From ab6237da824a95898209ecbb568095981c4dbe69 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 27 Jun 2022 18:06:20 +1000 Subject: Eliminated cross dependencies between driver projects. Driver projects now use globs to search for files. There's less effort editing the Lua files when things are moved around. Remember it won't automatically pick up a change, so if you add/remove/change files, you should touch makefile to get it to find the change. Driver projects no longer get the top-level MAME directory as an include path. This means you need to think about how you structure things and not introduce nasty circular dependencies. Subtarget projects can now be generated entirely from .flt files without the need for separate Lua scripts and .lst files. This has been done for the arcade, mess and virtual targets. It effectively works like a SOURCES= build on a large scale. This means you need to organise things so the dependency genrators can find them. There's an issue with the mess subtarget right now. For some reason, decmate2.cpp isn't picking up the dependency on the PDP8 CPU core for the HD6120 device. I'll debug it later --- makefile | 8 +- scripts/build/makedep.py | 514 +- scripts/genie.lua | 28 +- scripts/src/cpu.lua | 1 + scripts/target/mame/arcade.lua | 5116 ------------------ scripts/target/mame/ci.lua | 124 +- scripts/target/mame/dummy.lua | 10 +- scripts/target/mame/mame.lua | 3705 ++++++++++++- scripts/target/mame/mess.lua | 4847 ----------------- scripts/target/mame/nl.lua | 560 +- scripts/target/mame/tiny.lua | 118 +- scripts/target/mame/virtual.lua | 142 - src/mame/acorn/atom.cpp | 2 +- src/mame/acorn/bbc.cpp | 2 +- src/mame/acorn/bbc_m.cpp | 2 +- src/mame/acorn/bbc_v.cpp | 2 +- src/mame/acorn/electron.cpp | 2 +- src/mame/acorn/electron_m.cpp | 2 +- src/mame/acorn/electron_v.cpp | 2 +- src/mame/acorn/z88.cpp | 2 +- src/mame/acorn/z88.h | 4 +- src/mame/acorn/z88_v.cpp | 2 +- src/mame/act/apricotf.cpp | 2 +- src/mame/act/apricotp.cpp | 2 +- src/mame/act/victor9k.cpp | 4 +- src/mame/adc/super6.cpp | 2 +- src/mame/agat/agat.cpp | 6 +- src/mame/agat/agat7.cpp | 2 +- src/mame/agat/agat9.cpp | 2 +- src/mame/agat/agatkeyb.cpp | 2 +- src/mame/alesis/alesis.cpp | 2 +- src/mame/alesis/alesis_a.cpp | 2 +- src/mame/alesis/alesis_v.cpp | 2 +- src/mame/alpha/ad_sound.cpp | 2 +- src/mame/alpha/alpha68k.cpp | 2 +- src/mame/alpha/alpha68k.h | 8 +- src/mame/alpha/alpha68k_i.cpp | 2 +- src/mame/alpha/alpha68k_n.cpp | 2 +- src/mame/alpha/alpha68k_v.cpp | 2 +- src/mame/alpha/champbas.cpp | 2 +- src/mame/alpha/champbas.h | 2 +- src/mame/alpha/champbas_v.cpp | 2 +- src/mame/alpha/equites.cpp | 4 +- src/mame/alpha/equites.h | 2 +- src/mame/alpha/equites_v.cpp | 2 +- src/mame/alpha/shougi.cpp | 2 +- src/mame/altos/acs8600_ics.cpp | 2 +- src/mame/altos/altos8600.cpp | 2 +- src/mame/amiga/alg.cpp | 2 +- src/mame/amiga/amiga.cpp | 2 +- src/mame/amiga/amiga.h | 2 +- src/mame/amiga/amiga_m.cpp | 2 +- src/mame/amiga/amiga_v.cpp | 2 +- src/mame/amiga/amigaaga.cpp | 2 +- src/mame/amiga/arsystems.cpp | 2 +- src/mame/amiga/cubo.cpp | 2 +- src/mame/amiga/mquake.cpp | 2 +- src/mame/amiga/upscope.cpp | 2 +- src/mame/amstrad/amstrad.cpp | 2 +- src/mame/amstrad/amstrad_m.cpp | 2 +- src/mame/amstrad/nc.cpp | 2 +- src/mame/amstrad/nc_m.cpp | 2 +- src/mame/amstrad/nc_v.cpp | 2 +- src/mame/amstrad/pc1512.cpp | 2 +- src/mame/amstrad/pc1512.h | 4 +- src/mame/amstrad/pcw.cpp | 2 +- src/mame/amstrad/pcw16.cpp | 2 +- src/mame/amstrad/pcw16_v.cpp | 2 +- src/mame/amstrad/pcw_v.cpp | 2 +- src/mame/apollo/apollo.cpp | 2 +- src/mame/apollo/apollo.h | 2 +- src/mame/apollo/apollo_dbg.cpp | 2 +- src/mame/apollo/apollo_kbd.cpp | 2 +- src/mame/apollo/apollo_m.cpp | 2 +- src/mame/apollo/apollo_v.cpp | 2 +- src/mame/apple/apple2.cpp | 4 +- src/mame/apple/apple2e.cpp | 5 +- src/mame/apple/apple2gs.cpp | 7 +- src/mame/apple/apple3.cpp | 2 +- src/mame/apple/apple3_m.cpp | 2 +- src/mame/apple/apple3_v.cpp | 2 +- src/mame/apple/lisa.cpp | 2 +- src/mame/apple/lisa_m.cpp | 2 +- src/mame/apple/mac.cpp | 4 +- src/mame/apple/mac.h | 10 +- src/mame/apple/mac128.cpp | 6 +- src/mame/apple/mac_m.cpp | 2 +- src/mame/apple/mac_v.cpp | 2 +- src/mame/apple/macpci.cpp | 2 +- src/mame/apple/macpci.h | 2 +- src/mame/apple/macpci_m.cpp | 2 +- src/mame/apple/macpdm.cpp | 4 +- src/mame/apple/macprtb.cpp | 6 +- src/mame/apple/macpwrbk030.cpp | 6 +- src/mame/apple/macquadra700.cpp | 4 +- src/mame/apple/swim.cpp | 2 +- src/mame/apple/tk2000.cpp | 8 +- src/mame/applied/mbee.cpp | 2 +- src/mame/applied/mbee_m.cpp | 5 +- src/mame/applied/mbee_v.cpp | 2 +- src/mame/arcade.flt | 3089 +++++------ src/mame/arcadia/arcadia.cpp | 2 +- src/mame/arcadia/arcadia.h | 2 +- src/mame/arcadia/arcadia_a.cpp | 2 +- src/mame/arcadia/arcadia_v.cpp | 2 +- src/mame/ascii/msx.cpp | 8 +- src/mame/ascii/msx.h | 2 +- src/mame/ascii/msx_m.cpp | 2 +- src/mame/atari/a2600.cpp | 2 +- src/mame/atari/a2600.h | 2 +- src/mame/atari/a7800.cpp | 2 +- src/mame/atari/antic.h | 2 +- src/mame/atari/arcadecl.cpp | 4 +- src/mame/atari/arcadecl.h | 2 +- src/mame/atari/arcadecl_v.cpp | 4 +- src/mame/atari/asteroid.cpp | 103 +- src/mame/atari/asteroid.h | 11 +- src/mame/atari/asteroid_a.cpp | 2 +- src/mame/atari/asteroid_m.cpp | 3 +- src/mame/atari/atari400.cpp | 4 +- src/mame/atari/atari400.h | 4 +- src/mame/atari/atari400_m.cpp | 2 +- src/mame/atari/atari400_v.cpp | 2 +- src/mame/atari/atarifb.cpp | 2 +- src/mame/atari/atarifb_a.cpp | 2 +- src/mame/atari/atarifb_m.cpp | 2 +- src/mame/atari/atarifb_v.cpp | 2 +- src/mame/atari/atarig1.cpp | 2 +- src/mame/atari/atarig1.h | 8 +- src/mame/atari/atarig1_v.cpp | 4 +- src/mame/atari/atarig42.cpp | 2 +- src/mame/atari/atarig42.h | 8 +- src/mame/atari/atarig42_v.cpp | 4 +- src/mame/atari/atarigt.cpp | 2 +- src/mame/atari/atarigt.h | 6 +- src/mame/atari/atarigt_v.cpp | 4 +- src/mame/atari/atarigx2.cpp | 2 +- src/mame/atari/atarigx2.h | 8 +- src/mame/atari/atarigx2_v.cpp | 4 +- src/mame/atari/atarijsa.cpp | 2 +- src/mame/atari/atarijsa.h | 2 +- src/mame/atari/atarisac.cpp | 2 +- src/mame/atari/atarisac.h | 2 +- src/mame/atari/atarist.cpp | 4 +- src/mame/atari/atarist_v.cpp | 2 +- src/mame/atari/ataristb.cpp | 2 +- src/mame/atari/atarisy1.cpp | 4 +- src/mame/atari/atarisy1.h | 4 +- src/mame/atari/atarisy1_v.cpp | 2 +- src/mame/atari/atarisy2.cpp | 2 +- src/mame/atari/atarisy2.h | 4 +- src/mame/atari/atarisy2_v.cpp | 2 +- src/mame/atari/atarittl.cpp | 6 +- src/mame/atari/atarivad.cpp | 4 +- src/mame/atari/atarivad.h | 2 +- src/mame/atari/atetris.cpp | 2 +- src/mame/atari/avalnche.cpp | 2 +- src/mame/atari/avalnche_a.cpp | 2 +- src/mame/atari/badlands.cpp | 2 +- src/mame/atari/badlands.h | 2 +- src/mame/atari/badlands_m.cpp | 2 +- src/mame/atari/badlands_v.cpp | 4 +- src/mame/atari/badlandsbl.cpp | 2 +- src/mame/atari/bartop52.cpp | 8 +- src/mame/atari/batman.cpp | 4 +- src/mame/atari/batman.h | 6 +- src/mame/atari/batman_v.cpp | 2 +- src/mame/atari/beathead.cpp | 2 +- src/mame/atari/beathead.h | 2 +- src/mame/atari/beathead_v.cpp | 2 +- src/mame/atari/blstroid.cpp | 2 +- src/mame/atari/blstroid.h | 6 +- src/mame/atari/blstroid_v.cpp | 2 +- src/mame/atari/bsktball.cpp | 2 +- src/mame/atari/bsktball_a.cpp | 2 +- src/mame/atari/bsktball_m.cpp | 2 +- src/mame/atari/bsktball_v.cpp | 2 +- src/mame/atari/bwidow.cpp | 7 +- src/mame/atari/bwidow.h | 2 +- src/mame/atari/bwidow_a.cpp | 2 +- src/mame/atari/bzone.cpp | 6 +- src/mame/atari/bzone.h | 4 +- src/mame/atari/bzone_a.cpp | 2 +- src/mame/atari/canyon.cpp | 2 +- src/mame/atari/canyon_a.cpp | 2 +- src/mame/atari/canyon_v.cpp | 2 +- src/mame/atari/ccastles.cpp | 2 +- src/mame/atari/ccastles_v.cpp | 2 +- src/mame/atari/centiped.cpp | 2 +- src/mame/atari/centiped_v.cpp | 2 +- src/mame/atari/cloak.cpp | 2 +- src/mame/atari/cloak_v.cpp | 2 +- src/mame/atari/cloud9.cpp | 2 +- src/mame/atari/cloud9_v.cpp | 2 +- src/mame/atari/copsnrob.cpp | 2 +- src/mame/atari/copsnrob_a.cpp | 2 +- src/mame/atari/copsnrob_v.cpp | 2 +- src/mame/atari/cyberbal.cpp | 2 +- src/mame/atari/cyberbal.h | 8 +- src/mame/atari/cyberbal_v.cpp | 2 +- src/mame/atari/cybstorm.cpp | 2 +- src/mame/atari/cybstorm.h | 4 +- src/mame/atari/cybstorm_v.cpp | 2 +- src/mame/atari/destroyr.cpp | 2 +- src/mame/atari/dragrace.cpp | 2 +- src/mame/atari/dragrace_a.cpp | 2 +- src/mame/atari/dragrace_v.cpp | 2 +- src/mame/atari/eprom.cpp | 2 +- src/mame/atari/eprom.h | 4 +- src/mame/atari/eprom_v.cpp | 2 +- src/mame/atari/firetrk.cpp | 2 +- src/mame/atari/firetrk_a.cpp | 2 +- src/mame/atari/firetrk_v.cpp | 2 +- src/mame/atari/flyball.cpp | 2 +- src/mame/atari/foodf.cpp | 2 +- src/mame/atari/foodf_v.cpp | 2 +- src/mame/atari/gauntlet.cpp | 2 +- src/mame/atari/gauntlet.h | 4 +- src/mame/atari/gauntlet_v.cpp | 2 +- src/mame/atari/gtia.cpp | 2 +- src/mame/atari/harddriv.cpp | 2 +- src/mame/atari/harddriv.h | 6 +- src/mame/atari/harddriv_a.cpp | 2 +- src/mame/atari/harddriv_m.cpp | 2 +- src/mame/atari/harddriv_v.cpp | 2 +- src/mame/atari/irobot.cpp | 2 +- src/mame/atari/irobot_m.cpp | 2 +- src/mame/atari/irobot_v.cpp | 2 +- src/mame/atari/jagblit.ipp | 2 +- src/mame/atari/jaguar.cpp | 2 +- src/mame/atari/jaguar.h | 2 +- src/mame/atari/jaguar_a.cpp | 2 +- src/mame/atari/jaguar_v.cpp | 2 +- src/mame/atari/jedi.cpp | 2 +- src/mame/atari/jedi_a.cpp | 2 +- src/mame/atari/jedi_v.cpp | 2 +- src/mame/atari/klax.cpp | 2 +- src/mame/atari/klax.h | 2 +- src/mame/atari/klax_v.cpp | 4 +- src/mame/atari/liberatr.cpp | 2 +- src/mame/atari/liberatr_v.cpp | 2 +- src/mame/atari/llander.cpp | 106 - src/mame/atari/lynx.cpp | 2 +- src/mame/atari/lynx_m.cpp | 2 +- src/mame/atari/marblmd2.cpp | 6 +- src/mame/atari/maxaflex.cpp | 4 +- src/mame/atari/mediagx.cpp | 4 +- src/mame/atari/metalmx.cpp | 2 +- src/mame/atari/metalmx.h | 2 +- src/mame/atari/mhavoc.cpp | 5 +- src/mame/atari/mhavoc_m.cpp | 2 +- src/mame/atari/nitedrvr.cpp | 2 +- src/mame/atari/nitedrvr_a.cpp | 2 +- src/mame/atari/nitedrvr_m.cpp | 2 +- src/mame/atari/nitedrvr_v.cpp | 2 +- src/mame/atari/offtwall.cpp | 2 +- src/mame/atari/offtwall.h | 6 +- src/mame/atari/offtwall_v.cpp | 2 +- src/mame/atari/orbit.cpp | 2 +- src/mame/atari/orbit_a.cpp | 2 +- src/mame/atari/orbit_v.cpp | 2 +- src/mame/atari/pofo.cpp | 2 +- src/mame/atari/pofo_kbd.cpp | 2 +- src/mame/atari/pong.cpp | 8 +- src/mame/atari/poolshrk.cpp | 2 +- src/mame/atari/poolshrk_a.cpp | 2 +- src/mame/atari/poolshrk_v.cpp | 2 +- src/mame/atari/quantum.cpp | 10 +- src/mame/atari/rampart.cpp | 2 +- src/mame/atari/rampart.h | 4 +- src/mame/atari/rampart_v.cpp | 2 +- src/mame/atari/redbaron.cpp | 2 +- src/mame/atari/relief.cpp | 2 +- src/mame/atari/relief.h | 4 +- src/mame/atari/relief_v.cpp | 2 +- src/mame/atari/shuuz.cpp | 2 +- src/mame/atari/shuuz.h | 4 +- src/mame/atari/shuuz_v.cpp | 2 +- src/mame/atari/skullxbo.cpp | 2 +- src/mame/atari/skullxbo.h | 6 +- src/mame/atari/skullxbo_v.cpp | 2 +- src/mame/atari/skydiver.cpp | 2 +- src/mame/atari/skydiver_a.cpp | 2 +- src/mame/atari/skydiver_v.cpp | 2 +- src/mame/atari/skyraid.cpp | 2 +- src/mame/atari/skyraid_a.cpp | 2 +- src/mame/atari/skyraid_v.cpp | 2 +- src/mame/atari/slapstic.cpp | 2 +- src/mame/atari/sprint2.cpp | 2 +- src/mame/atari/sprint2_a.cpp | 2 +- src/mame/atari/sprint2_v.cpp | 2 +- src/mame/atari/sprint4.cpp | 2 +- src/mame/atari/sprint4_a.cpp | 2 +- src/mame/atari/sprint8.cpp | 2 +- src/mame/atari/sprint8_a.cpp | 2 +- src/mame/atari/sprint8_v.cpp | 2 +- src/mame/atari/starshp1.cpp | 2 +- src/mame/atari/starshp1_a.cpp | 2 +- src/mame/atari/starshp1_v.cpp | 2 +- src/mame/atari/starwars.cpp | 5 +- src/mame/atari/starwars.h | 2 +- src/mame/atari/starwars_a.cpp | 2 +- src/mame/atari/starwars_m.cpp | 2 +- src/mame/atari/subs.cpp | 2 +- src/mame/atari/subs_a.cpp | 2 +- src/mame/atari/subs_m.cpp | 2 +- src/mame/atari/subs_v.cpp | 2 +- src/mame/atari/tank8.cpp | 2 +- src/mame/atari/tank8_a.cpp | 2 +- src/mame/atari/tank8_v.cpp | 2 +- src/mame/atari/tempest.cpp | 14 +- src/mame/atari/thunderj.cpp | 2 +- src/mame/atari/thunderj.h | 6 +- src/mame/atari/thunderj_v.cpp | 2 +- src/mame/atari/tomcat.cpp | 4 +- src/mame/atari/toobin.cpp | 2 +- src/mame/atari/toobin.h | 4 +- src/mame/atari/toobin_v.cpp | 2 +- src/mame/atari/tourtabl.cpp | 2 +- src/mame/atari/triplhnt.cpp | 2 +- src/mame/atari/triplhnt_a.cpp | 2 +- src/mame/atari/triplhnt_v.cpp | 2 +- src/mame/atari/tunhunt.cpp | 2 +- src/mame/atari/tunhunt_v.cpp | 2 +- src/mame/atari/tvboy.cpp | 2 +- src/mame/atari/ultratnk.cpp | 5 +- src/mame/atari/ultratnk_v.cpp | 4 +- src/mame/atari/videopin.cpp | 2 +- src/mame/atari/videopin_a.cpp | 2 +- src/mame/atari/videopin_v.cpp | 2 +- src/mame/atari/vindictr.cpp | 2 +- src/mame/atari/vindictr.h | 4 +- src/mame/atari/vindictr_v.cpp | 2 +- src/mame/atari/wolfpack.cpp | 2 +- src/mame/atari/wolfpack_v.cpp | 2 +- src/mame/atari/xybots.cpp | 2 +- src/mame/atari/xybots.h | 6 +- src/mame/atari/xybots_v.cpp | 2 +- src/mame/atlus/patapata.cpp | 2 +- src/mame/bally/astrohome.cpp | 294 -- src/mame/bandai/wswan.cpp | 6 +- src/mame/bandai/wswan_v.cpp | 2 +- src/mame/barcrest/mpu3.cpp | 4 +- src/mame/barcrest/mpu4.cpp | 4 +- src/mame/barcrest/mpu4.h | 21 +- src/mame/barcrest/mpu4avan.cpp | 2 +- src/mame/barcrest/mpu4bwb.cpp | 2 +- src/mame/barcrest/mpu4concept.cpp | 2 +- src/mame/barcrest/mpu4crystal.cpp | 2 +- src/mame/barcrest/mpu4dealem.cpp | 2 +- src/mame/barcrest/mpu4empire.cpp | 2 +- src/mame/barcrest/mpu4mdm.cpp | 2 +- src/mame/barcrest/mpu4misc.cpp | 2 +- src/mame/barcrest/mpu4mod2sw.cpp | 2 +- src/mame/barcrest/mpu4mod4oki.cpp | 2 +- src/mame/barcrest/mpu4mod4yam.cpp | 2 +- src/mame/barcrest/mpu4plasma.cpp | 2 +- src/mame/barcrest/mpu4union.cpp | 2 +- src/mame/barcrest/mpu4unsorted.cpp | 2 +- src/mame/barcrest/mpu4vid.cpp | 2 +- src/mame/barcrest/mpu5.cpp | 2 +- src/mame/barcrest/mpu5.h | 9 +- src/mame/barcrest/mpu5sw.cpp | 2 +- src/mame/be/bebox.cpp | 2 +- src/mame/be/bebox_m.cpp | 2 +- src/mame/bfm/bfcobra.cpp | 2 +- src/mame/bfm/bfm_ad5.cpp | 4 +- src/mame/bfm/bfm_ad5sw.cpp | 4 +- src/mame/bfm/bfm_adr2.cpp | 4 +- src/mame/bfm/bfm_sc1.cpp | 26 +- src/mame/bfm/bfm_sc2.cpp | 14 +- src/mame/bfm/bfm_sc4.cpp | 10 +- src/mame/bfm/bfm_sc4.h | 6 +- src/mame/bfm/bfm_sc5.cpp | 7 +- src/mame/bfm/bfm_sc5.h | 2 +- src/mame/bfm/bfm_sc5sw.cpp | 4 +- src/mame/bfm/bfmsys83.cpp | 2 +- src/mame/bfm/bfmsys85.cpp | 15 +- src/mame/bfm/rastersp.cpp | 4 +- src/mame/bitcorp/gamate.cpp | 2 +- src/mame/bitcorp/gamate_v.cpp | 2 +- src/mame/bnpo/b2m.cpp | 2 +- src/mame/bnpo/b2m_m.cpp | 2 +- src/mame/bondwell/bw12.cpp | 2 +- src/mame/bondwell/bw2.cpp | 2 +- src/mame/booth/apexc.cpp | 2 +- src/mame/booth/apexc.h | 2 +- src/mame/booth/apexc_m.cpp | 2 +- src/mame/booth/apexc_v.cpp | 2 +- src/mame/canon/x07.cpp | 2 +- src/mame/capcom/1942.cpp | 4 +- src/mame/capcom/1942_v.cpp | 2 +- src/mame/capcom/1943.cpp | 2 +- src/mame/capcom/1943_v.cpp | 2 +- src/mame/capcom/bionicc.cpp | 2 +- src/mame/capcom/cbasebal.cpp | 2 +- src/mame/capcom/commando.cpp | 2 +- src/mame/capcom/commando_v.cpp | 2 +- src/mame/capcom/cps1.cpp | 4 +- src/mame/capcom/cps1_v.cpp | 2 +- src/mame/capcom/cps1bl_5205.cpp | 2 +- src/mame/capcom/cps1bl_pic.cpp | 2 +- src/mame/capcom/cps2.cpp | 6 +- src/mame/capcom/cps2crypt.cpp | 2 +- src/mame/capcom/cps3.cpp | 2 +- src/mame/capcom/cps3.h | 2 +- src/mame/capcom/cps3_a.cpp | 2 +- src/mame/capcom/exedexes.cpp | 2 +- src/mame/capcom/exedexes_v.cpp | 2 +- src/mame/capcom/fcrash.cpp | 2 +- src/mame/capcom/fcrash.h | 2 +- src/mame/capcom/higemaru.cpp | 2 +- src/mame/capcom/higemaru_v.cpp | 2 +- src/mame/capcom/kenseim.cpp | 2 +- src/mame/capcom/lastduel.cpp | 2 +- src/mame/capcom/lastduel_v.cpp | 2 +- src/mame/capcom/lwings.cpp | 2 +- src/mame/capcom/lwings_v.cpp | 2 +- src/mame/capcom/mitchell.cpp | 2 +- src/mame/capcom/sidearms.cpp | 2 +- src/mame/capcom/sidearms_v.cpp | 2 +- src/mame/capcom/sonson.cpp | 2 +- src/mame/capcom/sonson_v.cpp | 2 +- src/mame/capcom/srumbler.cpp | 2 +- src/mame/capcom/srumbler_v.cpp | 2 +- src/mame/capcom/supduck.cpp | 2 +- src/mame/capcom/tigeroad.cpp | 2 +- src/mame/capcom/tigeroad.h | 2 +- src/mame/capcom/tigeroad_m.cpp | 2 +- src/mame/capcom/tigeroad_v.cpp | 2 +- src/mame/capcom/vulgus.cpp | 2 +- src/mame/capcom/vulgus_v.cpp | 2 +- src/mame/casio/fp6000.cpp | 2 +- src/mame/cbm/c128.cpp | 2 +- src/mame/cbm/c64.cpp | 2 +- src/mame/cbm/cbm2.cpp | 2 +- src/mame/cbm/cbm_snqk.cpp | 2 +- src/mame/cbm/pet.cpp | 2 +- src/mame/cbm/plus4.cpp | 2 +- src/mame/cbm/vic20.cpp | 2 +- src/mame/cccp/lviv.cpp | 2 +- src/mame/cccp/lviv_m.cpp | 2 +- src/mame/cccp/lviv_v.cpp | 2 +- src/mame/cccp/mikro80.cpp | 2 +- src/mame/cccp/mikro80_m.cpp | 2 +- src/mame/cccp/pk8000.cpp | 8 +- src/mame/cccp/pk8020.cpp | 2 +- src/mame/cccp/pk8020_m.cpp | 2 +- src/mame/cccp/pk8020_v.cpp | 2 +- src/mame/cccp/sm7238.cpp | 2 +- src/mame/cccp/ut88.cpp | 2 +- src/mame/cccp/ut88_m.cpp | 2 +- src/mame/cccp/vector06.cpp | 2 +- src/mame/cccp/vector06_m.cpp | 2 +- src/mame/cccp/vector06_v.cpp | 2 +- src/mame/chromatics/cgc7900.cpp | 2 +- src/mame/chromatics/cgc7900_v.cpp | 2 +- src/mame/cinemat/cinemat.cpp | 2 +- src/mame/cinemat/cinemat.h | 2 +- src/mame/cinemat/cinemat_a.cpp | 28 +- src/mame/cinemat/cinemat_v.cpp | 2 +- src/mame/cinemat/jack.cpp | 2 +- src/mame/cinemat/jack_v.cpp | 2 +- src/mame/cinemat/leland.cpp | 4 +- src/mame/cinemat/leland_a.cpp | 2 +- src/mame/cinemat/leland_m.cpp | 4 +- src/mame/cinemat/leland_v.cpp | 4 +- src/mame/citoh/cit101.cpp | 2 +- src/mame/citoh/cit220.cpp | 2 +- src/mame/coleco/adam.cpp | 2 +- src/mame/coleco/adam.h | 2 +- src/mame/coleco/coleco.cpp | 2 +- src/mame/coleco/coleco.h | 2 +- src/mame/coleco/coleco_m.cpp | 2 +- src/mame/comad/funybubl.cpp | 2 +- src/mame/comad/funybubl_v.cpp | 2 +- src/mame/comad/galspnbl.cpp | 2 +- src/mame/comad/galspnbl.h | 4 +- src/mame/comad/galspnbl_v.cpp | 2 +- src/mame/comad/zerozone.cpp | 2 +- src/mame/comad/zerozone_v.cpp | 2 +- src/mame/comx/comx35.cpp | 2 +- src/mame/comx/comx35_v.cpp | 2 +- src/mame/concept/concept.cpp | 2 +- src/mame/concept/concept_m.cpp | 2 +- src/mame/conitec/prof180x.cpp | 2 +- src/mame/conitec/prof80.cpp | 2 +- src/mame/conitec/prof80.h | 2 +- src/mame/cvs/cvs.cpp | 2 +- src/mame/cvs/cvs_v.cpp | 2 +- src/mame/cvs/galaxia.cpp | 2 +- src/mame/cvs/galaxia.h | 2 +- src/mame/cvs/galaxia_v.cpp | 2 +- src/mame/cvs/quasar.cpp | 2 +- src/mame/cvs/quasar.h | 2 +- src/mame/cvs/quasar_v.cpp | 2 +- src/mame/cybiko/cybiko.cpp | 2 +- src/mame/cybiko/cybiko_m.cpp | 2 +- src/mame/dai/dai.cpp | 2 +- src/mame/dai/dai.h | 2 +- src/mame/dai/dai_m.cpp | 2 +- src/mame/dai/dai_v.cpp | 2 +- src/mame/dataeast/actfancr.cpp | 4 +- src/mame/dataeast/astrof.cpp | 2 +- src/mame/dataeast/astrof_a.cpp | 2 +- src/mame/dataeast/backfire.cpp | 8 +- src/mame/dataeast/boogwing.cpp | 6 +- src/mame/dataeast/boogwing.h | 8 +- src/mame/dataeast/boogwing_v.cpp | 2 +- src/mame/dataeast/btime.cpp | 6 +- src/mame/dataeast/btime_m.cpp | 2 +- src/mame/dataeast/btime_v.cpp | 2 +- src/mame/dataeast/bwing.cpp | 2 +- src/mame/dataeast/bwing_v.cpp | 2 +- src/mame/dataeast/cbuster.cpp | 2 +- src/mame/dataeast/cbuster.h | 4 +- src/mame/dataeast/cbuster_v.cpp | 2 +- src/mame/dataeast/cninja.cpp | 4 +- src/mame/dataeast/cninja.h | 10 +- src/mame/dataeast/cninja_v.cpp | 2 +- src/mame/dataeast/compgolf.cpp | 2 +- src/mame/dataeast/compgolf_v.cpp | 2 +- src/mame/dataeast/darkseal.cpp | 2 +- src/mame/dataeast/darkseal.h | 4 +- src/mame/dataeast/darkseal_v.cpp | 2 +- src/mame/dataeast/dassault.cpp | 2 +- src/mame/dataeast/dassault.h | 6 +- src/mame/dataeast/dassault_v.cpp | 2 +- src/mame/dataeast/dblewing.cpp | 10 +- src/mame/dataeast/dec0.cpp | 2 +- src/mame/dataeast/dec0.h | 4 +- src/mame/dataeast/dec0_m.cpp | 2 +- src/mame/dataeast/dec0_v.cpp | 2 +- src/mame/dataeast/dec8.cpp | 4 +- src/mame/dataeast/dec8.h | 8 +- src/mame/dataeast/dec8_v.cpp | 2 +- src/mame/dataeast/deco102.cpp | 2 +- src/mame/dataeast/deco156.cpp | 8 +- src/mame/dataeast/deco156_m.cpp | 2 +- src/mame/dataeast/deco16ic.cpp | 2 +- src/mame/dataeast/deco32.cpp | 7 +- src/mame/dataeast/deco32.h | 29 +- src/mame/dataeast/deco32_v.cpp | 2 +- src/mame/dataeast/deco_ace.cpp | 2 +- src/mame/dataeast/deco_mlc.cpp | 4 +- src/mame/dataeast/deco_mlc.h | 2 +- src/mame/dataeast/deco_mlc_v.cpp | 2 +- src/mame/dataeast/decocass.cpp | 6 +- src/mame/dataeast/decocass.h | 2 +- src/mame/dataeast/decocass_m.cpp | 4 +- src/mame/dataeast/decocass_tape.cpp | 2 +- src/mame/dataeast/decocass_v.cpp | 2 +- src/mame/dataeast/decocomn.cpp | 2 +- src/mame/dataeast/decocrpt.cpp | 2 +- src/mame/dataeast/dietgo.cpp | 10 +- src/mame/dataeast/dreambal.cpp | 6 +- src/mame/dataeast/exprraid.cpp | 2 +- src/mame/dataeast/exprraid_v.cpp | 2 +- src/mame/dataeast/funkyjet.cpp | 8 +- src/mame/dataeast/karnov.cpp | 4 +- src/mame/dataeast/kchamp.cpp | 2 +- src/mame/dataeast/kchamp_v.cpp | 2 +- src/mame/dataeast/kingobox.cpp | 2 +- src/mame/dataeast/kingobox_v.cpp | 2 +- src/mame/dataeast/lemmings.cpp | 2 +- src/mame/dataeast/lemmings.h | 4 +- src/mame/dataeast/lemmings_v.cpp | 2 +- src/mame/dataeast/liberate.cpp | 4 +- src/mame/dataeast/liberate_v.cpp | 2 +- src/mame/dataeast/madalien.cpp | 2 +- src/mame/dataeast/madalien_a.cpp | 2 +- src/mame/dataeast/madalien_v.cpp | 2 +- src/mame/dataeast/madmotor.cpp | 4 +- src/mame/dataeast/metlclsh.cpp | 2 +- src/mame/dataeast/metlclsh_v.cpp | 2 +- src/mame/dataeast/mirage.cpp | 6 +- src/mame/dataeast/pcktgal.cpp | 4 +- src/mame/dataeast/pktgaldx.cpp | 6 +- src/mame/dataeast/pktgaldx.h | 6 +- src/mame/dataeast/pktgaldx_v.cpp | 2 +- src/mame/dataeast/progolf.cpp | 4 +- src/mame/dataeast/rohga.cpp | 4 +- src/mame/dataeast/rohga.h | 10 +- src/mame/dataeast/rohga_v.cpp | 2 +- src/mame/dataeast/scregg.cpp | 6 +- src/mame/dataeast/shootout.cpp | 2 +- src/mame/dataeast/sidepckt.cpp | 2 +- src/mame/dataeast/sidepckt_v.cpp | 2 +- src/mame/dataeast/simpl156.cpp | 6 +- src/mame/dataeast/simpl156.h | 4 +- src/mame/dataeast/simpl156_v.cpp | 2 +- src/mame/dataeast/sshangha.cpp | 2 +- src/mame/dataeast/sshangha.h | 6 +- src/mame/dataeast/sshangha_v.cpp | 2 +- src/mame/dataeast/stadhero.cpp | 2 +- src/mame/dataeast/stadhero.h | 4 +- src/mame/dataeast/stadhero_v.cpp | 2 +- src/mame/dataeast/supbtime.cpp | 2 +- src/mame/dataeast/supbtime.h | 6 +- src/mame/dataeast/supbtime_v.cpp | 2 +- src/mame/dataeast/thedeep.cpp | 4 +- src/mame/dataeast/tryout.cpp | 2 +- src/mame/dataeast/tryout_v.cpp | 2 +- src/mame/dataeast/tumbleb.cpp | 4 +- src/mame/dataeast/tumbleb.h | 2 +- src/mame/dataeast/tumbleb_v.cpp | 2 +- src/mame/dataeast/vaportra.cpp | 2 +- src/mame/dataeast/vaportra.h | 4 +- src/mame/dataeast/vaportra_v.cpp | 2 +- src/mame/ddr/huebler.cpp | 2 +- src/mame/ddr/llc2.cpp | 2 +- src/mame/ddr/pcm.cpp | 2 +- src/mame/dec/decmate2.cpp | 2 +- src/mame/dec/decstation.cpp | 4 +- src/mame/dec/decwritr.cpp | 2 +- src/mame/dec/pdp11.cpp | 2 +- src/mame/dec/rainbow.cpp | 4 +- src/mame/dec/rx01.cpp | 2 +- src/mame/dec/vax11.cpp | 2 +- src/mame/dec/vt100.cpp | 4 +- src/mame/dec/vt240.cpp | 5 +- src/mame/dec/vtvideo.cpp | 2 +- src/mame/dgrm/blackt96.cpp | 4 +- src/mame/dgrm/pokechmp.cpp | 2 +- src/mame/dgrm/pokechmp_v.cpp | 2 +- src/mame/dicksmth/super80.cpp | 2 +- src/mame/dicksmth/super80_m.cpp | 6 +- src/mame/dicksmth/super80_v.cpp | 2 +- src/mame/dooyong/dooyong.cpp | 2 +- src/mame/dooyong/dooyong_v.cpp | 2 +- src/mame/dooyong/gundealr.cpp | 2 +- src/mame/dooyong/gundealr_v.cpp | 2 +- src/mame/dynax/ddenlovr.cpp | 2 +- src/mame/dynax/dynax.cpp | 2 +- src/mame/dynax/dynax.h | 2 +- src/mame/dynax/dynax_v.cpp | 2 +- src/mame/dynax/realbrk.cpp | 2 +- src/mame/dynax/realbrk_v.cpp | 2 +- src/mame/edevices/fantland.cpp | 2 +- src/mame/edevices/fantland_v.cpp | 2 +- src/mame/edevices/mugsmash.cpp | 2 +- src/mame/edevices/mugsmash_v.cpp | 2 +- src/mame/edevices/mwarr.cpp | 2 +- src/mame/edevices/stlforce.cpp | 2 +- src/mame/edevices/stlforce.h | 2 +- src/mame/efo/cedar_magnet.cpp | 11 +- src/mame/efo/cedar_magnet_plane.h | 2 +- src/mame/efo/cedar_magnet_sprite.h | 2 +- src/mame/efo/cidelsa.cpp | 2 +- src/mame/efo/cidelsa_v.cpp | 2 +- src/mame/einis/pecom.cpp | 2 +- src/mame/einis/pecom_m.cpp | 2 +- src/mame/einis/pecom_v.cpp | 2 +- src/mame/elektronika/bk.cpp | 2 +- src/mame/elektronika/bk_m.cpp | 2 +- src/mame/elektronika/dvk_kcgd.cpp | 2 +- src/mame/elektronika/dvk_ksm.cpp | 2 +- src/mame/elektronika/ms6102.cpp | 5 +- src/mame/ensoniq/esq1.cpp | 2 +- src/mame/ensoniq/esq5505.cpp | 6 +- src/mame/ensoniq/esqasr.cpp | 2 +- src/mame/ensoniq/esqkt.cpp | 2 +- src/mame/ensoniq/esqmr.cpp | 4 +- src/mame/ensoniq/esqpanel.h | 4 +- src/mame/enterprise/ep64.cpp | 2 +- src/mame/eolith/eolith.cpp | 2 +- src/mame/eolith/eolith16.cpp | 2 +- src/mame/eolith/eolith_v.cpp | 2 +- src/mame/eolith/vegaeo.cpp | 2 +- src/mame/epoch/gamepock.cpp | 2 +- src/mame/epoch/gamepock_m.cpp | 2 +- src/mame/epson/hx20.cpp | 2 +- src/mame/epson/px8.cpp | 2 +- src/mame/epson/qx10.cpp | 2 +- src/mame/epson/qx10kbd.cpp | 2 +- src/mame/ericsson/eispc.cpp | 2 +- src/mame/excelent/aquarium.cpp | 2 +- src/mame/excelent/aquarium.h | 2 +- src/mame/excelent/aquarium_v.cpp | 2 +- src/mame/excelent/gcpinbal.cpp | 2 +- src/mame/excelent/gcpinbal.h | 2 +- src/mame/excelent/gcpinbal_v.cpp | 2 +- src/mame/excelent/witch.cpp | 2 +- src/mame/exidy/carpolo.cpp | 2 +- src/mame/exidy/carpolo.h | 2 +- src/mame/exidy/carpolo_m.cpp | 2 +- src/mame/exidy/carpolo_v.cpp | 2 +- src/mame/exidy/circus.cpp | 2 +- src/mame/exidy/circus_a.cpp | 2 +- src/mame/exidy/circus_v.cpp | 2 +- src/mame/exidy/exidy.cpp | 2 +- src/mame/exidy/exidy440.cpp | 2 +- src/mame/exidy/exidy440.h | 2 +- src/mame/exidy/exidy440_a.cpp | 4 +- src/mame/exidy/exidy440_v.cpp | 2 +- src/mame/exidy/exidy_a.cpp | 1045 ---- src/mame/exidy/exidy_a.h | 233 - src/mame/exidy/micropolis.cpp | 2 +- src/mame/exidy/sorcerer.cpp | 2 +- src/mame/exidy/sorcerer.h | 2 +- src/mame/exidy/sorcerer_m.cpp | 6 +- src/mame/exidy/starfire.cpp | 2 +- src/mame/exidy/starfire.h | 4 +- src/mame/exidy/starfire_v.cpp | 2 +- src/mame/exidy/vertigo.cpp | 4 +- src/mame/exidy/vertigo.h | 2 +- src/mame/exidy/vertigo_m.cpp | 2 +- src/mame/exidy/vertigo_v.cpp | 2 +- src/mame/exidy/victory.cpp | 7 +- src/mame/exidy/victory_v.cpp | 2 +- src/mame/f32/crospang.cpp | 2 +- src/mame/f32/crospang.h | 4 +- src/mame/f32/crospang_v.cpp | 2 +- src/mame/f32/silvmil.cpp | 3 +- src/mame/fairch/channelf.cpp | 2 +- src/mame/fairch/channelf.h | 2 +- src/mame/fairch/channelf_a.cpp | 2 +- src/mame/fairch/channelf_v.cpp | 2 +- src/mame/fairlight/cmi.cpp | 6 +- src/mame/fairlight/cmi01a.cpp | 2 +- src/mame/falco/falco500.cpp | 2 +- src/mame/fidelity/fidel_as12.cpp | 2 +- src/mame/fidelity/fidel_clockdiv.cpp | 2 +- src/mame/fidelity/fidel_elite.cpp | 2 +- src/mame/fidelity/fidel_sc12.cpp | 2 +- src/mame/fujitsu/fm7.cpp | 2 +- src/mame/fujitsu/fm7_v.cpp | 2 +- src/mame/fujitsu/fmtowns.cpp | 2 +- src/mame/fujitsu/fmtowns.h | 2 +- src/mame/fujitsu/fmtowns_v.cpp | 2 +- src/mame/funtech/supracan.cpp | 2 +- src/mame/funworld/4roses.cpp | 2 +- src/mame/funworld/funworld.cpp | 2 +- src/mame/funworld/funworld_v.cpp | 2 +- src/mame/funworld/photoply.cpp | 9 +- src/mame/funworld/snookr10.cpp | 2 +- src/mame/funworld/snookr10_v.cpp | 2 +- src/mame/fuuki/fuukifg2.cpp | 2 +- src/mame/fuuki/fuukifg2.h | 2 +- src/mame/fuuki/fuukifg2_v.cpp | 2 +- src/mame/fuuki/fuukifg3.cpp | 2 +- src/mame/fuuki/fuukifg3.h | 2 +- src/mame/fuuki/fuukifg3_v.cpp | 2 +- src/mame/gaelco/blmbycar.cpp | 2 +- src/mame/gaelco/blmbycar.h | 2 +- src/mame/gaelco/blmbycar_v.cpp | 2 +- src/mame/gaelco/gaelco.cpp | 2 +- src/mame/gaelco/gaelco.h | 2 +- src/mame/gaelco/gaelco2.cpp | 4 +- src/mame/gaelco/gaelco2_m.cpp | 2 +- src/mame/gaelco/gaelco2_v.cpp | 2 +- src/mame/gaelco/gaelco3d.cpp | 2 +- src/mame/gaelco/gaelco3d.h | 2 +- src/mame/gaelco/gaelco3d_m.cpp | 2 +- src/mame/gaelco/gaelco3d_v.cpp | 2 +- src/mame/gaelco/gaelco_ds5002fp.cpp | 2 +- src/mame/gaelco/gaelco_v.cpp | 2 +- src/mame/gaelco/glass.cpp | 4 +- src/mame/gaelco/glass_v.cpp | 2 +- src/mame/gaelco/splash.cpp | 2 +- src/mame/gaelco/splash_v.cpp | 2 +- src/mame/gaelco/targeth.cpp | 4 +- src/mame/gaelco/targeth_v.cpp | 2 +- src/mame/gaelco/thoop2.cpp | 4 +- src/mame/gaelco/thoop2_v.cpp | 2 +- src/mame/gaelco/wrally.cpp | 4 +- src/mame/gaelco/wrally.h | 4 +- src/mame/gaelco/wrally_v.cpp | 2 +- src/mame/gaelco/xorworld.cpp | 2 +- src/mame/gaelco/xorworld_v.cpp | 2 +- src/mame/galaxian/dambustr.cpp | 4 +- src/mame/galaxian/fastfred.cpp | 2 +- src/mame/galaxian/fastfred.h | 10 +- src/mame/galaxian/fastfred_v.cpp | 2 +- src/mame/galaxian/galaxian.cpp | 23 +- src/mame/galaxian/galaxian_a.cpp | 4 +- src/mame/galaxian/galaxian_rockclim.cpp | 2 +- src/mame/galaxian/galaxian_v.cpp | 2 +- src/mame/galaxian/galaxold.cpp | 4 +- src/mame/galaxian/galaxold_m.cpp | 2 +- src/mame/galaxian/galaxold_v.cpp | 2 +- src/mame/galaxian/scobra.cpp | 2 +- src/mame/galaxian/scramble.cpp | 2 +- src/mame/galaxian/scramble.h | 9 +- src/mame/galaxian/scramble_a.cpp | 2 +- src/mame/galaxian/scramble_m.cpp | 2 +- src/mame/galaxy/galaxy.cpp | 2 +- src/mame/galaxy/galaxy_m.cpp | 2 +- src/mame/galaxy/galaxy_v.cpp | 2 +- src/mame/gamepark/gp32.cpp | 2 +- src/mame/gameplan/gameplan.cpp | 2 +- src/mame/gameplan/gameplan_v.cpp | 2 +- src/mame/gameplan/trvquest.cpp | 3 +- src/mame/gametron/gatron.cpp | 2 +- src/mame/gametron/gatron_v.cpp | 2 +- src/mame/gametron/sbugger.cpp | 2 +- src/mame/gametron/sbugger_v.cpp | 2 +- src/mame/gottlieb/exterm.cpp | 2 +- src/mame/gottlieb/exterm_v.cpp | 2 +- src/mame/gottlieb/gottlieb.cpp | 2 +- src/mame/gottlieb/gottlieb.h | 2 +- src/mame/gottlieb/gottlieb_v.cpp | 2 +- src/mame/gridcomp/gridcomp.cpp | 2 +- src/mame/gridcomp/gridkeyb.cpp | 2 +- src/mame/grundy/newbrain.cpp | 2 +- src/mame/grundy/newbrain_v.cpp | 2 +- src/mame/handheld/hh_sm510.cpp | 2 +- src/mame/handheld/hh_tms1k.cpp | 2 +- src/mame/handheld/rzone.cpp | 2 +- src/mame/handheld/tispeak.cpp | 2 +- src/mame/handheld/tispellb.cpp | 2 +- src/mame/hds/hds200.cpp | 2 +- src/mame/hec2hrp/hec2hrp.cpp | 2 +- src/mame/hec2hrp/hec2hrp_m.cpp | 2 +- src/mame/hec2hrp/hec2hrp_v.cpp | 2 +- src/mame/hegener/mephisto_academy.cpp | 4 +- src/mame/hegener/mephisto_amsterdam.cpp | 4 +- src/mame/hegener/mephisto_berlin.cpp | 4 +- src/mame/hegener/mephisto_brikett.cpp | 2 +- src/mame/hegener/mephisto_glasgow.cpp | 4 +- src/mame/hegener/mephisto_milano.cpp | 2 +- src/mame/hegener/mephisto_mm1.cpp | 4 +- src/mame/hegener/mephisto_mm2.cpp | 4 +- src/mame/hegener/mephisto_modena.cpp | 2 +- src/mame/hegener/mephisto_modular.cpp | 4 +- src/mame/hegener/mephisto_modular_tm.cpp | 4 +- src/mame/hegener/mephisto_montec.cpp | 2 +- src/mame/hegener/mephisto_polgar.cpp | 4 +- src/mame/hegener/mephisto_risc.cpp | 4 +- src/mame/hp/hp2640.cpp | 2 +- src/mame/hp/hp48.cpp | 2 +- src/mame/hp/hp48.h | 2 +- src/mame/hp/hp48_m.cpp | 2 +- src/mame/hp/hp48_port.cpp | 4 +- src/mame/hp/hp48_v.cpp | 2 +- src/mame/hp/hp80.cpp | 2 +- src/mame/hp/hp9825.cpp | 6 +- src/mame/hp/hp9845.cpp | 6 +- src/mame/hp/hp9845.h | 2 +- src/mame/hp/hp_ipc.cpp | 2 +- src/mame/ibm6580/ibm6580.cpp | 2 +- src/mame/ibmpc/calchase.cpp | 3 +- src/mame/ibmpc/fruitpc.cpp | 15 +- src/mame/ibmpc/pangofun.cpp | 9 +- src/mame/ibmpc/paokaipc.cpp | 14 +- src/mame/ibmpc/pcat_dyn.cpp | 6 +- src/mame/ibmpc/pcat_nit.cpp | 10 +- src/mame/ibmpc/quakeat.cpp | 8 +- src/mame/ibmpc/queen.cpp | 6 +- src/mame/igs/goldstar.cpp | 7 +- src/mame/igs/goldstar_v.cpp | 2 +- src/mame/igs/igs017.cpp | 4 +- src/mame/igs/igs_fear.cpp | 2 +- src/mame/igs/igs_m027.cpp | 4 +- src/mame/igs/igs_m036.cpp | 2 +- src/mame/igs/iqblock.cpp | 2 +- src/mame/igs/iqblock_v.cpp | 2 +- src/mame/igs/lordgun.cpp | 2 +- src/mame/igs/lordgun_v.cpp | 2 +- src/mame/igs/pgm.cpp | 18 +- src/mame/igs/pgm.h | 8 +- src/mame/igs/pgm2.cpp | 2 +- src/mame/igs/pgm2.h | 4 +- src/mame/igs/pgm2_v.cpp | 2 +- src/mame/igs/pgm_v.cpp | 2 +- src/mame/igs/pgmprot_igs025_igs012.cpp | 4 +- src/mame/igs/pgmprot_igs025_igs022.cpp | 4 +- src/mame/igs/pgmprot_igs025_igs028.cpp | 4 +- src/mame/igs/pgmprot_igs027a_type1.cpp | 2 +- src/mame/igs/pgmprot_igs027a_type1.h | 2 +- src/mame/igs/pgmprot_igs027a_type2.cpp | 4 +- src/mame/igs/pgmprot_igs027a_type3.cpp | 4 +- src/mame/igs/pgmprot_orlegend.cpp | 4 +- src/mame/informer/informer_207_376.cpp | 2 +- src/mame/informer/informer_213.cpp | 2 +- src/mame/intel/imds2.cpp | 2 +- src/mame/intel/imds2ioc.cpp | 2 +- src/mame/intel/intellec4.cpp | 2 +- src/mame/intel/isbc.cpp | 4 +- src/mame/interpro/interpro.cpp | 8 +- src/mame/interton/vc4000.cpp | 2 +- src/mame/interton/vc4000.h | 2 +- src/mame/interton/vc4000_a.cpp | 2 +- src/mame/interton/vc4000_v.cpp | 2 +- src/mame/intv/intv.cpp | 2 +- src/mame/intv/intv.h | 2 +- src/mame/intv/intv_m.cpp | 4 +- src/mame/intv/intv_v.cpp | 2 +- src/mame/intv/stic.cpp | 2 +- src/mame/irem/irem.cpp | 2 +- src/mame/irem/irem.h | 2 +- src/mame/irem/m10.cpp | 2 +- src/mame/irem/m107.cpp | 6 +- src/mame/irem/m107_v.cpp | 2 +- src/mame/irem/m10_v.cpp | 2 +- src/mame/irem/m52.cpp | 6 +- src/mame/irem/m52_v.cpp | 2 +- src/mame/irem/m57.cpp | 6 +- src/mame/irem/m57_v.cpp | 2 +- src/mame/irem/m58.cpp | 6 +- src/mame/irem/m58_v.cpp | 2 +- src/mame/irem/m62.cpp | 4 +- src/mame/irem/m62.h | 2 +- src/mame/irem/m62_bkungfu.cpp | 4 +- src/mame/irem/m62_v.cpp | 2 +- src/mame/irem/m72.cpp | 6 +- src/mame/irem/m72.h | 2 +- src/mame/irem/m72_a.cpp | 2 +- src/mame/irem/m72_v.cpp | 2 +- src/mame/irem/m90.cpp | 6 +- src/mame/irem/m90.h | 2 +- src/mame/irem/m90_v.cpp | 2 +- src/mame/irem/m92.cpp | 6 +- src/mame/irem/m92_v.cpp | 2 +- src/mame/irem/redalert.cpp | 4 +- src/mame/irem/redalert_a.cpp | 2 +- src/mame/irem/redalert_v.cpp | 2 +- src/mame/irem/shisen.cpp | 2 +- src/mame/irem/spartanxtec.cpp | 2 +- src/mame/irem/travrusa.cpp | 4 +- src/mame/irem/travrusa_v.cpp | 2 +- src/mame/irem/vigilant.cpp | 4 +- src/mame/irem/vigilant.h | 2 +- src/mame/irem/vigilant_v.cpp | 2 +- src/mame/itech/iteagle.cpp | 2 +- src/mame/itech/itech32.cpp | 2 +- src/mame/itech/itech32_v.cpp | 2 +- src/mame/itech/itech8.cpp | 2 +- src/mame/itech/itech8_m.cpp | 2 +- src/mame/itech/itech8_v.cpp | 2 +- src/mame/jaleco/acommand.cpp | 8 +- src/mame/jaleco/aeroboto.cpp | 2 +- src/mame/jaleco/aeroboto_v.cpp | 2 +- src/mame/jaleco/argus.cpp | 2 +- src/mame/jaleco/argus.h | 2 +- src/mame/jaleco/argus_v.cpp | 2 +- src/mame/jaleco/bigstrkb.cpp | 2 +- src/mame/jaleco/bigstrkb_v.cpp | 2 +- src/mame/jaleco/bnstars.cpp | 4 +- src/mame/jaleco/cischeat.cpp | 4 +- src/mame/jaleco/cischeat.h | 2 +- src/mame/jaleco/cischeat_v.cpp | 2 +- src/mame/jaleco/citycon.cpp | 2 +- src/mame/jaleco/citycon_v.cpp | 2 +- src/mame/jaleco/exerion.cpp | 2 +- src/mame/jaleco/exerion_v.cpp | 2 +- src/mame/jaleco/fcombat.cpp | 2 +- src/mame/jaleco/fcombat_v.cpp | 2 +- src/mame/jaleco/ginganin.cpp | 2 +- src/mame/jaleco/ginganin_v.cpp | 2 +- src/mame/jaleco/homerun.cpp | 2 +- src/mame/jaleco/homerun_v.cpp | 2 +- src/mame/jaleco/jalcrpt.cpp | 2 +- src/mame/jaleco/jalmah.cpp | 5 +- src/mame/jaleco/megasys1.cpp | 4 +- src/mame/jaleco/megasys1.h | 2 +- src/mame/jaleco/megasys1_v.cpp | 2 +- src/mame/jaleco/momoko.cpp | 2 +- src/mame/jaleco/momoko_v.cpp | 2 +- src/mame/jaleco/ms1_tmap.cpp | 2 +- src/mame/jaleco/ms32.cpp | 4 +- src/mame/jaleco/ms32.h | 4 +- src/mame/jaleco/ms32_v.cpp | 2 +- src/mame/jaleco/psychic5.cpp | 2 +- src/mame/jaleco/psychic5.h | 2 +- src/mame/jaleco/psychic5_v.cpp | 2 +- src/mame/jaleco/skyfox.cpp | 2 +- src/mame/jaleco/skyfox_v.cpp | 2 +- src/mame/jaleco/tetrisp2.cpp | 2 +- src/mame/jaleco/tetrisp2.h | 4 +- src/mame/jaleco/tetrisp2_v.cpp | 2 +- src/mame/jazz/jazz.cpp | 2 +- src/mame/jpm/guab.cpp | 5 +- src/mame/jpm/jpmimpct.cpp | 6 +- src/mame/jpm/jpmimpct.h | 19 +- src/mame/jpm/jpmimpct_v.cpp | 2 +- src/mame/jpm/jpmimpctsw.cpp | 2 +- src/mame/jpm/jpmsru.cpp | 7 +- src/mame/jpm/jpmsys5.cpp | 5 +- src/mame/jpm/jpmsys5.h | 19 +- src/mame/jpm/jpmsys5sw.cpp | 2 +- src/mame/kaneko/airbustr.cpp | 2 +- src/mame/kaneko/airbustr.h | 9 +- src/mame/kaneko/airbustr_v.cpp | 2 +- src/mame/kaneko/djboy.cpp | 2 +- src/mame/kaneko/djboy.h | 13 +- src/mame/kaneko/djboy_v.cpp | 3 +- src/mame/kaneko/expro02.cpp | 8 +- src/mame/kaneko/galpani2.cpp | 2 +- src/mame/kaneko/galpani2.h | 8 +- src/mame/kaneko/galpani2_v.cpp | 2 +- src/mame/kaneko/galpani3.cpp | 6 +- src/mame/kaneko/galpanic.cpp | 6 +- src/mame/kaneko/galpnipt.h | 6 + src/mame/kaneko/hvyunit.cpp | 5 +- src/mame/kaneko/jchan.cpp | 6 +- src/mame/kaneko/kan_pand.cpp | 294 ++ src/mame/kaneko/kan_pand.h | 66 + src/mame/kaneko/kaneko16.cpp | 2 +- src/mame/kaneko/kaneko16.h | 19 +- src/mame/kaneko/kaneko16_v.cpp | 2 +- src/mame/kaneko/kaneko_calc3.h | 6 +- src/mame/kaneko/kaneko_grap2.h | 6 +- src/mame/kaneko/kaneko_hit.h | 6 +- src/mame/kaneko/sandscrp.cpp | 11 +- src/mame/kaneko/snowbros.cpp | 3147 +++++++++++ src/mame/kaneko/snowbros.h | 128 + src/mame/kaneko/snowbros_v.cpp | 275 + src/mame/kaneko/suprnova.cpp | 2 +- src/mame/kaneko/suprnova.h | 2 +- src/mame/kaneko/suprnova_v.cpp | 4 +- src/mame/kaypro/kay_kbd.cpp | 2 +- src/mame/kaypro/kaypro.cpp | 4 +- src/mame/kaypro/kaypro_m.cpp | 2 +- src/mame/kaypro/kaypro_v.cpp | 2 +- src/mame/kiwako/jongkyo.cpp | 5 +- src/mame/kiwako/mrjong.cpp | 2 +- src/mame/kiwako/mrjong_v.cpp | 2 +- src/mame/konami/3dom2.h | 2 +- src/mame/konami/3dom2_te.cpp | 4 +- src/mame/konami/88games.cpp | 2 +- src/mame/konami/88games.h | 8 +- src/mame/konami/88games_v.cpp | 2 +- src/mame/konami/ajax.cpp | 10 +- src/mame/konami/aliens.cpp | 4 +- src/mame/konami/aliens.h | 4 +- src/mame/konami/aliens_v.cpp | 2 +- src/mame/konami/asterix.cpp | 4 +- src/mame/konami/asterix.h | 8 +- src/mame/konami/asterix_v.cpp | 2 +- src/mame/konami/battlnts.cpp | 4 +- src/mame/konami/battlnts.h | 4 +- src/mame/konami/battlnts_v.cpp | 2 +- src/mame/konami/bishi.cpp | 2 +- src/mame/konami/bishi.h | 8 +- src/mame/konami/bishi_v.cpp | 2 +- src/mame/konami/bladestl.cpp | 4 +- src/mame/konami/bladestl.h | 6 +- src/mame/konami/bladestl_v.cpp | 2 +- src/mame/konami/blockhl.cpp | 6 +- src/mame/konami/bottom9.cpp | 10 +- src/mame/konami/chqflag.cpp | 4 +- src/mame/konami/chqflag.h | 8 +- src/mame/konami/chqflag_v.cpp | 2 +- src/mame/konami/circusc.cpp | 4 +- src/mame/konami/circusc_v.cpp | 2 +- src/mame/konami/cobra.cpp | 2 +- src/mame/konami/combatsc.cpp | 2 +- src/mame/konami/combatsc.h | 4 +- src/mame/konami/combatsc_v.cpp | 2 +- src/mame/konami/contra.cpp | 6 +- src/mame/konami/crimfght.cpp | 4 +- src/mame/konami/crimfght.h | 4 +- src/mame/konami/crimfght_v.cpp | 2 +- src/mame/konami/dbz.cpp | 2 +- src/mame/konami/dbz.h | 10 +- src/mame/konami/dbz_v.cpp | 2 +- src/mame/konami/ddribble.cpp | 4 +- src/mame/konami/ddribble_v.cpp | 2 +- src/mame/konami/divebomb.cpp | 2 +- src/mame/konami/divebomb.h | 2 +- src/mame/konami/divebomb_v.cpp | 2 +- src/mame/konami/djmain.cpp | 2 +- src/mame/konami/djmain.h | 6 +- src/mame/konami/djmain_v.cpp | 2 +- src/mame/konami/fastlane.cpp | 6 +- src/mame/konami/finalizr.cpp | 6 +- src/mame/konami/finalizr_v.cpp | 2 +- src/mame/konami/firebeat.cpp | 4 +- src/mame/konami/flkatck.cpp | 6 +- src/mame/konami/gberet.cpp | 4 +- src/mame/konami/gberet_v.cpp | 2 +- src/mame/konami/giclassic.cpp | 8 +- src/mame/konami/gijoe.cpp | 4 +- src/mame/konami/gijoe.h | 8 +- src/mame/konami/gijoe_v.cpp | 2 +- src/mame/konami/gradius3.cpp | 4 +- src/mame/konami/gradius3.h | 6 +- src/mame/konami/gradius3_v.cpp | 2 +- src/mame/konami/gticlub.cpp | 8 +- src/mame/konami/gyruss.cpp | 6 +- src/mame/konami/gyruss_v.cpp | 2 +- src/mame/konami/hcastle.cpp | 4 +- src/mame/konami/hexion.cpp | 2 +- src/mame/konami/hornet.cpp | 6 +- src/mame/konami/hyperspt.cpp | 8 +- src/mame/konami/hyperspt.h | 2 +- src/mame/konami/hyperspt_v.cpp | 2 +- src/mame/konami/hyprolyb.cpp | 2 +- src/mame/konami/ironhors.cpp | 4 +- src/mame/konami/ironhors_v.cpp | 2 +- src/mame/konami/jackal.cpp | 4 +- src/mame/konami/jackal_v.cpp | 2 +- src/mame/konami/jailbrek.cpp | 6 +- src/mame/konami/jailbrek_v.cpp | 2 +- src/mame/konami/junofrst.cpp | 6 +- src/mame/konami/k001005.h | 2 +- src/mame/konami/k054156_k054157_k056832.h | 2 +- src/mame/konami/k573cass.h | 2 +- src/mame/konami/k573dio.h | 2 +- src/mame/konami/konamigx.cpp | 2 +- src/mame/konami/konamigx.h | 12 +- src/mame/konami/konamigx_m.cpp | 2 +- src/mame/konami/konamigx_v.cpp | 4 +- src/mame/konami/konamim2.cpp | 2 +- src/mame/konami/konendev.cpp | 2 +- src/mame/konami/konmedal.cpp | 6 +- src/mame/konami/konmedal68k.cpp | 6 +- src/mame/konami/kpontoon.cpp | 2 +- src/mame/konami/ksys573.cpp | 14 +- src/mame/konami/labyrunr.cpp | 6 +- src/mame/konami/lethal.cpp | 2 +- src/mame/konami/lethal.h | 8 +- src/mame/konami/lethal_v.cpp | 2 +- src/mame/konami/mainevt.cpp | 4 +- src/mame/konami/mainevt.h | 8 +- src/mame/konami/mainevt_v.cpp | 2 +- src/mame/konami/megazone.cpp | 4 +- src/mame/konami/midikbd.cpp | 2 +- src/mame/konami/mikie.cpp | 4 +- src/mame/konami/mikie_v.cpp | 2 +- src/mame/konami/mogura.cpp | 2 +- src/mame/konami/moo.cpp | 4 +- src/mame/konami/moo.h | 12 +- src/mame/konami/moo_v.cpp | 2 +- src/mame/konami/mystwarr.cpp | 8 +- src/mame/konami/mystwarr.h | 8 +- src/mame/konami/mystwarr_v.cpp | 4 +- src/mame/konami/nemesis.cpp | 4 +- src/mame/konami/nemesis_v.cpp | 2 +- src/mame/konami/nwk-tr.cpp | 6 +- src/mame/konami/overdriv.cpp | 10 +- src/mame/konami/pandoras.cpp | 4 +- src/mame/konami/pandoras_v.cpp | 2 +- src/mame/konami/parodius.cpp | 10 +- src/mame/konami/pingpong.cpp | 2 +- src/mame/konami/pingpong_v.cpp | 2 +- src/mame/konami/piratesh.cpp | 12 +- src/mame/konami/plygonet.cpp | 2 +- src/mame/konami/pooyan.cpp | 6 +- src/mame/konami/pooyan_v.cpp | 2 +- src/mame/konami/qdrmfgp.cpp | 2 +- src/mame/konami/qdrmfgp.h | 4 +- src/mame/konami/qdrmfgp_v.cpp | 2 +- src/mame/konami/quickpick5.cpp | 4 +- src/mame/konami/rockrage.cpp | 4 +- src/mame/konami/rockrage.h | 4 +- src/mame/konami/rockrage_v.cpp | 2 +- src/mame/konami/rocnrope.cpp | 8 +- src/mame/konami/rocnrope_v.cpp | 2 +- src/mame/konami/rollerg.cpp | 6 +- src/mame/konami/rungun.cpp | 4 +- src/mame/konami/rungun.h | 6 +- src/mame/konami/rungun_v.cpp | 2 +- src/mame/konami/sbasketb.cpp | 6 +- src/mame/konami/sbasketb.h | 2 +- src/mame/konami/sbasketb_v.cpp | 2 +- src/mame/konami/scotrsht.cpp | 4 +- src/mame/konami/scotrsht_v.cpp | 2 +- src/mame/konami/shaolins.cpp | 2 +- src/mame/konami/shaolins_v.cpp | 2 +- src/mame/konami/simpsons.cpp | 4 +- src/mame/konami/simpsons.h | 8 +- src/mame/konami/simpsons_m.cpp | 2 +- src/mame/konami/simpsons_v.cpp | 2 +- src/mame/konami/spy.cpp | 4 +- src/mame/konami/spy.h | 6 +- src/mame/konami/spy_v.cpp | 2 +- src/mame/konami/surpratk.cpp | 10 +- src/mame/konami/tasman.cpp | 8 +- src/mame/konami/thunderx.cpp | 4 +- src/mame/konami/thunderx.h | 6 +- src/mame/konami/thunderx_v.cpp | 2 +- src/mame/konami/timeplt.cpp | 6 +- src/mame/konami/timeplt_v.cpp | 2 +- src/mame/konami/tmnt.cpp | 4 +- src/mame/konami/tmnt.h | 14 +- src/mame/konami/tmnt_v.cpp | 2 +- src/mame/konami/tp84.cpp | 4 +- src/mame/konami/tp84_v.cpp | 2 +- src/mame/konami/trackfld.cpp | 8 +- src/mame/konami/trackfld.h | 2 +- src/mame/konami/trackfld_a.cpp | 4 +- src/mame/konami/trackfld_v.cpp | 2 +- src/mame/konami/tutankhm.cpp | 4 +- src/mame/konami/tutankhm.h | 2 +- src/mame/konami/tutankhm_v.cpp | 2 +- src/mame/konami/twin16.cpp | 4 +- src/mame/konami/twin16_v.cpp | 2 +- src/mame/konami/ultraman.cpp | 2 +- src/mame/konami/ultraman.h | 6 +- src/mame/konami/ultraman_v.cpp | 2 +- src/mame/konami/vendetta.cpp | 12 +- src/mame/konami/wecleman.cpp | 4 +- src/mame/konami/wecleman.h | 4 +- src/mame/konami/wecleman_v.cpp | 2 +- src/mame/konami/xexex.cpp | 4 +- src/mame/konami/xexex.h | 12 +- src/mame/konami/xexex_v.cpp | 2 +- src/mame/konami/xmen.cpp | 4 +- src/mame/konami/xmen.h | 8 +- src/mame/konami/xmen_v.cpp | 2 +- src/mame/konami/yiear.cpp | 4 +- src/mame/konami/yiear.h | 2 +- src/mame/konami/yiear_v.cpp | 2 +- src/mame/konami/zr107.cpp | 12 +- src/mame/konami/zs01.cpp | 2 +- src/mame/kyocera/kyocera.cpp | 2 +- src/mame/kyocera/kyocera_v.cpp | 2 +- src/mame/lsi/octo_kbd.cpp | 2 +- src/mame/lsi/octopus.cpp | 2 +- src/mame/luxor/abc1600.cpp | 2 +- src/mame/luxor/abc1600.h | 4 +- src/mame/luxor/abc1600_v.cpp | 2 +- src/mame/luxor/abc80.cpp | 2 +- src/mame/luxor/abc80.h | 2 +- src/mame/luxor/abc800.cpp | 302 -- src/mame/luxor/abc802.cpp | 205 - src/mame/luxor/abc806.cpp | 510 -- src/mame/luxor/abc80_v.cpp | 2 +- src/mame/luxor/abc80x.cpp | 991 +++- src/mame/luxor/ds90.cpp | 2 +- src/mame/mame.lst | 5578 ++++++++++---------- src/mame/mattel/aquarius.cpp | 2 +- src/mame/mattel/aquarius_v.cpp | 2 +- src/mame/maygay/maygay1b.cpp | 2 +- src/mame/maygay/maygay1b.h | 22 +- src/mame/maygay/maygay1bsw.cpp | 2 +- src/mame/maygay/maygayv1.cpp | 3 +- src/mame/meadows/lazercmd.cpp | 2 +- src/mame/meadows/lazercmd_v.cpp | 2 +- src/mame/meadows/meadows.cpp | 2 +- src/mame/meadows/meadows_a.cpp | 2 +- src/mame/meadows/meadows_v.cpp | 2 +- src/mame/memotech/mtx.cpp | 2 +- src/mame/memotech/mtx_m.cpp | 2 +- src/mame/mess.flt | 2542 ++++----- src/mame/messshared/crt.cpp | 181 - src/mame/messshared/crt.h | 76 - src/mame/messshared/mega32x.cpp | 2 +- src/mame/messshared/megacdcd.cpp | 2 +- src/mame/messshared/mitcrt.cpp | 181 + src/mame/messshared/mitcrt.h | 76 + src/mame/messshared/vboy_a.cpp | 501 -- src/mame/messshared/vboy_a.h | 92 - src/mame/messshared/vboysound.cpp | 501 ++ src/mame/messshared/vboysound.h | 92 + src/mame/messshared/vt100_kbd.cpp | 2 +- src/mame/messshared/wswan_a.cpp | 387 -- src/mame/messshared/wswan_a.h | 86 - src/mame/messshared/wswansound.cpp | 387 ++ src/mame/messshared/wswansound.h | 86 + src/mame/messshared/z80bin.cpp | 2 +- src/mame/metro/metro.cpp | 2 +- src/mame/metro/metro.h | 16 +- src/mame/metro/metro_v.cpp | 2 +- src/mame/microkey/primo.cpp | 2 +- src/mame/microkey/primo_m.cpp | 2 +- src/mame/microsoft/xbox.cpp | 4 +- src/mame/midw8080/8080bw.cpp | 2 +- src/mame/midw8080/8080bw.h | 4 +- src/mame/midw8080/8080bw_a.cpp | 2 +- src/mame/midw8080/8080bw_v.cpp | 2 +- src/mame/midw8080/m79amb.cpp | 2 +- src/mame/midw8080/m79amb_a.cpp | 2 +- src/mame/midw8080/mw8080bw.cpp | 2 +- src/mame/midw8080/mw8080bw.h | 2 +- src/mame/midw8080/mw8080bw_a.cpp | 8 +- src/mame/midw8080/mw8080bw_v.cpp | 2 +- src/mame/midway/astrocde.cpp | 2 +- src/mame/midway/astrocde_v.cpp | 2 +- src/mame/midway/astrohome.cpp | 294 ++ src/mame/midway/atlantis.cpp | 20 +- src/mame/midway/balsente.cpp | 4 +- src/mame/midway/balsente_m.cpp | 2 +- src/mame/midway/balsente_v.cpp | 2 +- src/mame/midway/gridlee.cpp | 2 +- src/mame/midway/gridlee_a.cpp | 2 +- src/mame/midway/gridlee_v.cpp | 2 +- src/mame/midway/mcr.cpp | 2 +- src/mame/midway/mcr.h | 16 +- src/mame/midway/mcr3.cpp | 2 +- src/mame/midway/mcr3.h | 2 +- src/mame/midway/mcr3_v.cpp | 2 +- src/mame/midway/mcr68.cpp | 2 +- src/mame/midway/mcr68.h | 17 +- src/mame/midway/mcr68_m.cpp | 4 +- src/mame/midway/mcr68_v.cpp | 2 +- src/mame/midway/mcr_m.cpp | 2 +- src/mame/midway/mcr_v.cpp | 2 +- src/mame/midway/midqslvr.cpp | 4 +- src/mame/midway/midtunit.cpp | 2 +- src/mame/midway/midtunit.h | 14 +- src/mame/midway/midtunit_m.cpp | 2 +- src/mame/midway/midtunit_v.cpp | 4 +- src/mame/midway/midvunit.cpp | 6 +- src/mame/midway/midvunit.h | 13 +- src/mame/midway/midvunit_v.cpp | 14 +- src/mame/midway/midway.cpp | 7 +- src/mame/midway/midwayic.h | 12 +- src/mame/midway/midwunit.cpp | 4 +- src/mame/midway/midwunit.h | 15 +- src/mame/midway/midwunit_m.cpp | 2 +- src/mame/midway/midxunit.cpp | 3 +- src/mame/midway/midxunit.h | 13 +- src/mame/midway/midxunit_m.cpp | 2 +- src/mame/midway/midyunit.cpp | 2 +- src/mame/midway/midyunit.h | 2 +- src/mame/midway/midyunit_m.cpp | 2 +- src/mame/midway/midyunit_v.cpp | 2 +- src/mame/midway/midzeus.cpp | 10 +- src/mame/midway/midzeus.h | 2 +- src/mame/midway/midzeus_v.cpp | 2 +- src/mame/midway/omegrace.cpp | 9 +- src/mame/midway/pinball2k.cpp | 5 +- src/mame/midway/seattle.cpp | 7 +- src/mame/midway/sente6vb.cpp | 2 +- src/mame/midway/sspeedr.cpp | 4 +- src/mame/midway/sspeedr_v.cpp | 2 +- src/mame/midway/vegas.cpp | 5 +- src/mame/midway/williams.cpp | 2 +- src/mame/midway/williams.h | 12 +- src/mame/midway/williams_m.cpp | 2 +- src/mame/midway/williams_v.cpp | 2 +- src/mame/midway/wmg.cpp | 2 +- src/mame/midway/zwackery.cpp | 2 +- src/mame/mips/mips.cpp | 2 +- src/mame/misc/3do.cpp | 2 +- src/mame/misc/3do_m.cpp | 2 +- src/mame/misc/aces1.cpp | 7 +- src/mame/misc/acesp.cpp | 2 +- src/mame/misc/ampoker2.cpp | 2 +- src/mame/misc/ampoker2_v.cpp | 2 +- src/mame/misc/apple2_v.cpp | 1643 ------ src/mame/misc/apple2_v.h | 86 - src/mame/misc/apple2common.cpp | 893 ---- src/mame/misc/apple2common.h | 54 - src/mame/misc/artmagic.cpp | 2 +- src/mame/misc/artmagic_v.cpp | 2 +- src/mame/misc/aztarac.cpp | 2 +- src/mame/misc/aztarac_a.cpp | 2 +- src/mame/misc/aztarac_v.cpp | 2 +- src/mame/misc/calomega.cpp | 2 +- src/mame/misc/calomega_v.cpp | 2 +- src/mame/misc/cave.cpp | 7 +- src/mame/misc/cave.h | 10 +- src/mame/misc/cave_v.cpp | 2 +- src/mame/misc/cdi.cpp | 2 +- src/mame/misc/cdi.h | 6 +- src/mame/misc/cdicdic.cpp | 2 +- src/mame/misc/cdislavehle.cpp | 2 +- src/mame/misc/cocoloco.cpp | 2 +- src/mame/misc/comebaby.cpp | 5 +- src/mame/misc/coolpool.cpp | 2 +- src/mame/misc/dcheese.cpp | 2 +- src/mame/misc/dcheese_v.cpp | 2 +- src/mame/misc/ecoinf2.cpp | 13 +- src/mame/misc/ecoinf3.cpp | 4 +- src/mame/misc/ecoinfr.cpp | 7 +- src/mame/misc/efdt.cpp | 2 +- src/mame/misc/esd16.cpp | 2 +- src/mame/misc/esd16.h | 11 +- src/mame/misc/esd16_v.cpp | 2 +- src/mame/misc/esripsys.cpp | 2 +- src/mame/misc/esripsys_v.cpp | 2 +- src/mame/misc/flower.cpp | 2 +- src/mame/misc/flower_a.cpp | 2 +- src/mame/misc/freekick.cpp | 6 +- src/mame/misc/freekick_v.cpp | 2 +- src/mame/misc/funkball.cpp | 11 +- src/mame/misc/gammagic.cpp | 8 +- src/mame/misc/gotcha.cpp | 2 +- src/mame/misc/gotcha.h | 9 +- src/mame/misc/gotcha_v.cpp | 2 +- src/mame/misc/gumbo.cpp | 2 +- src/mame/misc/gumbo_v.cpp | 2 +- src/mame/misc/homedata.cpp | 2 +- src/mame/misc/homedata_v.cpp | 2 +- src/mame/misc/hotchili.cpp | 27 +- src/mame/misc/inder_sb.cpp | 2 +- src/mame/misc/kyugo.cpp | 2 +- src/mame/misc/kyugo_v.cpp | 2 +- src/mame/misc/ladyfrog.cpp | 2 +- src/mame/misc/ladyfrog_v.cpp | 2 +- src/mame/misc/lethalj.cpp | 2 +- src/mame/misc/lethalj_v.cpp | 2 +- src/mame/misc/magtouch.cpp | 8 +- src/mame/misc/malzak.cpp | 2 +- src/mame/misc/malzak_v.cpp | 2 +- src/mame/misc/mcatadv.cpp | 2 +- src/mame/misc/mcatadv.h | 10 +- src/mame/misc/mcatadv_v.cpp | 2 +- src/mame/misc/mcd212.cpp | 2 +- src/mame/misc/megaphx.cpp | 4 +- src/mame/misc/micro3d.cpp | 4 +- src/mame/misc/micro3d_a.cpp | 2 +- src/mame/misc/micro3d_m.cpp | 4 +- src/mame/misc/micro3d_v.cpp | 4 +- src/mame/misc/mosaic.cpp | 2 +- src/mame/misc/mosaic_v.cpp | 2 +- src/mame/misc/multfish.cpp | 2 +- src/mame/misc/multfish_boot.cpp | 2 +- src/mame/misc/news.cpp | 2 +- src/mame/misc/news_v.cpp | 2 +- src/mame/misc/norautp.cpp | 2 +- src/mame/misc/norautp_a.cpp | 2 +- src/mame/misc/oneshot.cpp | 2 +- src/mame/misc/oneshot_v.cpp | 2 +- src/mame/misc/pass.cpp | 2 +- src/mame/misc/pass_v.cpp | 2 +- src/mame/misc/photon.cpp | 3 +- src/mame/misc/policetr.cpp | 2 +- src/mame/misc/policetr_v.cpp | 2 +- src/mame/misc/polyplay.cpp | 2 +- src/mame/misc/polyplay_a.cpp | 2 +- src/mame/misc/polyplay_v.cpp | 2 +- src/mame/misc/proconn.cpp | 3 +- src/mame/misc/savquest.cpp | 11 +- src/mame/misc/shangkid.cpp | 2 +- src/mame/misc/shangkid_v.cpp | 2 +- src/mame/misc/special_a.cpp | 85 - src/mame/misc/special_a.h | 38 - src/mame/misc/special_gambl.cpp | 7 +- src/mame/misc/su2000.cpp | 15 +- src/mame/misc/superga2.cpp | 10 +- src/mame/misc/truco.cpp | 2 +- src/mame/misc/truco_v.cpp | 2 +- src/mame/misc/trucocl.cpp | 2 +- src/mame/misc/trucocl_v.cpp | 2 +- src/mame/misc/vectrex.cpp | 2 +- src/mame/misc/vectrex_m.cpp | 2 +- src/mame/misc/vectrex_v.cpp | 2 +- src/mame/misc/voyager.cpp | 7 +- src/mame/misc/xtom3d.cpp | 4 +- src/mame/mit/tx0.cpp | 3 +- src/mame/mit/tx0.h | 9 +- src/mame/mit/tx0_v.cpp | 4 +- src/mame/morrow/mpz80.cpp | 2 +- src/mame/mr/dribling.cpp | 2 +- src/mame/mr/dribling_v.cpp | 2 +- src/mame/multitch/mpf1.cpp | 2 +- src/mame/namco/20pacgal.cpp | 2 +- src/mame/namco/20pacgal_v.cpp | 2 +- src/mame/namco/baraduke.cpp | 2 +- src/mame/namco/baraduke_v.cpp | 2 +- src/mame/namco/bosco.cpp | 4 +- src/mame/namco/c117.cpp | 2 +- src/mame/namco/cswat.cpp | 2 +- src/mame/namco/digdug.cpp | 4 +- src/mame/namco/gal3.cpp | 6 +- src/mame/namco/galaga.cpp | 20 +- src/mame/namco/galaga.h | 2 +- src/mame/namco/galaga_a.cpp | 2 +- src/mame/namco/galaga_v.cpp | 2 +- src/mame/namco/gaplus.cpp | 4 +- src/mame/namco/gaplus.h | 2 +- src/mame/namco/gaplus_m.cpp | 2 +- src/mame/namco/gaplus_v.cpp | 2 +- src/mame/namco/geebee.cpp | 2 +- src/mame/namco/mappy.cpp | 2 +- src/mame/namco/mappy.h | 2 +- src/mame/namco/mappy_v.cpp | 2 +- src/mame/namco/namco06.cpp | 2 +- src/mame/namco/namco62.cpp | 2 +- src/mame/namco/namco65.cpp | 2 +- src/mame/namco/namco68.cpp | 2 +- src/mame/namco/namco_c116.cpp | 2 +- src/mame/namco/namco_c355spr.cpp | 802 --- src/mame/namco/namco_c355spr.h | 166 - src/mame/namco/namco_c45road.cpp | 2 +- src/mame/namco/namcofl.cpp | 2 +- src/mame/namco/namcofl.h | 10 +- src/mame/namco/namcofl_v.cpp | 2 +- src/mame/namco/namcoio.cpp | 2 +- src/mame/namco/namcona1.cpp | 2 +- src/mame/namco/namcona1.h | 2 +- src/mame/namco/namcona1_v.cpp | 2 +- src/mame/namco/namconb1.cpp | 2 +- src/mame/namco/namconb1.h | 10 +- src/mame/namco/namconb1_v.cpp | 2 +- src/mame/namco/namcond1.cpp | 2 +- src/mame/namco/namcond1.h | 2 +- src/mame/namco/namcond1_m.cpp | 2 +- src/mame/namco/namcos1.cpp | 2 +- src/mame/namco/namcos1.h | 6 +- src/mame/namco/namcos10.cpp | 2 +- src/mame/namco/namcos11.cpp | 4 +- src/mame/namco/namcos12.cpp | 2 +- src/mame/namco/namcos1_m.cpp | 2 +- src/mame/namco/namcos1_v.cpp | 2 +- src/mame/namco/namcos2.cpp | 2 +- src/mame/namco/namcos2.h | 22 +- src/mame/namco/namcos21.cpp | 10 +- src/mame/namco/namcos21_c67.cpp | 16 +- src/mame/namco/namcos21_de.cpp | 14 +- src/mame/namco/namcos21_dsp.h | 2 +- src/mame/namco/namcos21_dsp_c67.h | 4 +- src/mame/namco/namcos22.cpp | 2 +- src/mame/namco/namcos22.h | 2 +- src/mame/namco/namcos22_v.cpp | 2 +- src/mame/namco/namcos23.cpp | 2 +- src/mame/namco/namcos2_m.cpp | 2 +- src/mame/namco/namcos2_v.cpp | 2 +- src/mame/namco/namcos86.cpp | 2 +- src/mame/namco/namcos86_v.cpp | 2 +- src/mame/namco/polepos.cpp | 14 +- src/mame/namco/polepos_a.cpp | 2 +- src/mame/namco/polepos_v.cpp | 2 +- src/mame/namco/rallyx.cpp | 2 +- src/mame/namco/rallyx.h | 10 +- src/mame/namco/rallyx_v.cpp | 2 +- src/mame/namco/tankbatt.cpp | 2 +- src/mame/namco/tankbatt.h | 2 +- src/mame/namco/tankbatt_v.cpp | 2 +- src/mame/namco/tceptor.cpp | 2 +- src/mame/namco/tceptor.h | 2 +- src/mame/namco/tceptor_v.cpp | 2 +- src/mame/namco/toypop.cpp | 2 +- src/mame/namco/turrett.cpp | 2 +- src/mame/namco/turrett_a.cpp | 2 +- src/mame/namco/turrett_v.cpp | 2 +- src/mame/namco/warpwarp.cpp | 2 +- src/mame/namco/warpwarp.h | 4 +- src/mame/namco/warpwarp_a.cpp | 2 +- src/mame/namco/warpwarp_v.cpp | 2 +- src/mame/namco/xevious.cpp | 4 +- src/mame/namco/xevious_m.cpp | 4 +- src/mame/namco/ygv608.cpp | 2 +- src/mame/ncd/bert_m.cpp | 2 +- src/mame/ncd/ncd68k.cpp | 3 +- src/mame/ne/z80ne.cpp | 2 +- src/mame/ne/z80ne_m.cpp | 2 +- src/mame/nec/pc6001.cpp | 2 +- src/mame/nec/pc6001.h | 2 +- src/mame/nec/pc6001_v.cpp | 2 +- src/mame/nec/pc8001.cpp | 2 +- src/mame/nec/pc8001.h | 2 +- src/mame/nec/pc8401a.cpp | 2 +- src/mame/nec/pc8401a_v.cpp | 2 +- src/mame/nec/pc8801.cpp | 2 +- src/mame/nec/pc8801.h | 4 +- src/mame/nec/pc88va.cpp | 2 +- src/mame/nec/pc9801.cpp | 2 +- src/mame/nec/pc9801.h | 6 +- src/mame/nec/pc9801_epson.cpp | 2 +- src/mame/nec/pc9801_epson.h | 2 +- src/mame/nec/pc9801_kbd.cpp | 2 +- src/mame/nec/pc9801_v.cpp | 2 +- src/mame/nec/pc9821.cpp | 2 +- src/mame/nec/pc9821.h | 2 +- src/mame/nec/pc98ha.cpp | 2 +- src/mame/nec/pc98ha.h | 2 +- src/mame/nec/pce.cpp | 2 +- src/mame/nec/pce.h | 7 +- src/mame/nec/pce_cd.cpp | 2 +- src/mame/nec/pce_m.cpp | 2 +- src/mame/neogeo/midas.cpp | 7 +- src/mame/neogeo/neogeo.cpp | 2 +- src/mame/neogeo/neogeo.h | 4 +- src/mame/neogeo/neogeo_v.cpp | 2 +- src/mame/neogeo/neogeocd.cpp | 1127 ++++ src/mame/neogeo/neopcb.cpp | 2 +- src/mame/netronic/elf.cpp | 2 +- src/mame/next/next.cpp | 2 +- src/mame/next/next.h | 4 +- src/mame/nichibut/armedf.cpp | 2 +- src/mame/nichibut/armedf.h | 2 +- src/mame/nichibut/armedf_v.cpp | 2 +- src/mame/nichibut/cclimber.cpp | 4 +- src/mame/nichibut/cclimber.h | 10 +- src/mame/nichibut/cclimber_a.cpp | 123 - src/mame/nichibut/cclimber_a.h | 61 - src/mame/nichibut/cclimber_m.cpp | 2 +- src/mame/nichibut/cclimber_v.cpp | 2 +- src/mame/nichibut/clshroad.cpp | 4 +- src/mame/nichibut/clshroad_v.cpp | 2 +- src/mame/nichibut/cop01.cpp | 2 +- src/mame/nichibut/cop01.h | 2 +- src/mame/nichibut/cop01_v.cpp | 2 +- src/mame/nichibut/csplayh5.cpp | 2 +- src/mame/nichibut/galivan.cpp | 2 +- src/mame/nichibut/galivan.h | 4 +- src/mame/nichibut/galivan_v.cpp | 2 +- src/mame/nichibut/gomoku.cpp | 4 +- src/mame/nichibut/gomoku_a.cpp | 2 +- src/mame/nichibut/gomoku_v.cpp | 2 +- src/mame/nichibut/hyhoo.cpp | 2 +- src/mame/nichibut/hyhoo.h | 2 +- src/mame/nichibut/hyhoo_v.cpp | 2 +- src/mame/nichibut/jangou.cpp | 8 +- src/mame/nichibut/magmax.cpp | 2 +- src/mame/nichibut/magmax_v.cpp | 2 +- src/mame/nichibut/nb1412m2.cpp | 2 +- src/mame/nichibut/nb1413m3.cpp | 2 +- src/mame/nichibut/nb1414m4.cpp | 2 +- src/mame/nichibut/nbmj8688.cpp | 2 +- src/mame/nichibut/nbmj8688.h | 2 +- src/mame/nichibut/nbmj8688_v.cpp | 2 +- src/mame/nichibut/nbmj8891.cpp | 2 +- src/mame/nichibut/nbmj8891.h | 2 +- src/mame/nichibut/nbmj8891_v.cpp | 2 +- src/mame/nichibut/nbmj8900.cpp | 2 +- src/mame/nichibut/nbmj8900.h | 2 +- src/mame/nichibut/nbmj8900_v.cpp | 2 +- src/mame/nichibut/nbmj8991.cpp | 2 +- src/mame/nichibut/nbmj8991.h | 2 +- src/mame/nichibut/nbmj8991_v.cpp | 2 +- src/mame/nichibut/nbmj9195.cpp | 2 +- src/mame/nichibut/nbmj9195.h | 2 +- src/mame/nichibut/nbmj9195_v.cpp | 2 +- src/mame/nichibut/niyanpai.cpp | 2 +- src/mame/nichibut/niyanpai.h | 4 +- src/mame/nichibut/niyanpai_v.cpp | 2 +- src/mame/nichibut/pastelg.cpp | 2 +- src/mame/nichibut/pastelg.h | 2 +- src/mame/nichibut/pastelg_v.cpp | 2 +- src/mame/nichibut/seicross.cpp | 2 +- src/mame/nichibut/seicross_v.cpp | 2 +- src/mame/nichibut/terracre.cpp | 2 +- src/mame/nichibut/terracre.h | 2 +- src/mame/nichibut/terracre_v.cpp | 2 +- src/mame/nichibut/tubep.cpp | 2 +- src/mame/nichibut/tubep_v.cpp | 2 +- src/mame/nichibut/wiping.cpp | 4 +- src/mame/nichibut/wiping_a.cpp | 2 +- src/mame/nichibut/wiping_v.cpp | 2 +- src/mame/nintendo/aleck64.cpp | 6 +- src/mame/nintendo/dkong.cpp | 2 +- src/mame/nintendo/dkong_a.cpp | 2 +- src/mame/nintendo/dkong_v.cpp | 2 +- src/mame/nintendo/gb.cpp | 2 +- src/mame/nintendo/gb_m.cpp | 2 +- src/mame/nintendo/gba.cpp | 2 +- src/mame/nintendo/mario.cpp | 2 +- src/mame/nintendo/mario_a.cpp | 4 +- src/mame/nintendo/mario_v.cpp | 2 +- src/mame/nintendo/n64.cpp | 2 +- src/mame/nintendo/n64.h | 9 +- src/mame/nintendo/n64_m.cpp | 11 +- src/mame/nintendo/n64_v.cpp | 8 +- src/mame/nintendo/n64_v.h | 6 +- src/mame/nintendo/n64types.h | 11 +- src/mame/nintendo/n8080.cpp | 2 +- src/mame/nintendo/n8080_a.cpp | 2 +- src/mame/nintendo/n8080_v.cpp | 2 +- src/mame/nintendo/nds.cpp | 2 +- src/mame/nintendo/nes.cpp | 2 +- src/mame/nintendo/nes_m.cpp | 2 +- src/mame/nintendo/nes_v.cpp | 2 +- src/mame/nintendo/nes_vt02_vt03.cpp | 2 +- src/mame/nintendo/nes_vt09.cpp | 2 +- src/mame/nintendo/nes_vt09_soc.h | 4 +- src/mame/nintendo/nes_vt32.cpp | 4 +- src/mame/nintendo/nes_vt32_soc.h | 4 +- src/mame/nintendo/nes_vt369_vtunknown.cpp | 4 +- src/mame/nintendo/nes_vt369_vtunknown_soc.h | 6 +- src/mame/nintendo/nes_vt_soc.h | 4 +- src/mame/nintendo/nss.cpp | 2 +- src/mame/nintendo/playch10.cpp | 2 +- src/mame/nintendo/playch10_m.cpp | 2 +- src/mame/nintendo/playch10_v.cpp | 2 +- src/mame/nintendo/popeye.cpp | 4 +- src/mame/nintendo/popeye_v.cpp | 2 +- src/mame/nintendo/punchout.cpp | 2 +- src/mame/nintendo/punchout_v.cpp | 2 +- src/mame/nintendo/rdpblend.cpp | 4 +- src/mame/nintendo/rdpblend.h | 2 +- src/mame/nintendo/rdptpipe.cpp | 6 +- src/mame/nintendo/rdptpipe.h | 2 +- src/mame/nintendo/sfcbox.cpp | 2 +- src/mame/nintendo/snes.cpp | 4 +- src/mame/nintendo/snes_m.cpp | 2 +- src/mame/nintendo/snesb.cpp | 2 +- src/mame/nintendo/snesb51.cpp | 2 +- src/mame/nintendo/snescx4.cpp | 10 +- src/mame/nintendo/spacefb.cpp | 2 +- src/mame/nintendo/spacefb_a.cpp | 2 +- src/mame/nintendo/spacefb_v.cpp | 2 +- src/mame/nintendo/vboy.cpp | 3 +- src/mame/nintendo/vsnes.cpp | 2 +- src/mame/nintendo/vsnes_m.cpp | 2 +- src/mame/nintendo/vt1682.cpp | 12 +- src/mame/nintendo/vt1682_alu.cpp | 2 +- src/mame/nintendo/vt1682_io.cpp | 2 +- src/mame/nintendo/vt1682_timer.cpp | 2 +- src/mame/nintendo/vt1682_uio.cpp | 2 +- src/mame/nix/fitfight.cpp | 2 +- src/mame/nix/fitfight_v.cpp | 2 +- src/mame/nix/pirates.cpp | 2 +- src/mame/nix/pirates_v.cpp | 2 +- src/mame/nl.lst | 86 +- src/mame/nmk/nmk16.cpp | 9 +- src/mame/nmk/nmk16.h | 10 +- src/mame/nmk/nmk16_v.cpp | 2 +- src/mame/nmk/powerins.cpp | 6 +- src/mame/nmk/powerins.h | 4 +- src/mame/nmk/powerins_v.cpp | 2 +- src/mame/nmk/quizdna.cpp | 2 +- src/mame/nmk/quizdna_v.cpp | 2 +- src/mame/nmk/quizpani.cpp | 2 +- src/mame/nmk/quizpani.h | 9 +- src/mame/nmk/quizpani_v.cpp | 2 +- src/mame/nokia/mikromik.cpp | 2 +- src/mame/nokia/mikromik.h | 2 +- src/mame/nokia/mikromik_v.cpp | 2 +- src/mame/olivetti/m20.cpp | 4 +- src/mame/olivetti/m20_kbd.cpp | 2 +- src/mame/olivetti/m24.cpp | 4 +- src/mame/olympia/dday.cpp | 2 +- src/mame/olympia/dday_v.cpp | 2 +- src/mame/olympia/portrait.cpp | 2 +- src/mame/olympia/portrait_v.cpp | 2 +- src/mame/omnibyte/ob68k1a.cpp | 2 +- src/mame/omori/battlex.cpp | 2 +- src/mame/omori/battlex_v.cpp | 2 +- src/mame/orca/espial.cpp | 2 +- src/mame/orca/espial_v.cpp | 2 +- src/mame/orca/funkybee.cpp | 2 +- src/mame/orca/funkybee_v.cpp | 2 +- src/mame/orca/marineb.cpp | 2 +- src/mame/orca/marineb_v.cpp | 2 +- src/mame/orca/orca40c.cpp | 2 +- src/mame/orca/vastar.cpp | 4 +- src/mame/orca/vastar_v.cpp | 2 +- src/mame/orca/zodiack.cpp | 4 +- src/mame/osborne/osborne1.cpp | 2 +- src/mame/osborne/osborne1_m.cpp | 2 +- src/mame/osi/osi.cpp | 2 +- src/mame/osi/osi_v.cpp | 2 +- src/mame/pacific/mrflea.cpp | 2 +- src/mame/pacific/mrflea_v.cpp | 2 +- src/mame/pacific/thief.cpp | 2 +- src/mame/pacific/thief_v.cpp | 2 +- src/mame/pacman/jrpacman.cpp | 2 +- src/mame/pacman/jumpshot.cpp | 2 +- src/mame/pacman/pacman.cpp | 6 +- src/mame/pacman/pacman_m.cpp | 2 +- src/mame/pacman/pacman_v.cpp | 2 +- src/mame/pacman/pacplus.cpp | 2 +- src/mame/pacman/pengo.cpp | 6 +- src/mame/pc/europc.cpp | 2 +- src/mame/pc/ibmpcjr.cpp | 2 +- src/mame/pc/nforcepc.cpp | 18 +- src/mame/pc/nforcepc.h | 26 +- src/mame/pc/tandy1t.cpp | 2 +- src/mame/pc/tosh1000.cpp | 2 +- src/mame/pce/ggconnie.cpp | 2 +- src/mame/pce/paranoia.cpp | 2 +- src/mame/pce/pcecommn.cpp | 2 +- src/mame/pce/tourvis.cpp | 2 +- src/mame/pce/uapce.cpp | 2 +- src/mame/pdp1/pdp1.cpp | 4 +- src/mame/pdp1/pdp1.h | 10 +- src/mame/pdp1/pdp1_v.cpp | 2 +- src/mame/philips/p2000t.cpp | 2 +- src/mame/philips/p2000t.h | 2 +- src/mame/philips/p2000t_m.cpp | 2 +- src/mame/philips/p2000t_v.cpp | 2 +- src/mame/phoenix/naughtyb.cpp | 2 +- src/mame/phoenix/naughtyb.h | 2 +- src/mame/phoenix/naughtyb_v.cpp | 2 +- src/mame/phoenix/phoenix.cpp | 4 +- src/mame/phoenix/phoenix.h | 2 +- src/mame/phoenix/phoenix_a.cpp | 2 +- src/mame/phoenix/phoenix_v.cpp | 2 +- src/mame/phoenix/pleiads.cpp | 2 +- src/mame/pinball/allied.cpp | 2 +- src/mame/pinball/alvg.cpp | 2 +- src/mame/pinball/atari_4x4.cpp | 2 +- src/mame/pinball/atari_s1.cpp | 2 +- src/mame/pinball/atari_s2.cpp | 2 +- src/mame/pinball/barni.cpp | 2 +- src/mame/pinball/by17.cpp | 2 +- src/mame/pinball/by35.cpp | 6 +- src/mame/pinball/by6803.cpp | 2 +- src/mame/pinball/byvid.cpp | 7 +- src/mame/pinball/de_2.cpp | 4 +- src/mame/pinball/de_3.cpp | 15 +- src/mame/pinball/flicker.cpp | 2 +- src/mame/pinball/g627.cpp | 2 +- src/mame/pinball/gp_1.cpp | 2 +- src/mame/pinball/gp_2.cpp | 2 +- src/mame/pinball/gts1.cpp | 8 +- src/mame/pinball/gts3.cpp | 6 +- src/mame/pinball/gts3a.cpp | 7 +- src/mame/pinball/gts80.cpp | 7 +- src/mame/pinball/gts80a.cpp | 9 +- src/mame/pinball/gts80b.cpp | 7 +- src/mame/pinball/hankin.cpp | 2 +- src/mame/pinball/idsa.cpp | 2 +- src/mame/pinball/inder.cpp | 2 +- src/mame/pinball/inderp.cpp | 2 +- src/mame/pinball/jeutel.cpp | 2 +- src/mame/pinball/jp.cpp | 2 +- src/mame/pinball/jvh.cpp | 2 +- src/mame/pinball/lancelot.cpp | 2 +- src/mame/pinball/lckydraw.cpp | 2 +- src/mame/pinball/ltd.cpp | 2 +- src/mame/pinball/macp.cpp | 2 +- src/mame/pinball/mephistp.cpp | 2 +- src/mame/pinball/micropin.cpp | 2 +- src/mame/pinball/mrgame.cpp | 2 +- src/mame/pinball/nsm.cpp | 2 +- src/mame/pinball/peyper.cpp | 2 +- src/mame/pinball/play_1.cpp | 2 +- src/mame/pinball/play_2.cpp | 2 +- src/mame/pinball/play_3.cpp | 5 +- src/mame/pinball/recel.cpp | 2 +- src/mame/pinball/rowamet.cpp | 2 +- src/mame/pinball/s11.cpp | 2 +- src/mame/pinball/s11.h | 6 +- src/mame/pinball/s11a.cpp | 2 +- src/mame/pinball/s11b.cpp | 2 +- src/mame/pinball/s11c.cpp | 2 +- src/mame/pinball/s3.cpp | 6 +- src/mame/pinball/s4.cpp | 5 +- src/mame/pinball/s6.cpp | 5 +- src/mame/pinball/s7.cpp | 5 +- src/mame/pinball/s8.cpp | 5 +- src/mame/pinball/s9.cpp | 6 +- src/mame/pinball/sleic.cpp | 2 +- src/mame/pinball/spectra.cpp | 2 +- src/mame/pinball/spinb.cpp | 2 +- src/mame/pinball/spirit76.cpp | 2 +- src/mame/pinball/st_mp100.cpp | 2 +- src/mame/pinball/st_mp200.cpp | 2 +- src/mame/pinball/stargame.cpp | 2 +- src/mame/pinball/taito.cpp | 2 +- src/mame/pinball/techno.cpp | 2 +- src/mame/pinball/vd.cpp | 2 +- src/mame/pinball/whitestar.cpp | 9 +- src/mame/pinball/wico.cpp | 2 +- src/mame/pinball/wms_shuffle.cpp | 7 +- src/mame/pinball/wpc_95.cpp | 15 +- src/mame/pinball/wpc_an.cpp | 6 +- src/mame/pinball/wpc_dcs.cpp | 12 +- src/mame/pinball/wpc_dot.cpp | 2 +- src/mame/pinball/wpc_dot.h | 13 +- src/mame/pinball/wpc_flip1.cpp | 2 +- src/mame/pinball/wpc_flip2.cpp | 2 +- src/mame/pinball/wpc_s.cpp | 15 +- src/mame/pinball/zac_1.cpp | 2 +- src/mame/pinball/zac_2.cpp | 2 +- src/mame/pinball/zac_proto.cpp | 2 +- src/mame/pinball/zpinball.cpp | 5 +- src/mame/playmark/playmark.cpp | 2 +- src/mame/playmark/playmark_v.cpp | 2 +- src/mame/playmark/powerbal.cpp | 2 +- src/mame/playmark/sslam.cpp | 2 +- src/mame/playmark/sslam_v.cpp | 2 +- src/mame/poly/poly.cpp | 2 +- src/mame/poly/poly_m.cpp | 2 +- src/mame/poly88/poly88.cpp | 2 +- src/mame/poly88/poly88_m.cpp | 2 +- src/mame/psikyo/psikyo.cpp | 2 +- src/mame/psikyo/psikyo4.cpp | 2 +- src/mame/psikyo/psikyo4_v.cpp | 2 +- src/mame/psikyo/psikyo_v.cpp | 2 +- src/mame/psikyo/psikyosh.cpp | 2 +- src/mame/psikyo/psikyosh_v.cpp | 2 +- src/mame/psion/psion.cpp | 2 +- src/mame/psion/psion.h | 2 +- src/mame/psion/psion5.cpp | 2 +- src/mame/psion/psion5.h | 2 +- src/mame/radio/apogee.cpp | 2 +- src/mame/radio/mikrosha.cpp | 2 +- src/mame/radio/orion.cpp | 2 +- src/mame/radio/orion.h | 8 +- src/mame/radio/orion_m.cpp | 2 +- src/mame/radio/orion_v.cpp | 2 +- src/mame/radio/partner.cpp | 2 +- src/mame/radio/partner.h | 2 +- src/mame/radio/partner_m.cpp | 2 +- src/mame/radio/radio86.cpp | 2 +- src/mame/radio/radio86_m.cpp | 2 +- src/mame/ramtek/hitme.cpp | 2 +- src/mame/ramtek/hitme_a.cpp | 2 +- src/mame/ramtek/starcrus.cpp | 2 +- src/mame/ramtek/starcrus.h | 2 +- src/mame/ramtek/starcrus_v.cpp | 2 +- src/mame/rare/btoads.cpp | 2 +- src/mame/rare/btoads_v.cpp | 2 +- src/mame/rare/kinst.cpp | 2 +- src/mame/rca/vip.cpp | 2 +- src/mame/regnecentralen/rc759.cpp | 2 +- src/mame/rm/rm380z.cpp | 2 +- src/mame/rm/rm380z_m.cpp | 2 +- src/mame/rm/rm380z_v.cpp | 2 +- src/mame/rm/rmnimbus.cpp | 4 +- src/mame/rm/rmnimbus_m.cpp | 2 +- src/mame/rm/rmnimbus_v.cpp | 2 +- src/mame/rm/rmnkbd.cpp | 2 +- src/mame/robotron/a7150.cpp | 3 +- src/mame/rockwell/aim65.cpp | 2 +- src/mame/rockwell/aim65_m.cpp | 2 +- src/mame/roland/alphajuno.cpp | 4 +- src/mame/roland/juno106.cpp | 2 +- src/mame/roland/roland_d10.cpp | 2 +- src/mame/roland/roland_d50.cpp | 2 +- src/mame/roland/roland_jx3p.cpp | 2 +- src/mame/roland/roland_jx8p.cpp | 4 +- src/mame/roland/roland_pr100.cpp | 2 +- src/mame/roland/roland_s10.cpp | 10 +- src/mame/roland/roland_s50.cpp | 6 +- src/mame/roland/roland_tr505.cpp | 2 +- src/mame/roland/roland_tr707.cpp | 2 +- src/mame/rtpc/rtpc.cpp | 4 +- src/mame/sage/sage2.cpp | 2 +- src/mame/saitek/saitek_corona.cpp | 2 +- src/mame/saitek/saitek_stratos.cpp | 2 +- src/mame/sanritsu/appoooh.cpp | 2 +- src/mame/sanritsu/bankp.cpp | 2 +- src/mame/sanritsu/bankp_v.cpp | 2 +- src/mame/sanritsu/chinsan.cpp | 11 +- src/mame/sanritsu/drmicro.cpp | 2 +- src/mame/sanritsu/drmicro_v.cpp | 2 +- src/mame/sanritsu/mermaid.cpp | 2 +- src/mame/sanritsu/mermaid_v.cpp | 2 +- src/mame/sanritsu/mjkjidai.cpp | 2 +- src/mame/sanritsu/mjkjidai_v.cpp | 2 +- src/mame/sanyo/mbc55x.cpp | 4 +- src/mame/sanyo/mbc55x_kbd.cpp | 2 +- src/mame/sanyo/mbc55x_v.cpp | 2 +- src/mame/sanyo/phc25.cpp | 2 +- src/mame/sega/315-5838_317-0229_comp.cpp | 2 +- src/mame/sega/315-5881_crypt.cpp | 2 +- src/mame/sega/315-6154.cpp | 2 +- src/mame/sega/315_5195.h | 4 +- src/mame/sega/315_5296.cpp | 2 +- src/mame/sega/angelkds.cpp | 2 +- src/mame/sega/bingoc.cpp | 4 +- src/mame/sega/bingoct.cpp | 2 +- src/mame/sega/calorie.cpp | 2 +- src/mame/sega/carnival.cpp | 257 - src/mame/sega/chihiro.cpp | 10 +- src/mame/sega/coolridr.cpp | 2 +- src/mame/sega/dc_atomiswave.cpp | 2 +- src/mame/sega/dc_atomiswave.h | 4 +- src/mame/sega/deniam.cpp | 2 +- src/mame/sega/deniam_v.cpp | 2 +- src/mame/sega/depthch.cpp | 93 - src/mame/sega/dsbz80.cpp | 2 +- src/mame/sega/fd1089.cpp | 2 +- src/mame/sega/flashbeats.cpp | 4 +- src/mame/sega/fwheel.cpp | 2 +- src/mame/sega/hshavoc.cpp | 4 +- src/mame/sega/invinco.cpp | 104 - src/mame/sega/kopunch.cpp | 2 +- src/mame/sega/kopunch_v.cpp | 2 +- src/mame/sega/lindbergh.cpp | 2 +- src/mame/sega/m1comm.cpp | 2 +- src/mame/sega/m2comm.cpp | 2 +- src/mame/sega/m3comm.cpp | 2 +- src/mame/sega/megadriv.h | 249 - src/mame/sega/megadriv_acbl.cpp | 4 +- src/mame/sega/megadriv_m.cpp | 1115 ---- src/mame/sega/megaplay.cpp | 2 +- src/mame/sega/megatech.cpp | 8 +- src/mame/sega/model1.cpp | 6 +- src/mame/sega/model1.h | 9 +- src/mame/sega/model1_m.cpp | 2 +- src/mame/sega/model1_v.cpp | 2 +- src/mame/sega/model1io.cpp | 2 +- src/mame/sega/model1io2.cpp | 2 +- src/mame/sega/model2.cpp | 12 +- src/mame/sega/model2.h | 37 +- src/mame/sega/model2_m.cpp | 2 +- src/mame/sega/model2_v.cpp | 2 +- src/mame/sega/model3.cpp | 6 +- src/mame/sega/model3.h | 8 +- src/mame/sega/model3_m.cpp | 2 +- src/mame/sega/model3_v.cpp | 2 +- src/mame/sega/naomi.cpp | 4 +- src/mame/sega/naomi.h | 24 +- src/mame/sega/naomibd.h | 2 +- src/mame/sega/naomigd.h | 6 +- src/mame/sega/puckpkmn.cpp | 4 +- src/mame/sega/pulsar_a.cpp | 181 - src/mame/sega/s32comm.cpp | 2 +- src/mame/sega/saturn.cpp | 4 +- src/mame/sega/saturn.h | 4 +- src/mame/sega/saturn_cdb.cpp | 2 +- src/mame/sega/saturn_m.cpp | 2 +- src/mame/sega/saturn_v.cpp | 2 +- src/mame/sega/segabill.h | 2 +- src/mame/sega/segac2.cpp | 4 +- src/mame/sega/segacoin.cpp | 2 +- src/mame/sega/segae.cpp | 6 +- src/mame/sega/segag80.cpp | 10 +- src/mame/sega/segag80_m.cpp | 2 +- src/mame/sega/segag80r.cpp | 7 +- src/mame/sega/segag80r.h | 10 +- src/mame/sega/segag80r_a.cpp | 4 +- src/mame/sega/segag80r_v.cpp | 2 +- src/mame/sega/segag80v.cpp | 6 +- src/mame/sega/segag80v.h | 8 +- src/mame/sega/segag80v_v.cpp | 2 +- src/mame/sega/segahang.cpp | 8 +- src/mame/sega/segahang.h | 6 +- src/mame/sega/segahang_v.cpp | 2 +- src/mame/sega/segaic16_m.cpp | 2 +- src/mame/sega/segajw.cpp | 2 +- src/mame/sega/segaorun.cpp | 6 +- src/mame/sega/segaorun.h | 8 +- src/mame/sega/segaorun_v.cpp | 2 +- src/mame/sega/segas16a.cpp | 10 +- src/mame/sega/segas16a.h | 4 +- src/mame/sega/segas16a_v.cpp | 2 +- src/mame/sega/segas16b.cpp | 8 +- src/mame/sega/segas16b.h | 8 +- src/mame/sega/segas16b_isgsm.cpp | 4 +- src/mame/sega/segas16b_v.cpp | 2 +- src/mame/sega/segas18.cpp | 4 +- src/mame/sega/segas18.h | 8 +- src/mame/sega/segas18_astormbl.cpp | 4 +- src/mame/sega/segas18_v.cpp | 2 +- src/mame/sega/segas24.cpp | 10 +- src/mame/sega/segas24.h | 2 +- src/mame/sega/segas24_v.cpp | 2 +- src/mame/sega/segas32.cpp | 4 +- src/mame/sega/segas32.h | 2 +- src/mame/sega/segas32_m.cpp | 2 +- src/mame/sega/segas32_v.cpp | 2 +- src/mame/sega/segashiobd.cpp | 2 +- src/mame/sega/segasm1.cpp | 4 +- src/mame/sega/segasp.cpp | 4 +- src/mame/sega/segaspeech.cpp | 2 +- src/mame/sega/segaufo.cpp | 4 +- src/mame/sega/segaxbd.cpp | 6 +- src/mame/sega/segaxbd.h | 8 +- src/mame/sega/segaxbd_v.cpp | 2 +- src/mame/sega/segaybd.cpp | 8 +- src/mame/sega/segaybd.h | 4 +- src/mame/sega/segaybd_v.cpp | 2 +- src/mame/sega/sg1000a.cpp | 5 +- src/mame/sega/shtzone.cpp | 2 +- src/mame/sega/sms.cpp | 2 +- src/mame/sega/sms_bootleg.cpp | 2 +- src/mame/sega/sms_m.cpp | 2 +- src/mame/sega/speedbsk.cpp | 2 +- src/mame/sega/stactics.cpp | 2 +- src/mame/sega/stactics_v.cpp | 2 +- src/mame/sega/stv.cpp | 3 +- src/mame/sega/stv.h | 15 +- src/mame/sega/suprloco.cpp | 7 +- src/mame/sega/suprloco_v.cpp | 2 +- src/mame/sega/system1.cpp | 8 +- src/mame/sega/system1.h | 2 +- src/mame/sega/system16.cpp | 4 +- src/mame/sega/system16.h | 4 +- src/mame/sega/system16_v.cpp | 4 +- src/mame/sega/system1_v.cpp | 2 +- src/mame/sega/triforce.cpp | 2 +- src/mame/sega/turbo.cpp | 6 +- src/mame/sega/turbo_a.cpp | 2 +- src/mame/sega/turbo_v.cpp | 2 +- src/mame/sega/vicdual-97269pb.cpp | 2 +- src/mame/sega/vicdual-97271p.cpp | 2 +- src/mame/sega/vicdual.cpp | 635 ++- src/mame/sega/vicdual.h | 6 +- src/mame/sega/vicdual_a.cpp | 6 +- src/mame/sega/vicdual_v.cpp | 2 +- src/mame/sega/zaxxon.cpp | 7 +- src/mame/sega/zaxxon_a.cpp | 2 +- src/mame/sega/zaxxon_v.cpp | 2 +- src/mame/segacons/dccons.cpp | 7 +- src/mame/segacons/dccons.h | 8 +- src/mame/segacons/dccons_m.cpp | 4 +- src/mame/segacons/mdconsole.cpp | 1205 +++++ src/mame/segacons/mdconsole.h | 109 + src/mame/segacons/megacd.cpp | 2 +- src/mame/segacons/megacd.h | 2 +- src/mame/segacons/megadriv.cpp | 1197 ----- src/mame/segacons/megadriv_rad.cpp | 4 +- src/mame/segacons/megadriv_sunplus_hybrid.cpp | 2 +- src/mame/segacons/megadriv_vt_hybrid.cpp | 6 +- src/mame/segacons/segapico.cpp | 15 +- src/mame/segacons/sg1000.cpp | 2 +- src/mame/seibu/airraid.cpp | 6 +- src/mame/seibu/banprestoms.cpp | 2 +- src/mame/seibu/bloodbro.cpp | 4 +- src/mame/seibu/bloodbro.h | 10 +- src/mame/seibu/bloodbro_v.cpp | 2 +- src/mame/seibu/cabal.cpp | 2 +- src/mame/seibu/cabal.h | 10 +- src/mame/seibu/cabal_v.cpp | 2 +- src/mame/seibu/darkmist.cpp | 2 +- src/mame/seibu/darkmist.h | 2 +- src/mame/seibu/darkmist_v.cpp | 2 +- src/mame/seibu/dcon.cpp | 4 +- src/mame/seibu/dcon.h | 9 +- src/mame/seibu/dcon_v.cpp | 2 +- src/mame/seibu/deadang.cpp | 2 +- src/mame/seibu/deadang.h | 10 +- src/mame/seibu/deadang_v.cpp | 2 +- src/mame/seibu/dynduke.cpp | 2 +- src/mame/seibu/dynduke.h | 11 +- src/mame/seibu/dynduke_v.cpp | 2 +- src/mame/seibu/feversoc.cpp | 2 +- src/mame/seibu/goodejan.cpp | 11 +- src/mame/seibu/kncljoe.cpp | 2 +- src/mame/seibu/kncljoe_v.cpp | 2 +- src/mame/seibu/legionna.cpp | 2 +- src/mame/seibu/legionna.h | 15 +- src/mame/seibu/legionna_v.cpp | 2 +- src/mame/seibu/metlfrzr.cpp | 2 +- src/mame/seibu/mustache.cpp | 4 +- src/mame/seibu/mustache.h | 11 +- src/mame/seibu/mustache_v.cpp | 2 +- src/mame/seibu/panicr.cpp | 2 +- src/mame/seibu/r2crypt.cpp | 4 +- src/mame/seibu/r2crypt.h | 2 +- src/mame/seibu/r2dx_v33.cpp | 4 +- src/mame/seibu/raiden.cpp | 4 +- src/mame/seibu/raiden.h | 10 +- src/mame/seibu/raiden2.cpp | 4 +- src/mame/seibu/raiden2.h | 15 +- src/mame/seibu/raiden2_v.cpp | 2 +- src/mame/seibu/raiden_v.cpp | 2 +- src/mame/seibu/seibu_crtc.cpp | 2 +- src/mame/seibu/seibucats.cpp | 4 +- src/mame/seibu/seibuspi.cpp | 6 +- src/mame/seibu/seibuspi_m.cpp | 2 +- src/mame/seibu/seibuspi_v.cpp | 4 +- src/mame/seibu/seicupbl.cpp | 2 +- src/mame/seibu/sengokmj.cpp | 9 +- src/mame/seibu/stfight.cpp | 2 +- src/mame/seibu/stfight.h | 4 +- src/mame/seibu/stfight_m.cpp | 2 +- src/mame/seibu/toki.cpp | 2 +- src/mame/seibu/toki.h | 11 +- src/mame/seibu/toki_v.cpp | 2 +- src/mame/seibu/wiz.cpp | 2 +- src/mame/seibu/wiz_v.cpp | 2 +- src/mame/seta/albazc.cpp | 5 +- src/mame/seta/jclub2.cpp | 4 +- src/mame/seta/macs.cpp | 2 +- src/mame/seta/seta.cpp | 2 +- src/mame/seta/seta.h | 4 +- src/mame/seta/seta2.cpp | 2 +- src/mame/seta/seta2_v.cpp | 2 +- src/mame/seta/seta_v.cpp | 2 +- src/mame/seta/simple_st0016.cpp | 2 +- src/mame/seta/speedatk.cpp | 2 +- src/mame/seta/speedatk_v.cpp | 2 +- src/mame/seta/speglsht.cpp | 2 +- src/mame/seta/srmp2.cpp | 2 +- src/mame/seta/srmp2.h | 2 +- src/mame/seta/srmp2_v.cpp | 2 +- src/mame/seta/srmp5.cpp | 2 +- src/mame/seta/ssv.cpp | 2 +- src/mame/seta/ssv.h | 2 +- src/mame/seta/ssv_v.cpp | 2 +- src/mame/seta/thedealr.cpp | 2 +- src/mame/sgi/4dpi.cpp | 2 +- src/mame/sgi/crime.cpp | 2 +- src/mame/sgi/hal2.cpp | 2 +- src/mame/sgi/hpc1.cpp | 2 +- src/mame/sgi/hpc3.cpp | 2 +- src/mame/sgi/hpc3.h | 2 +- src/mame/sgi/indigo.cpp | 6 +- src/mame/sgi/indy_indigo2.cpp | 8 +- src/mame/sgi/ioc2.cpp | 2 +- src/mame/sgi/light.cpp | 2 +- src/mame/sgi/mace.cpp | 2 +- src/mame/sgi/o2.cpp | 4 +- src/mame/sgi/sgi_gr1.h | 6 +- src/mame/sgi/sgi_re2.h | 2 +- src/mame/shared/apple2common.cpp | 893 ++++ src/mame/shared/apple2common.h | 54 + src/mame/shared/apple2video.cpp | 1645 ++++++ src/mame/shared/apple2video.h | 86 + src/mame/shared/bally.cpp | 890 ---- src/mame/shared/bally.h | 342 -- src/mame/shared/ballysound.cpp | 890 ++++ src/mame/shared/ballysound.h | 342 ++ src/mame/shared/cclimber_a.cpp | 123 + src/mame/shared/cclimber_a.h | 61 + src/mame/shared/dc.cpp | 11 +- src/mame/shared/dc.h | 13 +- src/mame/shared/decobsmt.cpp | 2 +- src/mame/shared/efo_zsu.cpp | 2 +- src/mame/shared/efo_zsu.h | 9 +- src/mame/shared/exidysound.cpp | 1046 ++++ src/mame/shared/exidysound.h | 233 + src/mame/shared/gottlieb_a.cpp | 2 +- src/mame/shared/inder_vid.cpp | 2 +- src/mame/shared/megadriv.cpp | 1108 ++++ src/mame/shared/megadriv.h | 151 + src/mame/shared/mie.h | 2 +- src/mame/shared/namco_c355spr.cpp | 802 +++ src/mame/shared/namco_c355spr.h | 166 + src/mame/shared/naomig1.cpp | 2 +- src/mame/shared/pcshare.cpp | 2 +- src/mame/shared/pk8000_v.cpp | 2 +- src/mame/shared/pk8000_v.h | 9 +- src/mame/shared/powervr2.cpp | 2 +- src/mame/shared/segam1audio.cpp | 2 +- src/mame/shared/seibu.cpp | 489 -- src/mame/shared/seibu.h | 196 - src/mame/shared/seibusound.cpp | 490 ++ src/mame/shared/seibusound.h | 196 + src/mame/shared/specialsound.cpp | 85 + src/mame/shared/specialsound.h | 38 + src/mame/shared/taito68705.cpp | 356 ++ src/mame/shared/taito68705.h | 143 + src/mame/shared/taito68705interface.cpp | 356 -- src/mame/shared/taito68705interface.h | 143 - src/mame/shared/timeplt_a.cpp | 2 +- src/mame/shared/williams_a.cpp | 1300 ----- src/mame/shared/williams_a.h | 317 -- src/mame/shared/williamssound.cpp | 1301 +++++ src/mame/shared/williamssound.h | 317 ++ src/mame/shared/xbox.cpp | 993 ++++ src/mame/shared/xbox.h | 176 + src/mame/shared/xbox_m.cpp | 991 ---- src/mame/shared/xbox_m.h | 175 - src/mame/shared/xbox_nv2a.cpp | 2 +- src/mame/shared/xbox_pci.cpp | 6 +- src/mame/shared/xbox_pci.h | 12 +- src/mame/shared/xbox_usb.cpp | 7 +- src/mame/sharp/mz2500.cpp | 2 +- src/mame/sharp/mz700.cpp | 2 +- src/mame/sharp/mz700_m.cpp | 2 +- src/mame/sharp/mz700_v.cpp | 2 +- src/mame/sharp/mz80.cpp | 2 +- src/mame/sharp/mz80_m.cpp | 2 +- src/mame/sharp/mz80_v.cpp | 2 +- src/mame/sharp/pc1251.cpp | 4 +- src/mame/sharp/pc1251_m.cpp | 4 +- src/mame/sharp/pc1350.cpp | 4 +- src/mame/sharp/pc1350_m.cpp | 4 +- src/mame/sharp/pc1401.cpp | 4 +- src/mame/sharp/pc1401_m.cpp | 4 +- src/mame/sharp/pc1403.cpp | 4 +- src/mame/sharp/pc1403_m.cpp | 4 +- src/mame/sharp/pce220.cpp | 2 +- src/mame/sharp/pocketc.cpp | 10 +- src/mame/sharp/pocketc_m.cpp | 2 +- src/mame/sharp/pocketc_v.cpp | 2 +- src/mame/sharp/x1.cpp | 2 +- src/mame/sharp/x1_m.cpp | 2 +- src/mame/sharp/x1_v.cpp | 2 +- src/mame/sharp/x1twin.cpp | 10 +- src/mame/sharp/x68k.cpp | 6 +- src/mame/sharp/x68k.h | 2 +- src/mame/sharp/x68k_crtc.cpp | 2 +- src/mame/sharp/x68k_kbd.cpp | 2 +- src/mame/sharp/x68k_v.cpp | 2 +- src/mame/siemens/pcd.cpp | 4 +- src/mame/siemens/pcd.h | 125 + src/mame/siemens/pcd_v.h | 125 - src/mame/sigma/spiders.cpp | 2 +- src/mame/sigma/spiders_a.cpp | 2 +- src/mame/sigma/sub.cpp | 2 +- src/mame/sigma/sub_v.cpp | 2 +- src/mame/sinclair/atm.cpp | 7 +- src/mame/sinclair/beta_m.cpp | 2 +- src/mame/sinclair/elwro800.cpp | 2 +- src/mame/sinclair/pentagon.cpp | 5 +- src/mame/sinclair/ql.cpp | 6 +- src/mame/sinclair/scorpion.cpp | 5 +- src/mame/sinclair/spec128.cpp | 2 +- src/mame/sinclair/spec_snqk.cpp | 10 +- src/mame/sinclair/specpls3.cpp | 2 +- src/mame/sinclair/spectrum.cpp | 4 +- src/mame/sinclair/spectrum.h | 2 +- src/mame/sinclair/spectrum_v.cpp | 4 +- src/mame/sinclair/timex.cpp | 5 +- src/mame/sinclair/timex_v.cpp | 2 +- src/mame/sinclair/tsconf.cpp | 2 +- src/mame/sinclair/tsconf.h | 3 +- src/mame/sinclair/tsconf_m.cpp | 2 +- src/mame/sinclair/zx.cpp | 2 +- src/mame/sinclair/zx_m.cpp | 2 +- src/mame/sinclair/zx_v.cpp | 2 +- src/mame/skeleton/ampex210.cpp | 2 +- src/mame/skeleton/aussiebyte.cpp | 2 +- src/mame/skeleton/aussiebyte_v.cpp | 2 +- src/mame/skeleton/basf7100.cpp | 2 +- src/mame/skeleton/busicom.cpp | 2 +- src/mame/skeleton/busicom_v.cpp | 2 +- src/mame/skeleton/cosmicos.cpp | 2 +- src/mame/skeleton/cxhumax.cpp | 2 +- src/mame/skeleton/digilog320.cpp | 2 +- src/mame/skeleton/digilog400.cpp | 2 +- src/mame/skeleton/dm7000.cpp | 2 +- src/mame/skeleton/dmv.cpp | 2 +- src/mame/skeleton/hazeltin.cpp | 2 +- src/mame/skeleton/itt1700.cpp | 2 +- src/mame/skeleton/itt1700_kbd.cpp | 2 +- src/mame/skeleton/micronic.cpp | 2 +- src/mame/skeleton/mod8.cpp | 8 +- src/mame/skeleton/ms0515.cpp | 7 +- src/mame/skeleton/ngen.cpp | 2 +- src/mame/skeleton/palestra.cpp | 2 +- src/mame/skeleton/softbox.cpp | 2 +- src/mame/skeleton/testpat.cpp | 4 +- src/mame/skeleton/vp415.cpp | 2 +- src/mame/skeleton/xor100.cpp | 2 +- src/mame/skeleton/zorba.cpp | 4 +- src/mame/snk/bbusters.cpp | 2 +- src/mame/snk/hng64.cpp | 55 +- src/mame/snk/hng64_a.cpp | 2 +- src/mame/snk/hng64_net.cpp | 58 - src/mame/snk/hng64_v.cpp | 6 +- src/mame/snk/lasso.cpp | 2 +- src/mame/snk/lasso_v.cpp | 2 +- src/mame/snk/mainsnk.cpp | 2 +- src/mame/snk/mainsnk_v.cpp | 2 +- src/mame/snk/mechatt.cpp | 2 +- src/mame/snk/munchmo.cpp | 2 +- src/mame/snk/munchmo_v.cpp | 2 +- src/mame/snk/neogeocd.cpp | 1124 ---- src/mame/snk/ngp.cpp | 2 +- src/mame/snk/prehisle.cpp | 2 +- src/mame/snk/prehisle_v.cpp | 2 +- src/mame/snk/snk.cpp | 2 +- src/mame/snk/snk6502.cpp | 4 +- src/mame/snk/snk6502_a.cpp | 2 +- src/mame/snk/snk6502_v.cpp | 4 +- src/mame/snk/snk68.cpp | 2 +- src/mame/snk/snk68.h | 10 +- src/mame/snk/snk68_v.cpp | 2 +- src/mame/snk/snk_v.cpp | 2 +- src/mame/sony/psx.cpp | 2 +- src/mame/sony/taitogn.cpp | 6 +- src/mame/sony/zn.cpp | 2 +- src/mame/sony/zn.h | 17 +- src/mame/sony_news/news_38xx.cpp | 4 +- src/mame/sony_news/news_68k.cpp | 4 +- src/mame/sony_news/news_r3k.cpp | 4 +- src/mame/special/special.cpp | 2 +- src/mame/special/special.h | 9 +- src/mame/special/special_m.cpp | 2 +- src/mame/special/special_v.cpp | 2 +- src/mame/stern/berzerk.cpp | 11 +- src/mame/stern/cliffhgr.cpp | 2 +- src/mame/stern/cliffhgr_a.cpp | 2 +- src/mame/subsino/subsino.cpp | 3 +- src/mame/subsino/subsino2.cpp | 3 +- src/mame/suna/suna16.cpp | 2 +- src/mame/suna/suna16_v.cpp | 2 +- src/mame/suna/suna8.cpp | 2 +- src/mame/suna/suna8_a.cpp | 2 +- src/mame/suna/suna8_v.cpp | 2 +- src/mame/sunelect/arabian.cpp | 2 +- src/mame/sunelect/arabian_v.cpp | 2 +- src/mame/sunelect/ikki.cpp | 2 +- src/mame/sunelect/ikki_v.cpp | 2 +- src/mame/sunelect/markham.cpp | 2 +- src/mame/sunelect/markham_v.cpp | 2 +- src/mame/sunelect/route16.cpp | 2 +- src/mame/sunelect/route16_v.cpp | 2 +- src/mame/sunelect/shangha3.cpp | 2 +- src/mame/sunelect/shangha3_v.cpp | 2 +- src/mame/sunelect/shanghai.cpp | 5 +- src/mame/svision/svision.cpp | 2 +- src/mame/svision/svision.h | 2 +- src/mame/swtpc/swtpc09.cpp | 2 +- src/mame/swtpc/swtpc09_m.cpp | 2 +- src/mame/tab/tabe22.cpp | 2 +- src/mame/taito/2mindril.cpp | 4 +- src/mame/taito/40love.cpp | 2 +- src/mame/taito/40love.h | 10 +- src/mame/taito/40love_v.cpp | 2 +- src/mame/taito/arkanoid.cpp | 2 +- src/mame/taito/arkanoid.h | 9 +- src/mame/taito/arkanoid_m.cpp | 2 +- src/mame/taito/arkanoid_v.cpp | 2 +- src/mame/taito/ashnojoe.cpp | 2 +- src/mame/taito/ashnojoe_v.cpp | 2 +- src/mame/taito/asuka.cpp | 14 +- src/mame/taito/bigevglf.cpp | 2 +- src/mame/taito/bigevglf.h | 15 +- src/mame/taito/bigevglf_v.cpp | 2 +- src/mame/taito/bingowav.cpp | 2 +- src/mame/taito/bking.cpp | 2 +- src/mame/taito/bking.h | 10 +- src/mame/taito/bking_v.cpp | 2 +- src/mame/taito/bublbobl.cpp | 5 +- src/mame/taito/bublbobl.h | 8 +- src/mame/taito/bublbobl_m.cpp | 2 +- src/mame/taito/bublbobl_v.cpp | 2 +- src/mame/taito/buggychl.cpp | 2 +- src/mame/taito/cchance.cpp | 2 +- src/mame/taito/chaknpop.cpp | 2 +- src/mame/taito/chaknpop.h | 9 +- src/mame/taito/chaknpop_v.cpp | 2 +- src/mame/taito/champbwl.cpp | 5 +- src/mame/taito/changela.cpp | 2 +- src/mame/taito/changela_v.cpp | 2 +- src/mame/taito/cpzodiac.cpp | 2 +- src/mame/taito/crbaloon.cpp | 2 +- src/mame/taito/crbaloon_a.cpp | 2 +- src/mame/taito/crbaloon_v.cpp | 2 +- src/mame/taito/cucaracha.cpp | 2 +- src/mame/taito/darius.cpp | 4 +- src/mame/taito/darius.h | 2 +- src/mame/taito/darius_v.cpp | 2 +- src/mame/taito/exzisus.cpp | 4 +- src/mame/taito/fgoal.cpp | 2 +- src/mame/taito/fgoal_v.cpp | 2 +- src/mame/taito/flstory.cpp | 2 +- src/mame/taito/flstory.h | 10 +- src/mame/taito/flstory_v.cpp | 2 +- src/mame/taito/galastrm.cpp | 6 +- src/mame/taito/galastrm.h | 6 +- src/mame/taito/galastrm_v.cpp | 2 +- src/mame/taito/gladiatr.cpp | 2 +- src/mame/taito/gladiatr_v.cpp | 2 +- src/mame/taito/grchamp.cpp | 2 +- src/mame/taito/grchamp_a.cpp | 2 +- src/mame/taito/grchamp_v.cpp | 2 +- src/mame/taito/groundfx.cpp | 6 +- src/mame/taito/groundfx.h | 4 +- src/mame/taito/groundfx_v.cpp | 2 +- src/mame/taito/gsword.cpp | 2 +- src/mame/taito/gsword_v.cpp | 2 +- src/mame/taito/gunbustr.cpp | 6 +- src/mame/taito/gunbustr.h | 2 +- src/mame/taito/gunbustr_v.cpp | 2 +- src/mame/taito/halleys.cpp | 2 +- src/mame/taito/heromem.cpp | 2 +- src/mame/taito/kikikai.cpp | 2 +- src/mame/taito/kikikai_m.cpp | 2 +- src/mame/taito/kikikai_v.cpp | 2 +- src/mame/taito/lkage.cpp | 2 +- src/mame/taito/lkage.h | 9 +- src/mame/taito/lkage_v.cpp | 2 +- src/mame/taito/lsasquad.cpp | 2 +- src/mame/taito/lsasquad.h | 9 +- src/mame/taito/lsasquad_m.cpp | 2 +- src/mame/taito/lsasquad_v.cpp | 2 +- src/mame/taito/missb2.cpp | 2 +- src/mame/taito/mlanding.cpp | 6 +- src/mame/taito/msisaac.cpp | 2 +- src/mame/taito/msisaac.h | 11 +- src/mame/taito/msisaac_v.cpp | 2 +- src/mame/taito/ninjaw.cpp | 4 +- src/mame/taito/ninjaw.h | 8 +- src/mame/taito/ninjaw_v.cpp | 2 +- src/mame/taito/nycaptor.cpp | 4 +- src/mame/taito/nycaptor.h | 11 +- src/mame/taito/nycaptor_v.cpp | 2 +- src/mame/taito/opwolf.cpp | 10 +- src/mame/taito/othunder.cpp | 6 +- src/mame/taito/othunder.h | 8 +- src/mame/taito/othunder_v.cpp | 2 +- src/mame/taito/pc080sn.cpp | 2 +- src/mame/taito/pitnrun.cpp | 2 +- src/mame/taito/pitnrun_m.cpp | 2 +- src/mame/taito/pitnrun_v.cpp | 2 +- src/mame/taito/qix.cpp | 2 +- src/mame/taito/qix_a.cpp | 2 +- src/mame/taito/qix_m.cpp | 2 +- src/mame/taito/qix_v.cpp | 2 +- src/mame/taito/rastan.cpp | 8 +- src/mame/taito/rbisland.cpp | 6 +- src/mame/taito/rbisland.h | 6 +- src/mame/taito/rbisland_v.cpp | 2 +- src/mame/taito/retofinv.cpp | 2 +- src/mame/taito/retofinv.h | 11 +- src/mame/taito/retofinv_v.cpp | 2 +- src/mame/taito/rollrace.cpp | 2 +- src/mame/taito/rollrace_v.cpp | 2 +- src/mame/taito/slapshot.cpp | 2 +- src/mame/taito/slapshot.h | 8 +- src/mame/taito/slapshot_v.cpp | 2 +- src/mame/taito/spdheat.cpp | 2 +- src/mame/taito/ssrj.cpp | 2 +- src/mame/taito/ssrj_v.cpp | 2 +- src/mame/taito/superchs.cpp | 6 +- src/mame/taito/superchs.h | 2 +- src/mame/taito/superchs_v.cpp | 2 +- src/mame/taito/superqix.cpp | 2 +- src/mame/taito/superqix_v.cpp | 2 +- src/mame/taito/taito_b.cpp | 6 +- src/mame/taito/taito_b.h | 4 +- src/mame/taito/taito_b_v.cpp | 2 +- src/mame/taito/taito_f2.cpp | 6 +- src/mame/taito/taito_f2.h | 14 +- src/mame/taito/taito_f2_v.cpp | 2 +- src/mame/taito/taito_f3.cpp | 2 +- src/mame/taito/taito_f3.h | 2 +- src/mame/taito/taito_f3_v.cpp | 2 +- src/mame/taito/taito_h.cpp | 6 +- src/mame/taito/taito_h.h | 4 +- src/mame/taito/taito_h_v.cpp | 2 +- src/mame/taito/taito_l.cpp | 13 +- src/mame/taito/taito_l_v.cpp | 2 +- src/mame/taito/taito_o.cpp | 2 +- src/mame/taito/taito_x.cpp | 41 +- src/mame/taito/taito_z.cpp | 4 +- src/mame/taito/taito_z.h | 12 +- src/mame/taito/taito_z_v.cpp | 2 +- src/mame/taito/taitoair.cpp | 6 +- src/mame/taito/taitoair.h | 6 +- src/mame/taito/taitoair_v.cpp | 2 +- src/mame/taito/taitocchip.cpp | 2 +- src/mame/taito/taitoio.cpp | 2 +- src/mame/taito/taitojc.cpp | 6 +- src/mame/taito/taitojc.h | 4 +- src/mame/taito/taitojc_v.cpp | 2 +- src/mame/taito/taitopjc.cpp | 2 +- src/mame/taito/taitosj.cpp | 2 +- src/mame/taito/taitosj.h | 2 +- src/mame/taito/taitosj_m.cpp | 2 +- src/mame/taito/taitosj_v.cpp | 2 +- src/mame/taito/taitowlf.cpp | 3 +- src/mame/taito/tc0080vco.cpp | 2 +- src/mame/taito/tc0150rod.cpp | 2 +- src/mame/taito/tc0480scp.cpp | 2 +- src/mame/taito/tnzs.cpp | 4 +- src/mame/taito/tnzs.h | 10 +- src/mame/taito/tnzs_m.cpp | 2 +- src/mame/taito/tnzs_v.cpp | 2 +- src/mame/taito/topspeed.cpp | 8 +- src/mame/taito/topspeed.h | 4 +- src/mame/taito/topspeed_v.cpp | 2 +- src/mame/taito/tsamurai.cpp | 2 +- src/mame/taito/tsamurai_v.cpp | 2 +- src/mame/taito/undrfire.cpp | 6 +- src/mame/taito/undrfire.h | 6 +- src/mame/taito/undrfire_v.cpp | 2 +- src/mame/taito/volfied.cpp | 6 +- src/mame/taito/volfied.h | 4 +- src/mame/taito/volfied_v.cpp | 2 +- src/mame/taito/warriorb.cpp | 4 +- src/mame/taito/warriorb.h | 8 +- src/mame/taito/warriorb_v.cpp | 2 +- src/mame/taito/wgp.cpp | 4 +- src/mame/taito/wgp.h | 6 +- src/mame/taito/wgp_v.cpp | 2 +- src/mame/taito/wyvernf0.cpp | 8 +- src/mame/tandberg/tdv2324.cpp | 2 +- src/mame/tangerin/microtan.cpp | 2 +- src/mame/tangerin/microtan_m.cpp | 2 +- src/mame/tangerin/microtan_v.cpp | 2 +- src/mame/tatsumi/lockon.cpp | 2 +- src/mame/tatsumi/lockon_v.cpp | 2 +- src/mame/tatsumi/tatsumi.cpp | 2 +- src/mame/tatsumi/tatsumi_m.cpp | 2 +- src/mame/tatsumi/tatsumi_v.cpp | 2 +- src/mame/tatsumi/tx1.cpp | 2 +- src/mame/tatsumi/tx1.h | 2 +- src/mame/tatsumi/tx1_a.cpp | 4 +- src/mame/tatsumi/tx1_m.cpp | 2 +- src/mame/tatsumi/tx1_v.cpp | 2 +- src/mame/tch/kickgoal.cpp | 2 +- src/mame/tch/kickgoal_v.cpp | 2 +- src/mame/tch/littlerb.cpp | 9 +- src/mame/tch/rltennis.cpp | 2 +- src/mame/tch/rltennis_v.cpp | 2 +- src/mame/tch/speedspn.cpp | 2 +- src/mame/tch/speedspn_v.cpp | 2 +- src/mame/tecfri/holeland.cpp | 2 +- src/mame/tecfri/holeland_v.cpp | 2 +- src/mame/tecfri/sauro.cpp | 2 +- src/mame/tecfri/sauro_v.cpp | 2 +- src/mame/tecfri/speedbal.cpp | 2 +- src/mame/tecfri/speedbal_v.cpp | 2 +- src/mame/technos/battlane.cpp | 2 +- src/mame/technos/battlane_v.cpp | 2 +- src/mame/technos/blockout.cpp | 2 +- src/mame/technos/blockout_v.cpp | 2 +- src/mame/technos/bogeyman.cpp | 2 +- src/mame/technos/bogeyman_v.cpp | 2 +- src/mame/technos/chinagat.cpp | 2 +- src/mame/technos/ddragon.cpp | 2 +- src/mame/technos/ddragon3.cpp | 2 +- src/mame/technos/ddragon3_v.cpp | 2 +- src/mame/technos/ddragon_v.cpp | 2 +- src/mame/technos/dogfgt.cpp | 2 +- src/mame/technos/dogfgt_v.cpp | 2 +- src/mame/technos/matmania.cpp | 2 +- src/mame/technos/matmania.h | 9 +- src/mame/technos/matmania_v.cpp | 2 +- src/mame/technos/mystston.cpp | 2 +- src/mame/technos/mystston_v.cpp | 2 +- src/mame/technos/renegade.cpp | 2 +- src/mame/technos/renegade.h | 9 +- src/mame/technos/renegade_v.cpp | 2 +- src/mame/technos/shadfrce.cpp | 2 +- src/mame/technos/shadfrce_v.cpp | 2 +- src/mame/technos/ssozumo.cpp | 2 +- src/mame/technos/ssozumo_v.cpp | 2 +- src/mame/technos/tagteam.cpp | 2 +- src/mame/technos/tagteam_v.cpp | 2 +- src/mame/technos/wwfsstar.cpp | 2 +- src/mame/technos/wwfsstar_v.cpp | 2 +- src/mame/technos/xain.cpp | 2 +- src/mame/technos/xain.h | 8 +- src/mame/technos/xain_v.cpp | 2 +- src/mame/tehkan/bombjack.cpp | 2 +- src/mame/tehkan/bombjack_v.cpp | 2 +- src/mame/tehkan/gaiden.cpp | 2 +- src/mame/tehkan/gaiden.h | 4 +- src/mame/tehkan/gaiden_v.cpp | 2 +- src/mame/tehkan/lvcards.cpp | 2 +- src/mame/tehkan/lvcards_v.cpp | 2 +- src/mame/tehkan/pbaction.cpp | 5 +- src/mame/tehkan/pbaction_v.cpp | 2 +- src/mame/tehkan/senjyo.cpp | 6 +- src/mame/tehkan/senjyo_a.cpp | 2 +- src/mame/tehkan/senjyo_v.cpp | 2 +- src/mame/tehkan/solomon.cpp | 2 +- src/mame/tehkan/solomon_v.cpp | 2 +- src/mame/tehkan/spbactn.cpp | 2 +- src/mame/tehkan/spbactn.h | 4 +- src/mame/tehkan/spbactn_v.cpp | 2 +- src/mame/tehkan/tbowl.cpp | 2 +- src/mame/tehkan/tecmo.cpp | 2 +- src/mame/tehkan/tecmo.h | 2 +- src/mame/tehkan/tecmo16.cpp | 2 +- src/mame/tehkan/tecmo16.h | 4 +- src/mame/tehkan/tecmo16_v.cpp | 2 +- src/mame/tehkan/tecmo_v.cpp | 2 +- src/mame/tehkan/tecmosys.cpp | 2 +- src/mame/tehkan/tecmosys_m.cpp | 2 +- src/mame/tehkan/tecmosys_v.cpp | 2 +- src/mame/tehkan/tehkanwc.cpp | 2 +- src/mame/tehkan/tehkanwc_v.cpp | 2 +- src/mame/tehkan/wc90.cpp | 2 +- src/mame/tektroni/tek405x.cpp | 2 +- src/mame/tektroni/tek410x.cpp | 2 +- src/mame/tektroni/tek440x.cpp | 2 +- src/mame/telenova/compis.cpp | 2 +- src/mame/telercas/tmc1800.cpp | 2 +- src/mame/telercas/tmc1800_v.cpp | 2 +- src/mame/telercas/tmc2000e.cpp | 2 +- src/mame/telercas/tmc600.cpp | 2 +- src/mame/telercas/tmc600_v.cpp | 2 +- src/mame/televideo/tv950.cpp | 2 +- src/mame/televideo/tv950kb.cpp | 2 +- src/mame/televideo/tv955.cpp | 2 +- src/mame/televideo/tv955kb.cpp | 2 +- src/mame/terminal/tiamc1.cpp | 4 +- src/mame/terminal/tiamc1_a.cpp | 2 +- src/mame/terminal/tiamc1_v.cpp | 2 +- src/mame/tesla/ondra.cpp | 2 +- src/mame/tesla/ondra_m.cpp | 2 +- src/mame/tesla/pmd85.cpp | 2 +- src/mame/tesla/pmd85_m.cpp | 2 +- src/mame/thepit/thepit.cpp | 2 +- src/mame/thepit/thepit_v.cpp | 2 +- src/mame/thepit/timelimt.cpp | 2 +- src/mame/thepit/timelimt_v.cpp | 2 +- src/mame/thomson/thomson.cpp | 2 +- src/mame/thomson/thomson_m.cpp | 2 +- src/mame/thomson/thomson_v.cpp | 2 +- src/mame/ti/avigo.cpp | 2 +- src/mame/ti/avigo_v.cpp | 2 +- src/mame/ti/ti85.cpp | 2 +- src/mame/ti/ti85_m.cpp | 2 +- src/mame/ti/ti85_v.cpp | 2 +- src/mame/ti/ti89.cpp | 2 +- src/mame/ti/ti990_10.cpp | 2 +- src/mame/ti/ti990_4.cpp | 4 +- src/mame/tiger/gamecom.cpp | 2 +- src/mame/tiger/gamecom_m.cpp | 2 +- src/mame/tiger/gamecom_v.cpp | 2 +- src/mame/tigertel/docg3.cpp | 2 +- src/mame/tigertel/gizmondo.cpp | 2 +- src/mame/tiki/tiki100.cpp | 2 +- src/mame/toaplan/kan_pand.cpp | 294 -- src/mame/toaplan/kan_pand.h | 67 - src/mame/toaplan/slapfght.cpp | 2 +- src/mame/toaplan/slapfght.h | 10 +- src/mame/toaplan/slapfght_m.cpp | 2 +- src/mame/toaplan/slapfght_v.cpp | 2 +- src/mame/toaplan/snowbros.cpp | 3147 ----------- src/mame/toaplan/snowbros.h | 125 - src/mame/toaplan/snowbros_v.cpp | 275 - src/mame/toaplan/toaplan1.cpp | 4 +- src/mame/toaplan/toaplan1.h | 2 +- src/mame/toaplan/toaplan1_m.cpp | 2 +- src/mame/toaplan/toaplan1_v.cpp | 2 +- src/mame/toaplan/toaplan2.cpp | 4 +- src/mame/toaplan/toaplan2.h | 2 +- src/mame/toaplan/toaplan2_v.cpp | 2 +- src/mame/toaplan/twincobr.cpp | 4 +- src/mame/toaplan/twincobr.h | 2 +- src/mame/toaplan/twincobr_m.cpp | 2 +- src/mame/toaplan/twincobr_v.cpp | 2 +- src/mame/toaplan/wardner.cpp | 4 +- src/mame/toshiba/pasopia.cpp | 2 +- src/mame/toshiba/pasopia7.cpp | 2 +- src/mame/trs/6883sam.cpp | 2 +- src/mame/trs/coco.cpp | 2 +- src/mame/trs/coco.h | 2 +- src/mame/trs/coco12.cpp | 2 +- src/mame/trs/coco12.h | 4 +- src/mame/trs/coco12_m.cpp | 2 +- src/mame/trs/coco3.cpp | 2 +- src/mame/trs/coco3.h | 4 +- src/mame/trs/coco3_m.cpp | 2 +- src/mame/trs/coco_vhd.cpp | 2 +- src/mame/trs/dgn_beta.cpp | 2 +- src/mame/trs/dgn_beta_m.cpp | 4 +- src/mame/trs/dgn_beta_v.cpp | 2 +- src/mame/trs/dgnalpha.cpp | 2 +- src/mame/trs/dgnalpha.h | 2 +- src/mame/trs/dragon.cpp | 4 +- src/mame/trs/dragon.h | 2 +- src/mame/trs/dragon_m.cpp | 2 +- src/mame/trs/gime.cpp | 4 +- src/mame/trs/gime.h | 2 +- src/mame/trs/lnw80.cpp | 2 +- src/mame/trs/meritum.cpp | 4 +- src/mame/trs/radionic.cpp | 2 +- src/mame/trs/tandy2k.cpp | 2 +- src/mame/trs/tandy2k.h | 2 +- src/mame/trs/trs80.cpp | 2 +- src/mame/trs/trs80_m.cpp | 2 +- src/mame/trs/trs80_v.cpp | 2 +- src/mame/trs/trs80m2.cpp | 2 +- src/mame/trs/trs80m2.h | 2 +- src/mame/trs/trs80m3.cpp | 2 +- src/mame/trs/trs80m3_m.cpp | 2 +- src/mame/trs/trs80m3_v.cpp | 2 +- src/mame/tvgames/bl_handhelds_lcdc.cpp | 2 +- src/mame/tvgames/elan_ep3a19a.cpp | 12 +- src/mame/tvgames/elan_eu3a05.cpp | 10 +- src/mame/tvgames/elan_eu3a05_a.cpp | 2 +- src/mame/tvgames/elan_eu3a14.cpp | 13 +- src/mame/tvgames/generalplus_gpl16250.cpp | 2 +- src/mame/tvgames/generalplus_gpl16250.h | 2 +- src/mame/tvgames/generalplus_gpl16250_m.cpp | 2 +- src/mame/tvgames/generalplus_gpl16250_mobigo.cpp | 4 +- src/mame/tvgames/generalplus_gpl16250_nand.cpp | 4 +- src/mame/tvgames/generalplus_gpl16250_nand.h | 4 +- src/mame/tvgames/generalplus_gpl16250_rom.cpp | 2 +- src/mame/tvgames/generalplus_gpl16250_romram.cpp | 2 +- src/mame/tvgames/generalplus_gpl16250_romram.h | 4 +- src/mame/tvgames/generalplus_gpl16250_spi.cpp | 2 +- .../tvgames/generalplus_gpl16250_spi_direct.cpp | 2 +- src/mame/tvgames/spg29x.cpp | 4 +- src/mame/tvgames/spg2xx.cpp | 2 +- src/mame/tvgames/spg2xx_digimake.cpp | 2 +- src/mame/tvgames/spg2xx_dreamlife.cpp | 2 +- src/mame/tvgames/spg2xx_ican.cpp | 2 +- src/mame/tvgames/spg2xx_jakks.cpp | 2 +- src/mame/tvgames/spg2xx_jakks_gkr.cpp | 2 +- src/mame/tvgames/spg2xx_jakks_sharp.cpp | 2 +- src/mame/tvgames/spg2xx_jakks_tvtouch.cpp | 2 +- src/mame/tvgames/spg2xx_lexibook.cpp | 2 +- src/mame/tvgames/spg2xx_mysprtch.cpp | 2 +- src/mame/tvgames/spg2xx_pdc.cpp | 2 +- src/mame/tvgames/spg2xx_playvision.cpp | 2 +- src/mame/tvgames/spg2xx_senario.cpp | 2 +- src/mame/tvgames/spg2xx_senario_poker.cpp | 2 +- src/mame/tvgames/spg2xx_senca.cpp | 2 +- src/mame/tvgames/spg2xx_shredmjr.cpp | 2 +- src/mame/tvgames/spg2xx_skannerztv.cpp | 2 +- src/mame/tvgames/spg2xx_smarttv.cpp | 2 +- src/mame/tvgames/spg2xx_telestory.cpp | 2 +- src/mame/tvgames/spg2xx_tvgogo.cpp | 2 +- src/mame/tvgames/spg2xx_vii.cpp | 2 +- src/mame/tvgames/spg2xx_wiwi.cpp | 2 +- src/mame/tvgames/spg2xx_zone.cpp | 2 +- src/mame/tvgames/st2302u_bbl_rom.cpp | 2 +- src/mame/tvgames/st2302u_bbl_spi.cpp | 2 +- src/mame/tvgames/xavix.cpp | 2 +- src/mame/tvgames/xavix.h | 14 +- src/mame/tvgames/xavix_2000.cpp | 2 +- src/mame/tvgames/xavix_2002.cpp | 2 +- src/mame/tvgames/xavix_a.cpp | 2 +- src/mame/tvgames/xavix_m.cpp | 2 +- src/mame/tvgames/xavix_madfb_ball.cpp | 2 +- src/mame/tvgames/xavix_mtrk_wheel.cpp | 2 +- src/mame/tvgames/xavix_v.cpp | 2 +- src/mame/unico/drgnmst.cpp | 2 +- src/mame/unico/drgnmst_v.cpp | 2 +- src/mame/unico/silkroad.cpp | 2 +- src/mame/unico/silkroad_v.cpp | 2 +- src/mame/unico/unico.cpp | 2 +- src/mame/unico/unico_v.cpp | 2 +- src/mame/unisonic/unichamp.cpp | 2 +- src/mame/univers/cheekyms.cpp | 2 +- src/mame/univers/cheekyms.h | 2 +- src/mame/univers/cheekyms_a.cpp | 4 +- src/mame/univers/cheekyms_v.cpp | 2 +- src/mame/univers/cosmic.cpp | 2 +- src/mame/univers/cosmic_v.cpp | 2 +- src/mame/univers/docastle.cpp | 2 +- src/mame/univers/docastle_m.cpp | 2 +- src/mame/univers/docastle_v.cpp | 2 +- src/mame/univers/ladybug.cpp | 2 +- src/mame/univers/ladybug.h | 2 +- src/mame/univers/ladybug_v.cpp | 2 +- src/mame/univers/mrdo.cpp | 2 +- src/mame/univers/mrdo_v.cpp | 2 +- src/mame/univers/redclash.cpp | 2 +- src/mame/univers/redclash.h | 2 +- src/mame/univers/redclash_v.cpp | 2 +- src/mame/upl/mouser.cpp | 2 +- src/mame/upl/mouser_v.cpp | 2 +- src/mame/upl/ninjakd2.cpp | 6 +- src/mame/upl/ninjakd2_v.cpp | 2 +- src/mame/upl/nova2001.cpp | 2 +- src/mame/upl/nova2001_v.cpp | 2 +- src/mame/usp/patinho_feio.cpp | 2 +- src/mame/usp/patinhofeio.h | 8 +- src/mame/valadon/bagman.cpp | 2 +- src/mame/valadon/bagman_m.cpp | 2 +- src/mame/valadon/bagman_v.cpp | 2 +- src/mame/veb/kc.cpp | 2 +- src/mame/veb/kc.h | 2 +- src/mame/veb/kc_m.cpp | 2 +- src/mame/veb/kc_v.cpp | 2 +- src/mame/venture/spcforce.cpp | 2 +- src/mame/venture/spcforce_v.cpp | 2 +- src/mame/venture/suprridr.cpp | 2 +- src/mame/venture/suprridr_v.cpp | 2 +- src/mame/verifone/tranz330.cpp | 2 +- src/mame/vidbrain/vidbrain.cpp | 2 +- src/mame/vidbrain/vidbrain.h | 2 +- src/mame/videoton/tvc.cpp | 2 +- src/mame/videoton/tvc_a.cpp | 2 +- src/mame/virtual.flt | 3 + src/mame/virtual.lst | 6 - src/mame/virtual/vgmplay.cpp | 7 +- src/mame/visual/v102.cpp | 2 +- src/mame/visual/v102_kbd.cpp | 2 +- src/mame/visual/v1050.cpp | 2 +- src/mame/visual/v1050.h | 2 +- src/mame/visual/v1050_v.cpp | 2 +- src/mame/visual/v550.cpp | 2 +- src/mame/vsystem/aerofgt.cpp | 6 +- src/mame/vsystem/aerofgt.h | 4 +- src/mame/vsystem/aerofgt_v.cpp | 2 +- src/mame/vsystem/crshrace.cpp | 2 +- src/mame/vsystem/crshrace.h | 12 +- src/mame/vsystem/crshrace_v.cpp | 2 +- src/mame/vsystem/f1gp.cpp | 4 +- src/mame/vsystem/f1gp.h | 15 +- src/mame/vsystem/f1gp_v.cpp | 2 +- src/mame/vsystem/fromanc2.cpp | 2 +- src/mame/vsystem/fromanc2_v.cpp | 2 +- src/mame/vsystem/fromance.cpp | 4 +- src/mame/vsystem/fromance.h | 4 +- src/mame/vsystem/fromance_v.cpp | 2 +- src/mame/vsystem/gstriker.cpp | 8 +- src/mame/vsystem/inufuku.cpp | 2 +- src/mame/vsystem/ojankohs.cpp | 4 +- src/mame/vsystem/ojankohs_v.cpp | 2 +- src/mame/vsystem/pipedrm.cpp | 2 +- src/mame/vsystem/rpunch.cpp | 2 +- src/mame/vsystem/suprslam.cpp | 4 +- src/mame/vsystem/suprslam.h | 14 +- src/mame/vsystem/suprslam_v.cpp | 2 +- src/mame/vsystem/tail2nos.cpp | 5 +- src/mame/vsystem/taotaido.cpp | 4 +- src/mame/vsystem/taotaido.h | 2 +- src/mame/vsystem/taotaido_v.cpp | 2 +- src/mame/vsystem/vs9209.cpp | 2 +- src/mame/vsystem/welltris.cpp | 4 +- src/mame/vtech/crvision.cpp | 2 +- src/mame/vtech/gamemachine.cpp | 2 +- src/mame/vtech/pc4.cpp | 2 +- src/mame/vtech/pc4_v.cpp | 2 +- src/mame/vtech/socrates.cpp | 2 +- src/mame/vtech/socrates_a.cpp | 2 +- src/mame/vtech/vsmile.cpp | 2 +- src/mame/vtech/vsmileb.cpp | 2 +- src/mame/vtech/vtech2.cpp | 2 +- src/mame/vtech/vtech2_m.cpp | 2 +- src/mame/vtech/vtech2_v.cpp | 2 +- src/mame/wang/wangpc.cpp | 2 +- src/mame/wavemate/bullet.cpp | 2 +- src/mame/wing/lucky74.cpp | 2 +- src/mame/wing/lucky74_v.cpp | 2 +- src/mame/wyse/wy100.cpp | 2 +- src/mame/wyse/wy50.cpp | 2 +- src/mame/wyse/wy50kb.cpp | 2 +- src/mame/xerox/xerox820.cpp | 2 +- src/mame/xerox/xerox820.h | 2 +- src/mame/xussrpc/mc1502.cpp | 2 +- src/mame/xussrpc/poisk1.cpp | 2 +- src/mame/yamaha/yman1x.cpp | 2 +- src/mame/yamaha/ymmu100.cpp | 2 +- src/mame/yamaha/ymmu50.cpp | 2 +- src/mame/yamaha/ymmu80.cpp | 2 +- src/mame/yamaha/ymvl70.cpp | 2 +- src/mame/yunsung/nmg5.cpp | 5 +- src/mame/zaccaria/laserbat.cpp | 2 +- src/mame/zaccaria/laserbat.h | 2 +- src/mame/zaccaria/laserbat_a.cpp | 2 +- src/mame/zaccaria/laserbat_v.cpp | 2 +- src/mame/zaccaria/zac2650.cpp | 2 +- src/mame/zaccaria/zac2650_v.cpp | 2 +- src/mame/zaccaria/zaccaria.cpp | 2 +- src/mame/zaccaria/zaccaria.h | 2 +- src/mame/zaccaria/zaccaria_a.cpp | 4 +- src/mame/zaccaria/zaccaria_v.cpp | 2 +- src/mame/zvt/pp01.cpp | 2 +- src/mame/zvt/pp01_m.cpp | 2 +- src/mame/zvt/pp01_v.cpp | 2 +- src/tools/reorganize.py | 43 +- 2900 files changed, 36608 insertions(+), 42322 deletions(-) delete mode 100644 scripts/target/mame/arcade.lua delete mode 100644 scripts/target/mame/mess.lua delete mode 100644 scripts/target/mame/virtual.lua delete mode 100644 src/mame/atari/llander.cpp delete mode 100644 src/mame/bally/astrohome.cpp delete mode 100644 src/mame/exidy/exidy_a.cpp delete mode 100644 src/mame/exidy/exidy_a.h create mode 100644 src/mame/kaneko/kan_pand.cpp create mode 100644 src/mame/kaneko/kan_pand.h create mode 100644 src/mame/kaneko/snowbros.cpp create mode 100644 src/mame/kaneko/snowbros.h create mode 100644 src/mame/kaneko/snowbros_v.cpp delete mode 100644 src/mame/luxor/abc800.cpp delete mode 100644 src/mame/luxor/abc802.cpp delete mode 100644 src/mame/luxor/abc806.cpp delete mode 100644 src/mame/messshared/crt.cpp delete mode 100644 src/mame/messshared/crt.h create mode 100644 src/mame/messshared/mitcrt.cpp create mode 100644 src/mame/messshared/mitcrt.h delete mode 100644 src/mame/messshared/vboy_a.cpp delete mode 100644 src/mame/messshared/vboy_a.h create mode 100644 src/mame/messshared/vboysound.cpp create mode 100644 src/mame/messshared/vboysound.h delete mode 100644 src/mame/messshared/wswan_a.cpp delete mode 100644 src/mame/messshared/wswan_a.h create mode 100644 src/mame/messshared/wswansound.cpp create mode 100644 src/mame/messshared/wswansound.h create mode 100644 src/mame/midway/astrohome.cpp delete mode 100644 src/mame/misc/apple2_v.cpp delete mode 100644 src/mame/misc/apple2_v.h delete mode 100644 src/mame/misc/apple2common.cpp delete mode 100644 src/mame/misc/apple2common.h delete mode 100644 src/mame/misc/special_a.cpp delete mode 100644 src/mame/misc/special_a.h delete mode 100644 src/mame/namco/namco_c355spr.cpp delete mode 100644 src/mame/namco/namco_c355spr.h create mode 100644 src/mame/neogeo/neogeocd.cpp delete mode 100644 src/mame/nichibut/cclimber_a.cpp delete mode 100644 src/mame/nichibut/cclimber_a.h delete mode 100644 src/mame/sega/carnival.cpp delete mode 100644 src/mame/sega/depthch.cpp delete mode 100644 src/mame/sega/invinco.cpp delete mode 100644 src/mame/sega/megadriv.h delete mode 100644 src/mame/sega/megadriv_m.cpp delete mode 100644 src/mame/sega/pulsar_a.cpp create mode 100644 src/mame/segacons/mdconsole.cpp create mode 100644 src/mame/segacons/mdconsole.h delete mode 100644 src/mame/segacons/megadriv.cpp create mode 100644 src/mame/shared/apple2common.cpp create mode 100644 src/mame/shared/apple2common.h create mode 100644 src/mame/shared/apple2video.cpp create mode 100644 src/mame/shared/apple2video.h delete mode 100644 src/mame/shared/bally.cpp delete mode 100644 src/mame/shared/bally.h create mode 100644 src/mame/shared/ballysound.cpp create mode 100644 src/mame/shared/ballysound.h create mode 100644 src/mame/shared/cclimber_a.cpp create mode 100644 src/mame/shared/cclimber_a.h create mode 100644 src/mame/shared/exidysound.cpp create mode 100644 src/mame/shared/exidysound.h create mode 100644 src/mame/shared/megadriv.cpp create mode 100644 src/mame/shared/megadriv.h create mode 100644 src/mame/shared/namco_c355spr.cpp create mode 100644 src/mame/shared/namco_c355spr.h delete mode 100644 src/mame/shared/seibu.cpp delete mode 100644 src/mame/shared/seibu.h create mode 100644 src/mame/shared/seibusound.cpp create mode 100644 src/mame/shared/seibusound.h create mode 100644 src/mame/shared/specialsound.cpp create mode 100644 src/mame/shared/specialsound.h create mode 100644 src/mame/shared/taito68705.cpp create mode 100644 src/mame/shared/taito68705.h delete mode 100644 src/mame/shared/taito68705interface.cpp delete mode 100644 src/mame/shared/taito68705interface.h delete mode 100644 src/mame/shared/williams_a.cpp delete mode 100644 src/mame/shared/williams_a.h create mode 100644 src/mame/shared/williamssound.cpp create mode 100644 src/mame/shared/williamssound.h create mode 100644 src/mame/shared/xbox.cpp create mode 100644 src/mame/shared/xbox.h delete mode 100644 src/mame/shared/xbox_m.cpp delete mode 100644 src/mame/shared/xbox_m.h create mode 100644 src/mame/siemens/pcd.h delete mode 100644 src/mame/siemens/pcd_v.h delete mode 100644 src/mame/snk/hng64_net.cpp delete mode 100644 src/mame/snk/neogeocd.cpp delete mode 100644 src/mame/toaplan/kan_pand.cpp delete mode 100644 src/mame/toaplan/kan_pand.h delete mode 100644 src/mame/toaplan/snowbros.cpp delete mode 100644 src/mame/toaplan/snowbros.h delete mode 100644 src/mame/toaplan/snowbros_v.cpp create mode 100644 src/mame/virtual.flt delete mode 100644 src/mame/virtual.lst diff --git a/makefile b/makefile index 916d92277f4..e51740da8cb 100644 --- a/makefile +++ b/makefile @@ -930,16 +930,12 @@ SCRIPTS = scripts/genie.lua \ $(wildcard src/osd/$(OSD)/$(OSD).mak) \ $(wildcard src/$(TARGET)/$(SUBTARGET_FULL).mak) -ifeq ($(SUBTARGET_FULL),mame) -SCRIPTS += scripts/target/$(TARGET)/arcade.lua -SCRIPTS += scripts/target/$(TARGET)/mess.lua -endif - ifndef SOURCES ifdef PROJECT SCRIPTS += projects/$(PROJECT)/scripts/target/$(TARGET)/$(SUBTARGET_FULL).lua else -SCRIPTS += scripts/target/$(TARGET)/$(SUBTARGET_FULL).lua +# A filter file can be used as an alternative +#SCRIPTS += scripts/target/$(TARGET)/$(SUBTARGET_FULL).lua endif endif diff --git a/scripts/build/makedep.py b/scripts/build/makedep.py index d9f92b08ac6..33e61ccc171 100755 --- a/scripts/build/makedep.py +++ b/scripts/build/makedep.py @@ -392,10 +392,136 @@ class DriverFilter: [chr(x) for x in range(ord('a'), ord('z') + 1)] + ['_']) + def parse_filter(self, path, sourcefile, inclusion, exclusion): + def line_hook(text): + text = text.strip() + if text.startswith('#'): + do_parse(os.path.join(os.path.dirname(n), text[1:].lstrip())) + elif text.startswith('+'): + text = text[1:].lstrip() + if not text: + sys.stderr.write('%s:%s: Empty driver name\n' % (path, parser.input_line)) + sys.exit(1) + elif not all(x in self.DRIVER_CHARS for x in text): + sys.stderr.write('%s:%s: Invalid character in driver name "%s"\n' % (path, parser.input_line, text)) + sys.exit(1) + inclusion(text) + elif text.startswith('-'): + text = text[1:].lstrip() + if not text: + sys.stderr.write('%s:%s: Empty driver name\n' % (path, parser.input_line)) + sys.exit(1) + elif not all(x in self.DRIVER_CHARS for x in text): + sys.stderr.write('%s:%s: Invalid character in driver name "%s"\n' % (path, parser.input_line, text)) + sys.exit(1) + exclusion(text) + elif text: + sourcefile(text) + + try: + filterfile = io.open(path, 'r', encoding='utf-8') + except IOError: + sys.stderr.write('Unable to open filter file "%s"\n' % (path, )) + sys.exit(1) + with filterfile: + handler = CppParser.Handler() + handler.line = line_hook + parser = CppParser(handler) + try: + parser.parse(filterfile) + except IOError: + sys.stderr.write('Error reading filter file "%s"\n' % (path, )) + sys.exit(1) + except Exception as e: + sys.stderr.write('Error parsing filter file "%s": %s\n' % (path, e)) + sys.exit(1) + + def parse_list(self, path, sourcefile, driver): + def line_hook(text): + text = text.strip() + if text.startswith('#'): + do_parse(os.path.join(os.path.dirname(n), text[1:].lstrip())) + elif text.startswith('@'): + parts = text[1:].lstrip().split(':', 1) + parts[0] = parts[0].strip() + if (parts[0] == 'source') and (len(parts) == 2): + parts[1] = parts[1].strip() + if not parts[1]: + sys.stderr.write('%s:%s: Empty source file name "%s"\n' % (path, parser.input_line, text)) + sys.exit(1) + else: + sourcefile(parts[1]) + else: + sys.stderr.write('%s:%s: Unsupported directive "%s"\n' % (path, parser.input_line, text)) + sys.exit(1) + elif text: + if not all(x in self.DRIVER_CHARS for x in text): + sys.stderr.write('%s:%s: Invalid character in driver name "%s"\n' % (path, parser.input_line, text)) + sys.exit(1) + else: + driver(text) + + try: + listfile = io.open(path, 'r', encoding='utf-8') + except IOError: + sys.stderr.write('Unable to open list file "%s"\n' % (path, )) + sys.exit(1) + with listfile: + handler = CppParser.Handler() + handler.line = line_hook + parser = CppParser(handler) + try: + parser.parse(listfile) + except IOError: + sys.stderr.write('Error reading list file "%s"\n' % (path, )) + sys.exit(1) + except Exception as e: + sys.stderr.write('Error parsing list file "%s": %s\n' % (path, e)) + sys.exit(1) + + +class DriverLister(DriverFilter): def __init__(self, options, **kwargs): super().__init__(**kwargs) - self.parse_filter(options.filter) - self.parse_list(options.list) + + def includesource(filename): + sources.add(filename) + + def includedriver(shortname): + includes.add(shortname) + excludes.discard(shortname) + + def excludedriver(shortname): + includes.discard(shortname) + excludes.add(shortname) + + def sourcefile(filename): + if self.sources: + state['includesrc'] = filename in self.sources + + def driver(shortname): + if state['includesrc'] and (shortname not in self.excludes): + drivers.add(shortname) + + sources = set() + includes = set() + excludes = set() + if options.filter is not None: + self.parse_filter(options.filter, includesource, includedriver, excludedriver) + sys.stderr.write('%d source file(s) found\n' % (len(sources), )) + self.sources = frozenset(sources) + self.includes = frozenset(includes) + self.excludes = frozenset(excludes) + + drivers = set() + state = { 'includesrc': True } + self.parse_list(options.list, sourcefile, driver) + + for driver in self.includes: + drivers.add(driver) + sys.stderr.write('%d driver(s) found\n' % (len(drivers), )) + drivers.add('___empty') + self.drivers = sorted(drivers) def write_source(self, f): f.write( @@ -416,124 +542,34 @@ class DriverFilter: '\n' \ 'std::size_t const driver_list::s_driver_count = %d;\n' % (len(self.drivers), )) - def parse_filter(self, path): - def do_parse(p): - def line_hook(text): - text = text.strip() - if text.startswith('#'): - do_parse(os.path.join(os.path.dirname(n), text[1:].lstrip())) - elif text.startswith('+'): - text = text[1:].lstrip() - if not text: - sys.stderr.write('%s:%s: Empty driver name\n' % (p, parser.input_line)) - sys.exit(1) - elif not all(x in self.DRIVER_CHARS for x in text): - sys.stderr.write('%s:%s: Invalid character in driver name "%s"\n' % (p, parser.input_line, text)) - sys.exit(1) - includes.add(text) - excludes.discard(text) - elif text.startswith('-'): - text = text[1:].lstrip() - if not text: - sys.stderr.write('%s:%s: Empty driver name\n' % (p, parser.input_line)) - sys.exit(1) - elif not all(x in self.DRIVER_CHARS for x in text): - sys.stderr.write('%s:%s: Invalid character in driver name "%s"\n' % (p, parser.input_line, text)) - sys.exit(1) - includes.discard(text) - excludes.add(text) - elif text: - sources.add(text) - - n = os.path.normpath(p) - if n not in filters: - filters.add(n) - try: - filterfile = io.open(n, 'r', encoding='utf-8') - except IOError: - sys.stderr.write('Unable to open filter file "%s"\n' % (p, )) - sys.exit(1) - with filterfile: - handler = CppParser.Handler() - handler.line = line_hook - parser = CppParser(handler) - try: - parser.parse(filterfile) - except IOError: - sys.stderr.write('Error reading filter file "%s"\n' % (p, )) - sys.exit(1) - except Exception as e: - sys.stderr.write('Error parsing filter file "%s": %s\n' % (p, e)) - sys.exit(1) - sources = set() - includes = set() - excludes = set() - filters = set() - if path is not None: - do_parse(path) - sys.stderr.write('%d source file(s) found\n' % (len(sources), )) - self.sources = frozenset(sources) - self.includes = frozenset(includes) - self.excludes = frozenset(excludes) +class DriverCollector(DriverFilter): + def __init__(self, options, **kwargs): + super().__init__(**kwargs) - def parse_list(self, path): - def do_parse(p): - def line_hook(text): - text = text.strip() - if text.startswith('#'): - do_parse(os.path.join(os.path.dirname(n), text[1:].lstrip())) - elif text.startswith('@'): - parts = text[1:].lstrip().split(':', 1) - parts[0] = parts[0].strip() - if (parts[0] == 'source') and (len(parts) == 2): - parts[1] = parts[1].strip() - if not parts[1]: - sys.stderr.write('%s:%s: Empty source file name "%s"\n' % (p, parser.input_line, text)) - sys.exit(1) - elif self.sources: - state['includesrc'] = parts[1] in self.sources - else: - sys.stderr.write('%s:%s: Unsupported directive "%s"\n' % (p, parser.input_line, text)) - sys.exit(1) - elif text: - if not all(x in self.DRIVER_CHARS for x in text): - sys.stderr.write('%s:%s: Invalid character in driver name "%s"\n' % (p, parser.input_line, text)) - sys.exit(1) - elif state['includesrc'] and (text not in self.excludes): - drivers.add(text) - - n = os.path.normpath(p) - if n not in lists: - lists.add(n) - try: - listfile = io.open(n, 'r', encoding='utf-8') - except IOError: - sys.stderr.write('Unable to open list file "%s"\n' % (p, )) - sys.exit(1) - with listfile: - handler = CppParser.Handler() - handler.line = line_hook - parser = CppParser(handler) - try: - parser.parse(listfile) - except IOError: - sys.stderr.write('Error reading list file "%s"\n' % (p, )) - sys.exit(1) - except Exception as e: - sys.stderr.write('Error parsing list file "%s": %s\n' % (p, e)) - sys.exit(1) + def includesource(filename): + sources.add(filename) - lists = set() - drivers = set() - state = object() - state = { 'includesrc': True } - do_parse(path) - for driver in self.includes: - drivers.add(driver) - sys.stderr.write('%d driver(s) found\n' % (len(drivers), )) - drivers.add('___empty') - self.drivers = sorted(drivers) + def includedriver(shortname): + includes.add(shortname) + + def excludedriver(shortname): + includes.discard(shortname) + + def sourcefile(filename): + state['prevsource'] = filename + + def driver(shortname): + if shortname in includes: + sources.add(state['prevsource']) + + sources = set() + includes = set() + state = { 'prevsource': None } + self.parse_filter(options.filter, includesource, includedriver, excludedriver) + self.parse_list(options.list, sourcefile, driver) + sys.stderr.write('%d source file(s) found\n' % (len(sources), )) + self.sources = sorted(sources) def split_path(path): @@ -561,6 +597,12 @@ def parse_command_line(): subparser.add_argument('-t', '--target', metavar='', required=True, help='generated emulator target name') subparser.add_argument('sources', metavar='', nargs='+', help='source files to include') + subparser = subparsers.add_parser('filterproject', help='generate project directives using filter file') + subparser.add_argument('-r', '--root', metavar='', default='.', help='path to emulator source root (defaults to working directory)') + subparser.add_argument('-t', '--target', metavar='', required=True, help='generated emulator target name') + subparser.add_argument('-f', '--filter', metavar='', required=True, help='input filter file') + subparser.add_argument('list', metavar='', help='input list file') + subparser = subparsers.add_parser('sourcesfilter', help='generate driver filter for source files') subparser.add_argument('-l', '--list', metavar='', required=True, help='master driver list file') subparser.add_argument('sources', metavar='', nargs='+', help='source files to include') @@ -604,7 +646,7 @@ def collect_lua_directives(options): return result -def scan_source_dependencies(options): +def scan_source_dependencies(root, sources): def locate_include(path): split = [ ] forward = 0 @@ -631,13 +673,13 @@ def scan_source_dependencies(options): else: components = incdir[:-depth] + split[depth:] depth = forward - 1 - if os.path.isfile(os.path.join(options.root, *components)): + if os.path.isfile(os.path.join(root, *components)): return components, depth return None, 0 def test_siblings(relative, basename, depth): pathbase = '/'.join(relative) + '/' - dirname = os.path.join(options.root, *relative) + dirname = os.path.join(root, *relative) for ext in ('.cpp', '.ipp', '.hxx'): path = pathbase + basename + ext if (path not in seen) and os.path.isfile(os.path.join(dirname, basename + ext)): @@ -664,25 +706,21 @@ def scan_source_dependencies(options): components = components[:-1] test_siblings(components, base, depth) if components[:2] == ('src', 'mame'): - if components[2:] == ('includes', ): - for aspect in ('audio', 'drivers', 'video', 'machine'): - test_siblings(('src', 'mame', aspect), base, depth) - else: - for aspect in ('_a', '_v', '_m'): - test_siblings(components, base + aspect, depth) + for aspect in ('_a', '_v', '_m'): + test_siblings(components, base + aspect, depth) handler = CppParser.Handler() handler.line = line_hook parser = CppParser(handler) - seen = set('/'.join(x for x in split_path(source) if x) for source in options.sources) + seen = set('/'.join(x for x in split_path(source) if x) for source in sources) remaining = list([(x, 0) for x in seen]) - default_roots = ((('src', 'devices'), 0), (('src', 'mame'), 0), (('src', 'lib'), 0)) + default_roots = ((('src', 'devices'), 0), (('src', 'mame', 'shared'), 0), (('src', 'mame', 'messshared'), 0), (('src', 'lib'), 0)) while remaining: source, depth = remaining.pop() components = tuple(source.split('/')) roots = ((components[:-1], depth), ) + default_roots try: - f = io.open(os.path.join(options.root, *components), 'r', encoding='utf-8') + f = io.open(os.path.join(root, *components), 'r', encoding='utf-8') except IOError: sys.stderr.write('Unable to open source file "%s"\n' % (source, )) sys.exit(1) @@ -698,97 +736,126 @@ def scan_source_dependencies(options): return seen -def write_project(options, projectfile, mappings, sources): - targetsrc = '' - for source in sorted(sources): - action = mappings.get(source) - if action: - for line in action: - projectfile.write(line + '\n') - if source.startswith('src/mame/'): - targetsrc += ' MAME_DIR .. "%s",\n' % (source, ) - projectfile.write( - '\n' \ - 'function createProjects_mame_%s(_target, _subtarget)\n' \ - ' project ("mame_%s")\n' \ - ' targetsubdir(_target .."_" .. _subtarget)\n' \ - ' kind (LIBTYPE)\n' \ - ' uuid (os.uuid("drv-mame-%s"))\n' \ - ' addprojectflags()\n' \ - ' \n' \ - ' includedirs {\n' \ - ' MAME_DIR .. "src/osd",\n' \ - ' MAME_DIR .. "src/emu",\n' \ - ' MAME_DIR .. "src/devices",\n' \ - ' MAME_DIR .. "src/mame",\n' \ - ' MAME_DIR .. "src/lib",\n' \ - ' MAME_DIR .. "src/lib/util",\n' \ - ' MAME_DIR .. "src/lib/netlist",\n' \ - ' MAME_DIR .. "3rdparty",\n' \ - ' GEN_DIR .. "mame/layout",\n' \ - ' ext_includedir("asio"),\n' \ - ' ext_includedir("flac"),\n' \ - ' ext_includedir("glm"),\n' \ - ' ext_includedir("jpeg"),\n' \ - ' ext_includedir("rapidjson"),\n' \ - ' ext_includedir("zlib"),\n' \ - ' }\n' \ - '\n' \ - ' files{\n%s' \ - ' }\n' \ - 'end\n' \ - '\n' \ - 'function linkProjects_mame_%s(_target, _subtarget)\n' \ - ' links {\n' \ - ' "mame_%s",\n' \ - ' }\n' \ - 'end\n' % (options.target, options.target, options.target, targetsrc, options.target, options.target)) - - -def write_filter(options, filterfile): - def do_parse(p): - def line_hook(text): - text = text.strip() - if text.startswith('#'): - do_parse(os.path.join(os.path.dirname(n), text[1:].lstrip())) - elif text.startswith('@'): - parts = text[1:].lstrip().split(':', 1) - parts[0] = parts[0].strip() - if (parts[0] == 'source') and (len(parts) == 2): - parts[1] = parts[1].strip() - if not parts[1]: - sys.stderr.write('%s:%s: Empty source file name "%s"\n' % (p, parser.input_line, text)) - sys.exit(1) - else: - sources.add(parts[1]) +def write_project(options, projectfile, mappings, sources, single): + if single: + targetsrc = '' + for source in sorted(sources): + action = mappings.get(source) + if action: + for line in action: + projectfile.write(line + '\n') + if source.startswith('src/mame/'): + targetsrc += ' MAME_DIR .. "%s",\n' % (source, ) + projectfile.write( + '\n' \ + 'function createProjects_mame_%s(_target, _subtarget)\n' \ + ' project ("mame_%s")\n' \ + ' targetsubdir(_target .."_" .. _subtarget)\n' \ + ' kind (LIBTYPE)\n' \ + ' uuid (os.uuid("drv-mame-%s"))\n' \ + ' addprojectflags()\n' \ + ' \n' \ + ' includedirs {\n' \ + ' MAME_DIR .. "src/osd",\n' \ + ' MAME_DIR .. "src/emu",\n' \ + ' MAME_DIR .. "src/devices",\n' \ + ' MAME_DIR .. "src/mame/shared",\n' \ + ' MAME_DIR .. "src/mame/messshared",\n' \ + ' MAME_DIR .. "src/lib",\n' \ + ' MAME_DIR .. "src/lib/util",\n' \ + ' MAME_DIR .. "src/lib/netlist",\n' \ + ' MAME_DIR .. "3rdparty",\n' \ + ' GEN_DIR .. "mame/layout",\n' \ + ' ext_includedir("asio"),\n' \ + ' ext_includedir("flac"),\n' \ + ' ext_includedir("glm"),\n' \ + ' ext_includedir("jpeg"),\n' \ + ' ext_includedir("rapidjson"),\n' \ + ' ext_includedir("zlib"),\n' \ + ' }\n' \ + '\n' \ + ' files{\n%s' \ + ' }\n' \ + 'end\n' \ + '\n' \ + 'function linkProjects_mame_%s(_target, _subtarget)\n' \ + ' links {\n' \ + ' "mame_%s",\n' \ + ' }\n' \ + 'end\n' % (options.target, options.target, options.target, targetsrc, options.target, options.target)) + else: + libraries = { } + for source in sorted(sources): + components = source.split('/') + if (len(components) > 3) and (components[:2] == ['src', 'mame']): + line = ' MAME_DIR .. "%s",\n' % (source, ) + liblines = libraries.get(components[2]) + if liblines is not None: + liblines.append(line) else: - sys.stderr.write('%s:%s: Unsupported directive "%s"\n' % (p, parser.input_line, text)) - sys.exit(1) + libraries[components[2]] = [line] + action = mappings.get(source) + if action: + for line in action: + projectfile.write(line + '\n') + libnames = sorted(libraries.keys()) + projectfile.write( + '\n' \ + 'function createMAMEProjects(_target, _subtarget, _name)\n' \ + ' project (_name)\n' \ + ' targetsubdir(_target .."_" .. _subtarget)\n' \ + ' kind (LIBTYPE)\n' \ + ' uuid (os.uuid("drv-" .. _target .. "_" .. _subtarget .. "-" .. _name))\n' \ + ' addprojectflags()\n' \ + ' \n' \ + ' includedirs {\n' \ + ' MAME_DIR .. "src/osd",\n' \ + ' MAME_DIR .. "src/emu",\n' \ + ' MAME_DIR .. "src/devices",\n' \ + ' MAME_DIR .. "src/mame/shared",\n' \ + ' MAME_DIR .. "src/mame/messshared",\n' \ + ' MAME_DIR .. "src/lib",\n' \ + ' MAME_DIR .. "src/lib/util",\n' \ + ' MAME_DIR .. "src/lib/netlist",\n' \ + ' MAME_DIR .. "3rdparty",\n' \ + ' GEN_DIR .. "mame/layout",\n' \ + ' ext_includedir("asio"),\n' \ + ' ext_includedir("flac"),\n' \ + ' ext_includedir("glm"),\n' \ + ' ext_includedir("jpeg"),\n' \ + ' ext_includedir("rapidjson"),\n' \ + ' ext_includedir("zlib"),\n' \ + ' }\n' \ + 'end\n' \ + '\n' \ + 'function linkProjects_mame_%s(_target, _subtarget)\n' \ + ' links {\n' % (options.target, )) + for lib in libnames: + if (lib != 'shared') and (lib != 'messshared'): + projectfile.write(' "%s",\n' % (lib, )) + if 'shared' in libraries: + projectfile.write(' "shared",\n') + if 'messshared' in libraries: + projectfile.write(' "messshared",\n') + projectfile.write( + ' }\n' \ + 'end\n' \ + '\n' \ + 'function createProjects_mame_%s(_target, _subtarget)\n' \ + '\n' % (options.target, )) + for lib in libnames: + projectfile.write( + 'createMAMEProjects(_target, _subtarget, "%s")\n' \ + 'files {\n' % (lib, )) + for line in libraries[lib]: + projectfile.write(line) + projectfile.write('}\n\n') + projectfile.write('end\n') - n = os.path.normpath(p) - if n not in lists: - lists.add(n) - try: - listfile = io.open(n, 'r', encoding='utf-8') - except IOError: - sys.stderr.write('Unable to open list file "%s"\n' % (p, )) - sys.exit(1) - with listfile: - handler = CppParser.Handler() - handler.line = line_hook - parser = CppParser(handler) - try: - parser.parse(listfile) - except IOError: - sys.stderr.write('Error reading list file "%s"\n' % (p, )) - sys.exit(1) - except Exception as e: - sys.stderr.write('Error parsing list file "%s": %s\n' % (p, e)) - sys.exit(1) - lists = set() +def write_filter(options, filterfile): sources = set() - do_parse(options.list) + DriverFilter().parse_list(options.list, lambda n: sources.add(n), lambda n: None) drivers = set() for source in options.sources: @@ -796,9 +863,7 @@ def write_filter(options, filterfile): if (len(components) > 3) and (components[:2] == ('src', 'mame')): ext = os.path.splitext(components[-1])[1].lower() if ext.startswith('.c'): - if components[2] == 'drivers': - drivers.add('/'.join(components[3:])) - elif '/'.join(components[2:]) in sources: + if '/'.join(components[2:]) in sources: drivers.add('/'.join(components[2:])) for driver in sorted(drivers): filterfile.write(driver + '\n') @@ -808,9 +873,14 @@ if __name__ == '__main__': options = parse_command_line() if options.command == 'sourcesproject': header_to_optional = collect_lua_directives(options) - source_dependencies = scan_source_dependencies(options) - write_project(options, sys.stdout, header_to_optional, source_dependencies) + source_dependencies = scan_source_dependencies(options.root, options.sources) + write_project(options, sys.stdout, header_to_optional, source_dependencies, True) + elif options.command == 'filterproject': + header_to_optional = collect_lua_directives(options) + sources = DriverCollector(options).sources + source_dependencies = scan_source_dependencies(options.root, (os.path.join('src', 'mame', *n.split('/')) for n in sources)) + write_project(options, sys.stdout, header_to_optional, source_dependencies, False) elif options.command == 'sourcesfilter': write_filter(options, sys.stdout) elif options.command == 'driverlist': - DriverFilter(options).write_source(sys.stdout) + DriverLister(options).write_source(sys.stdout) diff --git a/scripts/genie.lua b/scripts/genie.lua index 37b8ee967e2..fcc670768df 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -456,11 +456,7 @@ if (_OPTIONS["subtarget"] == nil) then return false end if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then solution (_OPTIONS["target"]) else - if (_OPTIONS["subtarget"]=="mess") then - solution (_OPTIONS["subtarget"]) - else - solution (_OPTIONS["target"] .. _OPTIONS["subtarget"]) - end + solution (_OPTIONS["target"] .. _OPTIONS["subtarget"]) end @@ -558,10 +554,20 @@ if (_OPTIONS["PROJECT"] ~= nil) then dofile (path.join(".." ,"projects", _OPTIONS["PROJECT"], "scripts", "target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua")) end if (_OPTIONS["SOURCES"] == nil) and (_OPTIONS["PROJECT"] == nil) then - if (not os.isfile(path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))) then + local subtargetscript = path.join("target", _OPTIONS["target"], _OPTIONS["subtarget"] .. ".lua") + local subtargetfilter = path.join(MAME_DIR, "src", _OPTIONS["target"], _OPTIONS["subtarget"] .. ".flt") + if os.isfile(subtargetscript) then + dofile(subtargetscript) + elseif os.isfile(subtargetfilter) then + local cmd = string.format( + "%s %s filterproject -r %s -t %s -f %s %s", + PYTHON, path.join(MAME_DIR, "scripts", "build", "makedep.py"), + MAME_DIR, _OPTIONS["subtarget"], subtargetfilter, path.join(MAME_DIR, "src", _OPTIONS["target"] , _OPTIONS["target"] .. ".lst")) + local OUT_STR = os.outputof(cmd) + load(OUT_STR)() + else error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist") end - dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua")) end configuration { "gmake or ninja" } @@ -1424,7 +1430,7 @@ if (_OPTIONS["SOURCES"] ~= nil) then end sourceargs = sourceargs .. " " .. word end - OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py sourcesproject -r " .. MAME_DIR .. " -t " .. _OPTIONS["subtarget"] .. sourceargs ) + local OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py sourcesproject -r " .. MAME_DIR .. " -t " .. _OPTIONS["subtarget"] .. sourceargs ) load(OUT_STR)() os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py sourcesfilter -l " .. MAME_DIR .. "src/" .. _OPTIONS["target"] .. "/" .. _OPTIONS["target"] .. ".lst" .. sourceargs .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"] .. ".flt" ) end @@ -1471,11 +1477,7 @@ if (_OPTIONS["SOURCES"] == nil) then if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then startproject (_OPTIONS["target"]) else - if (_OPTIONS["subtarget"]=="mess") then - startproject (_OPTIONS["subtarget"]) - else - startproject (_OPTIONS["target"] .. _OPTIONS["subtarget"]) - end + startproject (_OPTIONS["target"] .. _OPTIONS["subtarget"]) end else startproject (_OPTIONS["subtarget"]) diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 73d5861f21f..a560750b3d4 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -553,6 +553,7 @@ end -------------------------------------------------- -- DEC PDP-8 --@src/devices/cpu/pdp8/pdp8.h,CPUS["PDP8"] = true +--@src/devices/cpu/pdp8/hd6120.h,CPUS["PDP8"] = true -------------------------------------------------- if CPUS["PDP8"] then diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua deleted file mode 100644 index c67a7ed2f71..00000000000 --- a/scripts/target/mame/arcade.lua +++ /dev/null @@ -1,5116 +0,0 @@ --- license:BSD-3-Clause --- copyright-holders:MAMEdev Team - ---------------------------------------------------------------------------- --- --- arcade.lua --- --- MAME target makefile --- ---------------------------------------------------------------------------- - --------------------------------------------------- --- specify available CPU cores ---------------------------------------------------- - -CPUS["Z80"] = true -CPUS["KC80"] = true -CPUS["Z180"] = true -CPUS["I8085"] = true -CPUS["I8089"] = true -CPUS["M6502"] = true ---CPUS["ST2XXX"] = true ---CPUS["XAVIX"] = true ---CPUS["XAVIX2000"] = true -CPUS["H6280"] = true -CPUS["I86"] = true -CPUS["I386"] = true -CPUS["NEC"] = true -CPUS["V30MZ"] = true -CPUS["V60"] = true -CPUS["MCS48"] = true -CPUS["MCS51"] = true -CPUS["MCS96"] = true -CPUS["M6800"] = true -CPUS["M6805"] = true -CPUS["HD6309"] = true -CPUS["M6809"] = true -CPUS["KONAMI"] = true -CPUS["M680X0"] = true -CPUS["T11"] = true -CPUS["S2650"] = true -CPUS["TMS340X0"] = true -CPUS["TMS9900"] = true -CPUS["TMS9995"] = true -CPUS["TMS9900L"] = true -CPUS["Z8000"] = true -CPUS["Z8001"] = true -CPUS["TMS32010"] = true -CPUS["TMS32025"] = true -CPUS["TMS32031"] = true -CPUS["TMS32051"] = true -CPUS["TMS32082"] = true -CPUS["TMS57002"] = true -CPUS["CCPU"] = true -CPUS["ADSP21XX"] = true -CPUS["ASAP"] = true -CPUS["AM29000"] = true -CPUS["UPD7810"] = true -CPUS["ARM"] = true -CPUS["ARM7"] = true -CPUS["JAGUAR"] = true -CPUS["CUBEQCPU"] = true -CPUS["ESRIP"] = true -CPUS["MIPS1"] = true -CPUS["MIPS3"] = true -CPUS["PSX"] = true -CPUS["SH"] = true -CPUS["DSP16"] = true -CPUS["DSP32C"] = true -CPUS["PIC16C5X"] = true -CPUS["PIC16C62X"] = true -CPUS["PIC17"] = true -CPUS["G65816"] = true -CPUS["SPC700"] = true -CPUS["E1"] = true -CPUS["I860"] = true -CPUS["I960"] = true -CPUS["H8"] = true -CPUS["H8500"] = true -CPUS["V810"] = true -CPUS["M37710"] = true -CPUS["POWERPC"] = true -CPUS["SE3208"] = true -CPUS["MC68HC11"] = true -CPUS["ADSP21062"] = true -CPUS["DSP56156"] = true -CPUS["RSP"] = true -CPUS["COP400"] = true -CPUS["TLCS90"] = true -CPUS["TLCS870"] = true -CPUS["TLCS900"] = true -CPUS["MB88XX"] = true -CPUS["MB86233"] = true -CPUS["MB86235"] = true -CPUS["SSP1601"] = true -CPUS["APEXC"] = true -CPUS["CP1610"] = true -CPUS["F8"] = true -CPUS["LH5801"] = true ---CPUS["PDP1"] = true ---CPUS["TX0"] = true -CPUS["SATURN"] = true -CPUS["SC61860"] = true -CPUS["LR35902"] = true -CPUS["TMS7000"] = true -CPUS["SM8500"] = true -CPUS["MINX"] = true -CPUS["SSEM"] = true -CPUS["AVR8"] = true ---CPUS["TMS1000"] = true -CPUS["MCS40"] = true -CPUS["SUPERFX"] = true -CPUS["Z8"] = true -CPUS["I8008"] = true -CPUS["SCMP"] = true ---CPUS["MN1880"] = true -CPUS["MN10200"] = true -CPUS["COSMAC"] = true -CPUS["UNSP"] = true -CPUS["HCD62121"] = true -CPUS["PPS4"] = true ---CPUS["PPS41"] = true ---CPUS["RW5000"] = true -CPUS["UPD7725"] = true -CPUS["HD61700"] = true -CPUS["LC8670"] = true -CPUS["SCORE"] = true -CPUS["ES5510"] = true -CPUS["SCUDSP"] = true -CPUS["IE15"] = true -CPUS["8X300"] = true -CPUS["ALTO2"] = true ---CPUS["W65816"] = true -CPUS["ARC"] = true -CPUS["ARCOMPACT"] = true ---CPUS["AMIS2000"] = true ---CPUS["UCOM4"] = true -CPUS["HMCS40"] = true ---CPUS["E0C6200"] = true ---CPUS["MELPS4"] = true ---CPUS["HPHYBRID"] = true -CPUS["SM510"] = true -CPUS["ST62XX"] = true -CPUS["DSPP"] = true -CPUS["HPC"] = true ---CPUS["RII"] = true ---CPUS["BCP"] = true ---CPUS["CR16B"] = true -CPUS["FR"] = true -CPUS["UPD78K"] = true -CPUS["KS0164"] = true ---CPUS["COPS1"] = true -CPUS["MEG"] = true -CPUS["F2MC16"] = true -CPUS["M68HC16"] = true - --------------------------------------------------- --- specify available sound cores --------------------------------------------------- - -SOUNDS["SAMPLES"] = true -SOUNDS["DAC"] = true -SOUNDS["DMADAC"] = true -SOUNDS["SPEAKER"] = true -SOUNDS["BEEP"] = true -SOUNDS["DISCRETE"] = true -SOUNDS["AY8910"] = true -SOUNDS["YM2151"] = true -SOUNDS["YM2203"] = true -SOUNDS["YM2413"] = true -SOUNDS["YM2608"] = true -SOUNDS["YM2610"] = true -SOUNDS["YM2610B"] = true -SOUNDS["YM2612"] = true -SOUNDS["YM3438"] = true -SOUNDS["YM3812"] = true -SOUNDS["YM3526"] = true -SOUNDS["Y8950"] = true -SOUNDS["YMF262"] = true -SOUNDS["YMF271"] = true -SOUNDS["YMF278B"] = true -SOUNDS["YMZ280B"] = true -SOUNDS["SN76477"] = true -SOUNDS["SN76496"] = true -SOUNDS["POKEY"] = true -SOUNDS["TIA"] = true -SOUNDS["NES_APU"] = true -SOUNDS["PAULA_8364"] = true -SOUNDS["ASTROCADE"] = true -SOUNDS["NAMCO"] = true -SOUNDS["NAMCO_15XX"] = true -SOUNDS["NAMCO_CUS30"] = true -SOUNDS["NAMCO_52XX"] = true -SOUNDS["NAMCO_63701X"] = true ---SOUNDS["NAMCO_163"] = true -SOUNDS["T6W28"] = true -SOUNDS["SNKWAVE"] = true -SOUNDS["C140"] = true -SOUNDS["C352"] = true -SOUNDS["TMS36XX"] = true -SOUNDS["TMS3615"] = true -SOUNDS["TMS5110"] = true -SOUNDS["TMS5220"] = true -SOUNDS["VLM5030"] = true -SOUNDS["ADPCM"] = true -SOUNDS["MSM5205"] = true -SOUNDS["MSM5232"] = true -SOUNDS["OKIM6258"] = true -SOUNDS["OKIM6295"] = true -SOUNDS["OKIM6376"] = true -SOUNDS["OKIM9810"] = true ---SOUNDS["UPD7752"] = true -SOUNDS["UPD7759"] = true -SOUNDS["HC55516"] = true -SOUNDS["TC8830F"] = true -SOUNDS["K005289"] = true -SOUNDS["K007232"] = true -SOUNDS["K051649"] = true -SOUNDS["K053260"] = true -SOUNDS["K054539"] = true -SOUNDS["K056800"] = true -SOUNDS["SEGAPCM"] = true -SOUNDS["MULTIPCM"] = true -SOUNDS["SCSP"] = true -SOUNDS["AICA"] = true -SOUNDS["RF5C68"] = true -SOUNDS["RF5C400"] = true -SOUNDS["CEM3394"] = true -SOUNDS["QSOUND"] = true -SOUNDS["QS1000"] = true -SOUNDS["SAA1099"] = true -SOUNDS["IREMGA20"] = true -SOUNDS["ES5503"] = true -SOUNDS["ES5505"] = true -SOUNDS["ES5506"] = true -SOUNDS["BSMT2000"] = true -SOUNDS["GAELCO_CG1V"] = true -SOUNDS["GAELCO_GAE1"] = true ---SOUNDS["HUC6230"] = true -SOUNDS["C6280"] = true -SOUNDS["SP0250"] = true -SOUNDS["SPU"] = true -SOUNDS["CDDA"] = true -SOUNDS["ICS2115"] = true -SOUNDS["I5000_SND"] = true -SOUNDS["ST0016"] = true -SOUNDS["SETAPCM"] = true -SOUNDS["X1_010"] = true -SOUNDS["VRENDER0"] = true -SOUNDS["VOTRAX"] = true -SOUNDS["ES8712"] = true -SOUNDS["CDP1869"] = true -SOUNDS["S14001A"] = true -SOUNDS["WAVE"] = true -SOUNDS["SID6581"] = true -SOUNDS["SID8580"] = true -SOUNDS["SP0256"] = true -SOUNDS["DIGITALKER"] = true -SOUNDS["CDP1863"] = true -SOUNDS["CDP1864"] = true -SOUNDS["ZSG2"] = true -SOUNDS["MOS656X"] = true -SOUNDS["ASC"] = true -SOUNDS["MAS3507D"] = true -SOUNDS["SOCRATES"] = true -SOUNDS["TMC0285"] = true -SOUNDS["TMS5200"] = true -SOUNDS["CD2801"] = true -SOUNDS["CD2802"] = true -SOUNDS["M58817"] = true -SOUNDS["TMC0281"] = true -SOUNDS["TMS5100"] = true -SOUNDS["TMS5110A"] = true -SOUNDS["LMC1992"] = true -SOUNDS["AWACS"] = true -SOUNDS["YMZ770"] = true -SOUNDS["MPEG_AUDIO"] = true -SOUNDS["T6721A"] = true -SOUNDS["MOS7360"] = true -SOUNDS["ESQPUMP"] = true ---SOUNDS["VRC6"] = true -SOUNDS["SB0400"] = true -SOUNDS["AC97"] = true -SOUNDS["ES1373"] = true -SOUNDS["L7A1045"] = true -SOUNDS["AD1848"] = true ---SOUNDS["UPD1771"] = true -SOUNDS["MEA8000"] = true -SOUNDS["DAC76"] = true -SOUNDS["TA7630"] = true -SOUNDS["MM5837"] = true ---SOUNDS["DAVE"] = true -SOUNDS["LC7535"] = true ---SOUNDS["UPD934G"] = true -SOUNDS["S_DSP"] = true -SOUNDS["KS0164"] = true -SOUNDS["TT5665"] = true ---SOUNDS["RP2C33_SOUND"] = true ---SOUNDS["UDA1344"] = true -SOUNDS["SWP30"] = true -SOUNDS["XT446"] = true ---SOUNDS["LYNX"] = true - --------------------------------------------------- --- specify available video cores --------------------------------------------------- - -VIDEOS["SEGA315_5124"] = true -VIDEOS["SEGA315_5313"] = true ---VIDEOS["AM8052"] = true -VIDEOS["BUFSPRITE"] = true -VIDEOS["BT45X"] = true -VIDEOS["BT47X"] = true ---VIDEOS["CDP1861"] = true ---VIDEOS["CDP1862"] = true -VIDEOS["CESBLIT"] = true ---VIDEOS["CRT9007"] = true ---VIDEOS["CRT9021"] = true ---VIDEOS["CRT9028"] = true ---VIDEOS["CRT9212"] = true -VIDEOS["CRTC_EGA"] = true ---VIDEOS["DL1416"] = true -VIDEOS["DM9368"] = true -VIDEOS["DP8350"] = true ---VIDEOS["EF9340_1"] = true ---VIDEOS["EF9345"] = true ---VIDEOS["EF9364"] = true ---VIDEOS["EF9365"] = true -VIDEOS["EF9369"] = true ---VIDEOS["GF4500"] = true -VIDEOS["GF7600GS"] = true -VIDEOS["EPIC12"] = true -VIDEOS["FIXFREQ"] = true ---VIDEOS["HD44102"] = true ---VIDEOS["HD44352"] = true -VIDEOS["HD44780"] = true ---VIDEOS["HD61603"] = true -VIDEOS["HD61830"] = true -VIDEOS["HD63484"] = true ---VIDEOS["HD66421"] = true ---VIDEOS["HLCD0438"] = true ---VIDEOS["HLCD0488"] = true ---VIDEOS["HLCD0515"] = true ---VIDEOS["HLCD0538"] = true -VIDEOS["HUC6202"] = true -VIDEOS["HUC6260"] = true ---VIDEOS["HUC6261"] = true -VIDEOS["HUC6270"] = true ---VIDEOS["HUC6272"] = true -VIDEOS["I4100"] = true ---VIDEOS["I8244"] = true -VIDEOS["I8275"] = true -VIDEOS["JANGOU_BLITTER"] = true ---VIDEOS["LC7582"] = true ---VIDEOS["LC7985"] = true -VIDEOS["M50458"] = true -VIDEOS["MB90082"] = true -VIDEOS["MB_VCU"] = true -VIDEOS["MC6845"] = true ---VIDEOS["MC6847"] = true ---VIDEOS["MD4330B"] = true ---VIDEOS["MM5445"] = true ---VIDEOS["MSM6222B"] = true ---VIDEOS["MSM6255"] = true ---VIDEOS["MOS6566"] = true -VIDEOS["PC_VGA"] = true ---VIDEOS["PCF2100"] = true -VIDEOS["POLY"] = true -VIDEOS["PSX"] = true -VIDEOS["RAMDAC"] = true ---VIDEOS["S2636"] = true -VIDEOS["SAA5050"] = true ---VIDEOS["SDA5708"] = true -VIDEOS["SCN2674"] = true -VIDEOS["PWM_DISPLAY"] = true ---VIDEOS["SED1200"] = true ---VIDEOS["SED1330"] = true ---VIDEOS["SED1356"] = true ---VIDEOS["SED1500"] = true ---VIDEOS["SED1520"] = true -VIDEOS["SNES_PPU"] = true ---VIDEOS["T6963C"] = true ---VIDEOS["T6A04"] = true -VIDEOS["TLC34076"] = true -VIDEOS["TMS34061"] = true ---VIDEOS["TMS3556"] = true -VIDEOS["TMS9927"] = true -VIDEOS["TMS9928A"] = true ---VIDEOS["UPD3301"] = true -VIDEOS["UPD7220"] = true ---VIDEOS["UPD7227"] = true -VIDEOS["V9938"] = true ---VIDEOS["VIC4567"] = true -VIDEOS["VOODOO"] = true -VIDEOS["VOODOO_PCI"] = true -VIDEOS["ZEUS2"] = true -VIDEOS["PPU2C0X"] = true -VIDEOS["PS2GS"] = true -VIDEOS["PS2GIF"] = true -VIDEOS["VRENDER0"] = true - --------------------------------------------------- --- specify available machine cores --------------------------------------------------- - -MACHINES["ACORN_IOC"] = true -MACHINES["ACORN_MEMC"] = true -MACHINES["ACORN_VIDC"] = true -MACHINES["AKIKO"] = true -MACHINES["ALPHA_8921"] = true ---MACHINES["AM2901B"] = true -MACHINES["ARM_IOMD"] = true -MACHINES["AUTOCONFIG"] = true -MACHINES["BITMAP_PRINTER"] = true -MACHINES["BUSMOUSE"] = true -MACHINES["CR511B"] = true -MACHINES["DMAC"] = true -MACHINES["GAYLE"] = true -MACHINES["2812FIFO"] = true -MACHINES["6522VIA"] = true -MACHINES["TPI6525"] = true -MACHINES["RIOT6532"] = true -MACHINES["6821PIA"] = true -MACHINES["6840PTM"] = true ---MACHINES["MPCC68561"] = true -MACHINES["ACIA6850"] = true -MACHINES["68681"] = true -MACHINES["7200FIFO"] = true ---MACHINES["8530SCC"] = true ---MACHINES["TTL7400"] = true ---MACHINES["TTL7404"] = true -MACHINES["TTL74123"] = true -MACHINES["TTL74145"] = true -MACHINES["TTL74148"] = true -MACHINES["TTL74153"] = true -MACHINES["TTL74157"] = true ---MACHINES["TTL74161"] = true ---MACHINES["TTL74164"] = true -MACHINES["TTL74165"] = true -MACHINES["TTL74166"] = true ---MACHINES["TTL74175"] = true -MACHINES["TTL74181"] = true -MACHINES["TTL74259"] = true ---MACHINES["TTL74381"] = true -MACHINES["TTL7474"] = true -MACHINES["KBDC8042"] = true -MACHINES["I8257"] = true ---MACHINES["ACIA6850"] = true -MACHINES["ADC0804"] = true -MACHINES["ADC0808"] = true -MACHINES["ADC083X"] = true -MACHINES["ADC1038"] = true -MACHINES["ADC1213X"] = true -MACHINES["AICARTC"] = true ---MACHINES["AM25S55X"] = true ---MACHINES["AM2847"] = true ---MACHINES["AM2910"] = true -MACHINES["AM53CF96"] = true -MACHINES["AM79C90"] = true ---MACHINES["AM9513"] = true -MACHINES["AM9517A"] = true -MACHINES["AMIGAFDC"] = true -MACHINES["AMIGA_COPPER"] = true ---MACHINES["APPLEPIC"] = true -MACHINES["AT_KEYBC"] = true -MACHINES["AT28C16"] = true ---MACHINES["AT28C64B"] = true -MACHINES["AT29X"] = true -MACHINES["AT45DBXX"] = true -MACHINES["ATAFLASH"] = true -MACHINES["ARM_AIC"] = true -MACHINES["AY31015"] = true -MACHINES["BANKDEV"] = true ---MACHINES["BIM68153"] = true -MACHINES["CDP1852"] = true -MACHINES["CDP1871"] = true ---MACHINES["CH376"] = true -MACHINES["CHESSMACHINE"] = true -MACHINES["CMOS40105"] = true -MACHINES["CDU76S"] = true -MACHINES["COM52C50"] = true -MACHINES["COM8116"] = true -MACHINES["CR589"] = true ---MACHINES["CS4031"] = true ---MACHINES["CS8221"] = true -MACHINES["CXD1095"] = true -MACHINES["CXD1185"] = true -MACHINES["DP8390"] = true ---MACHINES["DP8573"] = true -MACHINES["DS1204"] = true -MACHINES["DS1205"] = true -MACHINES["DS1302"] = true ---MACHINES["DS1315"] = true -MACHINES["DS1386"] = true -MACHINES["DS17X85"] = true -MACHINES["DS1994"] = true -MACHINES["DS2401"] = true -MACHINES["DS2404"] = true -MACHINES["DS75160A"] = true -MACHINES["DS75161A"] = true ---MACHINES["DS8874"] = true -MACHINES["E0516"] = true -MACHINES["E05A03"] = true -MACHINES["E05A30"] = true -MACHINES["EEPROMDEV"] = true ---MACHINES["ER1400"] = true -MACHINES["ER2055"] = true -MACHINES["F3853"] = true ---MACHINES["F4702"] = true ---MACHINES["HD63450"] = true ---MACHINES["HD64610"] = true -MACHINES["I2CMEM"] = true ---MACHINES["I80130"] = true ---MACHINES["I8089"] = true -MACHINES["I8155"] = true -MACHINES["I8212"] = true -MACHINES["I8214"] = true -MACHINES["I82355"] = true -MACHINES["I8243"] = true -MACHINES["I8251"] = true -MACHINES["I8255"] = true ---MACHINES["I8257"] = true ---MACHINES["I8271"] = true -MACHINES["I8279"] = true -MACHINES["I8355"] = true -MACHINES["IBM21S850"] = true -MACHINES["IDECTRL"] = true -MACHINES["IE15"] = true -MACHINES["IM6402"] = true -MACHINES["INS8154"] = true -MACHINES["INS8250"] = true -MACHINES["INTELFLASH"] = true -MACHINES["JVS"] = true -MACHINES["K033906"] = true -MACHINES["K053252"] = true -MACHINES["K056230"] = true ---MACHINES["KB3600"] = true ---MACHINES["KBDC8042"] = true ---MACHINES["KR2376"] = true -MACHINES["LATCH8"] = true -MACHINES["LC89510"] = true -MACHINES["LDPR8210"] = true -MACHINES["LDSTUB"] = true -MACHINES["LDV1000"] = true -MACHINES["LDV4200HLE"] = true -MACHINES["LDP1000"] = true -MACHINES["LDP1450"] = true -MACHINES["LDVP931"] = true ---MACHINES["LH5810"] = true -MACHINES["LINFLASH"] = true ---MACHINES["LOCOMO"] = true -MACHINES["LPCI"] = true -MACHINES["LSI53C810"] = true ---MACHINES["M3002"] = true ---MACHINES["M68307"] = true ---MACHINES["M68340"] = true -MACHINES["M6M80011AP"] = true -MACHINES["MB14241"] = true -MACHINES["MB3773"] = true -MACHINES["MB8421"] = true -MACHINES["MB87078"] = true ---MACHINES["MB8795"] = true -MACHINES["MB89352"] = true -MACHINES["MB89371"] = true -MACHINES["MB89374"] = true ---MACHINES["MC14411"] = true -MACHINES["MC146818"] = true -MACHINES["MC6843"] = true -MACHINES["MC6846"] = true -MACHINES["MC6852"] = true -MACHINES["MC6854"] = true -MACHINES["MC68328"] = true -MACHINES["MC68901"] = true -MACHINES["MCCS1850"] = true -MACHINES["M68307"] = true -MACHINES["M68340"] = true ---MACHINES["M950X0"] = true -MACHINES["MCF5206E"] = true -MACHINES["METERS"] = true -MACHINES["MICROTOUCH"] = true ---MACHINES["MIOT6530"] = true ---MACHINES["MM5307"] = true ---MACHINES["MM58167"] = true -MACHINES["MM58274C"] = true -MACHINES["MM74C922"] = true -MACHINES["MOS6526"] = true -MACHINES["MOS6529"] = true -MACHINES["MIOT6530"] = true -MACHINES["MOS6551"] = true ---MACHINES["MOS6702"] = true ---MACHINES["MOS8706"] = true ---MACHINES["MOS8722"] = true ---MACHINES["MOS8726"] = true -MACHINES["MPU401"] = true -MACHINES["MSM5832"] = true -MACHINES["MSM58321"] = true -MACHINES["MSM6242"] = true -MACHINES["MSM6253"] = true -MACHINES["NCR5380"] = true -MACHINES["NCR5390"] = true -MACHINES["NCR539x"] = true -MACHINES["NETLIST"] = true -MACHINES["NCR53C7XX"] = true -MACHINES["NMC9306"] = true ---MACHINES["NSC810"] = true -MACHINES["NSCSI"] = true -MACHINES["OUTPUT_LATCH"] = true -MACHINES["PC_FDC"] = true -MACHINES["PC_LPT"] = true ---MACHINES["PCCARD"] = true -MACHINES["PCF8583"] = true -MACHINES["PCF8584"] = true -MACHINES["PCF8593"] = true -MACHINES["PCI"] = true -MACHINES["PCKEYBRD"] = true -MACHINES["PIC8259"] = true -MACHINES["PIT68230"] = true -MACHINES["PIT8253"] = true -MACHINES["PLA"] = true ---MACHINES["PROFILE"] = true ---MACHINES["PROM82S129"] = true -MACHINES["PXA255"] = true -MACHINES["R10696"] = true -MACHINES["R10788"] = true -MACHINES["RA17XX"] = true ---MACHINES["R64H156"] = true -MACHINES["RF5C296"] = true ---MACHINES["RIOT6532"] = true -MACHINES["RIPPLE_COUNTER"] = true -MACHINES["ROC10937"] = true -MACHINES["RP5C01"] = true -MACHINES["RP5C15"] = true -MACHINES["RP5H01"] = true -MACHINES["RSTBUF"] = true -MACHINES["RTC4543"] = true -MACHINES["RTC65271"] = true -MACHINES["RTC9701"] = true -MACHINES["S_SMP"] = true -MACHINES["S2636"] = true -MACHINES["S3520CF"] = true -MACHINES["S3C24XX"] = true ---MACHINES["S3C44B0"] = true ---MACHINES["SA1110"] = true ---MACHINES["SA1111"] = true -MACHINES["SATURN"] = true -MACHINES["SCC68070"] = true -MACHINES["SCN_PCI"] = true ---MACHINES["SCOOP"] = true -MACHINES["SCSI"] = true -MACHINES["SCUDSP"] = true -MACHINES["SDA2006"] = true ---MACHINES["SECFLASH"] = true -MACHINES["SENSORBOARD"] = true -MACHINES["SERFLASH"] = true -MACHINES["SMC91C9X"] = true -MACHINES["SEGA_SCU"] = true -MACHINES["SMPC"] = true ---MACHINES["SPG2XX"] = true ---MACHINES["SPISDCARD"] = true -MACHINES["STVCD"] = true ---MACHINES["SUN4C_MMU"] = true -MACHINES["SWTPC8212"] = true -MACHINES["TASC_SB30"] = true -MACHINES["TC0091LVC"] = true ---MACHINES["TDC1008"] = true -MACHINES["TE7750"] = true -MACHINES["TICKET"] = true -MACHINES["TIMEKPR"] = true ---MACHINES["TMC208K"] = true -MACHINES["TMP68301"] = true ---MACHINES["TMS5501"] = true -MACHINES["TMS6100"] = true -MACHINES["TMS9901"] = true -MACHINES["TMS9902"] = true ---MACHINES["TPI6525"] = true -MACHINES["TSB12LV01A"] = true ---MACHINES["TTL74123"] = true ---MACHINES["TTL74145"] = true ---MACHINES["TTL74148"] = true ---MACHINES["TTL74153"] = true ---MACHINES["TTL74181"] = true ---MACHINES["TTL7474"] = true ---MACHINES["UCB1200"] = true -MACHINES["UPD1990A"] = true ---MACHINES["UPD4991A"] = true -MACHINES["UPD4992"] = true -MACHINES["UPD4701"] = true -MACHINES["UPD7001"] = true -MACHINES["UPD7002"] = true -MACHINES["UPD7004"] = true -MACHINES["UPD71071"] = true -MACHINES["UPD765"] = true -MACHINES["FDC_PLL"] = true -MACHINES["V3021"] = true -MACHINES["WD_FDC"] = true ---MACHINES["WD1010"] = true -MACHINES["WD11C00_17"] = true -MACHINES["WD2010"] = true -MACHINES["WD33C9X"] = true -MACHINES["X2212"] = true -MACHINES["X76F041"] = true -MACHINES["X76F100"] = true -MACHINES["Z80CTC"] = true -MACHINES["Z80SIO"] = true -MACHINES["Z80SCC"] = true -MACHINES["Z80DMA"] = true -MACHINES["Z80PIO"] = true -MACHINES["Z80STI"] = true -MACHINES["Z8536"] = true -MACHINES["SECFLASH"] = true -MACHINES["PCCARD"] = true -MACHINES["FDC37C665GT"] = true ---MACHINES["SMC92X4"] = true ---MACHINES["TI99_HD"] = true ---MACHINES["STRATA"] = true -MACHINES["STEPPERS"] = true ---MACHINES["CORVUSHD"] = true ---MACHINES["WOZFDC"] = true ---MACHINES["APPLE_FDINTF"] = true ---MACHINES["IWM"] = true ---MACHINES["SWIM1"] = true ---MACHINES["SWIM2"] = true ---MACHINES["SWIM3"] = true ---MACHINES["MAC_VIDEO_SONORA"] = true ---MACHINES["DIABLO_HD"] = true -MACHINES["PCI9050"] = true -MACHINES["TMS1024"] = true -MACHINES["GENPC"] = true -MACHINES["GEN_LATCH"] = true -MACHINES["WATCHDOG"] = true -MACHINES["SMARTMEDIA"] = true -MACHINES["I82586"] = true -MACHINES["INPUT_MERGER"] = true -MACHINES["K054321"] = true -MACHINES["ADC0844"] = true -MACHINES["GEN_FIFO"] = true -MACHINES["Z80DAISY"] = true ---MACHINES["PS2DMAC"] = true -MACHINES["PS2INTC"] = true ---MACHINES["PS2MC"] = true ---MACHINES["PS2PAD"] = true ---MACHINES["PS2SIF"] = true ---MACHINES["PS2TIMER"] = true ---MACHINES["IOPCDVD"] = true ---MACHINES["IOPDMA"] = true ---MACHINES["IOPINTC"] = true ---MACHINES["IOPSIO2"] = true ---MACHINES["IOPTIMER"] = true -MACHINES["AIC565"] = true -MACHINES["AIC580"] = true -MACHINES["AIC6250"] = true -MACHINES["VRENDER0"] = true -MACHINES["AT_MB"] = true - --------------------------------------------------- --- specify available bus cores --------------------------------------------------- - ---BUSES["A1BUS"] = true ---BUSES["A2BUS"] = true ---BUSES["A7800"] = true ---BUSES["A800"] = true ---BUSES["ABCBUS"] = true ---BUSES["ABCKB"] = true ---BUSES["ADAM"] = true ---BUSES["ADAMNET"] = true ---BUSES["ADB"] = true ---BUSES["APF"] = true -BUSES["AMIGA_KEYBOARD"] = true ---BUSES["ARCADIA"] = true ---BUSES["ASTROCADE"] = true -BUSES["ATA"] = true ---BUSES["BML3"] = true ---BUSES["BW2"] = true ---BUSES["C64"] = true ---BUSES["CBM2"] = true ---BUSES["CBMIEC"] = true -BUSES["CENTRONICS"] = true ---BUSES["CHANNELF"] = true ---BUSES["COCO"] = true ---BUSES["COLECO_CONTROLLER"] = true ---BUSES["COLECO_CART"] = true ---BUSES["COMPUCOLOR"] = true ---BUSES["COMX35"] = true ---BUSES["CPC"] = true ---BUSES["CRVISION"] = true ---BUSES["DMV"] = true ---BUSES["ECBBUS"] = true ---BUSES["ECONET"] = true ---BUSES["EP64"] = true ---BUSES["EPSON_SIO"] = true ---BUSES["GAMEBOY"] = true -BUSES["GAMEGEAR"] = true ---BUSES["GBA"] = true -BUSES["GENERIC"] = true ---BUSES["IEEE488"] = true ---BUSES["IMI7000"] = true ---BUSES["INTV"] = true ---BUSES["IQ151"] = true -BUSES["ISA"] = true ---BUSES["ISBX"] = true ---BUSES["KC"] = true ---BUSES["LPCI"] = true ---BUSES["MACPDS"] = true -BUSES["MIDI"] = true ---BUSES["MEGADRIVE"] = true ---BUSES["MSX_SLOT"] = true -BUSES["NEOGEO"] = true -BUSES["NEOGEO_CTRL"] = true -BUSES["NES_CTRL"] = true -BUSES["NSCSI"] = true ---BUSES["NUBUS"] = true ---BUSES["O2"] = true ---BUSES["ORICEXT"] = true ---BUSES["PCE"] = true ---BUSES["PCE_CTRL"] = true -BUSES["PC_JOY"] = true -BUSES["PC_KBD"] = true ---BUSES["PET"] = true ---BUSES["PLUS4"] = true -BUSES["PSX_CONTROLLER"] = true ---BUSES["QL"] = true -BUSES["RS232"] = true ---BUSES["S100"] = true -BUSES["SAT_CTRL"] = true ---BUSES["SATURN"] = true -BUSES["SCSI"] = true ---BUSES["SCV"] = true -BUSES["SEGA8"] = true -BUSES["SG1000_EXP"] = true -BUSES["SGIKBD"] = true -BUSES["SMS_CTRL"] = true -BUSES["SMS_EXP"] = true -BUSES["SNES_CTRL"] = true ---BUSES["SPC1000"] = true -BUSES["SUNKBD"] = true ---BUSES["TI99PEB"] = true ---BUSES["TVC"] = true ---BUSES["VBOY"] = true ---BUSES["VC4000"] = true ---BUSES["VCS"] = true ---BUSES["VCS_CTRL"] = true -BUSES["VECTREX"] = true ---BUSES["VIC10"] = true ---BUSES["VIC20"] = true ---BUSES["VIDBRAIN"] = true ---BUSES["VIP"] = true ---BUSES["VME"] = true ---BUSES["VSMILE"] = true ---BUSES["VTECH_IOEXP"] = true ---BUSES["VTECH_MEMEXP"] = true ---BUSES["WANGPC"] = true ---BUSES["WSWAN"] = true ---BUSES["X68K"] = true ---BUSES["Z88"] = true -BUSES["ZORRO"] = true ---BUSES["THOMSON"] = true - - --------------------------------------------------- --- specify used file formats --------------------------------------------------- - -FORMATS["APOLLO_DSK"] = true -FORMATS["GUAB_DSK"] = true -FORMATS["AMI_DSK"] = true -FORMATS["SC3000_BIT"] = true -FORMATS["WD177X_DSK"] = true -FORMATS["NASLITE_DSK"] = true -FORMATS["BASICDSK"] = true -FORMATS["IBMXDF_DSK"] = true -FORMATS["IPF_DSK"] = true -FORMATS["TZX_CAS"] = true - --------------------------------------------------- --- this is the list of driver libraries that --- comprise MAME plus mamedriv.o which contains --- the list of drivers --------------------------------------------------- - -function linkProjects_mame_arcade(_target, _subtarget) - links { - "acorn", - "adp", - "alba", - "alliedl", - "alpha", - "amiga", - "aristocr", - "ascii", - "atari", - "atlus", - "barcrest", - "bfm", - "bmc", - "capcom", - "ces", - "cinemat", - "cirsa", - "comad", - "cvs", - "dataeast", - "dgrm", - "dooyong", - "dynax", - "edevices", - "efo", - "eolith", - "excelent", - "exidy", - "f32", - "funworld", - "fuuki", - "gaelco", - "galaxian", - "gameplan", - "gametron", - "gottlieb", - "ibmpc", - "igs", - "igt", - "irem", - "itech", - "jaleco", - "jpm", - "kaneko", - "kiwako", - "konami", - "matic", - "maygay", - "meadows", - "merit", - "metro", - "midcoin", - "midw8080", - "midway", - "mr", - "namco", - "nasco", - "neogeo", - "nichibut", - "nintendo", - "nix", - "nmk", - "novadesitec", - "omori", - "olympia", - "orca", - "pacific", - "pacman", - "pce", - "phoenix", - "playmark", - "promat", - "psikyo", - "ramtek", - "rare", - "sanritsu", - "sega", - "seibu", - "seta", - "sigma", - "snk", - "sony", - "stern", - "subsino", - "suna", - "sunelect", - "taito", - "tatsumi", - "tch", - "tecfri", - "technos", - "tehkan", - "terminal", - "thepit", - "toaplan", - "unico", - "univers", - "upl", - "valadon", - "venture", - "vsystem", - "wing", - "yunsung", - "zaccaria", - "misc", - "pinball", - "shared", - } -end - -function createMAMEProjects(_target, _subtarget, _name) - project (_name) - targetsubdir(_target .."_" .. _subtarget) - kind (LIBTYPE) - uuid (os.uuid("drv-" .. _target .."_" .. _subtarget .. "_" .._name)) - addprojectflags() - precompiledheaders_novs() - - includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/emu", - MAME_DIR .. "src/devices", - MAME_DIR .. "src/mame", - MAME_DIR .. "src/lib", - MAME_DIR .. "src/lib/util", - MAME_DIR .. "3rdparty", - GEN_DIR .. "mame/layout", - } - includedirs { - ext_includedir("asio"), - ext_includedir("flac"), - ext_includedir("glm"), - ext_includedir("jpeg"), - ext_includedir("rapidjson"), - } - -end - -function createProjects_mame_arcade(_target, _subtarget) --------------------------------------------------- --- the following files are general components and --- shared across a number of drivers --------------------------------------------------- - -createMAMEProjects(_target, _subtarget, "shared") -files { - MAME_DIR .. "src/mame/machine/bacta_datalogger.cpp", - MAME_DIR .. "src/mame/machine/bacta_datalogger.h", - MAME_DIR .. "src/mame/machine/cedar_magnet_board.cpp", - MAME_DIR .. "src/mame/machine/cedar_magnet_board.h", - MAME_DIR .. "src/mame/machine/dc_g2if.cpp", - MAME_DIR .. "src/mame/machine/dc_g2if.h", - MAME_DIR .. "src/mame/machine/dc.cpp", - MAME_DIR .. "src/mame/includes/dc.h", - MAME_DIR .. "src/mame/machine/dc-ctrl.cpp", - MAME_DIR .. "src/mame/machine/dc-ctrl.h", - MAME_DIR .. "src/mame/machine/gdrom.cpp", - MAME_DIR .. "src/mame/machine/gdrom.h", - MAME_DIR .. "src/mame/machine/inder_vid.cpp", - MAME_DIR .. "src/mame/machine/inder_vid.h", - MAME_DIR .. "src/mame/machine/maple-dc.cpp", - MAME_DIR .. "src/mame/machine/maple-dc.h", - MAME_DIR .. "src/mame/machine/mapledev.cpp", - MAME_DIR .. "src/mame/machine/mapledev.h", - MAME_DIR .. "src/mame/machine/mc8123.cpp", - MAME_DIR .. "src/mame/machine/mc8123.h", - MAME_DIR .. "src/mame/machine/mie.cpp", - MAME_DIR .. "src/mame/machine/mie.h", - MAME_DIR .. "src/mame/machine/naomig1.cpp", - MAME_DIR .. "src/mame/machine/naomig1.h", - MAME_DIR .. "src/mame/machine/nmk112.cpp", - MAME_DIR .. "src/mame/machine/nmk112.h", - MAME_DIR .. "src/mame/machine/pcshare.cpp", - MAME_DIR .. "src/mame/machine/pcshare.h", - MAME_DIR .. "src/mame/machine/sec.cpp", - MAME_DIR .. "src/mame/machine/sec.h", - MAME_DIR .. "src/mame/machine/segacrp2_device.cpp", - MAME_DIR .. "src/mame/machine/segacrp2_device.h", - MAME_DIR .. "src/mame/machine/segacrpt_device.cpp", - MAME_DIR .. "src/mame/machine/segacrpt_device.h", - MAME_DIR .. "src/mame/machine/taito68705interface.cpp", - MAME_DIR .. "src/mame/machine/taito68705interface.h", - MAME_DIR .. "src/mame/machine/xbox.cpp", - MAME_DIR .. "src/mame/machine/xbox.h", - MAME_DIR .. "src/mame/machine/xbox_pci.cpp", - MAME_DIR .. "src/mame/machine/xbox_pci.h", - MAME_DIR .. "src/mame/machine/xbox_usb.cpp", - MAME_DIR .. "src/mame/machine/xbox_usb.h", - MAME_DIR .. "src/mame/audio/cage.cpp", - MAME_DIR .. "src/mame/audio/cage.h", - MAME_DIR .. "src/mame/audio/bally.cpp", - MAME_DIR .. "src/mame/audio/bally.h", - MAME_DIR .. "src/mame/audio/gottlieb.cpp", - MAME_DIR .. "src/mame/audio/gottlieb.h", - MAME_DIR .. "src/mame/audio/seibu.cpp", - MAME_DIR .. "src/mame/audio/seibu.h", - MAME_DIR .. "src/mame/audio/dcs.cpp", - MAME_DIR .. "src/mame/audio/dcs.h", - MAME_DIR .. "src/mame/audio/decobsmt.cpp", - MAME_DIR .. "src/mame/audio/decobsmt.h", - MAME_DIR .. "src/mame/audio/efo_zsu.cpp", - MAME_DIR .. "src/mame/audio/efo_zsu.h", - MAME_DIR .. "src/mame/audio/fruitsamples.cpp", - MAME_DIR .. "src/mame/audio/fruitsamples.h", - MAME_DIR .. "src/mame/audio/rax.cpp", - MAME_DIR .. "src/mame/audio/rax.h", - MAME_DIR .. "src/mame/audio/s11c_bg.cpp", - MAME_DIR .. "src/mame/audio/s11c_bg.h", - MAME_DIR .. "src/mame/audio/segam1audio.cpp", - MAME_DIR .. "src/mame/audio/segam1audio.h", - MAME_DIR .. "src/mame/audio/taitosnd.cpp", - MAME_DIR .. "src/mame/audio/taitosnd.h", - MAME_DIR .. "src/mame/audio/timeplt.cpp", - MAME_DIR .. "src/mame/audio/timeplt.h", - MAME_DIR .. "src/mame/audio/williams.cpp", - MAME_DIR .. "src/mame/audio/williams.h", - MAME_DIR .. "src/mame/video/alpha68k_palette.cpp", - MAME_DIR .. "src/mame/video/alpha68k_palette.h", - MAME_DIR .. "src/mame/video/avgdvg.cpp", - MAME_DIR .. "src/mame/video/avgdvg.h", - MAME_DIR .. "src/mame/video/awpvid.cpp", - MAME_DIR .. "src/mame/video/awpvid.h", - MAME_DIR .. "src/mame/video/decospr.cpp", - MAME_DIR .. "src/mame/video/decospr.h", - MAME_DIR .. "src/mame/video/k051316.cpp", - MAME_DIR .. "src/mame/video/k051316.h", - MAME_DIR .. "src/mame/video/k053936.cpp", - MAME_DIR .. "src/mame/video/k053936.h", - MAME_DIR .. "src/mame/video/pk8000.cpp", - MAME_DIR .. "src/mame/video/pk8000.h", - MAME_DIR .. "src/mame/video/powervr2.cpp", - MAME_DIR .. "src/mame/video/powervr2.h", - MAME_DIR .. "src/mame/video/seta001.cpp", - MAME_DIR .. "src/mame/video/seta001.h", - MAME_DIR .. "src/mame/video/snk68_spr.cpp", - MAME_DIR .. "src/mame/video/snk68_spr.h", - MAME_DIR .. "src/mame/video/tecmo_spr.cpp", - MAME_DIR .. "src/mame/video/tecmo_spr.h", - MAME_DIR .. "src/mame/video/tmap038.cpp", - MAME_DIR .. "src/mame/video/tmap038.h", - MAME_DIR .. "src/mame/video/xbox_nv2a.cpp", - MAME_DIR .. "src/mame/video/xbox_nv2a.h", -} - --------------------------------------------------- --- manufacturer-specific groupings for drivers --------------------------------------------------- - -createMAMEProjects(_target, _subtarget, "acorn") -files { - MAME_DIR .. "src/mame/drivers/ertictac.cpp", - MAME_DIR .. "src/mame/drivers/ssfindo.cpp", - MAME_DIR .. "src/mame/drivers/aristmk5.cpp", -} - -createMAMEProjects(_target, _subtarget, "adp") -files { - MAME_DIR .. "src/mame/drivers/adp.cpp", - MAME_DIR .. "src/mame/drivers/manohman.cpp", - MAME_DIR .. "src/mame/drivers/stellafr.cpp", -} - -createMAMEProjects(_target, _subtarget, "alba") -files { - MAME_DIR .. "src/mame/drivers/albazg.cpp", - MAME_DIR .. "src/mame/drivers/rmhaihai.cpp", - MAME_DIR .. "src/mame/drivers/vsmjtria.cpp", -} - -createMAMEProjects(_target, _subtarget, "alliedl") -files { - MAME_DIR .. "src/mame/drivers/ace.cpp", - MAME_DIR .. "src/mame/drivers/aleisttl.cpp", - MAME_DIR .. "src/mame/drivers/clayshoo.cpp", -} - -createMAMEProjects(_target, _subtarget, "alpha") -files { - MAME_DIR .. "src/mame/drivers/alpha68k.cpp", - MAME_DIR .. "src/mame/includes/alpha68k.h", - MAME_DIR .. "src/mame/video/alpha68k.cpp", - MAME_DIR .. "src/mame/drivers/alpha68k_i.cpp", - MAME_DIR .. "src/mame/drivers/alpha68k_n.cpp", - MAME_DIR .. "src/mame/drivers/champbas.cpp", - MAME_DIR .. "src/mame/includes/champbas.h", - MAME_DIR .. "src/mame/video/champbas.cpp", - MAME_DIR .. "src/mame/drivers/equites.cpp", - MAME_DIR .. "src/mame/includes/equites.h", - MAME_DIR .. "src/mame/video/equites.cpp", - MAME_DIR .. "src/mame/drivers/meijinsn.cpp", - MAME_DIR .. "src/mame/drivers/shougi.cpp", - MAME_DIR .. "src/mame/audio/ad_sound.cpp", - MAME_DIR .. "src/mame/audio/ad_sound.h", - MAME_DIR .. "src/mame/machine/alpha8201.cpp", - MAME_DIR .. "src/mame/machine/alpha8201.h", -} - -createMAMEProjects(_target, _subtarget, "amiga") -files { - MAME_DIR .. "src/mame/includes/amiga.h", - MAME_DIR .. "src/mame/drivers/alg.cpp", - MAME_DIR .. "src/mame/drivers/amiga.cpp", - MAME_DIR .. "src/mame/machine/amiga.cpp", - MAME_DIR .. "src/mame/video/amiga.cpp", - MAME_DIR .. "src/mame/video/amigaaga.cpp", - MAME_DIR .. "src/mame/video/amigaaga.h", - MAME_DIR .. "src/mame/drivers/arsystems.cpp", - MAME_DIR .. "src/mame/drivers/cubo.cpp", - MAME_DIR .. "src/mame/drivers/mquake.cpp", - MAME_DIR .. "src/mame/drivers/upscope.cpp", -} - -createMAMEProjects(_target, _subtarget, "aristocr") -files { - MAME_DIR .. "src/mame/drivers/aristmk4.cpp", - MAME_DIR .. "src/mame/drivers/aristmk6.cpp", - MAME_DIR .. "src/mame/drivers/caswin.cpp", -} - -createMAMEProjects(_target, _subtarget, "ascii") -files { - MAME_DIR .. "src/mame/drivers/big10.cpp", - MAME_DIR .. "src/mame/drivers/forte2.cpp", - MAME_DIR .. "src/mame/drivers/pengadvb.cpp", - MAME_DIR .. "src/mame/drivers/sangho.cpp", - MAME_DIR .. "src/mame/drivers/sfkick.cpp", -} - -createMAMEProjects(_target, _subtarget, "atari") -files { - MAME_DIR .. "src/mame/drivers/akkaarrh.cpp", - MAME_DIR .. "src/mame/drivers/arcadecl.cpp", - MAME_DIR .. "src/mame/includes/arcadecl.h", - MAME_DIR .. "src/mame/video/arcadecl.cpp", - MAME_DIR .. "src/mame/drivers/asteroid.cpp", - MAME_DIR .. "src/mame/includes/asteroid.h", - MAME_DIR .. "src/mame/machine/asteroid.cpp", - MAME_DIR .. "src/mame/audio/asteroid.cpp", - MAME_DIR .. "src/mame/audio/llander.cpp", - MAME_DIR .. "src/mame/drivers/atarifb.cpp", - MAME_DIR .. "src/mame/includes/atarifb.h", - MAME_DIR .. "src/mame/machine/atarifb.cpp", - MAME_DIR .. "src/mame/audio/atarifb.cpp", - MAME_DIR .. "src/mame/video/atarifb.cpp", - MAME_DIR .. "src/mame/drivers/atarig1.cpp", - MAME_DIR .. "src/mame/includes/atarig1.h", - MAME_DIR .. "src/mame/video/atarig1.cpp", - MAME_DIR .. "src/mame/drivers/atarig42.cpp", - MAME_DIR .. "src/mame/includes/atarig42.h", - MAME_DIR .. "src/mame/video/atarig42.cpp", - MAME_DIR .. "src/mame/drivers/atarigt.cpp", - MAME_DIR .. "src/mame/includes/atarigt.h", - MAME_DIR .. "src/mame/video/atarigt.cpp", - MAME_DIR .. "src/mame/drivers/atarigx2.cpp", - MAME_DIR .. "src/mame/includes/atarigx2.h", - MAME_DIR .. "src/mame/video/atarigx2.cpp", - MAME_DIR .. "src/mame/drivers/atarisy1.cpp", - MAME_DIR .. "src/mame/includes/atarisy1.h", - MAME_DIR .. "src/mame/video/atarisy1.cpp", - MAME_DIR .. "src/mame/drivers/atarisy2.cpp", - MAME_DIR .. "src/mame/includes/atarisy2.h", - MAME_DIR .. "src/mame/video/atarisy2.cpp", - MAME_DIR .. "src/mame/drivers/atarisy4.cpp", - MAME_DIR .. "src/mame/drivers/atarittl.cpp", - MAME_DIR .. "src/mame/machine/nl_gtrak10.cpp", - MAME_DIR .. "src/mame/machine/nl_gtrak10.h", - MAME_DIR .. "src/mame/machine/nl_stuntcyc.cpp", - MAME_DIR .. "src/mame/machine/nl_stuntcyc.h", - MAME_DIR .. "src/mame/machine/nl_tank.cpp", - MAME_DIR .. "src/mame/machine/nl_tank.h", - MAME_DIR .. "src/mame/drivers/atetris.cpp", - MAME_DIR .. "src/mame/drivers/avalnche.cpp", - MAME_DIR .. "src/mame/includes/avalnche.h", - MAME_DIR .. "src/mame/audio/avalnche.cpp", - MAME_DIR .. "src/mame/drivers/badlands.cpp", - MAME_DIR .. "src/mame/includes/badlands.h", - MAME_DIR .. "src/mame/machine/badlands.cpp", - MAME_DIR .. "src/mame/video/badlands.cpp", - MAME_DIR .. "src/mame/drivers/badlands_ms.cpp", - MAME_DIR .. "src/mame/drivers/badlandsbl.cpp", - MAME_DIR .. "src/mame/drivers/bartop52.cpp", - MAME_DIR .. "src/mame/drivers/batman.cpp", - MAME_DIR .. "src/mame/includes/batman.h", - MAME_DIR .. "src/mame/video/batman.cpp", - MAME_DIR .. "src/mame/drivers/beathead.cpp", - MAME_DIR .. "src/mame/includes/beathead.h", - MAME_DIR .. "src/mame/video/beathead.cpp", - MAME_DIR .. "src/mame/drivers/blstroid.cpp", - MAME_DIR .. "src/mame/includes/blstroid.h", - MAME_DIR .. "src/mame/video/blstroid.cpp", - MAME_DIR .. "src/mame/drivers/boxer.cpp", - MAME_DIR .. "src/mame/drivers/bsktball.cpp", - MAME_DIR .. "src/mame/includes/bsktball.h", - MAME_DIR .. "src/mame/machine/bsktball.cpp", - MAME_DIR .. "src/mame/audio/bsktball.cpp", - MAME_DIR .. "src/mame/video/bsktball.cpp", - MAME_DIR .. "src/mame/drivers/bwidow.cpp", - MAME_DIR .. "src/mame/includes/bwidow.h", - MAME_DIR .. "src/mame/audio/bwidow.cpp", - MAME_DIR .. "src/mame/drivers/bzone.cpp", - MAME_DIR .. "src/mame/includes/bzone.h", - MAME_DIR .. "src/mame/audio/bzone.cpp", - MAME_DIR .. "src/mame/drivers/canyon.cpp", - MAME_DIR .. "src/mame/includes/canyon.h", - MAME_DIR .. "src/mame/audio/canyon.cpp", - MAME_DIR .. "src/mame/video/canyon.cpp", - MAME_DIR .. "src/mame/drivers/cball.cpp", - MAME_DIR .. "src/mame/drivers/ccastles.cpp", - MAME_DIR .. "src/mame/includes/ccastles.h", - MAME_DIR .. "src/mame/video/ccastles.cpp", - MAME_DIR .. "src/mame/drivers/centiped.cpp", - MAME_DIR .. "src/mame/includes/centiped.h", - MAME_DIR .. "src/mame/video/centiped.cpp", - MAME_DIR .. "src/mame/drivers/cloak.cpp", - MAME_DIR .. "src/mame/includes/cloak.h", - MAME_DIR .. "src/mame/video/cloak.cpp", - MAME_DIR .. "src/mame/drivers/cloud9.cpp", - MAME_DIR .. "src/mame/includes/cloud9.h", - MAME_DIR .. "src/mame/video/cloud9.cpp", - MAME_DIR .. "src/mame/drivers/cmmb.cpp", - MAME_DIR .. "src/mame/drivers/cops.cpp", - MAME_DIR .. "src/mame/drivers/copsnrob.cpp", - MAME_DIR .. "src/mame/includes/copsnrob.h", - MAME_DIR .. "src/mame/audio/copsnrob.cpp", - MAME_DIR .. "src/mame/video/copsnrob.cpp", - MAME_DIR .. "src/mame/drivers/cyberbal.cpp", - MAME_DIR .. "src/mame/includes/cyberbal.h", - MAME_DIR .. "src/mame/video/cyberbal.cpp", - MAME_DIR .. "src/mame/drivers/cybstorm.cpp", - MAME_DIR .. "src/mame/includes/cybstorm.h", - MAME_DIR .. "src/mame/video/cybstorm.cpp", - MAME_DIR .. "src/mame/audio/nl_destroyr.cpp", - MAME_DIR .. "src/mame/audio/nl_destroyr.h", - MAME_DIR .. "src/mame/drivers/destroyr.cpp", - MAME_DIR .. "src/mame/drivers/dragrace.cpp", - MAME_DIR .. "src/mame/includes/dragrace.h", - MAME_DIR .. "src/mame/audio/dragrace.cpp", - MAME_DIR .. "src/mame/video/dragrace.cpp", - MAME_DIR .. "src/mame/drivers/eprom.cpp", - MAME_DIR .. "src/mame/includes/eprom.h", - MAME_DIR .. "src/mame/video/eprom.cpp", - MAME_DIR .. "src/mame/drivers/firefox.cpp", - MAME_DIR .. "src/mame/drivers/firetrk.cpp", - MAME_DIR .. "src/mame/includes/firetrk.h", - MAME_DIR .. "src/mame/audio/firetrk.cpp", - MAME_DIR .. "src/mame/video/firetrk.cpp", - MAME_DIR .. "src/mame/audio/nl_flyball.cpp", - MAME_DIR .. "src/mame/audio/nl_flyball.h", - MAME_DIR .. "src/mame/drivers/flyball.cpp", - MAME_DIR .. "src/mame/drivers/foodf.cpp", - MAME_DIR .. "src/mame/includes/foodf.h", - MAME_DIR .. "src/mame/video/foodf.cpp", - MAME_DIR .. "src/mame/drivers/gauntlet.cpp", - MAME_DIR .. "src/mame/includes/gauntlet.h", - MAME_DIR .. "src/mame/video/gauntlet.cpp", - MAME_DIR .. "src/mame/drivers/gumrally.cpp", - MAME_DIR .. "src/mame/drivers/harddriv.cpp", - MAME_DIR .. "src/mame/includes/harddriv.h", - MAME_DIR .. "src/mame/machine/harddriv.cpp", - MAME_DIR .. "src/mame/audio/harddriv.cpp", - MAME_DIR .. "src/mame/video/harddriv.cpp", - MAME_DIR .. "src/mame/drivers/irobot.cpp", - MAME_DIR .. "src/mame/includes/irobot.h", - MAME_DIR .. "src/mame/machine/irobot.cpp", - MAME_DIR .. "src/mame/video/irobot.cpp", - MAME_DIR .. "src/mame/drivers/jaguar.cpp", - MAME_DIR .. "src/mame/includes/jaguar.h", - MAME_DIR .. "src/mame/audio/jaguar.cpp", - MAME_DIR .. "src/mame/video/jag_blitter.cpp", - MAME_DIR .. "src/mame/video/jag_blitter.h", - MAME_DIR .. "src/mame/video/jaguar.cpp", - MAME_DIR .. "src/mame/video/jagblit.h", - MAME_DIR .. "src/mame/video/jagblit.ipp", - MAME_DIR .. "src/mame/video/jagobj.ipp", - MAME_DIR .. "src/mame/drivers/jedi.cpp", - MAME_DIR .. "src/mame/includes/jedi.h", - MAME_DIR .. "src/mame/audio/jedi.cpp", - MAME_DIR .. "src/mame/video/jedi.cpp", - MAME_DIR .. "src/mame/drivers/klax.cpp", - MAME_DIR .. "src/mame/includes/klax.h", - MAME_DIR .. "src/mame/video/klax.cpp", - MAME_DIR .. "src/mame/drivers/liberatr.cpp", - MAME_DIR .. "src/mame/includes/liberatr.h", - MAME_DIR .. "src/mame/video/liberatr.cpp", - MAME_DIR .. "src/mame/drivers/marblmd2.cpp", - MAME_DIR .. "src/mame/drivers/maxaflex.cpp", - MAME_DIR .. "src/mame/machine/atari400.cpp", - MAME_DIR .. "src/mame/includes/atari400.h", - MAME_DIR .. "src/mame/video/atari400.cpp", - MAME_DIR .. "src/mame/video/antic.cpp", - MAME_DIR .. "src/mame/video/antic.h", - MAME_DIR .. "src/mame/video/gtia.cpp", - MAME_DIR .. "src/mame/video/gtia.h", - MAME_DIR .. "src/mame/drivers/mediagx.cpp", - MAME_DIR .. "src/mame/drivers/metalmx.cpp", - MAME_DIR .. "src/mame/includes/metalmx.h", - MAME_DIR .. "src/mame/drivers/mgolf.cpp", - MAME_DIR .. "src/mame/drivers/mhavoc.cpp", - MAME_DIR .. "src/mame/includes/mhavoc.h", - MAME_DIR .. "src/mame/machine/mhavoc.cpp", - MAME_DIR .. "src/mame/drivers/missile.cpp", - MAME_DIR .. "src/mame/drivers/nitedrvr.cpp", - MAME_DIR .. "src/mame/includes/nitedrvr.h", - MAME_DIR .. "src/mame/machine/nitedrvr.cpp", - MAME_DIR .. "src/mame/audio/nitedrvr.cpp", - MAME_DIR .. "src/mame/video/nitedrvr.cpp", - MAME_DIR .. "src/mame/drivers/offtwall.cpp", - MAME_DIR .. "src/mame/includes/offtwall.h", - MAME_DIR .. "src/mame/video/offtwall.cpp", - MAME_DIR .. "src/mame/drivers/orbit.cpp", - MAME_DIR .. "src/mame/includes/orbit.h", - MAME_DIR .. "src/mame/audio/orbit.cpp", - MAME_DIR .. "src/mame/video/orbit.cpp", - MAME_DIR .. "src/mame/drivers/pong.cpp", - MAME_DIR .. "src/mame/machine/nl_pong.cpp", - MAME_DIR .. "src/mame/machine/nl_pong.h", - MAME_DIR .. "src/mame/machine/nl_pongdoubles.cpp", - MAME_DIR .. "src/mame/machine/nl_pongdoubles.h", - MAME_DIR .. "src/mame/machine/nl_breakout.cpp", - MAME_DIR .. "src/mame/machine/nl_breakout.h", - MAME_DIR .. "src/mame/machine/nl_rebound.cpp", - MAME_DIR .. "src/mame/machine/nl_rebound.h", - MAME_DIR .. "src/mame/drivers/poolshrk.cpp", - MAME_DIR .. "src/mame/includes/poolshrk.h", - MAME_DIR .. "src/mame/audio/poolshrk.cpp", - MAME_DIR .. "src/mame/video/poolshrk.cpp", - MAME_DIR .. "src/mame/drivers/quantum.cpp", - MAME_DIR .. "src/mame/drivers/quizshow.cpp", - MAME_DIR .. "src/mame/drivers/rampart.cpp", - MAME_DIR .. "src/mame/includes/rampart.h", - MAME_DIR .. "src/mame/video/rampart.cpp", - MAME_DIR .. "src/mame/drivers/relief.cpp", - MAME_DIR .. "src/mame/includes/relief.h", - MAME_DIR .. "src/mame/video/relief.cpp", - MAME_DIR .. "src/mame/drivers/runaway.cpp", - MAME_DIR .. "src/mame/drivers/sbrkout.cpp", - MAME_DIR .. "src/mame/drivers/shuuz.cpp", - MAME_DIR .. "src/mame/includes/shuuz.h", - MAME_DIR .. "src/mame/video/shuuz.cpp", - MAME_DIR .. "src/mame/drivers/skullxbo.cpp", - MAME_DIR .. "src/mame/includes/skullxbo.h", - MAME_DIR .. "src/mame/video/skullxbo.cpp", - MAME_DIR .. "src/mame/drivers/skydiver.cpp", - MAME_DIR .. "src/mame/includes/skydiver.h", - MAME_DIR .. "src/mame/audio/skydiver.cpp", - MAME_DIR .. "src/mame/video/skydiver.cpp", - MAME_DIR .. "src/mame/drivers/skyraid.cpp", - MAME_DIR .. "src/mame/includes/skyraid.h", - MAME_DIR .. "src/mame/audio/skyraid.cpp", - MAME_DIR .. "src/mame/video/skyraid.cpp", - MAME_DIR .. "src/mame/drivers/sprint2.cpp", - MAME_DIR .. "src/mame/includes/sprint2.h", - MAME_DIR .. "src/mame/audio/sprint2.cpp", - MAME_DIR .. "src/mame/video/sprint2.cpp", - MAME_DIR .. "src/mame/drivers/sprint4.cpp", - MAME_DIR .. "src/mame/audio/sprint4.cpp", - MAME_DIR .. "src/mame/audio/sprint4.h", - MAME_DIR .. "src/mame/drivers/sprint8.cpp", - MAME_DIR .. "src/mame/includes/sprint8.h", - MAME_DIR .. "src/mame/audio/sprint8.cpp", - MAME_DIR .. "src/mame/video/sprint8.cpp", - MAME_DIR .. "src/mame/drivers/starshp1.cpp", - MAME_DIR .. "src/mame/includes/starshp1.h", - MAME_DIR .. "src/mame/audio/starshp1.cpp", - MAME_DIR .. "src/mame/video/starshp1.cpp", - MAME_DIR .. "src/mame/drivers/starwars.cpp", - MAME_DIR .. "src/mame/includes/starwars.h", - MAME_DIR .. "src/mame/machine/starwars.cpp", - MAME_DIR .. "src/mame/audio/starwars.cpp", - MAME_DIR .. "src/mame/drivers/subs.cpp", - MAME_DIR .. "src/mame/includes/subs.h", - MAME_DIR .. "src/mame/machine/subs.cpp", - MAME_DIR .. "src/mame/audio/subs.cpp", - MAME_DIR .. "src/mame/video/subs.cpp", - MAME_DIR .. "src/mame/drivers/tank8.cpp", - MAME_DIR .. "src/mame/includes/tank8.h", - MAME_DIR .. "src/mame/audio/tank8.cpp", - MAME_DIR .. "src/mame/video/tank8.cpp", - MAME_DIR .. "src/mame/drivers/tempest.cpp", - MAME_DIR .. "src/mame/drivers/thunderj.cpp", - MAME_DIR .. "src/mame/includes/thunderj.h", - MAME_DIR .. "src/mame/video/thunderj.cpp", - MAME_DIR .. "src/mame/drivers/tomcat.cpp", - MAME_DIR .. "src/mame/drivers/toobin.cpp", - MAME_DIR .. "src/mame/includes/toobin.h", - MAME_DIR .. "src/mame/video/toobin.cpp", - MAME_DIR .. "src/mame/drivers/tourtabl.cpp", - MAME_DIR .. "src/mame/video/tia.cpp", - MAME_DIR .. "src/mame/video/tia.h", - MAME_DIR .. "src/mame/drivers/triplhnt.cpp", - MAME_DIR .. "src/mame/includes/triplhnt.h", - MAME_DIR .. "src/mame/audio/triplhnt.cpp", - MAME_DIR .. "src/mame/video/triplhnt.cpp", - MAME_DIR .. "src/mame/drivers/tunhunt.cpp", - MAME_DIR .. "src/mame/includes/tunhunt.h", - MAME_DIR .. "src/mame/video/tunhunt.cpp", - MAME_DIR .. "src/mame/drivers/ultratnk.cpp", - MAME_DIR .. "src/mame/includes/ultratnk.h", - MAME_DIR .. "src/mame/video/ultratnk.cpp", - MAME_DIR .. "src/mame/drivers/videopin.cpp", - MAME_DIR .. "src/mame/includes/videopin.h", - MAME_DIR .. "src/mame/audio/videopin.cpp", - MAME_DIR .. "src/mame/video/videopin.cpp", - MAME_DIR .. "src/mame/drivers/vindictr.cpp", - MAME_DIR .. "src/mame/includes/vindictr.h", - MAME_DIR .. "src/mame/video/vindictr.cpp", - MAME_DIR .. "src/mame/drivers/wolfpack.cpp", - MAME_DIR .. "src/mame/includes/wolfpack.h", - MAME_DIR .. "src/mame/video/wolfpack.cpp", - MAME_DIR .. "src/mame/drivers/xybots.cpp", - MAME_DIR .. "src/mame/includes/xybots.h", - MAME_DIR .. "src/mame/video/xybots.cpp", - MAME_DIR .. "src/mame/machine/asic65.cpp", - MAME_DIR .. "src/mame/machine/asic65.h", - MAME_DIR .. "src/mame/machine/atarigen.cpp", - MAME_DIR .. "src/mame/machine/atarigen.h", - MAME_DIR .. "src/mame/machine/atariscom.cpp", - MAME_DIR .. "src/mame/machine/atariscom.h", - MAME_DIR .. "src/mame/machine/mathbox.cpp", - MAME_DIR .. "src/mame/machine/mathbox.h", - MAME_DIR .. "src/mame/machine/slapstic.cpp", - MAME_DIR .. "src/mame/machine/slapstic.h", - MAME_DIR .. "src/mame/machine/atarixga.cpp", - MAME_DIR .. "src/mame/machine/atarixga.h", - MAME_DIR .. "src/mame/audio/atarijsa.cpp", - MAME_DIR .. "src/mame/audio/atarijsa.h", - MAME_DIR .. "src/mame/audio/atarisac.cpp", - MAME_DIR .. "src/mame/audio/atarisac.h", - MAME_DIR .. "src/mame/audio/redbaron.cpp", - MAME_DIR .. "src/mame/audio/redbaron.h", - MAME_DIR .. "src/mame/video/atarimo.cpp", - MAME_DIR .. "src/mame/video/atarimo.h", - MAME_DIR .. "src/mame/video/atarirle.cpp", - MAME_DIR .. "src/mame/video/atarirle.h", - MAME_DIR .. "src/mame/video/atarivad.cpp", - MAME_DIR .. "src/mame/video/atarivad.h", -} - -createMAMEProjects(_target, _subtarget, "atlus") -files { - MAME_DIR .. "src/mame/drivers/bowltry.cpp", - MAME_DIR .. "src/mame/drivers/ohmygod.cpp", - MAME_DIR .. "src/mame/drivers/patapata.cpp", - MAME_DIR .. "src/mame/drivers/rallypnt.cpp", -} - -createMAMEProjects(_target, _subtarget, "barcrest") -files { - MAME_DIR .. "src/mame/drivers/mpu2.cpp", - MAME_DIR .. "src/mame/drivers/mpu3.cpp", - MAME_DIR .. "src/mame/drivers/mpu4.cpp", - MAME_DIR .. "src/mame/includes/mpu4.h", - MAME_DIR .. "src/mame/drivers/mpu4unsorted.cpp", - MAME_DIR .. "src/mame/drivers/mpu4avan.cpp", - MAME_DIR .. "src/mame/drivers/mpu4bwb.cpp", - MAME_DIR .. "src/mame/drivers/mpu4concept.cpp", - MAME_DIR .. "src/mame/drivers/mpu4crystal.cpp", - MAME_DIR .. "src/mame/drivers/mpu4dealem.cpp", - MAME_DIR .. "src/mame/drivers/mpu4empire.cpp", - MAME_DIR .. "src/mame/drivers/mpu4mdm.cpp", - MAME_DIR .. "src/mame/drivers/mpu4misc.cpp", - MAME_DIR .. "src/mame/drivers/mpu4mod2sw.cpp", - MAME_DIR .. "src/mame/drivers/mpu4mod4oki.cpp", - MAME_DIR .. "src/mame/drivers/mpu4mod4yam.cpp", - MAME_DIR .. "src/mame/drivers/mpu4plasma.cpp", - MAME_DIR .. "src/mame/drivers/mpu4union.cpp", - MAME_DIR .. "src/mame/drivers/mpu4vid.cpp", - MAME_DIR .. "src/mame/machine/mpu4_characteriser_pal.cpp", - MAME_DIR .. "src/mame/machine/mpu4_characteriser_pal.h", - MAME_DIR .. "src/mame/machine/mpu4_characteriser_pal_bwb.cpp", - MAME_DIR .. "src/mame/machine/mpu4_characteriser_pal_bwb.h", - MAME_DIR .. "src/mame/machine/mpu4_characteriser_bootleg.cpp", - MAME_DIR .. "src/mame/machine/mpu4_characteriser_bootleg.h", - MAME_DIR .. "src/mame/includes/mpu5.h", - MAME_DIR .. "src/mame/drivers/mpu5.cpp", - MAME_DIR .. "src/mame/drivers/mpu5sw.cpp", -} - -createMAMEProjects(_target, _subtarget, "bfm") -files { - MAME_DIR .. "src/mame/drivers/bfcobra.cpp", - MAME_DIR .. "src/mame/includes/bfm_ad5.h", - MAME_DIR .. "src/mame/drivers/bfm_ad5.cpp", - MAME_DIR .. "src/mame/drivers/bfm_ad5sw.cpp", - MAME_DIR .. "src/mame/drivers/bfm_sc1.cpp", - MAME_DIR .. "src/mame/drivers/bfm_sc2.cpp", - MAME_DIR .. "src/mame/includes/bfm_sc4.h", - MAME_DIR .. "src/mame/drivers/bfm_sc4.cpp", - MAME_DIR .. "src/mame/includes/bfm_sc5.h", - MAME_DIR .. "src/mame/drivers/bfm_sc5.cpp", - MAME_DIR .. "src/mame/drivers/bfm_sc5sw.cpp", - MAME_DIR .. "src/mame/drivers/bfm_swp.cpp", - MAME_DIR .. "src/mame/drivers/bfmsys83.cpp", - MAME_DIR .. "src/mame/drivers/bfmsys85.cpp", - MAME_DIR .. "src/mame/drivers/rastersp.cpp", - MAME_DIR .. "src/mame/machine/bfm_bd1.h", - MAME_DIR .. "src/mame/machine/bfm_bd1.cpp", - MAME_DIR .. "src/mame/machine/bfm_bda.h", - MAME_DIR .. "src/mame/machine/bfm_bda.cpp", - MAME_DIR .. "src/mame/machine/bfm_comn.h", - MAME_DIR .. "src/mame/machine/bfm_comn.cpp", - MAME_DIR .. "src/mame/machine/bfm_sc45_helper.h", - MAME_DIR .. "src/mame/machine/bfm_sc45_helper.cpp", - MAME_DIR .. "src/mame/video/bfm_adr2.h", - MAME_DIR .. "src/mame/video/bfm_adr2.cpp", - MAME_DIR .. "src/mame/video/bfm_dm01.h", - MAME_DIR .. "src/mame/video/bfm_dm01.cpp", -} - -createMAMEProjects(_target, _subtarget, "bmc") -files { - MAME_DIR .. "src/mame/drivers/bmcbowl.cpp", - MAME_DIR .. "src/mame/drivers/koftball.cpp", - MAME_DIR .. "src/mame/drivers/popobear.cpp", - MAME_DIR .. "src/mame/drivers/bmcpokr.cpp", -} - -createMAMEProjects(_target, _subtarget, "capcom") -files { - MAME_DIR .. "src/mame/drivers/1942.cpp", - MAME_DIR .. "src/mame/includes/1942.h", - MAME_DIR .. "src/mame/video/1942.cpp", - MAME_DIR .. "src/mame/audio/nl_1942.cpp", - MAME_DIR .. "src/mame/audio/nl_1942.h", - MAME_DIR .. "src/mame/drivers/1943.cpp", - MAME_DIR .. "src/mame/includes/1943.h", - MAME_DIR .. "src/mame/video/1943.cpp", - MAME_DIR .. "src/mame/drivers/alien.cpp", - MAME_DIR .. "src/mame/drivers/bionicc.cpp", - MAME_DIR .. "src/mame/drivers/supduck.cpp", - MAME_DIR .. "src/mame/video/tigeroad_spr.cpp", - MAME_DIR .. "src/mame/video/tigeroad_spr.h", - MAME_DIR .. "src/mame/drivers/blktiger.cpp", - MAME_DIR .. "src/mame/drivers/blktiger_ms.cpp", - MAME_DIR .. "src/mame/drivers/cbasebal.cpp", - MAME_DIR .. "src/mame/drivers/commando.cpp", - MAME_DIR .. "src/mame/includes/commando.h", - MAME_DIR .. "src/mame/video/commando.cpp", - MAME_DIR .. "src/mame/drivers/cps1.cpp", - MAME_DIR .. "src/mame/includes/cps1.h", - MAME_DIR .. "src/mame/video/cps1.cpp", - MAME_DIR .. "src/mame/drivers/cps1bl_5205.cpp", - MAME_DIR .. "src/mame/drivers/cps1bl_pic.cpp", - MAME_DIR .. "src/mame/drivers/kenseim.cpp", - MAME_DIR .. "src/mame/drivers/cps2.cpp", - MAME_DIR .. "src/mame/machine/cps2comm.cpp", - MAME_DIR .. "src/mame/machine/cps2comm.h", - MAME_DIR .. "src/mame/machine/cps2crypt.cpp", - MAME_DIR .. "src/mame/machine/cps2crypt.h", - MAME_DIR .. "src/mame/drivers/cps3.cpp", - MAME_DIR .. "src/mame/includes/cps3.h", - MAME_DIR .. "src/mame/audio/cps3.cpp", - MAME_DIR .. "src/mame/audio/cps3.h", - MAME_DIR .. "src/mame/drivers/egghunt.cpp", - MAME_DIR .. "src/mame/drivers/exedexes.cpp", - MAME_DIR .. "src/mame/includes/exedexes.h", - MAME_DIR .. "src/mame/video/exedexes.cpp", - MAME_DIR .. "src/mame/drivers/fcrash.cpp", - MAME_DIR .. "src/mame/includes/fcrash.h", - MAME_DIR .. "src/mame/drivers/gng.cpp", - MAME_DIR .. "src/mame/drivers/gunsmoke.cpp", - MAME_DIR .. "src/mame/drivers/higemaru.cpp", - MAME_DIR .. "src/mame/includes/higemaru.h", - MAME_DIR .. "src/mame/video/higemaru.cpp", - MAME_DIR .. "src/mame/drivers/lastduel.cpp", - MAME_DIR .. "src/mame/includes/lastduel.h", - MAME_DIR .. "src/mame/video/lastduel.cpp", - MAME_DIR .. "src/mame/drivers/lwings.cpp", - MAME_DIR .. "src/mame/includes/lwings.h", - MAME_DIR .. "src/mame/video/lwings.cpp", - MAME_DIR .. "src/mame/drivers/mitchell.cpp", - MAME_DIR .. "src/mame/drivers/psrockman.cpp", - MAME_DIR .. "src/mame/drivers/sf.cpp", - MAME_DIR .. "src/mame/drivers/sidearms.cpp", - MAME_DIR .. "src/mame/includes/sidearms.h", - MAME_DIR .. "src/mame/video/sidearms.cpp", - MAME_DIR .. "src/mame/drivers/sonson.cpp", - MAME_DIR .. "src/mame/includes/sonson.h", - MAME_DIR .. "src/mame/video/sonson.cpp", - MAME_DIR .. "src/mame/drivers/srumbler.cpp", - MAME_DIR .. "src/mame/includes/srumbler.h", - MAME_DIR .. "src/mame/video/srumbler.cpp", - MAME_DIR .. "src/mame/drivers/tigeroad.cpp", - MAME_DIR .. "src/mame/includes/tigeroad.h", - MAME_DIR .. "src/mame/video/tigeroad.cpp", - MAME_DIR .. "src/mame/machine/tigeroad.cpp", - MAME_DIR .. "src/mame/drivers/vulgus.cpp", - MAME_DIR .. "src/mame/includes/vulgus.h", - MAME_DIR .. "src/mame/video/vulgus.cpp", - MAME_DIR .. "src/mame/machine/kabuki.cpp", - MAME_DIR .. "src/mame/machine/kabuki.h", - MAME_DIR .. "src/mame/drivers/tvcapcom.cpp", - MAME_DIR .. "src/mame/drivers/instantm.cpp", -} - -createMAMEProjects(_target, _subtarget, "ces") -files { - MAME_DIR .. "src/mame/drivers/cesclass.cpp", - MAME_DIR .. "src/mame/drivers/galgames.cpp", -} - -createMAMEProjects(_target, _subtarget, "cinemat") -files { - MAME_DIR .. "src/mame/drivers/cinemat.cpp", - MAME_DIR .. "src/mame/includes/cinemat.h", - MAME_DIR .. "src/mame/audio/cinemat.cpp", - MAME_DIR .. "src/mame/audio/cinemat.h", - MAME_DIR .. "src/mame/video/cinemat.cpp", - MAME_DIR .. "src/mame/audio/nl_armora.cpp", - MAME_DIR .. "src/mame/audio/nl_armora.h", - MAME_DIR .. "src/mame/audio/nl_barrier.cpp", - MAME_DIR .. "src/mame/audio/nl_barrier.h", - MAME_DIR .. "src/mame/audio/nl_boxingb.cpp", - MAME_DIR .. "src/mame/audio/nl_boxingb.h", - MAME_DIR .. "src/mame/audio/nl_cinemat_common.h", - MAME_DIR .. "src/mame/audio/nl_ripoff.cpp", - MAME_DIR .. "src/mame/audio/nl_ripoff.h", - MAME_DIR .. "src/mame/audio/nl_solarq.cpp", - MAME_DIR .. "src/mame/audio/nl_solarq.h", - MAME_DIR .. "src/mame/audio/nl_spacewar.cpp", - MAME_DIR .. "src/mame/audio/nl_spacewar.h", - MAME_DIR .. "src/mame/audio/nl_speedfrk.cpp", - MAME_DIR .. "src/mame/audio/nl_speedfrk.h", - MAME_DIR .. "src/mame/audio/nl_starcas.cpp", - MAME_DIR .. "src/mame/audio/nl_starcas.h", - MAME_DIR .. "src/mame/audio/nl_starhawk.cpp", - MAME_DIR .. "src/mame/audio/nl_starhawk.h", - MAME_DIR .. "src/mame/audio/nl_sundance.cpp", - MAME_DIR .. "src/mame/audio/nl_sundance.h", - MAME_DIR .. "src/mame/audio/nl_tailg.cpp", - MAME_DIR .. "src/mame/audio/nl_tailg.h", - MAME_DIR .. "src/mame/audio/nl_warrior.cpp", - MAME_DIR .. "src/mame/audio/nl_warrior.h", - MAME_DIR .. "src/mame/drivers/cchasm.cpp", - MAME_DIR .. "src/mame/drivers/dlair.cpp", - MAME_DIR .. "src/mame/drivers/dlair2.cpp", - MAME_DIR .. "src/mame/drivers/embargo.cpp", - MAME_DIR .. "src/mame/drivers/jack.cpp", - MAME_DIR .. "src/mame/includes/jack.h", - MAME_DIR .. "src/mame/video/jack.cpp", - MAME_DIR .. "src/mame/drivers/leland.cpp", - MAME_DIR .. "src/mame/includes/leland.h", - MAME_DIR .. "src/mame/machine/leland.cpp", - MAME_DIR .. "src/mame/audio/leland.cpp", - MAME_DIR .. "src/mame/audio/leland.h", - MAME_DIR .. "src/mame/video/leland.cpp", -} - -createMAMEProjects(_target, _subtarget, "cirsa") -files { - MAME_DIR .. "src/mame/drivers/cirsa820xxx.cpp", - MAME_DIR .. "src/mame/drivers/cirsa910510.cpp", - MAME_DIR .. "src/mame/drivers/miniguay.cpp", - MAME_DIR .. "src/mame/drivers/missbamby.cpp", - MAME_DIR .. "src/mame/drivers/neptunp2.cpp", -} - -createMAMEProjects(_target, _subtarget, "comad") -files { - MAME_DIR .. "src/mame/drivers/funybubl.cpp", - MAME_DIR .. "src/mame/includes/funybubl.h", - MAME_DIR .. "src/mame/video/funybubl.cpp", - MAME_DIR .. "src/mame/drivers/galspnbl.cpp", - MAME_DIR .. "src/mame/includes/galspnbl.h", - MAME_DIR .. "src/mame/video/galspnbl.cpp", - MAME_DIR .. "src/mame/drivers/zerozone.cpp", - MAME_DIR .. "src/mame/includes/zerozone.h", - MAME_DIR .. "src/mame/video/zerozone.cpp", -} - -createMAMEProjects(_target, _subtarget, "cvs") -files { - MAME_DIR .. "src/mame/drivers/cvs.cpp", - MAME_DIR .. "src/mame/includes/cvs.h", - MAME_DIR .. "src/mame/video/cvs.cpp", - MAME_DIR .. "src/mame/drivers/galaxia.cpp", - MAME_DIR .. "src/mame/includes/galaxia.h", - MAME_DIR .. "src/mame/video/galaxia.cpp", - MAME_DIR .. "src/mame/drivers/quasar.cpp", - MAME_DIR .. "src/mame/includes/quasar.h", - MAME_DIR .. "src/mame/video/quasar.cpp", -} - -createMAMEProjects(_target, _subtarget, "dataeast") -files { - MAME_DIR .. "src/mame/drivers/actfancr.cpp", - MAME_DIR .. "src/mame/drivers/astrof.cpp", - MAME_DIR .. "src/mame/includes/astrof.h", - MAME_DIR .. "src/mame/audio/astrof.cpp", - MAME_DIR .. "src/mame/drivers/backfire.cpp", - MAME_DIR .. "src/mame/drivers/battlera.cpp", - MAME_DIR .. "src/mame/drivers/boogwing.cpp", - MAME_DIR .. "src/mame/includes/boogwing.h", - MAME_DIR .. "src/mame/video/boogwing.cpp", - MAME_DIR .. "src/mame/drivers/brkthru.cpp", - MAME_DIR .. "src/mame/drivers/btime.cpp", - MAME_DIR .. "src/mame/includes/btime.h", - MAME_DIR .. "src/mame/machine/btime.cpp", - MAME_DIR .. "src/mame/video/btime.cpp", - MAME_DIR .. "src/mame/drivers/bwing.cpp", - MAME_DIR .. "src/mame/includes/bwing.h", - MAME_DIR .. "src/mame/video/bwing.cpp", - MAME_DIR .. "src/mame/drivers/cbuster.cpp", - MAME_DIR .. "src/mame/includes/cbuster.h", - MAME_DIR .. "src/mame/video/cbuster.cpp", - MAME_DIR .. "src/mame/drivers/chanbara.cpp", - MAME_DIR .. "src/mame/drivers/cninja.cpp", - MAME_DIR .. "src/mame/includes/cninja.h", - MAME_DIR .. "src/mame/video/cninja.cpp", - MAME_DIR .. "src/mame/drivers/cntsteer.cpp", - MAME_DIR .. "src/mame/drivers/compgolf.cpp", - MAME_DIR .. "src/mame/includes/compgolf.h", - MAME_DIR .. "src/mame/video/compgolf.cpp", - MAME_DIR .. "src/mame/drivers/darkseal.cpp", - MAME_DIR .. "src/mame/includes/darkseal.h", - MAME_DIR .. "src/mame/video/darkseal.cpp", - MAME_DIR .. "src/mame/drivers/dassault.cpp", - MAME_DIR .. "src/mame/includes/dassault.h", - MAME_DIR .. "src/mame/video/dassault.cpp", - MAME_DIR .. "src/mame/drivers/dblewing.cpp", - MAME_DIR .. "src/mame/drivers/dec0.cpp", - MAME_DIR .. "src/mame/includes/dec0.h", - MAME_DIR .. "src/mame/machine/dec0.cpp", - MAME_DIR .. "src/mame/video/dec0.cpp", - MAME_DIR .. "src/mame/drivers/dec8.cpp", - MAME_DIR .. "src/mame/includes/dec8.h", - MAME_DIR .. "src/mame/video/dec8.cpp", - MAME_DIR .. "src/mame/machine/deco222.cpp", - MAME_DIR .. "src/mame/machine/deco222.h", - MAME_DIR .. "src/mame/machine/decocpu7.cpp", - MAME_DIR .. "src/mame/machine/decocpu7.h", - MAME_DIR .. "src/mame/machine/decocpu6.cpp", - MAME_DIR .. "src/mame/machine/decocpu6.h", - MAME_DIR .. "src/mame/drivers/deco_ld.cpp", - MAME_DIR .. "src/mame/drivers/deco_mlc.cpp", - MAME_DIR .. "src/mame/includes/deco_mlc.h", - MAME_DIR .. "src/mame/video/deco_mlc.cpp", - MAME_DIR .. "src/mame/drivers/deco156.cpp", - MAME_DIR .. "src/mame/machine/deco156.cpp", - MAME_DIR .. "src/mame/machine/deco156.h", - MAME_DIR .. "src/mame/drivers/deco32.cpp", - MAME_DIR .. "src/mame/includes/deco32.h", - MAME_DIR .. "src/mame/video/deco32.cpp", - MAME_DIR .. "src/mame/video/dvi.cpp", - MAME_DIR .. "src/mame/video/deco_ace.cpp", - MAME_DIR .. "src/mame/video/deco_ace.h", - MAME_DIR .. "src/mame/drivers/decocass.cpp", - MAME_DIR .. "src/mame/includes/decocass.h", - MAME_DIR .. "src/mame/machine/decocass.cpp", - MAME_DIR .. "src/mame/machine/decocass_tape.cpp", - MAME_DIR .. "src/mame/machine/decocass_tape.h", - MAME_DIR .. "src/mame/video/decocass.cpp", - MAME_DIR .. "src/mame/drivers/deshoros.cpp", - MAME_DIR .. "src/mame/drivers/dietgo.cpp", - MAME_DIR .. "src/mame/drivers/dreambal.cpp", - MAME_DIR .. "src/mame/drivers/exprraid.cpp", - MAME_DIR .. "src/mame/includes/exprraid.h", - MAME_DIR .. "src/mame/video/exprraid.cpp", - MAME_DIR .. "src/mame/drivers/ffantasy_ms.cpp", - MAME_DIR .. "src/mame/drivers/firetrap.cpp", - MAME_DIR .. "src/mame/drivers/funkyjet.cpp", - MAME_DIR .. "src/mame/drivers/karnov.cpp", - MAME_DIR .. "src/mame/drivers/kchamp.cpp", - MAME_DIR .. "src/mame/includes/kchamp.h", - MAME_DIR .. "src/mame/video/kchamp.cpp", - MAME_DIR .. "src/mame/drivers/kingobox.cpp", - MAME_DIR .. "src/mame/includes/kingobox.h", - MAME_DIR .. "src/mame/video/kingobox.cpp", - MAME_DIR .. "src/mame/drivers/lemmings.cpp", - MAME_DIR .. "src/mame/includes/lemmings.h", - MAME_DIR .. "src/mame/video/lemmings.cpp", - MAME_DIR .. "src/mame/drivers/liberate.cpp", - MAME_DIR .. "src/mame/includes/liberate.h", - MAME_DIR .. "src/mame/video/liberate.cpp", - MAME_DIR .. "src/mame/drivers/madalien.cpp", - MAME_DIR .. "src/mame/includes/madalien.h", - MAME_DIR .. "src/mame/audio/madalien.cpp", - MAME_DIR .. "src/mame/video/madalien.cpp", - MAME_DIR .. "src/mame/drivers/madmotor.cpp", - MAME_DIR .. "src/mame/drivers/metlclsh.cpp", - MAME_DIR .. "src/mame/includes/metlclsh.h", - MAME_DIR .. "src/mame/video/metlclsh.cpp", - MAME_DIR .. "src/mame/drivers/mirage.cpp", - MAME_DIR .. "src/mame/drivers/pcktgal.cpp", - MAME_DIR .. "src/mame/drivers/pktgaldx.cpp", - MAME_DIR .. "src/mame/includes/pktgaldx.h", - MAME_DIR .. "src/mame/video/pktgaldx.cpp", - MAME_DIR .. "src/mame/drivers/progolf.cpp", - MAME_DIR .. "src/mame/drivers/rohga.cpp", - MAME_DIR .. "src/mame/includes/rohga.h", - MAME_DIR .. "src/mame/video/rohga.cpp", - MAME_DIR .. "src/mame/drivers/scregg.cpp", - MAME_DIR .. "src/mame/drivers/shootout.cpp", - MAME_DIR .. "src/mame/drivers/sidepckt.cpp", - MAME_DIR .. "src/mame/includes/sidepckt.h", - MAME_DIR .. "src/mame/video/sidepckt.cpp", - MAME_DIR .. "src/mame/drivers/simpl156.cpp", - MAME_DIR .. "src/mame/includes/simpl156.h", - MAME_DIR .. "src/mame/video/simpl156.cpp", - MAME_DIR .. "src/mame/drivers/sshangha.cpp", - MAME_DIR .. "src/mame/includes/sshangha.h", - MAME_DIR .. "src/mame/video/sshangha.cpp", - MAME_DIR .. "src/mame/drivers/stadhero.cpp", - MAME_DIR .. "src/mame/includes/stadhero.h", - MAME_DIR .. "src/mame/video/stadhero.cpp", - MAME_DIR .. "src/mame/drivers/supbtime.cpp", - MAME_DIR .. "src/mame/includes/supbtime.h", - MAME_DIR .. "src/mame/video/supbtime.cpp", - MAME_DIR .. "src/mame/drivers/thedeep.cpp", - MAME_DIR .. "src/mame/drivers/tryout.cpp", - MAME_DIR .. "src/mame/includes/tryout.h", - MAME_DIR .. "src/mame/video/tryout.cpp", - MAME_DIR .. "src/mame/drivers/tumbleb.cpp", - MAME_DIR .. "src/mame/includes/tumbleb.h", - MAME_DIR .. "src/mame/video/tumbleb.cpp", - MAME_DIR .. "src/mame/drivers/vaportra.cpp", - MAME_DIR .. "src/mame/includes/vaportra.h", - MAME_DIR .. "src/mame/video/vaportra.cpp", - MAME_DIR .. "src/mame/machine/deco_irq.cpp", - MAME_DIR .. "src/mame/machine/deco_irq.h", - MAME_DIR .. "src/mame/machine/deco102.cpp", - MAME_DIR .. "src/mame/machine/deco102.h", - MAME_DIR .. "src/mame/machine/decocrpt.cpp", - MAME_DIR .. "src/mame/machine/decocrpt.h", - MAME_DIR .. "src/mame/machine/deco104.cpp", - MAME_DIR .. "src/mame/machine/deco104.h", - MAME_DIR .. "src/mame/machine/deco146.cpp", - MAME_DIR .. "src/mame/machine/deco146.h", - MAME_DIR .. "src/mame/video/decbac06.cpp", - MAME_DIR .. "src/mame/video/decbac06.h", - MAME_DIR .. "src/mame/video/decrmc3.cpp", - MAME_DIR .. "src/mame/video/decrmc3.h", - MAME_DIR .. "src/mame/video/deco16ic.cpp", - MAME_DIR .. "src/mame/video/deco16ic.h", - MAME_DIR .. "src/mame/video/decocomn.cpp", - MAME_DIR .. "src/mame/video/decocomn.h", - MAME_DIR .. "src/mame/video/decmxc06.cpp", - MAME_DIR .. "src/mame/video/decmxc06.h", - MAME_DIR .. "src/mame/video/deckarn.cpp", - MAME_DIR .. "src/mame/video/deckarn.h", -} - -createMAMEProjects(_target, _subtarget, "dgrm") -files { - MAME_DIR .. "src/mame/drivers/blackt96.cpp", - MAME_DIR .. "src/mame/drivers/pokechmp.cpp", - MAME_DIR .. "src/mame/includes/pokechmp.h", - MAME_DIR .. "src/mame/video/pokechmp.cpp", -} - -createMAMEProjects(_target, _subtarget, "dooyong") -files { - MAME_DIR .. "src/mame/drivers/dooyong.cpp", - MAME_DIR .. "src/mame/video/dooyong.cpp", - MAME_DIR .. "src/mame/video/dooyong.h", - MAME_DIR .. "src/mame/drivers/gundealr.cpp", - MAME_DIR .. "src/mame/includes/gundealr.h", - MAME_DIR .. "src/mame/video/gundealr.cpp", -} - -createMAMEProjects(_target, _subtarget, "dynax") -files { - MAME_DIR .. "src/mame/drivers/ddenlovr.cpp", - MAME_DIR .. "src/mame/drivers/dynax.cpp", - MAME_DIR .. "src/mame/includes/dynax.h", - MAME_DIR .. "src/mame/video/dynax.cpp", - MAME_DIR .. "src/mame/drivers/hnayayoi.cpp", - MAME_DIR .. "src/mame/drivers/realbrk.cpp", - MAME_DIR .. "src/mame/includes/realbrk.h", - MAME_DIR .. "src/mame/video/realbrk.cpp", - MAME_DIR .. "src/mame/drivers/royalmah.cpp", - MAME_DIR .. "src/mame/video/dynax_blitter_rev2.cpp", - MAME_DIR .. "src/mame/video/dynax_blitter_rev2.h", -} - -createMAMEProjects(_target, _subtarget, "edevices") -files { - MAME_DIR .. "src/mame/drivers/diverboy.cpp", - MAME_DIR .. "src/mame/drivers/fantland.cpp", - MAME_DIR .. "src/mame/includes/fantland.h", - MAME_DIR .. "src/mame/video/fantland.cpp", - MAME_DIR .. "src/mame/drivers/mwarr.cpp", - MAME_DIR .. "src/mame/drivers/stlforce.cpp", - MAME_DIR .. "src/mame/includes/stlforce.h", - MAME_DIR .. "src/mame/video/edevices.cpp", - MAME_DIR .. "src/mame/video/edevices.h", - MAME_DIR .. "src/mame/drivers/mugsmash.cpp", - MAME_DIR .. "src/mame/includes/mugsmash.h", - MAME_DIR .. "src/mame/video/mugsmash.cpp", - MAME_DIR .. "src/mame/drivers/ppmast93.cpp", - MAME_DIR .. "src/mame/drivers/pzletime.cpp", - MAME_DIR .. "src/mame/drivers/twins.cpp", -} - -createMAMEProjects(_target, _subtarget, "efo") -files { - MAME_DIR .. "src/mame/drivers/cedar_magnet.cpp", - MAME_DIR .. "src/mame/machine/cedar_magnet_plane.h", - MAME_DIR .. "src/mame/machine/cedar_magnet_sprite.h", - MAME_DIR .. "src/mame/machine/cedar_magnet_flop.h", - MAME_DIR .. "src/mame/machine/cedar_magnet_plane.cpp", - MAME_DIR .. "src/mame/machine/cedar_magnet_sprite.cpp", - MAME_DIR .. "src/mame/machine/cedar_magnet_flop.cpp", - MAME_DIR .. "src/mame/drivers/cidelsa.cpp", - MAME_DIR .. "src/mame/includes/cidelsa.h", - MAME_DIR .. "src/mame/video/cidelsa.cpp", - MAME_DIR .. "src/mame/drivers/nightmare.cpp", -} - -createMAMEProjects(_target, _subtarget, "eolith") -files { - MAME_DIR .. "src/mame/drivers/eolith.cpp", - MAME_DIR .. "src/mame/includes/eolith.h", - MAME_DIR .. "src/mame/video/eolith.cpp", - MAME_DIR .. "src/mame/drivers/eolith16.cpp", - MAME_DIR .. "src/mame/drivers/ghosteo.cpp", - MAME_DIR .. "src/mame/drivers/vegaeo.cpp", -} - -createMAMEProjects(_target, _subtarget, "excelent") -files { - MAME_DIR .. "src/mame/drivers/aquarium.cpp", - MAME_DIR .. "src/mame/includes/aquarium.h", - MAME_DIR .. "src/mame/video/aquarium.cpp", - MAME_DIR .. "src/mame/drivers/d9final.cpp", - MAME_DIR .. "src/mame/drivers/dblcrown.cpp", - MAME_DIR .. "src/mame/drivers/gcpinbal.cpp", - MAME_DIR .. "src/mame/includes/gcpinbal.h", - MAME_DIR .. "src/mame/video/gcpinbal.cpp", - MAME_DIR .. "src/mame/video/excellent_spr.cpp", - MAME_DIR .. "src/mame/video/excellent_spr.h", - MAME_DIR .. "src/mame/drivers/lastbank.cpp", - MAME_DIR .. "src/mame/drivers/witch.cpp", - MAME_DIR .. "src/mame/includes/witch.h", -} - -createMAMEProjects(_target, _subtarget, "exidy") -files { - MAME_DIR .. "src/mame/audio/nl_carpolo.h", - MAME_DIR .. "src/mame/audio/nl_carpolo.cpp", - MAME_DIR .. "src/mame/drivers/carpolo.cpp", - MAME_DIR .. "src/mame/includes/carpolo.h", - MAME_DIR .. "src/mame/machine/carpolo.cpp", - MAME_DIR .. "src/mame/video/carpolo.cpp", - MAME_DIR .. "src/mame/drivers/circus.cpp", - MAME_DIR .. "src/mame/includes/circus.h", - MAME_DIR .. "src/mame/audio/circus.cpp", - MAME_DIR .. "src/mame/video/circus.cpp", - MAME_DIR .. "src/mame/drivers/exidy.cpp", - MAME_DIR .. "src/mame/audio/exidy.cpp", - MAME_DIR .. "src/mame/audio/exidy.h", - MAME_DIR .. "src/mame/drivers/exidy440.cpp", - MAME_DIR .. "src/mame/includes/exidy440.h", - MAME_DIR .. "src/mame/audio/exidy440.cpp", - MAME_DIR .. "src/mame/audio/exidy440.h", - MAME_DIR .. "src/mame/video/exidy440.cpp", - MAME_DIR .. "src/mame/drivers/exidyttl.cpp", - MAME_DIR .. "src/mame/audio/nl_fireone.h", - MAME_DIR .. "src/mame/audio/nl_fireone.cpp", - MAME_DIR .. "src/mame/audio/nl_starfire.h", - MAME_DIR .. "src/mame/audio/nl_starfire.cpp", - MAME_DIR .. "src/mame/drivers/starfire.cpp", - MAME_DIR .. "src/mame/includes/starfire.h", - MAME_DIR .. "src/mame/video/starfire.cpp", - MAME_DIR .. "src/mame/drivers/vertigo.cpp", - MAME_DIR .. "src/mame/includes/vertigo.h", - MAME_DIR .. "src/mame/machine/vertigo.cpp", - MAME_DIR .. "src/mame/video/vertigo.cpp", - MAME_DIR .. "src/mame/drivers/victory.cpp", - MAME_DIR .. "src/mame/includes/victory.h", - MAME_DIR .. "src/mame/video/victory.cpp", -} - -createMAMEProjects(_target, _subtarget, "f32") -files { - MAME_DIR .. "src/mame/drivers/crospang.cpp", - MAME_DIR .. "src/mame/includes/crospang.h", - MAME_DIR .. "src/mame/video/crospang.cpp", - MAME_DIR .. "src/mame/drivers/silvmil.cpp", - MAME_DIR .. "src/mame/drivers/f-32.cpp", -} - -createMAMEProjects(_target, _subtarget, "funworld") -files { - MAME_DIR .. "src/mame/drivers/4roses.cpp", - MAME_DIR .. "src/mame/drivers/funworld.cpp", - MAME_DIR .. "src/mame/includes/funworld.h", - MAME_DIR .. "src/mame/video/funworld.cpp", - MAME_DIR .. "src/mame/drivers/photoply.cpp", - MAME_DIR .. "src/mame/drivers/photoplys.cpp", - MAME_DIR .. "src/mame/drivers/photoplysx.cpp", - MAME_DIR .. "src/mame/drivers/snookr10.cpp", - MAME_DIR .. "src/mame/includes/snookr10.h", - MAME_DIR .. "src/mame/video/snookr10.cpp", -} - -createMAMEProjects(_target, _subtarget, "fuuki") -files { - MAME_DIR .. "src/mame/drivers/fuukifg2.cpp", - MAME_DIR .. "src/mame/includes/fuukifg2.h", - MAME_DIR .. "src/mame/video/fuukifg2.cpp", - MAME_DIR .. "src/mame/drivers/fuukifg3.cpp", - MAME_DIR .. "src/mame/includes/fuukifg3.h", - MAME_DIR .. "src/mame/video/fuukifg3.cpp", - MAME_DIR .. "src/mame/video/fuukifg.cpp", - MAME_DIR .. "src/mame/video/fuukifg.h", -} - -createMAMEProjects(_target, _subtarget, "gaelco") -files { - MAME_DIR .. "src/mame/drivers/atvtrack.cpp", - MAME_DIR .. "src/mame/drivers/gaelco.cpp", - MAME_DIR .. "src/mame/includes/gaelco.h", - MAME_DIR .. "src/mame/video/gaelco.cpp", - MAME_DIR .. "src/mame/machine/gaelcrpt.cpp", - MAME_DIR .. "src/mame/machine/gaelcrpt.h", - MAME_DIR .. "src/mame/drivers/gaelco2.cpp", - MAME_DIR .. "src/mame/includes/gaelco2.h", - MAME_DIR .. "src/mame/machine/gaelco2.cpp", - MAME_DIR .. "src/mame/video/gaelco2.cpp", - MAME_DIR .. "src/mame/drivers/gaelco3d.cpp", - MAME_DIR .. "src/mame/includes/gaelco3d.h", - MAME_DIR .. "src/mame/video/gaelco3d.cpp", - MAME_DIR .. "src/mame/machine/gaelco3d.cpp", - MAME_DIR .. "src/mame/machine/gaelco3d.h", - MAME_DIR .. "src/mame/drivers/gaelcof3.cpp", - MAME_DIR .. "src/mame/drivers/gaelcopc.cpp", - MAME_DIR .. "src/mame/drivers/goldart.cpp", - MAME_DIR .. "src/mame/drivers/glass.cpp", - MAME_DIR .. "src/mame/includes/glass.h", - MAME_DIR .. "src/mame/video/glass.cpp", - MAME_DIR .. "src/mame/drivers/mastboy.cpp", - MAME_DIR .. "src/mame/drivers/mastboyo.cpp", - MAME_DIR .. "src/mame/drivers/rollext.cpp", - MAME_DIR .. "src/mame/drivers/splash.cpp", - MAME_DIR .. "src/mame/includes/splash.h", - MAME_DIR .. "src/mame/drivers/splash_ms.cpp", - MAME_DIR .. "src/mame/video/splash.cpp", - MAME_DIR .. "src/mame/drivers/targeth.cpp", - MAME_DIR .. "src/mame/includes/targeth.h", - MAME_DIR .. "src/mame/video/targeth.cpp", - MAME_DIR .. "src/mame/drivers/thoop2.cpp", - MAME_DIR .. "src/mame/includes/thoop2.h", - MAME_DIR .. "src/mame/video/thoop2.cpp", - MAME_DIR .. "src/mame/drivers/wrally.cpp", - MAME_DIR .. "src/mame/includes/wrally.h", - MAME_DIR .. "src/mame/video/wrally.cpp", - MAME_DIR .. "src/mame/drivers/blmbycar.cpp", - MAME_DIR .. "src/mame/includes/blmbycar.h", - MAME_DIR .. "src/mame/video/blmbycar.cpp", - MAME_DIR .. "src/mame/video/gaelco_wrally_sprites.cpp", - MAME_DIR .. "src/mame/video/gaelco_wrally_sprites.h", - MAME_DIR .. "src/mame/drivers/xorworld.cpp", - MAME_DIR .. "src/mame/includes/xorworld.h", - MAME_DIR .. "src/mame/video/xorworld.cpp", - MAME_DIR .. "src/mame/machine/gaelco_ds5002fp.cpp", - MAME_DIR .. "src/mame/machine/gaelco_ds5002fp.h", - MAME_DIR .. "src/mame/drivers/bigkarnk_ms.cpp", -} - -createMAMEProjects(_target, _subtarget, "galaxian") -files { - MAME_DIR .. "src/mame/drivers/dambustr.cpp", - MAME_DIR .. "src/mame/drivers/fastfred.cpp", - MAME_DIR .. "src/mame/includes/fastfred.h", - MAME_DIR .. "src/mame/video/fastfred.cpp", - MAME_DIR .. "src/mame/drivers/galaxian.cpp", - MAME_DIR .. "src/mame/includes/galaxian.h", - MAME_DIR .. "src/mame/drivers/galaxian_rockclim.cpp", - MAME_DIR .. "src/mame/audio/galaxian.cpp", - MAME_DIR .. "src/mame/audio/galaxian.h", - MAME_DIR .. "src/mame/video/galaxian.cpp", - MAME_DIR .. "src/mame/audio/nl_konami.h", - MAME_DIR .. "src/mame/audio/nl_konami.cpp", - MAME_DIR .. "src/mame/drivers/galaxold.cpp", - MAME_DIR .. "src/mame/includes/galaxold.h", - MAME_DIR .. "src/mame/machine/galaxold.cpp", - MAME_DIR .. "src/mame/video/galaxold.cpp", - MAME_DIR .. "src/mame/drivers/scobra.cpp", - MAME_DIR .. "src/mame/drivers/scramble.cpp", - MAME_DIR .. "src/mame/includes/scramble.h", - MAME_DIR .. "src/mame/machine/scramble.cpp", - MAME_DIR .. "src/mame/audio/scramble.cpp", -} - -createMAMEProjects(_target, _subtarget, "gameplan") -files { - MAME_DIR .. "src/mame/drivers/enigma2.cpp", - MAME_DIR .. "src/mame/drivers/gameplan.cpp", - MAME_DIR .. "src/mame/includes/gameplan.h", - MAME_DIR .. "src/mame/video/gameplan.cpp", - MAME_DIR .. "src/mame/drivers/toratora.cpp", - MAME_DIR .. "src/mame/drivers/trvquest.cpp", -} - -createMAMEProjects(_target, _subtarget, "gametron") -files { - MAME_DIR .. "src/mame/drivers/gatron.cpp", - MAME_DIR .. "src/mame/includes/gatron.h", - MAME_DIR .. "src/mame/video/gatron.cpp", - MAME_DIR .. "src/mame/drivers/gotya.cpp", - MAME_DIR .. "src/mame/drivers/sbugger.cpp", - MAME_DIR .. "src/mame/includes/sbugger.h", - MAME_DIR .. "src/mame/video/sbugger.cpp", -} - -createMAMEProjects(_target, _subtarget, "gottlieb") -files { - MAME_DIR .. "src/mame/drivers/exterm.cpp", - MAME_DIR .. "src/mame/includes/exterm.h", - MAME_DIR .. "src/mame/video/exterm.cpp", - MAME_DIR .. "src/mame/drivers/gottlieb.cpp", - MAME_DIR .. "src/mame/includes/gottlieb.h", - MAME_DIR .. "src/mame/video/gottlieb.cpp", -} - -createMAMEProjects(_target, _subtarget, "ibmpc") -files { - MAME_DIR .. "src/mame/drivers/calchase.cpp", - MAME_DIR .. "src/mame/drivers/fruitpc.cpp", - MAME_DIR .. "src/mame/drivers/igspc.cpp", - MAME_DIR .. "src/mame/drivers/pangofun.cpp", - MAME_DIR .. "src/mame/drivers/paokaipc.cpp", - MAME_DIR .. "src/mame/drivers/pcat_dyn.cpp", - MAME_DIR .. "src/mame/drivers/pcat_nit.cpp", - MAME_DIR .. "src/mame/drivers/pcxt.cpp", - MAME_DIR .. "src/mame/drivers/quakeat.cpp", - MAME_DIR .. "src/mame/drivers/queen.cpp", - MAME_DIR .. "src/mame/drivers/sis630.cpp", -} - -createMAMEProjects(_target, _subtarget, "igs") -files { - MAME_DIR .. "src/mame/drivers/cabaret.cpp", - MAME_DIR .. "src/mame/drivers/dunhuang.cpp", - MAME_DIR .. "src/mame/drivers/goldstar.cpp", - MAME_DIR .. "src/mame/includes/goldstar.h", - MAME_DIR .. "src/mame/video/goldstar.cpp", - MAME_DIR .. "src/mame/drivers/funtech.cpp", - MAME_DIR .. "src/mame/drivers/jackie.cpp", - MAME_DIR .. "src/mame/drivers/igspoker.cpp", - MAME_DIR .. "src/mame/drivers/igs009.cpp", - MAME_DIR .. "src/mame/drivers/igs011.cpp", - MAME_DIR .. "src/mame/drivers/igs017.cpp", - MAME_DIR .. "src/mame/video/igs017_igs031.cpp", - MAME_DIR .. "src/mame/video/igs017_igs031.h", - MAME_DIR .. "src/mame/drivers/igs_fear.cpp", - MAME_DIR .. "src/mame/drivers/igs_m027.cpp", - MAME_DIR .. "src/mame/drivers/igs_m036.cpp", - MAME_DIR .. "src/mame/drivers/iqblock.cpp", - MAME_DIR .. "src/mame/includes/iqblock.h", - MAME_DIR .. "src/mame/video/iqblock.cpp", - MAME_DIR .. "src/mame/drivers/lordgun.cpp", - MAME_DIR .. "src/mame/includes/lordgun.h", - MAME_DIR .. "src/mame/video/lordgun.cpp", - MAME_DIR .. "src/mame/drivers/pgm.cpp", - MAME_DIR .. "src/mame/includes/pgm.h", - MAME_DIR .. "src/mame/video/pgm.cpp", - MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type1.cpp", - MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type1.h", - MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type2.cpp", - MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type2.h", - MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type3.cpp", - MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type3.h", - MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs012.cpp", - MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs012.h", - MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs022.cpp", - MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs022.h", - MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs028.cpp", - MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs028.h", - MAME_DIR .. "src/mame/machine/pgmprot_orlegend.cpp", - MAME_DIR .. "src/mame/machine/pgmprot_orlegend.h", - MAME_DIR .. "src/mame/drivers/pgm2.cpp", - MAME_DIR .. "src/mame/video/pgm2.cpp", - MAME_DIR .. "src/mame/includes/pgm2.h", - MAME_DIR .. "src/mame/machine/pgm2_memcard.cpp", - MAME_DIR .. "src/mame/machine/pgm2_memcard.h", - MAME_DIR .. "src/mame/drivers/pgm3.cpp", - MAME_DIR .. "src/mame/drivers/spoker.cpp", - MAME_DIR .. "src/mame/machine/igs036crypt.cpp", - MAME_DIR .. "src/mame/machine/igs036crypt.h", - MAME_DIR .. "src/mame/machine/pgmcrypt.cpp", - MAME_DIR .. "src/mame/machine/pgmcrypt.h", - MAME_DIR .. "src/mame/machine/igs025.cpp", - MAME_DIR .. "src/mame/machine/igs025.h", - MAME_DIR .. "src/mame/machine/igs022.cpp", - MAME_DIR .. "src/mame/machine/igs022.h", - MAME_DIR .. "src/mame/machine/igs028.cpp", - MAME_DIR .. "src/mame/machine/igs028.h", -} - -createMAMEProjects(_target, _subtarget, "igt") -files { - MAME_DIR .. "src/mame/drivers/drw80pkr.cpp", - MAME_DIR .. "src/mame/drivers/gkigt.cpp", - MAME_DIR .. "src/mame/drivers/peplus.cpp", - MAME_DIR .. "src/mame/drivers/splus.cpp", - MAME_DIR .. "src/mame/drivers/videopkr.cpp", -} - -createMAMEProjects(_target, _subtarget, "irem") -files { - MAME_DIR .. "src/mame/drivers/m10.cpp", - MAME_DIR .. "src/mame/includes/m10.h", - MAME_DIR .. "src/mame/video/m10.cpp", - MAME_DIR .. "src/mame/drivers/m14.cpp", - MAME_DIR .. "src/mame/drivers/m52.cpp", - MAME_DIR .. "src/mame/includes/m52.h", - MAME_DIR .. "src/mame/video/m52.cpp", - MAME_DIR .. "src/mame/drivers/m57.cpp", - MAME_DIR .. "src/mame/includes/m57.h", - MAME_DIR .. "src/mame/video/m57.cpp", - MAME_DIR .. "src/mame/drivers/m58.cpp", - MAME_DIR .. "src/mame/includes/m58.h", - MAME_DIR .. "src/mame/video/m58.cpp", - MAME_DIR .. "src/mame/drivers/m62.cpp", - MAME_DIR .. "src/mame/includes/m62.h", - MAME_DIR .. "src/mame/video/m62.cpp", - MAME_DIR .. "src/mame/drivers/m62_bkungfu.cpp", - MAME_DIR .. "src/mame/drivers/spartanxtec.cpp", - MAME_DIR .. "src/mame/drivers/m63.cpp", - MAME_DIR .. "src/mame/drivers/m72.cpp", - MAME_DIR .. "src/mame/includes/m72.h", - MAME_DIR .. "src/mame/audio/m72.cpp", - MAME_DIR .. "src/mame/audio/m72.h", - MAME_DIR .. "src/mame/video/m72.cpp", - MAME_DIR .. "src/mame/drivers/m90.cpp", - MAME_DIR .. "src/mame/includes/m90.h", - MAME_DIR .. "src/mame/video/m90.cpp", - MAME_DIR .. "src/mame/drivers/m92.cpp", - MAME_DIR .. "src/mame/includes/m92.h", - MAME_DIR .. "src/mame/video/m92.cpp", - MAME_DIR .. "src/mame/drivers/m107.cpp", - MAME_DIR .. "src/mame/includes/m107.h", - MAME_DIR .. "src/mame/video/m107.cpp", - MAME_DIR .. "src/mame/includes/iremipt.h", - MAME_DIR .. "src/mame/drivers/olibochu.cpp", - MAME_DIR .. "src/mame/drivers/redalert.cpp", - MAME_DIR .. "src/mame/includes/redalert.h", - MAME_DIR .. "src/mame/audio/redalert.cpp", - MAME_DIR .. "src/mame/audio/redalert.h", - MAME_DIR .. "src/mame/video/redalert.cpp", - MAME_DIR .. "src/mame/drivers/shisen.cpp", - MAME_DIR .. "src/mame/drivers/travrusa.cpp", - MAME_DIR .. "src/mame/includes/travrusa.h", - MAME_DIR .. "src/mame/video/travrusa.cpp", - MAME_DIR .. "src/mame/drivers/vigilant.cpp", - MAME_DIR .. "src/mame/includes/vigilant.h", - MAME_DIR .. "src/mame/video/vigilant.cpp", - MAME_DIR .. "src/mame/machine/irem_cpu.cpp", - MAME_DIR .. "src/mame/machine/irem_cpu.h", - MAME_DIR .. "src/mame/audio/irem.cpp", - MAME_DIR .. "src/mame/audio/irem.h", - MAME_DIR .. "src/mame/audio/nl_kidniki.cpp", - MAME_DIR .. "src/mame/audio/nl_kidniki.h", -} - -createMAMEProjects(_target, _subtarget, "itech") -files { - MAME_DIR .. "src/mame/drivers/capbowl.cpp", - MAME_DIR .. "src/mame/drivers/itech8.cpp", - MAME_DIR .. "src/mame/includes/itech8.h", - MAME_DIR .. "src/mame/machine/itech8.cpp", - MAME_DIR .. "src/mame/video/itech8.cpp", - MAME_DIR .. "src/mame/drivers/itech32.cpp", - MAME_DIR .. "src/mame/includes/itech32.h", - MAME_DIR .. "src/mame/video/itech32.cpp", - MAME_DIR .. "src/mame/drivers/iteagle.cpp", - MAME_DIR .. "src/mame/machine/iteagle_fpga.cpp", - MAME_DIR .. "src/mame/machine/iteagle_fpga.h", -} - -createMAMEProjects(_target, _subtarget, "jaleco") -files { - MAME_DIR .. "src/mame/drivers/acommand.cpp", - MAME_DIR .. "src/mame/drivers/aeroboto.cpp", - MAME_DIR .. "src/mame/includes/aeroboto.h", - MAME_DIR .. "src/mame/video/aeroboto.cpp", - MAME_DIR .. "src/mame/drivers/argus.cpp", - MAME_DIR .. "src/mame/includes/argus.h", - MAME_DIR .. "src/mame/video/argus.cpp", - MAME_DIR .. "src/mame/drivers/bestleag.cpp", - MAME_DIR .. "src/mame/drivers/bigstrkb.cpp", - MAME_DIR .. "src/mame/includes/bigstrkb.h", - MAME_DIR .. "src/mame/video/bigstrkb.cpp", - MAME_DIR .. "src/mame/drivers/blueprnt.cpp", - MAME_DIR .. "src/mame/drivers/bnstars.cpp", - MAME_DIR .. "src/mame/drivers/cischeat.cpp", - MAME_DIR .. "src/mame/includes/cischeat.h", - MAME_DIR .. "src/mame/video/cischeat.cpp", - MAME_DIR .. "src/mame/drivers/citycon.cpp", - MAME_DIR .. "src/mame/includes/citycon.h", - MAME_DIR .. "src/mame/video/citycon.cpp", - MAME_DIR .. "src/mame/drivers/ddayjlc.cpp", - MAME_DIR .. "src/mame/drivers/exerion.cpp", - MAME_DIR .. "src/mame/includes/exerion.h", - MAME_DIR .. "src/mame/video/exerion.cpp", - MAME_DIR .. "src/mame/drivers/fcombat.cpp", - MAME_DIR .. "src/mame/includes/fcombat.h", - MAME_DIR .. "src/mame/video/fcombat.cpp", - MAME_DIR .. "src/mame/drivers/ginganin.cpp", - MAME_DIR .. "src/mame/includes/ginganin.h", - MAME_DIR .. "src/mame/video/ginganin.cpp", - MAME_DIR .. "src/mame/drivers/homerun.cpp", - MAME_DIR .. "src/mame/includes/homerun.h", - MAME_DIR .. "src/mame/video/homerun.cpp", - MAME_DIR .. "src/mame/drivers/jalmah.cpp", - MAME_DIR .. "src/mame/drivers/megasys1.cpp", - MAME_DIR .. "src/mame/includes/megasys1.h", - MAME_DIR .. "src/mame/video/megasys1.cpp", - MAME_DIR .. "src/mame/drivers/momoko.cpp", - MAME_DIR .. "src/mame/includes/momoko.h", - MAME_DIR .. "src/mame/video/momoko.cpp", - MAME_DIR .. "src/mame/drivers/ms32.cpp", - MAME_DIR .. "src/mame/includes/ms32.h", - MAME_DIR .. "src/mame/video/ms32.cpp", - MAME_DIR .. "src/mame/drivers/psychic5.cpp", - MAME_DIR .. "src/mame/includes/psychic5.h", - MAME_DIR .. "src/mame/video/psychic5.cpp", - MAME_DIR .. "src/mame/drivers/pturn.cpp", - MAME_DIR .. "src/mame/drivers/skyfox.cpp", - MAME_DIR .. "src/mame/includes/skyfox.h", - MAME_DIR .. "src/mame/video/skyfox.cpp", - MAME_DIR .. "src/mame/drivers/tetrisp2.cpp", - MAME_DIR .. "src/mame/includes/tetrisp2.h", - MAME_DIR .. "src/mame/video/tetrisp2.cpp", - MAME_DIR .. "src/mame/machine/jalcrpt.cpp", - MAME_DIR .. "src/mame/machine/jalcrpt.h", - MAME_DIR .. "src/mame/video/jalblend.cpp", - MAME_DIR .. "src/mame/video/jalblend.h", - MAME_DIR .. "src/mame/video/ms1_tmap.cpp", - MAME_DIR .. "src/mame/video/ms1_tmap.h", - MAME_DIR .. "src/mame/video/ms32_sprite.cpp", - MAME_DIR .. "src/mame/video/ms32_sprite.h", - MAME_DIR .. "src/mame/machine/jaleco_ms32_sysctrl.cpp", - MAME_DIR .. "src/mame/machine/jaleco_ms32_sysctrl.h", -} - -createMAMEProjects(_target, _subtarget, "jpm") -files { - MAME_DIR .. "src/mame/drivers/guab.cpp", - MAME_DIR .. "src/mame/drivers/jpmsys5.cpp", - MAME_DIR .. "src/mame/includes/jpmsys5.h", - MAME_DIR .. "src/mame/drivers/jpmsys5sw.cpp", - MAME_DIR .. "src/mame/drivers/jpmmps.cpp", - MAME_DIR .. "src/mame/drivers/jpms80.cpp", - MAME_DIR .. "src/mame/audio/nl_jpmsru.cpp", - MAME_DIR .. "src/mame/audio/nl_jpmsru.h", - MAME_DIR .. "src/mame/drivers/jpmsru.cpp", - MAME_DIR .. "src/mame/drivers/jpmimpct.cpp", - MAME_DIR .. "src/mame/includes/jpmimpct.h", - MAME_DIR .. "src/mame/video/jpmimpct.cpp", - MAME_DIR .. "src/mame/drivers/jpmimpctsw.cpp", - MAME_DIR .. "src/mame/drivers/pluto5.cpp", - MAME_DIR .. "src/mame/drivers/jpmsys7.cpp", -} - -createMAMEProjects(_target, _subtarget, "kaneko") -files { - MAME_DIR .. "src/mame/drivers/airbustr.cpp", - MAME_DIR .. "src/mame/includes/airbustr.h", - MAME_DIR .. "src/mame/video/airbustr.cpp", - MAME_DIR .. "src/mame/drivers/djboy.cpp", - MAME_DIR .. "src/mame/includes/djboy.h", - MAME_DIR .. "src/mame/video/djboy.cpp", - MAME_DIR .. "src/mame/drivers/expro02.cpp", - MAME_DIR .. "src/mame/drivers/galpanic.cpp", - MAME_DIR .. "src/mame/drivers/galpanic_ms.cpp", - MAME_DIR .. "src/mame/includes/galpnipt.h", - MAME_DIR .. "src/mame/drivers/galpani2.cpp", - MAME_DIR .. "src/mame/includes/galpani2.h", - MAME_DIR .. "src/mame/video/galpani2.cpp", - MAME_DIR .. "src/mame/drivers/galpani3.cpp", - MAME_DIR .. "src/mame/video/kaneko_grap2.cpp", - MAME_DIR .. "src/mame/video/kaneko_grap2.h", - MAME_DIR .. "src/mame/drivers/hvyunit.cpp", - MAME_DIR .. "src/mame/drivers/jchan.cpp", - MAME_DIR .. "src/mame/drivers/kaneko16.cpp", - MAME_DIR .. "src/mame/includes/kaneko16.h", - MAME_DIR .. "src/mame/video/kaneko16.cpp", - MAME_DIR .. "src/mame/video/kaneko_tmap.cpp", - MAME_DIR .. "src/mame/video/kaneko_tmap.h", - MAME_DIR .. "src/mame/video/kaneko_spr.cpp", - MAME_DIR .. "src/mame/video/kaneko_spr.h", - MAME_DIR .. "src/mame/machine/kaneko_hit.cpp", - MAME_DIR .. "src/mame/machine/kaneko_hit.h", - MAME_DIR .. "src/mame/machine/kaneko_calc3.cpp", - MAME_DIR .. "src/mame/machine/kaneko_calc3.h", - MAME_DIR .. "src/mame/machine/kaneko_toybox.cpp", - MAME_DIR .. "src/mame/machine/kaneko_toybox.h", - MAME_DIR .. "src/mame/drivers/sandscrp.cpp", - MAME_DIR .. "src/mame/drivers/suprnova.cpp", - MAME_DIR .. "src/mame/includes/suprnova.h", - MAME_DIR .. "src/mame/video/suprnova.cpp", - MAME_DIR .. "src/mame/video/sknsspr.cpp", - MAME_DIR .. "src/mame/video/sknsspr.h", -} - -createMAMEProjects(_target, _subtarget, "kiwako") -files { - MAME_DIR .. "src/mame/drivers/jongkyo.cpp", - MAME_DIR .. "src/mame/drivers/koikoi.cpp", - MAME_DIR .. "src/mame/drivers/mrjong.cpp", - MAME_DIR .. "src/mame/includes/mrjong.h", - MAME_DIR .. "src/mame/video/mrjong.cpp", -} - -createMAMEProjects(_target, _subtarget, "konami") -files { - MAME_DIR .. "src/mame/drivers/88games.cpp", - MAME_DIR .. "src/mame/includes/88games.h", - MAME_DIR .. "src/mame/video/88games.cpp", - MAME_DIR .. "src/mame/drivers/ajax.cpp", - MAME_DIR .. "src/mame/drivers/aliens.cpp", - MAME_DIR .. "src/mame/includes/aliens.h", - MAME_DIR .. "src/mame/video/aliens.cpp", - MAME_DIR .. "src/mame/drivers/asterix.cpp", - MAME_DIR .. "src/mame/includes/asterix.h", - MAME_DIR .. "src/mame/video/asterix.cpp", - MAME_DIR .. "src/mame/drivers/battlnts.cpp", - MAME_DIR .. "src/mame/includes/battlnts.h", - MAME_DIR .. "src/mame/video/battlnts.cpp", - MAME_DIR .. "src/mame/drivers/bishi.cpp", - MAME_DIR .. "src/mame/includes/bishi.h", - MAME_DIR .. "src/mame/video/bishi.cpp", - MAME_DIR .. "src/mame/drivers/bladestl.cpp", - MAME_DIR .. "src/mame/includes/bladestl.h", - MAME_DIR .. "src/mame/video/bladestl.cpp", - MAME_DIR .. "src/mame/drivers/blockhl.cpp", - MAME_DIR .. "src/mame/drivers/bottom9.cpp", - MAME_DIR .. "src/mame/drivers/chqflag.cpp", - MAME_DIR .. "src/mame/includes/chqflag.h", - MAME_DIR .. "src/mame/video/chqflag.cpp", - MAME_DIR .. "src/mame/drivers/circusc.cpp", - MAME_DIR .. "src/mame/includes/circusc.h", - MAME_DIR .. "src/mame/video/circusc.cpp", - MAME_DIR .. "src/mame/drivers/cobra.cpp", - MAME_DIR .. "src/mame/drivers/combatsc.cpp", - MAME_DIR .. "src/mame/includes/combatsc.h", - MAME_DIR .. "src/mame/video/combatsc.cpp", - MAME_DIR .. "src/mame/drivers/contra.cpp", - MAME_DIR .. "src/mame/drivers/crimfght.cpp", - MAME_DIR .. "src/mame/includes/crimfght.h", - MAME_DIR .. "src/mame/video/crimfght.cpp", - MAME_DIR .. "src/mame/drivers/dbz.cpp", - MAME_DIR .. "src/mame/includes/dbz.h", - MAME_DIR .. "src/mame/video/dbz.cpp", - MAME_DIR .. "src/mame/drivers/ddribble.cpp", - MAME_DIR .. "src/mame/includes/ddribble.h", - MAME_DIR .. "src/mame/video/ddribble.cpp", - MAME_DIR .. "src/mame/drivers/divebomb.cpp", - MAME_DIR .. "src/mame/includes/divebomb.h", - MAME_DIR .. "src/mame/video/divebomb.cpp", - MAME_DIR .. "src/mame/drivers/djmain.cpp", - MAME_DIR .. "src/mame/includes/djmain.h", - MAME_DIR .. "src/mame/video/djmain.cpp", - MAME_DIR .. "src/mame/drivers/fastlane.cpp", - MAME_DIR .. "src/mame/drivers/finalizr.cpp", - MAME_DIR .. "src/mame/includes/finalizr.h", - MAME_DIR .. "src/mame/video/finalizr.cpp", - MAME_DIR .. "src/mame/drivers/firebeat.cpp", - MAME_DIR .. "src/mame/machine/midikbd.cpp", - MAME_DIR .. "src/mame/machine/midikbd.h", - MAME_DIR .. "src/mame/drivers/flkatck.cpp", - MAME_DIR .. "src/mame/drivers/gberet.cpp", - MAME_DIR .. "src/mame/includes/gberet.h", - MAME_DIR .. "src/mame/video/gberet.cpp", - MAME_DIR .. "src/mame/drivers/giclassic.cpp", - MAME_DIR .. "src/mame/drivers/gijoe.cpp", - MAME_DIR .. "src/mame/includes/gijoe.h", - MAME_DIR .. "src/mame/video/gijoe.cpp", - MAME_DIR .. "src/mame/drivers/gradius3.cpp", - MAME_DIR .. "src/mame/includes/gradius3.h", - MAME_DIR .. "src/mame/video/gradius3.cpp", - MAME_DIR .. "src/mame/drivers/gticlub.cpp", - MAME_DIR .. "src/mame/drivers/gyruss.cpp", - MAME_DIR .. "src/mame/includes/gyruss.h", - MAME_DIR .. "src/mame/video/gyruss.cpp", - MAME_DIR .. "src/mame/drivers/hcastle.cpp", - MAME_DIR .. "src/mame/drivers/hexion.cpp", - MAME_DIR .. "src/mame/drivers/hornet.cpp", - MAME_DIR .. "src/mame/machine/konppc.cpp", - MAME_DIR .. "src/mame/machine/konppc.h", - MAME_DIR .. "src/mame/machine/konami_gn676_lan.cpp", - MAME_DIR .. "src/mame/machine/konami_gn676_lan.h", - MAME_DIR .. "src/mame/drivers/hyperspt.cpp", - MAME_DIR .. "src/mame/includes/hyperspt.h", - MAME_DIR .. "src/mame/audio/hyprolyb.cpp", - MAME_DIR .. "src/mame/audio/hyprolyb.h", - MAME_DIR .. "src/mame/video/hyperspt.cpp", - MAME_DIR .. "src/mame/drivers/ironhors.cpp", - MAME_DIR .. "src/mame/includes/ironhors.h", - MAME_DIR .. "src/mame/video/ironhors.cpp", - MAME_DIR .. "src/mame/drivers/jackal.cpp", - MAME_DIR .. "src/mame/includes/jackal.h", - MAME_DIR .. "src/mame/video/jackal.cpp", - MAME_DIR .. "src/mame/drivers/jailbrek.cpp", - MAME_DIR .. "src/mame/includes/jailbrek.h", - MAME_DIR .. "src/mame/video/jailbrek.cpp", - MAME_DIR .. "src/mame/drivers/junofrst.cpp", - MAME_DIR .. "src/mame/drivers/konamigq.cpp", - MAME_DIR .. "src/mame/drivers/konamigs.cpp", - MAME_DIR .. "src/mame/drivers/konamigv.cpp", - MAME_DIR .. "src/mame/drivers/konamigx.cpp", - MAME_DIR .. "src/mame/includes/konamigx.h", - MAME_DIR .. "src/mame/machine/konamigx.cpp", - MAME_DIR .. "src/mame/video/konamigx.cpp", - MAME_DIR .. "src/mame/drivers/konamim2.cpp", - MAME_DIR .. "src/mame/machine/3dom2.cpp", - MAME_DIR .. "src/mame/machine/3dom2.h", - MAME_DIR .. "src/mame/video/3dom2_te.cpp", - MAME_DIR .. "src/mame/video/3dom2_te.h", - MAME_DIR .. "src/mame/drivers/konblands.cpp", - MAME_DIR .. "src/mame/drivers/kongs470.cpp", - MAME_DIR .. "src/mame/drivers/konmedal.cpp", - MAME_DIR .. "src/mame/drivers/konmedal020.cpp", - MAME_DIR .. "src/mame/drivers/konmedal68k.cpp", - MAME_DIR .. "src/mame/drivers/kontest.cpp", - MAME_DIR .. "src/mame/drivers/konendev.cpp", - MAME_DIR .. "src/mame/drivers/kpontoon.cpp", - MAME_DIR .. "src/mame/drivers/kpython.cpp", - MAME_DIR .. "src/mame/drivers/ksys573.cpp", - MAME_DIR .. "src/mame/machine/k573cass.cpp", - MAME_DIR .. "src/mame/machine/k573cass.h", - MAME_DIR .. "src/mame/machine/k573dio.cpp", - MAME_DIR .. "src/mame/machine/k573dio.h", - MAME_DIR .. "src/mame/machine/k573fpga.cpp", - MAME_DIR .. "src/mame/machine/k573fpga.h", - MAME_DIR .. "src/mame/machine/k573kara.cpp", - MAME_DIR .. "src/mame/machine/k573kara.h", - MAME_DIR .. "src/mame/machine/k573mcal.cpp", - MAME_DIR .. "src/mame/machine/k573mcal.h", - MAME_DIR .. "src/mame/machine/k573mcr.cpp", - MAME_DIR .. "src/mame/machine/k573mcr.h", - MAME_DIR .. "src/mame/machine/k573msu.cpp", - MAME_DIR .. "src/mame/machine/k573msu.h", - MAME_DIR .. "src/mame/machine/k573npu.cpp", - MAME_DIR .. "src/mame/machine/k573npu.h", - MAME_DIR .. "src/mame/machine/k007452.cpp", - MAME_DIR .. "src/mame/machine/k007452.h", - MAME_DIR .. "src/mame/machine/zs01.cpp", - MAME_DIR .. "src/mame/machine/zs01.h", - MAME_DIR .. "src/mame/drivers/labyrunr.cpp", - MAME_DIR .. "src/mame/drivers/lethal.cpp", - MAME_DIR .. "src/mame/includes/lethal.h", - MAME_DIR .. "src/mame/video/lethal.cpp", - MAME_DIR .. "src/mame/drivers/mainevt.cpp", - MAME_DIR .. "src/mame/includes/mainevt.h", - MAME_DIR .. "src/mame/video/mainevt.cpp", - MAME_DIR .. "src/mame/drivers/megazone.cpp", - MAME_DIR .. "src/mame/drivers/mikie.cpp", - MAME_DIR .. "src/mame/includes/mikie.h", - MAME_DIR .. "src/mame/video/mikie.cpp", - MAME_DIR .. "src/mame/drivers/mogura.cpp", - MAME_DIR .. "src/mame/drivers/moo.cpp", - MAME_DIR .. "src/mame/includes/moo.h", - MAME_DIR .. "src/mame/video/moo.cpp", - MAME_DIR .. "src/mame/drivers/mystwarr.cpp", - MAME_DIR .. "src/mame/includes/mystwarr.h", - MAME_DIR .. "src/mame/video/mystwarr.cpp", - MAME_DIR .. "src/mame/drivers/nemesis.cpp", - MAME_DIR .. "src/mame/includes/nemesis.h", - MAME_DIR .. "src/mame/video/nemesis.cpp", - MAME_DIR .. "src/mame/drivers/nwk-tr.cpp", - MAME_DIR .. "src/mame/drivers/otomedius.cpp", - MAME_DIR .. "src/mame/drivers/overdriv.cpp", - MAME_DIR .. "src/mame/drivers/pandoras.cpp", - MAME_DIR .. "src/mame/includes/pandoras.h", - MAME_DIR .. "src/mame/video/pandoras.cpp", - MAME_DIR .. "src/mame/drivers/parodius.cpp", - MAME_DIR .. "src/mame/drivers/pingpong.cpp", - MAME_DIR .. "src/mame/includes/pingpong.h", - MAME_DIR .. "src/mame/video/pingpong.cpp", - MAME_DIR .. "src/mame/drivers/piratesh.cpp", - MAME_DIR .. "src/mame/drivers/plygonet.cpp", - MAME_DIR .. "src/mame/drivers/pooyan.cpp", - MAME_DIR .. "src/mame/includes/pooyan.h", - MAME_DIR .. "src/mame/video/pooyan.cpp", - MAME_DIR .. "src/mame/drivers/qdrmfgp.cpp", - MAME_DIR .. "src/mame/includes/qdrmfgp.h", - MAME_DIR .. "src/mame/video/qdrmfgp.cpp", - MAME_DIR .. "src/mame/drivers/quickpick5.cpp", - MAME_DIR .. "src/mame/drivers/rockrage.cpp", - MAME_DIR .. "src/mame/includes/rockrage.h", - MAME_DIR .. "src/mame/video/rockrage.cpp", - MAME_DIR .. "src/mame/drivers/rocnrope.cpp", - MAME_DIR .. "src/mame/includes/rocnrope.h", - MAME_DIR .. "src/mame/video/rocnrope.cpp", - MAME_DIR .. "src/mame/drivers/rollerg.cpp", - MAME_DIR .. "src/mame/drivers/rungun.cpp", - MAME_DIR .. "src/mame/includes/rungun.h", - MAME_DIR .. "src/mame/video/rungun.cpp", - MAME_DIR .. "src/mame/drivers/sbasketb.cpp", - MAME_DIR .. "src/mame/includes/sbasketb.h", - MAME_DIR .. "src/mame/video/sbasketb.cpp", - MAME_DIR .. "src/mame/drivers/scotrsht.cpp", - MAME_DIR .. "src/mame/includes/scotrsht.h", - MAME_DIR .. "src/mame/video/scotrsht.cpp", - MAME_DIR .. "src/mame/drivers/shaolins.cpp", - MAME_DIR .. "src/mame/includes/shaolins.h", - MAME_DIR .. "src/mame/video/shaolins.cpp", - MAME_DIR .. "src/mame/drivers/simpsons.cpp", - MAME_DIR .. "src/mame/includes/simpsons.h", - MAME_DIR .. "src/mame/machine/simpsons.cpp", - MAME_DIR .. "src/mame/video/simpsons.cpp", - MAME_DIR .. "src/mame/drivers/spy.cpp", - MAME_DIR .. "src/mame/includes/spy.h", - MAME_DIR .. "src/mame/video/spy.cpp", - MAME_DIR .. "src/mame/drivers/surpratk.cpp", - MAME_DIR .. "src/mame/drivers/tasman.cpp", - MAME_DIR .. "src/mame/drivers/tgtpanic.cpp", - MAME_DIR .. "src/mame/drivers/thunderx.cpp", - MAME_DIR .. "src/mame/includes/thunderx.h", - MAME_DIR .. "src/mame/video/thunderx.cpp", - MAME_DIR .. "src/mame/drivers/timeplt.cpp", - MAME_DIR .. "src/mame/includes/timeplt.h", - MAME_DIR .. "src/mame/video/timeplt.cpp", - MAME_DIR .. "src/mame/drivers/tmnt.cpp", - MAME_DIR .. "src/mame/includes/tmnt.h", - MAME_DIR .. "src/mame/video/tmnt.cpp", - MAME_DIR .. "src/mame/drivers/tp84.cpp", - MAME_DIR .. "src/mame/includes/tp84.h", - MAME_DIR .. "src/mame/video/tp84.cpp", - MAME_DIR .. "src/mame/drivers/trackfld.cpp", - MAME_DIR .. "src/mame/includes/trackfld.h", - MAME_DIR .. "src/mame/machine/konami1.cpp", - MAME_DIR .. "src/mame/machine/konami1.h", - MAME_DIR .. "src/mame/audio/trackfld.cpp", - MAME_DIR .. "src/mame/audio/trackfld.h", - MAME_DIR .. "src/mame/video/trackfld.cpp", - MAME_DIR .. "src/mame/drivers/tutankhm.cpp", - MAME_DIR .. "src/mame/includes/tutankhm.h", - MAME_DIR .. "src/mame/video/tutankhm.cpp", - MAME_DIR .. "src/mame/drivers/twin16.cpp", - MAME_DIR .. "src/mame/includes/twin16.h", - MAME_DIR .. "src/mame/video/twin16.cpp", - MAME_DIR .. "src/mame/drivers/twinkle.cpp", - MAME_DIR .. "src/mame/drivers/ultrsprt.cpp", - MAME_DIR .. "src/mame/drivers/ultraman.cpp", - MAME_DIR .. "src/mame/includes/ultraman.h", - MAME_DIR .. "src/mame/video/ultraman.cpp", - MAME_DIR .. "src/mame/drivers/vendetta.cpp", - MAME_DIR .. "src/mame/drivers/viper.cpp", - MAME_DIR .. "src/mame/drivers/wecleman.cpp", - MAME_DIR .. "src/mame/includes/wecleman.h", - MAME_DIR .. "src/mame/video/wecleman.cpp", - MAME_DIR .. "src/mame/drivers/xexex.cpp", - MAME_DIR .. "src/mame/includes/xexex.h", - MAME_DIR .. "src/mame/video/xexex.cpp", - MAME_DIR .. "src/mame/drivers/xmen.cpp", - MAME_DIR .. "src/mame/includes/xmen.h", - MAME_DIR .. "src/mame/video/xmen.cpp", - MAME_DIR .. "src/mame/drivers/yiear.cpp", - MAME_DIR .. "src/mame/includes/yiear.h", - MAME_DIR .. "src/mame/video/yiear.cpp", - MAME_DIR .. "src/mame/drivers/zr107.cpp", - MAME_DIR .. "src/mame/includes/konamipt.h", - MAME_DIR .. "src/mame/video/konami_helper.cpp", - MAME_DIR .. "src/mame/video/konami_helper.h", - MAME_DIR .. "src/mame/video/k007121.cpp", - MAME_DIR .. "src/mame/video/k007121.h", - MAME_DIR .. "src/mame/video/k007342.cpp", - MAME_DIR .. "src/mame/video/k007342.h", - MAME_DIR .. "src/mame/video/k007420.cpp", - MAME_DIR .. "src/mame/video/k007420.h", - MAME_DIR .. "src/mame/video/k037122.cpp", - MAME_DIR .. "src/mame/video/k037122.h", - MAME_DIR .. "src/mame/video/k051733.cpp", - MAME_DIR .. "src/mame/video/k051733.h", - MAME_DIR .. "src/mame/video/k051960.cpp", - MAME_DIR .. "src/mame/video/k051960.h", - MAME_DIR .. "src/mame/video/k052109.cpp", - MAME_DIR .. "src/mame/video/k052109.h", - MAME_DIR .. "src/mame/video/k053250.cpp", - MAME_DIR .. "src/mame/video/k053250.h", - MAME_DIR .. "src/mame/video/k053250_ps.cpp", - MAME_DIR .. "src/mame/video/k053250_ps.h", - MAME_DIR .. "src/mame/video/k053251.cpp", - MAME_DIR .. "src/mame/video/k053251.h", - MAME_DIR .. "src/mame/video/k054156_k054157_k056832.cpp", - MAME_DIR .. "src/mame/video/k054156_k054157_k056832.h", - MAME_DIR .. "src/mame/video/k053244_k053245.cpp", - MAME_DIR .. "src/mame/video/k053244_k053245.h", - MAME_DIR .. "src/mame/video/k053246_k053247_k055673.cpp", - MAME_DIR .. "src/mame/video/k053246_k053247_k055673.h", - MAME_DIR .. "src/mame/video/k055555.cpp", - MAME_DIR .. "src/mame/video/k055555.h", - MAME_DIR .. "src/mame/video/k054000.cpp", - MAME_DIR .. "src/mame/video/k054000.h", - MAME_DIR .. "src/mame/video/k054338.cpp", - MAME_DIR .. "src/mame/video/k054338.h", - MAME_DIR .. "src/mame/video/k001006.cpp", - MAME_DIR .. "src/mame/video/k001006.h", - MAME_DIR .. "src/mame/video/k001005.cpp", - MAME_DIR .. "src/mame/video/k001005.h", - MAME_DIR .. "src/mame/video/k001604.cpp", - MAME_DIR .. "src/mame/video/k001604.h", - MAME_DIR .. "src/mame/video/k057714.cpp", - MAME_DIR .. "src/mame/video/k057714.h", -} - -createMAMEProjects(_target, _subtarget, "matic") -files { - MAME_DIR .. "src/mame/drivers/barata.cpp", -} - -createMAMEProjects(_target, _subtarget, "maygay") -files { - MAME_DIR .. "src/mame/includes/maygay1b.h", - MAME_DIR .. "src/mame/drivers/maygay1b.cpp", - MAME_DIR .. "src/mame/drivers/maygay1bsw.cpp", - MAME_DIR .. "src/mame/drivers/maygayv1.cpp", - MAME_DIR .. "src/mame/drivers/maygayep.cpp", - MAME_DIR .. "src/mame/drivers/maygayew.cpp", - MAME_DIR .. "src/mame/drivers/mmm.cpp", -} - -createMAMEProjects(_target, _subtarget, "meadows") -files { - MAME_DIR .. "src/mame/drivers/lazercmd.cpp", - MAME_DIR .. "src/mame/includes/lazercmd.h", - MAME_DIR .. "src/mame/video/lazercmd.cpp", - MAME_DIR .. "src/mame/drivers/meadwttl.cpp", - MAME_DIR .. "src/mame/drivers/meadows.cpp", - MAME_DIR .. "src/mame/includes/meadows.h", - MAME_DIR .. "src/mame/audio/meadows.cpp", - MAME_DIR .. "src/mame/video/meadows.cpp", - MAME_DIR .. "src/mame/drivers/warpsped.cpp", -} - -createMAMEProjects(_target, _subtarget, "merit") -files { - MAME_DIR .. "src/mame/drivers/mgames.cpp", - MAME_DIR .. "src/mame/drivers/merit.cpp", - MAME_DIR .. "src/mame/drivers/merit3xx.cpp", - MAME_DIR .. "src/mame/drivers/meritm.cpp", - MAME_DIR .. "src/mame/drivers/merits.cpp", - MAME_DIR .. "src/mame/drivers/meritsdx.cpp", - MAME_DIR .. "src/mame/drivers/mtouchxl.cpp", - MAME_DIR .. "src/mame/drivers/pubtimed.cpp", -} - -createMAMEProjects(_target, _subtarget, "metro") -files { - MAME_DIR .. "src/mame/drivers/hyprduel.cpp", - MAME_DIR .. "src/mame/drivers/metro.cpp", - MAME_DIR .. "src/mame/includes/metro.h", - MAME_DIR .. "src/mame/video/metro.cpp", - MAME_DIR .. "src/mame/drivers/rabbit.cpp", - MAME_DIR .. "src/mame/drivers/tmmjprd.cpp", -} - -createMAMEProjects(_target, _subtarget, "midcoin") -files { - MAME_DIR .. "src/mame/drivers/wallc.cpp", - MAME_DIR .. "src/mame/drivers/wink.cpp", - MAME_DIR .. "src/mame/drivers/24cdjuke.cpp", -} - -createMAMEProjects(_target, _subtarget, "midw8080") -files { - MAME_DIR .. "src/mame/drivers/8080bw.cpp", - MAME_DIR .. "src/mame/includes/8080bw.h", - MAME_DIR .. "src/mame/audio/8080bw.cpp", - MAME_DIR .. "src/mame/audio/8080bw.h", - MAME_DIR .. "src/mame/video/8080bw.cpp", - MAME_DIR .. "src/mame/drivers/m79amb.cpp", - MAME_DIR .. "src/mame/includes/m79amb.h", - MAME_DIR .. "src/mame/audio/m79amb.cpp", - MAME_DIR .. "src/mame/drivers/mw8080bw.cpp", - MAME_DIR .. "src/mame/includes/mw8080bw.h", - MAME_DIR .. "src/mame/audio/mw8080bw.cpp", - MAME_DIR .. "src/mame/audio/mw8080bw.h", - MAME_DIR .. "src/mame/audio/nl_gunfight.cpp", - MAME_DIR .. "src/mame/audio/nl_gunfight.h", - MAME_DIR .. "src/mame/audio/nl_280zzzap.cpp", - MAME_DIR .. "src/mame/audio/nl_280zzzap.h", - MAME_DIR .. "src/mame/video/mw8080bw.cpp", - MAME_DIR .. "src/mame/drivers/rotaryf.cpp", -} - -createMAMEProjects(_target, _subtarget, "midway") -files { - MAME_DIR .. "src/mame/drivers/astrocde.cpp", - MAME_DIR .. "src/mame/includes/astrocde.h", - MAME_DIR .. "src/mame/video/astrocde.cpp", - MAME_DIR .. "src/mame/drivers/atlantis.cpp", - MAME_DIR .. "src/mame/drivers/balsente.cpp", - MAME_DIR .. "src/mame/includes/balsente.h", - MAME_DIR .. "src/mame/machine/balsente.cpp", - MAME_DIR .. "src/mame/video/balsente.cpp", - MAME_DIR .. "src/mame/drivers/gridlee.cpp", - MAME_DIR .. "src/mame/includes/gridlee.h", - MAME_DIR .. "src/mame/audio/gridlee.cpp", - MAME_DIR .. "src/mame/video/gridlee.cpp", - MAME_DIR .. "src/mame/drivers/mcr.cpp", - MAME_DIR .. "src/mame/includes/mcr.h", - MAME_DIR .. "src/mame/machine/mcr.cpp", - MAME_DIR .. "src/mame/video/mcr.cpp", - MAME_DIR .. "src/mame/drivers/mcr3.cpp", - MAME_DIR .. "src/mame/includes/mcr3.h", - MAME_DIR .. "src/mame/video/mcr3.cpp", - MAME_DIR .. "src/mame/drivers/spyhuntertec.cpp", - MAME_DIR .. "src/mame/drivers/mcr68.cpp", - MAME_DIR .. "src/mame/includes/mcr68.h", - MAME_DIR .. "src/mame/machine/mcr68.cpp", - MAME_DIR .. "src/mame/video/mcr68.cpp", - MAME_DIR .. "src/mame/drivers/zwackery.cpp", - MAME_DIR .. "src/mame/drivers/midqslvr.cpp", - MAME_DIR .. "src/mame/drivers/midtunit.cpp", - MAME_DIR .. "src/mame/includes/midtunit.h", - MAME_DIR .. "src/mame/machine/midtunit.cpp", - MAME_DIR .. "src/mame/video/midtunit.cpp", - MAME_DIR .. "src/mame/video/midtunit.ipp", - MAME_DIR .. "src/mame/video/midtunit.h", - MAME_DIR .. "src/mame/video/midtview.ipp", - MAME_DIR .. "src/mame/drivers/midvunit.cpp", - MAME_DIR .. "src/mame/includes/midvunit.h", - MAME_DIR .. "src/mame/video/midvunit.cpp", - MAME_DIR .. "src/mame/drivers/midwunit.cpp", - MAME_DIR .. "src/mame/includes/midwunit.h", - MAME_DIR .. "src/mame/machine/midwunit.cpp", - MAME_DIR .. "src/mame/drivers/midxunit.cpp", - MAME_DIR .. "src/mame/includes/midxunit.h", - MAME_DIR .. "src/mame/machine/midxunit.cpp", - MAME_DIR .. "src/mame/drivers/midyunit.cpp", - MAME_DIR .. "src/mame/includes/midyunit.h", - MAME_DIR .. "src/mame/machine/midyunit.cpp", - MAME_DIR .. "src/mame/video/midyunit.cpp", - MAME_DIR .. "src/mame/drivers/midzeus.cpp", - MAME_DIR .. "src/mame/includes/midzeus.h", - MAME_DIR .. "src/mame/video/midzeus.cpp", - MAME_DIR .. "src/mame/drivers/mw18w.cpp", - MAME_DIR .. "src/mame/drivers/mwsub.cpp", - MAME_DIR .. "src/mame/drivers/omegrace.cpp", - MAME_DIR .. "src/mame/drivers/pinball2k.cpp", - MAME_DIR .. "src/mame/drivers/seattle.cpp", - MAME_DIR .. "src/mame/drivers/sspeedr.cpp", - MAME_DIR .. "src/mame/includes/sspeedr.h", - MAME_DIR .. "src/mame/audio/nl_sspeedr.cpp", - MAME_DIR .. "src/mame/audio/nl_sspeedr.h", - MAME_DIR .. "src/mame/video/sspeedr.cpp", - MAME_DIR .. "src/mame/drivers/starrider.cpp", - MAME_DIR .. "src/mame/drivers/tmaster.cpp", - MAME_DIR .. "src/mame/drivers/vegas.cpp", - MAME_DIR .. "src/mame/drivers/wmg.cpp", - MAME_DIR .. "src/mame/drivers/williams.cpp", - MAME_DIR .. "src/mame/includes/williams.h", - MAME_DIR .. "src/mame/machine/williams.cpp", - MAME_DIR .. "src/mame/video/williams.cpp", - MAME_DIR .. "src/mame/machine/midwayic.cpp", - MAME_DIR .. "src/mame/machine/midwayic.h", - MAME_DIR .. "src/mame/audio/midway.cpp", - MAME_DIR .. "src/mame/audio/midway.h", - MAME_DIR .. "src/mame/audio/csd.cpp", - MAME_DIR .. "src/mame/audio/csd.h", - MAME_DIR .. "src/mame/audio/sente6vb.cpp", - MAME_DIR .. "src/mame/audio/sente6vb.h", -} - -createMAMEProjects(_target, _subtarget, "mr") -files { - MAME_DIR .. "src/mame/drivers/dribling.cpp", - MAME_DIR .. "src/mame/includes/dribling.h", - MAME_DIR .. "src/mame/video/dribling.cpp", - MAME_DIR .. "src/mame/drivers/sshot.cpp", - MAME_DIR .. "src/mame/drivers/subhuntr.cpp", -} - -createMAMEProjects(_target, _subtarget, "namco") -files { - MAME_DIR .. "src/mame/drivers/20pacgal.cpp", - MAME_DIR .. "src/mame/includes/20pacgal.h", - MAME_DIR .. "src/mame/video/20pacgal.cpp", - MAME_DIR .. "src/mame/drivers/30test.cpp", - MAME_DIR .. "src/mame/drivers/baraduke.cpp", - MAME_DIR .. "src/mame/includes/baraduke.h", - MAME_DIR .. "src/mame/video/baraduke.cpp", - MAME_DIR .. "src/mame/drivers/cgang.cpp", - MAME_DIR .. "src/mame/drivers/cswat.cpp", - MAME_DIR .. "src/mame/drivers/dangbar.cpp", - MAME_DIR .. "src/mame/drivers/dkmb.cpp", - MAME_DIR .. "src/mame/drivers/gal3.cpp", - MAME_DIR .. "src/mame/drivers/galaga.cpp", - MAME_DIR .. "src/mame/includes/galaga.h", - MAME_DIR .. "src/mame/audio/galaga.cpp", - MAME_DIR .. "src/mame/video/galaga.cpp", - MAME_DIR .. "src/mame/video/bosco.cpp", - MAME_DIR .. "src/mame/includes/bosco.h", - MAME_DIR .. "src/mame/video/starfield_05xx.cpp", - MAME_DIR .. "src/mame/video/starfield_05xx.h", - MAME_DIR .. "src/mame/video/digdug.cpp", - MAME_DIR .. "src/mame/includes/digdug.h", - MAME_DIR .. "src/mame/machine/xevious.cpp", - MAME_DIR .. "src/mame/includes/xevious.h", - MAME_DIR .. "src/mame/video/xevious.cpp", - MAME_DIR .. "src/mame/drivers/gaplus.cpp", - MAME_DIR .. "src/mame/includes/gaplus.h", - MAME_DIR .. "src/mame/machine/gaplus.cpp", - MAME_DIR .. "src/mame/video/gaplus.cpp", - MAME_DIR .. "src/mame/drivers/kungfur.cpp", - MAME_DIR .. "src/mame/drivers/mappy.cpp", - MAME_DIR .. "src/mame/includes/mappy.h", - MAME_DIR .. "src/mame/video/mappy.cpp", - MAME_DIR .. "src/mame/drivers/namcofl.cpp", - MAME_DIR .. "src/mame/includes/namcofl.h", - MAME_DIR .. "src/mame/video/namcofl.cpp", - MAME_DIR .. "src/mame/drivers/namcona1.cpp", - MAME_DIR .. "src/mame/includes/namcona1.h", - MAME_DIR .. "src/mame/video/namcona1.cpp", - MAME_DIR .. "src/mame/drivers/namconb1.cpp", - MAME_DIR .. "src/mame/includes/namconb1.h", - MAME_DIR .. "src/mame/video/namconb1.cpp", - MAME_DIR .. "src/mame/drivers/namcond1.cpp", - MAME_DIR .. "src/mame/includes/namcond1.h", - MAME_DIR .. "src/mame/machine/namcond1.cpp", - MAME_DIR .. "src/mame/video/ygv608.cpp", - MAME_DIR .. "src/mame/video/ygv608.h", - MAME_DIR .. "src/mame/drivers/namcops2.cpp", - MAME_DIR .. "src/mame/drivers/namcos1.cpp", - MAME_DIR .. "src/mame/includes/namcos1.h", - MAME_DIR .. "src/mame/machine/namcos1.cpp", - MAME_DIR .. "src/mame/video/namcos1.cpp", - MAME_DIR .. "src/mame/drivers/namcos1b.cpp", - MAME_DIR .. "src/mame/drivers/namcos10.cpp", - MAME_DIR .. "src/mame/machine/ns10crypt.cpp", - MAME_DIR .. "src/mame/machine/ns10crypt.h", - MAME_DIR .. "src/mame/drivers/namcos11.cpp", - MAME_DIR .. "src/mame/machine/ns11prot.cpp", - MAME_DIR .. "src/mame/machine/ns11prot.h", - MAME_DIR .. "src/mame/drivers/namcos12.cpp", - MAME_DIR .. "src/mame/machine/namco_settings.cpp", - MAME_DIR .. "src/mame/machine/namco_settings.h", - MAME_DIR .. "src/mame/drivers/namcos2.cpp", - MAME_DIR .. "src/mame/includes/namcos2.h", - MAME_DIR .. "src/mame/machine/namcos2.cpp", - MAME_DIR .. "src/mame/video/namcos2.cpp", - MAME_DIR .. "src/mame/video/namco_c45road.cpp", - MAME_DIR .. "src/mame/video/namco_c45road.h", - MAME_DIR .. "src/mame/video/namco_c169roz.cpp", - MAME_DIR .. "src/mame/video/namco_c169roz.h", - MAME_DIR .. "src/mame/video/namco_c355spr.cpp", - MAME_DIR .. "src/mame/video/namco_c355spr.h", - MAME_DIR .. "src/mame/video/namco_c123tmap.cpp", - MAME_DIR .. "src/mame/video/namco_c123tmap.h", - MAME_DIR .. "src/mame/video/namcos2_sprite.cpp", - MAME_DIR .. "src/mame/video/namcos2_sprite.h", - MAME_DIR .. "src/mame/video/namcos2_roz.cpp", - MAME_DIR .. "src/mame/video/namcos2_roz.h", - MAME_DIR .. "src/mame/drivers/namcos21.cpp", - MAME_DIR .. "src/mame/drivers/namcos21_de.cpp", - MAME_DIR .. "src/mame/drivers/namcos21_c67.cpp", - MAME_DIR .. "src/mame/video/namcos21_3d.cpp", - MAME_DIR .. "src/mame/video/namcos21_3d.h", - MAME_DIR .. "src/mame/machine/namcos21_dsp.cpp", - MAME_DIR .. "src/mame/machine/namcos21_dsp.h", - MAME_DIR .. "src/mame/machine/namcos21_dsp_c67.cpp", - MAME_DIR .. "src/mame/machine/namcos21_dsp_c67.h", - MAME_DIR .. "src/mame/machine/namco_c67.cpp", - MAME_DIR .. "src/mame/machine/namco_c67.h", - MAME_DIR .. "src/mame/drivers/namcos22.cpp", - MAME_DIR .. "src/mame/includes/namcos22.h", - MAME_DIR .. "src/mame/video/namcos22.cpp", - MAME_DIR .. "src/mame/drivers/namcos23.cpp", - MAME_DIR .. "src/mame/drivers/namcos86.cpp", - MAME_DIR .. "src/mame/includes/namcos86.h", - MAME_DIR .. "src/mame/video/namcos86.cpp", - MAME_DIR .. "src/mame/drivers/pacland.cpp", - MAME_DIR .. "src/mame/drivers/polepos.cpp", - MAME_DIR .. "src/mame/includes/polepos.h", - MAME_DIR .. "src/mame/audio/polepos.cpp", - MAME_DIR .. "src/mame/audio/polepos.h", - MAME_DIR .. "src/mame/video/polepos.cpp", - MAME_DIR .. "src/mame/drivers/rallyx.cpp", - MAME_DIR .. "src/mame/includes/rallyx.h", - MAME_DIR .. "src/mame/video/rallyx.cpp", - MAME_DIR .. "src/mame/drivers/rbowlorama.cpp", - MAME_DIR .. "src/mame/drivers/shootaway2.cpp", - MAME_DIR .. "src/mame/drivers/skykid.cpp", - MAME_DIR .. "src/mame/drivers/sweetland.cpp", - MAME_DIR .. "src/mame/audio/nl_tankbatt.h", - MAME_DIR .. "src/mame/audio/nl_tankbatt.cpp", - MAME_DIR .. "src/mame/drivers/tankbatt.cpp", - MAME_DIR .. "src/mame/includes/tankbatt.h", - MAME_DIR .. "src/mame/video/tankbatt.cpp", - MAME_DIR .. "src/mame/drivers/tceptor.cpp", - MAME_DIR .. "src/mame/includes/tceptor.h", - MAME_DIR .. "src/mame/video/tceptor.cpp", - MAME_DIR .. "src/mame/drivers/toypop.cpp", - MAME_DIR .. "src/mame/drivers/turrett.cpp", - MAME_DIR .. "src/mame/includes/turrett.h", - MAME_DIR .. "src/mame/audio/turrett.cpp", - MAME_DIR .. "src/mame/video/turrett.cpp", - MAME_DIR .. "src/mame/drivers/wacky_gator.cpp", - MAME_DIR .. "src/mame/drivers/warpwarp.cpp", - MAME_DIR .. "src/mame/includes/warpwarp.h", - MAME_DIR .. "src/mame/audio/geebee.cpp", - MAME_DIR .. "src/mame/audio/geebee.h", - MAME_DIR .. "src/mame/audio/warpwarp.cpp", - MAME_DIR .. "src/mame/audio/warpwarp.h", - MAME_DIR .. "src/mame/video/warpwarp.cpp", - MAME_DIR .. "src/mame/machine/c117.cpp", - MAME_DIR .. "src/mame/machine/c117.h", - MAME_DIR .. "src/mame/machine/namcoio.cpp", - MAME_DIR .. "src/mame/machine/namcoio.h", - MAME_DIR .. "src/mame/machine/namco06.cpp", - MAME_DIR .. "src/mame/machine/namco06.h", - MAME_DIR .. "src/mame/machine/namco50.cpp", - MAME_DIR .. "src/mame/machine/namco50.h", - MAME_DIR .. "src/mame/machine/namco51.cpp", - MAME_DIR .. "src/mame/machine/namco51.h", - MAME_DIR .. "src/mame/machine/namco53.cpp", - MAME_DIR .. "src/mame/machine/namco53.h", - MAME_DIR .. "src/mame/machine/namco62.cpp", - MAME_DIR .. "src/mame/machine/namco62.h", - MAME_DIR .. "src/mame/machine/namco65.cpp", - MAME_DIR .. "src/mame/machine/namco65.h", - MAME_DIR .. "src/mame/machine/namco68.cpp", - MAME_DIR .. "src/mame/machine/namco68.h", - MAME_DIR .. "src/mame/machine/namcomcu.cpp", - MAME_DIR .. "src/mame/machine/namcomcu.h", - MAME_DIR .. "src/mame/machine/namcoio_gearbox.cpp", - MAME_DIR .. "src/mame/machine/namcoio_gearbox.h", - MAME_DIR .. "src/mame/machine/namco_c148.cpp", - MAME_DIR .. "src/mame/machine/namco_c148.h", - MAME_DIR .. "src/mame/machine/namco_c139.cpp", - MAME_DIR .. "src/mame/machine/namco_c139.h", - MAME_DIR .. "src/mame/audio/namco52.cpp", - MAME_DIR .. "src/mame/audio/namco52.h", - MAME_DIR .. "src/mame/audio/namco54.cpp", - MAME_DIR .. "src/mame/audio/namco54.h", - MAME_DIR .. "src/mame/video/namco_c116.cpp", - MAME_DIR .. "src/mame/video/namco_c116.h", -} - -createMAMEProjects(_target, _subtarget, "nasco") -files { - MAME_DIR .. "src/mame/drivers/crgolf.cpp", - MAME_DIR .. "src/mame/drivers/himesiki.cpp", - MAME_DIR .. "src/mame/drivers/suprgolf.cpp", -} - -createMAMEProjects(_target, _subtarget, "neogeo") -files { - MAME_DIR .. "src/mame/drivers/midas.cpp", - MAME_DIR .. "src/mame/drivers/neogeo.cpp", - MAME_DIR .. "src/mame/includes/neogeo.h", - MAME_DIR .. "src/mame/video/neogeo.cpp", - MAME_DIR .. "src/mame/drivers/neopcb.cpp", - MAME_DIR .. "src/mame/video/neogeo_spr.cpp", - MAME_DIR .. "src/mame/video/neogeo_spr.h", - MAME_DIR .. "src/mame/machine/ng_memcard.cpp", - MAME_DIR .. "src/mame/machine/ng_memcard.h", -} - -createMAMEProjects(_target, _subtarget, "nichibut") -files { - MAME_DIR .. "src/mame/drivers/armedf.cpp", - MAME_DIR .. "src/mame/includes/armedf.h", - MAME_DIR .. "src/mame/video/armedf.cpp", - MAME_DIR .. "src/mame/drivers/cclimber.cpp", - MAME_DIR .. "src/mame/includes/cclimber.h", - MAME_DIR .. "src/mame/machine/cclimber.cpp", - MAME_DIR .. "src/mame/audio/cclimber.cpp", - MAME_DIR .. "src/mame/audio/cclimber.h", - MAME_DIR .. "src/mame/video/cclimber.cpp", - MAME_DIR .. "src/mame/drivers/clshroad.cpp", - MAME_DIR .. "src/mame/includes/clshroad.h", - MAME_DIR .. "src/mame/video/clshroad.cpp", - MAME_DIR .. "src/mame/drivers/csplayh5.cpp", - MAME_DIR .. "src/mame/drivers/cop01.cpp", - MAME_DIR .. "src/mame/includes/cop01.h", - MAME_DIR .. "src/mame/video/cop01.cpp", - MAME_DIR .. "src/mame/drivers/dacholer.cpp", - MAME_DIR .. "src/mame/drivers/galivan.cpp", - MAME_DIR .. "src/mame/includes/galivan.h", - MAME_DIR .. "src/mame/video/galivan.cpp", - MAME_DIR .. "src/mame/drivers/gomoku.cpp", - MAME_DIR .. "src/mame/includes/gomoku.h", - MAME_DIR .. "src/mame/audio/gomoku.cpp", - MAME_DIR .. "src/mame/audio/gomoku.h", - MAME_DIR .. "src/mame/video/gomoku.cpp", - MAME_DIR .. "src/mame/drivers/hyhoo.cpp", - MAME_DIR .. "src/mame/includes/hyhoo.h", - MAME_DIR .. "src/mame/video/hyhoo.cpp", - MAME_DIR .. "src/mame/drivers/jangou.cpp", - MAME_DIR .. "src/mame/drivers/magmax.cpp", - MAME_DIR .. "src/mame/includes/magmax.h", - MAME_DIR .. "src/mame/video/magmax.cpp", - MAME_DIR .. "src/mame/drivers/nbmj8688.cpp", - MAME_DIR .. "src/mame/includes/nbmj8688.h", - MAME_DIR .. "src/mame/video/nbmj8688.cpp", - MAME_DIR .. "src/mame/drivers/nbmj8891.cpp", - MAME_DIR .. "src/mame/includes/nbmj8891.h", - MAME_DIR .. "src/mame/video/nbmj8891.cpp", - MAME_DIR .. "src/mame/drivers/nbmj8900.cpp", - MAME_DIR .. "src/mame/includes/nbmj8900.h", - MAME_DIR .. "src/mame/video/nbmj8900.cpp", - MAME_DIR .. "src/mame/drivers/nbmj8991.cpp", - MAME_DIR .. "src/mame/includes/nbmj8991.h", - MAME_DIR .. "src/mame/video/nbmj8991.cpp", - MAME_DIR .. "src/mame/drivers/nbmj9195.cpp", - MAME_DIR .. "src/mame/includes/nbmj9195.h", - MAME_DIR .. "src/mame/video/nbmj9195.cpp", - MAME_DIR .. "src/mame/drivers/nightgal.cpp", - MAME_DIR .. "src/mame/drivers/nichild.cpp", - MAME_DIR .. "src/mame/audio/nichisnd.cpp", - MAME_DIR .. "src/mame/audio/nichisnd.h", - MAME_DIR .. "src/mame/drivers/niyanpai.cpp", - MAME_DIR .. "src/mame/includes/niyanpai.h", - MAME_DIR .. "src/mame/video/niyanpai.cpp", - MAME_DIR .. "src/mame/drivers/pastelg.cpp", - MAME_DIR .. "src/mame/includes/pastelg.h", - MAME_DIR .. "src/mame/video/pastelg.cpp", - MAME_DIR .. "src/mame/drivers/seicross.cpp", - MAME_DIR .. "src/mame/includes/seicross.h", - MAME_DIR .. "src/mame/video/seicross.cpp", - MAME_DIR .. "src/mame/drivers/terracre.cpp", - MAME_DIR .. "src/mame/includes/terracre.h", - MAME_DIR .. "src/mame/video/terracre.cpp", - MAME_DIR .. "src/mame/drivers/tubep.cpp", - MAME_DIR .. "src/mame/includes/tubep.h", - MAME_DIR .. "src/mame/video/tubep.cpp", - MAME_DIR .. "src/mame/drivers/wiping.cpp", - MAME_DIR .. "src/mame/includes/wiping.h", - MAME_DIR .. "src/mame/audio/wiping.cpp", - MAME_DIR .. "src/mame/audio/wiping.h", - MAME_DIR .. "src/mame/video/wiping.cpp", - MAME_DIR .. "src/mame/machine/nb1412m2.cpp", - MAME_DIR .. "src/mame/machine/nb1412m2.h", - MAME_DIR .. "src/mame/machine/nb1413m3.cpp", - MAME_DIR .. "src/mame/machine/nb1413m3.h", - MAME_DIR .. "src/mame/machine/nb1414m4.cpp", - MAME_DIR .. "src/mame/machine/nb1414m4.h", -} - -createMAMEProjects(_target, _subtarget, "nintendo") -files { - MAME_DIR .. "src/mame/drivers/aleck64.cpp", - MAME_DIR .. "src/mame/machine/n64.cpp", - MAME_DIR .. "src/mame/video/n64.cpp", - MAME_DIR .. "src/mame/video/n64types.h", - MAME_DIR .. "src/mame/video/rdpfiltr.ipp", - MAME_DIR .. "src/mame/video/n64.h", - MAME_DIR .. "src/mame/video/rdpblend.cpp", - MAME_DIR .. "src/mame/video/rdpblend.h", - MAME_DIR .. "src/mame/video/rdptpipe.cpp", - MAME_DIR .. "src/mame/video/rdptpipe.h", - MAME_DIR .. "src/mame/video/pin64.cpp", - MAME_DIR .. "src/mame/video/pin64.h", - MAME_DIR .. "src/mame/drivers/cham24.cpp", - MAME_DIR .. "src/mame/drivers/dkong.cpp", - MAME_DIR .. "src/mame/includes/dkong.h", - MAME_DIR .. "src/mame/audio/dkong.cpp", - MAME_DIR .. "src/mame/video/dkong.cpp", - MAME_DIR .. "src/mame/drivers/mario.cpp", - MAME_DIR .. "src/mame/includes/mario.h", - MAME_DIR .. "src/mame/audio/nl_mario.cpp", - MAME_DIR .. "src/mame/audio/nl_mario.h", - MAME_DIR .. "src/mame/audio/mario.cpp", - MAME_DIR .. "src/mame/video/mario.cpp", - MAME_DIR .. "src/mame/drivers/mmagic.cpp", - MAME_DIR .. "src/mame/drivers/multigam.cpp", - MAME_DIR .. "src/mame/drivers/n8080.cpp", - MAME_DIR .. "src/mame/includes/n8080.h", - MAME_DIR .. "src/mame/audio/n8080.cpp", - MAME_DIR .. "src/mame/video/n8080.cpp", - MAME_DIR .. "src/mame/drivers/nss.cpp", - MAME_DIR .. "src/mame/machine/snes.cpp", - MAME_DIR .. "src/mame/drivers/playch10.cpp", - MAME_DIR .. "src/mame/includes/playch10.h", - MAME_DIR .. "src/mame/machine/playch10.cpp", - MAME_DIR .. "src/mame/video/playch10.cpp", - MAME_DIR .. "src/mame/drivers/popeye.cpp", - MAME_DIR .. "src/mame/includes/popeye.h", - MAME_DIR .. "src/mame/video/popeye.cpp", - MAME_DIR .. "src/mame/audio/nl_popeye.cpp", - MAME_DIR .. "src/mame/audio/nl_popeye.h", - MAME_DIR .. "src/mame/drivers/punchout.cpp", - MAME_DIR .. "src/mame/includes/punchout.h", - MAME_DIR .. "src/mame/video/punchout.cpp", - MAME_DIR .. "src/mame/drivers/famibox.cpp", - MAME_DIR .. "src/mame/drivers/sfcbox.cpp", - MAME_DIR .. "src/mame/drivers/snesb51.cpp", - MAME_DIR .. "src/mame/drivers/snesb.cpp", - MAME_DIR .. "src/mame/drivers/spacefb.cpp", - MAME_DIR .. "src/mame/includes/spacefb.h", - MAME_DIR .. "src/mame/audio/spacefb.cpp", - MAME_DIR .. "src/mame/video/spacefb.cpp", - MAME_DIR .. "src/mame/drivers/vsnes.cpp", - MAME_DIR .. "src/mame/includes/vsnes.h", - MAME_DIR .. "src/mame/machine/vsnes.cpp", -} - -createMAMEProjects(_target, _subtarget, "nix") -files { - MAME_DIR .. "src/mame/drivers/fitfight.cpp", - MAME_DIR .. "src/mame/includes/fitfight.h", - MAME_DIR .. "src/mame/video/fitfight.cpp", - MAME_DIR .. "src/mame/drivers/pirates.cpp", - MAME_DIR .. "src/mame/includes/pirates.h", - MAME_DIR .. "src/mame/video/pirates.cpp", -} - -createMAMEProjects(_target, _subtarget, "nmk") -files { - MAME_DIR .. "src/mame/drivers/cultures.cpp", - MAME_DIR .. "src/mame/drivers/ddealer.cpp", - MAME_DIR .. "src/mame/drivers/macrossp.cpp", - MAME_DIR .. "src/mame/drivers/nmk16.cpp", - MAME_DIR .. "src/mame/includes/nmk16.h", - MAME_DIR .. "src/mame/machine/nmk004.cpp", - MAME_DIR .. "src/mame/machine/nmk004.h", - MAME_DIR .. "src/mame/video/nmk16.cpp", - MAME_DIR .. "src/mame/video/nmk16spr.cpp", - MAME_DIR .. "src/mame/video/nmk16spr.h", - MAME_DIR .. "src/mame/drivers/nmkmedal.cpp", - MAME_DIR .. "src/mame/drivers/powerins.cpp", - MAME_DIR .. "src/mame/includes/powerins.h", - MAME_DIR .. "src/mame/video/powerins.cpp", - MAME_DIR .. "src/mame/drivers/quizdna.cpp", - MAME_DIR .. "src/mame/includes/quizdna.h", - MAME_DIR .. "src/mame/video/quizdna.cpp", - MAME_DIR .. "src/mame/drivers/quizpani.cpp", - MAME_DIR .. "src/mame/includes/quizpani.h", - MAME_DIR .. "src/mame/video/quizpani.cpp", -} - -createMAMEProjects(_target, _subtarget, "novadesitec") -files { - MAME_DIR .. "src/mame/drivers/novadesitec_fr002.cpp", - MAME_DIR .. "src/mame/drivers/novadesitec_fr004.cpp", - MAME_DIR .. "src/mame/drivers/novadesitec_fr009.cpp", -} - -createMAMEProjects(_target, _subtarget, "olympia") -files { - MAME_DIR .. "src/mame/drivers/dday.cpp", - MAME_DIR .. "src/mame/includes/dday.h", - MAME_DIR .. "src/mame/video/dday.cpp", - MAME_DIR .. "src/mame/drivers/lbeach.cpp", - MAME_DIR .. "src/mame/drivers/monzagp.cpp", - MAME_DIR .. "src/mame/drivers/portrait.cpp", - MAME_DIR .. "src/mame/includes/portrait.h", - MAME_DIR .. "src/mame/video/portrait.cpp", - MAME_DIR .. "src/mame/drivers/vega.cpp", -} - -createMAMEProjects(_target, _subtarget, "omori") -files { - MAME_DIR .. "src/mame/drivers/battlex.cpp", - MAME_DIR .. "src/mame/includes/battlex.h", - MAME_DIR .. "src/mame/video/battlex.cpp", - MAME_DIR .. "src/mame/drivers/carjmbre.cpp", - MAME_DIR .. "src/mame/drivers/popper.cpp", - MAME_DIR .. "src/mame/drivers/spaceg.cpp", -} - -createMAMEProjects(_target, _subtarget, "orca") -files { - MAME_DIR .. "src/mame/drivers/espial.cpp", - MAME_DIR .. "src/mame/includes/espial.h", - MAME_DIR .. "src/mame/video/espial.cpp", - MAME_DIR .. "src/mame/drivers/funkybee.cpp", - MAME_DIR .. "src/mame/includes/funkybee.h", - MAME_DIR .. "src/mame/video/funkybee.cpp", - MAME_DIR .. "src/mame/drivers/marineb.cpp", - MAME_DIR .. "src/mame/includes/marineb.h", - MAME_DIR .. "src/mame/video/marineb.cpp", - MAME_DIR .. "src/mame/video/orca40c.cpp", - MAME_DIR .. "src/mame/video/orca40c.h", - MAME_DIR .. "src/mame/drivers/vastar.cpp", - MAME_DIR .. "src/mame/includes/vastar.h", - MAME_DIR .. "src/mame/video/vastar.cpp", - MAME_DIR .. "src/mame/drivers/zodiack.cpp", - MAME_DIR .. "src/mame/includes/zodiack.h", -} - -createMAMEProjects(_target, _subtarget, "pacific") -files { - MAME_DIR .. "src/mame/drivers/mrflea.cpp", - MAME_DIR .. "src/mame/includes/mrflea.h", - MAME_DIR .. "src/mame/video/mrflea.cpp", - MAME_DIR .. "src/mame/drivers/thief.cpp", - MAME_DIR .. "src/mame/includes/thief.h", - MAME_DIR .. "src/mame/video/thief.cpp", -} - -createMAMEProjects(_target, _subtarget, "pacman") -files { - MAME_DIR .. "src/mame/drivers/jrpacman.cpp", - MAME_DIR .. "src/mame/drivers/pacman.cpp", - MAME_DIR .. "src/mame/includes/pacman.h", - MAME_DIR .. "src/mame/machine/pacman.cpp", - MAME_DIR .. "src/mame/video/pacman.cpp", - MAME_DIR .. "src/mame/machine/jumpshot.cpp", - MAME_DIR .. "src/mame/machine/jumpshot.h", - MAME_DIR .. "src/mame/machine/pacplus.cpp", - MAME_DIR .. "src/mame/machine/pacplus.h", - MAME_DIR .. "src/mame/drivers/pengo.cpp", - MAME_DIR .. "src/mame/drivers/schick.cpp", -} - -createMAMEProjects(_target, _subtarget, "pce") -files { - MAME_DIR .. "src/mame/drivers/ggconnie.cpp", - MAME_DIR .. "src/mame/drivers/paranoia.cpp", - MAME_DIR .. "src/mame/drivers/tourvis.cpp", - MAME_DIR .. "src/mame/drivers/uapce.cpp", - MAME_DIR .. "src/mame/machine/pcecommn.cpp", - MAME_DIR .. "src/mame/machine/pcecommn.h", -} - -createMAMEProjects(_target, _subtarget, "phoenix") -files { - MAME_DIR .. "src/mame/drivers/naughtyb.cpp", - MAME_DIR .. "src/mame/includes/naughtyb.h", - MAME_DIR .. "src/mame/video/naughtyb.cpp", - MAME_DIR .. "src/mame/drivers/phoenix.cpp", - MAME_DIR .. "src/mame/includes/phoenix.h", - MAME_DIR .. "src/mame/audio/phoenix.cpp", - MAME_DIR .. "src/mame/audio/phoenix.h", - MAME_DIR .. "src/mame/video/phoenix.cpp", - MAME_DIR .. "src/mame/drivers/safarir.cpp", - MAME_DIR .. "src/mame/audio/pleiads.cpp", - MAME_DIR .. "src/mame/audio/pleiads.h", -} - -createMAMEProjects(_target, _subtarget, "playmark") -files { - MAME_DIR .. "src/mame/drivers/drtomy.cpp", - MAME_DIR .. "src/mame/drivers/playmark.cpp", - MAME_DIR .. "src/mame/includes/playmark.h", - MAME_DIR .. "src/mame/video/playmark.cpp", - MAME_DIR .. "src/mame/drivers/powerbal.cpp", - MAME_DIR .. "src/mame/drivers/sderby.cpp", - MAME_DIR .. "src/mame/drivers/sslam.cpp", - MAME_DIR .. "src/mame/includes/sslam.h", - MAME_DIR .. "src/mame/video/sslam.cpp", -} - -createMAMEProjects(_target, _subtarget, "promat") -files { - MAME_DIR .. "src/mame/drivers/1945kiii.cpp", - MAME_DIR .. "src/mame/drivers/3x3puzzl.cpp", - MAME_DIR .. "src/mame/drivers/gstream.cpp", -} - -createMAMEProjects(_target, _subtarget, "psikyo") -files { - MAME_DIR .. "src/mame/drivers/psikyo.cpp", - MAME_DIR .. "src/mame/includes/psikyo.h", - MAME_DIR .. "src/mame/video/psikyo.cpp", - MAME_DIR .. "src/mame/drivers/psikyo4.cpp", - MAME_DIR .. "src/mame/includes/psikyo4.h", - MAME_DIR .. "src/mame/video/psikyo4.cpp", - MAME_DIR .. "src/mame/drivers/psikyosh.cpp", - MAME_DIR .. "src/mame/includes/psikyosh.h", - MAME_DIR .. "src/mame/video/psikyosh.cpp", -} - -createMAMEProjects(_target, _subtarget, "ramtek") -files { - MAME_DIR .. "src/mame/drivers/hitme.cpp", - MAME_DIR .. "src/mame/includes/hitme.h", - MAME_DIR .. "src/mame/audio/hitme.cpp", - MAME_DIR .. "src/mame/drivers/ramtek.cpp", - MAME_DIR .. "src/mame/drivers/starcrus.cpp", - MAME_DIR .. "src/mame/includes/starcrus.h", - MAME_DIR .. "src/mame/video/starcrus.cpp", - MAME_DIR .. "src/mame/audio/nl_starcrus.cpp", - MAME_DIR .. "src/mame/audio/nl_starcrus.h", -} - -createMAMEProjects(_target, _subtarget, "rare") -files { - MAME_DIR .. "src/mame/drivers/btoads.cpp", - MAME_DIR .. "src/mame/includes/btoads.h", - MAME_DIR .. "src/mame/video/btoads.cpp", - MAME_DIR .. "src/mame/drivers/kinst.cpp", - MAME_DIR .. "src/mame/drivers/xtheball.cpp", -} - -createMAMEProjects(_target, _subtarget, "sanritsu") -files { - MAME_DIR .. "src/mame/drivers/appoooh.cpp", - MAME_DIR .. "src/mame/drivers/bankp.cpp", - MAME_DIR .. "src/mame/includes/bankp.h", - MAME_DIR .. "src/mame/video/bankp.cpp", - MAME_DIR .. "src/mame/drivers/chinsan.cpp", - MAME_DIR .. "src/mame/drivers/drmicro.cpp", - MAME_DIR .. "src/mame/includes/drmicro.h", - MAME_DIR .. "src/mame/video/drmicro.cpp", - MAME_DIR .. "src/mame/drivers/jantotsu.cpp", - MAME_DIR .. "src/mame/drivers/mermaid.cpp", - MAME_DIR .. "src/mame/includes/mermaid.h", - MAME_DIR .. "src/mame/video/mermaid.cpp", - MAME_DIR .. "src/mame/drivers/mjkjidai.cpp", - MAME_DIR .. "src/mame/includes/mjkjidai.h", - MAME_DIR .. "src/mame/video/mjkjidai.cpp", - MAME_DIR .. "src/mame/drivers/ron.cpp", -} - -createMAMEProjects(_target, _subtarget, "sega") -files { - MAME_DIR .. "src/mame/drivers/angelkds.cpp", - MAME_DIR .. "src/mame/drivers/bingoc.cpp", - MAME_DIR .. "src/mame/drivers/blockade.cpp", - MAME_DIR .. "src/mame/drivers/calorie.cpp", - MAME_DIR .. "src/mame/drivers/chihiro.cpp", - MAME_DIR .. "src/mame/drivers/coolridr.cpp", - MAME_DIR .. "src/mame/drivers/deniam.cpp", - MAME_DIR .. "src/mame/includes/deniam.h", - MAME_DIR .. "src/mame/video/deniam.cpp", - MAME_DIR .. "src/mame/drivers/dotrikun.cpp", - MAME_DIR .. "src/mame/drivers/fwheel.cpp", - MAME_DIR .. "src/mame/drivers/gpworld.cpp", - MAME_DIR .. "src/mame/drivers/hikaru.cpp", - MAME_DIR .. "src/mame/drivers/hshavoc.cpp", - MAME_DIR .. "src/mame/drivers/kopunch.cpp", - MAME_DIR .. "src/mame/includes/kopunch.h", - MAME_DIR .. "src/mame/video/kopunch.cpp", - MAME_DIR .. "src/mame/drivers/lindbergh.cpp", - MAME_DIR .. "src/mame/drivers/sderby2.cpp", - MAME_DIR .. "src/mame/machine/segabb.cpp", - MAME_DIR .. "src/mame/machine/segabb.h", - MAME_DIR .. "src/mame/machine/megadriv.cpp", - MAME_DIR .. "src/mame/includes/megadriv.h", - MAME_DIR .. "src/mame/drivers/megadriv_acbl.cpp", - MAME_DIR .. "src/mame/includes/megadriv_acbl.h", - MAME_DIR .. "src/mame/drivers/megaplay.cpp", - MAME_DIR .. "src/mame/drivers/megatech.cpp", - MAME_DIR .. "src/mame/drivers/calcune.cpp", - MAME_DIR .. "src/mame/drivers/model1.cpp", - MAME_DIR .. "src/mame/includes/model1.h", - MAME_DIR .. "src/mame/machine/model1.cpp", - MAME_DIR .. "src/mame/video/model1.cpp", - MAME_DIR .. "src/mame/machine/s32comm.cpp", - MAME_DIR .. "src/mame/machine/s32comm.h", - MAME_DIR .. "src/mame/machine/m1comm.cpp", - MAME_DIR .. "src/mame/machine/m1comm.h", - MAME_DIR .. "src/mame/machine/m2comm.cpp", - MAME_DIR .. "src/mame/machine/m2comm.h", - MAME_DIR .. "src/mame/audio/dsbz80.cpp", - MAME_DIR .. "src/mame/audio/dsbz80.h", - MAME_DIR .. "src/mame/drivers/model2.cpp", - MAME_DIR .. "src/mame/machine/model2.cpp", - MAME_DIR .. "src/mame/includes/model2.h", - MAME_DIR .. "src/mame/video/model2rd.ipp", - MAME_DIR .. "src/mame/video/model2.cpp", - MAME_DIR .. "src/mame/drivers/model3.cpp", - MAME_DIR .. "src/mame/includes/model3.h", - MAME_DIR .. "src/mame/video/model3.cpp", - MAME_DIR .. "src/mame/machine/model3.cpp", - MAME_DIR .. "src/mame/drivers/monacogp.cpp", - MAME_DIR .. "src/mame/drivers/naomi.cpp", - MAME_DIR .. "src/mame/drivers/dc_atomiswave.cpp", - MAME_DIR .. "src/mame/includes/naomi.h", - MAME_DIR .. "src/mame/includes/dc_atomiswave.h", - MAME_DIR .. "src/mame/drivers/segasp.cpp", - MAME_DIR .. "src/mame/includes/segasp.h", - MAME_DIR .. "src/mame/drivers/y2.cpp", - MAME_DIR .. "src/mame/machine/gunsense.cpp", - MAME_DIR .. "src/mame/machine/gunsense.h", - MAME_DIR .. "src/mame/machine/naomibd.cpp", - MAME_DIR .. "src/mame/machine/naomibd.h", - MAME_DIR .. "src/mame/machine/naomirom.cpp", - MAME_DIR .. "src/mame/machine/naomirom.h", - MAME_DIR .. "src/mame/machine/naomigd.cpp", - MAME_DIR .. "src/mame/machine/naomigd.h", - MAME_DIR .. "src/mame/machine/naomim1.cpp", - MAME_DIR .. "src/mame/machine/naomim1.h", - MAME_DIR .. "src/mame/machine/naomim2.cpp", - MAME_DIR .. "src/mame/machine/naomim2.h", - MAME_DIR .. "src/mame/machine/naomim4.cpp", - MAME_DIR .. "src/mame/machine/naomim4.h", - MAME_DIR .. "src/mame/machine/m3comm.cpp", - MAME_DIR .. "src/mame/machine/m3comm.h", - MAME_DIR .. "src/mame/machine/315-5881_crypt.cpp", - MAME_DIR .. "src/mame/machine/315-5881_crypt.h", - MAME_DIR .. "src/mame/machine/315-6154.cpp", - MAME_DIR .. "src/mame/machine/315-6154.h", - MAME_DIR .. "src/mame/machine/awboard.cpp", - MAME_DIR .. "src/mame/machine/awboard.h", - MAME_DIR .. "src/mame/machine/jvs13551.cpp", - MAME_DIR .. "src/mame/machine/jvs13551.h", - MAME_DIR .. "src/mame/machine/segashiobd.cpp", - MAME_DIR .. "src/mame/machine/segashiobd.h", - MAME_DIR .. "src/mame/drivers/triforce.cpp", - MAME_DIR .. "src/mame/drivers/puckpkmn.cpp", - MAME_DIR .. "src/mame/drivers/segac2.cpp", - MAME_DIR .. "src/mame/drivers/segae.cpp", - MAME_DIR .. "src/mame/drivers/sms.cpp", - MAME_DIR .. "src/mame/includes/sms.h", - MAME_DIR .. "src/mame/machine/sms.cpp", - MAME_DIR .. "src/mame/drivers/sms_bootleg.cpp", - MAME_DIR .. "src/mame/drivers/shtzone.cpp", - MAME_DIR .. "src/mame/drivers/segacoin.cpp", - MAME_DIR .. "src/mame/drivers/segafruit.cpp", - MAME_DIR .. "src/mame/drivers/segag80r.cpp", - MAME_DIR .. "src/mame/includes/segag80r.h", - MAME_DIR .. "src/mame/machine/segag80.cpp", - MAME_DIR .. "src/mame/machine/segag80.h", - MAME_DIR .. "src/mame/audio/segag80r.cpp", - MAME_DIR .. "src/mame/audio/segag80r.h", - MAME_DIR .. "src/mame/video/segag80r.cpp", - MAME_DIR .. "src/mame/drivers/segag80v.cpp", - MAME_DIR .. "src/mame/includes/segag80v.h", - MAME_DIR .. "src/mame/audio/segag80.cpp", - MAME_DIR .. "src/mame/audio/segag80.h", - MAME_DIR .. "src/mame/audio/nl_astrob.cpp", - MAME_DIR .. "src/mame/audio/nl_astrob.h", - MAME_DIR .. "src/mame/audio/nl_elim.cpp", - MAME_DIR .. "src/mame/audio/nl_elim.h", - MAME_DIR .. "src/mame/audio/nl_spacfury.cpp", - MAME_DIR .. "src/mame/audio/nl_spacfury.h", - MAME_DIR .. "src/mame/video/segag80v.cpp", - MAME_DIR .. "src/mame/drivers/segahang.cpp", - MAME_DIR .. "src/mame/includes/segahang.h", - MAME_DIR .. "src/mame/video/segahang.cpp", - MAME_DIR .. "src/mame/drivers/segajw.cpp", - MAME_DIR .. "src/mame/drivers/segald.cpp", - MAME_DIR .. "src/mame/drivers/segaorun.cpp", - MAME_DIR .. "src/mame/includes/segaorun.h", - MAME_DIR .. "src/mame/video/segaorun.cpp", - MAME_DIR .. "src/mame/drivers/segas16a.cpp", - MAME_DIR .. "src/mame/includes/segas16a.h", - MAME_DIR .. "src/mame/video/segas16a.cpp", - MAME_DIR .. "src/mame/drivers/segas16b.cpp", - MAME_DIR .. "src/mame/drivers/segas16b_isgsm.cpp", - MAME_DIR .. "src/mame/includes/segas16b.h", - MAME_DIR .. "src/mame/video/segas16b.cpp", - MAME_DIR .. "src/mame/audio/nl_segas16b.cpp", - MAME_DIR .. "src/mame/audio/nl_segas16b.h", - MAME_DIR .. "src/mame/drivers/segas18.cpp", - MAME_DIR .. "src/mame/includes/segas18.h", - MAME_DIR .. "src/mame/video/segas18.cpp", - MAME_DIR .. "src/mame/drivers/segas18_astormbl.cpp", - MAME_DIR .. "src/mame/drivers/segas24.cpp", - MAME_DIR .. "src/mame/includes/segas24.h", - MAME_DIR .. "src/mame/video/segas24.cpp", - MAME_DIR .. "src/mame/drivers/segasm1.cpp", - MAME_DIR .. "src/mame/drivers/segas32.cpp", - MAME_DIR .. "src/mame/includes/segas32.h", - MAME_DIR .. "src/mame/machine/segas32.cpp", - MAME_DIR .. "src/mame/video/segas32.cpp", - MAME_DIR .. "src/mame/drivers/segattl.cpp", - MAME_DIR .. "src/mame/drivers/segaufo.cpp", - MAME_DIR .. "src/mame/drivers/segaxbd.cpp", - MAME_DIR .. "src/mame/includes/segaxbd.h", - MAME_DIR .. "src/mame/video/segaxbd.cpp", - MAME_DIR .. "src/mame/drivers/segaybd.cpp", - MAME_DIR .. "src/mame/includes/segaybd.h", - MAME_DIR .. "src/mame/video/segaybd.cpp", - MAME_DIR .. "src/mame/includes/segaipt.h", - MAME_DIR .. "src/mame/drivers/sg1000a.cpp", - MAME_DIR .. "src/mame/drivers/speedbsk.cpp", - MAME_DIR .. "src/mame/drivers/stactics.cpp", - MAME_DIR .. "src/mame/includes/stactics.h", - MAME_DIR .. "src/mame/video/stactics.cpp", - MAME_DIR .. "src/mame/drivers/stv.cpp", - MAME_DIR .. "src/mame/includes/saturn.h", - MAME_DIR .. "src/mame/drivers/saturn.cpp", - MAME_DIR .. "src/mame/machine/saturn.cpp", - MAME_DIR .. "src/mame/video/saturn.cpp", - MAME_DIR .. "src/mame/machine/saturn_cdb.cpp", - MAME_DIR .. "src/mame/machine/saturn_cdb.h", - MAME_DIR .. "src/mame/includes/stv.h", - MAME_DIR .. "src/mame/machine/315-5838_317-0229_comp.cpp", - MAME_DIR .. "src/mame/machine/315-5838_317-0229_comp.h", - MAME_DIR .. "src/mame/drivers/suprloco.cpp", - MAME_DIR .. "src/mame/includes/suprloco.h", - MAME_DIR .. "src/mame/video/suprloco.cpp", - MAME_DIR .. "src/mame/drivers/system1.cpp", - MAME_DIR .. "src/mame/includes/system1.h", - MAME_DIR .. "src/mame/video/system1.cpp", - MAME_DIR .. "src/mame/drivers/system16.cpp", - MAME_DIR .. "src/mame/includes/system16.h", - MAME_DIR .. "src/mame/video/system16.cpp", - MAME_DIR .. "src/mame/drivers/timetrv.cpp", - MAME_DIR .. "src/mame/drivers/turbo.cpp", - MAME_DIR .. "src/mame/includes/turbo.h", - MAME_DIR .. "src/mame/audio/turbo.cpp", - MAME_DIR .. "src/mame/video/turbo.cpp", - MAME_DIR .. "src/mame/drivers/vicdual.cpp", - MAME_DIR .. "src/mame/includes/vicdual.h", - MAME_DIR .. "src/mame/audio/vicdual.cpp", - MAME_DIR .. "src/mame/audio/vicdual.h", - MAME_DIR .. "src/mame/audio/nl_brdrline.cpp", - MAME_DIR .. "src/mame/audio/nl_brdrline.h", - MAME_DIR .. "src/mame/audio/nl_frogs.cpp", - MAME_DIR .. "src/mame/audio/nl_frogs.h", - MAME_DIR .. "src/mame/audio/vicdual-97271p.cpp", - MAME_DIR .. "src/mame/audio/vicdual-97271p.h", - MAME_DIR .. "src/mame/video/vicdual.cpp", - MAME_DIR .. "src/mame/video/vicdual-97269pb.cpp", - MAME_DIR .. "src/mame/video/vicdual-97269pb.h", - MAME_DIR .. "src/mame/audio/carnival.cpp", - MAME_DIR .. "src/mame/audio/depthch.cpp", - MAME_DIR .. "src/mame/audio/invinco.cpp", - MAME_DIR .. "src/mame/audio/pulsar.cpp", - MAME_DIR .. "src/mame/drivers/zaxxon.cpp", - MAME_DIR .. "src/mame/includes/zaxxon.h", - MAME_DIR .. "src/mame/audio/zaxxon.cpp", - MAME_DIR .. "src/mame/video/zaxxon.cpp", - MAME_DIR .. "src/mame/machine/315_5195.cpp", - MAME_DIR .. "src/mame/machine/315_5195.h", - MAME_DIR .. "src/mame/machine/315_5296.cpp", - MAME_DIR .. "src/mame/machine/315_5296.h", - MAME_DIR .. "src/mame/machine/315_5338a.cpp", - MAME_DIR .. "src/mame/machine/315_5338a.h", - MAME_DIR .. "src/mame/machine/315_5649.cpp", - MAME_DIR .. "src/mame/machine/315_5649.h", - MAME_DIR .. "src/mame/machine/bingoct.cpp", - MAME_DIR .. "src/mame/machine/bingoct.h", - MAME_DIR .. "src/mame/machine/model1io.cpp", - MAME_DIR .. "src/mame/machine/model1io.h", - MAME_DIR .. "src/mame/machine/model1io2.cpp", - MAME_DIR .. "src/mame/machine/model1io2.h", - MAME_DIR .. "src/mame/machine/fd1089.cpp", - MAME_DIR .. "src/mame/machine/fd1089.h", - MAME_DIR .. "src/mame/machine/fd1094.cpp", - MAME_DIR .. "src/mame/machine/fd1094.h", - MAME_DIR .. "src/mame/machine/segaic16.cpp", - MAME_DIR .. "src/mame/machine/segaic16.h", - MAME_DIR .. "src/mame/machine/segabill.cpp", - MAME_DIR .. "src/mame/machine/segabill.h", - MAME_DIR .. "src/mame/audio/segaspeech.cpp", - MAME_DIR .. "src/mame/audio/segaspeech.h", - MAME_DIR .. "src/mame/audio/segausb.cpp", - MAME_DIR .. "src/mame/audio/segausb.h", - MAME_DIR .. "src/mame/audio/nl_segausb.cpp", - MAME_DIR .. "src/mame/audio/nl_segausb.h", - MAME_DIR .. "src/mame/audio/nl_segaspeech.cpp", - MAME_DIR .. "src/mame/audio/nl_segaspeech.h", - MAME_DIR .. "src/mame/video/segaic16.cpp", - MAME_DIR .. "src/mame/video/segaic16.h", - MAME_DIR .. "src/mame/video/segaic16_road.cpp", - MAME_DIR .. "src/mame/video/segaic16_road.h", - MAME_DIR .. "src/mame/video/sega16sp.cpp", - MAME_DIR .. "src/mame/video/sega16sp.h", - MAME_DIR .. "src/mame/video/segaic24.cpp", - MAME_DIR .. "src/mame/video/segaic24.h", - MAME_DIR .. "src/mame/drivers/flashbeats.cpp", - MAME_DIR .. "src/mame/drivers/segaatom.cpp", -} - -createMAMEProjects(_target, _subtarget, "seibu") -files { - MAME_DIR .. "src/mame/drivers/airraid.cpp", - MAME_DIR .. "src/mame/drivers/banprestoms.cpp", - MAME_DIR .. "src/mame/drivers/bloodbro.cpp", - MAME_DIR .. "src/mame/includes/bloodbro.h", - MAME_DIR .. "src/mame/video/bloodbro.cpp", - MAME_DIR .. "src/mame/drivers/bloodbro_ms.cpp", - MAME_DIR .. "src/mame/drivers/cabal.cpp", - MAME_DIR .. "src/mame/includes/cabal.h", - MAME_DIR .. "src/mame/video/cabal.cpp", - MAME_DIR .. "src/mame/drivers/darkmist.cpp", - MAME_DIR .. "src/mame/includes/darkmist.h", - MAME_DIR .. "src/mame/video/darkmist.cpp", - MAME_DIR .. "src/mame/drivers/dcon.cpp", - MAME_DIR .. "src/mame/includes/dcon.h", - MAME_DIR .. "src/mame/video/dcon.cpp", - MAME_DIR .. "src/mame/drivers/deadang.cpp", - MAME_DIR .. "src/mame/includes/deadang.h", - MAME_DIR .. "src/mame/video/deadang.cpp", - MAME_DIR .. "src/mame/drivers/dynduke.cpp", - MAME_DIR .. "src/mame/includes/dynduke.h", - MAME_DIR .. "src/mame/video/dynduke.cpp", - MAME_DIR .. "src/mame/drivers/feversoc.cpp", - MAME_DIR .. "src/mame/drivers/goal92.cpp", - MAME_DIR .. "src/mame/drivers/goodejan.cpp", - MAME_DIR .. "src/mame/drivers/kncljoe.cpp", - MAME_DIR .. "src/mame/includes/kncljoe.h", - MAME_DIR .. "src/mame/video/kncljoe.cpp", - MAME_DIR .. "src/mame/drivers/legionna.cpp", - MAME_DIR .. "src/mame/includes/legionna.h", - MAME_DIR .. "src/mame/video/legionna.cpp", - MAME_DIR .. "src/mame/drivers/seicupbl.cpp", - MAME_DIR .. "src/mame/drivers/metlfrzr.cpp", - MAME_DIR .. "src/mame/drivers/mustache.cpp", - MAME_DIR .. "src/mame/includes/mustache.h", - MAME_DIR .. "src/mame/video/mustache.cpp", - MAME_DIR .. "src/mame/drivers/panicr.cpp", - MAME_DIR .. "src/mame/drivers/raiden.cpp", - MAME_DIR .. "src/mame/includes/raiden.h", - MAME_DIR .. "src/mame/video/raiden.cpp", - MAME_DIR .. "src/mame/drivers/raiden_ms.cpp", - MAME_DIR .. "src/mame/drivers/raiden2.cpp", - MAME_DIR .. "src/mame/includes/raiden2.h", - MAME_DIR .. "src/mame/video/raiden2.cpp", - MAME_DIR .. "src/mame/machine/r2crypt.cpp", - MAME_DIR .. "src/mame/machine/r2crypt.h", - MAME_DIR .. "src/mame/machine/seibucop.cpp", - MAME_DIR .. "src/mame/machine/seibucop_dma.ipp", - MAME_DIR .. "src/mame/machine/seibucop_cmd.ipp", - MAME_DIR .. "src/mame/machine/seibucop.h", - MAME_DIR .. "src/mame/drivers/r2dx_v33.cpp", - MAME_DIR .. "src/mame/drivers/seibuspi.cpp", - MAME_DIR .. "src/mame/includes/seibuspi.h", - MAME_DIR .. "src/mame/video/seibuspi.cpp", - MAME_DIR .. "src/mame/drivers/seibucats.cpp", - MAME_DIR .. "src/mame/drivers/sengokmj.cpp", - MAME_DIR .. "src/mame/drivers/stfight.cpp", - MAME_DIR .. "src/mame/video/stfight_dev.cpp", - MAME_DIR .. "src/mame/video/stfight_dev.h", - MAME_DIR .. "src/mame/video/airraid_dev.cpp", - MAME_DIR .. "src/mame/video/airraid_dev.h", - MAME_DIR .. "src/mame/includes/stfight.h", - MAME_DIR .. "src/mame/machine/stfight.cpp", - MAME_DIR .. "src/mame/drivers/toki.cpp", - MAME_DIR .. "src/mame/includes/toki.h", - MAME_DIR .. "src/mame/drivers/toki_ms.cpp", - MAME_DIR .. "src/mame/video/toki.cpp", - MAME_DIR .. "src/mame/drivers/wiz.cpp", - MAME_DIR .. "src/mame/includes/wiz.h", - MAME_DIR .. "src/mame/video/wiz.cpp", - MAME_DIR .. "src/mame/machine/seicopbl.cpp", - MAME_DIR .. "src/mame/machine/seicopbl.h", - MAME_DIR .. "src/mame/machine/seibuspi.cpp", - MAME_DIR .. "src/mame/machine/seibuspi.h", - MAME_DIR .. "src/mame/audio/t5182.cpp", - MAME_DIR .. "src/mame/audio/t5182.h", - MAME_DIR .. "src/mame/video/seibu_crtc.cpp", - MAME_DIR .. "src/mame/video/seibu_crtc.h", -} - -createMAMEProjects(_target, _subtarget, "seta") -files { - MAME_DIR .. "src/mame/drivers/albazc.cpp", - MAME_DIR .. "src/mame/drivers/hanaawas.cpp", - MAME_DIR .. "src/mame/drivers/jclub2.cpp", - MAME_DIR .. "src/mame/drivers/macs.cpp", - MAME_DIR .. "src/mame/drivers/seta.cpp", - MAME_DIR .. "src/mame/includes/seta.h", - MAME_DIR .. "src/mame/video/seta.cpp", - MAME_DIR .. "src/mame/drivers/seta2.cpp", - MAME_DIR .. "src/mame/includes/seta2.h", - MAME_DIR .. "src/mame/video/seta2.cpp", - MAME_DIR .. "src/mame/drivers/speedatk.cpp", - MAME_DIR .. "src/mame/includes/speedatk.h", - MAME_DIR .. "src/mame/video/speedatk.cpp", - MAME_DIR .. "src/mame/drivers/speglsht.cpp", - MAME_DIR .. "src/mame/drivers/srmp2.cpp", - MAME_DIR .. "src/mame/includes/srmp2.h", - MAME_DIR .. "src/mame/video/srmp2.cpp", - MAME_DIR .. "src/mame/drivers/srmp5.cpp", - MAME_DIR .. "src/mame/drivers/srmp6.cpp", - MAME_DIR .. "src/mame/drivers/ssv.cpp", - MAME_DIR .. "src/mame/includes/ssv.h", - MAME_DIR .. "src/mame/video/ssv.cpp", - MAME_DIR .. "src/mame/video/st0020.cpp", - MAME_DIR .. "src/mame/video/st0020.h", - MAME_DIR .. "src/mame/machine/st0016.cpp", - MAME_DIR .. "src/mame/machine/st0016.h", - MAME_DIR .. "src/mame/drivers/simple_st0016.cpp", - MAME_DIR .. "src/mame/video/x1_012.cpp", - MAME_DIR .. "src/mame/video/x1_012.h", - MAME_DIR .. "src/mame/drivers/thedealr.cpp", -} - -createMAMEProjects(_target, _subtarget, "sigma") -files { - MAME_DIR .. "src/mame/drivers/nyny.cpp", - MAME_DIR .. "src/mame/drivers/r2dtank.cpp", - MAME_DIR .. "src/mame/drivers/sigma21.cpp", - MAME_DIR .. "src/mame/drivers/sigmab31.cpp", - MAME_DIR .. "src/mame/drivers/sigmab52.cpp", - MAME_DIR .. "src/mame/drivers/sigmab98.cpp", - MAME_DIR .. "src/mame/drivers/spiders.cpp", - MAME_DIR .. "src/mame/includes/spiders.h", - MAME_DIR .. "src/mame/audio/spiders.cpp", - MAME_DIR .. "src/mame/drivers/sub.cpp", - MAME_DIR .. "src/mame/includes/sub.h", - MAME_DIR .. "src/mame/video/sub.cpp", -} - -createMAMEProjects(_target, _subtarget, "snk") -files { - MAME_DIR .. "src/mame/drivers/bbusters.cpp", - MAME_DIR .. "src/mame/drivers/mechatt.cpp", - MAME_DIR .. "src/mame/video/snk_bbusters_spr.cpp", - MAME_DIR .. "src/mame/video/snk_bbusters_spr.h", - MAME_DIR .. "src/mame/drivers/dmndrby.cpp", - MAME_DIR .. "src/mame/drivers/hng64.cpp", - MAME_DIR .. "src/mame/includes/hng64.h", - MAME_DIR .. "src/mame/video/hng64.cpp", - MAME_DIR .. "src/mame/audio/hng64.cpp", - MAME_DIR .. "src/mame/machine/hng64_net.cpp", - MAME_DIR .. "src/mame/video/hng64_3d.ipp", - MAME_DIR .. "src/mame/video/hng64_sprite.ipp", - MAME_DIR .. "src/mame/drivers/lasso.cpp", - MAME_DIR .. "src/mame/includes/lasso.h", - MAME_DIR .. "src/mame/video/lasso.cpp", - MAME_DIR .. "src/mame/drivers/mainsnk.cpp", - MAME_DIR .. "src/mame/includes/mainsnk.h", - MAME_DIR .. "src/mame/video/mainsnk.cpp", - MAME_DIR .. "src/mame/drivers/miconkit.cpp", - MAME_DIR .. "src/mame/drivers/munchmo.cpp", - MAME_DIR .. "src/mame/includes/munchmo.h", - MAME_DIR .. "src/mame/video/munchmo.cpp", - MAME_DIR .. "src/mame/drivers/prehisle.cpp", - MAME_DIR .. "src/mame/includes/prehisle.h", - MAME_DIR .. "src/mame/video/prehisle.cpp", - MAME_DIR .. "src/mame/drivers/snk6502.cpp", - MAME_DIR .. "src/mame/includes/snk6502.h", - MAME_DIR .. "src/mame/audio/snk6502.cpp", - MAME_DIR .. "src/mame/audio/snk6502.h", - MAME_DIR .. "src/mame/video/snk6502.cpp", - MAME_DIR .. "src/mame/drivers/snk.cpp", - MAME_DIR .. "src/mame/includes/snk.h", - MAME_DIR .. "src/mame/video/snk.cpp", - MAME_DIR .. "src/mame/drivers/snk68.cpp", - MAME_DIR .. "src/mame/includes/snk68.h", - MAME_DIR .. "src/mame/video/snk68.cpp", -} - -createMAMEProjects(_target, _subtarget, "sony") -files { - MAME_DIR .. "src/mame/drivers/taitogn.cpp", - MAME_DIR .. "src/mame/drivers/zn.cpp", - MAME_DIR .. "src/mame/includes/zn.h", - MAME_DIR .. "src/mame/audio/taito_zm.cpp", - MAME_DIR .. "src/mame/audio/taito_zm.h", - MAME_DIR .. "src/mame/machine/znmcu.cpp", - MAME_DIR .. "src/mame/machine/znmcu.h", - MAME_DIR .. "src/mame/machine/cat702.cpp", - MAME_DIR .. "src/mame/machine/cat702.h", -} - -createMAMEProjects(_target, _subtarget, "stern") -files { - MAME_DIR .. "src/mame/drivers/astinvad.cpp", - MAME_DIR .. "src/mame/drivers/berzerk.cpp", - MAME_DIR .. "src/mame/drivers/cliffhgr.cpp", - MAME_DIR .. "src/mame/audio/cliffhgr.cpp", - MAME_DIR .. "src/mame/audio/cliffhgr.h", - MAME_DIR .. "src/mame/drivers/mazerbla.cpp", - MAME_DIR .. "src/mame/drivers/supdrapo.cpp", -} - -createMAMEProjects(_target, _subtarget, "subsino") -files { - MAME_DIR .. "src/mame/drivers/lastfght.cpp", - MAME_DIR .. "src/mame/drivers/subsino.cpp", - MAME_DIR .. "src/mame/drivers/subsino2.cpp", - MAME_DIR .. "src/mame/machine/subsino.cpp", - MAME_DIR .. "src/mame/machine/subsino.h", -} - -createMAMEProjects(_target, _subtarget, "suna") -files { - MAME_DIR .. "src/mame/drivers/go2000.cpp", - MAME_DIR .. "src/mame/drivers/goindol.cpp", - MAME_DIR .. "src/mame/drivers/suna8.cpp", - MAME_DIR .. "src/mame/includes/suna8.h", - MAME_DIR .. "src/mame/audio/suna8.cpp", - MAME_DIR .. "src/mame/video/suna8.cpp", - MAME_DIR .. "src/mame/drivers/suna16.cpp", - MAME_DIR .. "src/mame/includes/suna16.h", - MAME_DIR .. "src/mame/video/suna16.cpp", -} - -createMAMEProjects(_target, _subtarget, "sunelect") -files { - MAME_DIR .. "src/mame/drivers/arabian.cpp", - MAME_DIR .. "src/mame/includes/arabian.h", - MAME_DIR .. "src/mame/video/arabian.cpp", - MAME_DIR .. "src/mame/drivers/blockch.cpp", - MAME_DIR .. "src/mame/drivers/dai3wksi.cpp", - MAME_DIR .. "src/mame/drivers/ikki.cpp", - MAME_DIR .. "src/mame/includes/ikki.h", - MAME_DIR .. "src/mame/video/ikki.cpp", - MAME_DIR .. "src/mame/drivers/kangaroo.cpp", - MAME_DIR .. "src/mame/drivers/markham.cpp", - MAME_DIR .. "src/mame/includes/markham.h", - MAME_DIR .. "src/mame/video/markham.cpp", - MAME_DIR .. "src/mame/drivers/route16.cpp", - MAME_DIR .. "src/mame/includes/route16.h", - MAME_DIR .. "src/mame/video/route16.cpp", - MAME_DIR .. "src/mame/drivers/shanghai.cpp", - MAME_DIR .. "src/mame/drivers/shangha3.cpp", - MAME_DIR .. "src/mame/includes/shangha3.h", - MAME_DIR .. "src/mame/video/shangha3.cpp", - MAME_DIR .. "src/mame/drivers/tonton.cpp", -} - -createMAMEProjects(_target, _subtarget, "taito") -files { - MAME_DIR .. "src/mame/drivers/2mindril.cpp", - MAME_DIR .. "src/mame/drivers/40love.cpp", - MAME_DIR .. "src/mame/includes/40love.h", - MAME_DIR .. "src/mame/video/40love.cpp", - MAME_DIR .. "src/mame/drivers/arkanoid.cpp", - MAME_DIR .. "src/mame/includes/arkanoid.h", - MAME_DIR .. "src/mame/machine/arkanoid.cpp", - MAME_DIR .. "src/mame/video/arkanoid.cpp", - MAME_DIR .. "src/mame/drivers/ashnojoe.cpp", - MAME_DIR .. "src/mame/includes/ashnojoe.h", - MAME_DIR .. "src/mame/video/ashnojoe.cpp", - MAME_DIR .. "src/mame/drivers/asuka.cpp", - MAME_DIR .. "src/mame/drivers/bigevglf.cpp", - MAME_DIR .. "src/mame/includes/bigevglf.h", - MAME_DIR .. "src/mame/video/bigevglf.cpp", - MAME_DIR .. "src/mame/drivers/bingowav.cpp", - MAME_DIR .. "src/mame/drivers/bking.cpp", - MAME_DIR .. "src/mame/includes/bking.h", - MAME_DIR .. "src/mame/video/bking.cpp", - MAME_DIR .. "src/mame/drivers/bublbobl.cpp", - MAME_DIR .. "src/mame/includes/bublbobl.h", - MAME_DIR .. "src/mame/machine/bublbobl.cpp", - MAME_DIR .. "src/mame/video/bublbobl.cpp", - MAME_DIR .. "src/mame/drivers/buggychl.cpp", - MAME_DIR .. "src/mame/machine/taitosjsec.cpp", - MAME_DIR .. "src/mame/machine/taitosjsec.h", - MAME_DIR .. "src/mame/drivers/capr1.cpp", - MAME_DIR .. "src/mame/drivers/caprcyc.cpp", - MAME_DIR .. "src/mame/drivers/cchance.cpp", - MAME_DIR .. "src/mame/drivers/chaknpop.cpp", - MAME_DIR .. "src/mame/includes/chaknpop.h", - MAME_DIR .. "src/mame/video/chaknpop.cpp", - MAME_DIR .. "src/mame/drivers/champbwl.cpp", - MAME_DIR .. "src/mame/drivers/changela.cpp", - MAME_DIR .. "src/mame/includes/changela.h", - MAME_DIR .. "src/mame/video/changela.cpp", - MAME_DIR .. "src/mame/drivers/cpzodiac.cpp", - MAME_DIR .. "src/mame/drivers/crbaloon.cpp", - MAME_DIR .. "src/mame/includes/crbaloon.h", - MAME_DIR .. "src/mame/video/crbaloon.cpp", - MAME_DIR .. "src/mame/audio/crbaloon.cpp", - MAME_DIR .. "src/mame/drivers/cucaracha.cpp", - MAME_DIR .. "src/mame/drivers/cyclemb.cpp", - MAME_DIR .. "src/mame/drivers/darius.cpp", - MAME_DIR .. "src/mame/includes/darius.h", - MAME_DIR .. "src/mame/video/darius.cpp", - MAME_DIR .. "src/mame/drivers/dinoking.cpp", - MAME_DIR .. "src/mame/drivers/exzisus.cpp", - MAME_DIR .. "src/mame/drivers/fgoal.cpp", - MAME_DIR .. "src/mame/includes/fgoal.h", - MAME_DIR .. "src/mame/video/fgoal.cpp", - MAME_DIR .. "src/mame/drivers/flstory.cpp", - MAME_DIR .. "src/mame/includes/flstory.h", - MAME_DIR .. "src/mame/video/flstory.cpp", - MAME_DIR .. "src/mame/drivers/galastrm.cpp", - MAME_DIR .. "src/mame/includes/galastrm.h", - MAME_DIR .. "src/mame/video/galastrm.cpp", - MAME_DIR .. "src/mame/drivers/gladiatr.cpp", - MAME_DIR .. "src/mame/includes/gladiatr.h", - MAME_DIR .. "src/mame/video/gladiatr.cpp", - MAME_DIR .. "src/mame/drivers/grchamp.cpp", - MAME_DIR .. "src/mame/includes/grchamp.h", - MAME_DIR .. "src/mame/audio/grchamp.cpp", - MAME_DIR .. "src/mame/video/grchamp.cpp", - MAME_DIR .. "src/mame/drivers/groundfx.cpp", - MAME_DIR .. "src/mame/includes/groundfx.h", - MAME_DIR .. "src/mame/video/groundfx.cpp", - MAME_DIR .. "src/mame/drivers/gsword.cpp", - MAME_DIR .. "src/mame/includes/gsword.h", - MAME_DIR .. "src/mame/video/gsword.cpp", - MAME_DIR .. "src/mame/drivers/gunbustr.cpp", - MAME_DIR .. "src/mame/includes/gunbustr.h", - MAME_DIR .. "src/mame/video/gunbustr.cpp", - MAME_DIR .. "src/mame/drivers/halleys.cpp", - MAME_DIR .. "src/mame/drivers/heromem.cpp", - MAME_DIR .. "src/mame/drivers/invqix.cpp", - MAME_DIR .. "src/mame/drivers/jollyjgr.cpp", - MAME_DIR .. "src/mame/drivers/ksayakyu.cpp", - MAME_DIR .. "src/mame/drivers/lgp.cpp", - MAME_DIR .. "src/mame/drivers/lkage.cpp", - MAME_DIR .. "src/mame/includes/lkage.h", - MAME_DIR .. "src/mame/video/lkage.cpp", - MAME_DIR .. "src/mame/drivers/lsasquad.cpp", - MAME_DIR .. "src/mame/includes/lsasquad.h", - MAME_DIR .. "src/mame/machine/lsasquad.cpp", - MAME_DIR .. "src/mame/video/lsasquad.cpp", - MAME_DIR .. "src/mame/drivers/marinedt.cpp", - MAME_DIR .. "src/mame/drivers/kikikai.cpp", - MAME_DIR .. "src/mame/includes/kikikai.h", - MAME_DIR .. "src/mame/machine/kikikai.cpp", - MAME_DIR .. "src/mame/video/kikikai.cpp", - MAME_DIR .. "src/mame/drivers/minivadr.cpp", - MAME_DIR .. "src/mame/drivers/missb2.cpp", - MAME_DIR .. "src/mame/drivers/mlanding.cpp", - MAME_DIR .. "src/mame/drivers/msisaac.cpp", - MAME_DIR .. "src/mame/includes/msisaac.h", - MAME_DIR .. "src/mame/video/msisaac.cpp", - MAME_DIR .. "src/mame/drivers/ninjaw.cpp", - MAME_DIR .. "src/mame/includes/ninjaw.h", - MAME_DIR .. "src/mame/video/ninjaw.cpp", - MAME_DIR .. "src/mame/drivers/nycaptor.cpp", - MAME_DIR .. "src/mame/includes/nycaptor.h", - MAME_DIR .. "src/mame/video/nycaptor.cpp", - MAME_DIR .. "src/mame/drivers/opwolf.cpp", - MAME_DIR .. "src/mame/drivers/othunder.cpp", - MAME_DIR .. "src/mame/includes/othunder.h", - MAME_DIR .. "src/mame/video/othunder.cpp", - MAME_DIR .. "src/mame/drivers/pitnrun.cpp", - MAME_DIR .. "src/mame/includes/pitnrun.h", - MAME_DIR .. "src/mame/machine/pitnrun.cpp", - MAME_DIR .. "src/mame/video/pitnrun.cpp", - MAME_DIR .. "src/mame/drivers/qix.cpp", - MAME_DIR .. "src/mame/includes/qix.h", - MAME_DIR .. "src/mame/machine/qix.cpp", - MAME_DIR .. "src/mame/audio/qix.cpp", - MAME_DIR .. "src/mame/video/qix.cpp", - MAME_DIR .. "src/mame/drivers/rbisland.cpp", - MAME_DIR .. "src/mame/includes/rbisland.h", - MAME_DIR .. "src/mame/video/rbisland.cpp", - MAME_DIR .. "src/mame/drivers/rastan.cpp", - MAME_DIR .. "src/mame/drivers/retofinv.cpp", - MAME_DIR .. "src/mame/includes/retofinv.h", - MAME_DIR .. "src/mame/video/retofinv.cpp", - MAME_DIR .. "src/mame/drivers/rollrace.cpp", - MAME_DIR .. "src/mame/includes/rollrace.h", - MAME_DIR .. "src/mame/video/rollrace.cpp", - MAME_DIR .. "src/mame/drivers/sbmjb.cpp", - MAME_DIR .. "src/mame/drivers/sbowling.cpp", - MAME_DIR .. "src/mame/drivers/scyclone.cpp", - MAME_DIR .. "src/mame/drivers/slapshot.cpp", - MAME_DIR .. "src/mame/includes/slapshot.h", - MAME_DIR .. "src/mame/video/slapshot.cpp", - MAME_DIR .. "src/mame/drivers/spdheat.cpp", - MAME_DIR .. "src/mame/includes/spdheat.h", - MAME_DIR .. "src/mame/drivers/ssrj.cpp", - MAME_DIR .. "src/mame/includes/ssrj.h", - MAME_DIR .. "src/mame/video/ssrj.cpp", - MAME_DIR .. "src/mame/drivers/superchs.cpp", - MAME_DIR .. "src/mame/includes/superchs.h", - MAME_DIR .. "src/mame/video/superchs.cpp", - MAME_DIR .. "src/mame/drivers/superqix.cpp", - MAME_DIR .. "src/mame/includes/superqix.h", - MAME_DIR .. "src/mame/video/superqix.cpp", - MAME_DIR .. "src/mame/drivers/taito_b.cpp", - MAME_DIR .. "src/mame/includes/taito_b.h", - MAME_DIR .. "src/mame/video/taito_b.cpp", - MAME_DIR .. "src/mame/includes/taitoipt.h", - MAME_DIR .. "src/mame/drivers/taito_f2.cpp", - MAME_DIR .. "src/mame/includes/taito_f2.h", - MAME_DIR .. "src/mame/video/taito_f2.cpp", - MAME_DIR .. "src/mame/drivers/taito_f3.cpp", - MAME_DIR .. "src/mame/includes/taito_f3.h", - MAME_DIR .. "src/mame/video/taito_f3.cpp", - MAME_DIR .. "src/mame/audio/taito_en.cpp", - MAME_DIR .. "src/mame/audio/taito_en.h", - MAME_DIR .. "src/mame/drivers/taito_h.cpp", - MAME_DIR .. "src/mame/includes/taito_h.h", - MAME_DIR .. "src/mame/video/taito_h.cpp", - MAME_DIR .. "src/mame/drivers/taito_l.cpp", - MAME_DIR .. "src/mame/includes/taito_l.h", - MAME_DIR .. "src/mame/video/taito_l.cpp", - MAME_DIR .. "src/mame/drivers/taito_x.cpp", - MAME_DIR .. "src/mame/machine/taitocchip.cpp", - MAME_DIR .. "src/mame/machine/taitocchip.h", - MAME_DIR .. "src/mame/drivers/taito_z.cpp", - MAME_DIR .. "src/mame/includes/taito_z.h", - MAME_DIR .. "src/mame/video/taito_z.cpp", - MAME_DIR .. "src/mame/drivers/taito_o.cpp", - MAME_DIR .. "src/mame/drivers/taitoair.cpp", - MAME_DIR .. "src/mame/includes/taitoair.h", - MAME_DIR .. "src/mame/video/taitoair.cpp", - MAME_DIR .. "src/mame/drivers/taitojc.cpp", - MAME_DIR .. "src/mame/includes/taitojc.h", - MAME_DIR .. "src/mame/video/taitojc.cpp", - MAME_DIR .. "src/mame/drivers/taitopjc.cpp", - MAME_DIR .. "src/mame/drivers/taitosj.cpp", - MAME_DIR .. "src/mame/includes/taitosj.h", - MAME_DIR .. "src/mame/machine/taitosj.cpp", - MAME_DIR .. "src/mame/video/taitosj.cpp", - MAME_DIR .. "src/mame/drivers/taitottl.cpp", - MAME_DIR .. "src/mame/drivers/taitotz.cpp", - MAME_DIR .. "src/mame/drivers/taitotx.cpp", - MAME_DIR .. "src/mame/drivers/taitowlf.cpp", - MAME_DIR .. "src/mame/drivers/tnzs.cpp", - MAME_DIR .. "src/mame/includes/tnzs.h", - MAME_DIR .. "src/mame/machine/tnzs.cpp", - MAME_DIR .. "src/mame/video/tnzs.cpp", - MAME_DIR .. "src/mame/drivers/topspeed.cpp", - MAME_DIR .. "src/mame/includes/topspeed.h", - MAME_DIR .. "src/mame/video/topspeed.cpp", - MAME_DIR .. "src/mame/drivers/tsamurai.cpp", - MAME_DIR .. "src/mame/includes/tsamurai.h", - MAME_DIR .. "src/mame/video/tsamurai.cpp", - MAME_DIR .. "src/mame/drivers/undrfire.cpp", - MAME_DIR .. "src/mame/includes/undrfire.h", - MAME_DIR .. "src/mame/video/undrfire.cpp", - MAME_DIR .. "src/mame/drivers/volfied.cpp", - MAME_DIR .. "src/mame/includes/volfied.h", - MAME_DIR .. "src/mame/video/volfied.cpp", - MAME_DIR .. "src/mame/drivers/warriorb.cpp", - MAME_DIR .. "src/mame/includes/warriorb.h", - MAME_DIR .. "src/mame/video/warriorb.cpp", - MAME_DIR .. "src/mame/drivers/wgp.cpp", - MAME_DIR .. "src/mame/includes/wgp.h", - MAME_DIR .. "src/mame/video/wgp.cpp", - MAME_DIR .. "src/mame/drivers/wyvernf0.cpp", - MAME_DIR .. "src/mame/machine/taitoio.cpp", - MAME_DIR .. "src/mame/machine/taitoio.h", - MAME_DIR .. "src/mame/machine/taitoio_yoke.cpp", - MAME_DIR .. "src/mame/machine/taitoio_yoke.h", - MAME_DIR .. "src/mame/video/taito_helper.cpp", - MAME_DIR .. "src/mame/video/taito_helper.h", - MAME_DIR .. "src/mame/video/pc080sn.cpp", - MAME_DIR .. "src/mame/video/pc080sn.h", - MAME_DIR .. "src/mame/video/pc090oj.cpp", - MAME_DIR .. "src/mame/video/pc090oj.h", - MAME_DIR .. "src/mame/video/tc0080vco.cpp", - MAME_DIR .. "src/mame/video/tc0080vco.h", - MAME_DIR .. "src/mame/video/tc0100scn.cpp", - MAME_DIR .. "src/mame/video/tc0100scn.h", - MAME_DIR .. "src/mame/video/tc0150rod.cpp", - MAME_DIR .. "src/mame/video/tc0150rod.h", - MAME_DIR .. "src/mame/video/tc0280grd.cpp", - MAME_DIR .. "src/mame/video/tc0280grd.h", - MAME_DIR .. "src/mame/video/tc0360pri.cpp", - MAME_DIR .. "src/mame/video/tc0360pri.h", - MAME_DIR .. "src/mame/video/tc0480scp.cpp", - MAME_DIR .. "src/mame/video/tc0480scp.h", - MAME_DIR .. "src/mame/video/tc0110pcr.cpp", - MAME_DIR .. "src/mame/video/tc0110pcr.h", - MAME_DIR .. "src/mame/video/tc0180vcu.cpp", - MAME_DIR .. "src/mame/video/tc0180vcu.h", - MAME_DIR .. "src/mame/video/tc0780fpa.cpp", - MAME_DIR .. "src/mame/video/tc0780fpa.h", -} - -createMAMEProjects(_target, _subtarget, "tatsumi") -files { - MAME_DIR .. "src/mame/drivers/kingdrby.cpp", - MAME_DIR .. "src/mame/drivers/lockon.cpp", - MAME_DIR .. "src/mame/includes/lockon.h", - MAME_DIR .. "src/mame/video/lockon.cpp", - MAME_DIR .. "src/mame/drivers/tatsumi.cpp", - MAME_DIR .. "src/mame/includes/tatsumi.h", - MAME_DIR .. "src/mame/machine/tatsumi.cpp", - MAME_DIR .. "src/mame/video/tatsumi.cpp", - MAME_DIR .. "src/mame/drivers/tx1.cpp", - MAME_DIR .. "src/mame/includes/tx1.h", - MAME_DIR .. "src/mame/machine/tx1.cpp", - MAME_DIR .. "src/mame/audio/tx1.cpp", - MAME_DIR .. "src/mame/audio/tx1.h", - MAME_DIR .. "src/mame/video/tx1.cpp", -} - -createMAMEProjects(_target, _subtarget, "tch") -files { - MAME_DIR .. "src/mame/drivers/kickgoal.cpp", - MAME_DIR .. "src/mame/includes/kickgoal.h", - MAME_DIR .. "src/mame/video/kickgoal.cpp", - MAME_DIR .. "src/mame/drivers/littlerb.cpp", - MAME_DIR .. "src/mame/drivers/rltennis.cpp", - MAME_DIR .. "src/mame/includes/rltennis.h", - MAME_DIR .. "src/mame/video/rltennis.cpp", - MAME_DIR .. "src/mame/drivers/speedspn.cpp", - MAME_DIR .. "src/mame/includes/speedspn.h", - MAME_DIR .. "src/mame/video/speedspn.cpp", - MAME_DIR .. "src/mame/drivers/wheelfir.cpp", -} - -createMAMEProjects(_target, _subtarget, "tecfri") -files { - MAME_DIR .. "src/mame/drivers/ambush.cpp", - MAME_DIR .. "src/mame/drivers/holeland.cpp", - MAME_DIR .. "src/mame/includes/holeland.h", - MAME_DIR .. "src/mame/video/holeland.cpp", - MAME_DIR .. "src/mame/drivers/sauro.cpp", - MAME_DIR .. "src/mame/includes/sauro.h", - MAME_DIR .. "src/mame/video/sauro.cpp", - MAME_DIR .. "src/mame/drivers/speedbal.cpp", - MAME_DIR .. "src/mame/includes/speedbal.h", - MAME_DIR .. "src/mame/video/speedbal.cpp", -} - -createMAMEProjects(_target, _subtarget, "technos") -files { - MAME_DIR .. "src/mame/drivers/battlane.cpp", - MAME_DIR .. "src/mame/includes/battlane.h", - MAME_DIR .. "src/mame/video/battlane.cpp", - MAME_DIR .. "src/mame/drivers/blockout.cpp", - MAME_DIR .. "src/mame/includes/blockout.h", - MAME_DIR .. "src/mame/video/blockout.cpp", - MAME_DIR .. "src/mame/drivers/bogeyman.cpp", - MAME_DIR .. "src/mame/includes/bogeyman.h", - MAME_DIR .. "src/mame/video/bogeyman.cpp", - MAME_DIR .. "src/mame/drivers/chinagat.cpp", - MAME_DIR .. "src/mame/drivers/ddragon.cpp", - MAME_DIR .. "src/mame/includes/ddragon.h", - MAME_DIR .. "src/mame/video/ddragon.cpp", - MAME_DIR .. "src/mame/drivers/ddragon3.cpp", - MAME_DIR .. "src/mame/includes/ddragon3.h", - MAME_DIR .. "src/mame/video/ddragon3.cpp", - MAME_DIR .. "src/mame/drivers/dogfgt.cpp", - MAME_DIR .. "src/mame/includes/dogfgt.h", - MAME_DIR .. "src/mame/video/dogfgt.cpp", - MAME_DIR .. "src/mame/drivers/matmania.cpp", - MAME_DIR .. "src/mame/includes/matmania.h", - MAME_DIR .. "src/mame/video/matmania.cpp", - MAME_DIR .. "src/mame/drivers/mystston.cpp", - MAME_DIR .. "src/mame/includes/mystston.h", - MAME_DIR .. "src/mame/video/mystston.cpp", - MAME_DIR .. "src/mame/drivers/renegade.cpp", - MAME_DIR .. "src/mame/includes/renegade.h", - MAME_DIR .. "src/mame/video/renegade.cpp", - MAME_DIR .. "src/mame/drivers/shadfrce.cpp", - MAME_DIR .. "src/mame/includes/shadfrce.h", - MAME_DIR .. "src/mame/video/shadfrce.cpp", - MAME_DIR .. "src/mame/drivers/spdodgeb.cpp", - MAME_DIR .. "src/mame/drivers/ssozumo.cpp", - MAME_DIR .. "src/mame/includes/ssozumo.h", - MAME_DIR .. "src/mame/video/ssozumo.cpp", - MAME_DIR .. "src/mame/drivers/tagteam.cpp", - MAME_DIR .. "src/mame/includes/tagteam.h", - MAME_DIR .. "src/mame/video/tagteam.cpp", - MAME_DIR .. "src/mame/drivers/vball.cpp", - MAME_DIR .. "src/mame/drivers/wwfsstar.cpp", - MAME_DIR .. "src/mame/includes/wwfsstar.h", - MAME_DIR .. "src/mame/video/wwfsstar.cpp", - MAME_DIR .. "src/mame/drivers/xain.cpp", - MAME_DIR .. "src/mame/includes/xain.h", - MAME_DIR .. "src/mame/video/xain.cpp", -} - -createMAMEProjects(_target, _subtarget, "tehkan") -files { - MAME_DIR .. "src/mame/video/tecmo_mix.cpp", - MAME_DIR .. "src/mame/video/tecmo_mix.h", - MAME_DIR .. "src/mame/drivers/bombjack.cpp", - MAME_DIR .. "src/mame/includes/bombjack.h", - MAME_DIR .. "src/mame/video/bombjack.cpp", - MAME_DIR .. "src/mame/drivers/gaiden.cpp", - MAME_DIR .. "src/mame/includes/gaiden.h", - MAME_DIR .. "src/mame/video/gaiden.cpp", - MAME_DIR .. "src/mame/drivers/lvcards.cpp", - MAME_DIR .. "src/mame/includes/lvcards.h", - MAME_DIR .. "src/mame/video/lvcards.cpp", - MAME_DIR .. "src/mame/drivers/pbaction.cpp", - MAME_DIR .. "src/mame/includes/pbaction.h", - MAME_DIR .. "src/mame/video/pbaction.cpp", - MAME_DIR .. "src/mame/drivers/senjyo.cpp", - MAME_DIR .. "src/mame/includes/senjyo.h", - MAME_DIR .. "src/mame/audio/senjyo.cpp", - MAME_DIR .. "src/mame/video/senjyo.cpp", - MAME_DIR .. "src/mame/drivers/solomon.cpp", - MAME_DIR .. "src/mame/includes/solomon.h", - MAME_DIR .. "src/mame/video/solomon.cpp", - MAME_DIR .. "src/mame/drivers/spbactn.cpp", - MAME_DIR .. "src/mame/includes/spbactn.h", - MAME_DIR .. "src/mame/video/spbactn.cpp", - MAME_DIR .. "src/mame/drivers/tbowl.cpp", - MAME_DIR .. "src/mame/drivers/tecmo.cpp", - MAME_DIR .. "src/mame/includes/tecmo.h", - MAME_DIR .. "src/mame/video/tecmo.cpp", - MAME_DIR .. "src/mame/drivers/tecmo16.cpp", - MAME_DIR .. "src/mame/includes/tecmo16.h", - MAME_DIR .. "src/mame/video/tecmo16.cpp", - MAME_DIR .. "src/mame/drivers/tecmosys.cpp", - MAME_DIR .. "src/mame/includes/tecmosys.h", - MAME_DIR .. "src/mame/machine/tecmosys.cpp", - MAME_DIR .. "src/mame/video/tecmosys.cpp", - MAME_DIR .. "src/mame/drivers/tehkanwc.cpp", - MAME_DIR .. "src/mame/includes/tehkanwc.h", - MAME_DIR .. "src/mame/video/tehkanwc.cpp", - MAME_DIR .. "src/mame/drivers/wc90.cpp", - MAME_DIR .. "src/mame/drivers/wc90b.cpp", -} - -createMAMEProjects(_target, _subtarget, "terminal") -files { - MAME_DIR .. "src/mame/drivers/istrebiteli.cpp", - MAME_DIR .. "src/mame/drivers/tiamc1.cpp", - MAME_DIR .. "src/mame/includes/tiamc1.h", - MAME_DIR .. "src/mame/video/tiamc1.cpp", - MAME_DIR .. "src/mame/audio/tiamc1.cpp", - MAME_DIR .. "src/mame/audio/tiamc1.h", -} - -createMAMEProjects(_target, _subtarget, "thepit") -files { - MAME_DIR .. "src/mame/drivers/thepit.cpp", - MAME_DIR .. "src/mame/includes/thepit.h", - MAME_DIR .. "src/mame/video/thepit.cpp", - MAME_DIR .. "src/mame/drivers/timelimt.cpp", - MAME_DIR .. "src/mame/includes/timelimt.h", - MAME_DIR .. "src/mame/video/timelimt.cpp", -} - -createMAMEProjects(_target, _subtarget, "toaplan") -files { - MAME_DIR .. "src/mame/drivers/mjsister.cpp", - MAME_DIR .. "src/mame/drivers/slapfght.cpp", - MAME_DIR .. "src/mame/includes/slapfght.h", - MAME_DIR .. "src/mame/machine/slapfght.cpp", - MAME_DIR .. "src/mame/video/slapfght.cpp", - MAME_DIR .. "src/mame/drivers/slapfght_ms.cpp", - MAME_DIR .. "src/mame/drivers/snowbros.cpp", - MAME_DIR .. "src/mame/includes/snowbros.h", - MAME_DIR .. "src/mame/video/snowbros.cpp", - MAME_DIR .. "src/mame/video/kan_pand.cpp", - MAME_DIR .. "src/mame/video/kan_pand.h", - MAME_DIR .. "src/mame/drivers/toaplan1.cpp", - MAME_DIR .. "src/mame/includes/toaplan1.h", - MAME_DIR .. "src/mame/machine/toaplan1.cpp", - MAME_DIR .. "src/mame/video/toaplan1.cpp", - MAME_DIR .. "src/mame/includes/toaplipt.h", - MAME_DIR .. "src/mame/drivers/toaplan2.cpp", - MAME_DIR .. "src/mame/includes/toaplan2.h", - MAME_DIR .. "src/mame/video/toaplan2.cpp", - MAME_DIR .. "src/mame/video/gp9001.cpp", - MAME_DIR .. "src/mame/video/gp9001.h", - MAME_DIR .. "src/mame/drivers/twincobr.cpp", - MAME_DIR .. "src/mame/includes/twincobr.h", - MAME_DIR .. "src/mame/machine/twincobr.cpp", - MAME_DIR .. "src/mame/video/twincobr.cpp", - MAME_DIR .. "src/mame/drivers/wardner.cpp", - MAME_DIR .. "src/mame/video/toaplan_scu.cpp", - MAME_DIR .. "src/mame/video/toaplan_scu.h", -} - -createMAMEProjects(_target, _subtarget, "unico") -files { - MAME_DIR .. "src/mame/drivers/drgnmst.cpp", - MAME_DIR .. "src/mame/includes/drgnmst.h", - MAME_DIR .. "src/mame/video/drgnmst.cpp", - MAME_DIR .. "src/mame/drivers/silkroad.cpp", - MAME_DIR .. "src/mame/includes/silkroad.h", - MAME_DIR .. "src/mame/video/silkroad.cpp", - MAME_DIR .. "src/mame/drivers/unianapc.cpp", - MAME_DIR .. "src/mame/drivers/unico.cpp", - MAME_DIR .. "src/mame/includes/unico.h", - MAME_DIR .. "src/mame/video/unico.cpp", - MAME_DIR .. "src/mame/drivers/goori.cpp", -} - -createMAMEProjects(_target, _subtarget, "univers") -files { - MAME_DIR .. "src/mame/audio/cheekyms.cpp", - MAME_DIR .. "src/mame/audio/cheekyms.h", - MAME_DIR .. "src/mame/audio/nl_cheekyms.cpp", - MAME_DIR .. "src/mame/audio/nl_cheekyms.h", - MAME_DIR .. "src/mame/drivers/cheekyms.cpp", - MAME_DIR .. "src/mame/includes/cheekyms.h", - MAME_DIR .. "src/mame/video/cheekyms.cpp", - MAME_DIR .. "src/mame/drivers/cosmic.cpp", - MAME_DIR .. "src/mame/includes/cosmic.h", - MAME_DIR .. "src/mame/video/cosmic.cpp", - MAME_DIR .. "src/mame/drivers/cosmicg.cpp", - MAME_DIR .. "src/mame/drivers/docastle.cpp", - MAME_DIR .. "src/mame/includes/docastle.h", - MAME_DIR .. "src/mame/machine/docastle.cpp", - MAME_DIR .. "src/mame/video/docastle.cpp", - MAME_DIR .. "src/mame/drivers/getaway.cpp", - MAME_DIR .. "src/mame/drivers/ladybug.cpp", - MAME_DIR .. "src/mame/includes/ladybug.h", - MAME_DIR .. "src/mame/video/ladybug.cpp", - MAME_DIR .. "src/mame/video/ladybug.h", - MAME_DIR .. "src/mame/drivers/mrdo.cpp", - MAME_DIR .. "src/mame/includes/mrdo.h", - MAME_DIR .. "src/mame/video/mrdo.cpp", - MAME_DIR .. "src/mame/drivers/redclash.cpp", - MAME_DIR .. "src/mame/includes/redclash.h", - MAME_DIR .. "src/mame/video/redclash.cpp", - MAME_DIR .. "src/mame/drivers/superdq.cpp", -} - -createMAMEProjects(_target, _subtarget, "upl") -files { - MAME_DIR .. "src/mame/drivers/mouser.cpp", - MAME_DIR .. "src/mame/includes/mouser.h", - MAME_DIR .. "src/mame/video/mouser.cpp", - MAME_DIR .. "src/mame/drivers/ninjakd2.cpp", - MAME_DIR .. "src/mame/includes/ninjakd2.h", - MAME_DIR .. "src/mame/video/ninjakd2.cpp", - MAME_DIR .. "src/mame/drivers/nova2001.cpp", - MAME_DIR .. "src/mame/includes/nova2001.h", - MAME_DIR .. "src/mame/video/nova2001.cpp", - MAME_DIR .. "src/mame/drivers/xxmissio.cpp", -} - -createMAMEProjects(_target, _subtarget, "valadon") -files { - MAME_DIR .. "src/mame/drivers/bagman.cpp", - MAME_DIR .. "src/mame/includes/bagman.h", - MAME_DIR .. "src/mame/machine/bagman.cpp", - MAME_DIR .. "src/mame/video/bagman.cpp", - MAME_DIR .. "src/mame/drivers/tankbust.cpp", -} - -createMAMEProjects(_target, _subtarget, "venture") -files { - MAME_DIR .. "src/mame/drivers/looping.cpp", - MAME_DIR .. "src/mame/drivers/spcforce.cpp", - MAME_DIR .. "src/mame/includes/spcforce.h", - MAME_DIR .. "src/mame/video/spcforce.cpp", - MAME_DIR .. "src/mame/drivers/suprridr.cpp", - MAME_DIR .. "src/mame/includes/suprridr.h", - MAME_DIR .. "src/mame/video/suprridr.cpp", -} - -createMAMEProjects(_target, _subtarget, "vsystem") -files { - MAME_DIR .. "src/mame/machine/vs9209.cpp", - MAME_DIR .. "src/mame/machine/vs9209.h", - MAME_DIR .. "src/mame/video/vsystem_gga.cpp", - MAME_DIR .. "src/mame/video/vsystem_gga.h", - MAME_DIR .. "src/mame/video/vsystem_spr.cpp", - MAME_DIR .. "src/mame/video/vsystem_spr.h", - MAME_DIR .. "src/mame/video/vsystem_spr2.cpp", - MAME_DIR .. "src/mame/video/vsystem_spr2.h", - MAME_DIR .. "src/mame/drivers/aerofgt.cpp", - MAME_DIR .. "src/mame/includes/aerofgt.h", - MAME_DIR .. "src/mame/video/aerofgt.cpp", - MAME_DIR .. "src/mame/drivers/crshrace.cpp", - MAME_DIR .. "src/mame/includes/crshrace.h", - MAME_DIR .. "src/mame/video/crshrace.cpp", - MAME_DIR .. "src/mame/drivers/f1gp.cpp", - MAME_DIR .. "src/mame/includes/f1gp.h", - MAME_DIR .. "src/mame/video/f1gp.cpp", - MAME_DIR .. "src/mame/drivers/fromance.cpp", - MAME_DIR .. "src/mame/includes/fromance.h", - MAME_DIR .. "src/mame/video/fromance.cpp", - MAME_DIR .. "src/mame/drivers/fromanc2.cpp", - MAME_DIR .. "src/mame/includes/fromanc2.h", - MAME_DIR .. "src/mame/video/fromanc2.cpp", - MAME_DIR .. "src/mame/drivers/gstriker.cpp", - MAME_DIR .. "src/mame/video/mb60553.cpp", - MAME_DIR .. "src/mame/video/mb60553.h", - MAME_DIR .. "src/mame/video/vs920a.cpp", - MAME_DIR .. "src/mame/video/vs920a.h", - MAME_DIR .. "src/mame/drivers/inufuku.cpp", - MAME_DIR .. "src/mame/drivers/ojankohs.cpp", - MAME_DIR .. "src/mame/includes/ojankohs.h", - MAME_DIR .. "src/mame/video/ojankohs.cpp", - MAME_DIR .. "src/mame/drivers/pipedrm.cpp", - MAME_DIR .. "src/mame/drivers/rpunch.cpp", - MAME_DIR .. "src/mame/drivers/suprslam.cpp", - MAME_DIR .. "src/mame/includes/suprslam.h", - MAME_DIR .. "src/mame/video/suprslam.cpp", - MAME_DIR .. "src/mame/drivers/tail2nos.cpp", - MAME_DIR .. "src/mame/drivers/taotaido.cpp", - MAME_DIR .. "src/mame/includes/taotaido.h", - MAME_DIR .. "src/mame/video/taotaido.cpp", - MAME_DIR .. "src/mame/drivers/welltris.cpp", -} - -createMAMEProjects(_target, _subtarget, "wing") -files { - MAME_DIR .. "src/mame/drivers/lucky37.cpp", - MAME_DIR .. "src/mame/drivers/lucky74.cpp", - MAME_DIR .. "src/mame/includes/lucky74.h", - MAME_DIR .. "src/mame/video/lucky74.cpp", - MAME_DIR .. "src/mame/drivers/luckgrln.cpp", - MAME_DIR .. "src/mame/drivers/pinkiri8.cpp", - MAME_DIR .. "src/mame/drivers/slotcarn.cpp", - MAME_DIR .. "src/mame/drivers/superwng.cpp", -} - -createMAMEProjects(_target, _subtarget, "yunsung") -files { - MAME_DIR .. "src/mame/drivers/nmg5.cpp", - MAME_DIR .. "src/mame/drivers/paradise.cpp", - MAME_DIR .. "src/mame/drivers/yunsung8.cpp", - MAME_DIR .. "src/mame/drivers/yunsun16.cpp", -} - -createMAMEProjects(_target, _subtarget, "zaccaria") -files { - MAME_DIR .. "src/mame/audio/nl_zac1b11142.cpp", - MAME_DIR .. "src/mame/audio/nl_zac1b11142.h", - MAME_DIR .. "src/mame/audio/zaccaria.cpp", - MAME_DIR .. "src/mame/audio/zaccaria.h", - MAME_DIR .. "src/mame/drivers/laserbat.cpp", - MAME_DIR .. "src/mame/includes/laserbat.h", - MAME_DIR .. "src/mame/video/laserbat.cpp", - MAME_DIR .. "src/mame/audio/laserbat.cpp", - MAME_DIR .. "src/mame/drivers/seabattl.cpp", - MAME_DIR .. "src/mame/drivers/zac2650.cpp", - MAME_DIR .. "src/mame/includes/zac2650.h", - MAME_DIR .. "src/mame/video/zac2650.cpp", - MAME_DIR .. "src/mame/drivers/zaccaria.cpp", - MAME_DIR .. "src/mame/includes/zaccaria.h", - MAME_DIR .. "src/mame/video/zaccaria.cpp", -} - --------------------------------------------------- --- pinball drivers --------------------------------------------------- - -createMAMEProjects(_target, _subtarget, "pinball") -files { - MAME_DIR .. "src/mame/drivers/allied.cpp", - MAME_DIR .. "src/mame/drivers/alvg.cpp", - MAME_DIR .. "src/mame/drivers/atari_4x4.cpp", - MAME_DIR .. "src/mame/drivers/atari_s1.cpp", - MAME_DIR .. "src/mame/drivers/atari_s2.cpp", - MAME_DIR .. "src/mame/drivers/barni.cpp", - MAME_DIR .. "src/mame/drivers/bingo.cpp", - MAME_DIR .. "src/mame/drivers/by17.cpp", - MAME_DIR .. "src/mame/drivers/by35.cpp", - MAME_DIR .. "src/mame/drivers/by6803.cpp", - MAME_DIR .. "src/mame/drivers/by68701.cpp", - MAME_DIR .. "src/mame/drivers/byvid.cpp", - MAME_DIR .. "src/mame/drivers/capcom.cpp", - MAME_DIR .. "src/mame/drivers/de_2.cpp", - MAME_DIR .. "src/mame/drivers/de_3.cpp", - MAME_DIR .. "src/mame/machine/decopincpu.cpp", - MAME_DIR .. "src/mame/machine/decopincpu.h", - MAME_DIR .. "src/mame/video/decodmd1.cpp", - MAME_DIR .. "src/mame/video/decodmd1.h", - MAME_DIR .. "src/mame/video/decodmd2.cpp", - MAME_DIR .. "src/mame/video/decodmd2.h", - MAME_DIR .. "src/mame/video/decodmd3.cpp", - MAME_DIR .. "src/mame/video/decodmd3.h", - MAME_DIR .. "src/mame/drivers/flicker.cpp", - MAME_DIR .. "src/mame/drivers/g627.cpp", - MAME_DIR .. "src/mame/drivers/gp_1.cpp", - MAME_DIR .. "src/mame/machine/genpin.cpp", - MAME_DIR .. "src/mame/machine/genpin.h", - MAME_DIR .. "src/mame/drivers/gp_2.cpp", - MAME_DIR .. "src/mame/drivers/gts1.cpp", - MAME_DIR .. "src/mame/drivers/gts3.cpp", - MAME_DIR .. "src/mame/drivers/gts3a.cpp", - MAME_DIR .. "src/mame/drivers/gts80.cpp", - MAME_DIR .. "src/mame/drivers/gts80a.cpp", - MAME_DIR .. "src/mame/drivers/gts80b.cpp", - MAME_DIR .. "src/mame/drivers/hankin.cpp", - MAME_DIR .. "src/mame/drivers/icecold.cpp", - MAME_DIR .. "src/mame/drivers/idsa.cpp", - MAME_DIR .. "src/mame/drivers/inder.cpp", - MAME_DIR .. "src/mame/drivers/inderp.cpp", - MAME_DIR .. "src/mame/drivers/jeutel.cpp", - MAME_DIR .. "src/mame/drivers/joctronic.cpp", - MAME_DIR .. "src/mame/drivers/jp.cpp", - MAME_DIR .. "src/mame/drivers/jvh.cpp", - MAME_DIR .. "src/mame/drivers/kissproto.cpp", - MAME_DIR .. "src/mame/drivers/lancelot.cpp", - MAME_DIR .. "src/mame/drivers/lckydraw.cpp", - MAME_DIR .. "src/mame/drivers/ltd.cpp", - MAME_DIR .. "src/mame/drivers/macp.cpp", - MAME_DIR .. "src/mame/drivers/micropin.cpp", - MAME_DIR .. "src/mame/drivers/missamer.cpp", - MAME_DIR .. "src/mame/drivers/mephistp.cpp", - MAME_DIR .. "src/mame/drivers/mrgame.cpp", - MAME_DIR .. "src/mame/drivers/nsm.cpp", - MAME_DIR .. "src/mame/drivers/peyper.cpp", - MAME_DIR .. "src/mame/drivers/play_1.cpp", - MAME_DIR .. "src/mame/drivers/play_2.cpp", - MAME_DIR .. "src/mame/drivers/play_3.cpp", - MAME_DIR .. "src/mame/drivers/recel.cpp", - MAME_DIR .. "src/mame/drivers/rowamet.cpp", - MAME_DIR .. "src/mame/drivers/s11.cpp", - MAME_DIR .. "src/mame/includes/s11.h", - MAME_DIR .. "src/mame/drivers/s11a.cpp", - MAME_DIR .. "src/mame/drivers/s11b.cpp", - MAME_DIR .. "src/mame/drivers/s11c.cpp", - MAME_DIR .. "src/mame/audio/pinsnd88.cpp", - MAME_DIR .. "src/mame/audio/pinsnd88.h", - MAME_DIR .. "src/mame/drivers/s3.cpp", - MAME_DIR .. "src/mame/drivers/s4.cpp", - MAME_DIR .. "src/mame/drivers/s6.cpp", - MAME_DIR .. "src/mame/drivers/s7.cpp", - MAME_DIR .. "src/mame/drivers/s8.cpp", - MAME_DIR .. "src/mame/drivers/s9.cpp", - MAME_DIR .. "src/mame/drivers/sam.cpp", - MAME_DIR .. "src/mame/drivers/sleic.cpp", - MAME_DIR .. "src/mame/drivers/spectra.cpp", - MAME_DIR .. "src/mame/drivers/spike.cpp", - MAME_DIR .. "src/mame/drivers/spinb.cpp", - MAME_DIR .. "src/mame/drivers/spirit76.cpp", - MAME_DIR .. "src/mame/drivers/st_mp100.cpp", - MAME_DIR .. "src/mame/drivers/st_mp200.cpp", - MAME_DIR .. "src/mame/drivers/stargame.cpp", - MAME_DIR .. "src/mame/drivers/supstarf.cpp", - MAME_DIR .. "src/mame/drivers/taito.cpp", - MAME_DIR .. "src/mame/drivers/techno.cpp", - MAME_DIR .. "src/mame/drivers/vd.cpp", - MAME_DIR .. "src/mame/drivers/whitestar.cpp", - MAME_DIR .. "src/mame/drivers/wico.cpp", - MAME_DIR .. "src/mame/drivers/wms_shuffle.cpp", - MAME_DIR .. "src/mame/drivers/wpc_95.cpp", - MAME_DIR .. "src/mame/drivers/wpc_an.cpp", - MAME_DIR .. "src/mame/drivers/wpc_dcs.cpp", - MAME_DIR .. "src/mame/drivers/wpc_dot.cpp", - MAME_DIR .. "src/mame/includes/wpc_dot.h", - MAME_DIR .. "src/mame/drivers/wpc_flip1.cpp", - MAME_DIR .. "src/mame/drivers/wpc_flip2.cpp", - MAME_DIR .. "src/mame/drivers/wpc_s.cpp", - MAME_DIR .. "src/mame/machine/wpc.cpp", - MAME_DIR .. "src/mame/machine/wpc.h", - MAME_DIR .. "src/mame/audio/wpcsnd.cpp", - MAME_DIR .. "src/mame/audio/wpcsnd.h", - MAME_DIR .. "src/mame/video/wpc_dmd.cpp", - MAME_DIR .. "src/mame/video/wpc_dmd.h", - MAME_DIR .. "src/mame/machine/wpc_pic.cpp", - MAME_DIR .. "src/mame/machine/wpc_pic.h", - MAME_DIR .. "src/mame/machine/wpc_lamp.cpp", - MAME_DIR .. "src/mame/machine/wpc_lamp.h", - MAME_DIR .. "src/mame/machine/wpc_out.cpp", - MAME_DIR .. "src/mame/machine/wpc_out.h", - MAME_DIR .. "src/mame/machine/wpc_shift.cpp", - MAME_DIR .. "src/mame/machine/wpc_shift.h", - MAME_DIR .. "src/mame/drivers/zac_1.cpp", - MAME_DIR .. "src/mame/drivers/zac_2.cpp", - MAME_DIR .. "src/mame/drivers/zac_proto.cpp", - MAME_DIR .. "src/mame/drivers/zpinball.cpp", -} - --------------------------------------------------- --- remaining drivers --------------------------------------------------- - -createMAMEProjects(_target, _subtarget, "misc") -files { - MAME_DIR .. "src/mame/drivers/39in1.cpp", - MAME_DIR .. "src/mame/drivers/3do.cpp", - MAME_DIR .. "src/mame/includes/3do.h", - MAME_DIR .. "src/mame/machine/3do.cpp", - MAME_DIR .. "src/mame/drivers/4enlinea.cpp", - MAME_DIR .. "src/mame/drivers/4enraya.cpp", - MAME_DIR .. "src/mame/drivers/5clown.cpp", - MAME_DIR .. "src/mame/drivers/a1supply.cpp", - MAME_DIR .. "src/mame/drivers/acefruit.cpp", - MAME_DIR .. "src/mame/drivers/aces1.cpp", - MAME_DIR .. "src/mame/drivers/acesp.cpp", - MAME_DIR .. "src/mame/machine/ace_sp_reelctrl.cpp", - MAME_DIR .. "src/mame/machine/ace_sp_reelctrl.h", - MAME_DIR .. "src/mame/drivers/age_candy.cpp", - MAME_DIR .. "src/mame/drivers/alinvade.cpp", - MAME_DIR .. "src/mame/drivers/amaticmg.cpp", - MAME_DIR .. "src/mame/drivers/amerihok.cpp", - MAME_DIR .. "src/mame/drivers/ampoker2.cpp", - MAME_DIR .. "src/mame/includes/ampoker2.h", - MAME_DIR .. "src/mame/video/ampoker2.cpp", - MAME_DIR .. "src/mame/drivers/amspdwy.cpp", - MAME_DIR .. "src/mame/drivers/amusco.cpp", - MAME_DIR .. "src/mame/drivers/anes.cpp", - MAME_DIR .. "src/mame/video/apple2.cpp", - MAME_DIR .. "src/mame/video/apple2.h", - MAME_DIR .. "src/mame/machine/apple2common.cpp", - MAME_DIR .. "src/mame/machine/apple2common.h", - MAME_DIR .. "src/mame/drivers/arachnid.cpp", - MAME_DIR .. "src/mame/drivers/artmagic.cpp", - MAME_DIR .. "src/mame/includes/artmagic.h", - MAME_DIR .. "src/mame/video/artmagic.cpp", - MAME_DIR .. "src/mame/drivers/astrafr.cpp", - MAME_DIR .. "src/mame/drivers/astrcorp.cpp", - MAME_DIR .. "src/mame/drivers/astropc.cpp", - MAME_DIR .. "src/mame/drivers/atronic.cpp", - MAME_DIR .. "src/mame/drivers/attckufo.cpp", - MAME_DIR .. "src/mame/drivers/avt.cpp", - MAME_DIR .. "src/mame/drivers/aztarac.cpp", - MAME_DIR .. "src/mame/includes/aztarac.h", - MAME_DIR .. "src/mame/audio/aztarac.cpp", - MAME_DIR .. "src/mame/video/aztarac.cpp", - MAME_DIR .. "src/mame/drivers/bailey.cpp", - MAME_DIR .. "src/mame/drivers/beaminv.cpp", - MAME_DIR .. "src/mame/drivers/beezer.cpp", - MAME_DIR .. "src/mame/drivers/belatra.cpp", - MAME_DIR .. "src/mame/drivers/bgt.cpp", - MAME_DIR .. "src/mame/drivers/bingoman.cpp", - MAME_DIR .. "src/mame/drivers/bingor.cpp", - MAME_DIR .. "src/mame/drivers/blitz68k.cpp", - MAME_DIR .. "src/mame/drivers/blocktax.cpp", - MAME_DIR .. "src/mame/drivers/buster.cpp", - MAME_DIR .. "src/mame/drivers/calomega.cpp", - MAME_DIR .. "src/mame/includes/calomega.h", - MAME_DIR .. "src/mame/video/calomega.cpp", - MAME_DIR .. "src/mame/drivers/cardline.cpp", - MAME_DIR .. "src/mame/drivers/carrera.cpp", - MAME_DIR .. "src/mame/drivers/castle.cpp", - MAME_DIR .. "src/mame/drivers/cave.cpp", - MAME_DIR .. "src/mame/includes/cave.h", - MAME_DIR .. "src/mame/video/cave.cpp", - MAME_DIR .. "src/mame/drivers/cavepc.cpp", - MAME_DIR .. "src/mame/drivers/cv1k.cpp", - MAME_DIR .. "src/mame/drivers/cb2001.cpp", - MAME_DIR .. "src/mame/drivers/cdi.cpp", - MAME_DIR .. "src/mame/includes/cdi.h", - MAME_DIR .. "src/mame/video/mcd212.cpp", - MAME_DIR .. "src/mame/video/mcd212.h", - MAME_DIR .. "src/mame/machine/cdislavehle.cpp", - MAME_DIR .. "src/mame/machine/cdislavehle.h", - MAME_DIR .. "src/mame/machine/cdicdic.cpp", - MAME_DIR .. "src/mame/machine/cdicdic.h", - MAME_DIR .. "src/mame/drivers/chameleonrx1.cpp", - MAME_DIR .. "src/mame/drivers/chance32.cpp", - MAME_DIR .. "src/mame/drivers/changyu.cpp", - MAME_DIR .. "src/mame/drivers/chexx.cpp", - MAME_DIR .. "src/mame/drivers/chicago.cpp", - MAME_DIR .. "src/mame/drivers/chsuper.cpp", - MAME_DIR .. "src/mame/drivers/clowndwn.cpp", - MAME_DIR .. "src/mame/drivers/clpoker.cpp", - MAME_DIR .. "src/mame/drivers/cocoloco.cpp", - MAME_DIR .. "src/mame/audio/nl_cocoloco.h", - MAME_DIR .. "src/mame/audio/nl_cocoloco.cpp", - MAME_DIR .. "src/mame/drivers/coinmstr.cpp", - MAME_DIR .. "src/mame/drivers/coinmvga.cpp", - MAME_DIR .. "src/mame/drivers/cointek.cpp", - MAME_DIR .. "src/mame/drivers/comebaby.cpp", - MAME_DIR .. "src/mame/drivers/compucranes.cpp", - MAME_DIR .. "src/mame/drivers/cosmos_playc8f.cpp", - MAME_DIR .. "src/mame/drivers/cowtipping.cpp", - MAME_DIR .. "src/mame/drivers/crazybal.cpp", - MAME_DIR .. "src/mame/drivers/cromptons.cpp", - MAME_DIR .. "src/mame/drivers/cupidon.cpp", - MAME_DIR .. "src/mame/drivers/bntyhunt.cpp", - MAME_DIR .. "src/mame/drivers/coolpool.cpp", - MAME_DIR .. "src/mame/includes/coolpool.h", - MAME_DIR .. "src/mame/drivers/megaphx.cpp", - MAME_DIR .. "src/mame/machine/inder_sb.cpp", - MAME_DIR .. "src/mame/machine/inder_sb.h", - MAME_DIR .. "src/mame/drivers/corona.cpp", - MAME_DIR .. "src/mame/drivers/cwheel.cpp", - MAME_DIR .. "src/mame/drivers/crystal.cpp", - MAME_DIR .. "src/mame/drivers/ddz.cpp", - MAME_DIR .. "src/mame/drivers/menghong.cpp", - MAME_DIR .. "src/mame/drivers/trivrus.cpp", - MAME_DIR .. "src/mame/drivers/crospuzl.cpp", - MAME_DIR .. "src/mame/drivers/psattack.cpp", - MAME_DIR .. "src/mame/drivers/v0bowl.cpp", - MAME_DIR .. "src/mame/drivers/cubeqst.cpp", - MAME_DIR .. "src/mame/drivers/cybertnk.cpp", - MAME_DIR .. "src/mame/drivers/daryde.cpp", - MAME_DIR .. "src/mame/drivers/dcheese.cpp", - MAME_DIR .. "src/mame/includes/dcheese.h", - MAME_DIR .. "src/mame/video/dcheese.cpp", - MAME_DIR .. "src/mame/drivers/dfruit.cpp", - MAME_DIR .. "src/mame/drivers/dgpix.cpp", - MAME_DIR .. "src/mame/drivers/diamondking.cpp", - MAME_DIR .. "src/mame/drivers/discoboy.cpp", - MAME_DIR .. "src/mame/drivers/dmainevent.cpp", - MAME_DIR .. "src/mame/drivers/dominob.cpp", - MAME_DIR .. "src/mame/drivers/dorachan.cpp", - MAME_DIR .. "src/mame/drivers/drdmania.cpp", - MAME_DIR .. "src/mame/drivers/dreamwld.cpp", - MAME_DIR .. "src/mame/drivers/dwarfd.cpp", - MAME_DIR .. "src/mame/drivers/dynadice.cpp", - MAME_DIR .. "src/mame/drivers/dynamoah.cpp", - MAME_DIR .. "src/mame/drivers/ecoinfr.cpp", - MAME_DIR .. "src/mame/drivers/ecoinf1.cpp", - MAME_DIR .. "src/mame/drivers/ecoinf2.cpp", - MAME_DIR .. "src/mame/drivers/ecoinf3.cpp", - MAME_DIR .. "src/mame/includes/efdt.h", - MAME_DIR .. "src/mame/drivers/efdt.cpp", - MAME_DIR .. "src/mame/drivers/efg8080.cpp", - MAME_DIR .. "src/mame/drivers/electra.cpp", - MAME_DIR .. "src/mame/drivers/epos.cpp", - MAME_DIR .. "src/mame/drivers/esd16.cpp", - MAME_DIR .. "src/mame/includes/esd16.h", - MAME_DIR .. "src/mame/video/esd16.cpp", - MAME_DIR .. "src/mame/drivers/esh.cpp", - MAME_DIR .. "src/mame/drivers/esripsys.cpp", - MAME_DIR .. "src/mame/includes/esripsys.h", - MAME_DIR .. "src/mame/video/esripsys.cpp", - MAME_DIR .. "src/mame/drivers/ettrivia.cpp", - MAME_DIR .. "src/mame/drivers/extrema.cpp", - MAME_DIR .. "src/mame/drivers/ez2d.cpp", - MAME_DIR .. "src/mame/drivers/falgas_m89.cpp", - MAME_DIR .. "src/mame/drivers/fastinvaders.cpp", - MAME_DIR .. "src/mame/drivers/fireball.cpp", - MAME_DIR .. "src/mame/drivers/flipjack.cpp", - MAME_DIR .. "src/mame/drivers/flower.cpp", - MAME_DIR .. "src/mame/audio/flower.h", - MAME_DIR .. "src/mame/audio/flower.cpp", - MAME_DIR .. "src/mame/drivers/fortecar.cpp", - MAME_DIR .. "src/mame/drivers/fresh.cpp", - MAME_DIR .. "src/mame/drivers/freekick.cpp", - MAME_DIR .. "src/mame/includes/freekick.h", - MAME_DIR .. "src/mame/video/freekick.cpp", - MAME_DIR .. "src/mame/drivers/freeway.cpp", - MAME_DIR .. "src/mame/drivers/frenzyxprss.cpp", - MAME_DIR .. "src/mame/drivers/funeball.cpp", - MAME_DIR .. "src/mame/drivers/fungames.cpp", - MAME_DIR .. "src/mame/drivers/funkball.cpp", - MAME_DIR .. "src/mame/drivers/gambl186.cpp", - MAME_DIR .. "src/mame/drivers/galaxi.cpp", - MAME_DIR .. "src/mame/drivers/galgame.cpp", - MAME_DIR .. "src/mame/drivers/gamemasters.cpp", - MAME_DIR .. "src/mame/drivers/gammagic.cpp", - MAME_DIR .. "src/mame/drivers/gamtor.cpp", - MAME_DIR .. "src/mame/drivers/gei.cpp", - MAME_DIR .. "src/mame/drivers/gfamily.cpp", - MAME_DIR .. "src/mame/drivers/globalfr.cpp", - MAME_DIR .. "src/mame/drivers/globalvr.cpp", - MAME_DIR .. "src/mame/drivers/gluck2.cpp", - MAME_DIR .. "src/mame/drivers/goldngam.cpp", - MAME_DIR .. "src/mame/drivers/goldnpkr.cpp", - MAME_DIR .. "src/mame/drivers/good.cpp", - MAME_DIR .. "src/mame/drivers/gotcha.cpp", - MAME_DIR .. "src/mame/includes/gotcha.h", - MAME_DIR .. "src/mame/video/gotcha.cpp", - MAME_DIR .. "src/mame/drivers/gsspade.cpp", - MAME_DIR .. "src/mame/drivers/gumbo.cpp", - MAME_DIR .. "src/mame/includes/gumbo.h", - MAME_DIR .. "src/mame/video/gumbo.cpp", - MAME_DIR .. "src/mame/drivers/gunpey.cpp", - MAME_DIR .. "src/mame/drivers/hapyfish.cpp", - MAME_DIR .. "src/mame/drivers/hideseek.cpp", - MAME_DIR .. "src/mame/drivers/hazelgr.cpp", - MAME_DIR .. "src/mame/drivers/highvdeo.cpp", - MAME_DIR .. "src/mame/drivers/hitpoker.cpp", - MAME_DIR .. "src/mame/drivers/hobbyplay.cpp", - MAME_DIR .. "src/mame/drivers/homedata.cpp", - MAME_DIR .. "src/mame/includes/homedata.h", - MAME_DIR .. "src/mame/video/homedata.cpp", - MAME_DIR .. "src/mame/drivers/hotblock.cpp", - MAME_DIR .. "src/mame/drivers/hotchili.cpp", - MAME_DIR .. "src/mame/drivers/hotstuff.cpp", - MAME_DIR .. "src/mame/drivers/houseball.cpp", - MAME_DIR .. "src/mame/drivers/imolagp.cpp", - MAME_DIR .. "src/mame/drivers/intrscti.cpp", - MAME_DIR .. "src/mame/drivers/island.cpp", - MAME_DIR .. "src/mame/drivers/istellar.cpp", - MAME_DIR .. "src/mame/drivers/itgambl2.cpp", - MAME_DIR .. "src/mame/drivers/itgambl3.cpp", - MAME_DIR .. "src/mame/drivers/itgamble.cpp", - MAME_DIR .. "src/mame/drivers/jackpool.cpp", - MAME_DIR .. "src/mame/drivers/jackpot.cpp", - MAME_DIR .. "src/mame/drivers/jankenmn.cpp", - MAME_DIR .. "src/mame/drivers/jokrwild.cpp", - MAME_DIR .. "src/mame/drivers/joystand.cpp", - MAME_DIR .. "src/mame/drivers/jubilee.cpp", - MAME_DIR .. "src/mame/drivers/jungleyo.cpp", - MAME_DIR .. "src/mame/drivers/kas89.cpp", - MAME_DIR .. "src/mame/drivers/kingpin.cpp", - MAME_DIR .. "src/mame/drivers/krokha.cpp", - MAME_DIR .. "src/mame/drivers/kurukuru.cpp", - MAME_DIR .. "src/mame/drivers/kyugo.cpp", - MAME_DIR .. "src/mame/includes/kyugo.h", - MAME_DIR .. "src/mame/video/kyugo.cpp", - MAME_DIR .. "src/mame/drivers/ladyfrog.cpp", - MAME_DIR .. "src/mame/includes/ladyfrog.h", - MAME_DIR .. "src/mame/video/ladyfrog.cpp", - MAME_DIR .. "src/mame/drivers/laserbas.cpp", - MAME_DIR .. "src/mame/drivers/laz_aftrshok.cpp", - MAME_DIR .. "src/mame/drivers/laz_ribrac.cpp", - MAME_DIR .. "src/mame/drivers/lependu.cpp", - MAME_DIR .. "src/mame/drivers/lethalj.cpp", - MAME_DIR .. "src/mame/includes/lethalj.h", - MAME_DIR .. "src/mame/video/lethalj.cpp", - MAME_DIR .. "src/mame/drivers/limenko.cpp", - MAME_DIR .. "src/mame/drivers/ltcasino.cpp", - MAME_DIR .. "src/mame/drivers/luckybal.cpp", - MAME_DIR .. "src/mame/drivers/magic10.cpp", - MAME_DIR .. "src/mame/drivers/magicard.cpp", - MAME_DIR .. "src/mame/drivers/magicfly.cpp", - MAME_DIR .. "src/mame/drivers/magictg.cpp", - MAME_DIR .. "src/mame/drivers/magreel.cpp", - MAME_DIR .. "src/mame/drivers/magtouch.cpp", - MAME_DIR .. "src/mame/drivers/majorpkr.cpp", - MAME_DIR .. "src/mame/drivers/malzak.cpp", - MAME_DIR .. "src/mame/includes/malzak.h", - MAME_DIR .. "src/mame/video/malzak.cpp", - MAME_DIR .. "src/mame/drivers/marywu.cpp", - MAME_DIR .. "src/mame/drivers/matrix.cpp", - MAME_DIR .. "src/mame/drivers/mcatadv.cpp", - MAME_DIR .. "src/mame/includes/mcatadv.h", - MAME_DIR .. "src/mame/video/mcatadv.cpp", - MAME_DIR .. "src/mame/drivers/mgavegas.cpp", - MAME_DIR .. "src/mame/drivers/meyc8080.cpp", - MAME_DIR .. "src/mame/drivers/meyc8088.cpp", - MAME_DIR .. "src/mame/drivers/micro3d.cpp", - MAME_DIR .. "src/mame/includes/micro3d.h", - MAME_DIR .. "src/mame/machine/micro3d.cpp", - MAME_DIR .. "src/mame/video/micro3d.cpp", - MAME_DIR .. "src/mame/audio/micro3d.cpp", - MAME_DIR .. "src/mame/audio/micro3d.h", - MAME_DIR .. "src/mame/drivers/microdar.cpp", - MAME_DIR .. "src/mame/drivers/mil4000.cpp", - MAME_DIR .. "src/mame/drivers/miniboy7.cpp", - MAME_DIR .. "src/mame/drivers/minivideo.cpp", - MAME_DIR .. "src/mame/drivers/mirax.cpp", - MAME_DIR .. "src/mame/drivers/mjsenpu.cpp", - MAME_DIR .. "src/mame/drivers/mole.cpp", - MAME_DIR .. "src/mame/drivers/mosaic.cpp", - MAME_DIR .. "src/mame/includes/mosaic.h", - MAME_DIR .. "src/mame/video/mosaic.cpp", - MAME_DIR .. "src/mame/drivers/mpu12wbk.cpp", - MAME_DIR .. "src/mame/drivers/multfish.cpp", - MAME_DIR .. "src/mame/includes/multfish.h", - MAME_DIR .. "src/mame/drivers/multfish_boot.cpp", - MAME_DIR .. "src/mame/drivers/murogem.cpp", - MAME_DIR .. "src/mame/drivers/murogmbl.cpp", - MAME_DIR .. "src/mame/drivers/neomania.cpp", - MAME_DIR .. "src/mame/drivers/neoprint.cpp", - MAME_DIR .. "src/mame/drivers/news.cpp", - MAME_DIR .. "src/mame/includes/news.h", - MAME_DIR .. "src/mame/video/news.cpp", - MAME_DIR .. "src/mame/drivers/nexus3d.cpp", - MAME_DIR .. "src/mame/drivers/nibble.cpp", - MAME_DIR .. "src/mame/drivers/norautp.cpp", - MAME_DIR .. "src/mame/includes/norautp.h", - MAME_DIR .. "src/mame/audio/norautp.cpp", - MAME_DIR .. "src/mame/drivers/notechan.cpp", - MAME_DIR .. "src/mame/drivers/nsg6809.cpp", - MAME_DIR .. "src/mame/drivers/nsmpoker.cpp", - MAME_DIR .. "src/mame/drivers/odyssey.cpp", - MAME_DIR .. "src/mame/drivers/oneshot.cpp", - MAME_DIR .. "src/mame/includes/oneshot.h", - MAME_DIR .. "src/mame/video/oneshot.cpp", - MAME_DIR .. "src/mame/drivers/onetwo.cpp", - MAME_DIR .. "src/mame/drivers/opercoin.cpp", - MAME_DIR .. "src/mame/drivers/othello.cpp", - MAME_DIR .. "src/mame/drivers/pachifev.cpp", - MAME_DIR .. "src/mame/drivers/pasha2.cpp", - MAME_DIR .. "src/mame/drivers/pass.cpp", - MAME_DIR .. "src/mame/includes/pass.h", - MAME_DIR .. "src/mame/video/pass.cpp", - MAME_DIR .. "src/mame/drivers/photon.cpp", - MAME_DIR .. "src/mame/drivers/piggypas.cpp", - MAME_DIR .. "src/mame/drivers/photon2.cpp", - MAME_DIR .. "src/mame/drivers/pipeline.cpp", - MAME_DIR .. "src/mame/drivers/pkscram.cpp", - MAME_DIR .. "src/mame/drivers/playcenter.cpp", - MAME_DIR .. "src/mame/drivers/plsonic4.cpp", - MAME_DIR .. "src/mame/drivers/pmc.cpp", - MAME_DIR .. "src/mame/drivers/pntnpuzl.cpp", - MAME_DIR .. "src/mame/drivers/policetr.cpp", - MAME_DIR .. "src/mame/includes/policetr.h", - MAME_DIR .. "src/mame/video/policetr.cpp", - MAME_DIR .. "src/mame/drivers/polyplay.cpp", - MAME_DIR .. "src/mame/includes/polyplay.h", - MAME_DIR .. "src/mame/audio/polyplay.cpp", - MAME_DIR .. "src/mame/video/polyplay.cpp", - MAME_DIR .. "src/mame/drivers/poker72.cpp", - MAME_DIR .. "src/mame/drivers/pokerout.cpp", - MAME_DIR .. "src/mame/drivers/potgoldu.cpp", - MAME_DIR .. "src/mame/drivers/proconn.cpp", - MAME_DIR .. "src/mame/drivers/pse.cpp", - MAME_DIR .. "src/mame/drivers/quizo.cpp", - MAME_DIR .. "src/mame/drivers/quizpun2.cpp", - MAME_DIR .. "src/mame/drivers/radikaldarts.cpp", - MAME_DIR .. "src/mame/drivers/rawthrillspc.cpp", - MAME_DIR .. "src/mame/drivers/rbmk.cpp", - MAME_DIR .. "src/mame/drivers/rcorsair.cpp", - MAME_DIR .. "src/mame/drivers/re900.cpp", - MAME_DIR .. "src/mame/drivers/rf51w14cg.cpp", - MAME_DIR .. "src/mame/drivers/rfslots8085.cpp", - MAME_DIR .. "src/mame/drivers/rfslotsmcs48.cpp", - MAME_DIR .. "src/mame/drivers/rfslotspcpent.cpp", - MAME_DIR .. "src/mame/drivers/rgum.cpp", - MAME_DIR .. "src/mame/drivers/roul.cpp", - MAME_DIR .. "src/mame/drivers/rulechan.cpp", - MAME_DIR .. "src/mame/drivers/savquest.cpp", - MAME_DIR .. "src/mame/drivers/sanremo.cpp", - MAME_DIR .. "src/mame/drivers/sanremmg.cpp", - MAME_DIR .. "src/mame/drivers/schexx4gen.cpp", - MAME_DIR .. "src/mame/drivers/scm_500.cpp", - MAME_DIR .. "src/mame/drivers/sealy.cpp", - MAME_DIR .. "src/mame/drivers/sealy_fr.cpp", - MAME_DIR .. "src/mame/drivers/sfbonus.cpp", - MAME_DIR .. "src/mame/drivers/shangkid.cpp", - MAME_DIR .. "src/mame/includes/shangkid.h", - MAME_DIR .. "src/mame/video/shangkid.cpp", - MAME_DIR .. "src/mame/drivers/silverball.cpp", - MAME_DIR .. "src/mame/drivers/skeetsht.cpp", - MAME_DIR .. "src/mame/drivers/skimaxx.cpp", - MAME_DIR .. "src/mame/drivers/skopro.cpp", - MAME_DIR .. "src/mame/drivers/skyarmy.cpp", - MAME_DIR .. "src/mame/drivers/skylncr.cpp", - MAME_DIR .. "src/mame/drivers/sliver.cpp", - MAME_DIR .. "src/mame/drivers/smotor.cpp", - MAME_DIR .. "src/mame/drivers/smsmcorp.cpp", - MAME_DIR .. "src/mame/drivers/sothello.cpp", - MAME_DIR .. "src/mame/drivers/special_gambl.cpp", - MAME_DIR .. "src/mame/audio/special.cpp", - MAME_DIR .. "src/mame/audio/special.h", - MAME_DIR .. "src/mame/drivers/spdamjes.cpp", - MAME_DIR .. "src/mame/drivers/spool99.cpp", - MAME_DIR .. "src/mame/drivers/sprcros2.cpp", - MAME_DIR .. "src/mame/drivers/ssingles.cpp", - MAME_DIR .. "src/mame/drivers/sstrangr.cpp", - MAME_DIR .. "src/mame/drivers/startouch.cpp", - MAME_DIR .. "src/mame/drivers/statriv2.cpp", - MAME_DIR .. "src/mame/drivers/stop.cpp", - MAME_DIR .. "src/mame/drivers/strkzn.cpp", - MAME_DIR .. "src/mame/drivers/stuntair.cpp", - MAME_DIR .. "src/mame/drivers/su2000.cpp", - MAME_DIR .. "src/mame/drivers/summit.cpp", - MAME_DIR .. "src/mame/drivers/sumt8035.cpp", - MAME_DIR .. "src/mame/drivers/supercrd.cpp", - MAME_DIR .. "src/mame/drivers/superga2.cpp", - MAME_DIR .. "src/mame/drivers/supertnk.cpp", - MAME_DIR .. "src/mame/drivers/tapatune.cpp", - MAME_DIR .. "src/mame/drivers/tattack.cpp", - MAME_DIR .. "src/mame/drivers/taxidriv.cpp", - MAME_DIR .. "src/mame/drivers/teamjocs.cpp", - MAME_DIR .. "src/mame/drivers/tecnodar.cpp", - MAME_DIR .. "src/mame/drivers/thayers.cpp", - MAME_DIR .. "src/mame/drivers/tickee.cpp", - MAME_DIR .. "src/mame/drivers/tmspoker.cpp", - MAME_DIR .. "src/mame/drivers/tomsadvs.cpp", - MAME_DIR .. "src/mame/drivers/triviaquiz.cpp", - MAME_DIR .. "src/mame/drivers/truco.cpp", - MAME_DIR .. "src/mame/includes/truco.h", - MAME_DIR .. "src/mame/video/truco.cpp", - MAME_DIR .. "src/mame/drivers/trucocl.cpp", - MAME_DIR .. "src/mame/includes/trucocl.h", - MAME_DIR .. "src/mame/video/trucocl.cpp", - MAME_DIR .. "src/mame/drivers/truesys.cpp", - MAME_DIR .. "src/mame/drivers/trvmadns.cpp", - MAME_DIR .. "src/mame/drivers/ttchamp.cpp", - MAME_DIR .. "src/mame/drivers/tugboat.cpp", - MAME_DIR .. "src/mame/drivers/tvg01.cpp", - MAME_DIR .. "src/mame/drivers/twinbskt.cpp", - MAME_DIR .. "src/mame/drivers/ice_bozopail.cpp", - MAME_DIR .. "src/mame/drivers/ice_hhhippos.cpp", - MAME_DIR .. "src/mame/drivers/ice_tbd.cpp", - MAME_DIR .. "src/mame/drivers/umipoker.cpp", - MAME_DIR .. "src/mame/drivers/unkhorse.cpp", - MAME_DIR .. "src/mame/drivers/unkpoker.cpp", - MAME_DIR .. "src/mame/drivers/usbilliards.cpp", - MAME_DIR .. "src/mame/drivers/usgames.cpp", - MAME_DIR .. "src/mame/drivers/vamphalf.cpp", - MAME_DIR .. "src/mame/drivers/vcombat.cpp", - MAME_DIR .. "src/mame/drivers/vectrex.cpp", - MAME_DIR .. "src/mame/includes/vectrex.h", - MAME_DIR .. "src/mame/video/vectrex.cpp", - MAME_DIR .. "src/mame/machine/vectrex.cpp", - MAME_DIR .. "src/mame/drivers/video21.cpp", - MAME_DIR .. "src/mame/drivers/videosaa.cpp", - MAME_DIR .. "src/mame/drivers/vlc.cpp", - MAME_DIR .. "src/mame/drivers/vlc34010.cpp", - MAME_DIR .. "src/mame/drivers/voyager.cpp", - MAME_DIR .. "src/mame/drivers/vp101.cpp", - MAME_DIR .. "src/mame/drivers/vpoker.cpp", - MAME_DIR .. "src/mame/drivers/vroulet.cpp", - MAME_DIR .. "src/mame/drivers/wildpkr.cpp", - MAME_DIR .. "src/mame/drivers/winbingo.cpp", - MAME_DIR .. "src/mame/drivers/wms.cpp", - MAME_DIR .. "src/mame/drivers/xtom3d.cpp", - MAME_DIR .. "src/mame/drivers/xyonix.cpp", - MAME_DIR .. "src/mame/drivers/yuvomz80.cpp", -} -end diff --git a/scripts/target/mame/ci.lua b/scripts/target/mame/ci.lua index fef3d0deddc..563a7abe808 100644 --- a/scripts/target/mame/ci.lua +++ b/scripts/target/mame/ci.lua @@ -111,7 +111,7 @@ function createProjects_mame_ci(_target, _subtarget) MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", MAME_DIR .. "src/devices", - MAME_DIR .. "src/mame", + MAME_DIR .. "src/mame/shared", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", @@ -119,67 +119,67 @@ function createProjects_mame_ci(_target, _subtarget) } files{ - MAME_DIR .. "src/mame/audio/nl_carpolo.cpp", - MAME_DIR .. "src/mame/audio/nl_carpolo.h", - MAME_DIR .. "src/mame/drivers/carpolo.cpp", - MAME_DIR .. "src/mame/includes/carpolo.h", - MAME_DIR .. "src/mame/machine/carpolo.cpp", - MAME_DIR .. "src/mame/video/carpolo.cpp", - MAME_DIR .. "src/mame/drivers/circus.cpp", - MAME_DIR .. "src/mame/includes/circus.h", - MAME_DIR .. "src/mame/audio/circus.cpp", - MAME_DIR .. "src/mame/video/circus.cpp", - MAME_DIR .. "src/mame/drivers/exidy.cpp", - MAME_DIR .. "src/mame/audio/exidy.cpp", - MAME_DIR .. "src/mame/audio/exidy.h", - MAME_DIR .. "src/mame/audio/exidy440.cpp", - MAME_DIR .. "src/mame/audio/exidy440.h", - MAME_DIR .. "src/mame/drivers/starfire.cpp", - MAME_DIR .. "src/mame/audio/nl_fireone.cpp", - MAME_DIR .. "src/mame/audio/nl_fireone.h", - MAME_DIR .. "src/mame/audio/nl_starfire.cpp", - MAME_DIR .. "src/mame/audio/nl_starfire.h", - MAME_DIR .. "src/mame/includes/starfire.h", - MAME_DIR .. "src/mame/video/starfire.cpp", - MAME_DIR .. "src/mame/drivers/vertigo.cpp", - MAME_DIR .. "src/mame/includes/vertigo.h", - MAME_DIR .. "src/mame/machine/vertigo.cpp", - MAME_DIR .. "src/mame/video/vertigo.cpp", - MAME_DIR .. "src/mame/drivers/victory.cpp", - MAME_DIR .. "src/mame/includes/victory.h", - MAME_DIR .. "src/mame/video/victory.cpp", - MAME_DIR .. "src/mame/drivers/astrocde.cpp", - MAME_DIR .. "src/mame/includes/astrocde.h", - MAME_DIR .. "src/mame/video/astrocde.cpp", - MAME_DIR .. "src/mame/drivers/gridlee.cpp", - MAME_DIR .. "src/mame/includes/gridlee.h", - MAME_DIR .. "src/mame/audio/gridlee.cpp", - MAME_DIR .. "src/mame/video/gridlee.cpp", - MAME_DIR .. "src/mame/drivers/williams.cpp", - MAME_DIR .. "src/mame/includes/williams.h", - MAME_DIR .. "src/mame/machine/williams.cpp", - MAME_DIR .. "src/mame/audio/williams.cpp", - MAME_DIR .. "src/mame/audio/williams.h", - MAME_DIR .. "src/mame/video/williams.cpp", - MAME_DIR .. "src/mame/audio/s11c_bg.cpp", - MAME_DIR .. "src/mame/audio/s11c_bg.h", - MAME_DIR .. "src/mame/drivers/gaelco.cpp", - MAME_DIR .. "src/mame/includes/gaelco.h", - MAME_DIR .. "src/mame/video/gaelco.cpp", - MAME_DIR .. "src/mame/machine/gaelcrpt.cpp", - MAME_DIR .. "src/mame/drivers/wrally.cpp", - MAME_DIR .. "src/mame/includes/wrally.h", - MAME_DIR .. "src/mame/video/wrally.cpp", - MAME_DIR .. "src/mame/video/gaelco_wrally_sprites.cpp", - MAME_DIR .. "src/mame/video/gaelco_wrally_sprites.h", - MAME_DIR .. "src/mame/machine/gaelco_ds5002fp.cpp", - MAME_DIR .. "src/mame/machine/gaelco_ds5002fp.h", - MAME_DIR .. "src/mame/drivers/looping.cpp", - MAME_DIR .. "src/mame/drivers/supertnk.cpp", - MAME_DIR .. "src/mame/drivers/kinst.cpp", - MAME_DIR .. "src/mame/audio/dcs.cpp", - MAME_DIR .. "src/mame/audio/dcs.h", - MAME_DIR .. "src/mame/drivers/akkaarrh.cpp", + MAME_DIR .. "src/mame/exidy/nl_carpolo.cpp", + MAME_DIR .. "src/mame/exidy/nl_carpolo.h", + MAME_DIR .. "src/mame/exidy/carpolo.cpp", + MAME_DIR .. "src/mame/exidy/carpolo.h", + MAME_DIR .. "src/mame/exidy/carpolo_m.cpp", + MAME_DIR .. "src/mame/exidy/carpolo_v.cpp", + MAME_DIR .. "src/mame/exidy/circus.cpp", + MAME_DIR .. "src/mame/exidy/circus.h", + MAME_DIR .. "src/mame/exidy/circus_a.cpp", + MAME_DIR .. "src/mame/exidy/circus_v.cpp", + MAME_DIR .. "src/mame/exidy/exidy.cpp", + MAME_DIR .. "src/mame/shared/exidysound.cpp", + MAME_DIR .. "src/mame/shared/exidysound.h", + MAME_DIR .. "src/mame/exidy/exidy440_a.cpp", + MAME_DIR .. "src/mame/exidy/exidy440_a.h", + MAME_DIR .. "src/mame/exidy/starfire.cpp", + MAME_DIR .. "src/mame/exidy/nl_fireone.cpp", + MAME_DIR .. "src/mame/exidy/nl_fireone.h", + MAME_DIR .. "src/mame/exidy/nl_starfire.cpp", + MAME_DIR .. "src/mame/exidy/nl_starfire.h", + MAME_DIR .. "src/mame/exidy/starfire.h", + MAME_DIR .. "src/mame/exidy/starfire_v.cpp", + MAME_DIR .. "src/mame/exidy/vertigo.cpp", + MAME_DIR .. "src/mame/exidy/vertigo.h", + MAME_DIR .. "src/mame/exidy/vertigo_m.cpp", + MAME_DIR .. "src/mame/exidy/vertigo_v.cpp", + MAME_DIR .. "src/mame/exidy/victory.cpp", + MAME_DIR .. "src/mame/exidy/victory.h", + MAME_DIR .. "src/mame/exidy/victory_v.cpp", + MAME_DIR .. "src/mame/midway/astrocde.cpp", + MAME_DIR .. "src/mame/midway/astrocde.h", + MAME_DIR .. "src/mame/midway/astrocde_v.cpp", + MAME_DIR .. "src/mame/midway/gridlee.cpp", + MAME_DIR .. "src/mame/midway/gridlee.h", + MAME_DIR .. "src/mame/midway/gridlee_a.cpp", + MAME_DIR .. "src/mame/midway/gridlee_v.cpp", + MAME_DIR .. "src/mame/midway/williams.cpp", + MAME_DIR .. "src/mame/midway/williams.h", + MAME_DIR .. "src/mame/midway/williams_m.cpp", + MAME_DIR .. "src/mame/shared/williamssound.cpp", + MAME_DIR .. "src/mame/shared/williamssound.h", + MAME_DIR .. "src/mame/midway/williams_v.cpp", + MAME_DIR .. "src/mame/shared/s11c_bg.cpp", + MAME_DIR .. "src/mame/shared/s11c_bg.h", + MAME_DIR .. "src/mame/gaelco/gaelco.cpp", + MAME_DIR .. "src/mame/gaelco/gaelco.h", + MAME_DIR .. "src/mame/gaelco/gaelco_v.cpp", + MAME_DIR .. "src/mame/gaelco/gaelcrpt.cpp", + MAME_DIR .. "src/mame/gaelco/wrally.cpp", + MAME_DIR .. "src/mame/gaelco/wrally.h", + MAME_DIR .. "src/mame/gaelco/wrally_v.cpp", + MAME_DIR .. "src/mame/gaelco/gaelco_wrally_sprites.cpp", + MAME_DIR .. "src/mame/gaelco/gaelco_wrally_sprites.h", + MAME_DIR .. "src/mame/gaelco/gaelco_ds5002fp.cpp", + MAME_DIR .. "src/mame/gaelco/gaelco_ds5002fp.h", + MAME_DIR .. "src/mame/venture/looping.cpp", + MAME_DIR .. "src/mame/misc/supertnk.cpp", + MAME_DIR .. "src/mame/rare/kinst.cpp", + MAME_DIR .. "src/mame/shared/dcs.cpp", + MAME_DIR .. "src/mame/shared/dcs.h", + MAME_DIR .. "src/mame/atari/akkaarrh.cpp", } end diff --git a/scripts/target/mame/dummy.lua b/scripts/target/mame/dummy.lua index b939c1eb0ad..80864455873 100644 --- a/scripts/target/mame/dummy.lua +++ b/scripts/target/mame/dummy.lua @@ -24,7 +24,7 @@ function createProjects_mame_dummy(_target, _subtarget) MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", MAME_DIR .. "src/devices", - MAME_DIR .. "src/mame", + MAME_DIR .. "src/mame/shared", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", @@ -32,10 +32,10 @@ function createProjects_mame_dummy(_target, _subtarget) } files{ - MAME_DIR .. "src/mame/drivers/coleco.cpp", - MAME_DIR .. "src/mame/includes/coleco.h", - MAME_DIR .. "src/mame/machine/coleco.cpp", - MAME_DIR .. "src/mame/machine/coleco.h", + MAME_DIR .. "src/mame/coleco/coleco.cpp", + MAME_DIR .. "src/mame/coleco/coleco.h", + MAME_DIR .. "src/mame/coleco/coleco_m.cpp", + MAME_DIR .. "src/mame/coleco/coleco_m.h", } end diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua index b7360486042..ee740f62de6 100644 --- a/scripts/target/mame/mame.lua +++ b/scripts/target/mame/mame.lua @@ -9,15 +9,3704 @@ -- --------------------------------------------------------------------------- -dofile("arcade.lua") -dofile("mess.lua") +-------------------------------------------------- +-- specify available CPU cores +--------------------------------------------------- -function createProjects_mame_mame(_target, _subtarget) - createProjects_mame_arcade(_target, _subtarget) - createProjects_mame_mess(_target, _subtarget) -end +CPUS["8X300"] = true +CPUS["ADSP21062"] = true +CPUS["ADSP21XX"] = true +CPUS["ALPHA"] = true +CPUS["ALTO2"] = true +CPUS["AM29000"] = true +CPUS["AMIS2000"] = true +CPUS["APEXC"] = true +CPUS["ARC"] = true +CPUS["ARCOMPACT"] = true +CPUS["ARM"] = true +CPUS["ARM7"] = true +CPUS["ASAP"] = true +CPUS["AVR8"] = true +CPUS["BCP"] = true +CPUS["CAPRICORN"] = true +CPUS["CCPU"] = true +CPUS["CLIPPER"] = true +CPUS["COP400"] = true +CPUS["COPS1"] = true +CPUS["COSMAC"] = true +CPUS["CP1610"] = true +CPUS["CR16B"] = true +CPUS["CUBEQCPU"] = true +CPUS["DIABLO"] = true +CPUS["DSP16"] = true +CPUS["DSP32C"] = true +CPUS["DSP56000"] = true +CPUS["DSP56156"] = true +CPUS["DSPP"] = true +CPUS["DSPV"] = true +CPUS["E0C6200"] = true +CPUS["E1"] = true +CPUS["ES5510"] = true +CPUS["ESRIP"] = true +CPUS["F2MC16"] = true +CPUS["F8"] = true +CPUS["FR"] = true +CPUS["G65816"] = true +CPUS["GTRON"] = true +CPUS["H16"] = true +CPUS["H6280"] = true +CPUS["H8"] = true +CPUS["H8500"] = true +CPUS["HCD62121"] = true +CPUS["HD61700"] = true +CPUS["HD6309"] = true +CPUS["HMCS40"] = true +CPUS["HPC"] = true +CPUS["HPHYBRID"] = true +CPUS["I386"] = true +CPUS["I8008"] = true +CPUS["I8085"] = true +CPUS["I8089"] = true +CPUS["I86"] = true +CPUS["I860"] = true +CPUS["I960"] = true +CPUS["IE15"] = true +CPUS["JAGUAR"] = true +CPUS["KC80"] = true +CPUS["KONAMI"] = true +CPUS["KS0164"] = true +CPUS["LC8670"] = true +CPUS["LH5801"] = true +CPUS["LR35902"] = true +CPUS["M37710"] = true +CPUS["M6502"] = true +CPUS["M6800"] = true +CPUS["M6805"] = true +CPUS["M6809"] = true +CPUS["M680X0"] = true +CPUS["M68HC16"] = true +CPUS["M88000"] = true +CPUS["MB86233"] = true +CPUS["MB86235"] = true +CPUS["MB88XX"] = true +CPUS["MC68HC11"] = true +CPUS["MCS40"] = true +CPUS["MCS48"] = true +CPUS["MCS51"] = true +CPUS["MCS96"] = true +CPUS["MEG"] = true +CPUS["MELPS4"] = true +CPUS["MINX"] = true +CPUS["MIPS1"] = true +CPUS["MIPS3"] = true +CPUS["MK1"] = true +CPUS["MN10200"] = true +CPUS["MN1880"] = true +CPUS["NANOPROCESSOR"] = true +CPUS["NEC"] = true +CPUS["NS32000"] = true +CPUS["PACE"] = true +CPUS["PATINHOFEIO"] = true +CPUS["PDP1"] = true +CPUS["PDP8"] = true +CPUS["PIC16C5X"] = true +CPUS["PIC16C62X"] = true +CPUS["PIC17"] = true +CPUS["POWERPC"] = true +CPUS["PPS4"] = true +CPUS["PPS41"] = true +CPUS["PSX"] = true +CPUS["RII"] = true +CPUS["ROMP"] = true +CPUS["RSP"] = true +CPUS["RW5000"] = true +CPUS["RX01"] = true +CPUS["S2650"] = true +CPUS["SATURN"] = true +CPUS["SC61860"] = true +CPUS["SCMP"] = true +CPUS["SCORE"] = true +CPUS["SCUDSP"] = true +CPUS["SE3208"] = true +CPUS["SH"] = true +CPUS["SM510"] = true +CPUS["SM8500"] = true +CPUS["SPARC"] = true +CPUS["SPC700"] = true +CPUS["SSEM"] = true +CPUS["SSP1601"] = true +CPUS["ST2XXX"] = true +CPUS["ST62XX"] = true +CPUS["SUPERFX"] = true +CPUS["T11"] = true +CPUS["TLCS870"] = true +CPUS["TLCS90"] = true +CPUS["TLCS900"] = true +CPUS["TMS1000"] = true +CPUS["TMS32010"] = true +CPUS["TMS32025"] = true +CPUS["TMS32031"] = true +CPUS["TMS32051"] = true +CPUS["TMS32082"] = true +CPUS["TMS340X0"] = true +CPUS["TMS57002"] = true +CPUS["TMS7000"] = true +CPUS["TMS9900"] = true +CPUS["TMS9900L"] = true +CPUS["TMS9995"] = true +CPUS["TX0"] = true +CPUS["UCOM4"] = true +CPUS["UNSP"] = true +CPUS["UPD7725"] = true +CPUS["UPD7810"] = true +CPUS["UPD78K"] = true +CPUS["V30MZ"] = true +CPUS["V60"] = true +CPUS["V810"] = true +CPUS["VT50"] = true +CPUS["VT61"] = true +--CPUS["W65816"] = true +CPUS["WE32000"] = true +CPUS["XAVIX"] = true +CPUS["XAVIX2"] = true +CPUS["XAVIX2000"] = true +CPUS["Z180"] = true +CPUS["Z8"] = true +CPUS["Z80"] = true +CPUS["Z8000"] = true +CPUS["Z8001"] = true + +-------------------------------------------------- +-- specify available sound cores +-------------------------------------------------- + +SOUNDS["AC97"] = true +SOUNDS["AD1848"] = true +SOUNDS["ADPCM"] = true +SOUNDS["AICA"] = true +SOUNDS["ASC"] = true +SOUNDS["ASTROCADE"] = true +SOUNDS["AWACS"] = true +SOUNDS["AY8910"] = true +SOUNDS["BEEP"] = true +SOUNDS["BSMT2000"] = true +SOUNDS["C140"] = true +SOUNDS["C352"] = true +SOUNDS["C6280"] = true +SOUNDS["CD2801"] = true +SOUNDS["CD2802"] = true +SOUNDS["CDDA"] = true +SOUNDS["CDP1863"] = true +SOUNDS["CDP1864"] = true +SOUNDS["CDP1869"] = true +SOUNDS["CEM3394"] = true +SOUNDS["DAC"] = true +SOUNDS["DAC76"] = true +SOUNDS["DAVE"] = true +SOUNDS["DIGITALKER"] = true +SOUNDS["DISCRETE"] = true +SOUNDS["DMADAC"] = true +SOUNDS["ES1373"] = true +SOUNDS["ES5503"] = true +SOUNDS["ES5505"] = true +SOUNDS["ES5506"] = true +SOUNDS["ES8712"] = true +SOUNDS["ESQPUMP"] = true +SOUNDS["GAELCO_CG1V"] = true +SOUNDS["GAELCO_GAE1"] = true +SOUNDS["GB_SOUND"] = true +SOUNDS["HC55516"] = true +SOUNDS["HUC6230"] = true +SOUNDS["I5000_SND"] = true +SOUNDS["ICS2115"] = true +SOUNDS["IOPSPU"] = true +SOUNDS["IREMGA20"] = true +SOUNDS["K005289"] = true +SOUNDS["K007232"] = true +SOUNDS["K051649"] = true +SOUNDS["K053260"] = true +SOUNDS["K054539"] = true +SOUNDS["K056800"] = true +SOUNDS["KS0164"] = true +SOUNDS["L7A1045"] = true +SOUNDS["LC7535"] = true +SOUNDS["LMC1992"] = true +SOUNDS["LYNX"] = true +SOUNDS["M58817"] = true +SOUNDS["MAS3507D"] = true +SOUNDS["MEA8000"] = true +SOUNDS["MM5837"] = true +SOUNDS["MOS656X"] = true +SOUNDS["MOS7360"] = true +SOUNDS["MPEG_AUDIO"] = true +SOUNDS["MSM5205"] = true +SOUNDS["MSM5232"] = true +SOUNDS["MULTIPCM"] = true +SOUNDS["NAMCO"] = true +SOUNDS["NAMCO_15XX"] = true +SOUNDS["NAMCO_163"] = true +SOUNDS["NAMCO_52XX"] = true +SOUNDS["NAMCO_63701X"] = true +SOUNDS["NAMCO_CUS30"] = true +SOUNDS["NES_APU"] = true +SOUNDS["OKIM6258"] = true +SOUNDS["OKIM6295"] = true +SOUNDS["OKIM6376"] = true +SOUNDS["OKIM9810"] = true +SOUNDS["PAULA_8364"] = true +SOUNDS["PCD3311"] = true +SOUNDS["POKEY"] = true +SOUNDS["QS1000"] = true +SOUNDS["QSOUND"] = true +SOUNDS["RF5C400"] = true +SOUNDS["RF5C68"] = true +SOUNDS["ROLANDPCM"] = true +SOUNDS["RP2C33_SOUND"] = true +SOUNDS["S14001A"] = true +SOUNDS["SAA1099"] = true +SOUNDS["SAMPLES"] = true +SOUNDS["SB0400"] = true +SOUNDS["SCSP"] = true +SOUNDS["SEGAPCM"] = true +SOUNDS["SETAPCM"] = true +SOUNDS["SID6581"] = true +SOUNDS["SID8580"] = true +SOUNDS["SN76477"] = true +SOUNDS["SN76496"] = true +SOUNDS["SNKWAVE"] = true +SOUNDS["SOCRATES"] = true +SOUNDS["SP0250"] = true +SOUNDS["SP0256"] = true +SOUNDS["SPEAKER"] = true +SOUNDS["SPU"] = true +SOUNDS["ST0016"] = true +SOUNDS["SWP00"] = true +SOUNDS["SWP20"] = true +SOUNDS["SWP30"] = true +SOUNDS["S_DSP"] = true +SOUNDS["T6721A"] = true +SOUNDS["T6W28"] = true +SOUNDS["TA7630"] = true +SOUNDS["TC8830F"] = true +SOUNDS["TIA"] = true +SOUNDS["TMC0281"] = true +SOUNDS["TMC0285"] = true +SOUNDS["TMS3615"] = true +SOUNDS["TMS36XX"] = true +SOUNDS["TMS5100"] = true +SOUNDS["TMS5110"] = true +SOUNDS["TMS5110A"] = true +SOUNDS["TMS5200"] = true +SOUNDS["TMS5220"] = true +SOUNDS["TT5665"] = true +SOUNDS["UDA1344"] = true +SOUNDS["UPD1771"] = true +SOUNDS["UPD7752"] = true +SOUNDS["UPD7759"] = true +SOUNDS["UPD934G"] = true +SOUNDS["VGMVIZ"] = true +SOUNDS["VLM5030"] = true +SOUNDS["VOTRAX"] = true +SOUNDS["VRC6"] = true +SOUNDS["VRENDER0"] = true +SOUNDS["WAVE"] = true +SOUNDS["X1_010"] = true +SOUNDS["XT446"] = true +SOUNDS["Y8950"] = true +SOUNDS["YM2151"] = true +SOUNDS["YM2154"] = true +SOUNDS["YM2203"] = true +SOUNDS["YM2413"] = true +SOUNDS["YM2414"] = true +SOUNDS["YM2608"] = true +SOUNDS["YM2610"] = true +SOUNDS["YM2610B"] = true +SOUNDS["YM2612"] = true +SOUNDS["YM3438"] = true +SOUNDS["YM3526"] = true +SOUNDS["YM3806"] = true +SOUNDS["YM3812"] = true +SOUNDS["YMF262"] = true +SOUNDS["YMF271"] = true +SOUNDS["YMF278B"] = true +SOUNDS["YMZ280B"] = true +SOUNDS["YMZ770"] = true +SOUNDS["ZSG2"] = true + +-------------------------------------------------- +-- specify available video cores +-------------------------------------------------- + +VIDEOS["AM8052"] = true +VIDEOS["BT431"] = true +VIDEOS["BT459"] = true +VIDEOS["BT45X"] = true +VIDEOS["BT47X"] = true +VIDEOS["BUFSPRITE"] = true +VIDEOS["CATSEYE"] = true +VIDEOS["CDP1861"] = true +VIDEOS["CDP1862"] = true +VIDEOS["CESBLIT"] = true +VIDEOS["CRT9007"] = true +VIDEOS["CRT9021"] = true +VIDEOS["CRT9028"] = true +VIDEOS["CRT9212"] = true +VIDEOS["CRTC_EGA"] = true +VIDEOS["DECSFB"] = true +VIDEOS["DL1416"] = true +VIDEOS["DM9368"] = true +VIDEOS["DP8350"] = true +VIDEOS["DP8510"] = true +VIDEOS["EF9340_1"] = true +VIDEOS["EF9345"] = true +VIDEOS["EF9364"] = true +VIDEOS["EF9365"] = true +VIDEOS["EF9369"] = true +VIDEOS["EPIC12"] = true +VIDEOS["FIXFREQ"] = true +VIDEOS["GBA_LCD"] = true +VIDEOS["GB_LCD"] = true +VIDEOS["GF4500"] = true +VIDEOS["GF7600GS"] = true +VIDEOS["HD44102"] = true +VIDEOS["HD44352"] = true +VIDEOS["HD44780"] = true +VIDEOS["HD61202"] = true +VIDEOS["HD61603"] = true +VIDEOS["HD61830"] = true +VIDEOS["HD63484"] = true +VIDEOS["HD66421"] = true +VIDEOS["HLCD0438"] = true +VIDEOS["HLCD0488"] = true +VIDEOS["HLCD0515"] = true +VIDEOS["HLCD0538"] = true +VIDEOS["HP1LL3"] = true +VIDEOS["HUC6202"] = true +VIDEOS["HUC6260"] = true +VIDEOS["HUC6261"] = true +VIDEOS["HUC6270"] = true +VIDEOS["HUC6271"] = true +VIDEOS["HUC6272"] = true +VIDEOS["I4100"] = true +VIDEOS["I8244"] = true +VIDEOS["I82730"] = true +VIDEOS["I8275"] = true +VIDEOS["IMS_CVC"] = true +VIDEOS["JANGOU_BLITTER"] = true +VIDEOS["LC7582"] = true +VIDEOS["LC7985"] = true +VIDEOS["M50458"] = true +VIDEOS["MB88303"] = true +VIDEOS["MB90082"] = true +VIDEOS["MB_VCU"] = true +VIDEOS["MC6845"] = true +VIDEOS["MC6847"] = true +VIDEOS["MD4330B"] = true +VIDEOS["MGA2064W"] = true +VIDEOS["MM5445"] = true +VIDEOS["MOS6566"] = true +VIDEOS["MSM6222B"] = true +VIDEOS["MSM6255"] = true +VIDEOS["NEREID"] = true +VIDEOS["NT7534"] = true +VIDEOS["PCD8544"] = true +VIDEOS["PCF2100"] = true +VIDEOS["PC_VGA"] = true +VIDEOS["POLY"] = true +VIDEOS["PPU2C0X"] = true +VIDEOS["PS2GIF"] = true +VIDEOS["PS2GS"] = true +VIDEOS["PSX"] = true +VIDEOS["PWM_DISPLAY"] = true +VIDEOS["RAMDAC"] = true +VIDEOS["S2636"] = true +VIDEOS["SAA5050"] = true +VIDEOS["SAA5240"] = true +VIDEOS["SCN2674"] = true +VIDEOS["SDA5708"] = true +VIDEOS["SED1200"] = true +VIDEOS["SED1330"] = true +VIDEOS["SED1356"] = true +VIDEOS["SED1500"] = true +VIDEOS["SED1520"] = true +VIDEOS["SEGA315_5124"] = true +VIDEOS["SEGA315_5313"] = true +VIDEOS["SNES_PPU"] = true +VIDEOS["T6963C"] = true +VIDEOS["T6A04"] = true +VIDEOS["TEA1002"] = true +VIDEOS["TLC34076"] = true +VIDEOS["TMS34061"] = true +VIDEOS["TMS3556"] = true +VIDEOS["TMS9927"] = true +VIDEOS["TMS9928A"] = true +VIDEOS["TOPCAT"] = true +VIDEOS["UPD3301"] = true +VIDEOS["UPD7220"] = true +VIDEOS["UPD7227"] = true +VIDEOS["V9938"] = true +VIDEOS["VIC4567"] = true +VIDEOS["VIRGE_PCI"] = true +VIDEOS["VOODOO"] = true +VIDEOS["VOODOO_PCI"] = true +VIDEOS["VRENDER0"] = true +VIDEOS["ZEUS2"] = true + +-------------------------------------------------- +-- specify available machine cores +-------------------------------------------------- + +MACHINES["1MA6"] = true +MACHINES["1MB5"] = true +MACHINES["2812FIFO"] = true +MACHINES["28FXXX"] = true +MACHINES["6522VIA"] = true +MACHINES["6821PIA"] = true +MACHINES["6840PTM"] = true +MACHINES["68681"] = true +MACHINES["7200FIFO"] = true +MACHINES["8530SCC"] = true +MACHINES["ACIA6850"] = true +MACHINES["ACORN_BMU"] = true +MACHINES["ACORN_IOC"] = true +MACHINES["ACORN_LC"] = true +MACHINES["ACORN_MEMC"] = true +MACHINES["ACORN_VIDC"] = true +MACHINES["ADC0804"] = true +MACHINES["ADC0808"] = true +MACHINES["ADC083X"] = true +MACHINES["ADC0844"] = true +MACHINES["ADC1038"] = true +MACHINES["ADC1213X"] = true +MACHINES["AIC565"] = true +MACHINES["AIC580"] = true +MACHINES["AIC6250"] = true +MACHINES["AICARTC"] = true +MACHINES["AKIKO"] = true +MACHINES["ALPHA_8921"] = true +MACHINES["AM25S55X"] = true +MACHINES["AM2847"] = true +MACHINES["AM2901B"] = true +MACHINES["AM2910"] = true +MACHINES["AM53CF96"] = true +MACHINES["AM79C30"] = true +MACHINES["AM79C90"] = true +MACHINES["AM9513"] = true +MACHINES["AM9517A"] = true +MACHINES["AM9519"] = true +MACHINES["AMIGAFDC"] = true +MACHINES["AMIGA_COPPER"] = true +MACHINES["APPLEPIC"] = true +MACHINES["APPLE_DRIVE"] = true +MACHINES["APPLE_FDC"] = true +MACHINES["APPLE_FDINTF"] = true +MACHINES["ARCHIMEDES_KEYB"] = true +MACHINES["ARM_AIC"] = true +MACHINES["ARM_IOMD"] = true +MACHINES["AT28C16"] = true +MACHINES["AT28C64B"] = true +MACHINES["AT29X"] = true +MACHINES["AT45DBXX"] = true +MACHINES["ATAFLASH"] = true +MACHINES["AT_KEYBC"] = true +MACHINES["AT_MB"] = true +MACHINES["AUTOCONFIG"] = true +MACHINES["AY31015"] = true +MACHINES["BANKDEV"] = true +MACHINES["BIM68153"] = true +MACHINES["BITMAP_PRINTER"] = true +MACHINES["BL_HANDHELDS_MENUCONTROL"] = true +MACHINES["BQ4847"] = true +MACHINES["BQ4852"] = true +MACHINES["BUSMOUSE"] = true +MACHINES["CAMMU"] = true +MACHINES["CDP1852"] = true +MACHINES["CDP1871"] = true +MACHINES["CDP1879"] = true +MACHINES["CDU76S"] = true +MACHINES["CH376"] = true +MACHINES["CHESSMACHINE"] = true +MACHINES["CMOS40105"] = true +MACHINES["COM52C50"] = true +MACHINES["COM8116"] = true +MACHINES["COP452"] = true +MACHINES["CORVUSHD"] = true +MACHINES["CR511B"] = true +MACHINES["CR589"] = true +MACHINES["CS4031"] = true +MACHINES["CS8221"] = true +MACHINES["CS8900A"] = true +MACHINES["CXD1095"] = true +MACHINES["CXD1185"] = true +MACHINES["DC7085"] = true +MACHINES["DIABLO_HD"] = true +MACHINES["DL11"] = true +MACHINES["DMAC"] = true +MACHINES["DP8390"] = true +MACHINES["DP83932C"] = true +MACHINES["DP8573"] = true +MACHINES["DS1204"] = true +MACHINES["DS1205"] = true +MACHINES["DS1302"] = true +MACHINES["DS1315"] = true +MACHINES["DS1386"] = true +MACHINES["DS17X85"] = true +MACHINES["DS1994"] = true +MACHINES["DS2401"] = true +MACHINES["DS2404"] = true +MACHINES["DS6417"] = true +MACHINES["DS75160A"] = true +MACHINES["DS75161A"] = true +MACHINES["DS8874"] = true +MACHINES["E0516"] = true +MACHINES["E05A03"] = true +MACHINES["E05A30"] = true +MACHINES["EDLC"] = true +MACHINES["EEPROMDEV"] = true +MACHINES["ER1400"] = true +MACHINES["ER2055"] = true +MACHINES["EXORTERM"] = true +MACHINES["F3853"] = true +MACHINES["F4702"] = true +MACHINES["FDC37C665GT"] = true +MACHINES["FDC37C93X"] = true +MACHINES["FDC_PLL"] = true +MACHINES["FGA002"] = true +MACHINES["FM_SCSI"] = true +MACHINES["GAYLE"] = true +MACHINES["GENPC"] = true +MACHINES["GEN_FIFO"] = true +MACHINES["GEN_LATCH"] = true +MACHINES["GLUKRS"] = true +MACHINES["GT913"] = true +MACHINES["HD63450"] = true +MACHINES["HD64610"] = true +MACHINES["HDC9234"] = true +MACHINES["HP_DC100_TAPE"] = true +MACHINES["HP_TACO"] = true +MACHINES["I2CMEM"] = true +MACHINES["I3001"] = true +MACHINES["I3002"] = true +MACHINES["I7220"] = true +MACHINES["I80130"] = true +MACHINES["I8087"] = true +MACHINES["I8155"] = true +MACHINES["I8212"] = true +MACHINES["I8214"] = true +MACHINES["I82355"] = true +MACHINES["I82357"] = true +MACHINES["I8243"] = true +MACHINES["I8251"] = true +MACHINES["I8255"] = true +MACHINES["I8257"] = true +MACHINES["I82586"] = true +MACHINES["I8271"] = true +MACHINES["I8279"] = true +MACHINES["I8291A"] = true +MACHINES["I8355"] = true +MACHINES["IBM21S850"] = true +MACHINES["ICM7170"] = true +MACHINES["IDECTRL"] = true +MACHINES["IE15"] = true +MACHINES["IM6402"] = true +MACHINES["INPUT_MERGER"] = true +MACHINES["INS8154"] = true +MACHINES["INS8250"] = true +MACHINES["INTELFLASH"] = true +MACHINES["IOPCDVD"] = true +MACHINES["IOPDMA"] = true +MACHINES["IOPINTC"] = true +MACHINES["IOPSIO2"] = true +MACHINES["IOPTIMER"] = true +MACHINES["IWM"] = true +MACHINES["JVS"] = true +MACHINES["K033906"] = true +MACHINES["K053252"] = true +MACHINES["K054321"] = true +MACHINES["K056230"] = true +MACHINES["KB3600"] = true +MACHINES["KBDC8042"] = true +MACHINES["KR2376"] = true +MACHINES["LATCH8"] = true +MACHINES["LC89510"] = true +MACHINES["LDP1000"] = true +MACHINES["LDP1450"] = true +MACHINES["LDPR8210"] = true +MACHINES["LDSTUB"] = true +MACHINES["LDV1000"] = true +MACHINES["LDV4200HLE"] = true +MACHINES["LDVP931"] = true +MACHINES["LH5810"] = true +MACHINES["LINFLASH"] = true +MACHINES["LOCOMO"] = true +MACHINES["LPCI"] = true +MACHINES["LSI53C810"] = true +MACHINES["M3002"] = true +MACHINES["M68307"] = true +MACHINES["M68340"] = true +MACHINES["M68SFDC"] = true +MACHINES["M6M80011AP"] = true +MACHINES["M950X0"] = true +MACHINES["MAC_VIDEO_SONORA"] = true +MACHINES["MB14241"] = true +MACHINES["MB3773"] = true +MACHINES["MB8421"] = true +MACHINES["MB87030"] = true +MACHINES["MB87078"] = true +MACHINES["MB8795"] = true +MACHINES["MB89352"] = true +MACHINES["MB89371"] = true +MACHINES["MB89374"] = true +MACHINES["MC14411"] = true +MACHINES["MC146818"] = true +MACHINES["MC68328"] = true +MACHINES["MC6843"] = true +MACHINES["MC6844"] = true +MACHINES["MC6846"] = true +MACHINES["MC6852"] = true +MACHINES["MC6854"] = true +MACHINES["MC68901"] = true +MACHINES["MCCS1850"] = true +MACHINES["MCF5206E"] = true +MACHINES["METERS"] = true +MACHINES["MICROTOUCH"] = true +MACHINES["MIOT6530"] = true +MACHINES["MM5307"] = true +MACHINES["MM5740"] = true +MACHINES["MM58167"] = true +MACHINES["MM58174"] = true +MACHINES["MM58274C"] = true +MACHINES["MM74C922"] = true +MACHINES["MOS6526"] = true +MACHINES["MOS6529"] = true +MACHINES["MOS6551"] = true +MACHINES["MOS6702"] = true +MACHINES["MOS8706"] = true +MACHINES["MOS8722"] = true +MACHINES["MOS8726"] = true +MACHINES["MPCC68561"] = true +MACHINES["MPU401"] = true +MACHINES["MSM5832"] = true +MACHINES["MSM58321"] = true +MACHINES["MSM6242"] = true +MACHINES["MSM6253"] = true +MACHINES["MYB3K_KEYBOARD"] = true +MACHINES["NCR5380"] = true +MACHINES["NCR5385"] = true +MACHINES["NCR5390"] = true +MACHINES["NCR539x"] = true +MACHINES["NCR53C7XX"] = true +MACHINES["NETLIST"] = true +MACHINES["NMC9306"] = true +MACHINES["NS32081"] = true +MACHINES["NS32082"] = true +MACHINES["NS32202"] = true +MACHINES["NS32382"] = true +MACHINES["NSC810"] = true +MACHINES["NSCSI"] = true +MACHINES["OMTI5100"] = true +MACHINES["OUTPUT_LATCH"] = true +MACHINES["PCCARD"] = true +MACHINES["PCF8573"] = true +MACHINES["PCF8583"] = true +MACHINES["PCF8584"] = true +MACHINES["PCF8593"] = true +MACHINES["PCI"] = true +MACHINES["PCI9050"] = true +MACHINES["PCKEYBRD"] = true +MACHINES["PC_FDC"] = true +MACHINES["PC_LPT"] = true +MACHINES["PDC"] = true +MACHINES["PHI"] = true +MACHINES["PIC8259"] = true +MACHINES["PIT68230"] = true +MACHINES["PIT8253"] = true +MACHINES["PLA"] = true +--MACHINES["PROFILE"] = true +MACHINES["PROM82S129"] = true +MACHINES["PS2DMAC"] = true +MACHINES["PS2INTC"] = true +MACHINES["PS2MC"] = true +MACHINES["PS2PAD"] = true +MACHINES["PS2SIF"] = true +MACHINES["PS2TIMER"] = true +MACHINES["PXA255"] = true +MACHINES["R10696"] = true +MACHINES["R10788"] = true +MACHINES["R64H156"] = true +MACHINES["RA17XX"] = true +MACHINES["RF5C296"] = true +MACHINES["RIOT6532"] = true +MACHINES["RIPPLE_COUNTER"] = true +MACHINES["ROC10937"] = true +MACHINES["RP5C01"] = true +MACHINES["RP5C15"] = true +MACHINES["RP5H01"] = true +MACHINES["RSTBUF"] = true +MACHINES["RTC4543"] = true +MACHINES["RTC65271"] = true +MACHINES["RTC9701"] = true +MACHINES["S2636"] = true +MACHINES["S3520CF"] = true +MACHINES["S3C24XX"] = true +MACHINES["S3C44B0"] = true +MACHINES["SA1110"] = true +MACHINES["SA1111"] = true +MACHINES["SAA1043"] = true +MACHINES["SAA7191"] = true +MACHINES["SATURN"] = true +MACHINES["SCC2698B"] = true +MACHINES["SCC68070"] = true +MACHINES["SCNXX562"] = true +MACHINES["SCN_PCI"] = true +MACHINES["SCOOP"] = true +MACHINES["SCSI"] = true +MACHINES["SCUDSP"] = true +MACHINES["SDA2006"] = true +MACHINES["SECFLASH"] = true +MACHINES["SEGA_SCU"] = true +MACHINES["SEIBU_COP"] = true +MACHINES["SENSORBOARD"] = true +MACHINES["SERFLASH"] = true +MACHINES["SMARTMEDIA"] = true +MACHINES["SMC91C9X"] = true +MACHINES["SMC92X4"] = true +MACHINES["SMIOC"] = true +MACHINES["SMPC"] = true +MACHINES["SONY_DRIVE"] = true +MACHINES["SPG290"] = true +MACHINES["SPG2XX"] = true +MACHINES["SPISDCARD"] = true +MACHINES["STEPPERS"] = true +MACHINES["STRATA"] = true +MACHINES["STVCD"] = true +MACHINES["SUN4C_MMU"] = true +MACHINES["SWIM1"] = true +MACHINES["SWIM2"] = true +MACHINES["SWIM3"] = true +MACHINES["SWTPC8212"] = true +MACHINES["S_SMP"] = true +MACHINES["TASC_SB30"] = true +MACHINES["TC0091LVC"] = true +MACHINES["TDC1008"] = true +MACHINES["TE7750"] = true +MACHINES["TI99_HD"] = true +MACHINES["TICKET"] = true +MACHINES["TIMEKPR"] = true +MACHINES["TMC0430"] = true +MACHINES["TMC0999"] = true +MACHINES["TMC208K"] = true +MACHINES["TMP68301"] = true +MACHINES["TMS1024"] = true +MACHINES["TMS5501"] = true +MACHINES["TMS6100"] = true +MACHINES["TMS9901"] = true +MACHINES["TMS9902"] = true +MACHINES["TMS9914"] = true +MACHINES["TPI6525"] = true +MACHINES["TSB12LV01A"] = true +MACHINES["TSCONF_DMA"] = true +MACHINES["TTL7400"] = true +MACHINES["TTL7404"] = true +MACHINES["TTL74123"] = true +MACHINES["TTL74145"] = true +MACHINES["TTL74148"] = true +MACHINES["TTL74153"] = true +MACHINES["TTL74157"] = true +MACHINES["TTL74161"] = true +MACHINES["TTL74164"] = true +MACHINES["TTL74165"] = true +MACHINES["TTL74166"] = true +MACHINES["TTL74175"] = true +MACHINES["TTL74181"] = true +MACHINES["TTL74259"] = true +MACHINES["TTL74381"] = true +MACHINES["TTL74543"] = true +MACHINES["TTL7474"] = true +MACHINES["TUBE"] = true +MACHINES["UCB1200"] = true +MACHINES["UPC82C710"] = true +MACHINES["UPC82C711"] = true +MACHINES["UPD1990A"] = true +MACHINES["UPD4701"] = true +MACHINES["UPD4991A"] = true +MACHINES["UPD4992"] = true +MACHINES["UPD7001"] = true +MACHINES["UPD7002"] = true +MACHINES["UPD7004"] = true +MACHINES["UPD71071"] = true +MACHINES["UPD765"] = true +MACHINES["V3021"] = true +MACHINES["VIC_PL192"] = true +MACHINES["VRENDER0"] = true +MACHINES["VT82C496"] = true +MACHINES["WATCHDOG"] = true +MACHINES["WD1000"] = true +MACHINES["WD1010"] = true +MACHINES["WD11C00_17"] = true +MACHINES["WD2010"] = true +MACHINES["WD33C9X"] = true +MACHINES["WD7600"] = true +MACHINES["WD_FDC"] = true +MACHINES["WOZFDC"] = true +MACHINES["WTL3132"] = true +MACHINES["X2201"] = true +MACHINES["X2212"] = true +MACHINES["X76F041"] = true +MACHINES["X76F100"] = true +MACHINES["XC1700E"] = true +MACHINES["YM2148"] = true +MACHINES["YM3802"] = true +MACHINES["Z8038"] = true +MACHINES["Z80CTC"] = true +MACHINES["Z80DAISY"] = true +MACHINES["Z80DMA"] = true +MACHINES["Z80PIO"] = true +MACHINES["Z80SCC"] = true +MACHINES["Z80SIO"] = true +MACHINES["Z80STI"] = true +MACHINES["Z8536"] = true + +-------------------------------------------------- +-- specify available bus cores +-------------------------------------------------- + +BUSES["A1BUS"] = true +BUSES["A2BUS"] = true +BUSES["A2GAMEIO"] = true +BUSES["A7800"] = true +BUSES["A800"] = true +BUSES["ABCBUS"] = true +BUSES["ABCKB"] = true +BUSES["ACORN"] = true +BUSES["ADAM"] = true +BUSES["ADAMNET"] = true +BUSES["ADB"] = true +BUSES["AMIGA_KEYBOARD"] = true +BUSES["APF"] = true +BUSES["APRICOT_EXPANSION"] = true +BUSES["APRICOT_KEYBOARD"] = true +BUSES["APRICOT_VIDEO"] = true +BUSES["AQUARIUS"] = true +BUSES["ARCADIA"] = true +BUSES["ARCHIMEDES_ECONET"] = true +BUSES["ARCHIMEDES_PODULE"] = true +BUSES["ASTROCADE"] = true +BUSES["ATA"] = true +BUSES["BBC_1MHZBUS"] = true +BUSES["BBC_ANALOGUE"] = true +BUSES["BBC_CART"] = true +BUSES["BBC_EXP"] = true +BUSES["BBC_FDC"] = true +BUSES["BBC_INTERNAL"] = true +BUSES["BBC_JOYPORT"] = true +BUSES["BBC_MODEM"] = true +BUSES["BBC_ROM"] = true +BUSES["BBC_TUBE"] = true +BUSES["BBC_USERPORT"] = true +BUSES["BML3"] = true +BUSES["BW2"] = true +BUSES["C64"] = true +BUSES["CBM2"] = true +BUSES["CBMIEC"] = true +BUSES["CBUS"] = true +BUSES["CENTRONICS"] = true +BUSES["CGENIE_EXPANSION"] = true +BUSES["CGENIE_PARALLEL"] = true +BUSES["CHANNELF"] = true +BUSES["COCO"] = true +BUSES["COLECO_CART"] = true +BUSES["COLECO_CONTROLLER"] = true +BUSES["COMPIS_GRAPHICS"] = true +BUSES["COMPUCOLOR"] = true +BUSES["COMX35"] = true +BUSES["CPC"] = true +BUSES["CRVISION"] = true +BUSES["DMV"] = true +BUSES["ECBBUS"] = true +BUSES["ECONET"] = true +BUSES["EINSTEIN_USERPORT"] = true +BUSES["EKARA"] = true +BUSES["ELECTRON"] = true +BUSES["ELECTRON_CART"] = true +BUSES["EP64"] = true +BUSES["EPSON_QX"] = true +BUSES["EPSON_SIO"] = true +BUSES["FMT_SCSI"] = true +BUSES["GAMATE"] = true +BUSES["GAMEBOY"] = true +BUSES["GAMEGEAR"] = true +BUSES["GBA"] = true +BUSES["GENERIC"] = true +BUSES["GIO64"] = true +BUSES["HEXBUS"] = true +BUSES["HP80_IO"] = true +BUSES["HP9845_IO"] = true +BUSES["HPDIO"] = true +BUSES["HPHIL"] = true +BUSES["HP_IPC_IO"] = true +BUSES["IEEE488"] = true +BUSES["IMI7000"] = true +BUSES["INTELLEC4"] = true +BUSES["INTERPRO_KEYBOARD"] = true +BUSES["INTERPRO_MOUSE"] = true +BUSES["INTERPRO_SR"] = true +BUSES["INTV"] = true +BUSES["INTV_CTRL"] = true +BUSES["IQ151"] = true +BUSES["ISA"] = true +BUSES["ISBX"] = true +BUSES["JAKKS_GAMEKEY"] = true +BUSES["KC"] = true +BUSES["LPCI"] = true +BUSES["M5"] = true +BUSES["MACKBD"] = true +BUSES["MACPDS"] = true +BUSES["MC10"] = true +BUSES["MEGADRIVE"] = true +BUSES["MIDI"] = true +BUSES["MSX_SLOT"] = true +BUSES["MTX"] = true +BUSES["MULTIBUS"] = true +BUSES["NASBUS"] = true +BUSES["NEOGEO"] = true +BUSES["NEOGEO_CTRL"] = true +BUSES["NES"] = true +BUSES["NES_CTRL"] = true +BUSES["NEWBRAIN"] = true +BUSES["NSCSI"] = true +BUSES["NUBUS"] = true +BUSES["O2"] = true +BUSES["ORICEXT"] = true +BUSES["P2000"] = true +BUSES["PASOPIA"] = true +BUSES["PC1512"] = true +BUSES["PC8801"] = true +BUSES["PCE"] = true +BUSES["PCE_CTRL"] = true +BUSES["PC_JOY"] = true +BUSES["PC_KBD"] = true +BUSES["PET"] = true +BUSES["PLUS4"] = true +BUSES["POFO"] = true +BUSES["PSI_KEYBOARD"] = true +BUSES["PSX_CONTROLLER"] = true +BUSES["PSX_PARALLEL"] = true +BUSES["QBUS"] = true +BUSES["QL"] = true +BUSES["RC2014"] = true +BUSES["RS232"] = true +BUSES["RTPC_KBD"] = true +BUSES["S100"] = true +BUSES["SAITEK_OSA"] = true +BUSES["SAMCOUPE_DRIVE_PORT"] = true +BUSES["SAMCOUPE_EXPANSION"] = true +BUSES["SAMCOUPE_MOUSE_PORT"] = true +BUSES["SATURN"] = true +BUSES["SAT_CTRL"] = true +BUSES["SBUS"] = true +BUSES["SCSI"] = true +BUSES["SCV"] = true +BUSES["SDK85"] = true +BUSES["SEGA8"] = true +BUSES["SG1000_EXP"] = true +BUSES["SGIKBD"] = true +BUSES["SMS_CTRL"] = true +BUSES["SMS_EXP"] = true +BUSES["SNES"] = true +BUSES["SNES_CTRL"] = true +BUSES["SPC1000"] = true +BUSES["SPECTRUM"] = true +BUSES["SS50"] = true +BUSES["SUNKBD"] = true +BUSES["SUNMOUSE"] = true +BUSES["SVI_EXPANDER"] = true +BUSES["SVI_SLOT"] = true +BUSES["TANBUS"] = true +BUSES["TATUNG_PIPE"] = true +BUSES["THOMSON"] = true +BUSES["TI8X"] = true +BUSES["TI99"] = true +BUSES["TI99X"] = true +BUSES["TIKI100"] = true +BUSES["TMC600"] = true +BUSES["TVC"] = true +BUSES["UTS_KBD"] = true +BUSES["VBOY"] = true +BUSES["VC4000"] = true +BUSES["VCS"] = true +BUSES["VCS_CTRL"] = true +BUSES["VECTREX"] = true +BUSES["VIC10"] = true +BUSES["VIC20"] = true +BUSES["VIDBRAIN"] = true +BUSES["VIP"] = true +BUSES["VME"] = true +BUSES["VSMILE"] = true +BUSES["VTECH_IOEXP"] = true +BUSES["VTECH_MEMEXP"] = true +BUSES["WANGPC"] = true +BUSES["WSWAN"] = true +BUSES["X68K"] = true +BUSES["Z29_KBD"] = true +BUSES["Z88"] = true +BUSES["ZORRO"] = true + + +-------------------------------------------------- +-- specify used file formats +-------------------------------------------------- + +FORMATS["2D_DSK"] = true +FORMATS["A26_CAS"] = true +FORMATS["A5105_DSK"] = true +FORMATS["ABC1600_DSK"] = true +FORMATS["ABC800_DSK"] = true +FORMATS["ABCFD2_DSK"] = true +FORMATS["ACE_TAP"] = true +FORMATS["ACORN_DSK"] = true +FORMATS["ADAM_CAS"] = true +FORMATS["ADAM_DSK"] = true +FORMATS["AFS_DSK"] = true +FORMATS["AGAT840K_HLE_DSK"] = true +FORMATS["AIM_DSK"] = true +FORMATS["AMI_DSK"] = true +FORMATS["AP2_DSK"] = true +FORMATS["APD_DSK"] = true +FORMATS["APF_APT"] = true +FORMATS["APOLLO_DSK"] = true +FORMATS["APPLIX_DSK"] = true +FORMATS["APRIDISK"] = true +FORMATS["AP_DSK35"] = true +FORMATS["AQUARIUS_CAQ"] = true +FORMATS["ASST128_DSK"] = true +FORMATS["ASTROCADE_WAV"] = true +FORMATS["ATARI_DSK"] = true +FORMATS["ATOM_DSK"] = true +FORMATS["ATOM_TAP"] = true +FORMATS["BASICDSK"] = true +FORMATS["BW12_DSK"] = true +FORMATS["BW2_DSK"] = true +FORMATS["C3040_DSK"] = true +FORMATS["C4040_DSK"] = true +FORMATS["C8280_DSK"] = true +FORMATS["CAMPLYNX_CAS"] = true +FORMATS["CAMPLYNX_DSK"] = true +FORMATS["CBM_CRT"] = true +FORMATS["CBM_TAP"] = true +FORMATS["CCVF_DSK"] = true +FORMATS["CD90_640_DSK"] = true +FORMATS["CGENIE_DSK"] = true +FORMATS["CGEN_CAS"] = true +FORMATS["COCO_CAS"] = true +FORMATS["COCO_RAWDSK"] = true +FORMATS["COMX35_DSK"] = true +FORMATS["CONCEPT_DSK"] = true +FORMATS["COUPEDSK"] = true +FORMATS["CPIS_DSK"] = true +FORMATS["CSW_CAS"] = true +FORMATS["D64_DSK"] = true +FORMATS["D71_DSK"] = true +FORMATS["D80_DSK"] = true +FORMATS["D81_DSK"] = true +FORMATS["D82_DSK"] = true +FORMATS["DCP_DSK"] = true +FORMATS["DIM_DSK"] = true +FORMATS["DIP_DSK"] = true +FORMATS["DMK_DSK"] = true +FORMATS["DMV_DSK"] = true +FORMATS["DS9_DSK"] = true +FORMATS["EP64_DSK"] = true +FORMATS["ESQ16_DSK"] = true +FORMATS["ESQ8_DSK"] = true +FORMATS["EXCALI64_DSK"] = true +FORMATS["FC100_CAS"] = true +FORMATS["FDD_DSK"] = true +FORMATS["FL1_DSK"] = true +FORMATS["FLEX_DSK"] = true +FORMATS["FM7_CAS"] = true +FORMATS["FMSX_CAS"] = true +FORMATS["FMTOWNS_DSK"] = true +FORMATS["FSD_DSK"] = true +FORMATS["FS_COCO_OS9"] = true +FORMATS["FS_COCO_RSDOS"] = true +FORMATS["FS_ORIC_JASMIN"] = true +FORMATS["FS_PRODOS"] = true +FORMATS["FS_VTECH"] = true +FORMATS["G64_DSK"] = true +FORMATS["GTP_CAS"] = true +FORMATS["GUAB_DSK"] = true +FORMATS["H8_CAS"] = true +FORMATS["HECTOR_MINIDISC"] = true +FORMATS["HECT_DSK"] = true +FORMATS["HECT_TAP"] = true +FORMATS["HPI_DSK"] = true +FORMATS["HP_IPC_DSK"] = true +FORMATS["HTI_TAP"] = true +FORMATS["IBMXDF_DSK"] = true +FORMATS["IMG_DSK"] = true +FORMATS["IPF_DSK"] = true +FORMATS["IQ151_DSK"] = true +FORMATS["ITT3030_DSK"] = true +FORMATS["JFD_DSK"] = true +FORMATS["JUKU_DSK"] = true +FORMATS["JVC_DSK"] = true +FORMATS["KAYPRO_DSK"] = true +FORMATS["KC85_DSK"] = true +FORMATS["KC_CAS"] = true +FORMATS["KIM1_CAS"] = true +FORMATS["LVIV_LVT"] = true +FORMATS["M20_DSK"] = true +FORMATS["M5_DSK"] = true +FORMATS["MBEE_CAS"] = true +FORMATS["MDOS_DSK"] = true +FORMATS["MFM_HD"] = true +FORMATS["MM_DSK"] = true +FORMATS["MS0515_DSK"] = true +FORMATS["MSX_DSK"] = true +FORMATS["MTX_DSK"] = true +FORMATS["MZ_CAS"] = true +FORMATS["NANOS_DSK"] = true +FORMATS["NASCOM_DSK"] = true +FORMATS["NASLITE_DSK"] = true +FORMATS["NES_DSK"] = true +FORMATS["NFD_DSK"] = true +FORMATS["OPD_DSK"] = true +FORMATS["ORAO_CAS"] = true +FORMATS["ORIC_DSK"] = true +FORMATS["ORIC_TAP"] = true +FORMATS["OS9_DSK"] = true +FORMATS["P2000T_CAS"] = true +FORMATS["P6001_CAS"] = true +FORMATS["PASTI_DSK"] = true +FORMATS["PC98FDI_DSK"] = true +FORMATS["PC98_DSK"] = true +FORMATS["PHC25_CAS"] = true +FORMATS["PK8020_DSK"] = true +FORMATS["PMD_CAS"] = true +FORMATS["POLY_DSK"] = true +FORMATS["PPG_DSK"] = true +FORMATS["PRIMOPTP"] = true +FORMATS["PYLDIN_DSK"] = true +FORMATS["QL_DSK"] = true +FORMATS["RC759_DSK"] = true +FORMATS["RK_CAS"] = true +FORMATS["RX50_DSK"] = true +FORMATS["SC3000_BIT"] = true +FORMATS["SDD_DSK"] = true +FORMATS["SDF_DSK"] = true +FORMATS["SF7000_DSK"] = true +FORMATS["SMX_DSK"] = true +FORMATS["SOL_CAS"] = true +FORMATS["SORC_CAS"] = true +FORMATS["SORC_DSK"] = true +FORMATS["SORD_CAS"] = true +FORMATS["SPC1000_CAS"] = true +FORMATS["ST_DSK"] = true +FORMATS["SVI_CAS"] = true +FORMATS["SVI_DSK"] = true +FORMATS["SWD_DSK"] = true +FORMATS["TANDY2K_DSK"] = true +FORMATS["THOM_CAS"] = true +FORMATS["THOM_DSK"] = true +FORMATS["TI99_DSK"] = true +FORMATS["TIKI100_DSK"] = true +FORMATS["TIM011_DSK"] = true +FORMATS["TRD_DSK"] = true +FORMATS["TRS80_DSK"] = true +FORMATS["TRS_CAS"] = true +FORMATS["TVC_CAS"] = true +FORMATS["TVC_DSK"] = true +FORMATS["TZX_CAS"] = true +FORMATS["UEF_CAS"] = true +FORMATS["UNIFLEX_DSK"] = true +FORMATS["VDK_DSK"] = true +FORMATS["VECTOR06_DSK"] = true +FORMATS["VG5K_CAS"] = true +FORMATS["VICTOR9K_DSK"] = true +FORMATS["VT_CAS"] = true +FORMATS["VT_DSK"] = true +FORMATS["WD177X_DSK"] = true +FORMATS["X07_CAS"] = true +FORMATS["X1_TAP"] = true +FORMATS["XDF_DSK"] = true +FORMATS["ZX81_P"] = true + +-------------------------------------------------- +-- this is the list of driver libraries that +-- comprise MAME +-------------------------------------------------- function linkProjects_mame_mame(_target, _subtarget) - linkProjects_mame_arcade(_target, _subtarget) - linkProjects_mame_mess(_target, _subtarget) + links { + "access", + "aci", + "acorn", + "act", + "adc", + "adp", + "agat", + "akai", + "alba", + "alesis", + "alliedl", + "alpha", + "altos", + "amiga", + "amirix", + "ampro", + "amstrad", + "apf", + "apollo", + "apple", + "applied", + "arcadia", + "aristocr", + "ascii", + "at", + "atari", + "atlus", + "att", + "ave", + "aviion", + "banctec", + "bandai", + "barcrest", + "be", + "beehive", + "bfm", + "bitcorp", + "bmc", + "bnpo", + "bondwell", + "booth", + "camputers", + "canon", + "cantab", + "capcom", + "casio", + "cbm", + "cccp", + "cce", + "ccs", + "ceres", + "ces", + "chessking", + "chromatics", + "chrysler", + "cinemat", + "cirsa", + "citoh", + "coleco", + "comad", + "compugraphic", + "comx", + "concept", + "conic", + "conitec", + "consumenta", + "cromemco", + "cvs", + "cxg", + "cybiko", + "dai", + "dataeast", + "dcs", + "ddr", + "dec", + "dgrm", + "dicksmth", + "dms", + "dooyong", + "drc", + "dulmont", + "dynax", + "eaca", + "edevices", + "efo", + "einis", + "elektor", + "elektron", + "elektronika", + "emusys", + "ensoniq", + "enterprise", + "entex", + "eolith", + "epoch", + "epson", + "ericsson", + "excelent", + "exidy", + "exorterm", + "f32", + "fairch", + "fairlight", + "falco", + "fidelity", + "force", + "francedr", + "fujitsu", + "funtech", + "funworld", + "fuuki", + "gaelco", + "galaxian", + "galaxy", + "gamepark", + "gameplan", + "gametron", + "gottlieb", + "gridcomp", + "grundy", + "h01x", + "handheld", + "hartung", + "hds", + "heathkit", + "hec2hrp", + "hegener", + "heurikon", + "hitachi", + "homebrew", + "homelab", + "hp", + "husky", + "ibm6580", + "ibmpc", + "ie15", + "igs", + "igt", + "imp", + "informer", + "intel", + "interpro", + "interton", + "intv", + "irem", + "isc", + "itech", + "jaleco", + "jazz", + "jpm", + "kaneko", + "kawai", + "kaypro", + "kiwako", + "koei", + "konami", + "kontron", + "korg", + "kurzweil", + "kyber", + "kyocera", + "labtam", + "leapfrog", + "learsiegler", + "lsi", + "luxor", + "magnavox", + "makerbot", + "matic", + "matsushi", + "mattel", + "maygay", + "mb", + "mchester", + "meadows", + "memotech", + "mera", + "merit", + "metro", + "mg1", + "mgu", + "microkey", + "microsoft", + "microterm", + "midcoin", + "midw8080", + "midway", + "mips", + "misc", + "mit", + "mits", + "mitsubishi", + "mizar", + "morrow", + "mos", + "motorola", + "mr", + "multitch", + "mupid", + "nakajima", + "namco", + "nasco", + "nascom", + "natsemi", + "ncd", + "ne", + "nec", + "neogeo", + "netronic", + "next", + "nichibut", + "nintendo", + "nix", + "nmk", + "nokia", + "northstar", + "novadesitec", + "novag", + "novation", + "olivetti", + "olympia", + "omnibyte", + "omori", + "omron", + "openuni", + "orca", + "osborne", + "osi", + "pacific", + "pacman", + "palm", + "parker", + "pc", + "pce", + "pdp1", + "pel", + "philips", + "phoenix", + "pinball", + "pitronic", + "playmark", + "poly", + "poly88", + "positron", + "promat", + "psikyo", + "psion", + "quantel", + "qume", + "radio", + "ramtek", + "rare", + "rca", + "regnecentralen", + "ritam", + "rm", + "robotron", + "rockwell", + "roland", + "rolm", + "rtpc", + "sage", + "saitek", + "samcoupe", + "samsung", + "sanritsu", + "sanyo", + "saturn", + "sega", + "segacons", + "seibu", + "selchow", + "sequential", + "seta", + "sgi", + "sharp", + "siemens", + "sigma", + "sinclair", + "skeleton", + "slicer", + "snk", + "sony", + "sony_news", + "sord", + "special", + "stern", + "stm", + "subsino", + "sun", + "suna", + "sunelect", + "svi", + "svision", + "swtpc", + "synertek", + "ta", + "tab", + "taito", + "tandberg", + "tangerin", + "tasc", + "tatsumi", + "tatung", + "tch", + "teamconc", + "tecfri", + "technos", + "tectoy", + "tehkan", + "tektroni", + "telenova", + "telercas", + "televideo", + "terminal", + "tesla", + "thepit", + "thomson", + "ti", + "tiger", + "tigertel", + "tiki", + "toaplan", + "tomy", + "toshiba", + "trainer", + "trs", + "tvgames", + "ultimachine", + "ultratec", + "unicard", + "unico", + "unisonic", + "unisys", + "univers", + "upl", + "usp", + "valadon", + "veb", + "venture", + "verifone", + "vidbrain", + "videoton", + "virtual", + "visual", + "votrax", + "vsystem", + "vtech", + "wang", + "wavemate", + "westinghouse", + "wing", + "wyse", + "xerox", + "xussrpc", + "yamaha", + "yunsung", + "zaccaria", + "zenith", + "zpa", + "zvt", + "shared", -- must stay near the end + "messshared", -- must stay near the end + } +end + + +function createMAMEProjects(_target, _subtarget, _name) + project (_name) + targetsubdir(_target .."_" .. _subtarget) + kind (LIBTYPE) + uuid (os.uuid("drv-" .. _target .."_" .. _subtarget .. "_" .._name)) + addprojectflags() + precompiledheaders_novs() + + includedirs { + MAME_DIR .. "src/osd", + MAME_DIR .. "src/emu", + MAME_DIR .. "src/devices", + MAME_DIR .. "src/mame/shared", + MAME_DIR .. "src/mame/messshared", + MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/util", + MAME_DIR .. "3rdparty", + GEN_DIR .. "mame/layout", + } + + includedirs { + ext_includedir("asio"), + ext_includedir("flac"), + ext_includedir("glm"), + ext_includedir("jpeg"), + ext_includedir("rapidjson"), + ext_includedir("zlib") + } + +end + + +function createProjects_mame_mame(_target, _subtarget) + +-------------------------------------------------- +-- the following files are general components and +-- shared across a number of drivers +-------------------------------------------------- + +createMAMEProjects(_target, _subtarget, "shared") +files { + MAME_DIR .. "src/mame/shared/*.h", + MAME_DIR .. "src/mame/shared/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "messshared") +files { + MAME_DIR .. "src/mame/messshared/*.h", + MAME_DIR .. "src/mame/messshared/*.cpp", +} + +-------------------------------------------------- +-- manufacturer-specific groupings for drivers +-------------------------------------------------- + +createMAMEProjects(_target, _subtarget, "access") +files { + MAME_DIR .. "src/mame/access/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "aci") +files { + MAME_DIR .. "src/mame/aci/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "acorn") +files { + MAME_DIR .. "src/mame/acorn/*.cpp", + MAME_DIR .. "src/mame/acorn/*.h", +} + +createMAMEProjects(_target, _subtarget, "act") +files { + MAME_DIR .. "src/mame/act/*.cpp", + MAME_DIR .. "src/mame/act/*.h", +} + +createMAMEProjects(_target, _subtarget, "adc") +files { + MAME_DIR .. "src/mame/adc/*.cpp", + MAME_DIR .. "src/mame/adc/*.h", +} + +createMAMEProjects(_target, _subtarget, "adp") +files { + MAME_DIR .. "src/mame/adp/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "agat") +files { + MAME_DIR .. "src/mame/agat/*.cpp", + MAME_DIR .. "src/mame/agat/*.h", +} + +createMAMEProjects(_target, _subtarget, "akai") +files { + MAME_DIR .. "src/mame/akai/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "alba") +files { + MAME_DIR .. "src/mame/alba/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "alesis") +files { + MAME_DIR .. "src/mame/alesis/*.cpp", + MAME_DIR .. "src/mame/alesis/*.h", +} + +createMAMEProjects(_target, _subtarget, "alliedl") +files { + MAME_DIR .. "src/mame/alliedl/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "alpha") +files { + MAME_DIR .. "src/mame/alpha/*.cpp", + MAME_DIR .. "src/mame/alpha/*.h", +} + +createMAMEProjects(_target, _subtarget, "altos") +files { + MAME_DIR .. "src/mame/altos/*.cpp", + MAME_DIR .. "src/mame/altos/*.h", +} + +createMAMEProjects(_target, _subtarget, "amirix") +files { + MAME_DIR .. "src/mame/amirix/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "amiga") +files { + MAME_DIR .. "src/mame/amiga/*.cpp", + MAME_DIR .. "src/mame/amiga/*.h", +} + +createMAMEProjects(_target, _subtarget, "ampro") +files { + MAME_DIR .. "src/mame/ampro/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "amstrad") +files { + MAME_DIR .. "src/mame/amstrad/*.cpp", + MAME_DIR .. "src/mame/amstrad/*.h", +} + +createMAMEProjects(_target, _subtarget, "apf") +files { + MAME_DIR .. "src/mame/apf/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "apollo") +files { + MAME_DIR .. "src/mame/apollo/*.cpp", + MAME_DIR .. "src/mame/apollo/*.h", +} + +createMAMEProjects(_target, _subtarget, "apple") +files { + MAME_DIR .. "src/mame/apple/*.cpp", + MAME_DIR .. "src/mame/apple/*.h", +} + +createMAMEProjects(_target, _subtarget, "applied") +files { + MAME_DIR .. "src/mame/applied/*.cpp", + MAME_DIR .. "src/mame/applied/*.h", +} + +createMAMEProjects(_target, _subtarget, "arcadia") +files { + MAME_DIR .. "src/mame/arcadia/*.cpp", + MAME_DIR .. "src/mame/arcadia/*.h", +} + +createMAMEProjects(_target, _subtarget, "aristocr") +files { + MAME_DIR .. "src/mame/aristocr/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ascii") +files { + MAME_DIR .. "src/mame/ascii/*.cpp", + MAME_DIR .. "src/mame/ascii/*.h", +} + +createMAMEProjects(_target, _subtarget, "at") +files { + MAME_DIR .. "src/mame/at/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "atari") +files { + MAME_DIR .. "src/mame/atari/*.cpp", + MAME_DIR .. "src/mame/atari/*.h", + MAME_DIR .. "src/mame/atari/*.ipp", +} + +createMAMEProjects(_target, _subtarget, "atlus") +files { + MAME_DIR .. "src/mame/atlus/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "att") +files { + MAME_DIR .. "src/mame/att/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ave") +files { + MAME_DIR .. "src/mame/ave/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "aviion") +files { + MAME_DIR .. "src/mame/aviion/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "banctec") +files { + MAME_DIR .. "src/mame/banctec/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "bandai") +files { + MAME_DIR .. "src/mame/bandai/*.cpp", + MAME_DIR .. "src/mame/bandai/*.h", +} + +createMAMEProjects(_target, _subtarget, "barcrest") +files { + MAME_DIR .. "src/mame/barcrest/*.cpp", + MAME_DIR .. "src/mame/barcrest/*.h", +} + +createMAMEProjects(_target, _subtarget, "be") +files { + MAME_DIR .. "src/mame/be/*.cpp", + MAME_DIR .. "src/mame/be/*.h", +} + +createMAMEProjects(_target, _subtarget, "beehive") +files { + MAME_DIR .. "src/mame/beehive/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "bfm") +files { + MAME_DIR .. "src/mame/bfm/*.cpp", + MAME_DIR .. "src/mame/bfm/*.h", +} + +createMAMEProjects(_target, _subtarget, "bitcorp") +files { + MAME_DIR .. "src/mame/bitcorp/*.cpp", + MAME_DIR .. "src/mame/bitcorp/*.h", +} + +createMAMEProjects(_target, _subtarget, "bmc") +files { + MAME_DIR .. "src/mame/bmc/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "bnpo") +files { + MAME_DIR .. "src/mame/bnpo/*.cpp", + MAME_DIR .. "src/mame/bnpo/*.h", +} + +createMAMEProjects(_target, _subtarget, "bondwell") +files { + MAME_DIR .. "src/mame/bondwell/*.cpp", + MAME_DIR .. "src/mame/bondwell/*.h", +} + +createMAMEProjects(_target, _subtarget, "booth") +files { + MAME_DIR .. "src/mame/booth/*.cpp", + MAME_DIR .. "src/mame/booth/*.h", +} + +createMAMEProjects(_target, _subtarget, "camputers") +files { + MAME_DIR .. "src/mame/camputers/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "canon") +files { + MAME_DIR .. "src/mame/canon/*.cpp", + MAME_DIR .. "src/mame/canon/*.h", +} + +createMAMEProjects(_target, _subtarget, "cantab") +files { + MAME_DIR .. "src/mame/cantab/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "capcom") +files { + MAME_DIR .. "src/mame/capcom/*.cpp", + MAME_DIR .. "src/mame/capcom/*.h", +} + +createMAMEProjects(_target, _subtarget, "casio") +files { + MAME_DIR .. "src/mame/casio/*.cpp", + MAME_DIR .. "src/mame/casio/*.h", +} + +createMAMEProjects(_target, _subtarget, "cbm") +files { + MAME_DIR .. "src/mame/cbm/*.cpp", + MAME_DIR .. "src/mame/cbm/*.h", +} + +createMAMEProjects(_target, _subtarget, "cccp") +files { + MAME_DIR .. "src/mame/cccp/*.cpp", + MAME_DIR .. "src/mame/cccp/*.h", +} + +createMAMEProjects(_target, _subtarget, "cce") +files { + MAME_DIR .. "src/mame/cce/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ccs") +files { + MAME_DIR .. "src/mame/ccs/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ceres") +files { + MAME_DIR .. "src/mame/ceres/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ces") +files { + MAME_DIR .. "src/mame/ces/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "chessking") +files { + MAME_DIR .. "src/mame/chessking/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "chromatics") +files { + MAME_DIR .. "src/mame/chromatics/*.cpp", + MAME_DIR .. "src/mame/chromatics/*.h", +} + +createMAMEProjects(_target, _subtarget, "chrysler") +files { + MAME_DIR .. "src/mame/chrysler/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "cinemat") +files { + MAME_DIR .. "src/mame/cinemat/*.cpp", + MAME_DIR .. "src/mame/cinemat/*.h", +} + +createMAMEProjects(_target, _subtarget, "cirsa") +files { + MAME_DIR .. "src/mame/cirsa/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "citoh") +files { + MAME_DIR .. "src/mame/citoh/*.cpp", + MAME_DIR .. "src/mame/citoh/*.h", +} + +createMAMEProjects(_target, _subtarget, "coleco") +files { + MAME_DIR .. "src/mame/coleco/*.cpp", + MAME_DIR .. "src/mame/coleco/*.h", +} + +createMAMEProjects(_target, _subtarget, "comad") +files { + MAME_DIR .. "src/mame/comad/*.cpp", + MAME_DIR .. "src/mame/comad/*.h", +} + +createMAMEProjects(_target, _subtarget, "compugraphic") +files { + MAME_DIR .. "src/mame/compugraphic/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "conic") +files { + MAME_DIR .. "src/mame/conic/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "consumenta") +files { + MAME_DIR .. "src/mame/consumenta/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "cromemco") +files { + MAME_DIR .. "src/mame/cromemco/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "comx") +files { + MAME_DIR .. "src/mame/comx/*.cpp", + MAME_DIR .. "src/mame/comx/*.h", +} + +createMAMEProjects(_target, _subtarget, "concept") +files { + MAME_DIR .. "src/mame/concept/*.cpp", + MAME_DIR .. "src/mame/concept/*.h", +} + +createMAMEProjects(_target, _subtarget, "conitec") +files { + MAME_DIR .. "src/mame/conitec/*.cpp", + MAME_DIR .. "src/mame/conitec/*.h", +} + +createMAMEProjects(_target, _subtarget, "cvs") +files { + MAME_DIR .. "src/mame/cvs/*.cpp", + MAME_DIR .. "src/mame/cvs/*.h", +} + +createMAMEProjects(_target, _subtarget, "cxg") +files { + MAME_DIR .. "src/mame/cxg/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "cybiko") +files { + MAME_DIR .. "src/mame/cybiko/*.cpp", + MAME_DIR .. "src/mame/cybiko/*.h", +} + +createMAMEProjects(_target, _subtarget, "dai") +files { + MAME_DIR .. "src/mame/dai/*.cpp", + MAME_DIR .. "src/mame/dai/*.h", +} + +createMAMEProjects(_target, _subtarget, "dataeast") +files { + MAME_DIR .. "src/mame/dataeast/*.cpp", + MAME_DIR .. "src/mame/dataeast/*.h", +} + +createMAMEProjects(_target, _subtarget, "dcs") +files { + MAME_DIR .. "src/mame/dcs/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ddr") +files { + MAME_DIR .. "src/mame/ddr/*.cpp", + MAME_DIR .. "src/mame/ddr/*.h", +} + +createMAMEProjects(_target, _subtarget, "dec") +files { + MAME_DIR .. "src/mame/dec/*.cpp", + MAME_DIR .. "src/mame/dec/*.h", +} + +createMAMEProjects(_target, _subtarget, "dgrm") +files { + MAME_DIR .. "src/mame/dgrm/*.cpp", + MAME_DIR .. "src/mame/dgrm/*.h", +} + +createMAMEProjects(_target, _subtarget, "dicksmth") +files { + MAME_DIR .. "src/mame/dicksmth/*.cpp", + MAME_DIR .. "src/mame/dicksmth/*.h", +} + +createMAMEProjects(_target, _subtarget, "dms") +files { + MAME_DIR .. "src/mame/dms/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "dooyong") +files { + MAME_DIR .. "src/mame/dooyong/*.cpp", + MAME_DIR .. "src/mame/dooyong/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "drc") +files { + MAME_DIR .. "src/mame/drc/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "dulmont") +files { + MAME_DIR .. "src/mame/dulmont/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "dynax") +files { + MAME_DIR .. "src/mame/dynax/*.cpp", + MAME_DIR .. "src/mame/dynax/*.h", +} + +createMAMEProjects(_target, _subtarget, "eaca") +files { + MAME_DIR .. "src/mame/eaca/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "edevices") +files { + MAME_DIR .. "src/mame/edevices/*.cpp", + MAME_DIR .. "src/mame/edevices/*.h", +} + +createMAMEProjects(_target, _subtarget, "efo") +files { + MAME_DIR .. "src/mame/efo/*.cpp", + MAME_DIR .. "src/mame/efo/*.h", +} + +createMAMEProjects(_target, _subtarget, "einis") +files { + MAME_DIR .. "src/mame/einis/*.cpp", + MAME_DIR .. "src/mame/einis/*.h", +} + +createMAMEProjects(_target, _subtarget, "elektor") +files { + MAME_DIR .. "src/mame/elektor/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "elektron") +files { + MAME_DIR .. "src/mame/elektron/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "elektronika") +files { + MAME_DIR .. "src/mame/elektronika/*.cpp", + MAME_DIR .. "src/mame/elektronika/*.h", +} + +createMAMEProjects(_target, _subtarget, "emusys") +files { + MAME_DIR .. "src/mame/emusys/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ensoniq") +files { + MAME_DIR .. "src/mame/ensoniq/*.cpp", + MAME_DIR .. "src/mame/ensoniq/*.h", +} + +createMAMEProjects(_target, _subtarget, "enterprise") +files { + MAME_DIR .. "src/mame/enterprise/*.cpp", + MAME_DIR .. "src/mame/enterprise/*.h", +} + +createMAMEProjects(_target, _subtarget, "entex") +files { + MAME_DIR .. "src/mame/entex/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "eolith") +files { + MAME_DIR .. "src/mame/eolith/*.cpp", + MAME_DIR .. "src/mame/eolith/*.h", +} + +createMAMEProjects(_target, _subtarget, "epoch") +files { + MAME_DIR .. "src/mame/epoch/*.cpp", + MAME_DIR .. "src/mame/epoch/*.h", +} + +createMAMEProjects(_target, _subtarget, "epson") +files { + MAME_DIR .. "src/mame/epson/*.cpp", + MAME_DIR .. "src/mame/epson/*.h", +} + +createMAMEProjects(_target, _subtarget, "ericsson") +files { + MAME_DIR .. "src/mame/ericsson/*.cpp", + MAME_DIR .. "src/mame/ericsson/*.h", +} + +createMAMEProjects(_target, _subtarget, "excelent") +files { + MAME_DIR .. "src/mame/excelent/*.cpp", + MAME_DIR .. "src/mame/excelent/*.h", +} + +createMAMEProjects(_target, _subtarget, "exidy") +files { + MAME_DIR .. "src/mame/exidy/*.cpp", + MAME_DIR .. "src/mame/exidy/*.h", +} + +createMAMEProjects(_target, _subtarget, "exorterm") +files { + MAME_DIR .. "src/mame/exorterm/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "f32") +files { + MAME_DIR .. "src/mame/f32/*.cpp", + MAME_DIR .. "src/mame/f32/*.h", +} + +createMAMEProjects(_target, _subtarget, "fairch") +files { + MAME_DIR .. "src/mame/fairch/*.cpp", + MAME_DIR .. "src/mame/fairch/*.h", +} + +createMAMEProjects(_target, _subtarget, "fairlight") +files { + MAME_DIR .. "src/mame/fairlight/*.cpp", + MAME_DIR .. "src/mame/fairlight/*.h", +} + +createMAMEProjects(_target, _subtarget, "falco") +files { + MAME_DIR .. "src/mame/falco/*.cpp", + MAME_DIR .. "src/mame/falco/*.h", +} + +createMAMEProjects(_target, _subtarget, "fidelity") +files { + MAME_DIR .. "src/mame/fidelity/*.cpp", + MAME_DIR .. "src/mame/fidelity/*.h", +} + +createMAMEProjects(_target, _subtarget, "force") +files { + MAME_DIR .. "src/mame/force/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "francedr") +files { + MAME_DIR .. "src/mame/francedr/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "fujitsu") +files { + MAME_DIR .. "src/mame/fujitsu/*.cpp", + MAME_DIR .. "src/mame/fujitsu/*.h", +} + +createMAMEProjects(_target, _subtarget, "funtech") +files { + MAME_DIR .. "src/mame/funtech/*.cpp", + MAME_DIR .. "src/mame/funtech/*.h", +} + +createMAMEProjects(_target, _subtarget, "funworld") +files { + MAME_DIR .. "src/mame/funworld/*.cpp", + MAME_DIR .. "src/mame/funworld/*.h", +} + +createMAMEProjects(_target, _subtarget, "fuuki") +files { + MAME_DIR .. "src/mame/fuuki/*.cpp", + MAME_DIR .. "src/mame/fuuki/*.h", +} + +createMAMEProjects(_target, _subtarget, "gaelco") +files { + MAME_DIR .. "src/mame/gaelco/*.cpp", + MAME_DIR .. "src/mame/gaelco/*.h", +} + +createMAMEProjects(_target, _subtarget, "galaxian") +files { + MAME_DIR .. "src/mame/galaxian/*.cpp", + MAME_DIR .. "src/mame/galaxian/*.h", +} + +createMAMEProjects(_target, _subtarget, "galaxy") +files { + MAME_DIR .. "src/mame/galaxy/*.cpp", + MAME_DIR .. "src/mame/galaxy/*.h", +} + +createMAMEProjects(_target, _subtarget, "gamepark") +files { + MAME_DIR .. "src/mame/gamepark/*.cpp", + MAME_DIR .. "src/mame/gamepark/*.h", +} + +createMAMEProjects(_target, _subtarget, "gameplan") +files { + MAME_DIR .. "src/mame/gameplan/*.cpp", + MAME_DIR .. "src/mame/gameplan/*.h", +} + +createMAMEProjects(_target, _subtarget, "gametron") +files { + MAME_DIR .. "src/mame/gametron/*.cpp", + MAME_DIR .. "src/mame/gametron/*.h", +} + +createMAMEProjects(_target, _subtarget, "gottlieb") +files { + MAME_DIR .. "src/mame/gottlieb/*.cpp", + MAME_DIR .. "src/mame/gottlieb/*.h", +} + +createMAMEProjects(_target, _subtarget, "gridcomp") +files { + MAME_DIR .. "src/mame/gridcomp/*.cpp", + MAME_DIR .. "src/mame/gridcomp/*.h", +} + +createMAMEProjects(_target, _subtarget, "grundy") +files { + MAME_DIR .. "src/mame/grundy/*.cpp", + MAME_DIR .. "src/mame/grundy/*.h", +} + +createMAMEProjects(_target, _subtarget, "h01x") +files { + MAME_DIR .. "src/mame/h01x/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "handheld") +files { + MAME_DIR .. "src/mame/handheld/*.cpp", + MAME_DIR .. "src/mame/handheld/*.h", +} + +createMAMEProjects(_target, _subtarget, "hartung") +files { + MAME_DIR .. "src/mame/hartung/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "hds") +files { + MAME_DIR .. "src/mame/hds/*.cpp", + MAME_DIR .. "src/mame/hds/*.h", +} + +createMAMEProjects(_target, _subtarget, "heathkit") +files { + MAME_DIR .. "src/mame/heathkit/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "hec2hrp") +files { + MAME_DIR .. "src/mame/hec2hrp/*.cpp", + MAME_DIR .. "src/mame/hec2hrp/*.h", +} + +createMAMEProjects(_target, _subtarget, "hegener") +files { + MAME_DIR .. "src/mame/hegener/*.cpp", + MAME_DIR .. "src/mame/hegener/*.h", +} + +createMAMEProjects(_target, _subtarget, "heurikon") +files { + MAME_DIR .. "src/mame/heurikon/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "hitachi") +files { + MAME_DIR .. "src/mame/hitachi/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "homebrew") +files { + MAME_DIR .. "src/mame/homebrew/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "homelab") +files { + MAME_DIR .. "src/mame/homelab/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "hp") +files { + MAME_DIR .. "src/mame/hp/*.cpp", + MAME_DIR .. "src/mame/hp/*.h", +} + +createMAMEProjects(_target, _subtarget, "husky") +files { + MAME_DIR .. "src/mame/husky/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ibm6580") +files { + MAME_DIR .. "src/mame/ibm6580/*.cpp", + MAME_DIR .. "src/mame/ibm6580/*.h", +} + +createMAMEProjects(_target, _subtarget, "ibmpc") +files { + MAME_DIR .. "src/mame/ibmpc/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ie15") +files { + MAME_DIR .. "src/mame/ie15/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "igs") +files { + MAME_DIR .. "src/mame/igs/*.cpp", + MAME_DIR .. "src/mame/igs/*.h", +} + +createMAMEProjects(_target, _subtarget, "igt") +files { + MAME_DIR .. "src/mame/igt/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "informer") +files { + MAME_DIR .. "src/mame/informer/*.cpp", + MAME_DIR .. "src/mame/informer/*.h", +} + +createMAMEProjects(_target, _subtarget, "intel") +files { + MAME_DIR .. "src/mame/intel/*.cpp", + MAME_DIR .. "src/mame/intel/*.h", +} + +createMAMEProjects(_target, _subtarget, "imp") +files { + MAME_DIR .. "src/mame/imp/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "interpro") +files { + MAME_DIR .. "src/mame/interpro/*.cpp", + MAME_DIR .. "src/mame/interpro/*.h", +} + +createMAMEProjects(_target, _subtarget, "interton") +files { + MAME_DIR .. "src/mame/interton/*.cpp", + MAME_DIR .. "src/mame/interton/*.h", +} + +createMAMEProjects(_target, _subtarget, "intv") +files { + MAME_DIR .. "src/mame/intv/*.cpp", + MAME_DIR .. "src/mame/intv/*.h", +} + +createMAMEProjects(_target, _subtarget, "irem") +files { + MAME_DIR .. "src/mame/irem/*.cpp", + MAME_DIR .. "src/mame/irem/*.h", +} + +createMAMEProjects(_target, _subtarget, "itech") +files { + MAME_DIR .. "src/mame/itech/*.cpp", + MAME_DIR .. "src/mame/itech/*.h", +} + +createMAMEProjects(_target, _subtarget, "isc") +files { + MAME_DIR .. "src/mame/isc/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "jaleco") +files { + MAME_DIR .. "src/mame/jaleco/*.cpp", + MAME_DIR .. "src/mame/jaleco/*.h", +} + +createMAMEProjects(_target, _subtarget, "jazz") +files { + MAME_DIR .. "src/mame/jazz/*.cpp", + MAME_DIR .. "src/mame/jazz/*.h", +} + +createMAMEProjects(_target, _subtarget, "jpm") +files { + MAME_DIR .. "src/mame/jpm/*.cpp", + MAME_DIR .. "src/mame/jpm/*.h", +} + +createMAMEProjects(_target, _subtarget, "kaneko") +files { + MAME_DIR .. "src/mame/kaneko/*.cpp", + MAME_DIR .. "src/mame/kaneko/*.h", +} + +createMAMEProjects(_target, _subtarget, "kawai") +files { + MAME_DIR .. "src/mame/kawai/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "kaypro") +files { + MAME_DIR .. "src/mame/kaypro/*.cpp", + MAME_DIR .. "src/mame/kaypro/*.h", +} + +createMAMEProjects(_target, _subtarget, "kiwako") +files { + MAME_DIR .. "src/mame/kiwako/*.cpp", + MAME_DIR .. "src/mame/kiwako/*.h", +} + +createMAMEProjects(_target, _subtarget, "koei") +files { + MAME_DIR .. "src/mame/koei/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "konami") +files { + MAME_DIR .. "src/mame/konami/*.cpp", + MAME_DIR .. "src/mame/konami/*.h", +} + +createMAMEProjects(_target, _subtarget, "kontron") +files { + MAME_DIR .. "src/mame/kontron/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "korg") +files { + MAME_DIR .. "src/mame/korg/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "kurzweil") +files { + MAME_DIR .. "src/mame/kurzweil/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "kyber") +files { + MAME_DIR .. "src/mame/kyber/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "kyocera") +files { + MAME_DIR .. "src/mame/kyocera/*.cpp", + MAME_DIR .. "src/mame/kyocera/*.h", +} + +createMAMEProjects(_target, _subtarget, "labtam") +files { + MAME_DIR .. "src/mame/labtam/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "leapfrog") +files { + MAME_DIR .. "src/mame/leapfrog/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "learsiegler") +files { + MAME_DIR .. "src/mame/learsiegler/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "lsi") +files { + MAME_DIR .. "src/mame/lsi/*.cpp", + MAME_DIR .. "src/mame/lsi/*.h", +} + +createMAMEProjects(_target, _subtarget, "luxor") +files { + MAME_DIR .. "src/mame/luxor/*.cpp", + MAME_DIR .. "src/mame/luxor/*.h", +} + +createMAMEProjects(_target, _subtarget, "magnavox") +files { + MAME_DIR .. "src/mame/magnavox/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "makerbot") +files { + MAME_DIR .. "src/mame/makerbot/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "matic") +files { + MAME_DIR .. "src/mame/matic/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "matsushi") +files { + MAME_DIR .. "src/mame/matsushi/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "mattel") +files { + MAME_DIR .. "src/mame/mattel/*.cpp", + MAME_DIR .. "src/mame/mattel/*.h", +} + +createMAMEProjects(_target, _subtarget, "maygay") +files { + MAME_DIR .. "src/mame/maygay/*.cpp", + MAME_DIR .. "src/mame/maygay/*.h", +} + +createMAMEProjects(_target, _subtarget, "mb") +files { + MAME_DIR .. "src/mame/mb/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "mchester") +files { + MAME_DIR .. "src/mame/mchester/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "meadows") +files { + MAME_DIR .. "src/mame/meadows/*.cpp", + MAME_DIR .. "src/mame/meadows/*.h", +} + +createMAMEProjects(_target, _subtarget, "memotech") +files { + MAME_DIR .. "src/mame/memotech/*.cpp", + MAME_DIR .. "src/mame/memotech/*.h", +} + +createMAMEProjects(_target, _subtarget, "mera") +files { + MAME_DIR .. "src/mame/mera/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "merit") +files { + MAME_DIR .. "src/mame/merit/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "metro") +files { + MAME_DIR .. "src/mame/metro/*.cpp", + MAME_DIR .. "src/mame/metro/*.h", +} + +createMAMEProjects(_target, _subtarget, "mg1") +files { + MAME_DIR .. "src/mame/mg1/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "mgu") +files { + MAME_DIR .. "src/mame/mgu/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "microkey") +files { + MAME_DIR .. "src/mame/microkey/*.cpp", + MAME_DIR .. "src/mame/microkey/*.h", +} + +createMAMEProjects(_target, _subtarget, "microsoft") +files { + MAME_DIR .. "src/mame/microsoft/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "microterm") +files { + MAME_DIR .. "src/mame/microterm/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "midcoin") +files { + MAME_DIR .. "src/mame/midcoin/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "midw8080") +files { + MAME_DIR .. "src/mame/midw8080/*.cpp", + MAME_DIR .. "src/mame/midw8080/*.h", +} + +createMAMEProjects(_target, _subtarget, "midway") +files { + MAME_DIR .. "src/mame/midway/*.cpp", + MAME_DIR .. "src/mame/midway/*.h", + MAME_DIR .. "src/mame/midway/*.ipp", +} + +createMAMEProjects(_target, _subtarget, "mips") +files { + MAME_DIR .. "src/mame/mips/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "mit") +files { + MAME_DIR .. "src/mame/mit/*.cpp", + MAME_DIR .. "src/mame/mit/*.h", +} + +createMAMEProjects(_target, _subtarget, "mits") +files { + MAME_DIR .. "src/mame/mits/*.cpp", + MAME_DIR .. "src/mame/mits/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "mitsubishi") +files { + MAME_DIR .. "src/mame/mitsubishi/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "mizar") +files { + MAME_DIR .. "src/mame/mizar/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "morrow") +files { + MAME_DIR .. "src/mame/morrow/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "mos") +files { + MAME_DIR .. "src/mame/mos/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "motorola") +files { + MAME_DIR .. "src/mame/motorola/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "mr") +files { + MAME_DIR .. "src/mame/mr/*.cpp", + MAME_DIR .. "src/mame/mr/*.h", +} + +createMAMEProjects(_target, _subtarget, "multitch") +files { + MAME_DIR .. "src/mame/multitch/*.cpp", + MAME_DIR .. "src/mame/multitch/*.h", +} + +createMAMEProjects(_target, _subtarget, "mupid") +files { + MAME_DIR .. "src/mame/mupid/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "nakajima") +files { + MAME_DIR .. "src/mame/nakajima/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "namco") +files { + MAME_DIR .. "src/mame/namco/*.cpp", + MAME_DIR .. "src/mame/namco/*.h", +} + +createMAMEProjects(_target, _subtarget, "nasco") +files { + MAME_DIR .. "src/mame/nasco/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "nascom") +files { + MAME_DIR .. "src/mame/nascom/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "natsemi") +files { + MAME_DIR .. "src/mame/natsemi/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ncd") +files { + MAME_DIR .. "src/mame/ncd/*.cpp", + MAME_DIR .. "src/mame/ncd/*.h", +} + +createMAMEProjects(_target, _subtarget, "ne") +files { + MAME_DIR .. "src/mame/ne/*.cpp", + MAME_DIR .. "src/mame/ne/*.h", +} + +createMAMEProjects(_target, _subtarget, "nec") +files { + MAME_DIR .. "src/mame/nec/*.cpp", + MAME_DIR .. "src/mame/nec/*.h", +} + +createMAMEProjects(_target, _subtarget, "neogeo") +files { + MAME_DIR .. "src/mame/neogeo/*.cpp", + MAME_DIR .. "src/mame/neogeo/*.h", +} + +createMAMEProjects(_target, _subtarget, "netronic") +files { + MAME_DIR .. "src/mame/netronic/*.cpp", + MAME_DIR .. "src/mame/netronic/*.h", + MAME_DIR .. "src/mame/netronic/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "next") +files { + MAME_DIR .. "src/mame/next/*.cpp", + MAME_DIR .. "src/mame/next/*.h", +} + +createMAMEProjects(_target, _subtarget, "nichibut") +files { + MAME_DIR .. "src/mame/nichibut/*.cpp", + MAME_DIR .. "src/mame/nichibut/*.h", +} + +createMAMEProjects(_target, _subtarget, "nintendo") +files { + MAME_DIR .. "src/mame/nintendo/*.cpp", + MAME_DIR .. "src/mame/nintendo/*.h", + MAME_DIR .. "src/mame/nintendo/*.ipp", +} + +createMAMEProjects(_target, _subtarget, "nix") +files { + MAME_DIR .. "src/mame/nix/*.cpp", + MAME_DIR .. "src/mame/nix/*.h", +} + +createMAMEProjects(_target, _subtarget, "nmk") +files { + MAME_DIR .. "src/mame/nmk/*.cpp", + MAME_DIR .. "src/mame/nmk/*.h", +} + +createMAMEProjects(_target, _subtarget, "nokia") +files { + MAME_DIR .. "src/mame/nokia/*.cpp", + MAME_DIR .. "src/mame/nokia/*.h", +} + +createMAMEProjects(_target, _subtarget, "northstar") +files { + MAME_DIR .. "src/mame/northstar/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "novadesitec") +files { + MAME_DIR .. "src/mame/novadesitec/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "novag") +files { + MAME_DIR .. "src/mame/novag/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "novation") +files { + MAME_DIR .. "src/mame/novation/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "olivetti") +files { + MAME_DIR .. "src/mame/olivetti/*.cpp", + MAME_DIR .. "src/mame/olivetti/*.h", +} + +createMAMEProjects(_target, _subtarget, "olympia") +files { + MAME_DIR .. "src/mame/olympia/*.cpp", + MAME_DIR .. "src/mame/olympia/*.h", +} + +createMAMEProjects(_target, _subtarget, "omnibyte") +files { + MAME_DIR .. "src/mame/omnibyte/*.cpp", + MAME_DIR .. "src/mame/omnibyte/*.h", +} + +createMAMEProjects(_target, _subtarget, "omori") +files { + MAME_DIR .. "src/mame/omori/*.cpp", + MAME_DIR .. "src/mame/omori/*.h", +} + +createMAMEProjects(_target, _subtarget, "omron") +files { + MAME_DIR .. "src/mame/omron/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "openuni") +files { + MAME_DIR .. "src/mame/openuni/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "orca") +files { + MAME_DIR .. "src/mame/orca/*.cpp", + MAME_DIR .. "src/mame/orca/*.h", +} + +createMAMEProjects(_target, _subtarget, "osborne") +files { + MAME_DIR .. "src/mame/osborne/*.cpp", + MAME_DIR .. "src/mame/osborne/*.h", +} + +createMAMEProjects(_target, _subtarget, "osi") +files { + MAME_DIR .. "src/mame/osi/*.cpp", + MAME_DIR .. "src/mame/osi/*.h", +} + +createMAMEProjects(_target, _subtarget, "pacific") +files { + MAME_DIR .. "src/mame/pacific/*.cpp", + MAME_DIR .. "src/mame/pacific/*.h", +} + +createMAMEProjects(_target, _subtarget, "pacman") +files { + MAME_DIR .. "src/mame/pacman/*.cpp", + MAME_DIR .. "src/mame/pacman/*.h", +} + +createMAMEProjects(_target, _subtarget, "palm") +files { + MAME_DIR .. "src/mame/palm/*.cpp", + MAME_DIR .. "src/mame/palm/*.ipp", +} + +createMAMEProjects(_target, _subtarget, "parker") +files { + MAME_DIR .. "src/mame/parker/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "pc") +files { + MAME_DIR .. "src/mame/pc/*.cpp", + MAME_DIR .. "src/mame/pc/*.h", +} + +createMAMEProjects(_target, _subtarget, "pce") +files { + MAME_DIR .. "src/mame/pce/*.cpp", + MAME_DIR .. "src/mame/pce/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "pdp1") +files { + MAME_DIR .. "src/mame/pdp1/*.cpp", + MAME_DIR .. "src/mame/pdp1/*.h", +} + +createMAMEProjects(_target, _subtarget, "pel") +files { + MAME_DIR .. "src/mame/pel/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "philips") +files { + MAME_DIR .. "src/mame/philips/*.cpp", + MAME_DIR .. "src/mame/philips/*.h", +} + +createMAMEProjects(_target, _subtarget, "phoenix") +files { + MAME_DIR .. "src/mame/phoenix/*.cpp", + MAME_DIR .. "src/mame/phoenix/*.h", +} + +createMAMEProjects(_target, _subtarget, "pitronic") +files { + MAME_DIR .. "src/mame/pitronic/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "playmark") +files { + MAME_DIR .. "src/mame/playmark/*.cpp", + MAME_DIR .. "src/mame/playmark/*.h", +} + +createMAMEProjects(_target, _subtarget, "poly") +files { + MAME_DIR .. "src/mame/poly/*.cpp", + MAME_DIR .. "src/mame/poly/*.h", +} + +createMAMEProjects(_target, _subtarget, "poly88") +files { + MAME_DIR .. "src/mame/poly88/*.cpp", + MAME_DIR .. "src/mame/poly88/*.h", +} + +createMAMEProjects(_target, _subtarget, "positron") +files { + MAME_DIR .. "src/mame/positron/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "promat") +files { + MAME_DIR .. "src/mame/promat/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "psikyo") +files { + MAME_DIR .. "src/mame/psikyo/*.cpp", + MAME_DIR .. "src/mame/psikyo/*.h", +} + +createMAMEProjects(_target, _subtarget, "psion") +files { + MAME_DIR .. "src/mame/psion/*.cpp", + MAME_DIR .. "src/mame/psion/*.h", +} + +createMAMEProjects(_target, _subtarget, "quantel") +files { + MAME_DIR .. "src/mame/quantel/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "qume") +files { + MAME_DIR .. "src/mame/qume/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "radio") +files { + MAME_DIR .. "src/mame/radio/*.cpp", + MAME_DIR .. "src/mame/radio/*.h", +} + +createMAMEProjects(_target, _subtarget, "ramtek") +files { + MAME_DIR .. "src/mame/ramtek/*.cpp", + MAME_DIR .. "src/mame/ramtek/*.h", +} + +createMAMEProjects(_target, _subtarget, "rare") +files { + MAME_DIR .. "src/mame/rare/*.cpp", + MAME_DIR .. "src/mame/rare/*.h", +} + +createMAMEProjects(_target, _subtarget, "rca") +files { + MAME_DIR .. "src/mame/rca/*.cpp", + MAME_DIR .. "src/mame/rca/*.h", +} + +createMAMEProjects(_target, _subtarget, "regnecentralen") +files { + MAME_DIR .. "src/mame/regnecentralen/*.cpp", + MAME_DIR .. "src/mame/regnecentralen/*.h", +} + +createMAMEProjects(_target, _subtarget, "ritam") +files { + MAME_DIR .. "src/mame/ritam/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "rm") +files { + MAME_DIR .. "src/mame/rm/*.cpp", + MAME_DIR .. "src/mame/rm/*.h", +} + +createMAMEProjects(_target, _subtarget, "robotron") +files { + MAME_DIR .. "src/mame/robotron/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "roland") +files { + MAME_DIR .. "src/mame/roland/*.cpp", + MAME_DIR .. "src/mame/roland/*.h", +} + +createMAMEProjects(_target, _subtarget, "rolm") +files { + MAME_DIR .. "src/mame/rolm/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "rockwell") +files { + MAME_DIR .. "src/mame/rockwell/*.cpp", + MAME_DIR .. "src/mame/rockwell/*.h", +} + +createMAMEProjects(_target, _subtarget, "rtpc") +files { + MAME_DIR .. "src/mame/rtpc/*.cpp", + MAME_DIR .. "src/mame/rtpc/*.h", +} + +createMAMEProjects(_target, _subtarget, "sage") +files { + MAME_DIR .. "src/mame/sage/*.cpp", + MAME_DIR .. "src/mame/sage/*.h", +} + +createMAMEProjects(_target, _subtarget, "saitek") +files { + MAME_DIR .. "src/mame/saitek/*.cpp", + MAME_DIR .. "src/mame/saitek/*.h", +} + +createMAMEProjects(_target, _subtarget, "samcoupe") +files { + MAME_DIR .. "src/mame/samcoupe/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "samsung") +files { + MAME_DIR .. "src/mame/samsung/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "sanritsu") +files { + MAME_DIR .. "src/mame/sanritsu/*.cpp", + MAME_DIR .. "src/mame/sanritsu/*.h", +} + +createMAMEProjects(_target, _subtarget, "sanyo") +files { + MAME_DIR .. "src/mame/sanyo/*.cpp", + MAME_DIR .. "src/mame/sanyo/*.h", +} + +createMAMEProjects(_target, _subtarget, "saturn") +files { + MAME_DIR .. "src/mame/saturn/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "sega") +files { + MAME_DIR .. "src/mame/sega/*.cpp", + MAME_DIR .. "src/mame/sega/*.h", + MAME_DIR .. "src/mame/sega/*.ipp", +} + +createMAMEProjects(_target, _subtarget, "segacons") +files { + MAME_DIR .. "src/mame/segacons/*.cpp", + MAME_DIR .. "src/mame/segacons/*.h", +} + +createMAMEProjects(_target, _subtarget, "seibu") +files { + MAME_DIR .. "src/mame/seibu/*.cpp", + MAME_DIR .. "src/mame/seibu/*.h", + MAME_DIR .. "src/mame/seibu/*.ipp", +} + +createMAMEProjects(_target, _subtarget, "selchow") +files { + MAME_DIR .. "src/mame/selchow/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "sequential") +files { + MAME_DIR .. "src/mame/sequential/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "seta") +files { + MAME_DIR .. "src/mame/seta/*.cpp", + MAME_DIR .. "src/mame/seta/*.h", +} + +createMAMEProjects(_target, _subtarget, "sgi") +files { + MAME_DIR .. "src/mame/sgi/*.cpp", + MAME_DIR .. "src/mame/sgi/*.h", +} + +createMAMEProjects(_target, _subtarget, "sharp") +files { + MAME_DIR .. "src/mame/sharp/*.cpp", + MAME_DIR .. "src/mame/sharp/*.h", +} + +createMAMEProjects(_target, _subtarget, "siemens") +files { + MAME_DIR .. "src/mame/siemens/*.cpp", + MAME_DIR .. "src/mame/siemens/*.h", +} + +createMAMEProjects(_target, _subtarget, "sinclair") +files { + MAME_DIR .. "src/mame/sinclair/*.cpp", + MAME_DIR .. "src/mame/sinclair/*.h", +} + +createMAMEProjects(_target, _subtarget, "sigma") +files { + MAME_DIR .. "src/mame/sigma/*.cpp", + MAME_DIR .. "src/mame/sigma/*.h", +} + +createMAMEProjects(_target, _subtarget, "slicer") +files { + MAME_DIR .. "src/mame/slicer/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "snk") +files { + MAME_DIR .. "src/mame/snk/*.cpp", + MAME_DIR .. "src/mame/snk/*.h", + MAME_DIR .. "src/mame/snk/*.ipp", +} + +createMAMEProjects(_target, _subtarget, "sony") +files { + MAME_DIR .. "src/mame/sony/*.cpp", + MAME_DIR .. "src/mame/sony/*.h", +} + +createMAMEProjects(_target, _subtarget, "sony_news") +files { + MAME_DIR .. "src/mame/sony_news/*.cpp", + MAME_DIR .. "src/mame/sony_news/*.h", +} + +createMAMEProjects(_target, _subtarget, "sord") +files { + MAME_DIR .. "src/mame/sord/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "special") +files { + MAME_DIR .. "src/mame/special/*.cpp", + MAME_DIR .. "src/mame/special/*.h", +} + +createMAMEProjects(_target, _subtarget, "stern") +files { + MAME_DIR .. "src/mame/stern/*.cpp", + MAME_DIR .. "src/mame/stern/*.h", +} + +createMAMEProjects(_target, _subtarget, "stm") +files { + MAME_DIR .. "src/mame/stm/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "subsino") +files { + MAME_DIR .. "src/mame/subsino/*.cpp", + MAME_DIR .. "src/mame/subsino/*.h", +} + +createMAMEProjects(_target, _subtarget, "sun") +files { + MAME_DIR .. "src/mame/sun/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "suna") +files { + MAME_DIR .. "src/mame/suna/*.cpp", + MAME_DIR .. "src/mame/suna/*.h", +} + +createMAMEProjects(_target, _subtarget, "sunelect") +files { + MAME_DIR .. "src/mame/sunelect/*.cpp", + MAME_DIR .. "src/mame/sunelect/*.h", +} + +createMAMEProjects(_target, _subtarget, "svi") +files { + MAME_DIR .. "src/mame/svi/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "svision") +files { + MAME_DIR .. "src/mame/svision/*.cpp", + MAME_DIR .. "src/mame/svision/*.h", +} + +createMAMEProjects(_target, _subtarget, "swtpc") +files { + MAME_DIR .. "src/mame/swtpc/*.cpp", + MAME_DIR .. "src/mame/swtpc/*.h", +} + +createMAMEProjects(_target, _subtarget, "synertek") +files { + MAME_DIR .. "src/mame/synertek/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ta") +files { + MAME_DIR .. "src/mame/ta/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "tab") +files { + MAME_DIR .. "src/mame/tab/*.cpp", + MAME_DIR .. "src/mame/tab/*.h", +} + +createMAMEProjects(_target, _subtarget, "taito") +files { + MAME_DIR .. "src/mame/taito/*.cpp", + MAME_DIR .. "src/mame/taito/*.h", +} + +createMAMEProjects(_target, _subtarget, "tandberg") +files { + MAME_DIR .. "src/mame/tandberg/*.cpp", + MAME_DIR .. "src/mame/tandberg/*.h", +} + +createMAMEProjects(_target, _subtarget, "tangerin") +files { + MAME_DIR .. "src/mame/tangerin/*.cpp", + MAME_DIR .. "src/mame/tangerin/*.h", +} + +createMAMEProjects(_target, _subtarget, "tasc") +files { + MAME_DIR .. "src/mame/tasc/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "tatsumi") +files { + MAME_DIR .. "src/mame/tatsumi/*.cpp", + MAME_DIR .. "src/mame/tatsumi/*.h", +} + +createMAMEProjects(_target, _subtarget, "tatung") +files { + MAME_DIR .. "src/mame/tatung/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "tch") +files { + MAME_DIR .. "src/mame/tch/*.cpp", + MAME_DIR .. "src/mame/tch/*.h", +} + +createMAMEProjects(_target, _subtarget, "teamconc") +files { + MAME_DIR .. "src/mame/teamconc/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "tecfri") +files { + MAME_DIR .. "src/mame/tecfri/*.cpp", + MAME_DIR .. "src/mame/tecfri/*.h", +} + +createMAMEProjects(_target, _subtarget, "technos") +files { + MAME_DIR .. "src/mame/technos/*.cpp", + MAME_DIR .. "src/mame/technos/*.h", +} + +createMAMEProjects(_target, _subtarget, "tectoy") +files { + MAME_DIR .. "src/mame/tectoy/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "tehkan") +files { + MAME_DIR .. "src/mame/tehkan/*.cpp", + MAME_DIR .. "src/mame/tehkan/*.h", +} + +createMAMEProjects(_target, _subtarget, "tektroni") +files { + MAME_DIR .. "src/mame/tektroni/*.cpp", + MAME_DIR .. "src/mame/tektroni/*.h", +} + +createMAMEProjects(_target, _subtarget, "telenova") +files { + MAME_DIR .. "src/mame/telenova/*.cpp", + MAME_DIR .. "src/mame/telenova/*.h", +} + +createMAMEProjects(_target, _subtarget, "telercas") +files { + MAME_DIR .. "src/mame/telercas/*.cpp", + MAME_DIR .. "src/mame/telercas/*.h", +} + +createMAMEProjects(_target, _subtarget, "televideo") +files { + MAME_DIR .. "src/mame/televideo/*.cpp", + MAME_DIR .. "src/mame/televideo/*.h", +} + +createMAMEProjects(_target, _subtarget, "terminal") +files { + MAME_DIR .. "src/mame/terminal/*.cpp", + MAME_DIR .. "src/mame/terminal/*.h", +} + +createMAMEProjects(_target, _subtarget, "tesla") +files { + MAME_DIR .. "src/mame/tesla/*.cpp", + MAME_DIR .. "src/mame/tesla/*.h", +} + +createMAMEProjects(_target, _subtarget, "thepit") +files { + MAME_DIR .. "src/mame/thepit/*.cpp", + MAME_DIR .. "src/mame/thepit/*.h", +} + +createMAMEProjects(_target, _subtarget, "toaplan") +files { + MAME_DIR .. "src/mame/toaplan/*.cpp", + MAME_DIR .. "src/mame/toaplan/*.h", +} + +createMAMEProjects(_target, _subtarget, "thomson") +files { + MAME_DIR .. "src/mame/thomson/*.cpp", + MAME_DIR .. "src/mame/thomson/*.h", +} + +createMAMEProjects(_target, _subtarget, "ti") +files { + MAME_DIR .. "src/mame/ti/*.cpp", + MAME_DIR .. "src/mame/ti/*.h", +} + +createMAMEProjects(_target, _subtarget, "tiger") +files { + MAME_DIR .. "src/mame/tiger/*.cpp", + MAME_DIR .. "src/mame/tiger/*.h", +} + +createMAMEProjects(_target, _subtarget, "tigertel") +files { + MAME_DIR .. "src/mame/tigertel/*.cpp", + MAME_DIR .. "src/mame/tigertel/*.h", +} + +createMAMEProjects(_target, _subtarget, "tiki") +files { + MAME_DIR .. "src/mame/tiki/*.cpp", + MAME_DIR .. "src/mame/tiki/*.h", +} + +createMAMEProjects(_target, _subtarget, "tomy") +files { + MAME_DIR .. "src/mame/tomy/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "toshiba") +files { + MAME_DIR .. "src/mame/toshiba/*.h", + MAME_DIR .. "src/mame/toshiba/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "trainer") +files { + MAME_DIR .. "src/mame/trainer/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "trs") +files { + MAME_DIR .. "src/mame/trs/*.cpp", + MAME_DIR .. "src/mame/trs/*.h", +} + +createMAMEProjects(_target, _subtarget, "tvgames") +files { + MAME_DIR .. "src/mame/tvgames/*.cpp", + MAME_DIR .. "src/mame/tvgames/*.h", +} + +createMAMEProjects(_target, _subtarget, "ultimachine") +files { + MAME_DIR .. "src/mame/ultimachine/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "ultratec") +files { + MAME_DIR .. "src/mame/ultratec/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "unicard") +files { + MAME_DIR .. "src/mame/unicard/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "unico") +files { + MAME_DIR .. "src/mame/unico/*.cpp", + MAME_DIR .. "src/mame/unico/*.h", +} + +createMAMEProjects(_target, _subtarget, "unisonic") +files { + MAME_DIR .. "src/mame/unisonic/*.cpp", + MAME_DIR .. "src/mame/unisonic/*.h", +} + +createMAMEProjects(_target, _subtarget, "unisys") +files { + MAME_DIR .. "src/mame/unisys/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "univers") +files { + MAME_DIR .. "src/mame/univers/*.cpp", + MAME_DIR .. "src/mame/univers/*.h", +} + +createMAMEProjects(_target, _subtarget, "upl") +files { + MAME_DIR .. "src/mame/upl/*.cpp", + MAME_DIR .. "src/mame/upl/*.h", +} + +createMAMEProjects(_target, _subtarget, "usp") +files { + MAME_DIR .. "src/mame/usp/*.cpp", + MAME_DIR .. "src/mame/usp/*.h", +} + +createMAMEProjects(_target, _subtarget, "valadon") +files { + MAME_DIR .. "src/mame/valadon/*.cpp", + MAME_DIR .. "src/mame/valadon/*.h", +} + +createMAMEProjects(_target, _subtarget, "veb") +files { + MAME_DIR .. "src/mame/veb/*.cpp", + MAME_DIR .. "src/mame/veb/*.h", +} + +createMAMEProjects(_target, _subtarget, "venture") +files { + MAME_DIR .. "src/mame/venture/*.cpp", + MAME_DIR .. "src/mame/venture/*.h", +} + +createMAMEProjects(_target, _subtarget, "vsystem") +files { + MAME_DIR .. "src/mame/vsystem/*.cpp", + MAME_DIR .. "src/mame/vsystem/*.h", +} + +createMAMEProjects(_target, _subtarget, "verifone") +files { + MAME_DIR .. "src/mame/verifone/*.cpp", + MAME_DIR .. "src/mame/verifone/*.h" +} + +createMAMEProjects(_target, _subtarget, "vidbrain") +files { + MAME_DIR .. "src/mame/vidbrain/*.cpp", + MAME_DIR .. "src/mame/vidbrain/*.h", +} + +createMAMEProjects(_target, _subtarget, "videoton") +files { + MAME_DIR .. "src/mame/videoton/*.cpp", + MAME_DIR .. "src/mame/videoton/*.h", +} + +createMAMEProjects(_target, _subtarget, "visual") +files { + MAME_DIR .. "src/mame/visual/*.cpp", + MAME_DIR .. "src/mame/visual/*.h", +} + +createMAMEProjects(_target, _subtarget, "votrax") +files { + MAME_DIR .. "src/mame/votrax/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "vtech") +files { + MAME_DIR .. "src/mame/vtech/*.cpp", + MAME_DIR .. "src/mame/vtech/*.h", +} + +createMAMEProjects(_target, _subtarget, "wang") +files { + MAME_DIR .. "src/mame/wang/*.cpp", + MAME_DIR .. "src/mame/wang/*.h", +} + +createMAMEProjects(_target, _subtarget, "westinghouse") +files { + MAME_DIR .. "src/mame/westinghouse/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "wavemate") +files { + MAME_DIR .. "src/mame/wavemate/*.cpp", + MAME_DIR .. "src/mame/wavemate/*.h", +} + +createMAMEProjects(_target, _subtarget, "wing") +files { + MAME_DIR .. "src/mame/wing/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "wyse") +files { + MAME_DIR .. "src/mame/wyse/*.cpp", + MAME_DIR .. "src/mame/wyse/*.h", +} + +createMAMEProjects(_target, _subtarget, "xerox") +files { + MAME_DIR .. "src/mame/xerox/*.cpp", + MAME_DIR .. "src/mame/xerox/*.h", +} + +createMAMEProjects(_target, _subtarget, "xussrpc") +files { + MAME_DIR .. "src/mame/xussrpc/*.cpp", + MAME_DIR .. "src/mame/xussrpc/*.h", +} + +createMAMEProjects(_target, _subtarget, "yamaha") +files { + MAME_DIR .. "src/mame/yamaha/*.cpp", + MAME_DIR .. "src/mame/yamaha/*.h" +} + +createMAMEProjects(_target, _subtarget, "yunsung") +files { + MAME_DIR .. "src/mame/yunsung/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "zaccaria") +files { + MAME_DIR .. "src/mame/zaccaria/*.cpp", + MAME_DIR .. "src/mame/zaccaria/*.h", +} + +createMAMEProjects(_target, _subtarget, "zenith") +files { + MAME_DIR .. "src/mame/zenith/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "zpa") +files { + MAME_DIR .. "src/mame/zpa/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "zvt") +files { + MAME_DIR .. "src/mame/zvt/*.cpp", + MAME_DIR .. "src/mame/zvt/*.h", +} + + +-------------------------------------------------- +-- pinball drivers +-------------------------------------------------- + +createMAMEProjects(_target, _subtarget, "pinball") +files { + MAME_DIR .. "src/mame/pinball/*.cpp", + MAME_DIR .. "src/mame/pinball/*.h", +} + + +-------------------------------------------------- +-- remaining drivers +-------------------------------------------------- + +createMAMEProjects(_target, _subtarget, "misc") +files { + MAME_DIR .. "src/mame/misc/*.cpp", + MAME_DIR .. "src/mame/misc/*.h", +} + +createMAMEProjects(_target, _subtarget, "skeleton") +files { + MAME_DIR .. "src/mame/skeleton/*.cpp", + MAME_DIR .. "src/mame/skeleton/*.h", +} + +createMAMEProjects(_target, _subtarget, "virtual") +files { + MAME_DIR .. "src/mame/virtual/*.cpp", +} + end diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua deleted file mode 100644 index 909bd9e503f..00000000000 --- a/scripts/target/mame/mess.lua +++ /dev/null @@ -1,4847 +0,0 @@ --- license:BSD-3-Clause --- copyright-holders:MAMEdev Team - ---------------------------------------------------------------------------- --- --- mess.lua --- --- MESS target makefile --- ---------------------------------------------------------------------------- - --------------------------------------------------- --- specify available CPU cores --------------------------------------------------- - -CPUS["Z80"] = true ---CPUS["KC80"] = true -CPUS["Z180"] = true -CPUS["I8085"] = true -CPUS["I8089"] = true -CPUS["M6502"] = true -CPUS["ST2XXX"] = true -CPUS["XAVIX"] = true -CPUS["XAVIX2000"] = true -CPUS["H6280"] = true -CPUS["I86"] = true -CPUS["I386"] = true -CPUS["NEC"] = true -CPUS["V30MZ"] = true -CPUS["V60"] = true -CPUS["MCS48"] = true -CPUS["MCS51"] = true -CPUS["MCS96"] = true -CPUS["M6800"] = true -CPUS["M6805"] = true -CPUS["HD6309"] = true -CPUS["M6809"] = true -CPUS["KONAMI"] = true -CPUS["M680X0"] = true -CPUS["T11"] = true -CPUS["S2650"] = true -CPUS["TMS340X0"] = true -CPUS["TMS9900"] = true -CPUS["TMS9995"] = true -CPUS["TMS9900L"] = true -CPUS["Z8000"] = true -CPUS["Z8001"] = true -CPUS["TMS32010"] = true -CPUS["TMS32025"] = true -CPUS["TMS32031"] = true -CPUS["TMS32051"] = true -CPUS["TMS32082"] = true -CPUS["TMS57002"] = true -CPUS["CCPU"] = true -CPUS["ADSP21XX"] = true -CPUS["ASAP"] = true -CPUS["AM29000"] = true -CPUS["UPD7810"] = true -CPUS["ARM"] = true -CPUS["ARM7"] = true -CPUS["JAGUAR"] = true -CPUS["CUBEQCPU"] = true -CPUS["ESRIP"] = true -CPUS["MIPS1"] = true -CPUS["MIPS3"] = true -CPUS["PSX"] = true -CPUS["SH"] = true -CPUS["DSP16"] = true -CPUS["DSP32C"] = true -CPUS["PIC16C5X"] = true -CPUS["PIC16C62X"] = true -CPUS["PIC17"] = true -CPUS["G65816"] = true -CPUS["SPC700"] = true -CPUS["E1"] = true -CPUS["I860"] = true -CPUS["I960"] = true -CPUS["H16"] = true -CPUS["H8"] = true -CPUS["H8500"] = true -CPUS["V810"] = true -CPUS["M37710"] = true -CPUS["POWERPC"] = true -CPUS["SE3208"] = true -CPUS["MC68HC11"] = true -CPUS["ADSP21062"] = true -CPUS["DSP56156"] = true -CPUS["RSP"] = true -CPUS["COP400"] = true -CPUS["TLCS90"] = true -CPUS["TLCS900"] = true -CPUS["MB88XX"] = true -CPUS["MB86233"] = true -CPUS["MB86235"] = true -CPUS["SSP1601"] = true -CPUS["APEXC"] = true -CPUS["CP1610"] = true -CPUS["F8"] = true -CPUS["LH5801"] = true -CPUS["PATINHOFEIO"] = true -CPUS["PDP1"] = true -CPUS["PDP8"] = true -CPUS["TX0"] = true -CPUS["SATURN"] = true -CPUS["SC61860"] = true -CPUS["LR35902"] = true -CPUS["TMS7000"] = true -CPUS["SM8500"] = true -CPUS["MINX"] = true -CPUS["SSEM"] = true -CPUS["DIABLO"] = true -CPUS["AVR8"] = true -CPUS["TMS1000"] = true -CPUS["MCS40"] = true -CPUS["SUPERFX"] = true -CPUS["Z8"] = true -CPUS["I8008"] = true -CPUS["SCMP"] = true -CPUS["MN1880"] = true ---CPUS["MN10200"] = true -CPUS["COSMAC"] = true -CPUS["UNSP"] = true -CPUS["HCD62121"] = true -CPUS["PPS4"] = true -CPUS["PPS41"] = true -CPUS["RW5000"] = true -CPUS["UPD7725"] = true -CPUS["HD61700"] = true -CPUS["LC8670"] = true -CPUS["SCORE"] = true -CPUS["ES5510"] = true -CPUS["SCUDSP"] = true -CPUS["IE15"] = true -CPUS["8X300"] = true -CPUS["ALTO2"] = true ---CPUS["W65816"] = true -CPUS["ARC"] = true -CPUS["ARCOMPACT"] = true -CPUS["AMIS2000"] = true -CPUS["UCOM4"] = true -CPUS["HMCS40"] = true -CPUS["E0C6200"] = true -CPUS["MELPS4"] = true -CPUS["HPHYBRID"] = true -CPUS["SM510"] = true -CPUS["SPARC"] = true -CPUS["NANOPROCESSOR"] = true -CPUS["CLIPPER"] = true -CPUS["CAPRICORN"] = true -CPUS["ALPHA"] = true -CPUS["NS32000"] = true ---CPUS["DSPP"] = true -CPUS["HPC"] = true -CPUS["MEG"] = true -CPUS["DSPV"] = true -CPUS["RII"] = true -CPUS["BCP"] = true -CPUS["F2MC16"] = true -CPUS["CR16B"] = true -CPUS["FR"] = true -CPUS["DSP56000"] = true -CPUS["VT50"] = true -CPUS["VT61"] = true -CPUS["PACE"] = true -CPUS["WE32000"] = true -CPUS["RX01"] = true -CPUS["GTRON"] = true -CPUS["M88000"] = true -CPUS["XAVIX2"] = true -CPUS["UPD78K"] = true -CPUS["ROMP"] = true -CPUS["COPS1"] = true -CPUS["MK1"] = true -CPUS["M68HC16"] = true -CPUS["KS0164"] = true - --------------------------------------------------- --- specify available sound cores; some of these are --- only for MAME and so aren't included --------------------------------------------------- - ---SOUNDS["SAMPLES"] = true -SOUNDS["DAC"] = true -SOUNDS["DMADAC"] = true -SOUNDS["SPEAKER"] = true -SOUNDS["BEEP"] = true -SOUNDS["DISCRETE"] = true -SOUNDS["AY8910"] = true -SOUNDS["YM2154"] = true -SOUNDS["YM2151"] = true -SOUNDS["YM2414"] = true -SOUNDS["YM3806"] = true -SOUNDS["YM2203"] = true -SOUNDS["YM2413"] = true -SOUNDS["YM2608"] = true -SOUNDS["YM2610"] = true -SOUNDS["YM2610B"] = true -SOUNDS["YM2612"] = true ---SOUNDS["YM3438"] = true -SOUNDS["YM3812"] = true -SOUNDS["YM3526"] = true -SOUNDS["Y8950"] = true -SOUNDS["YMF262"] = true -SOUNDS["YMF271"] = true -SOUNDS["YMF278B"] = true -SOUNDS["YMZ280B"] = true -SOUNDS["SN76477"] = true -SOUNDS["SN76496"] = true -SOUNDS["POKEY"] = true -SOUNDS["TIA"] = true -SOUNDS["NES_APU"] = true -SOUNDS["PAULA_8364"] = true -SOUNDS["ASTROCADE"] = true ---SOUNDS["NAMCO"] = true ---SOUNDS["NAMCO_15XX"] = true ---SOUNDS["NAMCO_CUS30"] = true ---SOUNDS["NAMCO_52XX"] = true ---SOUNDS["NAMCO_63701X"] = true -SOUNDS["NAMCO_163"] = true -SOUNDS["T6W28"] = true ---SOUNDS["SNKWAVE"] = true -SOUNDS["C140"] = true -SOUNDS["C352"] = true ---SOUNDS["TMS36XX"] = true ---SOUNDS["TMS3615"] = true -SOUNDS["TMS5110"] = true -SOUNDS["TMS5220"] = true -SOUNDS["VLM5030"] = true ---SOUNDS["ADPCM"] = true -SOUNDS["MSM5205"] = true ---SOUNDS["MSM5232"] = true -SOUNDS["OKIM6258"] = true -SOUNDS["OKIM6295"] = true ---SOUNDS["OKIM6376"] = true ---SOUNDS["OKIM9810"] = true -SOUNDS["UPD7752"] = true -SOUNDS["UPD7759"] = true -SOUNDS["HC55516"] = true ---SOUNDS["TC8830F"] = true ---SOUNDS["K005289"] = true ---SOUNDS["K007232"] = true -SOUNDS["K051649"] = true -SOUNDS["K053260"] = true -SOUNDS["K054539"] = true ---SOUNDS["K056800"] = true -SOUNDS["SEGAPCM"] = true -SOUNDS["MULTIPCM"] = true -SOUNDS["SCSP"] = true -SOUNDS["AICA"] = true -SOUNDS["RF5C68"] = true ---SOUNDS["RF5C400"] = true ---SOUNDS["CEM3394"] = true -SOUNDS["QSOUND"] = true ---SOUNDS["QS1000"] = true -SOUNDS["SAA1099"] = true -SOUNDS["IREMGA20"] = true -SOUNDS["ES5503"] = true -SOUNDS["ES5505"] = true -SOUNDS["ES5506"] = true ---SOUNDS["BSMT2000"] = true ---SOUNDS["GAELCO_CG1V"] = true ---SOUNDS["GAELCO_GAE1"] = true -SOUNDS["HUC6230"] = true -SOUNDS["C6280"] = true -SOUNDS["SP0250"] = true -SOUNDS["SPU"] = true -SOUNDS["CDDA"] = true ---SOUNDS["ICS2115"] = true ---SOUNDS["I5000_SND"] = true ---SOUNDS["ST0016"] = true ---SOUNDS["SETAPCM"] = true -SOUNDS["X1_010"] = true ---SOUNDS["VRENDER0"] = true -SOUNDS["VOTRAX"] = true ---SOUNDS["ES8712"] = true -SOUNDS["CDP1869"] = true -SOUNDS["S14001A"] = true -SOUNDS["WAVE"] = true -SOUNDS["SID6581"] = true -SOUNDS["SID8580"] = true -SOUNDS["SP0256"] = true ---SOUNDS["DIGITALKER"] = true -SOUNDS["CDP1863"] = true -SOUNDS["CDP1864"] = true ---SOUNDS["ZSG2"] = true -SOUNDS["MOS656X"] = true -SOUNDS["ASC"] = true ---SOUNDS["MAS3507D"] = true -SOUNDS["SOCRATES"] = true -SOUNDS["TMC0285"] = true -SOUNDS["TMS5200"] = true -SOUNDS["CD2801"] = true -SOUNDS["CD2802"] = true ---SOUNDS["M58817"] = true -SOUNDS["TMC0281"] = true -SOUNDS["TMS5100"] = true -SOUNDS["TMS5110A"] = true -SOUNDS["LMC1992"] = true -SOUNDS["AWACS"] = true ---SOUNDS["YMZ770"] = true ---SOUNDS["MPEG_AUDIO"] = true -SOUNDS["T6721A"] = true -SOUNDS["MOS7360"] = true -SOUNDS["ESQPUMP"] = true -SOUNDS["VRC6"] = true ---SOUNDS["SB0400"] = true ---SOUNDS["AC97"] = true ---SOUNDS["ES1373"] = true -SOUNDS["L7A1045"] = true -SOUNDS["AD1848"] = true -SOUNDS["UPD1771"] = true -SOUNDS["GB_SOUND"] = true -SOUNDS["PCD3311"] = true -SOUNDS["MEA8000"] = true ---SOUNDS["DAC76"] = true ---SOUNDS["MM5837"] = true -SOUNDS["DAVE"] = true ---SOUNDS["LC7535"] = true -SOUNDS["UPD934G"] = true -SOUNDS["IOPSPU"] = true -SOUNDS["SWP00"] = true -SOUNDS["SWP20"] = true -SOUNDS["SWP30"] = true ---SOUNDS["XT446"] = true -SOUNDS["S_DSP"] = true -SOUNDS["ROLANDPCM"] = true ---SOUNDS["TT5665"] = true -SOUNDS["RP2C33_SOUND"] = true -SOUNDS["UDA1344"] = true -SOUNDS["LYNX"] = true -SOUNDS["VGMVIZ"] = true -SOUNDS["KS0164"] = true - --------------------------------------------------- --- specify available video cores --------------------------------------------------- - -VIDEOS["SEGA315_5124"] = true -VIDEOS["SEGA315_5313"] = true -VIDEOS["AM8052"] = true ---VIDEOS["BUFSPRITE"] = true -VIDEOS["BT45X"] = true -VIDEOS["BT459"] = true -VIDEOS["BT47X"] = true -VIDEOS["CATSEYE"] = true -VIDEOS["CDP1861"] = true -VIDEOS["CDP1862"] = true ---VIDEOS["CESBLIT"] = true -VIDEOS["CRT9007"] = true -VIDEOS["CRT9021"] = true -VIDEOS["CRT9028"] = true -VIDEOS["CRT9212"] = true -VIDEOS["CRTC_EGA"] = true -VIDEOS["DL1416"] = true -VIDEOS["DM9368"] = true -VIDEOS["DP8350"] = true -VIDEOS["EF9340_1"] = true -VIDEOS["EF9345"] = true -VIDEOS["EF9364"] = true -VIDEOS["EF9365"] = true ---VIDEOS["EF9369"] = true -VIDEOS["FIXFREQ"] = true -VIDEOS["GF4500"] = true ---VIDEOS["EPIC12"] = true -VIDEOS["NT7534"] = true -VIDEOS["HD44102"] = true -VIDEOS["HD44352"] = true -VIDEOS["HD44780"] = true -VIDEOS["HD61202"] = true -VIDEOS["HD61603"] = true -VIDEOS["HD61830"] = true -VIDEOS["HD63484"] = true -VIDEOS["HD66421"] = true -VIDEOS["HLCD0438"] = true -VIDEOS["HLCD0488"] = true -VIDEOS["HLCD0515"] = true -VIDEOS["HLCD0538"] = true -VIDEOS["HP1LL3"] = true -VIDEOS["HUC6202"] = true -VIDEOS["HUC6260"] = true -VIDEOS["HUC6261"] = true -VIDEOS["HUC6270"] = true -VIDEOS["HUC6271"] = true -VIDEOS["HUC6272"] = true -VIDEOS["I8244"] = true -VIDEOS["I82730"] = true -VIDEOS["I8275"] = true -VIDEOS["IMS_CVC"] = true -VIDEOS["LC7582"] = true -VIDEOS["LC7985"] = true ---VIDEOS["M50458"] = true ---VIDEOS["MB90082"] = true ---VIDEOS["MB_VCU"] = true -VIDEOS["MC6845"] = true -VIDEOS["MC6847"] = true -VIDEOS["MD4330B"] = true -VIDEOS["MM5445"] = true -VIDEOS["MSM6222B"] = true -VIDEOS["MSM6255"] = true -VIDEOS["MOS6566"] = true -VIDEOS["PC_VGA"] = true -VIDEOS["PCD8544"] = true -VIDEOS["PCF2100"] = true ---VIDEOS["POLY"] = true -VIDEOS["PSX"] = true -VIDEOS["RAMDAC"] = true -VIDEOS["S2636"] = true -VIDEOS["SAA5050"] = true -VIDEOS["SAA5240"] = true -VIDEOS["PWM_DISPLAY"] = true -VIDEOS["SDA5708"] = true -VIDEOS["SED1200"] = true -VIDEOS["SED1330"] = true -VIDEOS["SED1356"] = true -VIDEOS["SED1500"] = true -VIDEOS["SED1520"] = true -VIDEOS["SNES_PPU"] = true -VIDEOS["T6963C"] = true -VIDEOS["T6A04"] = true -VIDEOS["TEA1002"] = true ---VIDEOS["TLC34076"] = true ---VIDEOS["TMS34061"] = true -VIDEOS["TMS3556"] = true -VIDEOS["TMS9927"] = true -VIDEOS["TMS9928A"] = true -VIDEOS["TOPCAT"] = true -VIDEOS["NEREID"] = true -VIDEOS["UPD3301"] = true -VIDEOS["UPD7220"] = true -VIDEOS["UPD7227"] = true -VIDEOS["V9938"] = true -VIDEOS["VIC4567"] = true -VIDEOS["VIRGE_PCI"] = true ---VIDEOS["VOODOO"] = true -VIDEOS["SCN2674"] = true -VIDEOS["GB_LCD"] = true -VIDEOS["GBA_LCD"] = true -VIDEOS["MGA2064W"] = true -VIDEOS["PPU2C0X"] = true -VIDEOS["DP8510"] = true -VIDEOS["MB88303"] = true -VIDEOS["PS2GS"] = true -VIDEOS["PS2GIF"] = true -VIDEOS["DECSFB"] = true -VIDEOS["BT431"] = true ---VIDEOS["VRENDER0"] = true - --------------------------------------------------- --- specify available machine cores --------------------------------------------------- - -MACHINES["AKIKO"] = true -MACHINES["ALPHA_8921"] = true -MACHINES["AM2901B"] = true -MACHINES["AUTOCONFIG"] = true -MACHINES["BUSMOUSE"] = true -MACHINES["CR511B"] = true -MACHINES["DMAC"] = true -MACHINES["GAYLE"] = true -MACHINES["6522VIA"] = true -MACHINES["6821PIA"] = true -MACHINES["6840PTM"] = true -MACHINES["MPCC68561"] = true -MACHINES["68681"] = true -MACHINES["7200FIFO"] = true -MACHINES["8530SCC"] = true -MACHINES["ACIA6850"] = true -MACHINES["ACORN_BMU"] = true -MACHINES["ACORN_IOC"] = true -MACHINES["ACORN_LC"] = true -MACHINES["ACORN_MEMC"] = true -MACHINES["ACORN_VIDC"] = true -MACHINES["ADC0804"] = true -MACHINES["ADC0808"] = true -MACHINES["ADC083X"] = true -MACHINES["ADC1038"] = true -MACHINES["ADC1213X"] = true -MACHINES["AICARTC"] = true -MACHINES["AM25S55X"] = true -MACHINES["AM2847"] = true -MACHINES["AM2910"] = true -MACHINES["AM53CF96"] = true -MACHINES["AM79C30"] = true -MACHINES["AM79C90"] = true -MACHINES["AM9513"] = true -MACHINES["AM9517A"] = true -MACHINES["AM9519"] = true -MACHINES["AMIGAFDC"] = true -MACHINES["AMIGA_COPPER"] = true -MACHINES["APPLEPIC"] = true -MACHINES["ARM_IOMD"] = true -MACHINES["AT_KEYBC"] = true -MACHINES["AT28C16"] = true -MACHINES["AT28C64B"] = true -MACHINES["AT29X"] = true -MACHINES["AT45DBXX"] = true -MACHINES["ATAFLASH"] = true -MACHINES["AY31015"] = true -MACHINES["BANKDEV"] = true -MACHINES["BIM68153"] = true -MACHINES["BQ4847"] = true -MACHINES["BQ4852"] = true -MACHINES["CDP1852"] = true -MACHINES["CDP1871"] = true -MACHINES["CDP1879"] = true ---MACHINES["CDU76S"] = true -MACHINES["CH376"] = true -MACHINES["CHESSMACHINE"] = true -MACHINES["CMOS40105"] = true -MACHINES["COM52C50"] = true -MACHINES["COM8116"] = true -MACHINES["COP452"] = true -MACHINES["CR589"] = true -MACHINES["CS4031"] = true -MACHINES["CS8221"] = true -MACHINES["CS8900A"] = true -MACHINES["CXD1095"] = true -MACHINES["DL11"] = true -MACHINES["DP8390"] = true -MACHINES["DP83932C"] = true -MACHINES["DP8573"] = true ---MACHINES["DS1204"] = true -MACHINES["DS1302"] = true -MACHINES["DS1315"] = true -MACHINES["DS1386"] = true -MACHINES["DS17X85"] = true -MACHINES["DS2401"] = true -MACHINES["DS2404"] = true -MACHINES["DS6417"] = true -MACHINES["DS75160A"] = true -MACHINES["DS75161A"] = true -MACHINES["DS8874"] = true -MACHINES["E0516"] = true -MACHINES["E05A03"] = true -MACHINES["E05A30"] = true -MACHINES["EEPROMDEV"] = true -MACHINES["ER1400"] = true -MACHINES["ER2055"] = true -MACHINES["EXORTERM"] = true -MACHINES["F3853"] = true -MACHINES["F4702"] = true -MACHINES["GLUKRS"] = true -MACHINES["GT913"] = true -MACHINES["HD63450"] = true -MACHINES["HD64610"] = true -MACHINES["HP_DC100_TAPE"] = true -MACHINES["HP_TACO"] = true -MACHINES["1MA6"] = true -MACHINES["1MB5"] = true -MACHINES["I2CMEM"] = true -MACHINES["I3001"] = true -MACHINES["I3002"] = true -MACHINES["I7220"] = true -MACHINES["I80130"] = true -MACHINES["I8087"] = true -MACHINES["I8155"] = true -MACHINES["I8212"] = true -MACHINES["I8214"] = true -MACHINES["I82355"] = true -MACHINES["I8243"] = true -MACHINES["I8251"] = true -MACHINES["I8255"] = true -MACHINES["I8257"] = true -MACHINES["I8271"] = true -MACHINES["I8279"] = true -MACHINES["I8291A"] = true -MACHINES["I8355"] = true ---MACHINES["IBM21S850"] = true -MACHINES["ICM7170"] = true -MACHINES["IDECTRL"] = true -MACHINES["IE15"] = true -MACHINES["IM6402"] = true -MACHINES["INS8154"] = true -MACHINES["INS8250"] = true -MACHINES["INTELFLASH"] = true -MACHINES["JVS"] = true -MACHINES["K033906"] = true -MACHINES["K053252"] = true -MACHINES["K056230"] = true -MACHINES["KB3600"] = true -MACHINES["KBDC8042"] = true -MACHINES["KR2376"] = true -MACHINES["LATCH8"] = true -MACHINES["LC89510"] = true -MACHINES["LDPR8210"] = true -MACHINES["LDSTUB"] = true -MACHINES["LDV1000"] = true -MACHINES["LDVP931"] = true -MACHINES["LH5810"] = true -MACHINES["LINFLASH"] = true -MACHINES["LOCOMO"] = true -MACHINES["LPCI"] = true -MACHINES["LSI53C810"] = true -MACHINES["M3002"] = true -MACHINES["M68307"] = true -MACHINES["M68340"] = true -MACHINES["M950X0"] = true -MACHINES["M68SFDC"] = true -MACHINES["M6M80011AP"] = true -MACHINES["MB14241"] = true -MACHINES["MB3773"] = true -MACHINES["MB8421"] = true -MACHINES["MB87030"] = true -MACHINES["MB87078"] = true -MACHINES["MB8795"] = true -MACHINES["MB89352"] = true -MACHINES["MB89371"] = true -MACHINES["MC14411"] = true -MACHINES["MC146818"] = true -MACHINES["MC6843"] = true -MACHINES["MC6844"] = true -MACHINES["MC6846"] = true -MACHINES["MC6852"] = true -MACHINES["MC6854"] = true -MACHINES["MC68328"] = true -MACHINES["MC68901"] = true -MACHINES["MCCS1850"] = true -MACHINES["MCF5206E"] = true -MACHINES["MICROTOUCH"] = true -MACHINES["MIOT6530"] = true -MACHINES["MM5307"] = true -MACHINES["MM58167"] = true -MACHINES["MM58174"] = true -MACHINES["MM58274C"] = true -MACHINES["MM74C922"] = true -MACHINES["MM5740"] = true -MACHINES["MOS6526"] = true -MACHINES["MOS6529"] = true -MACHINES["MOS6551"] = true -MACHINES["MOS6702"] = true -MACHINES["MOS8706"] = true -MACHINES["MOS8722"] = true -MACHINES["MOS8726"] = true -MACHINES["MPU401"] = true -MACHINES["MSM5832"] = true -MACHINES["MSM58321"] = true -MACHINES["MSM6242"] = true ---MACHINES["MSM6253"] = true -MACHINES["MYB3K_KEYBOARD"] = true -MACHINES["NCR5380"] = true -MACHINES["NCR5385"] = true -MACHINES["NCR5390"] = true -MACHINES["NCR539x"] = true -MACHINES["NCR53C7XX"] = true -MACHINES["NETLIST"] = true -MACHINES["NMC9306"] = true -MACHINES["NSC810"] = true -MACHINES["NSCSI"] = true -MACHINES["OMTI5100"] = true -MACHINES["OUTPUT_LATCH"] = true -MACHINES["PC_FDC"] = true -MACHINES["PC_LPT"] = true -MACHINES["PCCARD"] = true -MACHINES["PCF8573"] = true -MACHINES["PCF8583"] = true ---MACHINES["PCF8584"] = true -MACHINES["PCF8593"] = true -MACHINES["PCI"] = true -MACHINES["PCKEYBRD"] = true -MACHINES["PDC"] = true -MACHINES["PHI"] = true -MACHINES["PIC8259"] = true -MACHINES["PIT68230"] = true -MACHINES["PIT8253"] = true -MACHINES["PLA"] = true ---MACHINES["PROFILE"] = true -MACHINES["PROM82S129"] = true -MACHINES["PXA255"] = true -MACHINES["R64H156"] = true -MACHINES["RF5C296"] = true -MACHINES["RIOT6532"] = true -MACHINES["RIPPLE_COUNTER"] = true -MACHINES["ROC10937"] = true -MACHINES["RP5C01"] = true -MACHINES["RP5C15"] = true -MACHINES["RP5H01"] = true -MACHINES["RSTBUF"] = true -MACHINES["RTC4543"] = true -MACHINES["RTC65271"] = true -MACHINES["RTC9701"] = true -MACHINES["S_SMP"] = true ---MACHINES["S2636"] = true -MACHINES["S3520CF"] = true -MACHINES["S3C24XX"] = true -MACHINES["S3C44B0"] = true -MACHINES["SA1110"] = true -MACHINES["SA1111"] = true -MACHINES["SAA1043"] = true -MACHINES["SATURN"] = true -MACHINES["SCC68070"] = true ---MACHINES["SCSI"] = true -MACHINES["SCC2698B"] = true -MACHINES["SCN_PCI"] = true -MACHINES["SCOOP"] = true -MACHINES["SCUDSP"] = true -MACHINES["SECFLASH"] = true -MACHINES["SEIBU_COP"] = true -MACHINES["SENSORBOARD"] = true ---MACHINES["SERFLASH"] = true -MACHINES["SMC91C9X"] = true -MACHINES["SMIOC"] = true -MACHINES["SEGA_SCU"] = true -MACHINES["SMPC"] = true -MACHINES["SPG2XX"] = true -MACHINES["SPG290"] = true -MACHINES["SPISDCARD"] = true -MACHINES["STVCD"] = true -MACHINES["SUN4C_MMU"] = true -MACHINES["SWTPC8212"] = true -MACHINES["TASC_SB30"] = true -MACHINES["TC0091LVC"] = true -MACHINES["TDC1008"] = true ---MACHINES["TE7750"] = true -MACHINES["TIMEKPR"] = true -MACHINES["TMC0430"] = true -MACHINES["TMC0999"] = true -MACHINES["TMC208K"] = true -MACHINES["TMP68301"] = true -MACHINES["TMS5501"] = true -MACHINES["TMS6100"] = true -MACHINES["TMS9901"] = true -MACHINES["TMS9902"] = true -MACHINES["TMS9914"] = true -MACHINES["TPI6525"] = true -MACHINES["TSCONF_DMA"] = true -MACHINES["TTL7400"] = true -MACHINES["TTL7404"] = true ---MACHINES["TSB12LV01A"] = true -MACHINES["TTL74123"] = true -MACHINES["TTL74145"] = true -MACHINES["TTL74148"] = true -MACHINES["TTL74153"] = true -MACHINES["TTL74157"] = true -MACHINES["TTL74161"] = true -MACHINES["TTL74164"] = true -MACHINES["TTL74175"] = true -MACHINES["TTL74181"] = true -MACHINES["TTL74259"] = true -MACHINES["TTL74381"] = true -MACHINES["TTL74543"] = true -MACHINES["TTL7474"] = true -MACHINES["TUBE"] = true -MACHINES["UCB1200"] = true -MACHINES["UPC82C710"] = true -MACHINES["UPC82C711"] = true -MACHINES["UPD1990A"] = true -MACHINES["UPD4991A"] = true ---MACHINES["UPD4992"] = true -MACHINES["UPD4701"] = true -MACHINES["UPD7001"] = true -MACHINES["UPD7002"] = true -MACHINES["UPD7004"] = true -MACHINES["UPD71071"] = true -MACHINES["UPD765"] = true -MACHINES["FDC_PLL"] = true -MACHINES["V3021"] = true -MACHINES["VIC_PL192"] = true -MACHINES["WD_FDC"] = true -MACHINES["WD1000"] = true -MACHINES["WD1010"] = true -MACHINES["WD11C00_17"] = true -MACHINES["WD2010"] = true -MACHINES["WD33C9X"] = true -MACHINES["WD7600"] = true -MACHINES["X2201"] = true -MACHINES["X2212"] = true -MACHINES["X76F041"] = true -MACHINES["X76F100"] = true -MACHINES["YM2148"] = true -MACHINES["YM3802"] = true -MACHINES["Z80CTC"] = true -MACHINES["Z80SIO"] = true -MACHINES["Z80SCC"] = true -MACHINES["Z80DMA"] = true -MACHINES["Z80PIO"] = true -MACHINES["Z80STI"] = true -MACHINES["Z8536"] = true -MACHINES["SMC92X4"] = true -MACHINES["HDC9234"] = true -MACHINES["TI99_HD"] = true -MACHINES["STRATA"] = true -MACHINES["STEPPERS"] = true -MACHINES["CORVUSHD"] = true -MACHINES["WOZFDC"] = true -MACHINES["APPLE_FDINTF"] = true -MACHINES["IWM"] = true -MACHINES["SWIM1"] = true -MACHINES["SWIM2"] = true -MACHINES["SWIM3"] = true -MACHINES["MAC_VIDEO_SONORA"] = true -MACHINES["DIABLO_HD"] = true -MACHINES["TMS1024"] = true -MACHINES["NSC810"] = true -MACHINES["VT82C496"] = true -MACHINES["FDC37C93X"] = true -MACHINES["GENPC"] = true -MACHINES["GEN_LATCH"] = true -MACHINES["WATCHDOG"] = true -MACHINES["SMARTMEDIA"] = true -MACHINES["APPLE_DRIVE"] = true -MACHINES["APPLE_FDC"] = true -MACHINES["SONY_DRIVE"] = true -MACHINES["SCNXX562"] = true -MACHINES["FGA002"] = true -MACHINES["I82586"] = true -MACHINES["INPUT_MERGER"] = true --- MACHINES["K054321"] = true -MACHINES["ADC0844"] = true -MACHINES["28FXXX"] = true --- MACHINES["GEN_FIFO"] = true -MACHINES["Z80DAISY"] = true -MACHINES["PS2DMAC"] = true -MACHINES["PS2INTC"] = true -MACHINES["PS2MC"] = true -MACHINES["PS2PAD"] = true -MACHINES["PS2SIF"] = true -MACHINES["PS2TIMER"] = true -MACHINES["IOPCDVD"] = true -MACHINES["IOPDMA"] = true -MACHINES["IOPINTC"] = true -MACHINES["IOPSIO2"] = true -MACHINES["IOPTIMER"] = true -MACHINES["Z8038"] = true -MACHINES["AIC565"] = true -MACHINES["AIC580"] = true -MACHINES["AIC6250"] = true -MACHINES["DC7085"] = true -MACHINES["I82357"] = true -MACHINES["XC1700E"] = true -MACHINES["EDLC"] = true -MACHINES["WTL3132"] = true -MACHINES["CXD1185"] = true -MACHINES["BL_HANDHELDS_MENUCONTROL"] = true -MACHINES["NS32081"] = true -MACHINES["NS32202"] = true -MACHINES["NS32082"] = true -MACHINES["BITMAP_PRINTER"] = true -MACHINES["NS32382"] = true -MACHINES["FM_SCSI"] = true -MACHINES["ARCHIMEDES_KEYB"] = true -MACHINES["CAMMU"] = true -MACHINES["AT_MB"] = true -MACHINES["SAA7191"] = true - --------------------------------------------------- --- specify available bus cores --------------------------------------------------- - -BUSES["A1BUS"] = true -BUSES["A2BUS"] = true -BUSES["A2GAMEIO"] = true -BUSES["A7800"] = true -BUSES["A800"] = true -BUSES["ABCBUS"] = true -BUSES["ABCKB"] = true -BUSES["ACORN"] = true -BUSES["ADAM"] = true -BUSES["ADAMNET"] = true -BUSES["ADB"] = true -BUSES["AMIGA_KEYBOARD"] = true -BUSES["APF"] = true -BUSES["APRICOT_EXPANSION"] = true -BUSES["APRICOT_KEYBOARD"] = true -BUSES["APRICOT_VIDEO"] = true -BUSES["AQUARIUS"] = true -BUSES["ARCADIA"] = true -BUSES["ARCHIMEDES_ECONET"] = true -BUSES["ARCHIMEDES_PODULE"] = true -BUSES["ASTROCADE"] = true -BUSES["ATA"] = true -BUSES["BBC_1MHZBUS"] = true -BUSES["BBC_ANALOGUE"] = true -BUSES["BBC_CART"] = true -BUSES["BBC_EXP"] = true -BUSES["BBC_FDC"] = true -BUSES["BBC_INTERNAL"] = true -BUSES["BBC_JOYPORT"] = true -BUSES["BBC_MODEM"] = true -BUSES["BBC_ROM"] = true -BUSES["BBC_TUBE"] = true -BUSES["BBC_USERPORT"] = true -BUSES["BML3"] = true -BUSES["BW2"] = true -BUSES["C64"] = true -BUSES["CBM2"] = true -BUSES["CBMIEC"] = true -BUSES["CBUS"] = true -BUSES["CENTRONICS"] = true -BUSES["CGENIE_EXPANSION"] = true -BUSES["CGENIE_PARALLEL"] = true -BUSES["CHANNELF"] = true -BUSES["COCO"] = true -BUSES["COLECO_CART"] = true -BUSES["COLECO_CONTROLLER"] = true -BUSES["COMPIS_GRAPHICS"] = true -BUSES["COMPUCOLOR"] = true -BUSES["COMX35"] = true -BUSES["CPC"] = true -BUSES["CRVISION"] = true -BUSES["DMV"] = true -BUSES["ECBBUS"] = true -BUSES["ECONET"] = true -BUSES["EINSTEIN_USERPORT"] = true -BUSES["EKARA"] = true -BUSES["ELECTRON_CART"] = true -BUSES["ELECTRON"] = true -BUSES["EP64"] = true -BUSES["EPSON_SIO"] = true -BUSES["EPSON_QX"] = true -BUSES["FMT_SCSI"] = true -BUSES["GAMATE"] = true -BUSES["GAMEBOY"] = true -BUSES["GAMEGEAR"] = true -BUSES["GBA"] = true -BUSES["GENERIC"] = true -BUSES["GIO64"] = true -BUSES["HEXBUS"] = true -BUSES["HP_IPC_IO"] = true -BUSES["HP80_IO"] = true -BUSES["HP9845_IO"] = true -BUSES["HPDIO"] = true -BUSES["HPHIL"] = true -BUSES["IEEE488"] = true -BUSES["IMI7000"] = true -BUSES["INTELLEC4"] = true -BUSES["INTERPRO_KEYBOARD"] = true -BUSES["INTERPRO_MOUSE"] = true -BUSES["INTERPRO_SR"] = true -BUSES["INTV_CTRL"] = true -BUSES["INTV"] = true -BUSES["IQ151"] = true -BUSES["ISA"] = true -BUSES["ISBX"] = true -BUSES["JAKKS_GAMEKEY"] = true -BUSES["KC"] = true -BUSES["LPCI"] = true -BUSES["M5"] = true -BUSES["MACKBD"] = true -BUSES["MACPDS"] = true -BUSES["MC10"] = true -BUSES["MEGADRIVE"] = true -BUSES["MIDI"] = true -BUSES["MSX_SLOT"] = true -BUSES["MTX"] = true -BUSES["MULTIBUS"] = true -BUSES["NASBUS"] = true -BUSES["NEOGEO_CTRL"] = true -BUSES["NEOGEO"] = true -BUSES["NES_CTRL"] = true -BUSES["NES"] = true -BUSES["NEWBRAIN"] = true -BUSES["NSCSI"] = true -BUSES["NUBUS"] = true -BUSES["O2"] = true -BUSES["ORICEXT"] = true -BUSES["P2000"] = true -BUSES["PASOPIA"] = true -BUSES["PC_JOY"] = true -BUSES["PC_KBD"] = true -BUSES["PC1512"] = true -BUSES["PCE"] = true -BUSES["PCE_CTRL"] = true -BUSES["PET"] = true -BUSES["PLUS4"] = true -BUSES["POFO"] = true -BUSES["PSI_KEYBOARD"] = true -BUSES["PSX_CONTROLLER"] = true -BUSES["PSX_PARALLEL"] = true -BUSES["QBUS"] = true -BUSES["QL"] = true -BUSES["RC2014"] = true -BUSES["RS232"] = true -BUSES["PC8801"] = true -BUSES["RTPC_KBD"] = true -BUSES["S100"] = true -BUSES["SAITEK_OSA"] = true -BUSES["SAMCOUPE_DRIVE_PORT"] = true -BUSES["SAMCOUPE_EXPANSION"] = true -BUSES["SAMCOUPE_MOUSE_PORT"] = true -BUSES["SAT_CTRL"] = true -BUSES["SATURN"] = true -BUSES["SBUS"] = true -BUSES["SCSI"] = true -BUSES["SCV"] = true -BUSES["SDK85"] = true -BUSES["SEGA8"] = true -BUSES["SG1000_EXP"] = true -BUSES["SGIKBD"] = true -BUSES["SMS_CTRL"] = true -BUSES["SMS_EXP"] = true -BUSES["SNES_CTRL"] = true -BUSES["SNES"] = true -BUSES["SPC1000"] = true -BUSES["SPECTRUM"] = true -BUSES["SS50"] = true -BUSES["SUNKBD"] = true -BUSES["SUNMOUSE"] = true -BUSES["SVI_EXPANDER"] = true -BUSES["SVI_SLOT"] = true -BUSES["TANBUS"] = true -BUSES["TATUNG_PIPE"] = true -BUSES["THOMSON"] = true -BUSES["TI8X"] = true -BUSES["TI99"] = true -BUSES["TI99X"] = true -BUSES["TIKI100"] = true -BUSES["TMC600"] = true -BUSES["TVC"] = true -BUSES["UTS_KBD"] = true -BUSES["VBOY"] = true -BUSES["VC4000"] = true -BUSES["VCS"] = true -BUSES["VCS_CTRL"] = true -BUSES["VECTREX"] = true -BUSES["VIC10"] = true -BUSES["VIC20"] = true -BUSES["VIDBRAIN"] = true -BUSES["VIP"] = true -BUSES["VME"] = true -BUSES["VSMILE"] = true -BUSES["VTECH_IOEXP"] = true -BUSES["VTECH_MEMEXP"] = true -BUSES["WANGPC"] = true -BUSES["WSWAN"] = true -BUSES["X68K"] = true -BUSES["Z29_KBD"] = true -BUSES["Z88"] = true -BUSES["ZORRO"] = true - --------------------------------------------------- --- specify used file formats --------------------------------------------------- - -FORMATS["2D_DSK"] = true -FORMATS["A26_CAS"] = true -FORMATS["A5105_DSK"] = true -FORMATS["ABC1600_DSK"] = true -FORMATS["ABC800_DSK"] = true -FORMATS["ABCFD2_DSK"] = true -FORMATS["ACE_TAP"] = true -FORMATS["ACORN_DSK"] = true -FORMATS["ADAM_CAS"] = true -FORMATS["ADAM_DSK"] = true -FORMATS["AFS_DSK"] = true -FORMATS["AGAT840K_HLE_DSK"] = true -FORMATS["AIM_DSK"] = true -FORMATS["AMI_DSK"] = true -FORMATS["AP2_DSK"] = true -FORMATS["APD_DSK"] = true -FORMATS["APF_APT"] = true -FORMATS["APOLLO_DSK"] = true -FORMATS["APPLIX_DSK"] = true -FORMATS["APRIDISK"] = true -FORMATS["AP_DSK35"] = true -FORMATS["AQUARIUS_CAQ"] = true -FORMATS["ASST128_DSK"] = true -FORMATS["ASTROCADE_WAV"] = true -FORMATS["ATARI_DSK"] = true -FORMATS["ATOM_DSK"] = true -FORMATS["ATOM_TAP"] = true -FORMATS["BASICDSK"] = true -FORMATS["BW12_DSK"] = true -FORMATS["BW2_DSK"] = true -FORMATS["C3040_DSK"] = true -FORMATS["C4040_DSK"] = true -FORMATS["C8280_DSK"] = true -FORMATS["CAMPLYNX_CAS"] = true -FORMATS["CAMPLYNX_DSK"] = true -FORMATS["CBM_CRT"] = true -FORMATS["CBM_TAP"] = true -FORMATS["CCVF_DSK"] = true -FORMATS["CD90_640_DSK"] = true -FORMATS["CGENIE_DSK"] = true -FORMATS["CGEN_CAS"] = true -FORMATS["COCO_CAS"] = true -FORMATS["COCO_RAWDSK"] = true -FORMATS["COMX35_DSK"] = true -FORMATS["CONCEPT_DSK"] = true -FORMATS["COUPEDSK"] = true -FORMATS["CPIS_DSK"] = true -FORMATS["CSW_CAS"] = true -FORMATS["D64_DSK"] = true -FORMATS["D71_DSK"] = true -FORMATS["D80_DSK"] = true -FORMATS["D81_DSK"] = true -FORMATS["D82_DSK"] = true -FORMATS["DCP_DSK"] = true -FORMATS["DIM_DSK"] = true -FORMATS["DIP_DSK"] = true -FORMATS["DMK_DSK"] = true -FORMATS["DS9_DSK"] = true -FORMATS["SDF_DSK"] = true -FORMATS["EP64_DSK"] = true -FORMATS["DMV_DSK"] = true -FORMATS["ESQ16_DSK"] = true -FORMATS["ESQ8_DSK"] = true -FORMATS["EXCALI64_DSK"] = true -FORMATS["FC100_CAS"] = true -FORMATS["FDD_DSK"] = true -FORMATS["FL1_DSK"] = true -FORMATS["FLEX_DSK"] = true -FORMATS["FM7_CAS"] = true -FORMATS["FMSX_CAS"] = true -FORMATS["FMTOWNS_DSK"] = true -FORMATS["FSD_DSK"] = true -FORMATS["G64_DSK"] = true -FORMATS["GTP_CAS"] = true -FORMATS["H8_CAS"] = true -FORMATS["HECTOR_MINIDISC"] = true -FORMATS["HECT_DSK"] = true -FORMATS["HECT_TAP"] = true -FORMATS["HPI_DSK"] = true -FORMATS["HP_IPC_DSK"] = true -FORMATS["HTI_TAP"] = true -FORMATS["IBMXDF_DSK"] = true -FORMATS["IMG_DSK"] = true -FORMATS["IPF_DSK"] = true -FORMATS["IQ151_DSK"] = true -FORMATS["ITT3030_DSK"] = true -FORMATS["JFD_DSK"] = true -FORMATS["JUKU_DSK"] = true -FORMATS["JVC_DSK"] = true -FORMATS["KAYPRO_DSK"] = true -FORMATS["KC85_DSK"] = true -FORMATS["KC_CAS"] = true -FORMATS["KIM1_CAS"] = true -FORMATS["LVIV_LVT"] = true -FORMATS["M20_DSK"] = true -FORMATS["M5_DSK"] = true -FORMATS["MBEE_CAS"] = true -FORMATS["MDOS_DSK"] = true -FORMATS["MFM_HD"] = true -FORMATS["MM_DSK"] = true -FORMATS["MS0515_DSK"] = true -FORMATS["MSX_DSK"] = true -FORMATS["MTX_DSK"] = true -FORMATS["MZ_CAS"] = true -FORMATS["NANOS_DSK"] = true -FORMATS["NASCOM_DSK"] = true -FORMATS["NASLITE_DSK"] = true -FORMATS["NES_DSK"] = true -FORMATS["NFD_DSK"] = true -FORMATS["OPD_DSK"] = true -FORMATS["ORAO_CAS"] = true -FORMATS["ORIC_DSK"] = true -FORMATS["ORIC_TAP"] = true -FORMATS["OS9_DSK"] = true -FORMATS["P2000T_CAS"] = true -FORMATS["P6001_CAS"] = true -FORMATS["PASTI_DSK"] = true -FORMATS["PC98FDI_DSK"] = true -FORMATS["PC98_DSK"] = true -FORMATS["PHC25_CAS"] = true -FORMATS["PK8020_DSK"] = true -FORMATS["PMD_CAS"] = true -FORMATS["POLY_DSK"] = true -FORMATS["PPG_DSK"] = true -FORMATS["PRIMOPTP"] = true -FORMATS["PYLDIN_DSK"] = true -FORMATS["QL_DSK"] = true -FORMATS["RC759_DSK"] = true -FORMATS["RK_CAS"] = true -FORMATS["RX50_DSK"] = true -FORMATS["SC3000_BIT"] = true -FORMATS["SDD_DSK"] = true -FORMATS["SF7000_DSK"] = true -FORMATS["SMX_DSK"] = true -FORMATS["SOL_CAS"] = true -FORMATS["SORC_CAS"] = true -FORMATS["SORC_DSK"] = true -FORMATS["SORD_CAS"] = true -FORMATS["SPC1000_CAS"] = true -FORMATS["ST_DSK"] = true -FORMATS["SVI_CAS"] = true -FORMATS["SVI_DSK"] = true -FORMATS["SWD_DSK"] = true -FORMATS["TANDY2K_DSK"] = true -FORMATS["THOM_CAS"] = true -FORMATS["THOM_DSK"] = true -FORMATS["TI99_DSK"] = true -FORMATS["TIKI100_DSK"] = true -FORMATS["TIM011_DSK"] = true -FORMATS["TRD_DSK"] = true -FORMATS["TRS80_DSK"] = true -FORMATS["TRS_CAS"] = true -FORMATS["TVC_CAS"] = true -FORMATS["TVC_DSK"] = true -FORMATS["TZX_CAS"] = true -FORMATS["UEF_CAS"] = true -FORMATS["UNIFLEX_DSK"] = true -FORMATS["VDK_DSK"] = true -FORMATS["VECTOR06_DSK"] = true -FORMATS["VG5K_CAS"] = true -FORMATS["VICTOR9K_DSK"] = true -FORMATS["VT_CAS"] = true -FORMATS["VT_DSK"] = true -FORMATS["FS_VTECH"] = true -FORMATS["WD177X_DSK"] = true -FORMATS["X07_CAS"] = true -FORMATS["X1_TAP"] = true -FORMATS["XDF_DSK"] = true -FORMATS["ZX81_P"] = true -FORMATS["FS_PRODOS"] = true -FORMATS["FS_ORIC_JASMIN"] = true -FORMATS["FS_COCO_RSDOS"] = true -FORMATS["FS_COCO_OS9"] = true - --------------------------------------------------- --- this is the list of driver libraries that --- comprise MESS plus messdriv.*", which contains --- the list of drivers --------------------------------------------------- -function linkProjects_mame_mess(_target, _subtarget) - links { - "access", - "aci", - "acorn", - "act", - "adc", - "agat", - "akai", - "alesis", - "altos", - "amirix", - "ampro", - "amstrad", - "apf", - "apollo", - "apple", - "applied", - "arcadia", - "ascii", - "at", - "atari", - "att", - "ave", - "aviion", - "bally", - "bandai", - "banctec", - "be", - "beehive", - "bitcorp", - "bnpo", - "bondwell", - "booth", - "camputers", - "canon", - "cantab", - "casio", - "cbm", - "cccp", - "cce", - "ccs", - "ceres", - "chessking", - "chromatics", - "chrysler", - "citoh", - "coleco", - "compugraphic", - "conic", - "consumenta", - "cromemco", - "comx", - "concept", - "conitec", - "cxg", - "cybiko", - "dai", - "dcs", - "ddr", - "dec", - "dicksmth", - "dms", - "drc", - "dulmont", - "eaca", - "einis", - "elektor", - "elektron", - "elektronika", - "emusys", - "ensoniq", - "enterprise", - "entex", - "epoch", - "epson", - "ericsson", - "exidy", - "exorterm", - "fairch", - "fairlight", - "falco", - "fidelity", - "force", - "francedr", - "fujitsu", - "funtech", - "galaxy", - "gamepark", - "gridcomp", - "grundy", - "h01x", - "handheld", - "hartung", - "hds", - "heathkit", - "hec2hrp", - "hegener", - "heurikon", - "hitachi", - "homebrew", - "homelab", - "hp", - "husky", - "ibm6580", - "ie15", - "imp", - "informer", - "intel", - "interpro", - "interton", - "intv", - "isc", - "jazz", - "kawai", - "kaypro", - "koei", - "kontron", - "korg", - "kurzweil", - "kyber", - "kyocera", - "labtam", - "leapfrog", - "learsiegler", - "lsi", - "luxor", - "magnavox", - "makerbot", - "matsushi", - "mattel", - "mb", - "mchester", - "memotech", - "mera", - "mg1", - "mgu", - "microkey", - "microsoft", - "microterm", - "mips", - "mit", - "mits", - "mitsubishi", - "mizar", - "morrow", - "mos", - "motorola", - "multitch", - "mupid", - "nakajima", - "nascom", - "natsemi", - "ncd", - "ne", - "nec", - "netronic", - "next", - "nintendo", - "nokia", - "northstar", - "novag", - "novation", - "olivetti", - "olympia", - "omnibyte", - "omron", - "openuni", - "osborne", - "osi", - "palm", - "parker", - "pc", - "pdp1", - "pel", - "philips", - "pitronic", - "poly", - "poly88", - "positron", - "psion", - "quantel", - "qume", - "radio", - "rca", - "regnecentralen", - "ritam", - "rm", - "robotron", - "rockwell", - "roland", - "rolm", - "rtpc", - "sage", - "saitek", - "samcoupe", - "samsung", - "sanyo", - "saturn", - "segacons", - "selchow", - "sequential", - "sgi", - "sharp", - "siemens", - "sinclair", - "skeleton", - "slicer", - "snk", - "sony", - "sony_news", - "sord", - "special", - "stm", - "sun", - "svi", - "svision", - "swtpc", - "synertek", - "ta", - "tab", - "tandberg", - "tangerin", - "tasc", - "tatung", - "teamconc", - "tectoy", - "tektroni", - "telenova", - "telercas", - "televideo", - "tesla", - "thomson", - "ti", - "tiger", - "tigertel", - "tiki", - "tomy", - "toshiba", - "trainer", - "trs", - "tvgames", - "ultimachine", - "ultratec", - "unicard", - "unisonic", - "unisys", - "usp", - "veb", - "verifone", - "vidbrain", - "videoton", - "visual", - "virtual", - "votrax", - "vtech", - "wang", - "wavemate", - "wyse", - "westinghouse", - "xerox", - "xussrpc", - "yamaha", - "zenith", - "zpa", - "zvt", - "messshared", - } - if (_subtarget=="mess") then - links { - "mameshared", - } - end -end - -function createMESSProjects(_target, _subtarget, _name) - project (_name) - targetsubdir(_target .."_" .. _subtarget) - kind (LIBTYPE) - uuid (os.uuid("drv-" .. _target .."_" .. _subtarget .. "_" .._name)) - addprojectflags() - precompiledheaders_novs() - - includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/emu", - MAME_DIR .. "src/devices", - MAME_DIR .. "src/mame", - MAME_DIR .. "src/lib", - MAME_DIR .. "src/lib/util", - MAME_DIR .. "3rdparty", - GEN_DIR .. "mame/layout", - } - - includedirs { - ext_includedir("flac"), - ext_includedir("zlib") - } -end - -function createProjects_mame_mess(_target, _subtarget) --------------------------------------------------- --- the following files are MAME components and --- shared across a number of drivers --- --- aa310.c (MESS), aristmk5.c, ertictac.c (MAME) --- amiga.c (MESS), alg.c, arcadia.c, cubo.c, mquake.c, upscope.c (MAME) --- a2600.c (MESS), tourtabl.c (MAME) --- atari400.c (MESS), bartop52.c, maxaflex.c (MAME) --- jaguar.c (MAME) --- astrocde.c (MAME+MESS), g627.c --- cps1.c (MAME + MESS), cbaseball.c, mitchell.c (MAME) --- pk8000.c (MESS), photon.c (MAME) --- nes.c (MESS), cham23.c, famibox.c, multigam.c, playch10.c, vsnes.c (MAME) --- snes.c (MESS), nss.c, sfcbox.c, snesb.c (MAME) --- n64.c (MESS), aleck64.c (MAME) --- megadriv.c, segapico.c (MESS), hshavoc.c, megadrvb.c, megaplay.c, megatech.c, puckpkmn.c, segac2.c, segas18.c (MAME) --- dccons.c (MESS), naomi.c (MAME) --- neogeocd.c (MESS), midas.c, neogeo.c, neoprint.c (MAME) --- cdi.c (MESS + MAME) --- 3do.c (MESS + MAME), konamim2.c (MAME) --- vectrex.c (MESS + MAME) --- cps1.c (MESS + MAME) --- apple --------------------------------------------------- -if (_subtarget=="mess") then -createMESSProjects(_target, _subtarget, "mameshared") -files { - MAME_DIR .. "src/mame/machine/amiga.cpp", - MAME_DIR .. "src/mame/video/amiga.cpp", - MAME_DIR .. "src/mame/video/amigaaga.cpp", - MAME_DIR .. "src/mame/video/amigaaga.h", - MAME_DIR .. "src/mame/video/tia.cpp", - MAME_DIR .. "src/mame/video/tia.h", - MAME_DIR .. "src/mame/machine/atari400.cpp", - MAME_DIR .. "src/mame/video/atari400.cpp", - MAME_DIR .. "src/mame/includes/atari400.h", - MAME_DIR .. "src/mame/video/antic.cpp", - MAME_DIR .. "src/mame/video/antic.h", - MAME_DIR .. "src/mame/video/gtia.cpp", - MAME_DIR .. "src/mame/video/gtia.h", - MAME_DIR .. "src/mame/drivers/jaguar.cpp", - MAME_DIR .. "src/mame/includes/jaguar.h", - MAME_DIR .. "src/mame/video/jag_blitter.cpp", - MAME_DIR .. "src/mame/video/jag_blitter.h", - MAME_DIR .. "src/mame/audio/jaguar.cpp", - MAME_DIR .. "src/mame/video/jaguar.cpp", - MAME_DIR .. "src/mame/video/jagblit.h", - MAME_DIR .. "src/mame/video/jagblit.ipp", - MAME_DIR .. "src/mame/video/jagobj.ipp", - MAME_DIR .. "src/mame/drivers/astrocde.cpp", - MAME_DIR .. "src/mame/includes/astrocde.h", - MAME_DIR .. "src/mame/video/astrocde.cpp", - MAME_DIR .. "src/mame/machine/kabuki.cpp", - MAME_DIR .. "src/mame/machine/kabuki.h", - MAME_DIR .. "src/mame/video/pk8000.cpp", - MAME_DIR .. "src/mame/machine/snes.cpp", - MAME_DIR .. "src/mame/machine/n64.cpp", - MAME_DIR .. "src/mame/video/n64.cpp", - MAME_DIR .. "src/mame/video/n64types.h", - MAME_DIR .. "src/mame/video/rdpfiltr.ipp", - MAME_DIR .. "src/mame/video/n64.h", - MAME_DIR .. "src/mame/video/rdpblend.cpp", - MAME_DIR .. "src/mame/video/rdpblend.h", - MAME_DIR .. "src/mame/video/rdptpipe.cpp", - MAME_DIR .. "src/mame/video/rdptpipe.h", - MAME_DIR .. "src/mame/video/pin64.cpp", - MAME_DIR .. "src/mame/video/pin64.h", - MAME_DIR .. "src/mame/machine/megadriv.cpp", - MAME_DIR .. "src/mame/drivers/naomi.cpp", - MAME_DIR .. "src/mame/includes/naomi.h", - MAME_DIR .. "src/mame/includes/dc.h", - MAME_DIR .. "src/mame/machine/awboard.cpp", - MAME_DIR .. "src/mame/machine/awboard.h", - MAME_DIR .. "src/mame/machine/dc.cpp", - MAME_DIR .. "src/mame/machine/dc-ctrl.cpp", - MAME_DIR .. "src/mame/machine/dc-ctrl.h", - MAME_DIR .. "src/mame/machine/jvs13551.cpp", - MAME_DIR .. "src/mame/machine/jvs13551.h", - MAME_DIR .. "src/mame/machine/maple-dc.cpp", - MAME_DIR .. "src/mame/machine/maple-dc.h", - MAME_DIR .. "src/mame/machine/mapledev.cpp", - MAME_DIR .. "src/mame/machine/mapledev.h", - MAME_DIR .. "src/mame/machine/mie.cpp", - MAME_DIR .. "src/mame/machine/mie.h", - MAME_DIR .. "src/mame/machine/naomibd.cpp", - MAME_DIR .. "src/mame/machine/naomibd.h", - MAME_DIR .. "src/mame/machine/naomig1.cpp", - MAME_DIR .. "src/mame/machine/naomig1.h", - MAME_DIR .. "src/mame/machine/dc_g2if.cpp", - MAME_DIR .. "src/mame/machine/dc_g2if.h", - MAME_DIR .. "src/mame/machine/naomigd.cpp", - MAME_DIR .. "src/mame/machine/naomigd.h", - MAME_DIR .. "src/mame/machine/naomim1.cpp", - MAME_DIR .. "src/mame/machine/naomim1.h", - MAME_DIR .. "src/mame/machine/naomim2.cpp", - MAME_DIR .. "src/mame/machine/naomim2.h", - MAME_DIR .. "src/mame/machine/naomim4.cpp", - MAME_DIR .. "src/mame/machine/naomim4.h", - MAME_DIR .. "src/mame/machine/naomirom.cpp", - MAME_DIR .. "src/mame/machine/naomirom.h", - MAME_DIR .. "src/mame/machine/315-5881_crypt.cpp", - MAME_DIR .. "src/mame/machine/315-5881_crypt.h", - MAME_DIR .. "src/mame/machine/315-6154.cpp", - MAME_DIR .. "src/mame/machine/315-6154.h", - MAME_DIR .. "src/mame/machine/segashiobd.cpp", - MAME_DIR .. "src/mame/machine/segashiobd.h", - MAME_DIR .. "src/mame/machine/xbox.cpp", - MAME_DIR .. "src/mame/machine/xbox.h", - MAME_DIR .. "src/mame/machine/xbox_pci.cpp", - MAME_DIR .. "src/mame/machine/xbox_pci.h", - MAME_DIR .. "src/mame/machine/xbox_usb.cpp", - MAME_DIR .. "src/mame/machine/xbox_usb.h", - MAME_DIR .. "src/mame/video/powervr2.cpp", - MAME_DIR .. "src/mame/video/powervr2.h", - MAME_DIR .. "src/mame/video/xbox_nv2a.cpp", - MAME_DIR .. "src/mame/video/xbox_nv2a.h", - MAME_DIR .. "src/mame/drivers/neogeo.cpp", - MAME_DIR .. "src/mame/includes/neogeo.h", - MAME_DIR .. "src/mame/machine/ng_memcard.cpp", - MAME_DIR .. "src/mame/machine/ng_memcard.h", - MAME_DIR .. "src/mame/video/neogeo.cpp", - MAME_DIR .. "src/mame/video/neogeo_spr.cpp", - MAME_DIR .. "src/mame/video/neogeo_spr.h", - MAME_DIR .. "src/mame/drivers/cdi.cpp", - MAME_DIR .. "src/mame/includes/cdi.h", - MAME_DIR .. "src/mame/machine/cdicdic.cpp", - MAME_DIR .. "src/mame/machine/cdicdic.h", - MAME_DIR .. "src/mame/machine/cdislavehle.cpp", - MAME_DIR .. "src/mame/machine/cdislavehle.h", - MAME_DIR .. "src/mame/video/mcd212.cpp", - MAME_DIR .. "src/mame/video/mcd212.h", - MAME_DIR .. "src/mame/drivers/3do.cpp", - MAME_DIR .. "src/mame/includes/3do.h", - MAME_DIR .. "src/mame/machine/3do.cpp", - MAME_DIR .. "src/mame/drivers/konamim2.cpp", - MAME_DIR .. "src/mame/drivers/vectrex.cpp", - MAME_DIR .. "src/mame/includes/vectrex.h", - MAME_DIR .. "src/mame/machine/vectrex.cpp", - MAME_DIR .. "src/mame/video/vectrex.cpp", - MAME_DIR .. "src/mame/drivers/cps1.cpp", - MAME_DIR .. "src/mame/includes/cps1.h", - MAME_DIR .. "src/mame/video/cps1.cpp", - MAME_DIR .. "src/mame/drivers/fcrash.cpp", - MAME_DIR .. "src/mame/includes/saturn.h", - MAME_DIR .. "src/mame/drivers/saturn.cpp", - MAME_DIR .. "src/mame/machine/saturn.cpp", - MAME_DIR .. "src/mame/video/saturn.cpp", - MAME_DIR .. "src/mame/machine/saturn_cdb.cpp", - MAME_DIR .. "src/mame/machine/saturn_cdb.h", - MAME_DIR .. "src/mame/video/apple2.cpp", - MAME_DIR .. "src/mame/video/apple2.h", - MAME_DIR .. "src/mame/machine/apple2common.cpp", - MAME_DIR .. "src/mame/machine/apple2common.h", - MAME_DIR .. "src/mame/drivers/amiga.cpp", - MAME_DIR .. "src/mame/includes/amiga.h", - MAME_DIR .. "src/mame/drivers/sis630.cpp", - MAME_DIR .. "src/mame/machine/gdrom.cpp", - MAME_DIR .. "src/mame/machine/gdrom.h", - MAME_DIR .. "src/mame/includes/megadriv.h", - MAME_DIR .. "src/mame/drivers/sms.cpp", - MAME_DIR .. "src/mame/includes/sms.h", - MAME_DIR .. "src/mame/machine/sms.cpp", - MAME_DIR .. "src/mame/audio/special.cpp", - MAME_DIR .. "src/mame/audio/special.h", -} -end - --------------------------------------------------- --- the following files are general components and --- shared across a number of drivers --------------------------------------------------- -createMESSProjects(_target, _subtarget, "messshared") -files { - MAME_DIR .. "src/mame/audio/vboy.cpp", - MAME_DIR .. "src/mame/audio/vboy.h", - MAME_DIR .. "src/mame/audio/wswan.cpp", - MAME_DIR .. "src/mame/audio/wswan.h", - MAME_DIR .. "src/mame/machine/isbc_215g.cpp", - MAME_DIR .. "src/mame/machine/isbc_215g.h", - MAME_DIR .. "src/mame/machine/mega32x.cpp", - MAME_DIR .. "src/mame/machine/mega32x.h", - MAME_DIR .. "src/mame/machine/megacdcd.cpp", - MAME_DIR .. "src/mame/machine/megacdcd.h", - MAME_DIR .. "src/mame/machine/ms7004.cpp", - MAME_DIR .. "src/mame/machine/ms7004.h", - MAME_DIR .. "src/mame/machine/teleprinter.cpp", - MAME_DIR .. "src/mame/machine/teleprinter.h", - MAME_DIR .. "src/mame/machine/vt100_kbd.cpp", - MAME_DIR .. "src/mame/machine/vt100_kbd.h", - MAME_DIR .. "src/mame/machine/z80bin.cpp", - MAME_DIR .. "src/mame/machine/z80bin.h", - MAME_DIR .. "src/mame/video/crt.cpp", - MAME_DIR .. "src/mame/video/crt.h", -} --------------------------------------------------- --- manufacturer-specific groupings for drivers --------------------------------------------------- - -createMESSProjects(_target, _subtarget, "access") -files { - MAME_DIR .. "src/mame/drivers/acvirus.cpp", -} - -createMESSProjects(_target, _subtarget, "aci") -files { - MAME_DIR .. "src/mame/drivers/aci_boris.cpp", - MAME_DIR .. "src/mame/drivers/aci_borisdpl.cpp", - MAME_DIR .. "src/mame/drivers/aci_ggm.cpp", - MAME_DIR .. "src/mame/drivers/aci_prodigy.cpp", -} - -createMESSProjects(_target, _subtarget, "acorn") -files { - MAME_DIR .. "src/mame/drivers/aa310.cpp", - MAME_DIR .. "src/mame/drivers/accomm.cpp", - MAME_DIR .. "src/mame/drivers/acrnsys1.cpp", - MAME_DIR .. "src/mame/drivers/acrnsys.cpp", - MAME_DIR .. "src/mame/drivers/atom.cpp", - MAME_DIR .. "src/mame/includes/atom.h", - MAME_DIR .. "src/mame/drivers/bbc.cpp", - MAME_DIR .. "src/mame/includes/bbc.h", - MAME_DIR .. "src/mame/machine/bbc.cpp", - MAME_DIR .. "src/mame/video/bbc.cpp", - MAME_DIR .. "src/mame/drivers/cms.cpp", - MAME_DIR .. "src/mame/drivers/electron.cpp", - MAME_DIR .. "src/mame/includes/electron.h", - MAME_DIR .. "src/mame/machine/electron.cpp", - MAME_DIR .. "src/mame/video/electron.cpp", - MAME_DIR .. "src/mame/drivers/riscpc.cpp", - MAME_DIR .. "src/mame/drivers/z88.cpp", - MAME_DIR .. "src/mame/includes/z88.h", - MAME_DIR .. "src/mame/machine/upd65031.cpp", - MAME_DIR .. "src/mame/machine/upd65031.h", - MAME_DIR .. "src/mame/machine/z88_impexp.cpp", - MAME_DIR .. "src/mame/machine/z88_impexp.h", - MAME_DIR .. "src/mame/video/z88.cpp", -} - -createMESSProjects(_target, _subtarget, "act") -files { - MAME_DIR .. "src/mame/drivers/apricot.cpp", - MAME_DIR .. "src/mame/drivers/apricotf.cpp", - MAME_DIR .. "src/mame/drivers/apricotp.cpp", - MAME_DIR .. "src/mame/drivers/apxen.cpp", - MAME_DIR .. "src/mame/machine/apricotkb.cpp", - MAME_DIR .. "src/mame/machine/apricotkb.h", - MAME_DIR .. "src/mame/drivers/victor9k.cpp", - MAME_DIR .. "src/mame/machine/victor9k_kb.cpp", - MAME_DIR .. "src/mame/machine/victor9k_kb.h", - MAME_DIR .. "src/mame/machine/victor9k_fdc.cpp", - MAME_DIR .. "src/mame/machine/victor9k_fdc.h", -} - -createMESSProjects(_target, _subtarget, "adc") -files { - MAME_DIR .. "src/mame/drivers/super6.cpp", - MAME_DIR .. "src/mame/includes/super6.h", - MAME_DIR .. "src/mame/drivers/superslave.cpp", -} - -createMESSProjects(_target, _subtarget, "agat") -files { - MAME_DIR .. "src/mame/drivers/agat.cpp", - MAME_DIR .. "src/mame/machine/agatkeyb.cpp", - MAME_DIR .. "src/mame/machine/agatkeyb.h", - MAME_DIR .. "src/mame/video/agat7.cpp", - MAME_DIR .. "src/mame/video/agat7.h", - MAME_DIR .. "src/mame/video/agat9.cpp", - MAME_DIR .. "src/mame/video/agat9.h", -} - -createMESSProjects(_target, _subtarget, "akai") -files { - MAME_DIR .. "src/mame/drivers/akaiax80.cpp", - MAME_DIR .. "src/mame/drivers/akaivx600.cpp", - MAME_DIR .. "src/mame/drivers/mpc3000.cpp", - MAME_DIR .. "src/mame/drivers/mpc60.cpp", -} - -createMESSProjects(_target, _subtarget, "alesis") -files { - MAME_DIR .. "src/mame/drivers/alesis.cpp", - MAME_DIR .. "src/mame/includes/alesis.h", - MAME_DIR .. "src/mame/audio/alesis.cpp", - MAME_DIR .. "src/mame/video/alesis.cpp", -} - -createMESSProjects(_target, _subtarget, "altos") -files { - MAME_DIR .. "src/mame/drivers/altos2.cpp", - MAME_DIR .. "src/mame/drivers/altos5.cpp", - MAME_DIR .. "src/mame/drivers/altos486.cpp", - MAME_DIR .. "src/mame/drivers/altos8600.cpp", - MAME_DIR .. "src/mame/machine/acs8600_ics.h", - MAME_DIR .. "src/mame/machine/acs8600_ics.cpp", -} - -createMESSProjects(_target, _subtarget, "amirix") -files { - MAME_DIR .. "src/mame/drivers/wxstar4000.cpp", -} - -createMESSProjects(_target, _subtarget, "ampro") -files { - MAME_DIR .. "src/mame/drivers/ampro.cpp", - MAME_DIR .. "src/mame/drivers/lb186.cpp", - MAME_DIR .. "src/mame/drivers/lbpc.cpp", -} - -createMESSProjects(_target, _subtarget, "amstrad") -files { - MAME_DIR .. "src/mame/drivers/amstrad.cpp", - MAME_DIR .. "src/mame/includes/amstrad.h", - MAME_DIR .. "src/mame/machine/amstrad.cpp", - MAME_DIR .. "src/mame/drivers/amstr_pc.cpp", - MAME_DIR .. "src/mame/drivers/nc.cpp", - MAME_DIR .. "src/mame/includes/nc.h", - MAME_DIR .. "src/mame/machine/nc.cpp", - MAME_DIR .. "src/mame/video/nc.cpp", - MAME_DIR .. "src/mame/drivers/pc1512.cpp", - MAME_DIR .. "src/mame/includes/pc1512.h", - MAME_DIR .. "src/mame/machine/pc1512kb.cpp", - MAME_DIR .. "src/mame/machine/pc1512kb.h", - MAME_DIR .. "src/mame/video/ams40041.cpp", - MAME_DIR .. "src/mame/video/ams40041.h", - MAME_DIR .. "src/mame/drivers/pcw.cpp", - MAME_DIR .. "src/mame/includes/pcw.h", - MAME_DIR .. "src/mame/video/pcw.cpp", - MAME_DIR .. "src/mame/drivers/pcw16.cpp", - MAME_DIR .. "src/mame/includes/pcw16.h", - MAME_DIR .. "src/mame/video/pcw16.cpp", - MAME_DIR .. "src/mame/drivers/pda600.cpp", -} - -createMESSProjects(_target, _subtarget, "apf") -files { - MAME_DIR .. "src/mame/drivers/apf.cpp", -} - -createMESSProjects(_target, _subtarget, "apollo") -files { - MAME_DIR .. "src/mame/drivers/apollo.cpp", - MAME_DIR .. "src/mame/includes/apollo.h", - MAME_DIR .. "src/mame/machine/apollo.cpp", - MAME_DIR .. "src/mame/machine/apollo_kbd.cpp", - MAME_DIR .. "src/mame/machine/apollo_kbd.h", - MAME_DIR .. "src/mame/machine/apollo_dbg.cpp", - MAME_DIR .. "src/mame/machine/apollo_dbg.h", - MAME_DIR .. "src/mame/video/apollo.cpp", -} - -createMESSProjects(_target, _subtarget, "apple") -files { - MAME_DIR .. "src/mame/drivers/apple1.cpp", - MAME_DIR .. "src/mame/drivers/apple2.cpp", - MAME_DIR .. "src/mame/drivers/apple2e.cpp", - MAME_DIR .. "src/mame/includes/apple2e.h", - MAME_DIR .. "src/mame/drivers/tk2000.cpp", - MAME_DIR .. "src/mame/drivers/apple2gs.cpp", - MAME_DIR .. "src/mame/drivers/apple3.cpp", - MAME_DIR .. "src/mame/includes/apple3.h", - MAME_DIR .. "src/mame/machine/apple3.cpp", - MAME_DIR .. "src/mame/video/apple3.cpp", - MAME_DIR .. "src/mame/drivers/lisa.cpp", - MAME_DIR .. "src/mame/includes/lisa.h", - MAME_DIR .. "src/mame/machine/lisa.cpp", - MAME_DIR .. "src/mame/drivers/lwriter.cpp", - MAME_DIR .. "src/mame/drivers/mac128.cpp", - MAME_DIR .. "src/mame/drivers/macquadra700.cpp", - MAME_DIR .. "src/mame/drivers/macpdm.cpp", - MAME_DIR .. "src/mame/drivers/macprtb.cpp", - MAME_DIR .. "src/mame/drivers/macpwrbk030.cpp", - MAME_DIR .. "src/mame/drivers/mac.cpp", - MAME_DIR .. "src/mame/includes/mac.h", - MAME_DIR .. "src/mame/machine/egret.cpp", - MAME_DIR .. "src/mame/machine/egret.h", - MAME_DIR .. "src/mame/machine/mac.cpp", - MAME_DIR .. "src/mame/machine/macadb.cpp", - MAME_DIR .. "src/mame/machine/macadb.h", - MAME_DIR .. "src/mame/machine/macrtc.cpp", - MAME_DIR .. "src/mame/machine/macrtc.h", - MAME_DIR .. "src/mame/machine/swim.cpp", - MAME_DIR .. "src/mame/machine/swim.h", - MAME_DIR .. "src/mame/video/mac.cpp", - MAME_DIR .. "src/mame/drivers/macpci.cpp", - MAME_DIR .. "src/mame/includes/macpci.h", - MAME_DIR .. "src/mame/machine/macpci.cpp", - MAME_DIR .. "src/mame/machine/cuda.cpp", - MAME_DIR .. "src/mame/machine/cuda.h", - MAME_DIR .. "src/mame/machine/macscsi.cpp", - MAME_DIR .. "src/mame/machine/macscsi.h", - MAME_DIR .. "src/mame/drivers/iphone2g.cpp", -} - -createMESSProjects(_target, _subtarget, "applied") -files { - MAME_DIR .. "src/mame/drivers/mbee.cpp", - MAME_DIR .. "src/mame/includes/mbee.h", - MAME_DIR .. "src/mame/machine/mbee.cpp", - MAME_DIR .. "src/mame/video/mbee.cpp", -} - -createMESSProjects(_target, _subtarget, "arcadia") -files { - MAME_DIR .. "src/mame/drivers/arcadia.cpp", - MAME_DIR .. "src/mame/includes/arcadia.h", - MAME_DIR .. "src/mame/audio/arcadia.cpp", - MAME_DIR .. "src/mame/audio/arcadia.h", - MAME_DIR .. "src/mame/video/arcadia.cpp", -} - -createMESSProjects(_target, _subtarget, "ascii") -files { - MAME_DIR .. "src/mame/drivers/msx.cpp", - MAME_DIR .. "src/mame/includes/msx.h", - MAME_DIR .. "src/mame/machine/msx.cpp", - MAME_DIR .. "src/mame/machine/msx_matsushita.cpp", - MAME_DIR .. "src/mame/machine/msx_matsushita.h", - MAME_DIR .. "src/mame/machine/msx_s1985.cpp", - MAME_DIR .. "src/mame/machine/msx_s1985.h", - MAME_DIR .. "src/mame/machine/msx_switched.h", - MAME_DIR .. "src/mame/machine/msx_systemflags.cpp", - MAME_DIR .. "src/mame/machine/msx_systemflags.h", -} - -createMESSProjects(_target, _subtarget, "at") -files { - MAME_DIR .. "src/mame/drivers/at.cpp", - MAME_DIR .. "src/mame/drivers/atpci.cpp", - MAME_DIR .. "src/mame/drivers/ps2.cpp", - MAME_DIR .. "src/mame/drivers/ct486.cpp", -} - -createMESSProjects(_target, _subtarget, "atari") -files { - MAME_DIR .. "src/mame/includes/a2600.h", - MAME_DIR .. "src/mame/drivers/a2600.cpp", - MAME_DIR .. "src/mame/drivers/a7800.cpp", - MAME_DIR .. "src/mame/video/maria.cpp", - MAME_DIR .. "src/mame/video/maria.h", - MAME_DIR .. "src/mame/drivers/atari400.cpp", - MAME_DIR .. "src/mame/machine/atarifdc.cpp", - MAME_DIR .. "src/mame/machine/atarifdc.h", - MAME_DIR .. "src/mame/drivers/atarist.cpp", - MAME_DIR .. "src/mame/machine/ataristb.cpp", - MAME_DIR .. "src/mame/machine/ataristb.h", - MAME_DIR .. "src/mame/video/atarist.cpp", - MAME_DIR .. "src/mame/video/atarist.h", - MAME_DIR .. "src/mame/drivers/lynx.cpp", - MAME_DIR .. "src/mame/includes/lynx.h", - MAME_DIR .. "src/mame/machine/lynx.cpp", - MAME_DIR .. "src/mame/drivers/pofo.cpp", - MAME_DIR .. "src/mame/machine/pofo_kbd.cpp", - MAME_DIR .. "src/mame/machine/pofo_kbd.h", - MAME_DIR .. "src/mame/drivers/tvboy.cpp", -} - -createMESSProjects(_target, _subtarget, "att") -files { - MAME_DIR .. "src/mame/drivers/att3b2.cpp", - MAME_DIR .. "src/mame/drivers/att4425.cpp", - MAME_DIR .. "src/mame/drivers/att610.cpp", - MAME_DIR .. "src/mame/drivers/att630.cpp", - MAME_DIR .. "src/mame/drivers/unixpc.cpp", -} - -createMESSProjects(_target, _subtarget, "ave") -files { - MAME_DIR .. "src/mame/drivers/ave_arb.cpp", -} - -createMESSProjects(_target, _subtarget, "aviion") -files { - MAME_DIR .. "src/mame/drivers/aviion88k.cpp", -} - -createMESSProjects(_target, _subtarget, "bally") -files { - MAME_DIR .. "src/mame/drivers/astrohome.cpp", -} - -createMESSProjects(_target, _subtarget, "banctec") -files { - MAME_DIR .. "src/mame/drivers/banctec.cpp", -} - -createMESSProjects(_target, _subtarget, "bandai") -files { - MAME_DIR .. "src/mame/drivers/sv8000.cpp", - MAME_DIR .. "src/mame/drivers/rx78.cpp", - MAME_DIR .. "src/mame/drivers/tamag1.cpp", - MAME_DIR .. "src/mame/drivers/wswan.cpp", - MAME_DIR .. "src/mame/video/wswan.cpp", - MAME_DIR .. "src/mame/video/wswan.h", - MAME_DIR .. "src/mame/drivers/bandai_design_master.cpp", -} - -createMESSProjects(_target, _subtarget, "be") -files { - MAME_DIR .. "src/mame/drivers/bebox.cpp", - MAME_DIR .. "src/mame/includes/bebox.h", - MAME_DIR .. "src/mame/machine/bebox.cpp", -} - -createMESSProjects(_target, _subtarget, "beehive") -files { - MAME_DIR .. "src/mame/drivers/microb.cpp", -} - -createMESSProjects(_target, _subtarget, "bitcorp") -files { - MAME_DIR .. "src/mame/drivers/gamate.cpp", - MAME_DIR .. "src/mame/video/gamate.cpp", - MAME_DIR .. "src/mame/video/gamate.h", -} - -createMESSProjects(_target, _subtarget, "bnpo") -files { - MAME_DIR .. "src/mame/drivers/b2m.cpp", - MAME_DIR .. "src/mame/includes/b2m.h", - MAME_DIR .. "src/mame/machine/b2m.cpp", -} - -createMESSProjects(_target, _subtarget, "bondwell") -files { - MAME_DIR .. "src/mame/drivers/bw12.cpp", - MAME_DIR .. "src/mame/includes/bw12.h", - MAME_DIR .. "src/mame/drivers/bw2.cpp", - MAME_DIR .. "src/mame/includes/bw2.h", -} - -createMESSProjects(_target, _subtarget, "booth") -files { - MAME_DIR .. "src/mame/drivers/apexc.cpp", - MAME_DIR .. "src/mame/includes/apexc.h", - MAME_DIR .. "src/mame/machine/apexc.h", - MAME_DIR .. "src/mame/machine/apexc.cpp", - MAME_DIR .. "src/mame/video/apexc.cpp", -} - -createMESSProjects(_target, _subtarget, "camputers") -files { - MAME_DIR .. "src/mame/drivers/camplynx.cpp", -} - -createMESSProjects(_target, _subtarget, "canon") -files { - MAME_DIR .. "src/mame/drivers/cat.cpp", - MAME_DIR .. "src/mame/drivers/x07.cpp", - MAME_DIR .. "src/mame/includes/x07.h", - MAME_DIR .. "src/mame/drivers/canon_s80.cpp", -} - -createMESSProjects(_target, _subtarget, "cantab") -files { - MAME_DIR .. "src/mame/drivers/jupace.cpp", -} - -createMESSProjects(_target, _subtarget, "casio") -files { - MAME_DIR .. "src/mame/drivers/casloopy.cpp", - MAME_DIR .. "src/mame/drivers/cfx9850.cpp", - MAME_DIR .. "src/mame/drivers/cz101.cpp", - MAME_DIR .. "src/mame/drivers/fp200.cpp", - MAME_DIR .. "src/mame/drivers/fp1100.cpp", - MAME_DIR .. "src/mame/drivers/fp6000.cpp", - MAME_DIR .. "src/mame/machine/fp6000_kbd.cpp", - MAME_DIR .. "src/mame/machine/fp6000_kbd.h", - MAME_DIR .. "src/mame/drivers/ctk2000.cpp", - MAME_DIR .. "src/mame/drivers/ctk551.cpp", - MAME_DIR .. "src/mame/drivers/ht6000.cpp", - MAME_DIR .. "src/mame/drivers/ld50.cpp", - MAME_DIR .. "src/mame/drivers/pb1000.cpp", - MAME_DIR .. "src/mame/drivers/pv1000.cpp", - MAME_DIR .. "src/mame/drivers/pv2000.cpp", - MAME_DIR .. "src/mame/drivers/sk1.cpp", - MAME_DIR .. "src/mame/drivers/sx1000.cpp", - MAME_DIR .. "src/mame/drivers/rz1.cpp", - MAME_DIR .. "src/mame/drivers/casio_rompack.cpp", -} - -createMESSProjects(_target, _subtarget, "cbm") -files { - MAME_DIR .. "src/mame/drivers/c128.cpp", - MAME_DIR .. "src/mame/drivers/c64.cpp", - MAME_DIR .. "src/mame/drivers/c64dtv.cpp", - MAME_DIR .. "src/mame/drivers/c65.cpp", - MAME_DIR .. "src/mame/includes/c65.h", - MAME_DIR .. "src/mame/drivers/c900.cpp", - MAME_DIR .. "src/mame/drivers/cbm2.cpp", - MAME_DIR .. "src/mame/drivers/chessmate.cpp", - MAME_DIR .. "src/mame/drivers/clcd.cpp", - MAME_DIR .. "src/mame/drivers/pet.cpp", - MAME_DIR .. "src/mame/drivers/plus4.cpp", - MAME_DIR .. "src/mame/drivers/vic10.cpp", - MAME_DIR .. "src/mame/drivers/vic20.cpp", - MAME_DIR .. "src/mame/machine/cbm_snqk.cpp", - MAME_DIR .. "src/mame/machine/cbm_snqk.h", - MAME_DIR .. "src/mame/drivers/mps1230.cpp", -} - -createMESSProjects(_target, _subtarget, "cccp") -files { - MAME_DIR .. "src/mame/drivers/argo.cpp", - MAME_DIR .. "src/mame/drivers/cm1800.cpp", - MAME_DIR .. "src/mame/drivers/debut.cpp", - MAME_DIR .. "src/mame/drivers/intellect02.cpp", - MAME_DIR .. "src/mame/drivers/lviv.cpp", - MAME_DIR .. "src/mame/includes/lviv.h", - MAME_DIR .. "src/mame/machine/lviv.cpp", - MAME_DIR .. "src/mame/video/lviv.cpp", - MAME_DIR .. "src/mame/drivers/mikro80.cpp", - MAME_DIR .. "src/mame/includes/mikro80.h", - MAME_DIR .. "src/mame/machine/mikro80.cpp", - MAME_DIR .. "src/mame/drivers/okean240.cpp", - MAME_DIR .. "src/mame/drivers/pk8000.cpp", - MAME_DIR .. "src/mame/drivers/pk8020.cpp", - MAME_DIR .. "src/mame/includes/pk8020.h", - MAME_DIR .. "src/mame/machine/pk8020.cpp", - MAME_DIR .. "src/mame/video/pk8020.cpp", - MAME_DIR .. "src/mame/drivers/pyl601.cpp", - MAME_DIR .. "src/mame/drivers/sm1800.cpp", - MAME_DIR .. "src/mame/drivers/sm7238.cpp", - MAME_DIR .. "src/mame/machine/km035.cpp", - MAME_DIR .. "src/mame/machine/km035.h", - MAME_DIR .. "src/mame/drivers/uknc.cpp", - MAME_DIR .. "src/mame/drivers/unior.cpp", - MAME_DIR .. "src/mame/drivers/ut88.cpp", - MAME_DIR .. "src/mame/includes/ut88.h", - MAME_DIR .. "src/mame/machine/ut88.cpp", - MAME_DIR .. "src/mame/drivers/vector06.cpp", - MAME_DIR .. "src/mame/includes/vector06.h", - MAME_DIR .. "src/mame/machine/vector06.cpp", - MAME_DIR .. "src/mame/video/vector06.cpp", - MAME_DIR .. "src/mame/drivers/vta2000.cpp", -} - -createMESSProjects(_target, _subtarget, "cce") -files { - MAME_DIR .. "src/mame/drivers/mc1000.cpp", -} - -createMESSProjects(_target, _subtarget, "ccs") -files { - MAME_DIR .. "src/mame/drivers/ccs2810.cpp", -} - -createMESSProjects(_target, _subtarget, "ceres") -files { - MAME_DIR .. "src/mame/drivers/ceres.cpp", -} - -createMESSProjects(_target, _subtarget, "chessking") -files { - MAME_DIR .. "src/mame/drivers/cking_master.cpp", -} - -createMESSProjects(_target, _subtarget, "chromatics") -files { - MAME_DIR .. "src/mame/drivers/cgc7900.cpp", - MAME_DIR .. "src/mame/includes/cgc7900.h", - MAME_DIR .. "src/mame/video/cgc7900.cpp", -} - -createMESSProjects(_target, _subtarget, "chrysler") -files { - MAME_DIR .. "src/mame/drivers/eva.cpp", -} - -createMESSProjects(_target, _subtarget, "citoh") -files { - MAME_DIR .. "src/mame/drivers/cit101.cpp", - MAME_DIR .. "src/mame/machine/cit101_kbd.cpp", - MAME_DIR .. "src/mame/machine/cit101_kbd.h", - MAME_DIR .. "src/mame/drivers/cit101xl.cpp", - MAME_DIR .. "src/mame/drivers/cit220.cpp", - MAME_DIR .. "src/mame/machine/cit220_kbd.cpp", - MAME_DIR .. "src/mame/machine/cit220_kbd.h", -} - -createMESSProjects(_target, _subtarget, "coleco") -files { - MAME_DIR .. "src/mame/drivers/adam.cpp", - MAME_DIR .. "src/mame/includes/adam.h", - MAME_DIR .. "src/mame/drivers/coleco.cpp", - MAME_DIR .. "src/mame/includes/coleco.h", - MAME_DIR .. "src/mame/machine/coleco.cpp", - MAME_DIR .. "src/mame/machine/coleco.h", - MAME_DIR .. "src/mame/drivers/wrinkles.cpp", -} - -createMESSProjects(_target, _subtarget, "compugraphic") -files { - MAME_DIR .. "src/mame/drivers/pwrview.cpp", -} - -createMESSProjects(_target, _subtarget, "conic") -files { - MAME_DIR .. "src/mame/drivers/conic_cchess2.cpp", - MAME_DIR .. "src/mame/drivers/conic_cchess3.cpp", -} - -createMESSProjects(_target, _subtarget, "consumenta") -files { - MAME_DIR .. "src/mame/drivers/conchess.cpp", -} - -createMESSProjects(_target, _subtarget, "cromemco") -files { - MAME_DIR .. "src/mame/drivers/c10.cpp", - MAME_DIR .. "src/mame/drivers/mcb216.cpp", -} - -createMESSProjects(_target, _subtarget, "comx") -files { - MAME_DIR .. "src/mame/drivers/comx35.cpp", - MAME_DIR .. "src/mame/includes/comx35.h", - MAME_DIR .. "src/mame/video/comx35.cpp", -} - -createMESSProjects(_target, _subtarget, "concept") -files { - MAME_DIR .. "src/mame/drivers/concept.cpp", - MAME_DIR .. "src/mame/includes/concept.h", - MAME_DIR .. "src/mame/machine/concept.cpp", -} - -createMESSProjects(_target, _subtarget, "conitec") -files { - MAME_DIR .. "src/mame/drivers/prof180x.cpp", - MAME_DIR .. "src/mame/includes/prof180x.h", - MAME_DIR .. "src/mame/drivers/prof80.cpp", - MAME_DIR .. "src/mame/includes/prof80.h", - MAME_DIR .. "src/mame/machine/prof80mmu.cpp", - MAME_DIR .. "src/mame/machine/prof80mmu.h", -} - -createMESSProjects(_target, _subtarget, "cxg") -files { - MAME_DIR .. "src/mame/drivers/cxg_ch2001.cpp", - MAME_DIR .. "src/mame/drivers/cxg_dominator.cpp", - MAME_DIR .. "src/mame/drivers/cxg_scptchess.cpp", - MAME_DIR .. "src/mame/drivers/cxg_sphinx40.cpp", -} - -createMESSProjects(_target, _subtarget, "cybiko") -files { - MAME_DIR .. "src/mame/drivers/cybiko.cpp", - MAME_DIR .. "src/mame/includes/cybiko.h", - MAME_DIR .. "src/mame/machine/cybiko.cpp", -} - -createMESSProjects(_target, _subtarget, "dai") -files { - MAME_DIR .. "src/mame/drivers/dai.cpp", - MAME_DIR .. "src/mame/includes/dai.h", - MAME_DIR .. "src/mame/audio/dai_snd.cpp", - MAME_DIR .. "src/mame/audio/dai_snd.h", - MAME_DIR .. "src/mame/machine/dai.cpp", - MAME_DIR .. "src/mame/video/dai.cpp", -} - -createMESSProjects(_target, _subtarget, "dcs") -files { - MAME_DIR .. "src/mame/drivers/compuchess.cpp", -} - -createMESSProjects(_target, _subtarget, "ddr") -files { - MAME_DIR .. "src/mame/drivers/ac1.cpp", - MAME_DIR .. "src/mame/drivers/bcs3.cpp", - MAME_DIR .. "src/mame/drivers/c80.cpp", - MAME_DIR .. "src/mame/drivers/huebler.cpp", - MAME_DIR .. "src/mame/includes/huebler.h", - MAME_DIR .. "src/mame/drivers/jtc.cpp", - MAME_DIR .. "src/mame/drivers/kramermc.cpp", - MAME_DIR .. "src/mame/drivers/llc1.cpp", - MAME_DIR .. "src/mame/drivers/llc2.cpp", - MAME_DIR .. "src/mame/drivers/nanos.cpp", - MAME_DIR .. "src/mame/drivers/pcm.cpp", - MAME_DIR .. "src/mame/drivers/vcs80.cpp", - MAME_DIR .. "src/mame/machine/k7659kb.cpp", - MAME_DIR .. "src/mame/machine/k7659kb.h", -} - -createMESSProjects(_target, _subtarget, "dec") -files { - MAME_DIR .. "src/mame/drivers/dct11em.cpp", - MAME_DIR .. "src/mame/drivers/decmate2.cpp", - MAME_DIR .. "src/mame/drivers/decstation.cpp", - MAME_DIR .. "src/mame/machine/decioga.cpp", - MAME_DIR .. "src/mame/machine/decioga.h", - MAME_DIR .. "src/mame/drivers/dectalk.cpp", - MAME_DIR .. "src/mame/drivers/decwritr.cpp", - MAME_DIR .. "src/mame/machine/dc305.cpp", - MAME_DIR .. "src/mame/machine/dc305.h", - MAME_DIR .. "src/mame/drivers/jensen.cpp", - MAME_DIR .. "src/mame/drivers/pdp11.cpp", - MAME_DIR .. "src/mame/drivers/vax11.cpp", - MAME_DIR .. "src/mame/drivers/rainbow.cpp", - MAME_DIR .. "src/mame/drivers/vk100.cpp", - MAME_DIR .. "src/mame/drivers/vt52.cpp", - MAME_DIR .. "src/mame/drivers/vt62.cpp", - MAME_DIR .. "src/mame/drivers/vt100.cpp", - MAME_DIR .. "src/mame/drivers/vt220.cpp", - MAME_DIR .. "src/mame/drivers/vt240.cpp", - MAME_DIR .. "src/mame/drivers/vt320.cpp", - MAME_DIR .. "src/mame/drivers/vt520.cpp", - MAME_DIR .. "src/mame/machine/dec_lk201.cpp", - MAME_DIR .. "src/mame/machine/dec_lk201.h", - MAME_DIR .. "src/mame/machine/rx01.cpp", - MAME_DIR .. "src/mame/machine/rx01.h", - MAME_DIR .. "src/mame/video/vtvideo.cpp", - MAME_DIR .. "src/mame/video/vtvideo.h", -} - -createMESSProjects(_target, _subtarget, "dicksmth") -files { - MAME_DIR .. "src/mame/drivers/super80.cpp", - MAME_DIR .. "src/mame/includes/super80.h", - MAME_DIR .. "src/mame/machine/super80.cpp", - MAME_DIR .. "src/mame/video/super80.cpp", -} - -createMESSProjects(_target, _subtarget, "dms") -files { - MAME_DIR .. "src/mame/drivers/dms5000.cpp", - MAME_DIR .. "src/mame/drivers/dms86.cpp", - MAME_DIR .. "src/mame/drivers/zsbc3.cpp", -} - -createMESSProjects(_target, _subtarget, "drc") -files { - MAME_DIR .. "src/mame/drivers/zrt80.cpp", -} - -createMESSProjects(_target, _subtarget, "dulmont") -files { - MAME_DIR .. "src/mame/drivers/magnum.cpp", -} - -createMESSProjects(_target, _subtarget, "eaca") -files { - MAME_DIR .. "src/mame/drivers/cgenie.cpp", -} - -createMESSProjects(_target, _subtarget, "einis") -files { - MAME_DIR .. "src/mame/drivers/pecom.cpp", - MAME_DIR .. "src/mame/includes/pecom.h", - MAME_DIR .. "src/mame/machine/pecom.cpp", - MAME_DIR .. "src/mame/video/pecom.cpp", -} - -createMESSProjects(_target, _subtarget, "elektor") -files { - MAME_DIR .. "src/mame/drivers/avrmax.cpp", - MAME_DIR .. "src/mame/drivers/ec65.cpp", - MAME_DIR .. "src/mame/drivers/elekscmp.cpp", - MAME_DIR .. "src/mame/drivers/junior.cpp", -} - -createMESSProjects(_target, _subtarget, "elektron") -files { - MAME_DIR .. "src/mame/drivers/elektronmono.cpp", -} - -createMESSProjects(_target, _subtarget, "elektronika") -files { - MAME_DIR .. "src/mame/drivers/bk.cpp", - MAME_DIR .. "src/mame/includes/bk.h", - MAME_DIR .. "src/mame/machine/bk.cpp", - MAME_DIR .. "src/mame/drivers/dvk_kcgd.cpp", - MAME_DIR .. "src/mame/drivers/dvk_ksm.cpp", - MAME_DIR .. "src/mame/drivers/im01.cpp", - MAME_DIR .. "src/mame/drivers/mk85.cpp", - MAME_DIR .. "src/mame/drivers/mk90.cpp", - MAME_DIR .. "src/mame/drivers/mk98.cpp", - MAME_DIR .. "src/mame/drivers/ms6102.cpp", - MAME_DIR .. "src/mame/machine/kr1601rr1.cpp", - MAME_DIR .. "src/mame/machine/kr1601rr1.h", -} - -createMESSProjects(_target, _subtarget, "emusys") -files { - MAME_DIR .. "src/mame/drivers/emax.cpp", - MAME_DIR .. "src/mame/drivers/emu2.cpp", - MAME_DIR .. "src/mame/drivers/emu3.cpp", - MAME_DIR .. "src/mame/drivers/emu68k.cpp", -} - -createMESSProjects(_target, _subtarget, "ensoniq") -files { - MAME_DIR .. "src/mame/drivers/esq1.cpp", - MAME_DIR .. "src/mame/drivers/esq5505.cpp", - MAME_DIR .. "src/mame/drivers/esqasr.cpp", - MAME_DIR .. "src/mame/drivers/esqkt.cpp", - MAME_DIR .. "src/mame/drivers/esqmr.cpp", - MAME_DIR .. "src/mame/drivers/enmirage.cpp", - MAME_DIR .. "src/mame/machine/esqpanel.cpp", - MAME_DIR .. "src/mame/machine/esqpanel.h", - MAME_DIR .. "src/mame/machine/esqvfd.cpp", - MAME_DIR .. "src/mame/machine/esqvfd.h", - MAME_DIR .. "src/mame/machine/esqlcd.cpp", - MAME_DIR .. "src/mame/machine/esqlcd.h", -} - -createMESSProjects(_target, _subtarget, "enterprise") -files { - MAME_DIR .. "src/mame/drivers/ep64.cpp", - MAME_DIR .. "src/mame/video/nick.cpp", - MAME_DIR .. "src/mame/video/nick.h", -} - -createMESSProjects(_target, _subtarget, "entex") -files { - MAME_DIR .. "src/mame/drivers/advision.cpp", - MAME_DIR .. "src/mame/drivers/sag.cpp", -} - -createMESSProjects(_target, _subtarget, "epoch") -files { - MAME_DIR .. "src/mame/drivers/gamepock.cpp", - MAME_DIR .. "src/mame/includes/gamepock.h", - MAME_DIR .. "src/mame/machine/gamepock.cpp", - MAME_DIR .. "src/mame/drivers/scv.cpp", -} - -createMESSProjects(_target, _subtarget, "epson") -files { - MAME_DIR .. "src/mame/drivers/hx20.cpp", - MAME_DIR .. "src/mame/includes/hx20.h", - MAME_DIR .. "src/mame/drivers/px4.cpp", - MAME_DIR .. "src/mame/drivers/px8.cpp", - MAME_DIR .. "src/mame/includes/px8.h", - MAME_DIR .. "src/mame/drivers/qx10.cpp", - MAME_DIR .. "src/mame/machine/qx10kbd.cpp", - MAME_DIR .. "src/mame/machine/qx10kbd.h", -} - -createMESSProjects(_target, _subtarget, "ericsson") -files { - MAME_DIR .. "src/mame/drivers/e9161.cpp", - MAME_DIR .. "src/mame/drivers/eispc.cpp", - MAME_DIR .. "src/mame/machine/eispc_kb.cpp", - MAME_DIR .. "src/mame/machine/eispc_kb.h", -} - -createMESSProjects(_target, _subtarget, "exidy") -files { - MAME_DIR .. "src/mame/machine/sorcerer.cpp", - MAME_DIR .. "src/mame/drivers/sorcerer.cpp", - MAME_DIR .. "src/mame/includes/sorcerer.h", - MAME_DIR .. "src/mame/machine/micropolis.cpp", - MAME_DIR .. "src/mame/machine/micropolis.h", -} - -createMESSProjects(_target, _subtarget, "exorterm") -files { - MAME_DIR .. "src/mame/drivers/exorterm.cpp", -} - -createMESSProjects(_target, _subtarget, "fairch") -files { - MAME_DIR .. "src/mame/drivers/channelf.cpp", - MAME_DIR .. "src/mame/includes/channelf.h", - MAME_DIR .. "src/mame/audio/channelf.cpp", - MAME_DIR .. "src/mame/audio/channelf.h", - MAME_DIR .. "src/mame/video/channelf.cpp", - MAME_DIR .. "src/mame/drivers/f387x.cpp", -} - -createMESSProjects(_target, _subtarget, "fairlight") -files { - MAME_DIR .. "src/mame/drivers/cmi.cpp", - MAME_DIR .. "src/mame/audio/cmi01a.cpp", - MAME_DIR .. "src/mame/audio/cmi01a.h", - MAME_DIR .. "src/mame/machine/cmi_ankbd.cpp", - MAME_DIR .. "src/mame/machine/cmi_ankbd.h", - MAME_DIR .. "src/mame/machine/cmi_mkbd.cpp", - MAME_DIR .. "src/mame/machine/cmi_mkbd.h", -} - -createMESSProjects(_target, _subtarget, "falco") -files { - MAME_DIR .. "src/mame/drivers/falco500.cpp", - MAME_DIR .. "src/mame/machine/f5220_kbd.cpp", - MAME_DIR .. "src/mame/machine/f5220_kbd.h", - MAME_DIR .. "src/mame/drivers/falcots.cpp", - MAME_DIR .. "src/mame/drivers/falcots28.cpp", -} - -createMESSProjects(_target, _subtarget, "fidelity") -files { - MAME_DIR .. "src/mame/machine/fidel_clockdiv.cpp", - MAME_DIR .. "src/mame/machine/fidel_clockdiv.h", - MAME_DIR .. "src/mame/drivers/fidel_as12.cpp", - MAME_DIR .. "src/mame/drivers/fidel_card.cpp", - MAME_DIR .. "src/mame/drivers/fidel_cc1.cpp", - MAME_DIR .. "src/mame/drivers/fidel_cc10.cpp", - MAME_DIR .. "src/mame/drivers/fidel_cc7.cpp", - MAME_DIR .. "src/mame/drivers/fidel_checkc2.cpp", - MAME_DIR .. "src/mame/drivers/fidel_chesster.cpp", - MAME_DIR .. "src/mame/drivers/fidel_csc.cpp", - MAME_DIR .. "src/mame/drivers/fidel_dames.cpp", - MAME_DIR .. "src/mame/drivers/fidel_desdis.cpp", - MAME_DIR .. "src/mame/drivers/fidel_eag68k.cpp", - MAME_DIR .. "src/mame/drivers/fidel_eldorado.cpp", - MAME_DIR .. "src/mame/drivers/fidel_elite.cpp", - MAME_DIR .. "src/mame/drivers/fidel_excel.cpp", - MAME_DIR .. "src/mame/drivers/fidel_msc.cpp", - MAME_DIR .. "src/mame/drivers/fidel_phantom.cpp", - MAME_DIR .. "src/mame/drivers/fidel_sc12.cpp", - MAME_DIR .. "src/mame/drivers/fidel_sc6.cpp", - MAME_DIR .. "src/mame/drivers/fidel_sc8.cpp", - MAME_DIR .. "src/mame/drivers/fidel_sc9.cpp", - MAME_DIR .. "src/mame/drivers/fidel_vcc.cpp", - MAME_DIR .. "src/mame/drivers/fidel_vsc.cpp", -} - -createMESSProjects(_target, _subtarget, "force") -files { - MAME_DIR .. "src/mame/drivers/miniforce.cpp", - MAME_DIR .. "src/mame/drivers/fccpu20.cpp", - MAME_DIR .. "src/mame/drivers/fccpu30.cpp", - MAME_DIR .. "src/mame/drivers/force68k.cpp", -} - -createMESSProjects(_target, _subtarget, "francedr") -files { - MAME_DIR .. "src/mame/drivers/regence.cpp", -} - -createMESSProjects(_target, _subtarget, "fujitsu") -files { - MAME_DIR .. "src/mame/drivers/fmtowns.cpp", - MAME_DIR .. "src/mame/includes/fmtowns.h", - MAME_DIR .. "src/mame/video/fmtowns.cpp", - MAME_DIR .. "src/mame/machine/fmt_icmem.cpp", - MAME_DIR .. "src/mame/machine/fmt_icmem.h", - MAME_DIR .. "src/mame/drivers/fm7.cpp", - MAME_DIR .. "src/mame/includes/fm7.h", - MAME_DIR .. "src/mame/video/fm7.cpp", -} - -createMESSProjects(_target, _subtarget, "funtech") -files { - MAME_DIR .. "src/mame/drivers/supracan.cpp", - MAME_DIR .. "src/mame/audio/acan.cpp", - MAME_DIR .. "src/mame/audio/acan.h", -} - -createMESSProjects(_target, _subtarget, "galaxy") -files { - MAME_DIR .. "src/mame/drivers/galaxy.cpp", - MAME_DIR .. "src/mame/includes/galaxy.h", - MAME_DIR .. "src/mame/machine/galaxy.cpp", - MAME_DIR .. "src/mame/video/galaxy.cpp", -} - -createMESSProjects(_target, _subtarget, "gamepark") -files { - MAME_DIR .. "src/mame/drivers/gp2x.cpp", - MAME_DIR .. "src/mame/drivers/gp32.cpp", - MAME_DIR .. "src/mame/includes/gp32.h", -} - -createMESSProjects(_target, _subtarget, "gridcomp") -files { - MAME_DIR .. "src/mame/drivers/gridcomp.cpp", - MAME_DIR .. "src/mame/machine/gridkeyb.cpp", - MAME_DIR .. "src/mame/machine/gridkeyb.h", -} - -createMESSProjects(_target, _subtarget, "grundy") -files { - MAME_DIR .. "src/mame/drivers/newbrain.cpp", - MAME_DIR .. "src/mame/includes/newbrain.h", - MAME_DIR .. "src/mame/video/newbrain.cpp", -} - -createMESSProjects(_target, _subtarget, "h01x") -files { - MAME_DIR .. "src/mame/drivers/h01x.cpp", -} - -createMESSProjects(_target, _subtarget, "handheld") -files { - MAME_DIR .. "src/mame/drivers/hh_cop400.cpp", - MAME_DIR .. "src/mame/drivers/hh_cops1.cpp", - MAME_DIR .. "src/mame/drivers/hh_hmcs40.cpp", - MAME_DIR .. "src/mame/drivers/hh_melps4.cpp", - MAME_DIR .. "src/mame/drivers/hh_pic16.cpp", - MAME_DIR .. "src/mame/drivers/hh_pps41.cpp", - MAME_DIR .. "src/mame/drivers/hh_rw5000.cpp", - MAME_DIR .. "src/mame/drivers/hh_sm510.cpp", - MAME_DIR .. "src/mame/includes/hh_sm510.h", - MAME_DIR .. "src/mame/drivers/rzone.cpp", - MAME_DIR .. "src/mame/drivers/hh_tms1k.cpp", - MAME_DIR .. "src/mame/includes/hh_tms1k.h", - MAME_DIR .. "src/mame/drivers/tispeak.cpp", - MAME_DIR .. "src/mame/drivers/tispellb.cpp", - MAME_DIR .. "src/mame/drivers/hh_ucom4.cpp", -} - -createMESSProjects(_target, _subtarget, "hartung") -files { - MAME_DIR .. "src/mame/drivers/gmaster.cpp", -} - -createMESSProjects(_target, _subtarget, "hds") -files { - MAME_DIR .. "src/mame/drivers/hds200.cpp", - MAME_DIR .. "src/mame/machine/hds200_kbd.cpp", - MAME_DIR .. "src/mame/machine/hds200_kbd.h", -} - -createMESSProjects(_target, _subtarget, "heathkit") -files { - MAME_DIR .. "src/mame/drivers/et3400.cpp", - MAME_DIR .. "src/mame/drivers/h8.cpp", - MAME_DIR .. "src/mame/drivers/h19.cpp", - MAME_DIR .. "src/mame/drivers/h89.cpp", -} - -createMESSProjects(_target, _subtarget, "hegener") -files { - MAME_DIR .. "src/mame/drivers/mephisto_academy.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_amsterdam.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_berlin.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_brikett.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_glasgow.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_milano.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_mm1.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_mm2.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_modena.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_modular.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_modular_tm.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_mondial.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_mondial2.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_mondial68k.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_montec.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_polgar.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_risc.cpp", - MAME_DIR .. "src/mame/drivers/mephisto_smondial.cpp", - MAME_DIR .. "src/mame/machine/mmboard.cpp", - MAME_DIR .. "src/mame/machine/mmboard.h", - MAME_DIR .. "src/mame/video/mmdisplay1.cpp", - MAME_DIR .. "src/mame/video/mmdisplay1.h", - MAME_DIR .. "src/mame/video/mmdisplay2.cpp", - MAME_DIR .. "src/mame/video/mmdisplay2.h", -} - -createMESSProjects(_target, _subtarget, "hitachi") -files { - MAME_DIR .. "src/mame/drivers/b16.cpp", - MAME_DIR .. "src/mame/drivers/bmjr.cpp", - MAME_DIR .. "src/mame/drivers/bml3.cpp", -} - -createMESSProjects(_target, _subtarget, "homebrew") -files { - MAME_DIR .. "src/mame/drivers/4004clk.cpp", - MAME_DIR .. "src/mame/drivers/68ksbc.cpp", - MAME_DIR .. "src/mame/drivers/lft_chiptune.cpp", - MAME_DIR .. "src/mame/drivers/lft_craft.cpp", - MAME_DIR .. "src/mame/drivers/lft_phasor.cpp", - MAME_DIR .. "src/mame/drivers/dcebridge.cpp", - MAME_DIR .. "src/mame/drivers/homez80.cpp", - MAME_DIR .. "src/mame/drivers/mk1forth.cpp", - MAME_DIR .. "src/mame/drivers/p112.cpp", - MAME_DIR .. "src/mame/drivers/phunsy.cpp", - MAME_DIR .. "src/mame/drivers/pimps.cpp", - MAME_DIR .. "src/mame/drivers/ravens.cpp", - MAME_DIR .. "src/mame/drivers/sbc6510.cpp", - MAME_DIR .. "src/mame/drivers/sitcom.cpp", - MAME_DIR .. "src/mame/drivers/slc1.cpp", - MAME_DIR .. "src/mame/drivers/test_t400.cpp", - MAME_DIR .. "src/mame/drivers/uzebox.cpp", - MAME_DIR .. "src/mame/drivers/z80clock.cpp", - MAME_DIR .. "src/mame/drivers/z80dev.cpp", - MAME_DIR .. "src/mame/drivers/zexall.cpp", -} - -createMESSProjects(_target, _subtarget, "homelab") -files { - MAME_DIR .. "src/mame/drivers/braiplus.cpp", - MAME_DIR .. "src/mame/drivers/homelab.cpp", -} - -createMESSProjects(_target, _subtarget, "hp") -files { - MAME_DIR .. "src/mame/drivers/hp16500.cpp", - MAME_DIR .. "src/mame/drivers/hp48.cpp", - MAME_DIR .. "src/mame/includes/hp48.h", - MAME_DIR .. "src/mame/includes/hp9845.h", - MAME_DIR .. "src/mame/machine/hp48.cpp", - MAME_DIR .. "src/mame/machine/hp48_port.cpp", - MAME_DIR .. "src/mame/machine/hp48_port.h", - MAME_DIR .. "src/mame/machine/hp80_optrom.cpp", - MAME_DIR .. "src/mame/machine/hp80_optrom.h", - MAME_DIR .. "src/mame/machine/hp9825_optrom.cpp", - MAME_DIR .. "src/mame/machine/hp9825_optrom.h", - MAME_DIR .. "src/mame/machine/hp9825_tape.cpp", - MAME_DIR .. "src/mame/machine/hp9825_tape.h", - MAME_DIR .. "src/mame/machine/hp9845_optrom.cpp", - MAME_DIR .. "src/mame/machine/hp9845_optrom.h", - MAME_DIR .. "src/mame/machine/hp9845_printer.cpp", - MAME_DIR .. "src/mame/machine/hp9845_printer.h", - MAME_DIR .. "src/mame/machine/hp98x5_io_sys.cpp", - MAME_DIR .. "src/mame/machine/hp98x5_io_sys.h", - MAME_DIR .. "src/mame/machine/hp_ipc_optrom.cpp", - MAME_DIR .. "src/mame/machine/hp_ipc_optrom.h", - MAME_DIR .. "src/mame/video/hp48.cpp", - MAME_DIR .. "src/mame/drivers/hp49gp.cpp", - MAME_DIR .. "src/mame/drivers/hp9845.cpp", - MAME_DIR .. "src/mame/drivers/hp9k.cpp", - MAME_DIR .. "src/mame/drivers/hp9k_3xx.cpp", - MAME_DIR .. "src/mame/drivers/hp64k.cpp", - MAME_DIR .. "src/mame/drivers/hp_ipc.cpp", - MAME_DIR .. "src/mame/drivers/hp80.cpp", - MAME_DIR .. "src/mame/drivers/hp2100.cpp", - MAME_DIR .. "src/mame/drivers/hp2620.cpp", - MAME_DIR .. "src/mame/drivers/hp700.cpp", - MAME_DIR .. "src/mame/machine/hp2640_tape.cpp", - MAME_DIR .. "src/mame/machine/hp2640_tape.h", - MAME_DIR .. "src/mame/drivers/hp2640.cpp", - MAME_DIR .. "src/mame/drivers/hp95lx.cpp", - MAME_DIR .. "src/mame/drivers/hp9825.cpp", - MAME_DIR .. "src/mame/drivers/jornada.cpp", -} - -createMESSProjects(_target, _subtarget, "hec2hrp") -files { - MAME_DIR .. "src/mame/drivers/hec2hrp.cpp", - MAME_DIR .. "src/mame/includes/hec2hrp.h", - MAME_DIR .. "src/mame/machine/hec2hrp.cpp", - MAME_DIR .. "src/mame/video/hec2hrp.cpp", -} - -createMESSProjects(_target, _subtarget, "heurikon") -files { - MAME_DIR .. "src/mame/drivers/hk68v10.cpp", -} - -createMESSProjects(_target, _subtarget, "husky") -files { - MAME_DIR .. "src/mame/drivers/hawk.cpp", - MAME_DIR .. "src/mame/drivers/hunter2.cpp", - MAME_DIR .. "src/mame/drivers/hunter16.cpp", - MAME_DIR .. "src/mame/drivers/husky.cpp", -} - -createMESSProjects(_target, _subtarget, "ibm6580") -files { - MAME_DIR .. "src/mame/drivers/ibm6580.cpp", - MAME_DIR .. "src/mame/machine/ibm6580_kbd.cpp", - MAME_DIR .. "src/mame/machine/ibm6580_kbd.h", - MAME_DIR .. "src/mame/machine/ibm6580_fdc.cpp", - MAME_DIR .. "src/mame/machine/ibm6580_fdc.h", -} - -createMESSProjects(_target, _subtarget, "ie15") -files { - MAME_DIR .. "src/mame/drivers/ie15.cpp", -} - -createMESSProjects(_target, _subtarget, "informer") -files { - MAME_DIR .. "src/mame/drivers/informer_207_100.cpp", - MAME_DIR .. "src/mame/drivers/informer_207_376.cpp", - MAME_DIR .. "src/mame/drivers/informer_213.cpp", - MAME_DIR .. "src/mame/machine/informer_207_376_kbd.cpp", - MAME_DIR .. "src/mame/machine/informer_207_376_kbd.h", - MAME_DIR .. "src/mame/machine/informer_213_kbd.cpp", - MAME_DIR .. "src/mame/machine/informer_213_kbd.h", -} - -createMESSProjects(_target, _subtarget, "intel") -files { - MAME_DIR .. "src/mame/drivers/basic52.cpp", - MAME_DIR .. "src/mame/drivers/imds2.cpp", - MAME_DIR .. "src/mame/drivers/intellec4.cpp", - MAME_DIR .. "src/mame/drivers/intellec8.cpp", - MAME_DIR .. "src/mame/drivers/ipc.cpp", - MAME_DIR .. "src/mame/drivers/ipds.cpp", - MAME_DIR .. "src/mame/drivers/isbc.cpp", - MAME_DIR .. "src/mame/drivers/isbc660.cpp", - MAME_DIR .. "src/mame/drivers/isbc8010.cpp", - MAME_DIR .. "src/mame/drivers/isbc8030.cpp", - MAME_DIR .. "src/mame/machine/imm6_76.cpp", - MAME_DIR .. "src/mame/machine/imm6_76.h", - MAME_DIR .. "src/mame/machine/isbc_208.cpp", - MAME_DIR .. "src/mame/machine/isbc_208.h", - MAME_DIR .. "src/mame/drivers/rex6000.cpp", - MAME_DIR .. "src/mame/drivers/sdk51.cpp", - MAME_DIR .. "src/mame/drivers/sdk80.cpp", - MAME_DIR .. "src/mame/drivers/sdk85.cpp", - MAME_DIR .. "src/mame/drivers/sdk86.cpp", - MAME_DIR .. "src/mame/machine/imds2ioc.cpp", - MAME_DIR .. "src/mame/machine/imds2ioc.h", -} - -createMESSProjects(_target, _subtarget, "imp") -files { - MAME_DIR .. "src/mame/drivers/tim011.cpp", - MAME_DIR .. "src/mame/drivers/tim100.cpp", -} - -createMESSProjects(_target, _subtarget, "interpro") -files { - MAME_DIR .. "src/mame/drivers/interpro.cpp", - MAME_DIR .. "src/mame/machine/interpro_ioga.h", - MAME_DIR .. "src/mame/machine/interpro_ioga.cpp", - MAME_DIR .. "src/mame/machine/interpro_mcga.h", - MAME_DIR .. "src/mame/machine/interpro_mcga.cpp", - MAME_DIR .. "src/mame/machine/interpro_sga.h", - MAME_DIR .. "src/mame/machine/interpro_sga.cpp", - MAME_DIR .. "src/mame/machine/interpro_arbga.h", - MAME_DIR .. "src/mame/machine/interpro_arbga.cpp", -} - -createMESSProjects(_target, _subtarget, "interton") -files { - MAME_DIR .. "src/mame/drivers/vc4000.cpp", - MAME_DIR .. "src/mame/includes/vc4000.h", - MAME_DIR .. "src/mame/audio/vc4000.cpp", - MAME_DIR .. "src/mame/audio/vc4000.h", - MAME_DIR .. "src/mame/video/vc4000.cpp", -} - -createMESSProjects(_target, _subtarget, "intv") -files { - MAME_DIR .. "src/mame/drivers/intv.cpp", - MAME_DIR .. "src/mame/includes/intv.h", - MAME_DIR .. "src/mame/machine/intv.cpp", - MAME_DIR .. "src/mame/video/intv.cpp", - MAME_DIR .. "src/mame/video/stic.cpp", - MAME_DIR .. "src/mame/video/stic.h", -} - -createMESSProjects(_target, _subtarget, "isc") -files { - MAME_DIR .. "src/mame/drivers/compucolor.cpp", -} - -createMESSProjects(_target, _subtarget, "jazz") -files { - MAME_DIR .. "src/mame/drivers/jazz.cpp", - MAME_DIR .. "src/mame/machine/mct_adr.cpp", - MAME_DIR .. "src/mame/machine/mct_adr.h", -} - -createMESSProjects(_target, _subtarget, "kawai") -files { - MAME_DIR .. "src/mame/drivers/kawai_acr20.cpp", - MAME_DIR .. "src/mame/drivers/kawai_k1.cpp", - MAME_DIR .. "src/mame/drivers/kawai_k4.cpp", - MAME_DIR .. "src/mame/drivers/kawai_k5.cpp", - MAME_DIR .. "src/mame/drivers/kawai_ksp10.cpp", - MAME_DIR .. "src/mame/drivers/kawai_r100.cpp", - MAME_DIR .. "src/mame/drivers/kawai_sx240.cpp", -} - -createMESSProjects(_target, _subtarget, "kaypro") -files { - MAME_DIR .. "src/mame/drivers/kaypro.cpp", - MAME_DIR .. "src/mame/includes/kaypro.h", - MAME_DIR .. "src/mame/machine/kaypro.cpp", - MAME_DIR .. "src/mame/machine/kay_kbd.cpp", - MAME_DIR .. "src/mame/machine/kay_kbd.h", - MAME_DIR .. "src/mame/video/kaypro.cpp", -} - -createMESSProjects(_target, _subtarget, "koei") -files { - MAME_DIR .. "src/mame/drivers/pasogo.cpp", -} - -createMESSProjects(_target, _subtarget, "kontron") -files { - MAME_DIR .. "src/mame/drivers/kdt6.cpp", -} - -createMESSProjects(_target, _subtarget, "korg") -files { - MAME_DIR .. "src/mame/drivers/korgds8.cpp", - MAME_DIR .. "src/mame/drivers/korgdss1.cpp", - MAME_DIR .. "src/mame/drivers/korgdvp1.cpp", - MAME_DIR .. "src/mame/drivers/korgdw8k.cpp", - MAME_DIR .. "src/mame/drivers/korgm1.cpp", - MAME_DIR .. "src/mame/drivers/korgws.cpp", - MAME_DIR .. "src/mame/drivers/korgz3.cpp", - MAME_DIR .. "src/mame/drivers/microkorg.cpp", - MAME_DIR .. "src/mame/drivers/poly800.cpp", - MAME_DIR .. "src/mame/drivers/polysix.cpp", -} - -createMESSProjects(_target, _subtarget, "kurzweil") -files { - MAME_DIR .. "src/mame/drivers/krz2000.cpp", -} - -createMESSProjects(_target, _subtarget, "kyber") -files { - MAME_DIR .. "src/mame/drivers/kminus.cpp", -} - -createMESSProjects(_target, _subtarget, "kyocera") -files { - MAME_DIR .. "src/mame/drivers/kyocera.cpp", - MAME_DIR .. "src/mame/includes/kyocera.h", - MAME_DIR .. "src/mame/video/kyocera.cpp", -} - -createMESSProjects(_target, _subtarget, "labtam") -files { - MAME_DIR .. "src/mame/drivers/labtam.cpp", -} - -createMESSProjects(_target, _subtarget, "leapfrog") -files { - MAME_DIR .. "src/mame/drivers/leapster.cpp", - MAME_DIR .. "src/mame/drivers/leapfrog_leappad.cpp", - MAME_DIR .. "src/mame/drivers/leapfrog_leapster_explorer.cpp", - MAME_DIR .. "src/mame/drivers/leapfrog_iquest.cpp", -} - -createMESSProjects(_target, _subtarget, "learsiegler") -files { - MAME_DIR .. "src/mame/drivers/adm11.cpp", - MAME_DIR .. "src/mame/drivers/adm23.cpp", - MAME_DIR .. "src/mame/drivers/adm31.cpp", - MAME_DIR .. "src/mame/drivers/adm36.cpp", -} - -createMESSProjects(_target, _subtarget, "lsi") -files { - MAME_DIR .. "src/mame/drivers/m3.cpp", - MAME_DIR .. "src/mame/drivers/octopus.cpp", - MAME_DIR .. "src/mame/machine/octo_kbd.cpp", - MAME_DIR .. "src/mame/machine/octo_kbd.h", -} - -createMESSProjects(_target, _subtarget, "luxor") -files { - MAME_DIR .. "src/mame/drivers/abc80.cpp", - MAME_DIR .. "src/mame/includes/abc80.h", - MAME_DIR .. "src/mame/machine/abc80kb.cpp", - MAME_DIR .. "src/mame/machine/abc80kb.h", - MAME_DIR .. "src/mame/video/abc80.cpp", - MAME_DIR .. "src/mame/drivers/abc80x.cpp", - MAME_DIR .. "src/mame/includes/abc80x.h", - MAME_DIR .. "src/mame/video/abc800.cpp", - MAME_DIR .. "src/mame/video/abc802.cpp", - MAME_DIR .. "src/mame/video/abc806.cpp", - MAME_DIR .. "src/mame/drivers/abc1600.cpp", - MAME_DIR .. "src/mame/includes/abc1600.h", - MAME_DIR .. "src/mame/machine/abc1600mac.cpp", - MAME_DIR .. "src/mame/machine/abc1600mac.h", - MAME_DIR .. "src/mame/video/abc1600.cpp", - MAME_DIR .. "src/mame/video/abc1600.h", - MAME_DIR .. "src/mame/drivers/ds90.cpp", -} - -createMESSProjects(_target, _subtarget, "magnavox") -files { - MAME_DIR .. "src/mame/drivers/odyssey2.cpp", -} - -createMESSProjects(_target, _subtarget, "makerbot") -files { - MAME_DIR .. "src/mame/drivers/replicator.cpp", -} - -createMESSProjects(_target, _subtarget, "mattel") -files { - MAME_DIR .. "src/mame/drivers/aquarius.cpp", - MAME_DIR .. "src/mame/includes/aquarius.h", - MAME_DIR .. "src/mame/video/aquarius.cpp", - MAME_DIR .. "src/mame/drivers/juicebox.cpp", - MAME_DIR .. "src/mame/drivers/mattelchess.cpp", -} - -createMESSProjects(_target, _subtarget, "matsushi") -files { - MAME_DIR .. "src/mame/drivers/jr100.cpp", - MAME_DIR .. "src/mame/drivers/jr200.cpp", - MAME_DIR .. "src/mame/drivers/myb3k.cpp", - MAME_DIR .. "src/mame/drivers/duet16.cpp", -} - -createMESSProjects(_target, _subtarget, "mb") -files { - MAME_DIR .. "src/mame/drivers/microvsn.cpp", - MAME_DIR .. "src/mame/drivers/milton6805.cpp", -} - -createMESSProjects(_target, _subtarget, "mchester") -files { - MAME_DIR .. "src/mame/drivers/ssem.cpp", -} - -createMESSProjects(_target, _subtarget, "memotech") -files { - MAME_DIR .. "src/mame/drivers/mtx.cpp", - MAME_DIR .. "src/mame/includes/mtx.h", - MAME_DIR .. "src/mame/machine/mtx.cpp", -} - -createMESSProjects(_target, _subtarget, "mera") -files { - MAME_DIR .. "src/mame/drivers/ec7915.cpp", - MAME_DIR .. "src/mame/drivers/konin.cpp", - MAME_DIR .. "src/mame/drivers/m79152pc.cpp", - MAME_DIR .. "src/mame/drivers/vdm7932x.cpp", -} - -createMESSProjects(_target, _subtarget, "mg1") -files { - MAME_DIR .. "src/mame/drivers/mg1.cpp", -} - -createMESSProjects(_target, _subtarget, "mgu") -files { - MAME_DIR .. "src/mame/drivers/irisha.cpp", -} - -createMESSProjects(_target, _subtarget, "microkey") -files { - MAME_DIR .. "src/mame/drivers/primo.cpp", - MAME_DIR .. "src/mame/includes/primo.h", - MAME_DIR .. "src/mame/machine/primo.cpp", -} - -createMESSProjects(_target, _subtarget, "microsoft") -files { - MAME_DIR .. "src/mame/drivers/xbox.cpp", -} - -createMESSProjects(_target, _subtarget, "microterm") -files { - MAME_DIR .. "src/mame/drivers/ergo201.cpp", - MAME_DIR .. "src/mame/drivers/microterm_f8.cpp", - MAME_DIR .. "src/mame/drivers/mt420.cpp", - MAME_DIR .. "src/mame/drivers/mt5510.cpp", -} - -createMESSProjects(_target, _subtarget, "mips") -files { - MAME_DIR .. "src/mame/drivers/mips.cpp", - MAME_DIR .. "src/mame/machine/mips_rambo.h", - MAME_DIR .. "src/mame/machine/mips_rambo.cpp", -} - -createMESSProjects(_target, _subtarget, "mit") -files { - MAME_DIR .. "src/mame/drivers/tx0.cpp", - MAME_DIR .. "src/mame/includes/tx0.h", - MAME_DIR .. "src/mame/video/tx0.cpp", -} - -createMESSProjects(_target, _subtarget, "mits") -files { - MAME_DIR .. "src/mame/drivers/altair.cpp", - MAME_DIR .. "src/mame/drivers/mits680b.cpp", -} - -createMESSProjects(_target, _subtarget, "mitsubishi") -files { - MAME_DIR .. "src/mame/drivers/multi8.cpp", - MAME_DIR .. "src/mame/drivers/multi16.cpp", -} - -createMESSProjects(_target, _subtarget, "mizar") -files { - MAME_DIR .. "src/mame/drivers/mzr8105.cpp", -} - -createMESSProjects(_target, _subtarget, "morrow") -files { - MAME_DIR .. "src/mame/drivers/microdec.cpp", - MAME_DIR .. "src/mame/drivers/mpz80.cpp", - MAME_DIR .. "src/mame/includes/mpz80.h", - MAME_DIR .. "src/mame/drivers/tricep.cpp", -} - -createMESSProjects(_target, _subtarget, "mos") -files { - MAME_DIR .. "src/mame/drivers/kim1.cpp", -} - -createMESSProjects(_target, _subtarget, "motorola") -files { - MAME_DIR .. "src/mame/drivers/exorciser.cpp", - MAME_DIR .. "src/mame/drivers/m6805evs.cpp", - MAME_DIR .. "src/mame/drivers/m68705prg.cpp", - MAME_DIR .. "src/mame/drivers/mekd1.cpp", - MAME_DIR .. "src/mame/drivers/mekd2.cpp", - MAME_DIR .. "src/mame/drivers/mekd3.cpp", - MAME_DIR .. "src/mame/drivers/mekd4.cpp", - MAME_DIR .. "src/mame/drivers/mekd5.cpp", - MAME_DIR .. "src/mame/drivers/mvme147.cpp", - MAME_DIR .. "src/mame/drivers/mvme162.cpp", - MAME_DIR .. "src/mame/drivers/sys1121.cpp", - MAME_DIR .. "src/mame/drivers/uchroma68.cpp", -} - -createMESSProjects(_target, _subtarget, "multitch") -files { - MAME_DIR .. "src/mame/drivers/mkit09.cpp", - MAME_DIR .. "src/mame/drivers/mpf1.cpp", - MAME_DIR .. "src/mame/includes/mpf1.h", -} - -createMESSProjects(_target, _subtarget, "mupid") -files { - MAME_DIR .. "src/mame/drivers/mdisk.cpp", - MAME_DIR .. "src/mame/drivers/mupid2.cpp", -} - -createMESSProjects(_target, _subtarget, "nakajima") -files { - MAME_DIR .. "src/mame/drivers/nakajies.cpp", -} - -createMESSProjects(_target, _subtarget, "nascom") -files { - MAME_DIR .. "src/mame/drivers/nascom1.cpp", -} - -createMESSProjects(_target, _subtarget, "natsemi") -files { - MAME_DIR .. "src/mame/drivers/ns5652.cpp", - MAME_DIR .. "src/mame/drivers/ns32kdb.cpp", -} - -createMESSProjects(_target, _subtarget, "ncd") -files { - MAME_DIR .. "src/mame/drivers/ncd68k.cpp", - MAME_DIR .. "src/mame/drivers/ncd88k.cpp", - MAME_DIR .. "src/mame/drivers/ncdmips.cpp", - MAME_DIR .. "src/mame/drivers/ncdppc.cpp", - MAME_DIR .. "src/mame/machine/bert.h", - MAME_DIR .. "src/mame/machine/bert.cpp", -} - -createMESSProjects(_target, _subtarget, "ne") -files { - MAME_DIR .. "src/mame/drivers/z80ne.cpp", - MAME_DIR .. "src/mame/includes/z80ne.h", - MAME_DIR .. "src/mame/machine/z80ne.cpp", -} - -createMESSProjects(_target, _subtarget, "nec") -files { - MAME_DIR .. "src/mame/drivers/apc.cpp", - MAME_DIR .. "src/mame/drivers/ews4800.cpp", - MAME_DIR .. "src/mame/drivers/pce.cpp", - MAME_DIR .. "src/mame/includes/pce.h", - MAME_DIR .. "src/mame/machine/pce.cpp", - MAME_DIR .. "src/mame/machine/pce_cd.cpp", - MAME_DIR .. "src/mame/machine/pce_cd.h", - MAME_DIR .. "src/mame/drivers/pcfx.cpp", - MAME_DIR .. "src/mame/drivers/pc6001.cpp", - MAME_DIR .. "src/mame/includes/pc6001.h", - MAME_DIR .. "src/mame/video/pc6001.cpp", - MAME_DIR .. "src/mame/drivers/pc8401a.cpp", - MAME_DIR .. "src/mame/includes/pc8401a.h", - MAME_DIR .. "src/mame/video/pc8401a.cpp", - MAME_DIR .. "src/mame/machine/pc80s31k.cpp", - MAME_DIR .. "src/mame/machine/pc80s31k.h", - MAME_DIR .. "src/mame/drivers/pc8001.cpp", - MAME_DIR .. "src/mame/includes/pc8001.h", - MAME_DIR .. "src/mame/drivers/pc8801.cpp", - MAME_DIR .. "src/mame/includes/pc8801.h", - MAME_DIR .. "src/mame/drivers/pc88va.cpp", - MAME_DIR .. "src/mame/includes/pc88va.h", - MAME_DIR .. "src/mame/drivers/pc100.cpp", - MAME_DIR .. "src/mame/drivers/pc9801.cpp", - MAME_DIR .. "src/mame/includes/pc9801.h", - MAME_DIR .. "src/mame/video/pc9801.cpp", - MAME_DIR .. "src/mame/machine/pc9801_kbd.cpp", - MAME_DIR .. "src/mame/machine/pc9801_kbd.h", - MAME_DIR .. "src/mame/machine/pc9801_cd.cpp", - MAME_DIR .. "src/mame/machine/pc9801_cd.h", - MAME_DIR .. "src/mame/machine/pc9801_memsw.cpp", - MAME_DIR .. "src/mame/machine/pc9801_memsw.h", - MAME_DIR .. "src/mame/drivers/pc98ha.cpp", - MAME_DIR .. "src/mame/includes/pc98ha.h", - MAME_DIR .. "src/mame/drivers/pc9801_epson.cpp", - MAME_DIR .. "src/mame/includes/pc9801_epson.h", - MAME_DIR .. "src/mame/drivers/pc9821.cpp", - MAME_DIR .. "src/mame/includes/pc9821.h", - MAME_DIR .. "src/mame/drivers/tk80bs.cpp", -} - -createMESSProjects(_target, _subtarget, "netronic") -files { - MAME_DIR .. "src/mame/drivers/elf.cpp", - MAME_DIR .. "src/mame/includes/elf.h", - MAME_DIR .. "src/mame/drivers/exp85.cpp", -} - -createMESSProjects(_target, _subtarget, "next") -files { - MAME_DIR .. "src/mame/drivers/next.cpp", - MAME_DIR .. "src/mame/includes/next.h", - MAME_DIR .. "src/mame/machine/nextkbd.cpp", - MAME_DIR .. "src/mame/machine/nextkbd.h", - MAME_DIR .. "src/mame/machine/nextmo.cpp", - MAME_DIR .. "src/mame/machine/nextmo.h", -} - -createMESSProjects(_target, _subtarget, "nintendo") -files { - MAME_DIR .. "src/mame/drivers/gb.cpp", - MAME_DIR .. "src/mame/includes/gb.h", - MAME_DIR .. "src/mame/machine/gb.cpp", - MAME_DIR .. "src/mame/drivers/gba.cpp", - MAME_DIR .. "src/mame/includes/gba.h", - MAME_DIR .. "src/mame/drivers/n64.cpp", - MAME_DIR .. "src/mame/includes/n64.h", - MAME_DIR .. "src/mame/drivers/nds.cpp", - MAME_DIR .. "src/mame/includes/nds.h", - MAME_DIR .. "src/mame/drivers/nes.cpp", - MAME_DIR .. "src/mame/includes/nes.h", - MAME_DIR .. "src/mame/machine/nes.cpp", - MAME_DIR .. "src/mame/video/nes.cpp", - MAME_DIR .. "src/mame/drivers/nes_vt02_vt03.cpp", - MAME_DIR .. "src/mame/drivers/nes_vt09.cpp", - MAME_DIR .. "src/mame/drivers/nes_vt32.cpp", - MAME_DIR .. "src/mame/drivers/nes_vt369_vtunknown.cpp", - MAME_DIR .. "src/mame/machine/nes_vt_soc.cpp", - MAME_DIR .. "src/mame/machine/nes_vt_soc.h", - MAME_DIR .. "src/mame/machine/nes_vt09_soc.cpp", - MAME_DIR .. "src/mame/machine/nes_vt09_soc.h", - MAME_DIR .. "src/mame/machine/nes_vt32_soc.cpp", - MAME_DIR .. "src/mame/machine/nes_vt32_soc.h", - MAME_DIR .. "src/mame/machine/nes_vt369_vtunknown_soc.cpp", - MAME_DIR .. "src/mame/machine/nes_vt369_vtunknown_soc.h", - MAME_DIR .. "src/mame/drivers/nes_sh6578.cpp", - MAME_DIR .. "src/mame/drivers/nes_clone.cpp", - MAME_DIR .. "src/mame/drivers/pokemini.cpp", - MAME_DIR .. "src/mame/drivers/snes.cpp", - MAME_DIR .. "src/mame/includes/snes.h", - MAME_DIR .. "src/mame/machine/snescx4.cpp", - MAME_DIR .. "src/mame/machine/snescx4.h", - MAME_DIR .. "src/mame/machine/cx4data.ipp", - MAME_DIR .. "src/mame/machine/cx4fn.ipp", - MAME_DIR .. "src/mame/machine/cx4oam.ipp", - MAME_DIR .. "src/mame/machine/cx4ops.ipp", - MAME_DIR .. "src/mame/drivers/vboy.cpp", - MAME_DIR .. "src/mame/drivers/gamecube.cpp", - MAME_DIR .. "src/mame/machine/m6502_vtscr.cpp", - MAME_DIR .. "src/mame/machine/m6502_vtscr.h", - MAME_DIR .. "src/mame/machine/m6502_swap_op_d5_d6.cpp", - MAME_DIR .. "src/mame/machine/m6502_swap_op_d5_d6.h", - MAME_DIR .. "src/mame/machine/m6502_swap_op_d2_d7.cpp", - MAME_DIR .. "src/mame/machine/m6502_swap_op_d2_d7.h", - MAME_DIR .. "src/mame/drivers/vt1682.cpp", - MAME_DIR .. "src/mame/machine/vt1682_io.h", - MAME_DIR .. "src/mame/machine/vt1682_io.cpp", - MAME_DIR .. "src/mame/machine/vt1682_uio.h", - MAME_DIR .. "src/mame/machine/vt1682_uio.cpp", - MAME_DIR .. "src/mame/machine/vt1682_alu.h", - MAME_DIR .. "src/mame/machine/vt1682_alu.cpp", - MAME_DIR .. "src/mame/machine/vt1682_timer.h", - MAME_DIR .. "src/mame/machine/vt1682_timer.cpp", - MAME_DIR .. "src/mame/drivers/vt_unknown.cpp", - MAME_DIR .. "src/mame/drivers/compmahj.cpp", -} - -createMESSProjects(_target, _subtarget, "nokia") -files { - MAME_DIR .. "src/mame/drivers/dbox.cpp", - MAME_DIR .. "src/mame/drivers/mikromik.cpp", - MAME_DIR .. "src/mame/includes/mikromik.h", - MAME_DIR .. "src/mame/machine/mm1kb.cpp", - MAME_DIR .. "src/mame/machine/mm1kb.h", - MAME_DIR .. "src/mame/video/mikromik.cpp", - MAME_DIR .. "src/mame/drivers/nokia_3310.cpp", -} - -createMESSProjects(_target, _subtarget, "northstar") -files { - MAME_DIR .. "src/mame/drivers/horizon.cpp", -} - -createMESSProjects(_target, _subtarget, "novag") -files { - MAME_DIR .. "src/mame/drivers/novag_cexpert.cpp", - MAME_DIR .. "src/mame/drivers/novag_cforte.cpp", - MAME_DIR .. "src/mame/drivers/novag_const.cpp", - MAME_DIR .. "src/mame/drivers/novag_diablo.cpp", - MAME_DIR .. "src/mame/drivers/novag_micro.cpp", - MAME_DIR .. "src/mame/drivers/novag_micro2.cpp", - MAME_DIR .. "src/mame/drivers/novag_savant.cpp", - MAME_DIR .. "src/mame/drivers/novag_sexpert.cpp", - MAME_DIR .. "src/mame/drivers/novag_snova.cpp", -} - -createMESSProjects(_target, _subtarget, "novation") -files { - MAME_DIR .. "src/mame/drivers/basssta.cpp", - MAME_DIR .. "src/mame/drivers/drumsta.cpp", -} - -createMESSProjects(_target, _subtarget, "olivetti") -files { - MAME_DIR .. "src/mame/drivers/m20.cpp", - MAME_DIR .. "src/mame/machine/m20_kbd.cpp", - MAME_DIR .. "src/mame/machine/m20_kbd.h", - MAME_DIR .. "src/mame/machine/m20_8086.cpp", - MAME_DIR .. "src/mame/machine/m20_8086.h", - MAME_DIR .. "src/mame/drivers/m24.cpp", - MAME_DIR .. "src/mame/machine/m24_kbd.cpp", - MAME_DIR .. "src/mame/machine/m24_kbd.h", - MAME_DIR .. "src/mame/machine/m24_z8000.cpp", - MAME_DIR .. "src/mame/machine/m24_z8000.h", - MAME_DIR .. "src/mame/drivers/olivpc1.cpp", -} - -createMESSProjects(_target, _subtarget, "olympia") -files { - MAME_DIR .. "src/mame/drivers/olyboss.cpp", - MAME_DIR .. "src/mame/drivers/olytext.cpp", - MAME_DIR .. "src/mame/drivers/peoplepc.cpp", -} - -createMESSProjects(_target, _subtarget, "omnibyte") -files { - MAME_DIR .. "src/mame/drivers/msbc1.cpp", - MAME_DIR .. "src/mame/drivers/ob68k1a.cpp", - MAME_DIR .. "src/mame/includes/ob68k1a.h", -} - -createMESSProjects(_target, _subtarget, "omron") -files { - MAME_DIR .. "src/mame/drivers/luna_68k.cpp", -} - -createMESSProjects(_target, _subtarget, "openuni") -files { - MAME_DIR .. "src/mame/drivers/hektor.cpp", -} - -createMESSProjects(_target, _subtarget, "osborne") -files { - MAME_DIR .. "src/mame/drivers/osborne1.cpp", - MAME_DIR .. "src/mame/includes/osborne1.h", - MAME_DIR .. "src/mame/machine/osborne1.cpp", - MAME_DIR .. "src/mame/drivers/osbexec.cpp", - MAME_DIR .. "src/mame/drivers/vixen.cpp", -} - -createMESSProjects(_target, _subtarget, "osi") -files { - MAME_DIR .. "src/mame/drivers/osi.cpp", - MAME_DIR .. "src/mame/includes/osi.h", - MAME_DIR .. "src/mame/video/osi.cpp", -} - -createMESSProjects(_target, _subtarget, "palm") -files { - MAME_DIR .. "src/mame/drivers/palm.cpp", - MAME_DIR .. "src/mame/drivers/palm_dbg.ipp", - MAME_DIR .. "src/mame/drivers/palmz22.cpp", -} - -createMESSProjects(_target, _subtarget, "parker") -files { - MAME_DIR .. "src/mame/drivers/talkingbb.cpp", - MAME_DIR .. "src/mame/drivers/talkingfb.cpp", - MAME_DIR .. "src/mame/drivers/wildfire.cpp", -} - -createMESSProjects(_target, _subtarget, "pitronic") -files { - MAME_DIR .. "src/mame/drivers/beta.cpp", -} - -createMESSProjects(_target, _subtarget, "pc") -files { - MAME_DIR .. "src/mame/drivers/asst128.cpp", - MAME_DIR .. "src/mame/drivers/europc.cpp", - MAME_DIR .. "src/mame/machine/europc_kbd.cpp", - MAME_DIR .. "src/mame/machine/europc_kbd.h", - MAME_DIR .. "src/mame/drivers/genpc.cpp", - MAME_DIR .. "src/mame/drivers/ibmpc.cpp", - MAME_DIR .. "src/mame/drivers/ibmpcjr.cpp", - MAME_DIR .. "src/mame/drivers/nforcepc.cpp", - MAME_DIR .. "src/mame/includes/nforcepc.h", - MAME_DIR .. "src/mame/drivers/pc.cpp", - MAME_DIR .. "src/mame/drivers/pcipc.cpp", - MAME_DIR .. "src/mame/drivers/tandy1t.cpp", - MAME_DIR .. "src/mame/drivers/tosh1000.cpp", - MAME_DIR .. "src/mame/machine/tosh1000_bram.cpp", - MAME_DIR .. "src/mame/machine/tosh1000_bram.h", - MAME_DIR .. "src/mame/drivers/compc.cpp", - MAME_DIR .. "src/mame/video/pc_t1t.cpp", - MAME_DIR .. "src/mame/video/pc_t1t.h", -} - -createMESSProjects(_target, _subtarget, "pdp1") -files { - MAME_DIR .. "src/mame/drivers/pdp1.cpp", - MAME_DIR .. "src/mame/includes/pdp1.h", - MAME_DIR .. "src/mame/video/pdp1.cpp", -} - -createMESSProjects(_target, _subtarget, "pel") -files { - MAME_DIR .. "src/mame/drivers/galeb.cpp", - MAME_DIR .. "src/mame/drivers/orao.cpp", -} - -createMESSProjects(_target, _subtarget, "philips") -files { - MAME_DIR .. "src/mame/drivers/p2000t.cpp", - MAME_DIR .. "src/mame/includes/p2000t.h", - MAME_DIR .. "src/mame/machine/p2000t.cpp", - MAME_DIR .. "src/mame/machine/p2000t_mdcr.h", - MAME_DIR .. "src/mame/machine/p2000t_mdcr.cpp", - MAME_DIR .. "src/mame/video/p2000t.cpp", - MAME_DIR .. "src/mame/drivers/vg5k.cpp", - MAME_DIR .. "src/mame/drivers/yes.cpp", -} - -createMESSProjects(_target, _subtarget, "poly") -files { - MAME_DIR .. "src/mame/drivers/poly.cpp", - MAME_DIR .. "src/mame/includes/poly.h", - MAME_DIR .. "src/mame/machine/poly.cpp", - MAME_DIR .. "src/mame/drivers/proteus.cpp", -} - -createMESSProjects(_target, _subtarget, "poly88") -files { - MAME_DIR .. "src/mame/drivers/poly88.cpp", - MAME_DIR .. "src/mame/includes/poly88.h", - MAME_DIR .. "src/mame/machine/poly88.cpp", -} - -createMESSProjects(_target, _subtarget, "positron") -files { - MAME_DIR .. "src/mame/drivers/positron.cpp", -} - -createMESSProjects(_target, _subtarget, "psion") -files { - MAME_DIR .. "src/mame/drivers/psion.cpp", - MAME_DIR .. "src/mame/includes/psion.h", - MAME_DIR .. "src/mame/drivers/psion5.cpp", - MAME_DIR .. "src/mame/includes/psion5.h", - MAME_DIR .. "src/mame/machine/etna.cpp", - MAME_DIR .. "src/mame/machine/etna.h", - MAME_DIR .. "src/mame/machine/psion_pack.cpp", - MAME_DIR .. "src/mame/machine/psion_pack.h", -} - -createMESSProjects(_target, _subtarget, "quantel") -files { - MAME_DIR .. "src/mame/drivers/dpb7000.cpp", - MAME_DIR .. "src/mame/drivers/harriet.cpp", -} - -createMESSProjects(_target, _subtarget, "qume") -files { - MAME_DIR .. "src/mame/drivers/qvt70.cpp", - MAME_DIR .. "src/mame/drivers/qvt102.cpp", - MAME_DIR .. "src/mame/drivers/qvt103.cpp", - MAME_DIR .. "src/mame/drivers/qvt190.cpp", - MAME_DIR .. "src/mame/drivers/qvt201.cpp", -} - -createMESSProjects(_target, _subtarget, "radio") -files { - MAME_DIR .. "src/mame/drivers/apogee.cpp", - MAME_DIR .. "src/mame/drivers/mikrosha.cpp", - MAME_DIR .. "src/mame/drivers/orion.cpp", - MAME_DIR .. "src/mame/includes/orion.h", - MAME_DIR .. "src/mame/machine/orion.cpp", - MAME_DIR .. "src/mame/video/orion.cpp", - MAME_DIR .. "src/mame/drivers/partner.cpp", - MAME_DIR .. "src/mame/includes/partner.h", - MAME_DIR .. "src/mame/machine/partner.cpp", - MAME_DIR .. "src/mame/drivers/radio86.cpp", - MAME_DIR .. "src/mame/includes/radio86.h", - MAME_DIR .. "src/mame/machine/radio86.cpp", -} - -createMESSProjects(_target, _subtarget, "rca") -files { - MAME_DIR .. "src/mame/drivers/microkit.cpp", - MAME_DIR .. "src/mame/drivers/studio2.cpp", - MAME_DIR .. "src/mame/drivers/vip.cpp", - MAME_DIR .. "src/mame/includes/vip.h", -} - -createMESSProjects(_target, _subtarget, "regnecentralen") -files { - MAME_DIR .. "src/mame/drivers/rc702.cpp", - MAME_DIR .. "src/mame/drivers/rc759.cpp", - MAME_DIR .. "src/mame/machine/rc759_kbd.cpp", - MAME_DIR .. "src/mame/machine/rc759_kbd.h", -} - -createMESSProjects(_target, _subtarget, "ritam") -files { - MAME_DIR .. "src/mame/drivers/monty.cpp", -} - -createMESSProjects(_target, _subtarget, "rm") -files { - MAME_DIR .. "src/mame/drivers/rm380z.cpp", - MAME_DIR .. "src/mame/includes/rm380z.h", - MAME_DIR .. "src/mame/machine/rm380z.cpp", - MAME_DIR .. "src/mame/video/rm380z.cpp", - MAME_DIR .. "src/mame/drivers/rmnimbus.cpp", - MAME_DIR .. "src/mame/includes/rmnimbus.h", - MAME_DIR .. "src/mame/machine/rmnimbus.cpp", - MAME_DIR .. "src/mame/video/rmnimbus.cpp", - MAME_DIR .. "src/mame/machine/rmnkbd.cpp", - MAME_DIR .. "src/mame/machine/rmnkbd.h", -} - -createMESSProjects(_target, _subtarget, "robotron") -files { - MAME_DIR .. "src/mame/drivers/a5105.cpp", - MAME_DIR .. "src/mame/drivers/a51xx.cpp", - MAME_DIR .. "src/mame/drivers/a7150.cpp", - MAME_DIR .. "src/mame/drivers/k1003.cpp", - MAME_DIR .. "src/mame/drivers/k8915.cpp", - MAME_DIR .. "src/mame/drivers/rt1715.cpp", - MAME_DIR .. "src/mame/drivers/z1013.cpp", - MAME_DIR .. "src/mame/drivers/z9001.cpp", -} - -createMESSProjects(_target, _subtarget, "roland") -files { - MAME_DIR .. "src/mame/drivers/alphajuno.cpp", - MAME_DIR .. "src/mame/drivers/boss_se70.cpp", - MAME_DIR .. "src/mame/drivers/boss_sx700.cpp", - MAME_DIR .. "src/mame/drivers/juno106.cpp", - MAME_DIR .. "src/mame/drivers/juno6.cpp", - MAME_DIR .. "src/mame/drivers/roland_cm32p.cpp", - MAME_DIR .. "src/mame/drivers/roland_d10.cpp", - MAME_DIR .. "src/mame/drivers/roland_d50.cpp", - MAME_DIR .. "src/mame/drivers/roland_jd800.cpp", - MAME_DIR .. "src/mame/drivers/roland_jv80.cpp", - MAME_DIR .. "src/mame/drivers/roland_jx3p.cpp", - MAME_DIR .. "src/mame/drivers/roland_jx8p.cpp", - MAME_DIR .. "src/mame/drivers/roland_mc50.cpp", - MAME_DIR .. "src/mame/drivers/roland_mt32.cpp", - MAME_DIR .. "src/mame/drivers/roland_pr100.cpp", - MAME_DIR .. "src/mame/drivers/roland_r8.cpp", - MAME_DIR .. "src/mame/drivers/roland_ra30.cpp", - MAME_DIR .. "src/mame/drivers/roland_s10.cpp", - MAME_DIR .. "src/mame/drivers/roland_s50.cpp", - MAME_DIR .. "src/mame/drivers/roland_sc55.cpp", - MAME_DIR .. "src/mame/drivers/roland_sc88.cpp", - MAME_DIR .. "src/mame/drivers/roland_tb303.cpp", - MAME_DIR .. "src/mame/drivers/roland_tnsc1.cpp", - MAME_DIR .. "src/mame/drivers/roland_tr505.cpp", - MAME_DIR .. "src/mame/drivers/roland_tr606.cpp", - MAME_DIR .. "src/mame/drivers/roland_tr707.cpp", - MAME_DIR .. "src/mame/drivers/roland_tr808.cpp", - MAME_DIR .. "src/mame/drivers/roland_tr909.cpp", - MAME_DIR .. "src/mame/drivers/roland_u20.cpp", - MAME_DIR .. "src/mame/audio/bu3905.cpp", - MAME_DIR .. "src/mame/audio/bu3905.h", - MAME_DIR .. "src/mame/audio/jx8p_synth.cpp", - MAME_DIR .. "src/mame/audio/jx8p_synth.h", - MAME_DIR .. "src/mame/audio/mb63h114.cpp", - MAME_DIR .. "src/mame/audio/mb63h114.h", - MAME_DIR .. "src/mame/audio/sa16.cpp", - MAME_DIR .. "src/mame/audio/sa16.h", - MAME_DIR .. "src/mame/machine/mb62h195.cpp", - MAME_DIR .. "src/mame/machine/mb62h195.h", - MAME_DIR .. "src/mame/machine/mb63h149.cpp", - MAME_DIR .. "src/mame/machine/mb63h149.h", - MAME_DIR .. "src/mame/machine/mb87013.cpp", - MAME_DIR .. "src/mame/machine/mb87013.h", - MAME_DIR .. "src/mame/machine/pg200.cpp", - MAME_DIR .. "src/mame/machine/pg200.h", -} - -createMESSProjects(_target, _subtarget, "rolm") -files { - MAME_DIR .. "src/mame/drivers/r9751.cpp", -} - -createMESSProjects(_target, _subtarget, "rockwell") -files { - MAME_DIR .. "src/mame/drivers/aim65.cpp", - MAME_DIR .. "src/mame/includes/aim65.h", - MAME_DIR .. "src/mame/machine/aim65.cpp", - MAME_DIR .. "src/mame/drivers/aim65_40.cpp", -} - -createMESSProjects(_target, _subtarget, "rtpc") -files { - MAME_DIR .. "src/mame/drivers/rtpc.cpp", - MAME_DIR .. "src/mame/machine/rosetta.cpp", - MAME_DIR .. "src/mame/machine/rosetta.h", - MAME_DIR .. "src/mame/machine/rtpc_iocc.cpp", - MAME_DIR .. "src/mame/machine/rtpc_iocc.h", -} - -createMESSProjects(_target, _subtarget, "sage") -files { - MAME_DIR .. "src/mame/drivers/sage2.cpp", - MAME_DIR .. "src/mame/includes/sage2.h", -} - -createMESSProjects(_target, _subtarget, "saitek") -files { - MAME_DIR .. "src/mame/drivers/saitek_ccompan.cpp", - MAME_DIR .. "src/mame/drivers/saitek_chesstrv.cpp", - MAME_DIR .. "src/mame/drivers/saitek_cp2000.cpp", - MAME_DIR .. "src/mame/drivers/saitek_delta1.cpp", - MAME_DIR .. "src/mame/drivers/saitek_exchess.cpp", - MAME_DIR .. "src/mame/drivers/saitek_intchess.cpp", - MAME_DIR .. "src/mame/drivers/saitek_leonardo.cpp", - MAME_DIR .. "src/mame/drivers/saitek_mark5.cpp", - MAME_DIR .. "src/mame/drivers/saitek_minichess.cpp", - MAME_DIR .. "src/mame/drivers/saitek_prschess.cpp", - MAME_DIR .. "src/mame/drivers/saitek_renaissance.cpp", - MAME_DIR .. "src/mame/drivers/saitek_risc2500.cpp", - MAME_DIR .. "src/mame/drivers/saitek_schess.cpp", - MAME_DIR .. "src/mame/drivers/saitek_simultano.cpp", - MAME_DIR .. "src/mame/drivers/saitek_ssystem3.cpp", - MAME_DIR .. "src/mame/includes/saitek_stratos.h", - MAME_DIR .. "src/mame/drivers/saitek_stratos.cpp", - MAME_DIR .. "src/mame/drivers/saitek_corona.cpp", -- subdriver of saitek_stratos - MAME_DIR .. "src/mame/drivers/saitek_superstar.cpp", -} - -createMESSProjects(_target, _subtarget, "samcoupe") -files { - MAME_DIR .. "src/mame/drivers/samcoupe.cpp", -} - -createMESSProjects(_target, _subtarget, "samsung") -files { - MAME_DIR .. "src/mame/drivers/spc1000.cpp", - MAME_DIR .. "src/mame/drivers/spc1500.cpp", -} - -createMESSProjects(_target, _subtarget, "sanyo") -files { - MAME_DIR .. "src/mame/drivers/mbc200.cpp", - MAME_DIR .. "src/mame/drivers/mbc55x.cpp", - MAME_DIR .. "src/mame/includes/mbc55x.h", - MAME_DIR .. "src/mame/video/mbc55x.cpp", - MAME_DIR .. "src/mame/drivers/phc25.cpp", - MAME_DIR .. "src/mame/includes/phc25.h", - MAME_DIR .. "src/mame/machine/mbc55x_kbd.cpp", - MAME_DIR .. "src/mame/machine/mbc55x_kbd.h", -} - -createMESSProjects(_target, _subtarget, "saturn") -files { - MAME_DIR .. "src/mame/drivers/st17xx.cpp", -} - --- Don't call this project "sega" or it collides with the arcade one --- and merges with it, which ends up with libsega.a linked after --- libshared.a. The link then fails on linux because SEGAM1AUDIO and RAX --- are in shared while model* and stv are in sega. -createMESSProjects(_target, _subtarget, "segacons") -files { - MAME_DIR .. "src/mame/drivers/dccons.cpp", - MAME_DIR .. "src/mame/includes/dccons.h", - MAME_DIR .. "src/mame/machine/dccons.cpp", - MAME_DIR .. "src/mame/drivers/megadriv.cpp", - MAME_DIR .. "src/mame/drivers/megadriv_rad.cpp", - MAME_DIR .. "src/mame/includes/megadriv_rad.h", - MAME_DIR .. "src/mame/drivers/megadriv_vt_hybrid.cpp", - MAME_DIR .. "src/mame/drivers/megadriv_sunplus_hybrid.cpp", - MAME_DIR .. "src/mame/drivers/segapico.cpp", - MAME_DIR .. "src/mame/drivers/sega_sawatte.cpp", - MAME_DIR .. "src/mame/drivers/sega_beena.cpp", - MAME_DIR .. "src/mame/drivers/segapm.cpp", - MAME_DIR .. "src/mame/drivers/sg1000.cpp", - MAME_DIR .. "src/mame/includes/sg1000.h", - MAME_DIR .. "src/mame/drivers/svmu.cpp", - MAME_DIR .. "src/mame/machine/megacd.cpp", - MAME_DIR .. "src/mame/machine/megacd.h", -} - -createMESSProjects(_target, _subtarget, "selchow") -files { - MAME_DIR .. "src/mame/drivers/scrablex.cpp", -} - -createMESSProjects(_target, _subtarget, "sequential") -files { - MAME_DIR .. "src/mame/drivers/prophet600.cpp", -} - -createMESSProjects(_target, _subtarget, "sgi") -files { - MAME_DIR .. "src/mame/drivers/iris_power.cpp", - MAME_DIR .. "src/mame/drivers/crimson.cpp", - MAME_DIR .. "src/mame/drivers/o2.cpp", - MAME_DIR .. "src/mame/drivers/octane.cpp", - MAME_DIR .. "src/mame/machine/vino.cpp", - MAME_DIR .. "src/mame/machine/vino.h", - MAME_DIR .. "src/mame/machine/sgi.cpp", - MAME_DIR .. "src/mame/machine/sgi.h", - MAME_DIR .. "src/mame/machine/hal2.cpp", - MAME_DIR .. "src/mame/machine/hal2.h", - MAME_DIR .. "src/mame/machine/hpc1.cpp", - MAME_DIR .. "src/mame/machine/hpc1.h", - MAME_DIR .. "src/mame/machine/hpc3.cpp", - MAME_DIR .. "src/mame/machine/hpc3.h", - MAME_DIR .. "src/mame/machine/ioc2.cpp", - MAME_DIR .. "src/mame/machine/ioc2.h", - MAME_DIR .. "src/mame/machine/mace.cpp", - MAME_DIR .. "src/mame/machine/mace.h", - MAME_DIR .. "src/mame/drivers/iris3130.cpp", - MAME_DIR .. "src/mame/drivers/4dpi.cpp", - MAME_DIR .. "src/mame/drivers/indigo.cpp", - MAME_DIR .. "src/mame/drivers/indy_indigo2.cpp", - MAME_DIR .. "src/mame/video/light.cpp", - MAME_DIR .. "src/mame/video/light.h", - MAME_DIR .. "src/mame/video/crime.cpp", - MAME_DIR .. "src/mame/video/crime.h", - MAME_DIR .. "src/mame/video/sgi_gr1.cpp", - MAME_DIR .. "src/mame/video/sgi_gr1.h", - MAME_DIR .. "src/mame/video/sgi_ge5.cpp", - MAME_DIR .. "src/mame/video/sgi_ge5.h", - MAME_DIR .. "src/mame/video/sgi_re2.cpp", - MAME_DIR .. "src/mame/video/sgi_re2.h", - MAME_DIR .. "src/mame/video/sgi_xmap2.cpp", - MAME_DIR .. "src/mame/video/sgi_xmap2.h", -} - -createMESSProjects(_target, _subtarget, "sharp") -files { - MAME_DIR .. "src/mame/video/mz700.cpp", - MAME_DIR .. "src/mame/drivers/mz700.cpp", - MAME_DIR .. "src/mame/includes/mz700.h", - MAME_DIR .. "src/mame/drivers/pc1500.cpp", - MAME_DIR .. "src/mame/drivers/pocketc.cpp", - MAME_DIR .. "src/mame/machine/pocketc.cpp", - MAME_DIR .. "src/mame/includes/pocketc.h", - MAME_DIR .. "src/mame/video/pc1401.cpp", - MAME_DIR .. "src/mame/machine/pc1401.cpp", - MAME_DIR .. "src/mame/includes/pc1401.h", - MAME_DIR .. "src/mame/video/pc1403.cpp", - MAME_DIR .. "src/mame/machine/pc1403.cpp", - MAME_DIR .. "src/mame/includes/pc1403.h", - MAME_DIR .. "src/mame/video/pc1350.cpp", - MAME_DIR .. "src/mame/machine/pc1350.cpp", - MAME_DIR .. "src/mame/includes/pc1350.h", - MAME_DIR .. "src/mame/video/pc1251.cpp", - MAME_DIR .. "src/mame/machine/pc1251.cpp", - MAME_DIR .. "src/mame/includes/pc1251.h", - MAME_DIR .. "src/mame/video/pocketc.cpp", - MAME_DIR .. "src/mame/machine/mz700.cpp", - MAME_DIR .. "src/mame/drivers/x68k.cpp", - MAME_DIR .. "src/mame/includes/x68k.h", - MAME_DIR .. "src/mame/video/x68k.cpp", - MAME_DIR .. "src/mame/machine/x68k_hdc.cpp", - MAME_DIR .. "src/mame/machine/x68k_hdc.h", - MAME_DIR .. "src/mame/machine/x68k_kbd.cpp", - MAME_DIR .. "src/mame/machine/x68k_kbd.h", - MAME_DIR .. "src/mame/video/x68k_crtc.cpp", - MAME_DIR .. "src/mame/video/x68k_crtc.h", - MAME_DIR .. "src/mame/drivers/mz80.cpp", - MAME_DIR .. "src/mame/includes/mz80.h", - MAME_DIR .. "src/mame/video/mz80.cpp", - MAME_DIR .. "src/mame/machine/mz80.cpp", - MAME_DIR .. "src/mame/drivers/mz2000.cpp", - MAME_DIR .. "src/mame/drivers/wizard.cpp", - MAME_DIR .. "src/mame/drivers/x1.cpp", - MAME_DIR .. "src/mame/includes/x1.h", - MAME_DIR .. "src/mame/machine/x1.cpp", - MAME_DIR .. "src/mame/video/x1.cpp", - MAME_DIR .. "src/mame/drivers/x1twin.cpp", - MAME_DIR .. "src/mame/drivers/mz2500.cpp", - MAME_DIR .. "src/mame/includes/mz2500.h", - MAME_DIR .. "src/mame/drivers/mz3500.cpp", - MAME_DIR .. "src/mame/drivers/pce220.cpp", - MAME_DIR .. "src/mame/machine/pce220_ser.cpp", - MAME_DIR .. "src/mame/machine/pce220_ser.h", - MAME_DIR .. "src/mame/drivers/mz6500.cpp", - MAME_DIR .. "src/mame/drivers/zaurus.cpp", - MAME_DIR .. "src/mame/drivers/fontwriter.cpp", -} - -createMESSProjects(_target, _subtarget, "sinclair") -files { - MAME_DIR .. "src/mame/video/spectrum.cpp", - MAME_DIR .. "src/mame/video/timex.cpp", - MAME_DIR .. "src/mame/video/zx.cpp", - MAME_DIR .. "src/mame/drivers/zx.cpp", - MAME_DIR .. "src/mame/includes/zx.h", - MAME_DIR .. "src/mame/machine/zx.cpp", - MAME_DIR .. "src/mame/drivers/spectrum.cpp", - MAME_DIR .. "src/mame/includes/spectrum.h", - MAME_DIR .. "src/mame/drivers/spec128.cpp", - MAME_DIR .. "src/mame/includes/spec128.h", - MAME_DIR .. "src/mame/drivers/timex.cpp", - MAME_DIR .. "src/mame/includes/timex.h", - MAME_DIR .. "src/mame/drivers/specpls3.cpp", - MAME_DIR .. "src/mame/includes/specpls3.h", - MAME_DIR .. "src/mame/drivers/scorpion.cpp", - MAME_DIR .. "src/mame/drivers/atm.cpp", - MAME_DIR .. "src/mame/drivers/elwro800.cpp", - MAME_DIR .. "src/mame/drivers/pentagon.cpp", - MAME_DIR .. "src/mame/machine/beta.cpp", - MAME_DIR .. "src/mame/machine/beta.h", - MAME_DIR .. "src/mame/machine/spec_snqk.cpp", - MAME_DIR .. "src/mame/machine/spec_snqk.h", - MAME_DIR .. "src/mame/drivers/ql.cpp", - MAME_DIR .. "src/mame/machine/qimi.cpp", - MAME_DIR .. "src/mame/machine/qimi.h", - MAME_DIR .. "src/mame/video/zx8301.cpp", - MAME_DIR .. "src/mame/video/zx8301.h", - MAME_DIR .. "src/mame/machine/zx8302.cpp", - MAME_DIR .. "src/mame/machine/zx8302.h", - MAME_DIR .. "src/mame/drivers/tsconf.cpp", - MAME_DIR .. "src/mame/includes/tsconf.h", - MAME_DIR .. "src/mame/machine/tsconf.cpp", -} - -createMESSProjects(_target, _subtarget, "siemens") -files { - MAME_DIR .. "src/mame/drivers/bitel.cpp", - MAME_DIR .. "src/mame/drivers/pcd.cpp", - MAME_DIR .. "src/mame/drivers/pcmx2.cpp", - MAME_DIR .. "src/mame/machine/pcd_kbd.cpp", - MAME_DIR .. "src/mame/machine/pcd_kbd.h", - MAME_DIR .. "src/mame/video/pcd.cpp", - MAME_DIR .. "src/mame/video/pcd.h", - MAME_DIR .. "src/mame/drivers/pg685.cpp", -} - -createMESSProjects(_target, _subtarget, "slicer") -files { - MAME_DIR .. "src/mame/drivers/slicer.cpp", -} - -createMESSProjects(_target, _subtarget, "snk") -files { - MAME_DIR .. "src/mame/drivers/neogeocd.cpp", - MAME_DIR .. "src/mame/drivers/ngp.cpp", - MAME_DIR .. "src/mame/video/k1ge.cpp", - MAME_DIR .. "src/mame/video/k1ge.h", -} - -createMESSProjects(_target, _subtarget, "sony") -files { - MAME_DIR .. "src/mame/drivers/betacam.cpp", - MAME_DIR .. "src/mame/drivers/bvm.cpp", - MAME_DIR .. "src/mame/drivers/dfs500.cpp", - MAME_DIR .. "src/mame/drivers/dpsv55.cpp", - MAME_DIR .. "src/mame/drivers/pockstat.cpp", - MAME_DIR .. "src/mame/drivers/psx.cpp", - MAME_DIR .. "src/mame/machine/psxcd.cpp", - MAME_DIR .. "src/mame/machine/psxcd.h", - MAME_DIR .. "src/mame/drivers/pve500.cpp", - MAME_DIR .. "src/mame/drivers/smc777.cpp", - MAME_DIR .. "src/mame/drivers/ps2sony.cpp", - MAME_DIR .. "src/mame/drivers/umatic.cpp", -} - -createMESSProjects(_target, _subtarget, "sony_news") -files { - MAME_DIR .. "src/mame/drivers/news_68k.cpp", - MAME_DIR .. "src/mame/drivers/news_r3k.cpp", - MAME_DIR .. "src/mame/drivers/news_38xx.cpp", - MAME_DIR .. "src/mame/machine/dmac_0448.cpp", - MAME_DIR .. "src/mame/machine/dmac_0448.h", - MAME_DIR .. "src/mame/machine/dmac_0266.cpp", - MAME_DIR .. "src/mame/machine/dmac_0266.h", - MAME_DIR .. "src/mame/machine/news_hid.cpp", - MAME_DIR .. "src/mame/machine/news_hid.h", -} - -createMESSProjects(_target, _subtarget, "sord") -files { - MAME_DIR .. "src/mame/drivers/m5.cpp", -} - -createMESSProjects(_target, _subtarget, "special") -files { - MAME_DIR .. "src/mame/drivers/special.cpp", - MAME_DIR .. "src/mame/includes/special.h", - MAME_DIR .. "src/mame/machine/special.cpp", - MAME_DIR .. "src/mame/video/special.cpp", -} - -createMESSProjects(_target, _subtarget, "stm") -files { - MAME_DIR .. "src/mame/drivers/pp.cpp", -} - -createMESSProjects(_target, _subtarget, "sun") -files { - MAME_DIR .. "src/mame/drivers/sun1.cpp", - MAME_DIR .. "src/mame/drivers/sun2.cpp", - MAME_DIR .. "src/mame/drivers/sun3.cpp", - MAME_DIR .. "src/mame/drivers/sun3x.cpp", - MAME_DIR .. "src/mame/drivers/sun4.cpp", -} - -createMESSProjects(_target, _subtarget, "svi") -files { - MAME_DIR .. "src/mame/drivers/svi318.cpp", -} - -createMESSProjects(_target, _subtarget, "svision") -files { - MAME_DIR .. "src/mame/drivers/svision.cpp", - MAME_DIR .. "src/mame/includes/svision.h", - MAME_DIR .. "src/mame/audio/svis_snd.cpp", - MAME_DIR .. "src/mame/audio/svis_snd.h", -} - -createMESSProjects(_target, _subtarget, "swtpc") -files { - MAME_DIR .. "src/mame/drivers/swtpc.cpp", - MAME_DIR .. "src/mame/drivers/swtpc09.cpp", - MAME_DIR .. "src/mame/includes/swtpc09.h", - MAME_DIR .. "src/mame/machine/swtpc09.cpp", - MAME_DIR .. "src/mame/drivers/swtpc8212.cpp", -} - -createMESSProjects(_target, _subtarget, "synertek") -files { - MAME_DIR .. "src/mame/drivers/ktm3.cpp", - MAME_DIR .. "src/mame/drivers/mbc020.cpp", - MAME_DIR .. "src/mame/drivers/sym1.cpp", -} - -createMESSProjects(_target, _subtarget, "ta") -files { - MAME_DIR .. "src/mame/drivers/alphatpx.cpp", - MAME_DIR .. "src/mame/drivers/alphatpc16.cpp", - MAME_DIR .. "src/mame/drivers/alphatro.cpp", -} - -createMESSProjects(_target, _subtarget, "tab") -files { - MAME_DIR .. "src/mame/drivers/tabe22.cpp", - MAME_DIR .. "src/mame/machine/e22_kbd.cpp", - MAME_DIR .. "src/mame/machine/e22_kbd.h", -} - -createMESSProjects(_target, _subtarget, "tandberg") -files { - MAME_DIR .. "src/mame/drivers/tdv2324.cpp", - MAME_DIR .. "src/mame/includes/tdv2324.h", -} - -createMESSProjects(_target, _subtarget, "tangerin") -files { - MAME_DIR .. "src/mame/drivers/alphatan.cpp", - MAME_DIR .. "src/mame/drivers/hhtiger.cpp", - MAME_DIR .. "src/mame/drivers/microtan.cpp", - MAME_DIR .. "src/mame/includes/microtan.h", - MAME_DIR .. "src/mame/machine/microtan.cpp", - MAME_DIR .. "src/mame/video/microtan.cpp", - MAME_DIR .. "src/mame/drivers/oric.cpp", -} - -createMESSProjects(_target, _subtarget, "tasc") -files { - MAME_DIR .. "src/mame/drivers/tasc.cpp", -} - -createMESSProjects(_target, _subtarget, "tatung") -files { - MAME_DIR .. "src/mame/drivers/einstein.cpp", -} - -createMESSProjects(_target, _subtarget, "teamconc") -files { - MAME_DIR .. "src/mame/drivers/comquest.cpp", -} - -createMESSProjects(_target, _subtarget, "tectoy") -files { - MAME_DIR .. "src/mame/drivers/pensebem.cpp", -} - -createMESSProjects(_target, _subtarget, "tektroni") -files { - MAME_DIR .. "src/mame/drivers/tek405x.cpp", - MAME_DIR .. "src/mame/includes/tek405x.h", - MAME_DIR .. "src/mame/drivers/tek410x.cpp", - MAME_DIR .. "src/mame/drivers/tek43xx.cpp", - MAME_DIR .. "src/mame/drivers/tek440x.cpp", - MAME_DIR .. "src/mame/drivers/tekigw.cpp", - MAME_DIR .. "src/mame/drivers/tekxp33x.cpp", - MAME_DIR .. "src/mame/machine/tek410x_kbd.cpp", - MAME_DIR .. "src/mame/machine/tek410x_kbd.h", -} - -createMESSProjects(_target, _subtarget, "telenova") -files { - MAME_DIR .. "src/mame/drivers/compis.cpp", - MAME_DIR .. "src/mame/machine/compiskb.cpp", - MAME_DIR .. "src/mame/machine/compiskb.h", -} - -createMESSProjects(_target, _subtarget, "telercas") -files { - MAME_DIR .. "src/mame/drivers/tmc1800.cpp", - MAME_DIR .. "src/mame/includes/tmc1800.h", - MAME_DIR .. "src/mame/video/tmc1800.cpp", - MAME_DIR .. "src/mame/drivers/tmc600.cpp", - MAME_DIR .. "src/mame/includes/tmc600.h", - MAME_DIR .. "src/mame/video/tmc600.cpp", - MAME_DIR .. "src/mame/drivers/tmc2000e.cpp", - MAME_DIR .. "src/mame/includes/tmc2000e.h", -} - -createMESSProjects(_target, _subtarget, "televideo") -files { - MAME_DIR .. "src/mame/drivers/ts802.cpp", - MAME_DIR .. "src/mame/drivers/ts803.cpp", - MAME_DIR .. "src/mame/drivers/ts816.cpp", - MAME_DIR .. "src/mame/drivers/tv910.cpp", - MAME_DIR .. "src/mame/drivers/tv912.cpp", - MAME_DIR .. "src/mame/drivers/tv924.cpp", - MAME_DIR .. "src/mame/drivers/tv950.cpp", - MAME_DIR .. "src/mame/drivers/tv955.cpp", - MAME_DIR .. "src/mame/drivers/tv965.cpp", - MAME_DIR .. "src/mame/drivers/tv990.cpp", - MAME_DIR .. "src/mame/drivers/ts3000.cpp", - MAME_DIR .. "src/mame/machine/tv950kb.cpp", - MAME_DIR .. "src/mame/machine/tv950kb.h", - MAME_DIR .. "src/mame/machine/tv955kb.cpp", - MAME_DIR .. "src/mame/machine/tv955kb.h", -} - -createMESSProjects(_target, _subtarget, "tesla") -files { - MAME_DIR .. "src/mame/drivers/ondra.cpp", - MAME_DIR .. "src/mame/includes/ondra.h", - MAME_DIR .. "src/mame/machine/ondra.cpp", - MAME_DIR .. "src/mame/drivers/pmd85.cpp", - MAME_DIR .. "src/mame/includes/pmd85.h", - MAME_DIR .. "src/mame/machine/pmd85.cpp", - MAME_DIR .. "src/mame/drivers/pmi80.cpp", - MAME_DIR .. "src/mame/drivers/sapi1.cpp", -} - -createMESSProjects(_target, _subtarget, "thomson") -files { - MAME_DIR .. "src/mame/drivers/thomson.cpp", - MAME_DIR .. "src/mame/includes/thomson.h", - MAME_DIR .. "src/mame/machine/thomson.cpp", - MAME_DIR .. "src/mame/video/thomson.cpp", -} - -createMESSProjects(_target, _subtarget, "ti") -files { - MAME_DIR .. "src/mame/drivers/avigo.cpp", - MAME_DIR .. "src/mame/includes/avigo.h", - MAME_DIR .. "src/mame/video/avigo.cpp", - MAME_DIR .. "src/mame/drivers/cc40.cpp", - MAME_DIR .. "src/mame/drivers/evmbug.cpp", - MAME_DIR .. "src/mame/drivers/exelv.cpp", - MAME_DIR .. "src/mame/drivers/geneve.cpp", - MAME_DIR .. "src/mame/drivers/ti74.cpp", - MAME_DIR .. "src/mame/drivers/ti85.cpp", - MAME_DIR .. "src/mame/includes/ti85.h", - MAME_DIR .. "src/mame/machine/ti85.cpp", - MAME_DIR .. "src/mame/video/ti85.cpp", - MAME_DIR .. "src/mame/drivers/ti89.cpp", - MAME_DIR .. "src/mame/includes/ti89.h", - MAME_DIR .. "src/mame/drivers/ti931.cpp", - MAME_DIR .. "src/mame/drivers/ti99_2.cpp", - MAME_DIR .. "src/mame/drivers/ti99_4x.cpp", - MAME_DIR .. "src/mame/drivers/ti99_4p.cpp", - MAME_DIR .. "src/mame/drivers/ti99_8.cpp", - MAME_DIR .. "src/mame/drivers/ti990_4.cpp", - MAME_DIR .. "src/mame/drivers/ti990_10.cpp", - MAME_DIR .. "src/mame/drivers/tm990189.cpp", - MAME_DIR .. "src/mame/video/733_asr.cpp", - MAME_DIR .. "src/mame/video/733_asr.h", - MAME_DIR .. "src/mame/video/911_vdt.cpp", - MAME_DIR .. "src/mame/video/911_vdt.h", - MAME_DIR .. "src/mame/video/911_chr.h", - MAME_DIR .. "src/mame/video/911_key.h", -} - -createMESSProjects(_target, _subtarget, "tiger") -files { - MAME_DIR .. "src/mame/drivers/gamecom.cpp", - MAME_DIR .. "src/mame/includes/gamecom.h", - MAME_DIR .. "src/mame/machine/gamecom.cpp", - MAME_DIR .. "src/mame/video/gamecom.cpp", - MAME_DIR .. "src/mame/drivers/k28.cpp", -} - -createMESSProjects(_target, _subtarget, "tigertel") -files { - MAME_DIR .. "src/mame/drivers/gizmondo.cpp", - MAME_DIR .. "src/mame/machine/docg3.cpp", - MAME_DIR .. "src/mame/machine/docg3.h", -} - -createMESSProjects(_target, _subtarget, "tiki") -files { - MAME_DIR .. "src/mame/drivers/tiki100.cpp", - MAME_DIR .. "src/mame/includes/tiki100.h", -} - -createMESSProjects(_target, _subtarget, "tomy") -files { - MAME_DIR .. "src/mame/drivers/tutor.cpp", - MAME_DIR .. "src/mame/drivers/tomy_princ.cpp", -} - -createMESSProjects(_target, _subtarget, "toshiba") -files { - MAME_DIR .. "src/mame/includes/pasopia.h", - MAME_DIR .. "src/mame/drivers/pasopia.cpp", - MAME_DIR .. "src/mame/drivers/pasopia7.cpp", - MAME_DIR .. "src/mame/drivers/paso1600.cpp", -} - -createMESSProjects(_target, _subtarget, "trainer") -files { - MAME_DIR .. "src/mame/drivers/amico2k.cpp", - MAME_DIR .. "src/mame/drivers/babbage.cpp", - MAME_DIR .. "src/mame/drivers/bob85.cpp", - MAME_DIR .. "src/mame/drivers/crei680.cpp", - MAME_DIR .. "src/mame/drivers/cvicny.cpp", - MAME_DIR .. "src/mame/drivers/datum.cpp", - MAME_DIR .. "src/mame/drivers/dolphunk.cpp", - MAME_DIR .. "src/mame/drivers/emma2.cpp", - MAME_DIR .. "src/mame/drivers/instruct.cpp", - MAME_DIR .. "src/mame/drivers/mk14.cpp", - MAME_DIR .. "src/mame/drivers/pro80.cpp", - MAME_DIR .. "src/mame/drivers/savia84.cpp", - MAME_DIR .. "src/mame/drivers/selz80.cpp", - MAME_DIR .. "src/mame/drivers/tec1.cpp", - MAME_DIR .. "src/mame/drivers/tk80.cpp", - MAME_DIR .. "src/mame/drivers/zapcomputer.cpp", -} - -createMESSProjects(_target, _subtarget, "trs") -files { - MAME_DIR .. "src/mame/drivers/coco12.cpp", - MAME_DIR .. "src/mame/includes/coco12.h", - MAME_DIR .. "src/mame/drivers/coco3.cpp", - MAME_DIR .. "src/mame/includes/coco3.h", - MAME_DIR .. "src/mame/drivers/dragon.cpp", - MAME_DIR .. "src/mame/includes/dragon.h", - MAME_DIR .. "src/mame/drivers/mc10.cpp", - MAME_DIR .. "src/mame/machine/6883sam.cpp", - MAME_DIR .. "src/mame/machine/6883sam.h", - MAME_DIR .. "src/mame/machine/coco.cpp", - MAME_DIR .. "src/mame/includes/coco.h", - MAME_DIR .. "src/mame/machine/coco12.cpp", - MAME_DIR .. "src/mame/machine/coco3.cpp", - MAME_DIR .. "src/mame/machine/coco_vhd.cpp", - MAME_DIR .. "src/mame/machine/coco_vhd.h", - MAME_DIR .. "src/mame/drivers/dgn_beta.cpp", - MAME_DIR .. "src/mame/includes/dgn_beta.h", - MAME_DIR .. "src/mame/machine/dgn_beta.cpp", - MAME_DIR .. "src/mame/video/dgn_beta.cpp", - MAME_DIR .. "src/mame/machine/dgnalpha.cpp", - MAME_DIR .. "src/mame/includes/dgnalpha.h", - MAME_DIR .. "src/mame/machine/dragon.cpp", - MAME_DIR .. "src/mame/video/gime.cpp", - MAME_DIR .. "src/mame/video/gime.h", - MAME_DIR .. "src/mame/drivers/lnw80.cpp", - MAME_DIR .. "src/mame/drivers/max80.cpp", - MAME_DIR .. "src/mame/drivers/meritum.cpp", - MAME_DIR .. "src/mame/drivers/radionic.cpp", - MAME_DIR .. "src/mame/drivers/trs80.cpp", - MAME_DIR .. "src/mame/includes/trs80.h", - MAME_DIR .. "src/mame/machine/trs80.cpp", - MAME_DIR .. "src/mame/video/trs80.cpp", - MAME_DIR .. "src/mame/drivers/trs80m2.cpp", - MAME_DIR .. "src/mame/includes/trs80m2.h", - MAME_DIR .. "src/mame/machine/trs80m2kb.cpp", - MAME_DIR .. "src/mame/machine/trs80m2kb.h", - MAME_DIR .. "src/mame/drivers/trs80m3.cpp", - MAME_DIR .. "src/mame/includes/trs80m3.h", - MAME_DIR .. "src/mame/machine/trs80m3.cpp", - MAME_DIR .. "src/mame/video/trs80m3.cpp", - MAME_DIR .. "src/mame/drivers/tandy2k.cpp", - MAME_DIR .. "src/mame/includes/tandy2k.h", - MAME_DIR .. "src/mame/machine/tandy2kb.cpp", - MAME_DIR .. "src/mame/machine/tandy2kb.h", - MAME_DIR .. "src/mame/drivers/vis.cpp", -} - -createMESSProjects(_target, _subtarget, "tvgames") -files { - MAME_DIR .. "src/mame/drivers/elan_ep3a19a.cpp", - MAME_DIR .. "src/mame/drivers/elan_eu3a14.cpp", - MAME_DIR .. "src/mame/drivers/elan_eu3a05.cpp", - MAME_DIR .. "src/mame/audio/elan_eu3a05.cpp", - MAME_DIR .. "src/mame/audio/elan_eu3a05.h", - MAME_DIR .. "src/mame/machine/elan_eu3a05gpio.cpp", - MAME_DIR .. "src/mame/machine/elan_eu3a05gpio.h", - MAME_DIR .. "src/mame/machine/elan_eu3a05commonsys.cpp", - MAME_DIR .. "src/mame/machine/elan_eu3a05commonsys.h", - MAME_DIR .. "src/mame/machine/elan_ep3a19asys.cpp", - MAME_DIR .. "src/mame/machine/elan_ep3a19asys.h", - MAME_DIR .. "src/mame/machine/elan_eu3a05sys.cpp", - MAME_DIR .. "src/mame/machine/elan_eu3a05sys.h", - MAME_DIR .. "src/mame/machine/elan_eu3a14sys.cpp", - MAME_DIR .. "src/mame/machine/elan_eu3a14sys.h", - MAME_DIR .. "src/mame/video/elan_eu3a05commonvid.cpp", - MAME_DIR .. "src/mame/video/elan_eu3a05commonvid.h", - MAME_DIR .. "src/mame/video/elan_eu3a05vid.cpp", - MAME_DIR .. "src/mame/video/elan_eu3a05vid.h", - MAME_DIR .. "src/mame/video/elan_eu3a14vid.cpp", - MAME_DIR .. "src/mame/video/elan_eu3a14vid.h", - MAME_DIR .. "src/mame/drivers/trkfldch.cpp", - MAME_DIR .. "src/mame/drivers/tvgame.cpp", - MAME_DIR .. "src/mame/drivers/spg110.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_skannerztv.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_digimake.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_jakks.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_jakks_gkr.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_jakks_sharp.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_jakks_tvtouch.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_zone.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_senca.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_senario.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_senario_poker.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_mysprtch.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_vii.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_wiwi.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_ican.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_playvision.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_shredmjr.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_telestory.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_tvgogo.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_pdc.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_dreamlife.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_lexibook.cpp", - MAME_DIR .. "src/mame/drivers/spg2xx_smarttv.cpp", - MAME_DIR .. "src/mame/includes/spg2xx.h", - MAME_DIR .. "src/mame/drivers/spg29x.cpp", - MAME_DIR .. "src/mame/machine/hyperscan_card.cpp", - MAME_DIR .. "src/mame/machine/hyperscan_card.h", - MAME_DIR .. "src/mame/machine/hyperscan_ctrl.cpp", - MAME_DIR .. "src/mame/machine/hyperscan_ctrl.h", - MAME_DIR .. "src/mame/drivers/spg29x_lexibook_jg7425.cpp", - MAME_DIR .. "src/mame/drivers/generalplus_gpl16250.cpp", - MAME_DIR .. "src/mame/drivers/generalplus_gpl16250_rom.cpp", - MAME_DIR .. "src/mame/drivers/generalplus_gpl16250_romram.cpp", - MAME_DIR .. "src/mame/drivers/generalplus_gpl16250_nand.cpp", - MAME_DIR .. "src/mame/drivers/generalplus_gpl16250_mobigo.cpp", - MAME_DIR .. "src/mame/drivers/generalplus_gpl16250_spi.cpp", - MAME_DIR .. "src/mame/drivers/generalplus_gpl16250_spi_direct.cpp", - MAME_DIR .. "src/mame/includes/generalplus_gpl16250.h", - MAME_DIR .. "src/mame/includes/generalplus_gpl16250_romram.h", - MAME_DIR .. "src/mame/includes/generalplus_gpl16250_nand.h", - MAME_DIR .. "src/mame/machine/generalplus_gpl16250.cpp", - MAME_DIR .. "src/mame/machine/generalplus_gpl16250.h", - MAME_DIR .. "src/mame/drivers/generalplus_gpl32612.cpp", - MAME_DIR .. "src/mame/drivers/generalplus_gpl162xx_lcdtype.cpp", - MAME_DIR .. "src/mame/drivers/generalplus_gpl_unknown.cpp", - MAME_DIR .. "src/mame/drivers/xavix.cpp", - MAME_DIR .. "src/mame/includes/xavix.h", - MAME_DIR .. "src/mame/drivers/xavix_2000.cpp", - MAME_DIR .. "src/mame/includes/xavix_2000.h", - MAME_DIR .. "src/mame/drivers/xavix_2002.cpp", - MAME_DIR .. "src/mame/includes/xavix_2002.h", - MAME_DIR .. "src/mame/video/xavix.cpp", - MAME_DIR .. "src/mame/machine/xavix.cpp", - MAME_DIR .. "src/mame/audio/xavix.cpp", - MAME_DIR .. "src/mame/machine/xavix_mtrk_wheel.cpp", - MAME_DIR .. "src/mame/machine/xavix_mtrk_wheel.h", - MAME_DIR .. "src/mame/machine/xavix_madfb_ball.cpp", - MAME_DIR .. "src/mame/machine/xavix_madfb_ball.h", - MAME_DIR .. "src/mame/machine/xavix_io.cpp", - MAME_DIR .. "src/mame/machine/xavix_io.h", - MAME_DIR .. "src/mame/machine/xavix_adc.cpp", - MAME_DIR .. "src/mame/machine/xavix_adc.h", - MAME_DIR .. "src/mame/machine/xavix_anport.h", - MAME_DIR .. "src/mame/machine/xavix_anport.cpp", - MAME_DIR .. "src/mame/machine/xavix_math.h", - MAME_DIR .. "src/mame/machine/xavix_math.cpp", - MAME_DIR .. "src/mame/machine/xavix2002_io.cpp", - MAME_DIR .. "src/mame/machine/xavix2002_io.h", - MAME_DIR .. "src/mame/drivers/xavix2.cpp", - MAME_DIR .. "src/mame/drivers/titan_soc.cpp", - MAME_DIR .. "src/mame/drivers/st2302u_bbl_rom.cpp", - MAME_DIR .. "src/mame/drivers/st2302u_bbl_spi.cpp", - MAME_DIR .. "src/mame/video/bl_handhelds_lcdc.cpp", - MAME_DIR .. "src/mame/video/bl_handhelds_lcdc.h", - MAME_DIR .. "src/mame/drivers/actions_atj2279b.cpp", - MAME_DIR .. "src/mame/drivers/pubint_storyreader.cpp", - MAME_DIR .. "src/mame/drivers/magiceyes_pollux_vr3520f.cpp", - MAME_DIR .. "src/mame/drivers/monkey_king_3b.cpp", -} - -createMESSProjects(_target, _subtarget, "ultimachine") -files { - MAME_DIR .. "src/mame/drivers/rambo.cpp", -} - -createMESSProjects(_target, _subtarget, "ultratec") -files { - MAME_DIR .. "src/mame/drivers/minicom.cpp", -} - -createMESSProjects(_target, _subtarget, "unicard") -files { - MAME_DIR .. "src/mame/drivers/bbcbc.cpp", -} - -createMESSProjects(_target, _subtarget, "unisonic") -files { - MAME_DIR .. "src/mame/drivers/unichamp.cpp", - MAME_DIR .. "src/mame/video/gic.cpp", - MAME_DIR .. "src/mame/video/gic.h", -} - -createMESSProjects(_target, _subtarget, "unisys") -files { - MAME_DIR .. "src/mame/drivers/univac.cpp", -} - -createMESSProjects(_target, _subtarget, "usp") -files { - MAME_DIR .. "src/mame/drivers/patinho_feio.cpp", - MAME_DIR .. "src/mame/includes/patinhofeio.h", -} - -createMESSProjects(_target, _subtarget, "veb") -files { - MAME_DIR .. "src/mame/drivers/chessmst.cpp", - MAME_DIR .. "src/mame/drivers/chessmstdm.cpp", - MAME_DIR .. "src/mame/drivers/kc.cpp", - MAME_DIR .. "src/mame/includes/kc.h", - MAME_DIR .. "src/mame/machine/kc.cpp", - MAME_DIR .. "src/mame/machine/kc_keyb.cpp", - MAME_DIR .. "src/mame/machine/kc_keyb.h", - MAME_DIR .. "src/mame/video/kc.cpp", - MAME_DIR .. "src/mame/drivers/lc80.cpp", - MAME_DIR .. "src/mame/drivers/mc8020.cpp", - MAME_DIR .. "src/mame/drivers/mc8030.cpp", - MAME_DIR .. "src/mame/drivers/poly880.cpp", - MAME_DIR .. "src/mame/drivers/sc2.cpp", -} - -createMESSProjects(_target, _subtarget, "verifone") -files { - MAME_DIR .. "src/mame/drivers/tranz330.cpp", - MAME_DIR .. "src/mame/includes/tranz330.h" -} - -createMESSProjects(_target, _subtarget, "vidbrain") -files { - MAME_DIR .. "src/mame/drivers/vidbrain.cpp", - MAME_DIR .. "src/mame/includes/vidbrain.h", - MAME_DIR .. "src/mame/video/uv201.cpp", - MAME_DIR .. "src/mame/video/uv201.h", -} - -createMESSProjects(_target, _subtarget, "videoton") -files { - MAME_DIR .. "src/mame/drivers/tvc.cpp", - MAME_DIR .. "src/mame/audio/tvc.cpp", - MAME_DIR .. "src/mame/audio/tvc.h", -} - -createMESSProjects(_target, _subtarget, "visual") -files { - MAME_DIR .. "src/mame/drivers/v100.cpp", - MAME_DIR .. "src/mame/drivers/v102.cpp", - MAME_DIR .. "src/mame/machine/v102_kbd.cpp", - MAME_DIR .. "src/mame/machine/v102_kbd.h", - MAME_DIR .. "src/mame/drivers/v550.cpp", - MAME_DIR .. "src/mame/drivers/v1050.cpp", - MAME_DIR .. "src/mame/includes/v1050.h", - MAME_DIR .. "src/mame/machine/v1050kb.cpp", - MAME_DIR .. "src/mame/machine/v1050kb.h", - MAME_DIR .. "src/mame/video/v1050.cpp", -} - -createMESSProjects(_target, _subtarget, "votrax") -files { - MAME_DIR .. "src/mame/drivers/votrhv.cpp", - MAME_DIR .. "src/mame/drivers/votrpss.cpp", - MAME_DIR .. "src/mame/drivers/votrtnt.cpp", -} - -createMESSProjects(_target, _subtarget, "vtech") -files { - MAME_DIR .. "src/mame/drivers/clickstart.cpp", - MAME_DIR .. "src/mame/drivers/crvision.cpp", - MAME_DIR .. "src/mame/includes/crvision.h", - MAME_DIR .. "src/mame/drivers/gamemachine.cpp", - MAME_DIR .. "src/mame/audio/nl_gamemachine.cpp", - MAME_DIR .. "src/mame/audio/nl_gamemachine.h", - MAME_DIR .. "src/mame/drivers/geniusiq.cpp", - MAME_DIR .. "src/mame/drivers/geniusjr.cpp", - MAME_DIR .. "src/mame/drivers/gkidabc.cpp", - MAME_DIR .. "src/mame/drivers/glcx.cpp", - MAME_DIR .. "src/mame/drivers/innotv_innotabmax.cpp", - MAME_DIR .. "src/mame/drivers/inteladv.cpp", - MAME_DIR .. "src/mame/drivers/iqunlim.cpp", - MAME_DIR .. "src/mame/drivers/laser3k.cpp", - MAME_DIR .. "src/mame/drivers/lcmate2.cpp", - MAME_DIR .. "src/mame/drivers/pc2000.cpp", - MAME_DIR .. "src/mame/drivers/pc4.cpp", - MAME_DIR .. "src/mame/includes/pc4.h", - MAME_DIR .. "src/mame/video/pc4.cpp", - MAME_DIR .. "src/mame/drivers/prestige.cpp", - MAME_DIR .. "src/mame/drivers/socrates.cpp", - MAME_DIR .. "src/mame/audio/socrates.cpp", - MAME_DIR .. "src/mame/audio/socrates.h", - MAME_DIR .. "src/mame/drivers/storio.cpp", - MAME_DIR .. "src/mame/drivers/vsmile.cpp", - MAME_DIR .. "src/mame/includes/vsmile.h", - MAME_DIR .. "src/mame/drivers/vsmileb.cpp", - MAME_DIR .. "src/mame/drivers/vtech1.cpp", - MAME_DIR .. "src/mame/drivers/vtech2.cpp", - MAME_DIR .. "src/mame/includes/vtech2.h", - MAME_DIR .. "src/mame/video/vtech2.cpp", - MAME_DIR .. "src/mame/machine/vtech2.cpp", - MAME_DIR .. "src/mame/drivers/vtech_eu3a12.cpp", - MAME_DIR .. "src/mame/drivers/vtech_innotab.cpp", -} - -createMESSProjects(_target, _subtarget, "wang") -files { - MAME_DIR .. "src/mame/drivers/wangpc.cpp", - MAME_DIR .. "src/devices/bus/wangpc/wangpc.h", - MAME_DIR .. "src/mame/machine/wangpckb.cpp", - MAME_DIR .. "src/mame/machine/wangpckb.h", -} - -createMESSProjects(_target, _subtarget, "westinghouse") -files { - MAME_DIR .. "src/mame/drivers/testconsole.cpp", -} - -createMESSProjects(_target, _subtarget, "wavemate") -files { - MAME_DIR .. "src/mame/drivers/bullet.cpp", - MAME_DIR .. "src/mame/includes/bullet.h", - MAME_DIR .. "src/mame/drivers/jupiter.cpp", -} - -createMESSProjects(_target, _subtarget, "wyse") -files { - MAME_DIR .. "src/mame/drivers/wy100.cpp", - MAME_DIR .. "src/mame/drivers/wy150.cpp", - MAME_DIR .. "src/mame/drivers/wy30p.cpp", - MAME_DIR .. "src/mame/drivers/wy50.cpp", - MAME_DIR .. "src/mame/drivers/wy55.cpp", - MAME_DIR .. "src/mame/drivers/wy60.cpp", - MAME_DIR .. "src/mame/drivers/wy85.cpp", - MAME_DIR .. "src/mame/machine/wy50kb.cpp", - MAME_DIR .. "src/mame/machine/wy50kb.h", -} - -createMESSProjects(_target, _subtarget, "xerox") -files { - MAME_DIR .. "src/mame/drivers/xerox820.cpp", - MAME_DIR .. "src/mame/includes/xerox820.h", - MAME_DIR .. "src/mame/machine/x820kb.cpp", - MAME_DIR .. "src/mame/machine/x820kb.h", - MAME_DIR .. "src/mame/drivers/bigbord2.cpp", - MAME_DIR .. "src/mame/drivers/alto1.cpp", - MAME_DIR .. "src/mame/drivers/alto2.cpp", -} - -createMESSProjects(_target, _subtarget, "xussrpc") -files { - MAME_DIR .. "src/mame/drivers/ec184x.cpp", - MAME_DIR .. "src/mame/drivers/iskr103x.cpp", - MAME_DIR .. "src/mame/drivers/mc1502.cpp", - MAME_DIR .. "src/mame/machine/kb_7007_3.h", - MAME_DIR .. "src/mame/drivers/poisk1.cpp", - MAME_DIR .. "src/mame/machine/kb_poisk1.h", -} - -createMESSProjects(_target, _subtarget, "yamaha") -files { - MAME_DIR .. "src/mame/machine/mulcd.h", - MAME_DIR .. "src/mame/machine/mulcd.cpp", - MAME_DIR .. "src/mame/drivers/yman1x.cpp", - MAME_DIR .. "src/mame/drivers/ymdx100.cpp", - MAME_DIR .. "src/mame/drivers/ymdx11.cpp", - MAME_DIR .. "src/mame/drivers/ymmu5.cpp", - MAME_DIR .. "src/mame/drivers/ymmu50.cpp", - MAME_DIR .. "src/mame/drivers/ymmu80.cpp", - MAME_DIR .. "src/mame/drivers/ymmu100.cpp", - MAME_DIR .. "src/mame/drivers/ympsr16.cpp", - MAME_DIR .. "src/mame/drivers/ympsr40.cpp", - MAME_DIR .. "src/mame/drivers/ympsr60.cpp", - MAME_DIR .. "src/mame/drivers/ympsr340.cpp", - MAME_DIR .. "src/mame/drivers/ymqy70.cpp", - MAME_DIR .. "src/mame/drivers/ymrx15.cpp", - MAME_DIR .. "src/mame/drivers/ymsy35.cpp", - MAME_DIR .. "src/mame/drivers/ymtx81z.cpp", - MAME_DIR .. "src/mame/drivers/ymvl70.cpp", - MAME_DIR .. "src/mame/drivers/fb01.cpp", - MAME_DIR .. "src/mame/drivers/tg100.cpp", -} - -createMESSProjects(_target, _subtarget, "zenith") -files { - MAME_DIR .. "src/mame/drivers/mdt60.cpp", - MAME_DIR .. "src/mame/drivers/z100.cpp", - MAME_DIR .. "src/mame/drivers/z22.cpp", - MAME_DIR .. "src/mame/drivers/z29.cpp", -} - -createMESSProjects(_target, _subtarget, "zpa") -files { - MAME_DIR .. "src/mame/drivers/iq151.cpp", -} - -createMESSProjects(_target, _subtarget, "zvt") -files { - MAME_DIR .. "src/mame/drivers/pp01.cpp", - MAME_DIR .. "src/mame/includes/pp01.h", - MAME_DIR .. "src/mame/machine/pp01.cpp", - MAME_DIR .. "src/mame/video/pp01.cpp", -} - -createMESSProjects(_target, _subtarget, "virtual") -files { - MAME_DIR .. "src/mame/drivers/vgmplay.cpp", - MAME_DIR .. "src/mame/drivers/wavesynth.cpp", - MAME_DIR .. "src/mame/drivers/ldplayer.cpp", -} - -createMESSProjects(_target, _subtarget, "skeleton") -files { - MAME_DIR .. "src/mame/drivers/aaa.cpp", - MAME_DIR .. "src/mame/drivers/acd.cpp", - MAME_DIR .. "src/mame/drivers/aceex.cpp", - MAME_DIR .. "src/mame/drivers/adacp150.cpp", - MAME_DIR .. "src/mame/drivers/adds2020.cpp", - MAME_DIR .. "src/mame/drivers/aid80f.cpp", - MAME_DIR .. "src/mame/drivers/airbase99.cpp", - MAME_DIR .. "src/mame/drivers/alcat7100.cpp", - MAME_DIR .. "src/mame/drivers/alesis_qs.cpp", - MAME_DIR .. "src/mame/drivers/alfaskop41xx.cpp", - MAME_DIR .. "src/mame/machine/alfaskop_s41_kb.h", - MAME_DIR .. "src/mame/machine/alfaskop_s41_kb.cpp", - MAME_DIR .. "src/mame/drivers/alphasma.cpp", - MAME_DIR .. "src/mame/drivers/alphasma3k.cpp", - MAME_DIR .. "src/mame/drivers/am1000.cpp", - MAME_DIR .. "src/mame/drivers/ampex.cpp", - MAME_DIR .. "src/mame/drivers/ampex210.cpp", - MAME_DIR .. "src/mame/machine/ampex210_kbd.cpp", - MAME_DIR .. "src/mame/machine/ampex210_kbd.h", - MAME_DIR .. "src/mame/drivers/ampscarp.cpp", - MAME_DIR .. "src/mame/drivers/amust.cpp", - MAME_DIR .. "src/mame/drivers/anzterm.cpp", - MAME_DIR .. "src/mame/drivers/applix.cpp", - MAME_DIR .. "src/mame/drivers/argox.cpp", - MAME_DIR .. "src/mame/drivers/attache.cpp", - MAME_DIR .. "src/mame/drivers/aussiebyte.cpp", - MAME_DIR .. "src/mame/includes/aussiebyte.h", - MAME_DIR .. "src/mame/video/aussiebyte.cpp", - MAME_DIR .. "src/mame/drivers/ax20.cpp", - MAME_DIR .. "src/mame/drivers/basf7100.cpp", - MAME_DIR .. "src/mame/machine/basf7100_kbd.cpp", - MAME_DIR .. "src/mame/machine/basf7100_kbd.h", - MAME_DIR .. "src/mame/drivers/binbug.cpp", - MAME_DIR .. "src/mame/drivers/bert.cpp", - MAME_DIR .. "src/mame/drivers/bitgraph.cpp", - MAME_DIR .. "src/mame/drivers/blit.cpp", - MAME_DIR .. "src/mame/drivers/bpmmicro.cpp", - MAME_DIR .. "src/mame/drivers/blw700i.cpp", - MAME_DIR .. "src/mame/drivers/br8641.cpp", - MAME_DIR .. "src/mame/drivers/busicom.cpp", - MAME_DIR .. "src/mame/includes/busicom.h", - MAME_DIR .. "src/mame/video/busicom.cpp", - MAME_DIR .. "src/mame/drivers/c2color.cpp", - MAME_DIR .. "src/mame/drivers/candela.cpp", - MAME_DIR .. "src/mame/drivers/cardinal.cpp", - MAME_DIR .. "src/mame/drivers/cbnt2039.cpp", - MAME_DIR .. "src/mame/drivers/cdsys5.cpp", - MAME_DIR .. "src/mame/drivers/chaos.cpp", - MAME_DIR .. "src/mame/drivers/cd100.cpp", - MAME_DIR .. "src/mame/drivers/cd2650.cpp", - MAME_DIR .. "src/mame/drivers/cdc721.cpp", - MAME_DIR .. "src/mame/drivers/cit1500.cpp", - MAME_DIR .. "src/mame/drivers/clxvme186.cpp", - MAME_DIR .. "src/mame/drivers/codata.cpp", - MAME_DIR .. "src/mame/drivers/consola_emt.cpp", - MAME_DIR .. "src/mame/drivers/controlid.cpp", - MAME_DIR .. "src/mame/drivers/cortex.cpp", - MAME_DIR .. "src/mame/drivers/cosmicos.cpp", - MAME_DIR .. "src/mame/includes/cosmicos.h", - MAME_DIR .. "src/mame/drivers/cp1.cpp", - MAME_DIR .. "src/mame/drivers/cxhumax.cpp", - MAME_DIR .. "src/mame/includes/cxhumax.h", - MAME_DIR .. "src/mame/drivers/ckz80.cpp", - MAME_DIR .. "src/mame/drivers/d400.cpp", - MAME_DIR .. "src/mame/drivers/d6800.cpp", - MAME_DIR .. "src/mame/drivers/d6809.cpp", - MAME_DIR .. "src/mame/drivers/daruma.cpp", - MAME_DIR .. "src/mame/drivers/datacast.cpp", - MAME_DIR .. "src/mame/drivers/design.cpp", - MAME_DIR .. "src/mame/drivers/dg680.cpp", - MAME_DIR .. "src/mame/drivers/diablo1300.cpp", - MAME_DIR .. "src/mame/drivers/didact.cpp", - MAME_DIR .. "src/mame/drivers/digel804.cpp", - MAME_DIR .. "src/mame/drivers/digilog320.cpp", - MAME_DIR .. "src/mame/drivers/digilog400.cpp", - MAME_DIR .. "src/mame/machine/digilog_kbd.cpp", - MAME_DIR .. "src/mame/machine/digilog_kbd.h", - MAME_DIR .. "src/mame/drivers/digijet.cpp", - MAME_DIR .. "src/mame/drivers/dim68k.cpp", - MAME_DIR .. "src/mame/drivers/dm7000.cpp", - MAME_DIR .. "src/mame/includes/dm7000.h", - MAME_DIR .. "src/mame/drivers/dmax8000.cpp", - MAME_DIR .. "src/mame/drivers/dmv.cpp", - MAME_DIR .. "src/mame/machine/dmv_keyb.cpp", - MAME_DIR .. "src/mame/machine/dmv_keyb.h", - MAME_DIR .. "src/mame/drivers/dps1.cpp", - MAME_DIR .. "src/mame/drivers/dsb46.cpp", - MAME_DIR .. "src/mame/drivers/dual68.cpp", - MAME_DIR .. "src/mame/drivers/e100.cpp", - MAME_DIR .. "src/mame/drivers/eacc.cpp", - MAME_DIR .. "src/mame/drivers/easy_karaoke.cpp", - MAME_DIR .. "src/mame/drivers/elzet80.cpp", - MAME_DIR .. "src/mame/drivers/epic14e.cpp", - MAME_DIR .. "src/mame/drivers/esprit.cpp", - MAME_DIR .. "src/mame/drivers/eti660.cpp", - MAME_DIR .. "src/mame/drivers/eurit.cpp", - MAME_DIR .. "src/mame/drivers/eurocom2.cpp", - MAME_DIR .. "src/mame/drivers/excali64.cpp", - MAME_DIR .. "src/mame/drivers/facit4440.cpp", - MAME_DIR .. "src/mame/drivers/fanucs15.cpp", - MAME_DIR .. "src/mame/drivers/fanucspmg.cpp", - MAME_DIR .. "src/mame/drivers/fc100.cpp", - MAME_DIR .. "src/mame/drivers/fk1.cpp", - MAME_DIR .. "src/mame/drivers/freedom120.cpp", - MAME_DIR .. "src/mame/drivers/fs3216.cpp", - MAME_DIR .. "src/mame/drivers/ft68m.cpp", - MAME_DIR .. "src/mame/drivers/gameking.cpp", - MAME_DIR .. "src/mame/drivers/gem_rp.cpp", - MAME_DIR .. "src/mame/drivers/gigatron.cpp", - MAME_DIR .. "src/mame/drivers/gimix.cpp", - MAME_DIR .. "src/mame/drivers/gm1000.cpp", - MAME_DIR .. "src/mame/drivers/gnat10.cpp", - MAME_DIR .. "src/mame/drivers/goupil.cpp", - MAME_DIR .. "src/mame/drivers/grfd2301.cpp", - MAME_DIR .. "src/mame/drivers/hazeltin.cpp", - MAME_DIR .. "src/mame/drivers/hazl1420.cpp", - MAME_DIR .. "src/mame/drivers/hohnadam.cpp", - MAME_DIR .. "src/mame/drivers/hp3478a.cpp", - MAME_DIR .. "src/mame/drivers/hprot1.cpp", - MAME_DIR .. "src/mame/drivers/hpz80unk.cpp", - MAME_DIR .. "src/mame/drivers/ht68k.cpp", - MAME_DIR .. "src/mame/drivers/i7000.cpp", - MAME_DIR .. "src/mame/drivers/ibm3153.cpp", - MAME_DIR .. "src/mame/drivers/icatel.cpp", - MAME_DIR .. "src/mame/drivers/icebox.cpp", - MAME_DIR .. "src/mame/drivers/iez80.cpp", - MAME_DIR .. "src/mame/drivers/if800.cpp", - MAME_DIR .. "src/mame/drivers/ikt5a.cpp", - MAME_DIR .. "src/mame/drivers/imsai.cpp", - MAME_DIR .. "src/mame/drivers/indiana.cpp", - MAME_DIR .. "src/mame/drivers/is48x.cpp", - MAME_DIR .. "src/mame/drivers/itc4.cpp", - MAME_DIR .. "src/mame/drivers/itt1700.cpp", - MAME_DIR .. "src/mame/machine/itt1700_kbd.cpp", - MAME_DIR .. "src/mame/machine/itt1700_kbd.h", - MAME_DIR .. "src/mame/drivers/itt3030.cpp", - MAME_DIR .. "src/mame/drivers/itt9216.cpp", - MAME_DIR .. "src/mame/drivers/jade.cpp", - MAME_DIR .. "src/mame/drivers/jonos.cpp", - MAME_DIR .. "src/mame/drivers/juku.cpp", - MAME_DIR .. "src/mame/drivers/junior80.cpp", - MAME_DIR .. "src/mame/drivers/kron.cpp", - MAME_DIR .. "src/mame/drivers/lee1214.cpp", - MAME_DIR .. "src/mame/drivers/lee1220.cpp", - MAME_DIR .. "src/mame/drivers/learnwin.cpp", - MAME_DIR .. "src/mame/drivers/lft.cpp", - MAME_DIR .. "src/mame/drivers/lg-dvd.cpp", - MAME_DIR .. "src/mame/drivers/lk3000.cpp", - MAME_DIR .. "src/mame/drivers/lms46.cpp", - MAME_DIR .. "src/mame/drivers/lola8a.cpp", - MAME_DIR .. "src/mame/drivers/lilith.cpp", - MAME_DIR .. "src/mame/drivers/mccpm.cpp", - MAME_DIR .. "src/mame/drivers/mes.cpp", - MAME_DIR .. "src/mame/drivers/mfabfz.cpp", - MAME_DIR .. "src/mame/drivers/mice.cpp", - MAME_DIR .. "src/mame/drivers/micral.cpp", - MAME_DIR .. "src/mame/drivers/micro20.cpp", - MAME_DIR .. "src/mame/drivers/micromon.cpp", - MAME_DIR .. "src/mame/drivers/micronic.cpp", - MAME_DIR .. "src/mame/includes/micronic.h", - MAME_DIR .. "src/mame/drivers/mightyframe.cpp", - MAME_DIR .. "src/mame/drivers/milwaukee.cpp", - MAME_DIR .. "src/mame/drivers/mini2440.cpp", - MAME_DIR .. "src/mame/drivers/miniframe.cpp", - MAME_DIR .. "src/mame/drivers/minitel_2_rpic.cpp", - MAME_DIR .. "src/mame/drivers/miuchiz.cpp", - MAME_DIR .. "src/mame/drivers/ml20.cpp", - MAME_DIR .. "src/mame/drivers/mmd1.cpp", - MAME_DIR .. "src/mame/drivers/mmd2.cpp", - MAME_DIR .. "src/mame/drivers/mod8.cpp", - MAME_DIR .. "src/mame/drivers/modellot.cpp", - MAME_DIR .. "src/mame/drivers/molecular.cpp", - MAME_DIR .. "src/mame/drivers/monon_color.cpp", - MAME_DIR .. "src/mame/drivers/ms0515.cpp", - MAME_DIR .. "src/mame/drivers/ms9540.cpp", - MAME_DIR .. "src/mame/drivers/mstation.cpp", - MAME_DIR .. "src/mame/drivers/mt735.cpp", - MAME_DIR .. "src/mame/drivers/mtd1256.cpp", - MAME_DIR .. "src/mame/drivers/mw4pole.cpp", - MAME_DIR .. "src/mame/drivers/mx2178.cpp", - MAME_DIR .. "src/mame/drivers/mycom.cpp", - MAME_DIR .. "src/mame/drivers/myvision.cpp", - MAME_DIR .. "src/mame/drivers/newton.cpp", - MAME_DIR .. "src/mame/machine/nl_hazelvid.cpp", - MAME_DIR .. "src/mame/machine/nl_hazelvid.h", - MAME_DIR .. "src/mame/drivers/notetaker.cpp", - MAME_DIR .. "src/mame/drivers/ngen.cpp", - MAME_DIR .. "src/mame/machine/ngen_kb.cpp", - MAME_DIR .. "src/mame/machine/ngen_kb.h", - MAME_DIR .. "src/mame/drivers/onyx.cpp", - MAME_DIR .. "src/mame/drivers/p8k.cpp", - MAME_DIR .. "src/mame/drivers/pdt3100.cpp", - MAME_DIR .. "src/mame/drivers/pegasus.cpp", - MAME_DIR .. "src/mame/drivers/pencil2.cpp", - MAME_DIR .. "src/mame/drivers/perq.cpp", - MAME_DIR .. "src/mame/drivers/pes.cpp", - MAME_DIR .. "src/mame/drivers/picno.cpp", - MAME_DIR .. "src/mame/drivers/pipbug.cpp", - MAME_DIR .. "src/mame/drivers/plan80.cpp", - MAME_DIR .. "src/mame/drivers/pm68k.cpp", - MAME_DIR .. "src/mame/drivers/pockchal.cpp", - MAME_DIR .. "src/mame/drivers/powerstack.cpp", - MAME_DIR .. "src/mame/drivers/proteus3.cpp", - MAME_DIR .. "src/mame/drivers/pt68k4.cpp", - MAME_DIR .. "src/mame/drivers/ptcsol.cpp", - MAME_DIR .. "src/mame/drivers/pulsar.cpp", - MAME_DIR .. "src/mame/drivers/pv9234.cpp", - MAME_DIR .. "src/mame/drivers/pwp14.cpp", - MAME_DIR .. "src/mame/drivers/qtsbc.cpp", - MAME_DIR .. "src/mame/drivers/rc2014.cpp", - MAME_DIR .. "src/mame/drivers/rd100.cpp", - MAME_DIR .. "src/mame/drivers/rvoice.cpp", - MAME_DIR .. "src/mame/drivers/sacstate.cpp", - MAME_DIR .. "src/mame/drivers/sartorius.cpp", - MAME_DIR .. "src/mame/drivers/sb180.cpp", - MAME_DIR .. "src/mame/drivers/sb8085.cpp", - MAME_DIR .. "src/mame/drivers/sbrain.cpp", - MAME_DIR .. "src/mame/drivers/seattlecmp.cpp", - MAME_DIR .. "src/mame/drivers/sh4robot.cpp", - MAME_DIR .. "src/mame/drivers/sansa_fuze.cpp", - MAME_DIR .. "src/mame/drivers/scopus.cpp", - MAME_DIR .. "src/mame/drivers/shine.cpp", - MAME_DIR .. "src/mame/drivers/si5500.cpp", - MAME_DIR .. "src/mame/drivers/sk101bl.cpp", - MAME_DIR .. "src/mame/drivers/slsstars.cpp", - MAME_DIR .. "src/mame/drivers/softbox.cpp", - MAME_DIR .. "src/mame/includes/softbox.h", - MAME_DIR .. "src/mame/drivers/squale.cpp", - MAME_DIR .. "src/mame/drivers/solbourne.cpp", - MAME_DIR .. "src/mame/drivers/swyft.cpp", - MAME_DIR .. "src/mame/drivers/symbolics.cpp", - MAME_DIR .. "src/mame/drivers/synthex.cpp", - MAME_DIR .. "src/mame/drivers/sys2900.cpp", - MAME_DIR .. "src/mame/drivers/sys9002.cpp", - MAME_DIR .. "src/mame/drivers/systec.cpp", - MAME_DIR .. "src/mame/drivers/systel1.cpp", - MAME_DIR .. "src/mame/drivers/tavernie.cpp", - MAME_DIR .. "src/mame/drivers/tecnbras.cpp", - MAME_DIR .. "src/mame/drivers/teleray10.cpp", - MAME_DIR .. "src/mame/drivers/telex1192.cpp", - MAME_DIR .. "src/mame/drivers/telex274.cpp", - MAME_DIR .. "src/mame/drivers/telex277d.cpp", - MAME_DIR .. "src/mame/drivers/terak.cpp", - MAME_DIR .. "src/mame/drivers/terco.cpp", - MAME_DIR .. "src/mame/drivers/terminal.cpp", - MAME_DIR .. "src/mame/drivers/textelcomp.cpp", - MAME_DIR .. "src/mame/drivers/ti630.cpp", - MAME_DIR .. "src/mame/drivers/tk635.cpp", - MAME_DIR .. "src/mame/drivers/tr175.cpp", - MAME_DIR .. "src/mame/drivers/trs80dt1.cpp", - MAME_DIR .. "src/mame/drivers/tsispch.cpp", - MAME_DIR .. "src/mame/drivers/tulip1.cpp", - MAME_DIR .. "src/mame/drivers/unistar.cpp", - MAME_DIR .. "src/mame/drivers/v6809.cpp", - MAME_DIR .. "src/mame/drivers/vanguardmk1.cpp", - MAME_DIR .. "src/mame/drivers/vd56sp.cpp", - MAME_DIR .. "src/mame/drivers/vector4.cpp", - MAME_DIR .. "src/mame/drivers/vectrix.cpp", - MAME_DIR .. "src/mame/drivers/vp60.cpp", - MAME_DIR .. "src/mame/includes/vp415.h", - MAME_DIR .. "src/mame/drivers/vp415.cpp", - MAME_DIR .. "src/mame/drivers/vsmilepro.cpp", - MAME_DIR .. "src/mame/drivers/wicat.cpp", - MAME_DIR .. "src/mame/drivers/xbase09.cpp", - MAME_DIR .. "src/mame/drivers/xor100.cpp", - MAME_DIR .. "src/mame/includes/xor100.h", - MAME_DIR .. "src/mame/drivers/zms8085.cpp", - MAME_DIR .. "src/mame/drivers/zorba.cpp", - MAME_DIR .. "src/mame/includes/zorba.h", - MAME_DIR .. "src/mame/machine/zorbakbd.cpp", - MAME_DIR .. "src/mame/machine/zorbakbd.h", - MAME_DIR .. "src/mame/drivers/zt8802.cpp", - MAME_DIR .. "src/mame/drivers/testpat.cpp", - MAME_DIR .. "src/mame/machine/nl_tp1983.h", - MAME_DIR .. "src/mame/machine/nl_tp1983.cpp", - MAME_DIR .. "src/mame/machine/nl_tp1985.h", - MAME_DIR .. "src/mame/machine/nl_tp1985.cpp", - MAME_DIR .. "src/mame/drivers/palestra.cpp", - MAME_DIR .. "src/mame/machine/nl_palestra.cpp", - MAME_DIR .. "src/mame/machine/nl_palestra.h", - MAME_DIR .. "src/mame/drivers/philipsbo.cpp", - MAME_DIR .. "src/mame/drivers/mindset.cpp", - MAME_DIR .. "src/mame/drivers/gs6502.cpp", - MAME_DIR .. "src/mame/drivers/gs6809.cpp", - MAME_DIR .. "src/mame/drivers/gscpm.cpp", - MAME_DIR .. "src/mame/drivers/gsz80.cpp", - MAME_DIR .. "src/mame/drivers/ultim809.cpp", - MAME_DIR .. "src/mame/drivers/zeebo_qualcomm_adreno130.cpp", -} - -end diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua index aae35d0f243..4efb1684f4a 100644 --- a/scripts/target/mame/nl.lua +++ b/scripts/target/mame/nl.lua @@ -136,7 +136,7 @@ function createProjects_mame_nl(_target, _subtarget) MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", MAME_DIR .. "src/devices", - MAME_DIR .. "src/mame", + MAME_DIR .. "src/mame/shared", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", @@ -145,288 +145,288 @@ function createProjects_mame_nl(_target, _subtarget) } files{ - MAME_DIR .. "src/mame/drivers/pong.cpp", - MAME_DIR .. "src/mame/machine/nl_pong.cpp", - MAME_DIR .. "src/mame/machine/nl_pong.h", - MAME_DIR .. "src/mame/machine/nl_pongdoubles.cpp", - MAME_DIR .. "src/mame/machine/nl_pongdoubles.h", - MAME_DIR .. "src/mame/machine/nl_breakout.cpp", - MAME_DIR .. "src/mame/machine/nl_breakout.h", - MAME_DIR .. "src/mame/machine/nl_rebound.cpp", - MAME_DIR .. "src/mame/machine/nl_rebound.h", - MAME_DIR .. "src/mame/machine/nl_hazelvid.cpp", - MAME_DIR .. "src/mame/machine/nl_hazelvid.h", - - MAME_DIR .. "src/mame/drivers/atarittl.cpp", - MAME_DIR .. "src/mame/machine/nl_stuntcyc.cpp", - MAME_DIR .. "src/mame/machine/nl_stuntcyc.h", - MAME_DIR .. "src/mame/machine/nl_gtrak10.cpp", - MAME_DIR .. "src/mame/machine/nl_gtrak10.h", - MAME_DIR .. "src/mame/machine/nl_tank.cpp", - MAME_DIR .. "src/mame/machine/nl_tank.h", - - MAME_DIR .. "src/mame/audio/nl_flyball.cpp", - MAME_DIR .. "src/mame/audio/nl_flyball.h", - MAME_DIR .. "src/mame/drivers/flyball.cpp", - - MAME_DIR .. "src/mame/audio/nl_destroyr.cpp", - MAME_DIR .. "src/mame/audio/nl_destroyr.h", - MAME_DIR .. "src/mame/drivers/destroyr.cpp", - - MAME_DIR .. "src/mame/drivers/hazeltin.cpp", - - MAME_DIR .. "src/mame/drivers/1942.cpp", - MAME_DIR .. "src/mame/includes/1942.h", - MAME_DIR .. "src/mame/video/1942.cpp", - MAME_DIR .. "src/mame/audio/nl_1942.cpp", - MAME_DIR .. "src/mame/audio/nl_1942.h", - - MAME_DIR .. "src/mame/drivers/gamemachine.cpp", - MAME_DIR .. "src/mame/audio/nl_gamemachine.h", - MAME_DIR .. "src/mame/audio/nl_gamemachine.cpp", - - MAME_DIR .. "src/mame/drivers/popeye.cpp", - MAME_DIR .. "src/mame/includes/popeye.h", - MAME_DIR .. "src/mame/video/popeye.cpp", - MAME_DIR .. "src/mame/audio/nl_popeye.cpp", - MAME_DIR .. "src/mame/audio/nl_popeye.h", - - MAME_DIR .. "src/mame/drivers/mario.cpp", - MAME_DIR .. "src/mame/includes/mario.h", - MAME_DIR .. "src/mame/audio/nl_mario.cpp", - MAME_DIR .. "src/mame/audio/nl_mario.h", - MAME_DIR .. "src/mame/video/mario.cpp", - MAME_DIR .. "src/mame/audio/mario.cpp", - - MAME_DIR .. "src/mame/drivers/m62.cpp", - MAME_DIR .. "src/mame/includes/m62.h", - MAME_DIR .. "src/mame/video/m62.cpp", - MAME_DIR .. "src/mame/audio/irem.cpp", - MAME_DIR .. "src/mame/audio/irem.h", - MAME_DIR .. "src/mame/audio/nl_kidniki.cpp", - MAME_DIR .. "src/mame/audio/nl_kidniki.h", - - MAME_DIR .. "src/mame/drivers/mw8080bw.cpp", - MAME_DIR .. "src/mame/includes/mw8080bw.h", - MAME_DIR .. "src/mame/audio/mw8080bw.h", - MAME_DIR .. "src/mame/audio/mw8080bw.cpp", - MAME_DIR .. "src/mame/video/mw8080bw.cpp", - - MAME_DIR .. "src/mame/audio/nl_gunfight.cpp", - MAME_DIR .. "src/mame/audio/nl_gunfight.h", - MAME_DIR .. "src/mame/audio/nl_280zzzap.cpp", - MAME_DIR .. "src/mame/audio/nl_280zzzap.h", - - MAME_DIR .. "src/mame/drivers/sspeedr.cpp", - MAME_DIR .. "src/mame/includes/sspeedr.h", - MAME_DIR .. "src/mame/video/sspeedr.cpp", - - MAME_DIR .. "src/mame/audio/nl_sspeedr.cpp", - MAME_DIR .. "src/mame/audio/nl_sspeedr.h", - - MAME_DIR .. "src/mame/audio/cheekyms.cpp", - MAME_DIR .. "src/mame/audio/cheekyms.h", - MAME_DIR .. "src/mame/audio/nl_cheekyms.cpp", - MAME_DIR .. "src/mame/audio/nl_cheekyms.h", - MAME_DIR .. "src/mame/drivers/cheekyms.cpp", - MAME_DIR .. "src/mame/includes/cheekyms.h", - MAME_DIR .. "src/mame/video/cheekyms.cpp", - - MAME_DIR .. "src/mame/drivers/cinemat.cpp", - MAME_DIR .. "src/mame/includes/cinemat.h", - MAME_DIR .. "src/mame/audio/cinemat.cpp", - MAME_DIR .. "src/mame/audio/cinemat.h", - MAME_DIR .. "src/mame/video/cinemat.cpp", - MAME_DIR .. "src/mame/audio/nl_armora.cpp", - MAME_DIR .. "src/mame/audio/nl_armora.h", - MAME_DIR .. "src/mame/audio/nl_barrier.cpp", - MAME_DIR .. "src/mame/audio/nl_barrier.h", - MAME_DIR .. "src/mame/audio/nl_boxingb.cpp", - MAME_DIR .. "src/mame/audio/nl_boxingb.h", - MAME_DIR .. "src/mame/audio/nl_cinemat_common.h", - MAME_DIR .. "src/mame/audio/nl_ripoff.cpp", - MAME_DIR .. "src/mame/audio/nl_ripoff.h", - MAME_DIR .. "src/mame/audio/nl_solarq.cpp", - MAME_DIR .. "src/mame/audio/nl_solarq.h", - MAME_DIR .. "src/mame/audio/nl_spacewar.cpp", - MAME_DIR .. "src/mame/audio/nl_spacewar.h", - MAME_DIR .. "src/mame/audio/nl_speedfrk.cpp", - MAME_DIR .. "src/mame/audio/nl_speedfrk.h", - MAME_DIR .. "src/mame/audio/nl_starcas.cpp", - MAME_DIR .. "src/mame/audio/nl_starcas.h", - MAME_DIR .. "src/mame/audio/nl_starhawk.cpp", - MAME_DIR .. "src/mame/audio/nl_starhawk.h", - MAME_DIR .. "src/mame/audio/nl_sundance.cpp", - MAME_DIR .. "src/mame/audio/nl_sundance.h", - MAME_DIR .. "src/mame/audio/nl_tailg.cpp", - MAME_DIR .. "src/mame/audio/nl_tailg.h", - MAME_DIR .. "src/mame/audio/nl_warrior.cpp", - MAME_DIR .. "src/mame/audio/nl_warrior.h", - - MAME_DIR .. "src/mame/drivers/galaxian.cpp", - MAME_DIR .. "src/mame/includes/galaxian.h", - MAME_DIR .. "src/mame/audio/galaxian.cpp", - MAME_DIR .. "src/mame/audio/galaxian.h", - MAME_DIR .. "src/mame/video/galaxian.cpp", - MAME_DIR .. "src/mame/audio/nl_konami.h", - MAME_DIR .. "src/mame/audio/nl_konami.cpp", - - MAME_DIR .. "src/mame/audio/cclimber.cpp", - MAME_DIR .. "src/mame/audio/cclimber.h", - - MAME_DIR .. "src/mame/audio/nl_zac1b11142.cpp", - MAME_DIR .. "src/mame/audio/nl_zac1b11142.h", - MAME_DIR .. "src/mame/audio/zaccaria.cpp", - MAME_DIR .. "src/mame/audio/zaccaria.h", - MAME_DIR .. "src/mame/drivers/zaccaria.cpp", - MAME_DIR .. "src/mame/includes/zaccaria.h", - MAME_DIR .. "src/mame/video/zaccaria.cpp", - - MAME_DIR .. "src/mame/drivers/cocoloco.cpp", - MAME_DIR .. "src/mame/audio/nl_cocoloco.h", - MAME_DIR .. "src/mame/audio/nl_cocoloco.cpp", - - MAME_DIR .. "src/mame/drivers/palestra.cpp", - MAME_DIR .. "src/mame/machine/nl_palestra.cpp", - MAME_DIR .. "src/mame/machine/nl_palestra.h", - - MAME_DIR .. "src/mame/drivers/vicdual.cpp", - MAME_DIR .. "src/mame/includes/vicdual.h", - MAME_DIR .. "src/mame/audio/vicdual.cpp", - MAME_DIR .. "src/mame/audio/vicdual.h", - MAME_DIR .. "src/mame/audio/nl_brdrline.cpp", - MAME_DIR .. "src/mame/audio/nl_brdrline.h", - MAME_DIR .. "src/mame/audio/nl_frogs.cpp", - MAME_DIR .. "src/mame/audio/nl_frogs.h", - MAME_DIR .. "src/mame/audio/vicdual-97271p.cpp", - MAME_DIR .. "src/mame/audio/vicdual-97271p.h", - MAME_DIR .. "src/mame/video/vicdual.cpp", - MAME_DIR .. "src/mame/video/vicdual-97269pb.cpp", - MAME_DIR .. "src/mame/video/vicdual-97269pb.h", - MAME_DIR .. "src/mame/audio/carnival.cpp", - MAME_DIR .. "src/mame/audio/depthch.cpp", - MAME_DIR .. "src/mame/audio/invinco.cpp", - MAME_DIR .. "src/mame/audio/pulsar.cpp", - - MAME_DIR .. "src/mame/machine/segacrpt_device.cpp", - MAME_DIR .. "src/mame/machine/segacrpt_device.h", - MAME_DIR .. "src/mame/drivers/segag80r.cpp", - MAME_DIR .. "src/mame/includes/segag80r.h", - MAME_DIR .. "src/mame/machine/segag80.cpp", - MAME_DIR .. "src/mame/machine/segag80.h", - MAME_DIR .. "src/mame/audio/segag80r.cpp", - MAME_DIR .. "src/mame/audio/segag80r.h", - MAME_DIR .. "src/mame/video/segag80r.cpp", - MAME_DIR .. "src/mame/drivers/segag80v.cpp", - MAME_DIR .. "src/mame/includes/segag80v.h", - MAME_DIR .. "src/mame/audio/segag80.cpp", - MAME_DIR .. "src/mame/audio/segag80.h", - MAME_DIR .. "src/mame/audio/segaspeech.cpp", - MAME_DIR .. "src/mame/audio/segaspeech.h", - MAME_DIR .. "src/mame/audio/segausb.cpp", - MAME_DIR .. "src/mame/audio/segausb.h", - MAME_DIR .. "src/mame/audio/nl_astrob.cpp", - MAME_DIR .. "src/mame/audio/nl_astrob.h", - MAME_DIR .. "src/mame/audio/nl_elim.cpp", - MAME_DIR .. "src/mame/audio/nl_elim.h", - MAME_DIR .. "src/mame/audio/nl_spacfury.cpp", - MAME_DIR .. "src/mame/audio/nl_spacfury.h", - MAME_DIR .. "src/mame/video/segag80v.cpp", - MAME_DIR .. "src/mame/drivers/zaxxon.cpp", - MAME_DIR .. "src/mame/includes/zaxxon.h", - MAME_DIR .. "src/mame/audio/zaxxon.cpp", - MAME_DIR .. "src/mame/video/zaxxon.cpp", - - MAME_DIR .. "src/mame/drivers/segas16b.cpp", - MAME_DIR .. "src/mame/drivers/segas16b_isgsm.cpp", - MAME_DIR .. "src/mame/includes/segas16b.h", - MAME_DIR .. "src/mame/video/segas16b.cpp", - MAME_DIR .. "src/mame/audio/nl_segas16b.cpp", - MAME_DIR .. "src/mame/audio/nl_segas16b.h", - MAME_DIR .. "src/mame/audio/nl_segausb.cpp", - MAME_DIR .. "src/mame/audio/nl_segausb.h", - MAME_DIR .. "src/mame/audio/nl_segaspeech.cpp", - MAME_DIR .. "src/mame/audio/nl_segaspeech.h", - MAME_DIR .. "src/mame/machine/315_5195.cpp", - MAME_DIR .. "src/mame/machine/315_5195.h", - MAME_DIR .. "src/mame/machine/fd1089.cpp", - MAME_DIR .. "src/mame/machine/fd1089.h", - MAME_DIR .. "src/mame/machine/fd1094.cpp", - MAME_DIR .. "src/mame/machine/fd1094.h", - MAME_DIR .. "src/mame/machine/segaic16.cpp", - MAME_DIR .. "src/mame/machine/segaic16.h", - MAME_DIR .. "src/mame/video/sega16sp.cpp", - MAME_DIR .. "src/mame/video/sega16sp.h", - MAME_DIR .. "src/mame/machine/mc8123.cpp", - MAME_DIR .. "src/mame/machine/mc8123.h", - MAME_DIR .. "src/mame/video/segaic16.cpp", - MAME_DIR .. "src/mame/video/segaic16.h", - MAME_DIR .. "src/mame/video/segaic16_road.cpp", - MAME_DIR .. "src/mame/video/segaic16_road.h", - - MAME_DIR .. "src/mame/drivers/testpat.cpp", - MAME_DIR .. "src/mame/machine/nl_tp1983.cpp", - MAME_DIR .. "src/mame/machine/nl_tp1983.h", - MAME_DIR .. "src/mame/machine/nl_tp1985.cpp", - MAME_DIR .. "src/mame/machine/nl_tp1985.h", - - MAME_DIR .. "src/mame/audio/nl_starcrus.h", - MAME_DIR .. "src/mame/audio/nl_starcrus.cpp", - MAME_DIR .. "src/mame/drivers/starcrus.cpp", - MAME_DIR .. "src/mame/includes/starcrus.h", - MAME_DIR .. "src/mame/video/starcrus.cpp", - - MAME_DIR .. "src/mame/audio/nl_carpolo.h", - MAME_DIR .. "src/mame/audio/nl_carpolo.cpp", - MAME_DIR .. "src/mame/drivers/carpolo.cpp", - MAME_DIR .. "src/mame/includes/carpolo.h", - MAME_DIR .. "src/mame/machine/carpolo.cpp", - MAME_DIR .. "src/mame/video/carpolo.cpp", - - MAME_DIR .. "src/mame/audio/nl_fireone.h", - MAME_DIR .. "src/mame/audio/nl_fireone.cpp", - MAME_DIR .. "src/mame/audio/nl_starfire.h", - MAME_DIR .. "src/mame/audio/nl_starfire.cpp", - MAME_DIR .. "src/mame/drivers/starfire.cpp", - MAME_DIR .. "src/mame/includes/starfire.h", - MAME_DIR .. "src/mame/video/starfire.cpp", - - MAME_DIR .. "src/mame/audio/nl_starcrus.cpp", - MAME_DIR .. "src/mame/audio/nl_starcrus.h", - MAME_DIR .. "src/mame/drivers/starcrus.cpp", - MAME_DIR .. "src/mame/includes/starcrus.h", - MAME_DIR .. "src/mame/video/starcrus.cpp", - - MAME_DIR .. "src/mame/drivers/dragrace.cpp", - MAME_DIR .. "src/mame/includes/dragrace.h", - MAME_DIR .. "src/mame/audio/dragrace.cpp", - MAME_DIR .. "src/mame/video/dragrace.cpp", + MAME_DIR .. "src/mame/atari/pong.cpp", + MAME_DIR .. "src/mame/atari/nl_pong.cpp", + MAME_DIR .. "src/mame/atari/nl_pong.h", + MAME_DIR .. "src/mame/atari/nl_pongdoubles.cpp", + MAME_DIR .. "src/mame/atari/nl_pongdoubles.h", + MAME_DIR .. "src/mame/atari/nl_breakout.cpp", + MAME_DIR .. "src/mame/atari/nl_breakout.h", + MAME_DIR .. "src/mame/atari/nl_rebound.cpp", + MAME_DIR .. "src/mame/atari/nl_rebound.h", + MAME_DIR .. "src/mame/skeleton/nl_hazelvid.cpp", + MAME_DIR .. "src/mame/skeleton/nl_hazelvid.h", + + MAME_DIR .. "src/mame/atari/atarittl.cpp", + MAME_DIR .. "src/mame/atari/nl_stuntcyc.cpp", + MAME_DIR .. "src/mame/atari/nl_stuntcyc.h", + MAME_DIR .. "src/mame/atari/nl_gtrak10.cpp", + MAME_DIR .. "src/mame/atari/nl_gtrak10.h", + MAME_DIR .. "src/mame/atari/nl_tank.cpp", + MAME_DIR .. "src/mame/atari/nl_tank.h", + + MAME_DIR .. "src/mame/atari/nl_flyball.cpp", + MAME_DIR .. "src/mame/atari/nl_flyball.h", + MAME_DIR .. "src/mame/atari/flyball.cpp", + + MAME_DIR .. "src/mame/atari/nl_destroyr.cpp", + MAME_DIR .. "src/mame/atari/nl_destroyr.h", + MAME_DIR .. "src/mame/atari/destroyr.cpp", + + MAME_DIR .. "src/mame/skeleton/hazeltin.cpp", + + MAME_DIR .. "src/mame/capcom/1942.cpp", + MAME_DIR .. "src/mame/capcom/1942.h", + MAME_DIR .. "src/mame/capcom/1942_v.cpp", + MAME_DIR .. "src/mame/capcom/nl_1942.cpp", + MAME_DIR .. "src/mame/capcom/nl_1942.h", + + MAME_DIR .. "src/mame/vtech/gamemachine.cpp", + MAME_DIR .. "src/mame/vtech/nl_gamemachine.h", + MAME_DIR .. "src/mame/vtech/nl_gamemachine.cpp", + + MAME_DIR .. "src/mame/nintendo/popeye.cpp", + MAME_DIR .. "src/mame/nintendo/popeye.h", + MAME_DIR .. "src/mame/nintendo/popeye_v.cpp", + MAME_DIR .. "src/mame/nintendo/nl_popeye.cpp", + MAME_DIR .. "src/mame/nintendo/nl_popeye.h", + + MAME_DIR .. "src/mame/nintendo/mario.cpp", + MAME_DIR .. "src/mame/nintendo/mario.h", + MAME_DIR .. "src/mame/nintendo/nl_mario.cpp", + MAME_DIR .. "src/mame/nintendo/nl_mario.h", + MAME_DIR .. "src/mame/nintendo/mario_v.cpp", + MAME_DIR .. "src/mame/nintendo/mario_a.cpp", + + MAME_DIR .. "src/mame/irem/m62.cpp", + MAME_DIR .. "src/mame/irem/m62.h", + MAME_DIR .. "src/mame/irem/m62_v.cpp", + MAME_DIR .. "src/mame/irem/irem.cpp", + MAME_DIR .. "src/mame/irem/irem.h", + MAME_DIR .. "src/mame/irem/nl_kidniki.cpp", + MAME_DIR .. "src/mame/irem/nl_kidniki.h", + + MAME_DIR .. "src/mame/midw8080/mw8080bw.cpp", + MAME_DIR .. "src/mame/midw8080/mw8080bw.h", + MAME_DIR .. "src/mame/midw8080/mw8080bw_a.h", + MAME_DIR .. "src/mame/midw8080/mw8080bw_a.cpp", + MAME_DIR .. "src/mame/midw8080/mw8080bw_v.cpp", + + MAME_DIR .. "src/mame/midw8080/nl_gunfight.cpp", + MAME_DIR .. "src/mame/midw8080/nl_gunfight.h", + MAME_DIR .. "src/mame/midw8080/nl_280zzzap.cpp", + MAME_DIR .. "src/mame/midw8080/nl_280zzzap.h", + + MAME_DIR .. "src/mame/midway/sspeedr.cpp", + MAME_DIR .. "src/mame/midway/sspeedr.h", + MAME_DIR .. "src/mame/midway/sspeedr_v.cpp", + + MAME_DIR .. "src/mame/midway/nl_sspeedr.cpp", + MAME_DIR .. "src/mame/midway/nl_sspeedr.h", + + MAME_DIR .. "src/mame/univers/cheekyms_a.cpp", + MAME_DIR .. "src/mame/univers/cheekyms_a.h", + MAME_DIR .. "src/mame/univers/nl_cheekyms.cpp", + MAME_DIR .. "src/mame/univers/nl_cheekyms.h", + MAME_DIR .. "src/mame/univers/cheekyms.cpp", + MAME_DIR .. "src/mame/univers/cheekyms.h", + MAME_DIR .. "src/mame/univers/cheekyms_v.cpp", + + MAME_DIR .. "src/mame/cinemat/cinemat.cpp", + MAME_DIR .. "src/mame/cinemat/cinemat.h", + MAME_DIR .. "src/mame/cinemat/cinemat_a.cpp", + MAME_DIR .. "src/mame/cinemat/cinemat_a.h", + MAME_DIR .. "src/mame/cinemat/cinemat_v.cpp", + MAME_DIR .. "src/mame/cinemat/nl_armora.cpp", + MAME_DIR .. "src/mame/cinemat/nl_armora.h", + MAME_DIR .. "src/mame/cinemat/nl_barrier.cpp", + MAME_DIR .. "src/mame/cinemat/nl_barrier.h", + MAME_DIR .. "src/mame/cinemat/nl_boxingb.cpp", + MAME_DIR .. "src/mame/cinemat/nl_boxingb.h", + MAME_DIR .. "src/mame/cinemat/nl_cinemat_common.h", + MAME_DIR .. "src/mame/cinemat/nl_ripoff.cpp", + MAME_DIR .. "src/mame/cinemat/nl_ripoff.h", + MAME_DIR .. "src/mame/cinemat/nl_solarq.cpp", + MAME_DIR .. "src/mame/cinemat/nl_solarq.h", + MAME_DIR .. "src/mame/cinemat/nl_spacewar.cpp", + MAME_DIR .. "src/mame/cinemat/nl_spacewar.h", + MAME_DIR .. "src/mame/cinemat/nl_speedfrk.cpp", + MAME_DIR .. "src/mame/cinemat/nl_speedfrk.h", + MAME_DIR .. "src/mame/cinemat/nl_starcas.cpp", + MAME_DIR .. "src/mame/cinemat/nl_starcas.h", + MAME_DIR .. "src/mame/cinemat/nl_starhawk.cpp", + MAME_DIR .. "src/mame/cinemat/nl_starhawk.h", + MAME_DIR .. "src/mame/cinemat/nl_sundance.cpp", + MAME_DIR .. "src/mame/cinemat/nl_sundance.h", + MAME_DIR .. "src/mame/cinemat/nl_tailg.cpp", + MAME_DIR .. "src/mame/cinemat/nl_tailg.h", + MAME_DIR .. "src/mame/cinemat/nl_warrior.cpp", + MAME_DIR .. "src/mame/cinemat/nl_warrior.h", + + MAME_DIR .. "src/mame/galaxian/galaxian.cpp", + MAME_DIR .. "src/mame/galaxian/galaxian.h", + MAME_DIR .. "src/mame/galaxian/galaxian_a.cpp", + MAME_DIR .. "src/mame/galaxian/galaxian_a.h", + MAME_DIR .. "src/mame/galaxian/galaxian_v.cpp", + MAME_DIR .. "src/mame/galaxian/nl_konami.h", + MAME_DIR .. "src/mame/galaxian/nl_konami.cpp", + + MAME_DIR .. "src/mame/shared/cclimber_a.cpp", + MAME_DIR .. "src/mame/shared/cclimber_a.h", + + MAME_DIR .. "src/mame/zaccaria/nl_zac1b11142.cpp", + MAME_DIR .. "src/mame/zaccaria/nl_zac1b11142.h", + MAME_DIR .. "src/mame/zaccaria/zaccaria_a.cpp", + MAME_DIR .. "src/mame/zaccaria/zaccaria_a.h", + MAME_DIR .. "src/mame/zaccaria/zaccaria.cpp", + MAME_DIR .. "src/mame/zaccaria/zaccaria.h", + MAME_DIR .. "src/mame/zaccaria/zaccaria_v.cpp", + + MAME_DIR .. "src/mame/misc/cocoloco.cpp", + MAME_DIR .. "src/mame/misc/nl_cocoloco.h", + MAME_DIR .. "src/mame/misc/nl_cocoloco.cpp", + + MAME_DIR .. "src/mame/skeleton/palestra.cpp", + MAME_DIR .. "src/mame/skeleton/nl_palestra.cpp", + MAME_DIR .. "src/mame/skeleton/nl_palestra.h", + + MAME_DIR .. "src/mame/sega/vicdual.cpp", + MAME_DIR .. "src/mame/sega/vicdual.h", + MAME_DIR .. "src/mame/sega/vicdual_a.cpp", + MAME_DIR .. "src/mame/sega/vicdual_a.h", + MAME_DIR .. "src/mame/sega/nl_brdrline.cpp", + MAME_DIR .. "src/mame/sega/nl_brdrline.h", + MAME_DIR .. "src/mame/sega/nl_frogs.cpp", + MAME_DIR .. "src/mame/sega/nl_frogs.h", + MAME_DIR .. "src/mame/sega/vicdual-97271p.cpp", + MAME_DIR .. "src/mame/sega/vicdual-97271p.h", + MAME_DIR .. "src/mame/sega/vicdual_v.cpp", + MAME_DIR .. "src/mame/sega/vicdual-97269pb.cpp", + MAME_DIR .. "src/mame/sega/vicdual-97269pb.h", + MAME_DIR .. "src/mame/sega/carnival.cpp", + MAME_DIR .. "src/mame/sega/depthch.cpp", + MAME_DIR .. "src/mame/sega/invinco.cpp", + MAME_DIR .. "src/mame/sega/pulsar_a.cpp", + + MAME_DIR .. "src/mame/shared/segacrpt_device.cpp", + MAME_DIR .. "src/mame/shared/segacrpt_device.h", + MAME_DIR .. "src/mame/sega/segag80r.cpp", + MAME_DIR .. "src/mame/sega/segag80r.h", + MAME_DIR .. "src/mame/sega/segag80_m.cpp", + MAME_DIR .. "src/mame/sega/segag80_m.h", + MAME_DIR .. "src/mame/sega/segag80r_a.cpp", + MAME_DIR .. "src/mame/sega/segag80r_a.h", + MAME_DIR .. "src/mame/sega/segag80r_v.cpp", + MAME_DIR .. "src/mame/sega/segag80v.cpp", + MAME_DIR .. "src/mame/sega/segag80v.h", + MAME_DIR .. "src/mame/sega/segag80.cpp", + MAME_DIR .. "src/mame/sega/segag80.h", + MAME_DIR .. "src/mame/sega/segaspeech.cpp", + MAME_DIR .. "src/mame/sega/segaspeech.h", + MAME_DIR .. "src/mame/sega/segausb.cpp", + MAME_DIR .. "src/mame/sega/segausb.h", + MAME_DIR .. "src/mame/sega/nl_astrob.cpp", + MAME_DIR .. "src/mame/sega/nl_astrob.h", + MAME_DIR .. "src/mame/sega/nl_elim.cpp", + MAME_DIR .. "src/mame/sega/nl_elim.h", + MAME_DIR .. "src/mame/sega/nl_spacfury.cpp", + MAME_DIR .. "src/mame/sega/nl_spacfury.h", + MAME_DIR .. "src/mame/sega/segag80v_v.cpp", + MAME_DIR .. "src/mame/sega/zaxxon.cpp", + MAME_DIR .. "src/mame/sega/zaxxon.h", + MAME_DIR .. "src/mame/sega/zaxxon_a.cpp", + MAME_DIR .. "src/mame/sega/zaxxon_v.cpp", + + MAME_DIR .. "src/mame/sega/segas16b.cpp", + MAME_DIR .. "src/mame/sega/segas16b_isgsm.cpp", + MAME_DIR .. "src/mame/sega/segas16b.h", + MAME_DIR .. "src/mame/sega/segas16b_v.cpp", + MAME_DIR .. "src/mame/sega/nl_segas16b.cpp", + MAME_DIR .. "src/mame/sega/nl_segas16b.h", + MAME_DIR .. "src/mame/sega/nl_segausb.cpp", + MAME_DIR .. "src/mame/sega/nl_segausb.h", + MAME_DIR .. "src/mame/sega/nl_segaspeech.cpp", + MAME_DIR .. "src/mame/sega/nl_segaspeech.h", + MAME_DIR .. "src/mame/sega/315_5195.cpp", + MAME_DIR .. "src/mame/sega/315_5195.h", + MAME_DIR .. "src/mame/sega/fd1089.cpp", + MAME_DIR .. "src/mame/sega/fd1089.h", + MAME_DIR .. "src/mame/sega/fd1094.cpp", + MAME_DIR .. "src/mame/sega/fd1094.h", + MAME_DIR .. "src/mame/sega/segaic16_m.cpp", + MAME_DIR .. "src/mame/sega/segaic16_m.h", + MAME_DIR .. "src/mame/sega/sega16sp.cpp", + MAME_DIR .. "src/mame/sega/sega16sp.h", + MAME_DIR .. "src/mame/shared/mc8123.cpp", + MAME_DIR .. "src/mame/shared/mc8123.h", + MAME_DIR .. "src/mame/sega/segaic16.cpp", + MAME_DIR .. "src/mame/sega/segaic16.h", + MAME_DIR .. "src/mame/sega/segaic16_road.cpp", + MAME_DIR .. "src/mame/sega/segaic16_road.h", + + MAME_DIR .. "src/mame/skeleton/testpat.cpp", + MAME_DIR .. "src/mame/skeleton/nl_tp1983.cpp", + MAME_DIR .. "src/mame/skeleton/nl_tp1983.h", + MAME_DIR .. "src/mame/skeleton/nl_tp1985.cpp", + MAME_DIR .. "src/mame/skeleton/nl_tp1985.h", + + MAME_DIR .. "src/mame/ramtek/nl_starcrus.h", + MAME_DIR .. "src/mame/ramtek/nl_starcrus.cpp", + MAME_DIR .. "src/mame/ramtek/starcrus.cpp", + MAME_DIR .. "src/mame/ramtek/starcrus.h", + MAME_DIR .. "src/mame/ramtek/starcrus_v.cpp", + + MAME_DIR .. "src/mame/exidy/nl_carpolo.h", + MAME_DIR .. "src/mame/exidy/nl_carpolo.cpp", + MAME_DIR .. "src/mame/exidy/carpolo.cpp", + MAME_DIR .. "src/mame/exidy/carpolo.h", + MAME_DIR .. "src/mame/exidy/carpolo_m.cpp", + MAME_DIR .. "src/mame/exidy/carpolo_v.cpp", + + MAME_DIR .. "src/mame/exidy/nl_fireone.h", + MAME_DIR .. "src/mame/exidy/nl_fireone.cpp", + MAME_DIR .. "src/mame/exidy/nl_starfire.h", + MAME_DIR .. "src/mame/exidy/nl_starfire.cpp", + MAME_DIR .. "src/mame/exidy/starfire.cpp", + MAME_DIR .. "src/mame/exidy/starfire.h", + MAME_DIR .. "src/mame/exidy/starfire_v.cpp", + + MAME_DIR .. "src/mame/ramtek/nl_starcrus.cpp", + MAME_DIR .. "src/mame/ramtek/nl_starcrus.h", + MAME_DIR .. "src/mame/ramtek/starcrus.cpp", + MAME_DIR .. "src/mame/ramtek/starcrus.h", + MAME_DIR .. "src/mame/ramtek/starcrus_v.cpp", + + MAME_DIR .. "src/mame/atari/dragrace.cpp", + MAME_DIR .. "src/mame/atari/dragrace.h", + MAME_DIR .. "src/mame/atari/dragrace_a.cpp", + MAME_DIR .. "src/mame/atari/dragrace_v.cpp", -- Skeletons ... - MAME_DIR .. "src/mame/drivers/a1supply.cpp", - MAME_DIR .. "src/mame/drivers/aleisttl.cpp", - MAME_DIR .. "src/mame/drivers/bailey.cpp", - MAME_DIR .. "src/mame/drivers/chicago.cpp", - MAME_DIR .. "src/mame/drivers/crazybal.cpp", - MAME_DIR .. "src/mame/drivers/electra.cpp", - MAME_DIR .. "src/mame/drivers/exidyttl.cpp", - MAME_DIR .. "src/mame/drivers/fungames.cpp", - MAME_DIR .. "src/mame/drivers/meadwttl.cpp", - MAME_DIR .. "src/mame/drivers/monacogp.cpp", - MAME_DIR .. "src/mame/drivers/pse.cpp", - MAME_DIR .. "src/mame/drivers/ramtek.cpp", - MAME_DIR .. "src/mame/drivers/segattl.cpp", - MAME_DIR .. "src/mame/drivers/taitottl.cpp", - MAME_DIR .. "src/mame/drivers/usbilliards.cpp", - - MAME_DIR .. "src/mame/drivers/jpmsru.cpp", - MAME_DIR .. "src/mame/audio/nl_jpmsru.cpp", - - MAME_DIR .. "src/mame/audio/fruitsamples.cpp", - MAME_DIR .. "src/mame/audio/fruitsamples.h", - MAME_DIR .. "src/mame/video/awpvid.cpp", - MAME_DIR .. "src/mame/video/awpvid.h", + MAME_DIR .. "src/mame/misc/a1supply.cpp", + MAME_DIR .. "src/mame/alliedl/aleisttl.cpp", + MAME_DIR .. "src/mame/misc/bailey.cpp", + MAME_DIR .. "src/mame/misc/chicago.cpp", + MAME_DIR .. "src/mame/misc/crazybal.cpp", + MAME_DIR .. "src/mame/misc/electra.cpp", + MAME_DIR .. "src/mame/exidy/exidyttl.cpp", + MAME_DIR .. "src/mame/misc/fungames.cpp", + MAME_DIR .. "src/mame/meadows/meadwttl.cpp", + MAME_DIR .. "src/mame/sega/monacogp.cpp", + MAME_DIR .. "src/mame/misc/pse.cpp", + MAME_DIR .. "src/mame/ramtek/ramtek.cpp", + MAME_DIR .. "src/mame/sega/segattl.cpp", + MAME_DIR .. "src/mame/taito/taitottl.cpp", + MAME_DIR .. "src/mame/misc/usbilliards.cpp", + + MAME_DIR .. "src/mame/jpm/jpmsru.cpp", + MAME_DIR .. "src/mame/jpm/nl_jpmsru.cpp", + + MAME_DIR .. "src/mame/shared/fruitsamples.cpp", + MAME_DIR .. "src/mame/shared/fruitsamples.h", + MAME_DIR .. "src/mame/shared/awpvid.cpp", + MAME_DIR .. "src/mame/shared/awpvid.h", } end diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua index 6bf3a3f83a1..e1eb60dbcae 100644 --- a/scripts/target/mame/tiny.lua +++ b/scripts/target/mame/tiny.lua @@ -105,7 +105,7 @@ function createProjects_mame_tiny(_target, _subtarget) MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", MAME_DIR .. "src/devices", - MAME_DIR .. "src/mame", + MAME_DIR .. "src/mame/shared", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", @@ -113,64 +113,64 @@ function createProjects_mame_tiny(_target, _subtarget) } files{ - MAME_DIR .. "src/mame/audio/nl_carpolo.cpp", - MAME_DIR .. "src/mame/audio/nl_carpolo.h", - MAME_DIR .. "src/mame/drivers/carpolo.cpp", - MAME_DIR .. "src/mame/includes/carpolo.h", - MAME_DIR .. "src/mame/machine/carpolo.cpp", - MAME_DIR .. "src/mame/video/carpolo.cpp", - MAME_DIR .. "src/mame/audio/circus.cpp", - MAME_DIR .. "src/mame/drivers/circus.cpp", - MAME_DIR .. "src/mame/includes/circus.h", - MAME_DIR .. "src/mame/video/circus.cpp", - MAME_DIR .. "src/mame/drivers/exidy.cpp", - MAME_DIR .. "src/mame/audio/exidy.cpp", - MAME_DIR .. "src/mame/audio/exidy.h", - MAME_DIR .. "src/mame/audio/exidy440.cpp", - MAME_DIR .. "src/mame/audio/exidy440.h", - MAME_DIR .. "src/mame/audio/nl_fireone.h", - MAME_DIR .. "src/mame/audio/nl_fireone.cpp", - MAME_DIR .. "src/mame/audio/nl_starfire.h", - MAME_DIR .. "src/mame/audio/nl_starfire.cpp", - MAME_DIR .. "src/mame/drivers/starfire.cpp", - MAME_DIR .. "src/mame/includes/starfire.h", - MAME_DIR .. "src/mame/video/starfire.cpp", - MAME_DIR .. "src/mame/drivers/vertigo.cpp", - MAME_DIR .. "src/mame/includes/vertigo.h", - MAME_DIR .. "src/mame/machine/vertigo.cpp", - MAME_DIR .. "src/mame/video/vertigo.cpp", - MAME_DIR .. "src/mame/drivers/victory.cpp", - MAME_DIR .. "src/mame/includes/victory.h", - MAME_DIR .. "src/mame/video/victory.cpp", - MAME_DIR .. "src/mame/drivers/astrocde.cpp", - MAME_DIR .. "src/mame/includes/astrocde.h", - MAME_DIR .. "src/mame/video/astrocde.cpp", - MAME_DIR .. "src/mame/drivers/gridlee.cpp", - MAME_DIR .. "src/mame/includes/gridlee.h", - MAME_DIR .. "src/mame/audio/gridlee.cpp", - MAME_DIR .. "src/mame/video/gridlee.cpp", - MAME_DIR .. "src/mame/audio/s11c_bg.cpp", - MAME_DIR .. "src/mame/audio/s11c_bg.h", - MAME_DIR .. "src/mame/audio/williams.cpp", - MAME_DIR .. "src/mame/audio/williams.h", - MAME_DIR .. "src/mame/drivers/williams.cpp", - MAME_DIR .. "src/mame/includes/williams.h", - MAME_DIR .. "src/mame/machine/williams.cpp", - MAME_DIR .. "src/mame/video/williams.cpp", - MAME_DIR .. "src/mame/drivers/gaelco.cpp", - MAME_DIR .. "src/mame/includes/gaelco.h", - MAME_DIR .. "src/mame/video/gaelco.cpp", - MAME_DIR .. "src/mame/machine/gaelcrpt.cpp", - MAME_DIR .. "src/mame/drivers/wrally.cpp", - MAME_DIR .. "src/mame/includes/wrally.h", - MAME_DIR .. "src/mame/video/wrally.cpp", - MAME_DIR .. "src/mame/video/gaelco_wrally_sprites.cpp", - MAME_DIR .. "src/mame/video/gaelco_wrally_sprites.h", - MAME_DIR .. "src/mame/machine/gaelco_ds5002fp.cpp", - MAME_DIR .. "src/mame/machine/gaelco_ds5002fp.h", - MAME_DIR .. "src/mame/drivers/looping.cpp", - MAME_DIR .. "src/mame/drivers/supertnk.cpp", - MAME_DIR .. "src/mame/drivers/goldnpkr.cpp", + MAME_DIR .. "src/mame/exidy/nl_carpolo.cpp", + MAME_DIR .. "src/mame/exidy/nl_carpolo.h", + MAME_DIR .. "src/mame/exidy/carpolo.cpp", + MAME_DIR .. "src/mame/exidy/carpolo.h", + MAME_DIR .. "src/mame/exidy/carpolo_m.cpp", + MAME_DIR .. "src/mame/exidy/carpolo_v.cpp", + MAME_DIR .. "src/mame/exidy/circus_a.cpp", + MAME_DIR .. "src/mame/exidy/circus.cpp", + MAME_DIR .. "src/mame/exidy/circus.h", + MAME_DIR .. "src/mame/exidy/circus_v.cpp", + MAME_DIR .. "src/mame/exidy/exidy.cpp", + MAME_DIR .. "src/mame/shared/exidysound.cpp", + MAME_DIR .. "src/mame/shared/exidysound.h", + MAME_DIR .. "src/mame/exidy/exidy440_a.cpp", + MAME_DIR .. "src/mame/exidy/exidy440_a.h", + MAME_DIR .. "src/mame/exidy/nl_fireone.h", + MAME_DIR .. "src/mame/exidy/nl_fireone.cpp", + MAME_DIR .. "src/mame/exidy/nl_starfire.h", + MAME_DIR .. "src/mame/exidy/nl_starfire.cpp", + MAME_DIR .. "src/mame/exidy/starfire.cpp", + MAME_DIR .. "src/mame/exidy/starfire.h", + MAME_DIR .. "src/mame/exidy/starfire_v.cpp", + MAME_DIR .. "src/mame/exidy/vertigo.cpp", + MAME_DIR .. "src/mame/exidy/vertigo.h", + MAME_DIR .. "src/mame/exidy/vertigo_m.cpp", + MAME_DIR .. "src/mame/exidy/vertigo_v.cpp", + MAME_DIR .. "src/mame/exidy/victory.cpp", + MAME_DIR .. "src/mame/exidy/victory.h", + MAME_DIR .. "src/mame/exidy/victory_v.cpp", + MAME_DIR .. "src/mame/midway/astrocde.cpp", + MAME_DIR .. "src/mame/midway/astrocde.h", + MAME_DIR .. "src/mame/midway/astrocde_v.cpp", + MAME_DIR .. "src/mame/midway/gridlee.cpp", + MAME_DIR .. "src/mame/midway/gridlee.h", + MAME_DIR .. "src/mame/midway/gridlee_a.cpp", + MAME_DIR .. "src/mame/midway/gridlee_v.cpp", + MAME_DIR .. "src/mame/shared/s11c_bg.cpp", + MAME_DIR .. "src/mame/shared/s11c_bg.h", + MAME_DIR .. "src/mame/shared/williamssound.cpp", + MAME_DIR .. "src/mame/shared/williamssound.h", + MAME_DIR .. "src/mame/midway/williams.cpp", + MAME_DIR .. "src/mame/midway/williams.h", + MAME_DIR .. "src/mame/midway/williams_m.cpp", + MAME_DIR .. "src/mame/midway/williams_v.cpp", + MAME_DIR .. "src/mame/gaelco/gaelco.cpp", + MAME_DIR .. "src/mame/gaelco/gaelco.h", + MAME_DIR .. "src/mame/gaelco/gaelco_v.cpp", + MAME_DIR .. "src/mame/gaelco/gaelcrpt.cpp", + MAME_DIR .. "src/mame/gaelco/wrally.cpp", + MAME_DIR .. "src/mame/gaelco/wrally.h", + MAME_DIR .. "src/mame/gaelco/wrally_v.cpp", + MAME_DIR .. "src/mame/gaelco/gaelco_wrally_sprites.cpp", + MAME_DIR .. "src/mame/gaelco/gaelco_wrally_sprites.h", + MAME_DIR .. "src/mame/gaelco/gaelco_ds5002fp.cpp", + MAME_DIR .. "src/mame/gaelco/gaelco_ds5002fp.h", + MAME_DIR .. "src/mame/venture/looping.cpp", + MAME_DIR .. "src/mame/misc/supertnk.cpp", + MAME_DIR .. "src/mame/misc/goldnpkr.cpp", } end diff --git a/scripts/target/mame/virtual.lua b/scripts/target/mame/virtual.lua deleted file mode 100644 index 6bd3c77cc80..00000000000 --- a/scripts/target/mame/virtual.lua +++ /dev/null @@ -1,142 +0,0 @@ --- license:BSD-3-Clause --- copyright-holders:MAMEdev Team - ---------------------------------------------------------------------------- --- --- virtual.lua --- --- Virtual target makefile --- ---------------------------------------------------------------------------- - --------------------------------------------------- --- specify available CPU cores --------------------------------------------------- - -CPUS["DSP16"] = true -- for qsound -CPUS["H6280"] = true -CPUS["KS0164"] = true -CPUS["M6502"] = true -CPUS["M680X0"] = true -CPUS["MCS48"] = true -CPUS["SH"] = true -CPUS["Z80"] = true - --------------------------------------------------- --- specify available sound cores; some of these are --- only for MAME and so aren't included --------------------------------------------------- - -SOUNDS["AY8910"] = true -SOUNDS["C140"] = true -SOUNDS["C352"] = true -SOUNDS["C6280"] = true -SOUNDS["GB_SOUND"] = true -SOUNDS["ES5503"] = true -SOUNDS["ES5505"] = true -SOUNDS["IREMGA20"] = true -SOUNDS["K051649"] = true -SOUNDS["K053260"] = true -SOUNDS["K054539"] = true -SOUNDS["KS0164"] = true -SOUNDS["MULTIPCM"] = true -SOUNDS["NES_APU"] = true -SOUNDS["OKIM6258"] = true -SOUNDS["OKIM6295"] = true -SOUNDS["POKEY"] = true -SOUNDS["QSOUND"] = true -SOUNDS["RF5C68"] = true -SOUNDS["SAA1099"] = true -SOUNDS["SCSP"] = true -SOUNDS["DAC"] = true -SOUNDS["SEGAPCM"] = true -SOUNDS["SN76496"] = true -SOUNDS["UPD7759"] = true -SOUNDS["VGMVIZ"] = true -SOUNDS["WAVE"] = true -SOUNDS["X1_010"] = true -SOUNDS["Y8950"] = true -SOUNDS["YM2154"] = true -SOUNDS["YM2151"] = true -SOUNDS["YM2414"] = true -SOUNDS["YM3806"] = true -SOUNDS["YM2203"] = true -SOUNDS["YM2413"] = true -SOUNDS["YM2608"] = true -SOUNDS["YM2610"] = true -SOUNDS["YM2612"] = true -SOUNDS["YM3526"] = true -SOUNDS["YM3812"] = true -SOUNDS["YMF262"] = true -SOUNDS["YMF271"] = true -SOUNDS["YMF278"] = true -SOUNDS["YMF278B"] = true -SOUNDS["YMZ280B"] = true - --------------------------------------------------- --- specify available video cores --------------------------------------------------- - - --------------------------------------------------- --- specify available machine cores --------------------------------------------------- -MACHINES["LDV1000"] = true -MACHINES["LDPR8210"] = true -MACHINES["Z80DAISY"] = true - --------------------------------------------------- --- specify available bus cores --------------------------------------------------- -BUSES["MIDI"] = true - - --------------------------------------------------- --- this is the driver library that --- comprise the virtual drivers --------------------------------------------------- -function linkProjects_mame_virtual(_target, _subtarget) - links { - "virtual", - } -end - -function createVirtualProjects(_target, _subtarget, _name) - project (_name) - targetsubdir(_target .."_" .. _subtarget) - kind (LIBTYPE) - uuid (os.uuid("drv-" .. _target .."_" .. _subtarget .. "_" .._name)) - addprojectflags() - precompiledheaders_novs() - - includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/emu", - MAME_DIR .. "src/devices", - MAME_DIR .. "src/mame", - MAME_DIR .. "src/lib", - MAME_DIR .. "src/lib/util", - MAME_DIR .. "3rdparty", - GEN_DIR .. "mame/layout", - } - - includedirs { - ext_includedir("zlib"), - ext_includedir("flac"), - } -end - -function createProjects_mame_virtual(_target, _subtarget) - createVirtualProjects(_target, _subtarget, "virtual") - files { - MAME_DIR .. "src/mame/drivers/vgmplay.cpp", - MAME_DIR .. "src/mame/drivers/wavesynth.cpp", - MAME_DIR .. "src/mame/drivers/ldplayer.cpp", - MAME_DIR .. "src/mame/machine/mega32x.cpp", - MAME_DIR .. "src/mame/machine/mega32x.h", - MAME_DIR .. "src/mame/audio/vboy.cpp", - MAME_DIR .. "src/mame/audio/vboy.h", - MAME_DIR .. "src/mame/audio/wswan.cpp", - MAME_DIR .. "src/mame/audio/wswan.h", - } -end diff --git a/src/mame/acorn/atom.cpp b/src/mame/acorn/atom.cpp index 40fa4d0675a..129ccec3cbd 100644 --- a/src/mame/acorn/atom.cpp +++ b/src/mame/acorn/atom.cpp @@ -116,7 +116,7 @@ Hardware: PPIA 8255 */ #include "emu.h" -#include "includes/atom.h" +#include "atom.h" #include "machine/clock.h" #include "formats/imageutl.h" #include "screen.h" diff --git a/src/mame/acorn/bbc.cpp b/src/mame/acorn/bbc.cpp index 725cc441937..f35c9449ed6 100644 --- a/src/mame/acorn/bbc.cpp +++ b/src/mame/acorn/bbc.cpp @@ -44,7 +44,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/bbc.h" +#include "bbc.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/acorn/bbc_m.cpp b/src/mame/acorn/bbc_m.cpp index 3bc221a57c1..8873ed057e8 100644 --- a/src/mame/acorn/bbc_m.cpp +++ b/src/mame/acorn/bbc_m.cpp @@ -12,7 +12,7 @@ #include "sound/tms5220.h" #include "machine/6522via.h" #include "machine/wd_fdc.h" -#include "includes/bbc.h" +#include "bbc.h" #include "machine/mc146818.h" #include "bus/centronics/ctronics.h" #include "imagedev/cassette.h" diff --git a/src/mame/acorn/bbc_v.cpp b/src/mame/acorn/bbc_v.cpp index ef59787cf69..493ebedff2f 100644 --- a/src/mame/acorn/bbc_v.cpp +++ b/src/mame/acorn/bbc_v.cpp @@ -13,7 +13,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/bbc.h" +#include "bbc.h" #include "video/saa5050.h" #include "video/mc6845.h" #include "screen.h" diff --git a/src/mame/acorn/electron.cpp b/src/mame/acorn/electron.cpp index 26cb16ca414..3cecb7ef5a7 100644 --- a/src/mame/acorn/electron.cpp +++ b/src/mame/acorn/electron.cpp @@ -81,7 +81,7 @@ Other internal boards to emulate: #include "emu.h" #include "cpu/m6502/m6502.h" -#include "includes/electron.h" +#include "electron.h" #include "imagedev/cassette.h" #include "formats/uef_cas.h" #include "formats/csw_cas.h" diff --git a/src/mame/acorn/electron_m.cpp b/src/mame/acorn/electron_m.cpp index 32d92743410..c09ea888341 100644 --- a/src/mame/acorn/electron_m.cpp +++ b/src/mame/acorn/electron_m.cpp @@ -7,7 +7,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/electron.h" +#include "electron.h" #include "screen.h" diff --git a/src/mame/acorn/electron_v.cpp b/src/mame/acorn/electron_v.cpp index 45ed01f42ee..8d99799c7c4 100644 --- a/src/mame/acorn/electron_v.cpp +++ b/src/mame/acorn/electron_v.cpp @@ -7,7 +7,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/electron.h" +#include "electron.h" #include "screen.h" /* diff --git a/src/mame/acorn/z88.cpp b/src/mame/acorn/z88.cpp index 789ad19283b..64564c66ff1 100644 --- a/src/mame/acorn/z88.cpp +++ b/src/mame/acorn/z88.cpp @@ -17,7 +17,7 @@ *******************************************************************************/ #include "emu.h" -#include "includes/z88.h" +#include "z88.h" #include "softlist_dev.h" diff --git a/src/mame/acorn/z88.h b/src/mame/acorn/z88.h index 3778431d44e..6d19027d935 100644 --- a/src/mame/acorn/z88.h +++ b/src/mame/acorn/z88.h @@ -15,8 +15,8 @@ #include "machine/bankdev.h" #include "machine/nvram.h" #include "machine/ram.h" -#include "machine/upd65031.h" -#include "machine/z88_impexp.h" +#include "upd65031.h" +#include "z88_impexp.h" #include "sound/spkrdev.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/acorn/z88_v.cpp b/src/mame/acorn/z88_v.cpp index 3435b5950db..679906b7982 100644 --- a/src/mame/acorn/z88_v.cpp +++ b/src/mame/acorn/z88_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/z88.h" +#include "z88.h" inline void z88_state::plot_pixel(bitmap_ind16 &bitmap, int x, int y, uint16_t color) diff --git a/src/mame/act/apricotf.cpp b/src/mame/act/apricotf.cpp index 8c5af267d16..1785799f91d 100644 --- a/src/mame/act/apricotf.cpp +++ b/src/mame/act/apricotf.cpp @@ -24,7 +24,7 @@ #include "cpu/i86/i86.h" #include "formats/apridisk.h" #include "imagedev/floppy.h" -#include "machine/apricotkb.h" +#include "apricotkb.h" #include "machine/buffer.h" #include "machine/input_merger.h" #include "machine/wd_fdc.h" diff --git a/src/mame/act/apricotp.cpp b/src/mame/act/apricotp.cpp index 4298c3708c8..c40cdcb0a7a 100644 --- a/src/mame/act/apricotp.cpp +++ b/src/mame/act/apricotp.cpp @@ -29,7 +29,7 @@ #include "formats/apridisk.h" #include "imagedev/floppy.h" #include "machine/am9517a.h" -#include "machine/apricotkb.h" +#include "apricotkb.h" #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/ram.h" diff --git a/src/mame/act/victor9k.cpp b/src/mame/act/victor9k.cpp index d558970abec..2561cfaf29a 100644 --- a/src/mame/act/victor9k.cpp +++ b/src/mame/act/victor9k.cpp @@ -34,8 +34,8 @@ #include "machine/pit8253.h" #include "machine/pic8259.h" #include "machine/ram.h" -#include "machine/victor9k_kb.h" -#include "machine/victor9k_fdc.h" +#include "victor9k_kb.h" +#include "victor9k_fdc.h" #include "machine/z80sio.h" #include "sound/hc55516.h" #include "video/mc6845.h" diff --git a/src/mame/adc/super6.cpp b/src/mame/adc/super6.cpp index 170709fcf11..7cf1bb92f3c 100644 --- a/src/mame/adc/super6.cpp +++ b/src/mame/adc/super6.cpp @@ -22,7 +22,7 @@ ToDo: #include "emu.h" #include "bus/rs232/rs232.h" //#include "bus/s100/s100.h" -#include "includes/super6.h" +#include "super6.h" #include "softlist_dev.h" //************************************************************************** diff --git a/src/mame/agat/agat.cpp b/src/mame/agat/agat.cpp index e264e192dc9..d9f2a2917c1 100644 --- a/src/mame/agat/agat.cpp +++ b/src/mame/agat/agat.cpp @@ -69,9 +69,9 @@ ************************************************************************/ #include "emu.h" -#include "machine/agatkeyb.h" -#include "video/agat7.h" -#include "video/agat9.h" +#include "agatkeyb.h" +#include "agat7.h" +#include "agat9.h" #include "bus/a2bus/a2diskii.h" #include "bus/a2bus/agat7langcard.h" diff --git a/src/mame/agat/agat7.cpp b/src/mame/agat/agat7.cpp index 038cbc180d0..8ececb32dd8 100644 --- a/src/mame/agat/agat7.cpp +++ b/src/mame/agat/agat7.cpp @@ -21,7 +21,7 @@ #include "emu.h" -#include "video/agat7.h" +#include "agat7.h" #include "screen.h" diff --git a/src/mame/agat/agat9.cpp b/src/mame/agat/agat9.cpp index 4c8f5f023df..b5ada9621c9 100644 --- a/src/mame/agat/agat9.cpp +++ b/src/mame/agat/agat9.cpp @@ -21,7 +21,7 @@ #include "emu.h" -#include "video/agat9.h" +#include "agat9.h" #include "screen.h" diff --git a/src/mame/agat/agatkeyb.cpp b/src/mame/agat/agatkeyb.cpp index f0a6c2e34fe..c4d80ce3fd7 100644 --- a/src/mame/agat/agatkeyb.cpp +++ b/src/mame/agat/agatkeyb.cpp @@ -8,7 +8,7 @@ #include "emu.h" -#include "machine/agatkeyb.h" +#include "agatkeyb.h" #include "machine/keyboard.ipp" diff --git a/src/mame/alesis/alesis.cpp b/src/mame/alesis/alesis.cpp index a3e9cb3f96a..268678882dc 100644 --- a/src/mame/alesis/alesis.cpp +++ b/src/mame/alesis/alesis.cpp @@ -13,7 +13,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/alesis.h" +#include "alesis.h" #include "sr16.lh" #include "screen.h" diff --git a/src/mame/alesis/alesis_a.cpp b/src/mame/alesis/alesis_a.cpp index ee38f6bea76..bc48b0f234c 100644 --- a/src/mame/alesis/alesis_a.cpp +++ b/src/mame/alesis/alesis_a.cpp @@ -12,7 +12,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/alesis.h" +#include "alesis.h" #include "speaker.h" #define LOG 1 diff --git a/src/mame/alesis/alesis_v.cpp b/src/mame/alesis/alesis_v.cpp index b5e00ccd797..3ea1fe406c5 100644 --- a/src/mame/alesis/alesis_v.cpp +++ b/src/mame/alesis/alesis_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/alesis.h" +#include "alesis.h" void alesis_state::update_lcd_symbols(bitmap_ind16 &bitmap, uint8_t pos, uint8_t y, uint8_t x, int state) diff --git a/src/mame/alpha/ad_sound.cpp b/src/mame/alpha/ad_sound.cpp index 61700edd1b6..92b7288f1ac 100644 --- a/src/mame/alpha/ad_sound.cpp +++ b/src/mame/alpha/ad_sound.cpp @@ -75,7 +75,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/ad_sound.h" +#include "ad_sound.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/alpha/alpha68k.cpp b/src/mame/alpha/alpha68k.cpp index 88c4a804708..ae0785f9473 100644 --- a/src/mame/alpha/alpha68k.cpp +++ b/src/mame/alpha/alpha68k.cpp @@ -202,7 +202,7 @@ DIP locations verified from manuals for: ***************************************************************************/ #include "emu.h" -#include "includes/alpha68k.h" +#include "alpha68k.h" /******************************************************************************/ diff --git a/src/mame/alpha/alpha68k.h b/src/mame/alpha/alpha68k.h index 7474452f786..c0710814384 100644 --- a/src/mame/alpha/alpha68k.h +++ b/src/mame/alpha/alpha68k.h @@ -10,6 +10,9 @@ #pragma once +#include "alpha68k_palette.h" +#include "snk68_spr.h" + #include "cpu/m68000/m68000.h" #include "cpu/mcs48/mcs48.h" #include "cpu/z80/z80.h" @@ -19,12 +22,11 @@ #include "sound/ymopl.h" #include "machine/74259.h" #include "machine/gen_latch.h" -#include "video/snk68_spr.h" -#include "video/alpha68k_palette.h" + #include "emupal.h" #include "screen.h" -#include "tilemap.h" #include "speaker.h" +#include "tilemap.h" class alpha68k_state : public driver_device diff --git a/src/mame/alpha/alpha68k_i.cpp b/src/mame/alpha/alpha68k_i.cpp index fd0c1bfb3cf..60d9f493fce 100644 --- a/src/mame/alpha/alpha68k_i.cpp +++ b/src/mame/alpha/alpha68k_i.cpp @@ -39,7 +39,7 @@ Paddle Mania **************************************************************************************************/ #include "emu.h" -#include "includes/alpha68k.h" +#include "alpha68k.h" /* * diff --git a/src/mame/alpha/alpha68k_n.cpp b/src/mame/alpha/alpha68k_n.cpp index 6915c623786..f48fc754380 100644 --- a/src/mame/alpha/alpha68k_n.cpp +++ b/src/mame/alpha/alpha68k_n.cpp @@ -140,7 +140,7 @@ PCB Pinout #include "emu.h" -#include "includes/alpha68k.h" +#include "alpha68k.h" /* * diff --git a/src/mame/alpha/alpha68k_v.cpp b/src/mame/alpha/alpha68k_v.cpp index 26c0405b34b..b8ccfcbd931 100644 --- a/src/mame/alpha/alpha68k_v.cpp +++ b/src/mame/alpha/alpha68k_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/alpha68k.h" +#include "alpha68k.h" // TODO: used by alpha68k_i.cpp and _n.cpp, move to own file void alpha68k_prom_state::palette_init(palette_device &palette) const diff --git a/src/mame/alpha/champbas.cpp b/src/mame/alpha/champbas.cpp index 57b17b0b351..048e138450d 100644 --- a/src/mame/alpha/champbas.cpp +++ b/src/mame/alpha/champbas.cpp @@ -79,7 +79,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/champbas.h" +#include "champbas.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m68705.h" #include "machine/gen_latch.h" diff --git a/src/mame/alpha/champbas.h b/src/mame/alpha/champbas.h index 05a3209c3d2..7bf3d3abbcc 100644 --- a/src/mame/alpha/champbas.h +++ b/src/mame/alpha/champbas.h @@ -11,7 +11,7 @@ #pragma once #include "machine/74259.h" -#include "machine/alpha8201.h" +#include "alpha8201.h" #include "machine/timer.h" #include "machine/watchdog.h" #include "emupal.h" diff --git a/src/mame/alpha/champbas_v.cpp b/src/mame/alpha/champbas_v.cpp index 67df4e28aa7..36ea7d9a04c 100644 --- a/src/mame/alpha/champbas_v.cpp +++ b/src/mame/alpha/champbas_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/champbas.h" +#include "champbas.h" /*************************************************************************** diff --git a/src/mame/alpha/equites.cpp b/src/mame/alpha/equites.cpp index 105b986fac1..16dbda26210 100644 --- a/src/mame/alpha/equites.cpp +++ b/src/mame/alpha/equites.cpp @@ -369,9 +369,9 @@ D *******************************************************************************/ #include "emu.h" -#include "includes/equites.h" +#include "equites.h" -#include "audio/ad_sound.h" +#include "ad_sound.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" #include "machine/watchdog.h" diff --git a/src/mame/alpha/equites.h b/src/mame/alpha/equites.h index 9f650f90f04..da751ece1c8 100644 --- a/src/mame/alpha/equites.h +++ b/src/mame/alpha/equites.h @@ -11,7 +11,7 @@ #pragma once #include "machine/74259.h" -#include "machine/alpha8201.h" +#include "alpha8201.h" #include "machine/timer.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/alpha/equites_v.cpp b/src/mame/alpha/equites_v.cpp index a0193cdebeb..394d70652af 100644 --- a/src/mame/alpha/equites_v.cpp +++ b/src/mame/alpha/equites_v.cpp @@ -9,7 +9,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/equites.h" +#include "equites.h" /************************************* diff --git a/src/mame/alpha/shougi.cpp b/src/mame/alpha/shougi.cpp index 1872ed8aadd..b7fdcf3aab4 100644 --- a/src/mame/alpha/shougi.cpp +++ b/src/mame/alpha/shougi.cpp @@ -79,7 +79,7 @@ PROM : Type MB7051 #include "emu.h" #include "machine/74259.h" -#include "machine/alpha8201.h" +#include "alpha8201.h" #include "machine/watchdog.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/altos/acs8600_ics.cpp b/src/mame/altos/acs8600_ics.cpp index 37a2100167c..a5d29748e2e 100644 --- a/src/mame/altos/acs8600_ics.cpp +++ b/src/mame/altos/acs8600_ics.cpp @@ -4,7 +4,7 @@ // TODO: multibus #include "emu.h" -#include "machine/acs8600_ics.h" +#include "acs8600_ics.h" #include "machine/z80sio.h" #include "machine/am9513.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/altos/altos8600.cpp b/src/mame/altos/altos8600.cpp index b1430e1471d..b57c3cd81b0 100644 --- a/src/mame/altos/altos8600.cpp +++ b/src/mame/altos/altos8600.cpp @@ -11,7 +11,7 @@ #include "machine/i8255.h" #include "machine/z80sio.h" #include "machine/wd_fdc.h" -#include "machine/acs8600_ics.h" +#include "acs8600_ics.h" #include "imagedev/floppy.h" #include "imagedev/harddriv.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/amiga/alg.cpp b/src/mame/amiga/alg.cpp index 37fd00ac60b..7e8230069c0 100644 --- a/src/mame/amiga/alg.cpp +++ b/src/mame/amiga/alg.cpp @@ -47,7 +47,7 @@ **************************************************************************************/ #include "emu.h" -#include "includes/amiga.h" +#include "amiga.h" #include "cpu/m68000/m68000.h" #include "machine/ldp1450.h" #include "machine/nvram.h" diff --git a/src/mame/amiga/amiga.cpp b/src/mame/amiga/amiga.cpp index 14ab6176fb3..47c885fe523 100644 --- a/src/mame/amiga/amiga.cpp +++ b/src/mame/amiga/amiga.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/amiga.h" +#include "amiga.h" #include "bus/amiga/keyboard/keyboard.h" #include "bus/amiga/zorro/zorro.h" diff --git a/src/mame/amiga/amiga.h b/src/mame/amiga/amiga.h index 3bdcf6db361..0de3ad850cd 100644 --- a/src/mame/amiga/amiga.h +++ b/src/mame/amiga/amiga.h @@ -25,7 +25,7 @@ Ernesto Corvi & Mariusz Wojcieszek #include "machine/akiko.h" #include "machine/i2cmem.h" #include "machine/8364_paula.h" -#include "video/amigaaga.h" +#include "amigaaga.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/amiga/amiga_m.cpp b/src/mame/amiga/amiga_m.cpp index bf729fe3d58..b516ea7c266 100644 --- a/src/mame/amiga/amiga_m.cpp +++ b/src/mame/amiga/amiga_m.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/amiga.h" +#include "amiga.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/amiga/amiga_v.cpp b/src/mame/amiga/amiga_v.cpp index ca8dda53d7e..5d2569c7ae1 100644 --- a/src/mame/amiga/amiga_v.cpp +++ b/src/mame/amiga/amiga_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/amiga.h" +#include "amiga.h" diff --git a/src/mame/amiga/amigaaga.cpp b/src/mame/amiga/amigaaga.cpp index 4064e57a6b1..dee04083707 100644 --- a/src/mame/amiga/amigaaga.cpp +++ b/src/mame/amiga/amigaaga.cpp @@ -25,7 +25,7 @@ TODO: **************************************************************************************************/ #include "emu.h" -#include "includes/amiga.h" +#include "amiga.h" diff --git a/src/mame/amiga/arsystems.cpp b/src/mame/amiga/arsystems.cpp index 52c71e1b182..b9bf85b2a01 100644 --- a/src/mame/amiga/arsystems.cpp +++ b/src/mame/amiga/arsystems.cpp @@ -51,7 +51,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/amiga.h" +#include "amiga.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" diff --git a/src/mame/amiga/cubo.cpp b/src/mame/amiga/cubo.cpp index 77df43d90c5..4f1cf746a72 100644 --- a/src/mame/amiga/cubo.cpp +++ b/src/mame/amiga/cubo.cpp @@ -317,7 +317,7 @@ routines : */ #include "emu.h" -#include "includes/amiga.h" +#include "amiga.h" #include "imagedev/chd_cd.h" #include "machine/microtch.h" #include "speaker.h" diff --git a/src/mame/amiga/mquake.cpp b/src/mame/amiga/mquake.cpp index c5a2470cb0b..2437137e56f 100644 --- a/src/mame/amiga/mquake.cpp +++ b/src/mame/amiga/mquake.cpp @@ -35,7 +35,7 @@ #include "emu.h" -#include "includes/amiga.h" +#include "amiga.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" diff --git a/src/mame/amiga/upscope.cpp b/src/mame/amiga/upscope.cpp index 3b28d895628..24619faa37b 100644 --- a/src/mame/amiga/upscope.cpp +++ b/src/mame/amiga/upscope.cpp @@ -26,7 +26,7 @@ **********************************************************************************/ #include "emu.h" -#include "includes/amiga.h" +#include "amiga.h" #include "cpu/m68000/m68000.h" #include "machine/amigafdc.h" diff --git a/src/mame/amstrad/amstrad.cpp b/src/mame/amstrad/amstrad.cpp index 7034d6b2caa..61fb4761f07 100644 --- a/src/mame/amstrad/amstrad.cpp +++ b/src/mame/amstrad/amstrad.cpp @@ -90,7 +90,7 @@ Some bugs left : /* Core includes */ #include "emu.h" -#include "includes/amstrad.h" +#include "amstrad.h" /* Components */ #include "machine/i8255.h" /* for 8255 ppi */ diff --git a/src/mame/amstrad/amstrad_m.cpp b/src/mame/amstrad/amstrad_m.cpp index 5e53da7cd68..01deca0eea4 100644 --- a/src/mame/amstrad/amstrad_m.cpp +++ b/src/mame/amstrad/amstrad_m.cpp @@ -38,7 +38,7 @@ This gives a total of 19968 NOPs per frame. #include "emu.h" -#include "includes/amstrad.h" +#include "amstrad.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" diff --git a/src/mame/amstrad/nc.cpp b/src/mame/amstrad/nc.cpp index 49d147692fc..9e3474aef44 100644 --- a/src/mame/amstrad/nc.cpp +++ b/src/mame/amstrad/nc.cpp @@ -90,7 +90,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/nc.h" +#include "nc.h" #include "cpu/z80/z80.h" #include "imagedev/floppy.h" diff --git a/src/mame/amstrad/nc_m.cpp b/src/mame/amstrad/nc_m.cpp index bf742ffbaca..542522e8574 100644 --- a/src/mame/amstrad/nc_m.cpp +++ b/src/mame/amstrad/nc_m.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/nc.h" +#include "nc.h" #include "machine/i8251.h" /*************************************************************************************************/ diff --git a/src/mame/amstrad/nc_v.cpp b/src/mame/amstrad/nc_v.cpp index 4da4e3d583e..1128c4d8e27 100644 --- a/src/mame/amstrad/nc_v.cpp +++ b/src/mame/amstrad/nc_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/nc.h" +#include "nc.h" #include "machine/ram.h" /*************************************************************************** diff --git a/src/mame/amstrad/pc1512.cpp b/src/mame/amstrad/pc1512.cpp index 5bfbd096ac5..2cd85a836a7 100644 --- a/src/mame/amstrad/pc1512.cpp +++ b/src/mame/amstrad/pc1512.cpp @@ -93,7 +93,7 @@ PC1640-HD30: Western Digital 95038 [-chs 615,6,17 -ss 512] */ #include "emu.h" -#include "includes/pc1512.h" +#include "pc1512.h" #include "bus/rs232/rs232.h" #include "bus/isa/ega.h" #include "screen.h" diff --git a/src/mame/amstrad/pc1512.h b/src/mame/amstrad/pc1512.h index fd585b8b251..ce6ba999186 100644 --- a/src/mame/amstrad/pc1512.h +++ b/src/mame/amstrad/pc1512.h @@ -19,11 +19,11 @@ #include "machine/mc146818.h" #include "machine/pic8259.h" #include "machine/pit8253.h" -#include "machine/pc1512kb.h" +#include "pc1512kb.h" #include "machine/upd765.h" #include "machine/ram.h" #include "sound/spkrdev.h" -#include "video/ams40041.h" +#include "ams40041.h" #include "formats/pc_dsk.h" diff --git a/src/mame/amstrad/pcw.cpp b/src/mame/amstrad/pcw.cpp index 1c4dc92b6af..2966b14a50a 100644 --- a/src/mame/amstrad/pcw.cpp +++ b/src/mame/amstrad/pcw.cpp @@ -96,7 +96,7 @@ ******************************************************************************/ #include "emu.h" // pcw video hardware -#include "includes/pcw.h" +#include "pcw.h" #include "cpu/z80/z80.h" #include "machine/i8243.h" diff --git a/src/mame/amstrad/pcw16.cpp b/src/mame/amstrad/pcw16.cpp index 299c838ab68..30269417e00 100644 --- a/src/mame/amstrad/pcw16.cpp +++ b/src/mame/amstrad/pcw16.cpp @@ -90,7 +90,7 @@ TODO: so ui disabled */ #include "emu.h" -#include "includes/pcw16.h" +#include "pcw16.h" #include "bus/rs232/hlemouse.h" #include "bus/rs232/rs232.h" #include "screen.h" diff --git a/src/mame/amstrad/pcw16_v.cpp b/src/mame/amstrad/pcw16_v.cpp index 1fb7c6eb2f5..d8f29019041 100644 --- a/src/mame/amstrad/pcw16_v.cpp +++ b/src/mame/amstrad/pcw16_v.cpp @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Kevin Thacker #include "emu.h" -#include "includes/pcw16.h" +#include "pcw16.h" #include "machine/ram.h" #include "screen.h" diff --git a/src/mame/amstrad/pcw_v.cpp b/src/mame/amstrad/pcw_v.cpp index 5060a313b15..1e49a84a789 100644 --- a/src/mame/amstrad/pcw_v.cpp +++ b/src/mame/amstrad/pcw_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/pcw.h" +#include "pcw.h" #include "machine/ram.h" #define LOG_PALETTE (1U << 1) // LOGs what palette is choosen diff --git a/src/mame/apollo/apollo.cpp b/src/mame/apollo/apollo.cpp index 332bad046a6..2debb4d6c46 100644 --- a/src/mame/apollo/apollo.cpp +++ b/src/mame/apollo/apollo.cpp @@ -26,7 +26,7 @@ #define VERBOSE 0 -#include "includes/apollo.h" +#include "apollo.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/apollo/apollo.h b/src/mame/apollo/apollo.h index d6cad534343..92855a5c4a9 100644 --- a/src/mame/apollo/apollo.h +++ b/src/mame/apollo/apollo.h @@ -14,7 +14,7 @@ #pragma once -#include "machine/apollo_kbd.h" +#include "apollo_kbd.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/apollo/apollo_dbg.cpp b/src/mame/apollo/apollo_dbg.cpp index e1181864453..78e73a71927 100644 --- a/src/mame/apollo/apollo_dbg.cpp +++ b/src/mame/apollo/apollo_dbg.cpp @@ -12,7 +12,7 @@ #include "emu.h" #include "debug/debugbuf.h" -#include "includes/apollo.h" +#include "apollo.h" #include "cpu/m68000/m68000.h" #if 0 diff --git a/src/mame/apollo/apollo_kbd.cpp b/src/mame/apollo/apollo_kbd.cpp index 5e7e577325a..8d43814ee31 100644 --- a/src/mame/apollo/apollo_kbd.cpp +++ b/src/mame/apollo/apollo_kbd.cpp @@ -14,7 +14,7 @@ #define VERBOSE 0 -#include "machine/apollo_kbd.h" +#include "apollo_kbd.h" #include "speaker.h" diff --git a/src/mame/apollo/apollo_m.cpp b/src/mame/apollo/apollo_m.cpp index a05acad6022..554fd9e3db4 100644 --- a/src/mame/apollo/apollo_m.cpp +++ b/src/mame/apollo/apollo_m.cpp @@ -29,7 +29,7 @@ */ #include "emu.h" -#include "includes/apollo.h" +#include "apollo.h" #include "bus/isa/omti8621.h" #include "bus/isa/sc499.h" diff --git a/src/mame/apollo/apollo_v.cpp b/src/mame/apollo/apollo_v.cpp index 26a762f5fc8..f8b4f0551a8 100644 --- a/src/mame/apollo/apollo_v.cpp +++ b/src/mame/apollo/apollo_v.cpp @@ -17,7 +17,7 @@ #define VERBOSE 0 -#include "includes/apollo.h" +#include "apollo.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/apple/apple2.cpp b/src/mame/apple/apple2.cpp index 84a7a10bff0..191ee896b9d 100644 --- a/src/mame/apple/apple2.cpp +++ b/src/mame/apple/apple2.cpp @@ -39,9 +39,9 @@ II Plus: RAM options reduced to 16/32/48 KB. ************************************************************************/ #include "emu.h" -#include "video/apple2.h" -#include "machine/apple2common.h" +#include "apple2common.h" +#include "apple2video.h" #include "bus/a2bus/a2bus.h" #include "bus/a2bus/cards.h" diff --git a/src/mame/apple/apple2e.cpp b/src/mame/apple/apple2e.cpp index e500723a6ff..f51395a34cc 100644 --- a/src/mame/apple/apple2e.cpp +++ b/src/mame/apple/apple2e.cpp @@ -112,11 +112,12 @@ MIG RAM page 2 $CE02 is the speaker/slot bitfield and $CE03 is the paddle/accele ***************************************************************************/ #include "emu.h" -#include "video/apple2.h" + +#include "apple2video.h" #define IICP_NEW_IWM (0) -#include "machine/apple2common.h" +#include "apple2common.h" #include "cpu/m6502/m6502.h" #include "cpu/m6502/m65c02.h" diff --git a/src/mame/apple/apple2gs.cpp b/src/mame/apple/apple2gs.cpp index 5eccee8e7a1..421e6f32e6e 100644 --- a/src/mame/apple/apple2gs.cpp +++ b/src/mame/apple/apple2gs.cpp @@ -49,15 +49,16 @@ ***************************************************************************/ #include "emu.h" -#include "video/apple2.h" + +#include "apple2video.h" #define RUN_ADB_MICRO (0) // use the ADB microcontroller for keyboard/mouse input #define ADB_HLE (0) // connect the ADB microcontroller to the macadb.cpp ADB bit-serial keyboard+mouse #define LOG_ADB (0) // log ADB activity in the old-style HLE simulation of the microcontroller and GLU -#include "machine/apple2common.h" +#include "apple2common.h" //#include "machine/apple2host.h" -#include "machine/macadb.h" +#include "macadb.h" #include "bus/a2bus/a2bus.h" #include "bus/a2bus/cards.h" diff --git a/src/mame/apple/apple3.cpp b/src/mame/apple/apple3.cpp index 76ed457b11f..cd29758cbc7 100644 --- a/src/mame/apple/apple3.cpp +++ b/src/mame/apple/apple3.cpp @@ -17,7 +17,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/apple3.h" +#include "apple3.h" #include "formats/ap2_dsk.h" #include "bus/a2bus/cards.h" diff --git a/src/mame/apple/apple3_m.cpp b/src/mame/apple/apple3_m.cpp index 3d6045d8d12..09bb561ab79 100644 --- a/src/mame/apple/apple3_m.cpp +++ b/src/mame/apple/apple3_m.cpp @@ -45,7 +45,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/apple3.h" +#include "apple3.h" #define LOG_MEMORY 0 #define LOG_INDXADDR 0 diff --git a/src/mame/apple/apple3_v.cpp b/src/mame/apple/apple3_v.cpp index 940531d5a72..d4cc3333cdf 100644 --- a/src/mame/apple/apple3_v.cpp +++ b/src/mame/apple/apple3_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/apple3.h" +#include "apple3.h" #include "machine/ram.h" #define BLACK 0 diff --git a/src/mame/apple/lisa.cpp b/src/mame/apple/lisa.cpp index 2cc6baed620..f67f2d2136a 100644 --- a/src/mame/apple/lisa.cpp +++ b/src/mame/apple/lisa.cpp @@ -11,7 +11,7 @@ *********************************************************************/ #include "emu.h" -#include "includes/lisa.h" +#include "lisa.h" #include "cpu/cop400/cop400.h" #include "formats/ap_dsk35.h" #include "screen.h" diff --git a/src/mame/apple/lisa_m.cpp b/src/mame/apple/lisa_m.cpp index 4fbce2e6555..b255d5c912c 100644 --- a/src/mame/apple/lisa_m.cpp +++ b/src/mame/apple/lisa_m.cpp @@ -39,7 +39,7 @@ */ #include "emu.h" -#include "includes/lisa.h" +#include "lisa.h" #include "screen.h" diff --git a/src/mame/apple/mac.cpp b/src/mame/apple/mac.cpp index 6fa15a9768f..9e9d70aea2a 100644 --- a/src/mame/apple/mac.cpp +++ b/src/mame/apple/mac.cpp @@ -12,9 +12,9 @@ ****************************************************************************/ #include "emu.h" -#include "includes/mac.h" +#include "mac.h" -#include "machine/macadb.h" +#include "macadb.h" #include "bus/nscsi/devices.h" #include "bus/nubus/cards.h" diff --git a/src/mame/apple/mac.h b/src/mame/apple/mac.h index e18b04dc16b..5d97e3c2992 100644 --- a/src/mame/apple/mac.h +++ b/src/mame/apple/mac.h @@ -18,14 +18,14 @@ #include "machine/nscsi_bus.h" #include "machine/ram.h" #include "machine/timer.h" -#include "machine/egret.h" -#include "machine/cuda.h" -#include "machine/macadb.h" +#include "egret.h" +#include "cuda.h" +#include "macadb.h" #include "bus/nubus/nubus.h" #include "bus/macpds/macpds.h" #include "machine/applefdintf.h" -#include "machine/macrtc.h" -#include "machine/macscsi.h" +#include "macrtc.h" +#include "macscsi.h" #include "sound/asc.h" #include "sound/dac.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/apple/mac128.cpp b/src/mame/apple/mac128.cpp index c62ddc12ff8..27c5518f7f4 100644 --- a/src/mame/apple/mac128.cpp +++ b/src/mame/apple/mac128.cpp @@ -84,7 +84,7 @@ Scanline 0 is the start of vblank. #include "emu.h" -#include "machine/macrtc.h" +#include "macrtc.h" #include "bus/mackbd/mackbd.h" #include "bus/macpds/hyperdrive.h" @@ -100,8 +100,8 @@ Scanline 0 is the start of vblank. #include "machine/applefdintf.h" #include "machine/timer.h" #include "machine/z80scc.h" -#include "machine/macadb.h" -#include "machine/macscsi.h" +#include "macadb.h" +#include "macscsi.h" #include "sound/dac.h" #include "sound/flt_biquad.h" #include "bus/macpds/pds_tpdfpd.h" diff --git a/src/mame/apple/mac_m.cpp b/src/mame/apple/mac_m.cpp index 9b777cc2603..1f4ef4fceb1 100644 --- a/src/mame/apple/mac_m.cpp +++ b/src/mame/apple/mac_m.cpp @@ -75,7 +75,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/mac.h" +#include "mac.h" #define INTS_RBV ((m_model >= MODEL_MAC_IICI) && (m_model <= MODEL_MAC_IIVI)) || ((m_model >= MODEL_MAC_LC) && (m_model <= MODEL_MAC_LC_580)) diff --git a/src/mame/apple/mac_v.cpp b/src/mame/apple/mac_v.cpp index a89a18d9f53..7307d0a7f15 100644 --- a/src/mame/apple/mac_v.cpp +++ b/src/mame/apple/mac_v.cpp @@ -55,7 +55,7 @@ Apple color FPD 01 11 10 (FPD = Full Page Display) #include "emu.h" #include "sound/asc.h" -#include "includes/mac.h" +#include "mac.h" #include "machine/ram.h" #include "render.h" diff --git a/src/mame/apple/macpci.cpp b/src/mame/apple/macpci.cpp index f81708c5b1e..c892916d64b 100644 --- a/src/mame/apple/macpci.cpp +++ b/src/mame/apple/macpci.cpp @@ -37,7 +37,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/macpci.h" +#include "macpci.h" #include "cpu/powerpc/ppc.h" #include "cpu/mn1880/mn1880.h" #include "imagedev/chd_cd.h" diff --git a/src/mame/apple/macpci.h b/src/mame/apple/macpci.h index b0e6188d933..87775a987aa 100644 --- a/src/mame/apple/macpci.h +++ b/src/mame/apple/macpci.h @@ -14,7 +14,7 @@ #include "machine/8530scc.h" #include "machine/6522via.h" #include "machine/ram.h" -#include "machine/cuda.h" +#include "cuda.h" #include "machine/ncr539x.h" #include "sound/awacs.h" diff --git a/src/mame/apple/macpci_m.cpp b/src/mame/apple/macpci_m.cpp index 034828222d6..66e2f3d489d 100644 --- a/src/mame/apple/macpci_m.cpp +++ b/src/mame/apple/macpci_m.cpp @@ -11,7 +11,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/macpci.h" +#include "macpci.h" #define LOG_ADB 0 #define LOG_VIA 0 diff --git a/src/mame/apple/macpdm.cpp b/src/mame/apple/macpdm.cpp index f21d326a46e..0be4b5c39be 100644 --- a/src/mame/apple/macpdm.cpp +++ b/src/mame/apple/macpdm.cpp @@ -8,8 +8,8 @@ #include "cpu/powerpc/ppc.h" #include "machine/6522via.h" #include "machine/8530scc.h" -#include "machine/cuda.h" -#include "machine/macadb.h" +#include "cuda.h" +#include "macadb.h" #include "machine/mv_sonora.h" #include "machine/ncr5390.h" #include "machine/ram.h" diff --git a/src/mame/apple/macprtb.cpp b/src/mame/apple/macprtb.cpp index 8af17fc1532..b4c0906bd75 100644 --- a/src/mame/apple/macprtb.cpp +++ b/src/mame/apple/macprtb.cpp @@ -88,7 +88,7 @@ #include "emu.h" -#include "machine/macrtc.h" +#include "macrtc.h" #include "cpu/m68000/m68000.h" #include "cpu/m6502/m5074x.h" #include "machine/6522via.h" @@ -97,8 +97,8 @@ #include "machine/swim1.h" #include "machine/timer.h" #include "machine/z80scc.h" -#include "machine/macadb.h" -#include "machine/macscsi.h" +#include "macadb.h" +#include "macscsi.h" #include "machine/ncr5380.h" #include "machine/nscsi_bus.h" #include "bus/nscsi/devices.h" diff --git a/src/mame/apple/macpwrbk030.cpp b/src/mame/apple/macpwrbk030.cpp index 92727d14a6e..d26a2b61500 100644 --- a/src/mame/apple/macpwrbk030.cpp +++ b/src/mame/apple/macpwrbk030.cpp @@ -96,7 +96,7 @@ #include "emu.h" -#include "machine/macrtc.h" +#include "macrtc.h" #include "cpu/m68000/m68000.h" #include "cpu/m6502/m5074x.h" #include "machine/6522via.h" @@ -105,8 +105,8 @@ #include "machine/swim1.h" #include "machine/timer.h" #include "machine/z80scc.h" -#include "machine/macadb.h" -#include "machine/macscsi.h" +#include "macadb.h" +#include "macscsi.h" #include "machine/ncr5380.h" #include "machine/nscsi_bus.h" #include "bus/nscsi/devices.h" diff --git a/src/mame/apple/macquadra700.cpp b/src/mame/apple/macquadra700.cpp index 41a2185aaa7..d1569025448 100644 --- a/src/mame/apple/macquadra700.cpp +++ b/src/mame/apple/macquadra700.cpp @@ -11,7 +11,7 @@ #include "emu.h" -#include "machine/macrtc.h" +#include "macrtc.h" #include "bus/nscsi/devices.h" #include "bus/nubus/cards.h" @@ -20,7 +20,7 @@ #include "machine/6522via.h" #include "machine/applefdintf.h" #include "machine/dp83932c.h" -#include "machine/macadb.h" +#include "macadb.h" #include "machine/ncr5390.h" #include "machine/nscsi_bus.h" #include "machine/ram.h" diff --git a/src/mame/apple/swim.cpp b/src/mame/apple/swim.cpp index 2978d679416..04515a2129b 100644 --- a/src/mame/apple/swim.cpp +++ b/src/mame/apple/swim.cpp @@ -10,7 +10,7 @@ *********************************************************************/ #include "emu.h" -#include "machine/swim.h" +#include "swim.h" /*************************************************************************** diff --git a/src/mame/apple/tk2000.cpp b/src/mame/apple/tk2000.cpp index 715e1a4c0bc..2924d234f44 100644 --- a/src/mame/apple/tk2000.cpp +++ b/src/mame/apple/tk2000.cpp @@ -19,7 +19,8 @@ ************************************************************************/ #include "emu.h" -#include "video/apple2.h" + +#include "apple2video.h" #include "cpu/m6502/m6502.h" #include "bus/centronics/ctronics.h" @@ -37,6 +38,8 @@ #include "formats/ap2_dsk.h" +namespace { + #define A2_CPU_TAG "maincpu" #define A2_BUS_TAG "a2bus" #define A2_SPEAKER_TAG "speaker" @@ -637,6 +640,9 @@ ROM_START(mpf2) ROM_LOAD( "mpf_ii.rom", 0x000000, 0x004000, CRC(8780189f) SHA1(92378b0db561632b58a9b36a85f8fb00796198bb) ) ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ COMP( 1984, tk2000, 0, 0, tk2000, tk2000, tk2000_state, empty_init, "Microdigital", "TK2000 Color Computer", MACHINE_NOT_WORKING ) COMP( 1982, mpf2, tk2000, 0, tk2000, tk2000, tk2000_state, empty_init, "Multitech", "Microprofessor II", MACHINE_NOT_WORKING ) diff --git a/src/mame/applied/mbee.cpp b/src/mame/applied/mbee.cpp index 2ef77976964..7c864a175fd 100644 --- a/src/mame/applied/mbee.cpp +++ b/src/mame/applied/mbee.cpp @@ -126,7 +126,7 @@ from Brett Selwood and Andrew Davies. *******************************************************************************/ #include "emu.h" -#include "includes/mbee.h" +#include "mbee.h" #include "formats/mbee_cas.h" #include "sound/sn76496.h" #include "softlist_dev.h" diff --git a/src/mame/applied/mbee_m.cpp b/src/mame/applied/mbee_m.cpp index e59d8e22a48..b26b127d645 100644 --- a/src/mame/applied/mbee_m.cpp +++ b/src/mame/applied/mbee_m.cpp @@ -10,8 +10,9 @@ Rewritten by Robbbert (see notes in driver file). ****************************************************************************/ #include "emu.h" -#include "includes/mbee.h" -#include "machine/z80bin.h" +#include "mbee.h" + +#include "z80bin.h" /*********************************************************** diff --git a/src/mame/applied/mbee_v.cpp b/src/mame/applied/mbee_v.cpp index 7df6556201e..fafe7a2ca6a 100644 --- a/src/mame/applied/mbee_v.cpp +++ b/src/mame/applied/mbee_v.cpp @@ -36,7 +36,7 @@ See drivers\mbee.cpp for any issues. #include "emu.h" -#include "includes/mbee.h" +#include "mbee.h" WRITE_LINE_MEMBER( mbee_state::crtc_vs ) { diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt index 87d6da459c4..c621969a213 100644 --- a/src/mame/arcade.flt +++ b/src/mame/arcade.flt @@ -1,1568 +1,1577 @@ -1942.cpp -1943.cpp -1945kiii.cpp -20pacgal.cpp -24cdjuke.cpp -2mindril.cpp -30test.cpp -39in1.cpp -3do.cpp -3x3puzzl.cpp -40love.cpp -4enlinea.cpp -4enraya.cpp -4roses.cpp -5clown.cpp -8080bw.cpp -88games.cpp -a1supply.cpp -ace.cpp -acefruit.cpp -aces1.cpp -acesp.cpp -acommand.cpp -actfancr.cpp -adp.cpp -aeroboto.cpp -aerofgt.cpp -age_candy.cpp -airbustr.cpp -airraid.cpp -ajax.cpp -akkaarrh.cpp -albazc.cpp -albazg.cpp -aleck64.cpp -aleisttl.cpp -alg.cpp -alien.cpp -aliens.cpp -alinvade.cpp -allied.cpp -alpha68k.cpp -alpha68k_i.cpp -alpha68k_n.cpp -alvg.cpp -amaticmg.cpp -ambush.cpp -amerihok.cpp -ampoker2.cpp -amspdwy.cpp -amusco.cpp -anes.cpp -angelkds.cpp -appoooh.cpp -aquarium.cpp -arabian.cpp -arachnid.cpp -arcadecl.cpp -argus.cpp -aristmk4.cpp -aristmk5.cpp -aristmk6.cpp -arkanoid.cpp -armedf.cpp -arsystems.cpp -artmagic.cpp -ashnojoe.cpp -asterix.cpp -asteroid.cpp -astinvad.cpp -astrafr.cpp -astrcorp.cpp -astrocde.cpp -astrof.cpp -astropc.cpp -asuka.cpp -atarifb.cpp -atarig1.cpp -atarig42.cpp -atarigt.cpp -atarigx2.cpp -atarisy1.cpp -atarisy2.cpp -atarisy4.cpp -atarittl.cpp -atari_4x4.cpp -atari_s1.cpp -atari_s2.cpp -atetris.cpp -atlantis.cpp -atronic.cpp -attckufo.cpp -atvtrack.cpp -avalnche.cpp -avt.cpp -aztarac.cpp -backfire.cpp -badlands.cpp -badlands_ms.cpp -badlandsbl.cpp -bagman.cpp -bailey.cpp -balsente.cpp -bankp.cpp -banprestoms.cpp -baraduke.cpp -barata.cpp -barni.cpp -bartop52.cpp -batman.cpp -battlane.cpp -battlera.cpp -battlex.cpp -battlnts.cpp -bbusters.cpp -beaminv.cpp -beathead.cpp -beezer.cpp -belatra.cpp -berzerk.cpp -bestleag.cpp -bfcobra.cpp -bfmsys83.cpp -bfmsys85.cpp -bfm_ad5sw.cpp -bfm_sc1.cpp -bfm_sc2.cpp -bfm_sc4.cpp -bfm_sc5sw.cpp -bfm_swp.cpp -bgt.cpp -big10.cpp -bigevglf.cpp -bigkarnk_ms.cpp -bigstrkb.cpp -bingo.cpp -bingoc.cpp -bingoman.cpp -bingor.cpp -bingowav.cpp -bionicc.cpp -bishi.cpp -bking.cpp -blackt96.cpp -bladestl.cpp -blitz68k.cpp -blktiger.cpp -blktiger_ms.cpp -blmbycar.cpp -blockade.cpp -blockch.cpp -blockhl.cpp -blockout.cpp -blocktax.cpp -bloodbro.cpp -bloodbro_ms.cpp -blstroid.cpp -blueprnt.cpp -bmcbowl.cpp -bmcpokr.cpp -bnstars.cpp -bntyhunt.cpp -bogeyman.cpp -bombjack.cpp -boogwing.cpp -bottom9.cpp -bowltry.cpp -boxer.cpp -brkthru.cpp -bsktball.cpp -btime.cpp -btoads.cpp -bublbobl.cpp -buggychl.cpp -buster.cpp -bwidow.cpp -bwing.cpp -by17.cpp -by35.cpp -by6803.cpp -by68701.cpp -byvid.cpp -bzone.cpp -cabal.cpp -cabaret.cpp -calchase.cpp -calcune.cpp -calomega.cpp -calorie.cpp -canyon.cpp -capbowl.cpp -capcom.cpp -capr1.cpp -caprcyc.cpp -cardline.cpp -carjmbre.cpp -carpolo.cpp -carrera.cpp -castle.cpp -caswin.cpp -cave.cpp -cavepc.cpp -cb2001.cpp -cball.cpp -cbasebal.cpp -cbuster.cpp -ccastles.cpp -cchance.cpp -cchasm.cpp -cclimber.cpp -cdi.cpp -cedar_magnet.cpp -centiped.cpp -cesclass.cpp -cgang.cpp -chaknpop.cpp -cham24.cpp -chameleonrx1.cpp -champbas.cpp -champbwl.cpp -chanbara.cpp -chance32.cpp -changela.cpp -changyu.cpp -cheekyms.cpp -chexx.cpp -chicago.cpp -chihiro.cpp -chinagat.cpp -chinsan.cpp -chqflag.cpp -chsuper.cpp -cidelsa.cpp -cinemat.cpp -circus.cpp -circusc.cpp -cirsa820xxx.cpp -cirsa910510.cpp -cischeat.cpp -citycon.cpp -clayshoo.cpp -cliffhgr.cpp -cloak.cpp -cloud9.cpp -clowndwn.cpp -clpoker.cpp -clshroad.cpp -cmmb.cpp -cninja.cpp -cntsteer.cpp -cobra.cpp -cocoloco.cpp -coinmstr.cpp -coinmvga.cpp -cointek.cpp -combatsc.cpp -comebaby.cpp -commando.cpp -compgolf.cpp -compucranes.cpp -contra.cpp -coolpool.cpp -coolridr.cpp -cop01.cpp -cops.cpp -copsnrob.cpp -corona.cpp -cosmic.cpp -cosmicg.cpp -cosmos_playc8f.cpp -cowtipping.cpp -cps1.cpp -cps1bl_5205.cpp -cps1bl_pic.cpp -cps2.cpp -cps3.cpp -cpzodiac.cpp -crazybal.cpp -crbaloon.cpp -crgolf.cpp -crimfght.cpp -cromptons.cpp -crospang.cpp -crospuzl.cpp -crshrace.cpp -crystal.cpp -csplayh5.cpp -cswat.cpp -cubeqst.cpp -cubo.cpp -cucaracha.cpp -cultures.cpp -cupidon.cpp -cv1k.cpp -cvs.cpp -cwheel.cpp -cyberbal.cpp -cybertnk.cpp -cybstorm.cpp -cyclemb.cpp -d9final.cpp -dacholer.cpp -dai3wksi.cpp -dambustr.cpp -dangbar.cpp -darius.cpp -darkmist.cpp -darkseal.cpp -daryde.cpp -dassault.cpp -dblcrown.cpp -dblewing.cpp -dbz.cpp -dc_atomiswave.cpp -dcheese.cpp -dcon.cpp -dday.cpp -ddayjlc.cpp -ddealer.cpp -ddenlovr.cpp -ddragon.cpp -ddragon3.cpp -ddribble.cpp -ddz.cpp -deadang.cpp -dec0.cpp -dec8.cpp -deco156.cpp -deco32.cpp -decocass.cpp -deco_ld.cpp -deco_mlc.cpp -deniam.cpp -deshoros.cpp -destroyr.cpp -de_2.cpp -de_3.cpp -dfruit.cpp -dgpix.cpp -diamondking.cpp -dietgo.cpp -dinoking.cpp -discoboy.cpp -divebomb.cpp -diverboy.cpp -djboy.cpp -djmain.cpp -dkmb.cpp -dkong.cpp -dlair.cpp -dlair2.cpp -dmainevent.cpp -dmndrby.cpp -docastle.cpp -dogfgt.cpp -dominob.cpp -dooyong.cpp -dorachan.cpp -dotrikun.cpp -dragrace.cpp -drdmania.cpp -dreambal.cpp -dreamwld.cpp -drgnmst.cpp -dribling.cpp -drmicro.cpp -drtomy.cpp -drw80pkr.cpp -dunhuang.cpp -dwarfd.cpp -dynadice.cpp -dynamoah.cpp -dynax.cpp -dynduke.cpp -ecoinf1.cpp -ecoinf2.cpp -ecoinf3.cpp -ecoinfr.cpp -efdt.cpp -efg8080.cpp -egghunt.cpp -electra.cpp -embargo.cpp -enigma2.cpp -eolith.cpp -eolith16.cpp -epos.cpp -eprom.cpp -equites.cpp -ertictac.cpp -esd16.cpp -esh.cpp -espial.cpp -esripsys.cpp -ettrivia.cpp -exedexes.cpp -exerion.cpp -exidy.cpp -exidy440.cpp -exidyttl.cpp -expro02.cpp -exprraid.cpp -exterm.cpp -extrema.cpp -exzisus.cpp -ez2d.cpp -f-32.cpp -f1gp.cpp -falgas_m89.cpp -famibox.cpp -fantland.cpp -fastfred.cpp -fastinvaders.cpp -fastlane.cpp -fcombat.cpp -fcrash.cpp -feversoc.cpp -ffantasy_ms.cpp -fgoal.cpp -finalizr.cpp -fireball.cpp -firebeat.cpp -firefox.cpp -firetrap.cpp -firetrk.cpp -fitfight.cpp -flashbeats.cpp -flicker.cpp -flipjack.cpp -flkatck.cpp -flower.cpp -flstory.cpp -flyball.cpp -foodf.cpp -forte2.cpp -fortecar.cpp -freekick.cpp -freeway.cpp -frenzyxprss.cpp -fresh.cpp -fromanc2.cpp -fromance.cpp -fruitpc.cpp -funeball.cpp -fungames.cpp -funkball.cpp -funkybee.cpp -funkyjet.cpp -funtech.cpp -funworld.cpp -funybubl.cpp -fuukifg2.cpp -fuukifg3.cpp -fwheel.cpp -g627.cpp -gaelco.cpp -gaelco2.cpp -gaelco3d.cpp -gaelcof3.cpp -gaelcopc.cpp -gaiden.cpp -gal3.cpp -galaga.cpp -galastrm.cpp -galaxi.cpp -galaxia.cpp -galaxian.cpp -galaxian_rockclim.cpp -galaxold.cpp -galgame.cpp -galgames.cpp -galivan.cpp -galpani2.cpp -galpani3.cpp -galpanic.cpp -galpanic_ms.cpp -galspnbl.cpp -gambl186.cpp -gamemasters.cpp -gameplan.cpp -gammagic.cpp -gamtor.cpp -gaplus.cpp -gatron.cpp -gauntlet.cpp -gberet.cpp -gcpinbal.cpp -gei.cpp -getaway.cpp -gfamily.cpp -ggconnie.cpp -ghosteo.cpp -giclassic.cpp -gijoe.cpp -ginganin.cpp -gkigt.cpp -gladiatr.cpp -glass.cpp -globalfr.cpp -globalvr.cpp -gluck2.cpp -gng.cpp -go2000.cpp -goal92.cpp -goindol.cpp -goldart.cpp -goldngam.cpp -goldnpkr.cpp -goldstar.cpp -gomoku.cpp -good.cpp -goodejan.cpp -goori.cpp -gotcha.cpp -gottlieb.cpp -gotya.cpp -gpworld.cpp -gp_1.cpp -gp_2.cpp -gradius3.cpp -grchamp.cpp -gridlee.cpp -groundfx.cpp -gsspade.cpp -gstream.cpp -gstriker.cpp -gsword.cpp -gticlub.cpp -gts1.cpp -gts3.cpp -gts3a.cpp -gts80.cpp -gts80a.cpp -gts80b.cpp -guab.cpp -gumbo.cpp -gumrally.cpp -gunbustr.cpp -gundealr.cpp -gunpey.cpp -gunsmoke.cpp -gyruss.cpp -halleys.cpp -hanaawas.cpp -hankin.cpp -hapyfish.cpp -harddriv.cpp -hazelgr.cpp -hcastle.cpp -heromem.cpp -hexion.cpp -hideseek.cpp -higemaru.cpp -highvdeo.cpp -hikaru.cpp -himesiki.cpp -hitme.cpp -hitpoker.cpp -hnayayoi.cpp -hng64.cpp -hobbyplay.cpp -holeland.cpp -homedata.cpp -homerun.cpp -hornet.cpp -hotblock.cpp -hotchili.cpp -hotstuff.cpp -houseball.cpp -hshavoc.cpp -hvyunit.cpp -hyhoo.cpp -hyperspt.cpp -hyprduel.cpp -icecold.cpp -ice_bozopail.cpp -ice_hhhippos.cpp -ice_tbd.cpp -idsa.cpp -igs009.cpp -igs011.cpp -igs017.cpp -igspc.cpp -igspoker.cpp -igs_fear.cpp -igs_m027.cpp -igs_m036.cpp -ikki.cpp -imolagp.cpp -inder.cpp -inderp.cpp -instantm.cpp -intrscti.cpp -inufuku.cpp -invqix.cpp -iqblock.cpp -irobot.cpp -ironhors.cpp -island.cpp -istellar.cpp -istrebiteli.cpp -iteagle.cpp -itech32.cpp -itech8.cpp -itgambl2.cpp -itgambl3.cpp -itgamble.cpp -jack.cpp -jackal.cpp -jackie.cpp -jackpool.cpp -jackpot.cpp -jaguar.cpp -jailbrek.cpp -jalmah.cpp -jangou.cpp -jankenmn.cpp -jantotsu.cpp -jchan.cpp -jclub2.cpp -jedi.cpp -jeutel.cpp -joctronic.cpp -jokrwild.cpp -jollyjgr.cpp -jongkyo.cpp -joystand.cpp -jp.cpp -jpmimpct.cpp -jpmimpctsw.cpp -jpmmps.cpp -jpms80.cpp -jpmsru.cpp -jpmsys5.cpp -jpmsys5sw.cpp -jpmsys7.cpp -jrpacman.cpp -jubilee.cpp -jungleyo.cpp -junofrst.cpp -jvh.cpp -kaneko16.cpp -kangaroo.cpp -karnov.cpp -kas89.cpp -kchamp.cpp -kenseim.cpp -kickgoal.cpp -kikikai.cpp -kingdrby.cpp -kingobox.cpp -kingpin.cpp -kinst.cpp -kissproto.cpp -klax.cpp -kncljoe.cpp -koftball.cpp -koikoi.cpp -konamigq.cpp -konamigs.cpp -konamigv.cpp -konamigx.cpp -konamim2.cpp -konblands.cpp -konendev.cpp -kongs470.cpp -konmedal.cpp -konmedal020.cpp -konmedal68k.cpp -kontest.cpp -kopunch.cpp -kpontoon.cpp -kpython.cpp -krokha.cpp -ksayakyu.cpp -ksys573.cpp -kungfur.cpp -kurukuru.cpp -kyugo.cpp -labyrunr.cpp -ladybug.cpp -ladyfrog.cpp -lancelot.cpp -laserbas.cpp -laserbat.cpp -lasso.cpp -lastbank.cpp -lastduel.cpp -lastfght.cpp -lazercmd.cpp -laz_aftrshok.cpp -laz_ribrac.cpp -lbeach.cpp -lckydraw.cpp -legionna.cpp -leland.cpp -lemmings.cpp -lependu.cpp -lethal.cpp -lethalj.cpp -lgp.cpp -liberate.cpp -liberatr.cpp -limenko.cpp -lindbergh.cpp -littlerb.cpp -lkage.cpp -lockon.cpp -looping.cpp -lordgun.cpp -lsasquad.cpp -ltcasino.cpp -ltd.cpp -luckgrln.cpp -lucky37.cpp -lucky74.cpp -luckybal.cpp -lvcards.cpp -lwings.cpp -m10.cpp -m107.cpp -m14.cpp -m52.cpp -m57.cpp -m58.cpp -m62.cpp -m62_bkungfu.cpp -m63.cpp -m72.cpp -m79amb.cpp -m90.cpp -m92.cpp -macp.cpp -macrossp.cpp -macs.cpp -madalien.cpp -madmotor.cpp -magic10.cpp -magicard.cpp -magicfly.cpp -magictg.cpp -magmax.cpp -magreel.cpp -magtouch.cpp -mainevt.cpp -mainsnk.cpp -majorpkr.cpp -malzak.cpp -manohman.cpp -mappy.cpp -marblmd2.cpp -marineb.cpp -marinedt.cpp -mario.cpp -markham.cpp -marywu.cpp -mastboy.cpp -mastboyo.cpp -matmania.cpp -matrix.cpp -maxaflex.cpp -maygay1bsw.cpp -maygayep.cpp -maygayew.cpp -maygayv1.cpp -mazerbla.cpp -mcatadv.cpp -mcr.cpp -mcr3.cpp -mcr68.cpp -meadows.cpp -meadwttl.cpp -mechatt.cpp -mediagx.cpp -megadriv_acbl.cpp -megaphx.cpp -megaplay.cpp -megasys1.cpp -megatech.cpp -megazone.cpp -meijinsn.cpp -menghong.cpp -mephistp.cpp -merit.cpp -merit3xx.cpp -meritm.cpp -merits.cpp -meritsdx.cpp -mermaid.cpp -metalmx.cpp -metlclsh.cpp -metlfrzr.cpp -metro.cpp -meyc8080.cpp -meyc8088.cpp -mgames.cpp -mgavegas.cpp -mgolf.cpp -mhavoc.cpp -miconkit.cpp -micro3d.cpp -microdar.cpp -micropin.cpp -midas.cpp -midqslvr.cpp -midtunit.cpp -midvunit.cpp -midwunit.cpp -midxunit.cpp -midyunit.cpp -midzeus.cpp -mikie.cpp -mil4000.cpp -miniboy7.cpp -miniguay.cpp -minivadr.cpp -minivideo.cpp -mirage.cpp -mirax.cpp -missamer.cpp -missb2.cpp -missbamby.cpp -missile.cpp -mitchell.cpp -mjkjidai.cpp -mjsenpu.cpp -mjsister.cpp -mlanding.cpp -mmagic.cpp -mmm.cpp -model1.cpp -model2.cpp -model3.cpp -mogura.cpp -mole.cpp -momoko.cpp -monacogp.cpp -monzagp.cpp -moo.cpp -mosaic.cpp -mouser.cpp -mpu12wbk.cpp -mpu2.cpp -mpu3.cpp -mpu4avan.cpp -mpu4bwb.cpp -mpu4concept.cpp -mpu4crystal.cpp -mpu4dealem.cpp -mpu4empire.cpp -mpu4mdm.cpp -mpu4misc.cpp -mpu4mod2sw.cpp -mpu4mod4oki.cpp -mpu4mod4yam.cpp -mpu4plasma.cpp -mpu4union.cpp -mpu4unsorted.cpp -mpu4vid.cpp -mpu5sw.cpp -mquake.cpp -mrdo.cpp -mrflea.cpp -mrgame.cpp -mrjong.cpp -ms32.cpp -msisaac.cpp -mtouchxl.cpp -mugsmash.cpp -multfish.cpp -multfish_boot.cpp -multigam.cpp -munchmo.cpp -murogem.cpp -murogmbl.cpp -mustache.cpp -mw18w.cpp -mw8080bw.cpp -mwarr.cpp -mwsub.cpp -mystston.cpp -mystwarr.cpp -n8080.cpp -namcofl.cpp -namcona1.cpp -namconb1.cpp -namcond1.cpp -namcops2.cpp -namcos1.cpp -namcos10.cpp -namcos11.cpp -namcos12.cpp -namcos1b.cpp -namcos2.cpp -namcos21.cpp -namcos21_c67.cpp -namcos21_de.cpp -namcos22.cpp -namcos23.cpp -namcos86.cpp -naomi.cpp -naughtyb.cpp -nbmj8688.cpp -nbmj8891.cpp -nbmj8900.cpp -nbmj8991.cpp -nbmj9195.cpp -nemesis.cpp -neogeo.cpp -neomania.cpp -neopcb.cpp -neoprint.cpp -neptunp2.cpp -news.cpp -nexus3d.cpp -nibble.cpp -nichild.cpp -nightgal.cpp -nightmare.cpp -ninjakd2.cpp -ninjaw.cpp -nitedrvr.cpp -niyanpai.cpp -nmg5.cpp -nmk16.cpp -nmkmedal.cpp -norautp.cpp -notechan.cpp -nova2001.cpp -novadesitec_fr002.cpp -novadesitec_fr004.cpp -novadesitec_fr009.cpp -nsg6809.cpp -nsm.cpp -nsmpoker.cpp -nss.cpp -nwk-tr.cpp -nycaptor.cpp -nyny.cpp -odyssey.cpp -offtwall.cpp -ohmygod.cpp -ojankohs.cpp -olibochu.cpp -omegrace.cpp -oneshot.cpp -onetwo.cpp -opercoin.cpp -opwolf.cpp -orbit.cpp -othello.cpp -othunder.cpp -otomedius.cpp -overdriv.cpp -pachifev.cpp -pacland.cpp -pacman.cpp -pandoras.cpp -pangofun.cpp -panicr.cpp -paokaipc.cpp -paradise.cpp -paranoia.cpp -parodius.cpp -pasha2.cpp -pass.cpp -pastelg.cpp -patapata.cpp -pbaction.cpp -pcat_dyn.cpp -pcat_nit.cpp -pcktgal.cpp -pcxt.cpp -pengadvb.cpp -pengo.cpp -peplus.cpp -peyper.cpp -pgm.cpp -pgm2.cpp -pgm3.cpp -phoenix.cpp -photon.cpp -photon2.cpp -photoply.cpp -photoplys.cpp -photoplysx.cpp -piggypas.cpp -pinball2k.cpp -pingpong.cpp -pinkiri8.cpp -pipedrm.cpp -pipeline.cpp -pirates.cpp -piratesh.cpp -pitnrun.cpp -pkscram.cpp -pktgaldx.cpp -playch10.cpp -playmark.cpp -play_1.cpp -play_2.cpp -play_3.cpp -playcenter.cpp -plsonic4.cpp -pluto5.cpp -plygonet.cpp -pmc.cpp -pntnpuzl.cpp -pokechmp.cpp -poker72.cpp -pokerout.cpp -polepos.cpp -policetr.cpp -polyplay.cpp -pong.cpp -poolshrk.cpp -pooyan.cpp -popeye.cpp -popobear.cpp -popper.cpp -portrait.cpp -potgoldu.cpp -powerbal.cpp -powerins.cpp -ppmast93.cpp -prehisle.cpp -proconn.cpp -progolf.cpp -psattack.cpp -pse.cpp -psikyo.cpp -psikyo4.cpp -psikyosh.cpp -psrockman.cpp -psychic5.cpp -pturn.cpp -pubtimed.cpp -puckpkmn.cpp -punchout.cpp -pzletime.cpp -qdrmfgp.cpp -qix.cpp -quakeat.cpp -quantum.cpp -quasar.cpp -queen.cpp -quickpick5.cpp -quizdna.cpp -quizo.cpp -quizpani.cpp -quizpun2.cpp -quizshow.cpp -r2dtank.cpp -r2dx_v33.cpp -rabbit.cpp -radikaldarts.cpp -raiden.cpp -raiden2.cpp -raiden_ms.cpp -rallypnt.cpp -rallyx.cpp -rampart.cpp -ramtek.cpp -rastan.cpp -rastersp.cpp -rawthrillspc.cpp -rbisland.cpp -rbmk.cpp -rbowlorama.cpp -rcorsair.cpp -re900.cpp -realbrk.cpp -recel.cpp -redalert.cpp -redclash.cpp -relief.cpp -renegade.cpp -retofinv.cpp -rf51w14cg.cpp -rfslots8085.cpp -rfslotsmcs48.cpp -rfslotspcpent.cpp -rgum.cpp -rltennis.cpp -rmhaihai.cpp -rockrage.cpp -rocnrope.cpp -rohga.cpp -rollerg.cpp -rollext.cpp -rollrace.cpp -ron.cpp -rotaryf.cpp -roul.cpp -route16.cpp -rowamet.cpp -royalmah.cpp -rpunch.cpp -rulechan.cpp -runaway.cpp -rungun.cpp -s11.cpp -s11a.cpp -s11b.cpp -s11c.cpp -s3.cpp -s4.cpp -s6.cpp -s7.cpp -s8.cpp -s9.cpp -safarir.cpp -sam.cpp -sandscrp.cpp -sangho.cpp -sanremmg.cpp -sanremo.cpp -saturn.cpp -sauro.cpp -savquest.cpp -sbasketb.cpp -sbmjb.cpp -sbowling.cpp -sbrkout.cpp -sbugger.cpp -schexx4gen.cpp -schick.cpp -scm_500.cpp -scobra.cpp -scotrsht.cpp -scramble.cpp -scregg.cpp -scyclone.cpp -sderby.cpp -sderby2.cpp -seabattl.cpp -sealy.cpp -sealy_fr.cpp -seattle.cpp -segaatom.cpp -segac2.cpp -segacoin.cpp -segae.cpp -segafruit.cpp -segag80r.cpp -segag80v.cpp -segahang.cpp -segajw.cpp -segald.cpp -segaorun.cpp -segas16a.cpp -segas16b.cpp -segas16b_isgsm.cpp -segas18.cpp -segas18_astormbl.cpp -segas24.cpp -segas32.cpp -segasm1.cpp -segasp.cpp -segattl.cpp -segaufo.cpp -segaxbd.cpp -segaybd.cpp -seibucats.cpp -seibuspi.cpp -seicross.cpp -seicupbl.cpp -sengokmj.cpp -senjyo.cpp -seta.cpp -seta2.cpp -sf.cpp -sfbonus.cpp -sfcbox.cpp -sfkick.cpp -sg1000a.cpp -shadfrce.cpp -shangha3.cpp -shanghai.cpp -shangkid.cpp -shaolins.cpp -shisen.cpp -shootaway2.cpp -shootout.cpp -shougi.cpp -shtzone.cpp -shuuz.cpp -sidearms.cpp -sidepckt.cpp -sigma21.cpp -sigmab31.cpp -sigmab52.cpp -sigmab98.cpp -silkroad.cpp -silverball.cpp -silvmil.cpp -simpl156.cpp -simple_st0016.cpp -simpsons.cpp -sis630.cpp -skeetsht.cpp -skimaxx.cpp -skopro.cpp -skullxbo.cpp -skyarmy.cpp -skydiver.cpp -skyfox.cpp -skykid.cpp -skylncr.cpp -skyraid.cpp -slapfght.cpp -slapfght_ms.cpp -slapshot.cpp -sleic.cpp -sliver.cpp -slotcarn.cpp -smotor.cpp -smsmcorp.cpp -sms_bootleg.cpp -snesb.cpp -snesb51.cpp -snk.cpp -snk6502.cpp -snk68.cpp -snookr10.cpp -snowbros.cpp -solomon.cpp -sonson.cpp -sothello.cpp -spacefb.cpp -spaceg.cpp -spartanxtec.cpp -spbactn.cpp -spcforce.cpp -spdamjes.cpp -spdheat.cpp -spdodgeb.cpp -special_gambl.cpp -spectra.cpp -speedatk.cpp -speedbal.cpp -speedbsk.cpp -speedspn.cpp -speglsht.cpp -spiders.cpp -spinb.cpp -spirit76.cpp -splash.cpp -splash_ms.cpp -splus.cpp -spoker.cpp -spool99.cpp -sprcros2.cpp -sprint2.cpp -sprint4.cpp -sprint8.cpp -spy.cpp -spyhuntertec.cpp -srmp2.cpp -srmp5.cpp -srmp6.cpp -srumbler.cpp -ssfindo.cpp -sshangha.cpp -sshot.cpp -ssingles.cpp -sslam.cpp -ssozumo.cpp -sspeedr.cpp -ssrj.cpp -sstrangr.cpp -ssv.cpp -stactics.cpp -stadhero.cpp -starcrus.cpp -starfire.cpp -stargame.cpp -starrider.cpp -starshp1.cpp -startouch.cpp -starwars.cpp -statriv2.cpp -stellafr.cpp -stfight.cpp -stlforce.cpp -stop.cpp -strkzn.cpp -stuntair.cpp -stv.cpp -st_mp100.cpp -st_mp200.cpp -su2000.cpp -sub.cpp -subhuntr.cpp -subs.cpp -subsino.cpp -subsino2.cpp -summit.cpp -sumt8035.cpp -suna16.cpp -suna8.cpp -supbtime.cpp -supdrapo.cpp -supduck.cpp -superchs.cpp -supercrd.cpp -superdq.cpp -superga2.cpp -superqix.cpp -supertnk.cpp -superwng.cpp -suprgolf.cpp -suprloco.cpp -suprnova.cpp -suprridr.cpp -suprslam.cpp -supstarf.cpp -surpratk.cpp -sweetland.cpp -system1.cpp -system16.cpp -tagteam.cpp -tail2nos.cpp -taito.cpp -taitoair.cpp -taitogn.cpp -taitojc.cpp -taitopjc.cpp -taitosj.cpp -taitottl.cpp -taitotx.cpp -taitotz.cpp -taitowlf.cpp -taito_b.cpp -taito_f2.cpp -taito_f3.cpp -taito_h.cpp -taito_l.cpp -taito_o.cpp -taito_x.cpp -taito_z.cpp -tank8.cpp -tankbatt.cpp -tankbust.cpp -taotaido.cpp -tapatune.cpp -targeth.cpp -tasman.cpp -tatsumi.cpp -tattack.cpp -taxidriv.cpp -tbowl.cpp -tceptor.cpp -teamjocs.cpp -techno.cpp -tecmo.cpp -tecmo16.cpp -tecmosys.cpp -tecnodar.cpp -tehkanwc.cpp -tempest.cpp -terracre.cpp -tetrisp2.cpp -tgtpanic.cpp -thayers.cpp -thedealr.cpp -thedeep.cpp -thepit.cpp -thief.cpp -thoop2.cpp -thunderj.cpp -thunderx.cpp -tiamc1.cpp -tickee.cpp -tigeroad.cpp -timelimt.cpp -timeplt.cpp -timetrv.cpp -tmaster.cpp -tmmjprd.cpp -tmnt.cpp -tmspoker.cpp -tnzs.cpp -toaplan1.cpp -toaplan2.cpp -toki.cpp -toki_ms.cpp -tomcat.cpp -tomsadvs.cpp -tonton.cpp -toobin.cpp -topspeed.cpp -toratora.cpp -tourtabl.cpp -tourvis.cpp -toypop.cpp -tp84.cpp -trackfld.cpp -travrusa.cpp -triforce.cpp -triplhnt.cpp -triviaquiz.cpp -trivrus.cpp -truco.cpp -trucocl.cpp -truesys.cpp -trvmadns.cpp -trvquest.cpp -tryout.cpp -tsamurai.cpp -ttchamp.cpp -tubep.cpp -tugboat.cpp -tumbleb.cpp -tunhunt.cpp -turbo.cpp -turrett.cpp -tutankhm.cpp -tvcapcom.cpp -tvg01.cpp -twin16.cpp -twinbskt.cpp -twincobr.cpp -twinkle.cpp -twins.cpp -tx1.cpp -uapce.cpp -ultraman.cpp -ultratnk.cpp -ultrsprt.cpp -umipoker.cpp -undrfire.cpp -unianapc.cpp -unico.cpp -unkhorse.cpp -unkpoker.cpp -upscope.cpp -usbilliards.cpp -usgames.cpp -v0bowl.cpp -vamphalf.cpp -vaportra.cpp -vastar.cpp -vball.cpp -vcombat.cpp -vd.cpp -vectrex.cpp -vega.cpp -vegaeo.cpp -vegas.cpp -vendetta.cpp -vertigo.cpp -vicdual.cpp -victory.cpp -video21.cpp -videopin.cpp -videopkr.cpp -videosaa.cpp -vigilant.cpp -vindictr.cpp -viper.cpp -vlc.cpp -vlc34010.cpp -volfied.cpp -voyager.cpp -vp101.cpp -vpoker.cpp -vroulet.cpp -vsmjtria.cpp -vsnes.cpp -vulgus.cpp -wacky_gator.cpp -wallc.cpp -wardner.cpp -warpsped.cpp -warpwarp.cpp -warriorb.cpp -wc90.cpp -wc90b.cpp -wecleman.cpp -welltris.cpp -wgp.cpp -wheelfir.cpp -whitestar.cpp -wico.cpp -wildpkr.cpp -williams.cpp -winbingo.cpp -wink.cpp -wiping.cpp -witch.cpp -wiz.cpp -wmg.cpp -wms.cpp -wms_shuffle.cpp -wolfpack.cpp -wpc_95.cpp -wpc_an.cpp -wpc_dcs.cpp -wpc_dot.cpp -wpc_flip1.cpp -wpc_flip2.cpp -wpc_s.cpp -wrally.cpp -wwfsstar.cpp -wyvernf0.cpp -xain.cpp -xexex.cpp -xmen.cpp -xorworld.cpp -xtheball.cpp -xtom3d.cpp -xxmissio.cpp -xybots.cpp -xyonix.cpp -y2.cpp -yiear.cpp -yunsun16.cpp -yunsung8.cpp -yuvomz80.cpp -zac2650.cpp -zaccaria.cpp -zac_1.cpp -zac_2.cpp -zac_proto.cpp -zaxxon.cpp -zerozone.cpp -zn.cpp -zodiack.cpp -zpinball.cpp -zr107.cpp -zwackery.cpp +acorn/aristmk5.cpp +acorn/ertictac.cpp +acorn/ssfindo.cpp +adp/adp.cpp +adp/manohman.cpp +adp/stellafr.cpp +alba/albazg.cpp +alba/rmhaihai.cpp +alba/vsmjtria.cpp +alliedl/ace.cpp +alliedl/aleisttl.cpp +alliedl/clayshoo.cpp +alpha/alpha68k.cpp +alpha/alpha68k_i.cpp +alpha/alpha68k_n.cpp +alpha/champbas.cpp +alpha/equites.cpp +alpha/meijinsn.cpp +alpha/shougi.cpp +amiga/alg.cpp +amiga/arsystems.cpp +amiga/cubo.cpp +amiga/mquake.cpp +amiga/upscope.cpp +aristocr/aristmk4.cpp +aristocr/aristmk6.cpp +aristocr/caswin.cpp +ascii/big10.cpp +ascii/forte2.cpp +ascii/pengadvb.cpp +ascii/sangho.cpp +ascii/sfkick.cpp +atari/akkaarrh.cpp +atari/arcadecl.cpp +atari/asteroid.cpp +atari/atarifb.cpp +atari/atarig1.cpp +atari/atarig42.cpp +atari/atarigt.cpp +atari/atarigx2.cpp +atari/atarisy1.cpp +atari/atarisy2.cpp +atari/atarisy4.cpp +atari/atarittl.cpp +atari/atetris.cpp +atari/avalnche.cpp +atari/badlands.cpp +atari/badlands_ms.cpp +atari/badlandsbl.cpp +atari/bartop52.cpp +atari/batman.cpp +atari/beathead.cpp +atari/blstroid.cpp +atari/boxer.cpp +atari/bsktball.cpp +atari/bwidow.cpp +atari/bzone.cpp +atari/canyon.cpp +atari/cball.cpp +atari/ccastles.cpp +atari/centiped.cpp +atari/cloak.cpp +atari/cloud9.cpp +atari/cmmb.cpp +atari/cops.cpp +atari/copsnrob.cpp +atari/cyberbal.cpp +atari/cybstorm.cpp +atari/destroyr.cpp +atari/dragrace.cpp +atari/eprom.cpp +atari/firefox.cpp +atari/firetrk.cpp +atari/flyball.cpp +atari/foodf.cpp +atari/gauntlet.cpp +atari/gumrally.cpp +atari/harddriv.cpp +atari/irobot.cpp +atari/jaguar.cpp +atari/jedi.cpp +atari/klax.cpp +atari/liberatr.cpp +atari/marblmd2.cpp +atari/maxaflex.cpp +atari/mediagx.cpp +atari/metalmx.cpp +atari/mgolf.cpp +atari/mhavoc.cpp +atari/missile.cpp +atari/nitedrvr.cpp +atari/offtwall.cpp +atari/orbit.cpp +atari/pong.cpp +atari/poolshrk.cpp +atari/quantum.cpp +atari/quizshow.cpp +atari/rampart.cpp +atari/relief.cpp +atari/runaway.cpp +atari/sbrkout.cpp +atari/shuuz.cpp +atari/skullxbo.cpp +atari/skydiver.cpp +atari/skyraid.cpp +atari/sprint2.cpp +atari/sprint4.cpp +atari/sprint8.cpp +atari/starshp1.cpp +atari/starwars.cpp +atari/subs.cpp +atari/tank8.cpp +atari/tempest.cpp +atari/thunderj.cpp +atari/tomcat.cpp +atari/toobin.cpp +atari/tourtabl.cpp +atari/triplhnt.cpp +atari/tunhunt.cpp +atari/ultratnk.cpp +atari/videopin.cpp +atari/vindictr.cpp +atari/wolfpack.cpp +atari/xybots.cpp +atlus/bowltry.cpp +atlus/ohmygod.cpp +atlus/patapata.cpp +atlus/rallypnt.cpp +barcrest/mpu2.cpp +barcrest/mpu3.cpp +barcrest/mpu4avan.cpp +barcrest/mpu4bwb.cpp +barcrest/mpu4concept.cpp +barcrest/mpu4crystal.cpp +barcrest/mpu4dealem.cpp +barcrest/mpu4empire.cpp +barcrest/mpu4mdm.cpp +barcrest/mpu4misc.cpp +barcrest/mpu4mod2sw.cpp +barcrest/mpu4mod4oki.cpp +barcrest/mpu4mod4yam.cpp +barcrest/mpu4plasma.cpp +barcrest/mpu4union.cpp +barcrest/mpu4unsorted.cpp +barcrest/mpu4vid.cpp +barcrest/mpu5sw.cpp +bfm/bfcobra.cpp +bfm/bfm_ad5sw.cpp +bfm/bfm_sc1.cpp +bfm/bfm_sc2.cpp +bfm/bfm_sc4.cpp +bfm/bfm_sc5sw.cpp +bfm/bfm_swp.cpp +bfm/bfmsys83.cpp +bfm/bfmsys85.cpp +bfm/rastersp.cpp +bmc/bmcbowl.cpp +bmc/bmcpokr.cpp +bmc/koftball.cpp +bmc/popobear.cpp +capcom/1942.cpp +capcom/1943.cpp +capcom/alien.cpp +capcom/bionicc.cpp +capcom/blktiger.cpp +capcom/blktiger_ms.cpp +capcom/cbasebal.cpp +capcom/commando.cpp +capcom/cps1.cpp +capcom/cps1bl_5205.cpp +capcom/cps1bl_pic.cpp +capcom/cps2.cpp +capcom/cps3.cpp +capcom/egghunt.cpp +capcom/exedexes.cpp +capcom/fcrash.cpp +capcom/gng.cpp +capcom/gunsmoke.cpp +capcom/higemaru.cpp +capcom/instantm.cpp +capcom/kenseim.cpp +capcom/lastduel.cpp +capcom/lwings.cpp +capcom/mitchell.cpp +capcom/psrockman.cpp +capcom/sf.cpp +capcom/sidearms.cpp +capcom/sonson.cpp +capcom/srumbler.cpp +capcom/supduck.cpp +capcom/tigeroad.cpp +capcom/tvcapcom.cpp +capcom/vulgus.cpp +ces/cesclass.cpp +ces/galgames.cpp +cinemat/cchasm.cpp +cinemat/cinemat.cpp +cinemat/dlair.cpp +cinemat/dlair2.cpp +cinemat/embargo.cpp +cinemat/jack.cpp +cinemat/leland.cpp +cirsa/cirsa820xxx.cpp +cirsa/cirsa910510.cpp +cirsa/miniguay.cpp +cirsa/missbamby.cpp +cirsa/neptunp2.cpp +comad/funybubl.cpp +comad/galspnbl.cpp +comad/zerozone.cpp +cvs/cvs.cpp +cvs/galaxia.cpp +cvs/quasar.cpp +dataeast/actfancr.cpp +dataeast/astrof.cpp +dataeast/backfire.cpp +dataeast/battlera.cpp +dataeast/boogwing.cpp +dataeast/brkthru.cpp +dataeast/btime.cpp +dataeast/bwing.cpp +dataeast/cbuster.cpp +dataeast/chanbara.cpp +dataeast/cninja.cpp +dataeast/cntsteer.cpp +dataeast/compgolf.cpp +dataeast/darkseal.cpp +dataeast/dassault.cpp +dataeast/dblewing.cpp +dataeast/dec0.cpp +dataeast/dec8.cpp +dataeast/deco156.cpp +dataeast/deco32.cpp +dataeast/deco_ld.cpp +dataeast/deco_mlc.cpp +dataeast/decocass.cpp +dataeast/deshoros.cpp +dataeast/dietgo.cpp +dataeast/dreambal.cpp +dataeast/exprraid.cpp +dataeast/ffantasy_ms.cpp +dataeast/firetrap.cpp +dataeast/funkyjet.cpp +dataeast/karnov.cpp +dataeast/kchamp.cpp +dataeast/kingobox.cpp +dataeast/lemmings.cpp +dataeast/liberate.cpp +dataeast/madalien.cpp +dataeast/madmotor.cpp +dataeast/metlclsh.cpp +dataeast/mirage.cpp +dataeast/pcktgal.cpp +dataeast/pktgaldx.cpp +dataeast/progolf.cpp +dataeast/rohga.cpp +dataeast/scregg.cpp +dataeast/shootout.cpp +dataeast/sidepckt.cpp +dataeast/simpl156.cpp +dataeast/sshangha.cpp +dataeast/stadhero.cpp +dataeast/supbtime.cpp +dataeast/thedeep.cpp +dataeast/tryout.cpp +dataeast/tumbleb.cpp +dataeast/vaportra.cpp +dgrm/blackt96.cpp +dgrm/pokechmp.cpp +dooyong/dooyong.cpp +dooyong/gundealr.cpp +dynax/ddenlovr.cpp +dynax/dynax.cpp +dynax/hnayayoi.cpp +dynax/realbrk.cpp +dynax/royalmah.cpp +edevices/diverboy.cpp +edevices/fantland.cpp +edevices/mugsmash.cpp +edevices/mwarr.cpp +edevices/ppmast93.cpp +edevices/pzletime.cpp +edevices/stlforce.cpp +edevices/twins.cpp +efo/cedar_magnet.cpp +efo/cidelsa.cpp +efo/nightmare.cpp +eolith/eolith.cpp +eolith/eolith16.cpp +eolith/ghosteo.cpp +eolith/vegaeo.cpp +excelent/aquarium.cpp +excelent/d9final.cpp +excelent/dblcrown.cpp +excelent/gcpinbal.cpp +excelent/lastbank.cpp +excelent/witch.cpp +exidy/carpolo.cpp +exidy/circus.cpp +exidy/exidy.cpp +exidy/exidy440.cpp +exidy/exidyttl.cpp +exidy/starfire.cpp +exidy/vertigo.cpp +exidy/victory.cpp +f32/crospang.cpp +f32/f-32.cpp +f32/silvmil.cpp +funworld/4roses.cpp +funworld/funworld.cpp +funworld/photoply.cpp +funworld/photoplys.cpp +funworld/photoplysx.cpp +funworld/snookr10.cpp +fuuki/fuukifg2.cpp +fuuki/fuukifg3.cpp +gaelco/atvtrack.cpp +gaelco/bigkarnk_ms.cpp +gaelco/blmbycar.cpp +gaelco/gaelco.cpp +gaelco/gaelco2.cpp +gaelco/gaelco3d.cpp +gaelco/gaelcof3.cpp +gaelco/gaelcopc.cpp +gaelco/glass.cpp +gaelco/goldart.cpp +gaelco/mastboy.cpp +gaelco/mastboyo.cpp +gaelco/rollext.cpp +gaelco/splash.cpp +gaelco/splash_ms.cpp +gaelco/targeth.cpp +gaelco/thoop2.cpp +gaelco/wrally.cpp +gaelco/xorworld.cpp +galaxian/dambustr.cpp +galaxian/fastfred.cpp +galaxian/galaxian.cpp +galaxian/galaxian_rockclim.cpp +galaxian/galaxold.cpp +galaxian/scobra.cpp +galaxian/scramble.cpp +gameplan/enigma2.cpp +gameplan/gameplan.cpp +gameplan/toratora.cpp +gameplan/trvquest.cpp +gametron/gatron.cpp +gametron/gotya.cpp +gametron/sbugger.cpp +gottlieb/exterm.cpp +gottlieb/gottlieb.cpp +ibmpc/calchase.cpp +ibmpc/fruitpc.cpp +ibmpc/igspc.cpp +ibmpc/pangofun.cpp +ibmpc/paokaipc.cpp +ibmpc/pcat_dyn.cpp +ibmpc/pcat_nit.cpp +ibmpc/pcxt.cpp +ibmpc/quakeat.cpp +ibmpc/queen.cpp +ibmpc/sis630.cpp +igs/cabaret.cpp +igs/dunhuang.cpp +igs/funtech.cpp +igs/goldstar.cpp +igs/igs009.cpp +igs/igs011.cpp +igs/igs017.cpp +igs/igs_fear.cpp +igs/igs_m027.cpp +igs/igs_m036.cpp +igs/igspoker.cpp +igs/iqblock.cpp +igs/jackie.cpp +igs/lordgun.cpp +igs/pgm.cpp +igs/pgm2.cpp +igs/pgm3.cpp +igs/spoker.cpp +igt/drw80pkr.cpp +igt/gkigt.cpp +igt/peplus.cpp +igt/splus.cpp +igt/videopkr.cpp +irem/m10.cpp +irem/m107.cpp +irem/m14.cpp +irem/m52.cpp +irem/m57.cpp +irem/m58.cpp +irem/m62.cpp +irem/m62_bkungfu.cpp +irem/m63.cpp +irem/m72.cpp +irem/m90.cpp +irem/m92.cpp +irem/olibochu.cpp +irem/redalert.cpp +irem/shisen.cpp +irem/spartanxtec.cpp +irem/travrusa.cpp +irem/vigilant.cpp +itech/capbowl.cpp +itech/iteagle.cpp +itech/itech32.cpp +itech/itech8.cpp +jaleco/acommand.cpp +jaleco/aeroboto.cpp +jaleco/argus.cpp +jaleco/bestleag.cpp +jaleco/bigstrkb.cpp +jaleco/blueprnt.cpp +jaleco/bnstars.cpp +jaleco/cischeat.cpp +jaleco/citycon.cpp +jaleco/ddayjlc.cpp +jaleco/exerion.cpp +jaleco/fcombat.cpp +jaleco/ginganin.cpp +jaleco/homerun.cpp +jaleco/jalmah.cpp +jaleco/megasys1.cpp +jaleco/momoko.cpp +jaleco/ms32.cpp +jaleco/psychic5.cpp +jaleco/pturn.cpp +jaleco/skyfox.cpp +jaleco/tetrisp2.cpp +jpm/guab.cpp +jpm/jpmimpct.cpp +jpm/jpmimpctsw.cpp +jpm/jpmmps.cpp +jpm/jpms80.cpp +jpm/jpmsru.cpp +jpm/jpmsys5.cpp +jpm/jpmsys5sw.cpp +jpm/jpmsys7.cpp +jpm/pluto5.cpp +kaneko/airbustr.cpp +kaneko/djboy.cpp +kaneko/expro02.cpp +kaneko/galpani2.cpp +kaneko/galpani3.cpp +kaneko/galpanic.cpp +kaneko/galpanic_ms.cpp +kaneko/hvyunit.cpp +kaneko/jchan.cpp +kaneko/kaneko16.cpp +kaneko/sandscrp.cpp +kaneko/snowbros.cpp +kaneko/suprnova.cpp +kiwako/jongkyo.cpp +kiwako/koikoi.cpp +kiwako/mrjong.cpp +konami/88games.cpp +konami/ajax.cpp +konami/aliens.cpp +konami/asterix.cpp +konami/battlnts.cpp +konami/bishi.cpp +konami/bladestl.cpp +konami/blockhl.cpp +konami/bottom9.cpp +konami/chqflag.cpp +konami/circusc.cpp +konami/cobra.cpp +konami/combatsc.cpp +konami/contra.cpp +konami/crimfght.cpp +konami/dbz.cpp +konami/ddribble.cpp +konami/divebomb.cpp +konami/djmain.cpp +konami/fastlane.cpp +konami/finalizr.cpp +konami/firebeat.cpp +konami/flkatck.cpp +konami/gberet.cpp +konami/giclassic.cpp +konami/gijoe.cpp +konami/gradius3.cpp +konami/gticlub.cpp +konami/gyruss.cpp +konami/hcastle.cpp +konami/hexion.cpp +konami/hornet.cpp +konami/hyperspt.cpp +konami/ironhors.cpp +konami/jackal.cpp +konami/jailbrek.cpp +konami/junofrst.cpp +konami/konamigq.cpp +konami/konamigs.cpp +konami/konamigv.cpp +konami/konamigx.cpp +konami/konamim2.cpp +konami/konblands.cpp +konami/konendev.cpp +konami/kongs470.cpp +konami/konmedal.cpp +konami/konmedal020.cpp +konami/konmedal68k.cpp +konami/kontest.cpp +konami/kpontoon.cpp +konami/kpython.cpp +konami/ksys573.cpp +konami/labyrunr.cpp +konami/lethal.cpp +konami/mainevt.cpp +konami/megazone.cpp +konami/mikie.cpp +konami/mogura.cpp +konami/moo.cpp +konami/mystwarr.cpp +konami/nemesis.cpp +konami/nwk-tr.cpp +konami/otomedius.cpp +konami/overdriv.cpp +konami/pandoras.cpp +konami/parodius.cpp +konami/pingpong.cpp +konami/piratesh.cpp +konami/plygonet.cpp +konami/pooyan.cpp +konami/qdrmfgp.cpp +konami/quickpick5.cpp +konami/rockrage.cpp +konami/rocnrope.cpp +konami/rollerg.cpp +konami/rungun.cpp +konami/sbasketb.cpp +konami/scotrsht.cpp +konami/shaolins.cpp +konami/simpsons.cpp +konami/spy.cpp +konami/surpratk.cpp +konami/tasman.cpp +konami/tgtpanic.cpp +konami/thunderx.cpp +konami/timeplt.cpp +konami/tmnt.cpp +konami/tp84.cpp +konami/trackfld.cpp +konami/tutankhm.cpp +konami/twin16.cpp +konami/twinkle.cpp +konami/ultraman.cpp +konami/ultrsprt.cpp +konami/vendetta.cpp +konami/viper.cpp +konami/wecleman.cpp +konami/xexex.cpp +konami/xmen.cpp +konami/yiear.cpp +konami/zr107.cpp +matic/barata.cpp +maygay/maygay1bsw.cpp +maygay/maygayep.cpp +maygay/maygayew.cpp +maygay/maygayv1.cpp +maygay/mmm.cpp +meadows/lazercmd.cpp +meadows/meadows.cpp +meadows/meadwttl.cpp +meadows/warpsped.cpp +merit/merit.cpp +merit/merit3xx.cpp +merit/meritm.cpp +merit/merits.cpp +merit/meritsdx.cpp +merit/mgames.cpp +merit/mtouchxl.cpp +merit/pubtimed.cpp +metro/hyprduel.cpp +metro/metro.cpp +metro/rabbit.cpp +metro/tmmjprd.cpp +midcoin/24cdjuke.cpp +midcoin/wallc.cpp +midcoin/wink.cpp +midw8080/8080bw.cpp +midw8080/m79amb.cpp +midw8080/mw8080bw.cpp +midw8080/rotaryf.cpp +midway/astrocde.cpp +midway/atlantis.cpp +midway/balsente.cpp +midway/gridlee.cpp +midway/mcr.cpp +midway/mcr3.cpp +midway/mcr68.cpp +midway/midqslvr.cpp +midway/midtunit.cpp +midway/midvunit.cpp +midway/midwunit.cpp +midway/midxunit.cpp +midway/midyunit.cpp +midway/midzeus.cpp +midway/mw18w.cpp +midway/mwsub.cpp +midway/omegrace.cpp +midway/pinball2k.cpp +midway/seattle.cpp +midway/spyhuntertec.cpp +midway/sspeedr.cpp +midway/starrider.cpp +midway/tmaster.cpp +midway/vegas.cpp +midway/williams.cpp +midway/wmg.cpp +midway/zwackery.cpp +misc/39in1.cpp +misc/3do.cpp +misc/4enlinea.cpp +misc/4enraya.cpp +misc/5clown.cpp +misc/a1supply.cpp +misc/acefruit.cpp +misc/aces1.cpp +misc/acesp.cpp +misc/age_candy.cpp +misc/alinvade.cpp +misc/amaticmg.cpp +misc/amerihok.cpp +misc/ampoker2.cpp +misc/amspdwy.cpp +misc/amusco.cpp +misc/anes.cpp +misc/arachnid.cpp +misc/artmagic.cpp +misc/astrafr.cpp +misc/astrcorp.cpp +misc/astropc.cpp +misc/atronic.cpp +misc/attckufo.cpp +misc/avt.cpp +misc/aztarac.cpp +misc/bailey.cpp +misc/beaminv.cpp +misc/beezer.cpp +misc/belatra.cpp +misc/bgt.cpp +misc/bingoman.cpp +misc/bingor.cpp +misc/blitz68k.cpp +misc/blocktax.cpp +misc/bntyhunt.cpp +misc/buster.cpp +misc/calomega.cpp +misc/cardline.cpp +misc/carrera.cpp +misc/castle.cpp +misc/cave.cpp +misc/cavepc.cpp +misc/cb2001.cpp +misc/cdi.cpp +misc/chameleonrx1.cpp +misc/chance32.cpp +misc/changyu.cpp +misc/chexx.cpp +misc/chicago.cpp +misc/chsuper.cpp +misc/clowndwn.cpp +misc/clpoker.cpp +misc/cocoloco.cpp +misc/coinmstr.cpp +misc/coinmvga.cpp +misc/cointek.cpp +misc/comebaby.cpp +misc/compucranes.cpp +misc/coolpool.cpp +misc/corona.cpp +misc/cosmos_playc8f.cpp +misc/cowtipping.cpp +misc/crazybal.cpp +misc/cromptons.cpp +misc/crospuzl.cpp +misc/crystal.cpp +misc/cubeqst.cpp +misc/cupidon.cpp +misc/cv1k.cpp +misc/cwheel.cpp +misc/cybertnk.cpp +misc/daryde.cpp +misc/dcheese.cpp +misc/ddz.cpp +misc/dfruit.cpp +misc/dgpix.cpp +misc/diamondking.cpp +misc/discoboy.cpp +misc/dmainevent.cpp +misc/dominob.cpp +misc/dorachan.cpp +misc/drdmania.cpp +misc/dreamwld.cpp +misc/dwarfd.cpp +misc/dynadice.cpp +misc/dynamoah.cpp +misc/ecoinf1.cpp +misc/ecoinf2.cpp +misc/ecoinf3.cpp +misc/ecoinfr.cpp +misc/efdt.cpp +misc/efg8080.cpp +misc/electra.cpp +misc/epos.cpp +misc/esd16.cpp +misc/esh.cpp +misc/esripsys.cpp +misc/ettrivia.cpp +misc/extrema.cpp +misc/ez2d.cpp +misc/falgas_m89.cpp +misc/fastinvaders.cpp +misc/fireball.cpp +misc/flipjack.cpp +misc/flower.cpp +misc/fortecar.cpp +misc/freekick.cpp +misc/freeway.cpp +misc/frenzyxprss.cpp +misc/fresh.cpp +misc/funeball.cpp +misc/fungames.cpp +misc/funkball.cpp +misc/galaxi.cpp +misc/galgame.cpp +misc/gambl186.cpp +misc/gamemasters.cpp +misc/gammagic.cpp +misc/gamtor.cpp +misc/gei.cpp +misc/gfamily.cpp +misc/globalfr.cpp +misc/globalvr.cpp +misc/gluck2.cpp +misc/goldngam.cpp +misc/goldnpkr.cpp +misc/good.cpp +misc/gotcha.cpp +misc/gsspade.cpp +misc/gumbo.cpp +misc/gunpey.cpp +misc/hapyfish.cpp +misc/hazelgr.cpp +misc/hideseek.cpp +misc/highvdeo.cpp +misc/hitpoker.cpp +misc/hobbyplay.cpp +misc/homedata.cpp +misc/hotblock.cpp +misc/hotchili.cpp +misc/hotstuff.cpp +misc/houseball.cpp +misc/ice_bozopail.cpp +misc/ice_hhhippos.cpp +misc/ice_tbd.cpp +misc/imolagp.cpp +misc/intrscti.cpp +misc/island.cpp +misc/istellar.cpp +misc/itgambl2.cpp +misc/itgambl3.cpp +misc/itgamble.cpp +misc/jackpool.cpp +misc/jackpot.cpp +misc/jankenmn.cpp +misc/jokrwild.cpp +misc/joystand.cpp +misc/jubilee.cpp +misc/jungleyo.cpp +misc/kas89.cpp +misc/kingpin.cpp +misc/krokha.cpp +misc/kurukuru.cpp +misc/kyugo.cpp +misc/ladyfrog.cpp +misc/laserbas.cpp +misc/laz_aftrshok.cpp +misc/laz_ribrac.cpp +misc/lependu.cpp +misc/lethalj.cpp +misc/limenko.cpp +misc/ltcasino.cpp +misc/luckybal.cpp +misc/magic10.cpp +misc/magicard.cpp +misc/magicfly.cpp +misc/magictg.cpp +misc/magreel.cpp +misc/magtouch.cpp +misc/majorpkr.cpp +misc/malzak.cpp +misc/marywu.cpp +misc/matrix.cpp +misc/mcatadv.cpp +misc/megaphx.cpp +misc/menghong.cpp +misc/meyc8080.cpp +misc/meyc8088.cpp +misc/mgavegas.cpp +misc/micro3d.cpp +misc/microdar.cpp +misc/mil4000.cpp +misc/miniboy7.cpp +misc/minivideo.cpp +misc/mirax.cpp +misc/mjsenpu.cpp +misc/mole.cpp +misc/mosaic.cpp +misc/mpu12wbk.cpp +misc/multfish.cpp +misc/multfish_boot.cpp +misc/murogem.cpp +misc/murogmbl.cpp +misc/neomania.cpp +misc/neoprint.cpp +misc/news.cpp +misc/nexus3d.cpp +misc/nibble.cpp +misc/norautp.cpp +misc/notechan.cpp +misc/nsg6809.cpp +misc/nsmpoker.cpp +misc/odyssey.cpp +misc/oneshot.cpp +misc/onetwo.cpp +misc/opercoin.cpp +misc/othello.cpp +misc/pachifev.cpp +misc/pasha2.cpp +misc/pass.cpp +misc/photon.cpp +misc/photon2.cpp +misc/piggypas.cpp +misc/pipeline.cpp +misc/pkscram.cpp +misc/playcenter.cpp +misc/plsonic4.cpp +misc/pmc.cpp +misc/pntnpuzl.cpp +misc/poker72.cpp +misc/pokerout.cpp +misc/policetr.cpp +misc/polyplay.cpp +misc/potgoldu.cpp +misc/proconn.cpp +misc/psattack.cpp +misc/pse.cpp +misc/quizo.cpp +misc/quizpun2.cpp +misc/radikaldarts.cpp +misc/rawthrillspc.cpp +misc/rbmk.cpp +misc/rcorsair.cpp +misc/re900.cpp +misc/rf51w14cg.cpp +misc/rfslots8085.cpp +misc/rfslotsmcs48.cpp +misc/rfslotspcpent.cpp +misc/rgum.cpp +misc/roul.cpp +misc/rulechan.cpp +misc/sanremmg.cpp +misc/sanremo.cpp +misc/savquest.cpp +misc/schexx4gen.cpp +misc/scm_500.cpp +misc/sealy.cpp +misc/sealy_fr.cpp +misc/sfbonus.cpp +misc/shangkid.cpp +misc/silverball.cpp +misc/skeetsht.cpp +misc/skimaxx.cpp +misc/skopro.cpp +misc/skyarmy.cpp +misc/skylncr.cpp +misc/sliver.cpp +misc/smotor.cpp +misc/smsmcorp.cpp +misc/sothello.cpp +misc/spdamjes.cpp +misc/special_gambl.cpp +misc/spool99.cpp +misc/sprcros2.cpp +misc/ssingles.cpp +misc/sstrangr.cpp +misc/startouch.cpp +misc/statriv2.cpp +misc/stop.cpp +misc/strkzn.cpp +misc/stuntair.cpp +misc/su2000.cpp +misc/summit.cpp +misc/sumt8035.cpp +misc/supercrd.cpp +misc/superga2.cpp +misc/supertnk.cpp +misc/tapatune.cpp +misc/tattack.cpp +misc/taxidriv.cpp +misc/teamjocs.cpp +misc/tecnodar.cpp +misc/thayers.cpp +misc/tickee.cpp +misc/tmspoker.cpp +misc/tomsadvs.cpp +misc/triviaquiz.cpp +misc/trivrus.cpp +misc/truco.cpp +misc/trucocl.cpp +misc/truesys.cpp +misc/trvmadns.cpp +misc/ttchamp.cpp +misc/tugboat.cpp +misc/tvg01.cpp +misc/twinbskt.cpp +misc/umipoker.cpp +misc/unkhorse.cpp +misc/unkpoker.cpp +misc/usbilliards.cpp +misc/usgames.cpp +misc/v0bowl.cpp +misc/vamphalf.cpp +misc/vcombat.cpp +misc/vectrex.cpp +misc/video21.cpp +misc/videosaa.cpp +misc/vlc.cpp +misc/vlc34010.cpp +misc/voyager.cpp +misc/vp101.cpp +misc/vpoker.cpp +misc/vroulet.cpp +misc/wildpkr.cpp +misc/winbingo.cpp +misc/wms.cpp +misc/xtom3d.cpp +misc/xyonix.cpp +misc/yuvomz80.cpp +mr/dribling.cpp +mr/sshot.cpp +mr/subhuntr.cpp +namco/20pacgal.cpp +namco/30test.cpp +namco/baraduke.cpp +namco/cgang.cpp +namco/cswat.cpp +namco/dangbar.cpp +namco/dkmb.cpp +namco/gal3.cpp +namco/galaga.cpp +namco/gaplus.cpp +namco/kungfur.cpp +namco/mappy.cpp +namco/namcofl.cpp +namco/namcona1.cpp +namco/namconb1.cpp +namco/namcond1.cpp +namco/namcops2.cpp +namco/namcos1.cpp +namco/namcos10.cpp +namco/namcos11.cpp +namco/namcos12.cpp +namco/namcos1b.cpp +namco/namcos2.cpp +namco/namcos21.cpp +namco/namcos21_c67.cpp +namco/namcos21_de.cpp +namco/namcos22.cpp +namco/namcos23.cpp +namco/namcos86.cpp +namco/pacland.cpp +namco/polepos.cpp +namco/rallyx.cpp +namco/rbowlorama.cpp +namco/shootaway2.cpp +namco/skykid.cpp +namco/sweetland.cpp +namco/tankbatt.cpp +namco/tceptor.cpp +namco/toypop.cpp +namco/turrett.cpp +namco/wacky_gator.cpp +namco/warpwarp.cpp +nasco/crgolf.cpp +nasco/himesiki.cpp +nasco/suprgolf.cpp +neogeo/midas.cpp +neogeo/neogeo.cpp +neogeo/neopcb.cpp +nichibut/armedf.cpp +nichibut/cclimber.cpp +nichibut/clshroad.cpp +nichibut/cop01.cpp +nichibut/csplayh5.cpp +nichibut/dacholer.cpp +nichibut/galivan.cpp +nichibut/gomoku.cpp +nichibut/hyhoo.cpp +nichibut/jangou.cpp +nichibut/magmax.cpp +nichibut/nbmj8688.cpp +nichibut/nbmj8891.cpp +nichibut/nbmj8900.cpp +nichibut/nbmj8991.cpp +nichibut/nbmj9195.cpp +nichibut/nichild.cpp +nichibut/nightgal.cpp +nichibut/niyanpai.cpp +nichibut/pastelg.cpp +nichibut/seicross.cpp +nichibut/terracre.cpp +nichibut/tubep.cpp +nichibut/wiping.cpp +nintendo/aleck64.cpp +nintendo/cham24.cpp +nintendo/dkong.cpp +nintendo/famibox.cpp +nintendo/mario.cpp +nintendo/mmagic.cpp +nintendo/multigam.cpp +nintendo/n8080.cpp +nintendo/nss.cpp +nintendo/playch10.cpp +nintendo/popeye.cpp +nintendo/punchout.cpp +nintendo/sfcbox.cpp +nintendo/snesb.cpp +nintendo/snesb51.cpp +nintendo/spacefb.cpp +nintendo/vsnes.cpp +nix/fitfight.cpp +nix/pirates.cpp +nmk/cultures.cpp +nmk/ddealer.cpp +nmk/macrossp.cpp +nmk/nmk16.cpp +nmk/nmkmedal.cpp +nmk/powerins.cpp +nmk/quizdna.cpp +nmk/quizpani.cpp +novadesitec/novadesitec_fr002.cpp +novadesitec/novadesitec_fr004.cpp +novadesitec/novadesitec_fr009.cpp +olympia/dday.cpp +olympia/lbeach.cpp +olympia/monzagp.cpp +olympia/portrait.cpp +olympia/vega.cpp +omori/battlex.cpp +omori/carjmbre.cpp +omori/popper.cpp +omori/spaceg.cpp +orca/espial.cpp +orca/funkybee.cpp +orca/marineb.cpp +orca/vastar.cpp +orca/zodiack.cpp +pacific/mrflea.cpp +pacific/thief.cpp +pacman/jrpacman.cpp +pacman/pacman.cpp +pacman/pengo.cpp +pacman/schick.cpp +pce/ggconnie.cpp +pce/paranoia.cpp +pce/tourvis.cpp +pce/uapce.cpp +phoenix/naughtyb.cpp +phoenix/phoenix.cpp +phoenix/safarir.cpp +pinball/allied.cpp +pinball/alvg.cpp +pinball/atari_4x4.cpp +pinball/atari_s1.cpp +pinball/atari_s2.cpp +pinball/barni.cpp +pinball/bingo.cpp +pinball/by17.cpp +pinball/by35.cpp +pinball/by6803.cpp +pinball/by68701.cpp +pinball/byvid.cpp +pinball/capcom.cpp +pinball/de_2.cpp +pinball/de_3.cpp +pinball/flicker.cpp +pinball/g627.cpp +pinball/gp_1.cpp +pinball/gp_2.cpp +pinball/gts1.cpp +pinball/gts3.cpp +pinball/gts3a.cpp +pinball/gts80.cpp +pinball/gts80a.cpp +pinball/gts80b.cpp +pinball/hankin.cpp +pinball/icecold.cpp +pinball/idsa.cpp +pinball/inder.cpp +pinball/inderp.cpp +pinball/jeutel.cpp +pinball/joctronic.cpp +pinball/jp.cpp +pinball/jvh.cpp +pinball/kissproto.cpp +pinball/lancelot.cpp +pinball/lckydraw.cpp +pinball/ltd.cpp +pinball/macp.cpp +pinball/mephistp.cpp +pinball/micropin.cpp +pinball/missamer.cpp +pinball/mrgame.cpp +pinball/nsm.cpp +pinball/peyper.cpp +pinball/play_1.cpp +pinball/play_2.cpp +pinball/play_3.cpp +pinball/recel.cpp +pinball/rowamet.cpp +pinball/s11.cpp +pinball/s11a.cpp +pinball/s11b.cpp +pinball/s11c.cpp +pinball/s3.cpp +pinball/s4.cpp +pinball/s6.cpp +pinball/s7.cpp +pinball/s8.cpp +pinball/s9.cpp +pinball/sam.cpp +pinball/sleic.cpp +pinball/spectra.cpp +pinball/spinb.cpp +pinball/spirit76.cpp +pinball/st_mp100.cpp +pinball/st_mp200.cpp +pinball/stargame.cpp +pinball/supstarf.cpp +pinball/taito.cpp +pinball/techno.cpp +pinball/vd.cpp +pinball/whitestar.cpp +pinball/wico.cpp +pinball/wms_shuffle.cpp +pinball/wpc_95.cpp +pinball/wpc_an.cpp +pinball/wpc_dcs.cpp +pinball/wpc_dot.cpp +pinball/wpc_flip1.cpp +pinball/wpc_flip2.cpp +pinball/wpc_s.cpp +pinball/zac_1.cpp +pinball/zac_2.cpp +pinball/zac_proto.cpp +pinball/zpinball.cpp +playmark/drtomy.cpp +playmark/playmark.cpp +playmark/powerbal.cpp +playmark/sderby.cpp +playmark/sslam.cpp +promat/1945kiii.cpp +promat/3x3puzzl.cpp +promat/gstream.cpp +psikyo/psikyo.cpp +psikyo/psikyo4.cpp +psikyo/psikyosh.cpp +ramtek/hitme.cpp +ramtek/ramtek.cpp +ramtek/starcrus.cpp +rare/btoads.cpp +rare/kinst.cpp +rare/xtheball.cpp +sanritsu/appoooh.cpp +sanritsu/bankp.cpp +sanritsu/chinsan.cpp +sanritsu/drmicro.cpp +sanritsu/jantotsu.cpp +sanritsu/mermaid.cpp +sanritsu/mjkjidai.cpp +sanritsu/ron.cpp +sega/angelkds.cpp +sega/bingoc.cpp +sega/blockade.cpp +sega/calcune.cpp +sega/calorie.cpp +sega/chihiro.cpp +sega/coolridr.cpp +sega/dc_atomiswave.cpp +sega/deniam.cpp +sega/dotrikun.cpp +sega/flashbeats.cpp +sega/fwheel.cpp +sega/gpworld.cpp +sega/hikaru.cpp +sega/hshavoc.cpp +sega/kopunch.cpp +sega/lindbergh.cpp +sega/megadriv_acbl.cpp +sega/megaplay.cpp +sega/megatech.cpp +sega/model1.cpp +sega/model2.cpp +sega/model3.cpp +sega/monacogp.cpp +sega/naomi.cpp +sega/puckpkmn.cpp +sega/saturn.cpp +sega/sderby2.cpp +sega/segaatom.cpp +sega/segac2.cpp +sega/segacoin.cpp +sega/segae.cpp +sega/segafruit.cpp +sega/segag80r.cpp +sega/segag80v.cpp +sega/segahang.cpp +sega/segajw.cpp +sega/segald.cpp +sega/segaorun.cpp +sega/segas16a.cpp +sega/segas16b.cpp +sega/segas16b_isgsm.cpp +sega/segas18.cpp +sega/segas18_astormbl.cpp +sega/segas24.cpp +sega/segas32.cpp +sega/segasm1.cpp +sega/segasp.cpp +sega/segattl.cpp +sega/segaufo.cpp +sega/segaxbd.cpp +sega/segaybd.cpp +sega/sg1000a.cpp +sega/shtzone.cpp +sega/sms_bootleg.cpp +sega/speedbsk.cpp +sega/stactics.cpp +sega/stv.cpp +sega/suprloco.cpp +sega/system1.cpp +sega/system16.cpp +sega/timetrv.cpp +sega/triforce.cpp +sega/turbo.cpp +sega/vicdual.cpp +sega/y2.cpp +sega/zaxxon.cpp +seibu/airraid.cpp +seibu/banprestoms.cpp +seibu/bloodbro.cpp +seibu/bloodbro_ms.cpp +seibu/cabal.cpp +seibu/darkmist.cpp +seibu/dcon.cpp +seibu/deadang.cpp +seibu/dynduke.cpp +seibu/feversoc.cpp +seibu/goal92.cpp +seibu/goodejan.cpp +seibu/kncljoe.cpp +seibu/legionna.cpp +seibu/metlfrzr.cpp +seibu/mustache.cpp +seibu/panicr.cpp +seibu/r2dx_v33.cpp +seibu/raiden.cpp +seibu/raiden2.cpp +seibu/raiden_ms.cpp +seibu/seibucats.cpp +seibu/seibuspi.cpp +seibu/seicupbl.cpp +seibu/sengokmj.cpp +seibu/stfight.cpp +seibu/toki.cpp +seibu/toki_ms.cpp +seibu/wiz.cpp +seta/albazc.cpp +seta/hanaawas.cpp +seta/jclub2.cpp +seta/macs.cpp +seta/seta.cpp +seta/seta2.cpp +seta/simple_st0016.cpp +seta/speedatk.cpp +seta/speglsht.cpp +seta/srmp2.cpp +seta/srmp5.cpp +seta/srmp6.cpp +seta/ssv.cpp +seta/thedealr.cpp +sigma/nyny.cpp +sigma/r2dtank.cpp +sigma/sigma21.cpp +sigma/sigmab31.cpp +sigma/sigmab52.cpp +sigma/sigmab98.cpp +sigma/spiders.cpp +sigma/sub.cpp +snk/bbusters.cpp +snk/dmndrby.cpp +snk/hng64.cpp +snk/lasso.cpp +snk/mainsnk.cpp +snk/mechatt.cpp +snk/miconkit.cpp +snk/munchmo.cpp +snk/prehisle.cpp +snk/snk.cpp +snk/snk6502.cpp +snk/snk68.cpp +sony/taitogn.cpp +sony/zn.cpp +stern/astinvad.cpp +stern/berzerk.cpp +stern/cliffhgr.cpp +stern/mazerbla.cpp +stern/supdrapo.cpp +subsino/lastfght.cpp +subsino/subsino.cpp +subsino/subsino2.cpp +suna/go2000.cpp +suna/goindol.cpp +suna/suna16.cpp +suna/suna8.cpp +sunelect/arabian.cpp +sunelect/blockch.cpp +sunelect/dai3wksi.cpp +sunelect/ikki.cpp +sunelect/kangaroo.cpp +sunelect/markham.cpp +sunelect/route16.cpp +sunelect/shangha3.cpp +sunelect/shanghai.cpp +sunelect/tonton.cpp +taito/2mindril.cpp +taito/40love.cpp +taito/arkanoid.cpp +taito/ashnojoe.cpp +taito/asuka.cpp +taito/bigevglf.cpp +taito/bingowav.cpp +taito/bking.cpp +taito/bublbobl.cpp +taito/buggychl.cpp +taito/capr1.cpp +taito/caprcyc.cpp +taito/cchance.cpp +taito/chaknpop.cpp +taito/champbwl.cpp +taito/changela.cpp +taito/cpzodiac.cpp +taito/crbaloon.cpp +taito/cucaracha.cpp +taito/cyclemb.cpp +taito/darius.cpp +taito/dinoking.cpp +taito/exzisus.cpp +taito/fgoal.cpp +taito/flstory.cpp +taito/galastrm.cpp +taito/gladiatr.cpp +taito/grchamp.cpp +taito/groundfx.cpp +taito/gsword.cpp +taito/gunbustr.cpp +taito/halleys.cpp +taito/heromem.cpp +taito/invqix.cpp +taito/jollyjgr.cpp +taito/kikikai.cpp +taito/ksayakyu.cpp +taito/lgp.cpp +taito/lkage.cpp +taito/lsasquad.cpp +taito/marinedt.cpp +taito/minivadr.cpp +taito/missb2.cpp +taito/mlanding.cpp +taito/msisaac.cpp +taito/ninjaw.cpp +taito/nycaptor.cpp +taito/opwolf.cpp +taito/othunder.cpp +taito/pitnrun.cpp +taito/qix.cpp +taito/rastan.cpp +taito/rbisland.cpp +taito/retofinv.cpp +taito/rollrace.cpp +taito/sbmjb.cpp +taito/sbowling.cpp +taito/scyclone.cpp +taito/slapshot.cpp +taito/spdheat.cpp +taito/ssrj.cpp +taito/superchs.cpp +taito/superqix.cpp +taito/taito_b.cpp +taito/taito_f2.cpp +taito/taito_f3.cpp +taito/taito_h.cpp +taito/taito_l.cpp +taito/taito_o.cpp +taito/taito_x.cpp +taito/taito_z.cpp +taito/taitoair.cpp +taito/taitojc.cpp +taito/taitopjc.cpp +taito/taitosj.cpp +taito/taitottl.cpp +taito/taitotx.cpp +taito/taitotz.cpp +taito/taitowlf.cpp +taito/tnzs.cpp +taito/topspeed.cpp +taito/tsamurai.cpp +taito/undrfire.cpp +taito/volfied.cpp +taito/warriorb.cpp +taito/wgp.cpp +taito/wyvernf0.cpp +tatsumi/kingdrby.cpp +tatsumi/lockon.cpp +tatsumi/tatsumi.cpp +tatsumi/tx1.cpp +tch/kickgoal.cpp +tch/littlerb.cpp +tch/rltennis.cpp +tch/speedspn.cpp +tch/wheelfir.cpp +tecfri/ambush.cpp +tecfri/holeland.cpp +tecfri/sauro.cpp +tecfri/speedbal.cpp +technos/battlane.cpp +technos/blockout.cpp +technos/bogeyman.cpp +technos/chinagat.cpp +technos/ddragon.cpp +technos/ddragon3.cpp +technos/dogfgt.cpp +technos/matmania.cpp +technos/mystston.cpp +technos/renegade.cpp +technos/shadfrce.cpp +technos/spdodgeb.cpp +technos/ssozumo.cpp +technos/tagteam.cpp +technos/vball.cpp +technos/wwfsstar.cpp +technos/xain.cpp +tehkan/bombjack.cpp +tehkan/gaiden.cpp +tehkan/lvcards.cpp +tehkan/pbaction.cpp +tehkan/senjyo.cpp +tehkan/solomon.cpp +tehkan/spbactn.cpp +tehkan/tbowl.cpp +tehkan/tecmo.cpp +tehkan/tecmo16.cpp +tehkan/tecmosys.cpp +tehkan/tehkanwc.cpp +tehkan/wc90.cpp +tehkan/wc90b.cpp +terminal/istrebiteli.cpp +terminal/tiamc1.cpp +thepit/thepit.cpp +thepit/timelimt.cpp +toaplan/mjsister.cpp +toaplan/slapfght.cpp +toaplan/slapfght_ms.cpp +toaplan/toaplan1.cpp +toaplan/toaplan2.cpp +toaplan/twincobr.cpp +toaplan/wardner.cpp +unico/drgnmst.cpp +unico/goori.cpp +unico/silkroad.cpp +unico/unianapc.cpp +unico/unico.cpp +univers/cheekyms.cpp +univers/cosmic.cpp +univers/cosmicg.cpp +univers/docastle.cpp +univers/getaway.cpp +univers/ladybug.cpp +univers/mrdo.cpp +univers/redclash.cpp +univers/superdq.cpp +upl/mouser.cpp +upl/ninjakd2.cpp +upl/nova2001.cpp +upl/xxmissio.cpp +valadon/bagman.cpp +valadon/tankbust.cpp +venture/looping.cpp +venture/spcforce.cpp +venture/suprridr.cpp +vsystem/aerofgt.cpp +vsystem/crshrace.cpp +vsystem/f1gp.cpp +vsystem/fromanc2.cpp +vsystem/fromance.cpp +vsystem/gstriker.cpp +vsystem/inufuku.cpp +vsystem/ojankohs.cpp +vsystem/pipedrm.cpp +vsystem/rpunch.cpp +vsystem/suprslam.cpp +vsystem/tail2nos.cpp +vsystem/taotaido.cpp +vsystem/welltris.cpp +wing/luckgrln.cpp +wing/lucky37.cpp +wing/lucky74.cpp +wing/pinkiri8.cpp +wing/slotcarn.cpp +wing/superwng.cpp +yunsung/nmg5.cpp +yunsung/paradise.cpp +yunsung/yunsun16.cpp +yunsung/yunsung8.cpp +zaccaria/laserbat.cpp +zaccaria/seabattl.cpp +zaccaria/zac2650.cpp +zaccaria/zaccaria.cpp + //exceptions + to add - to remove from imported list -//3do.cpp + +//misc/3do.cpp -3do -3do_m2 -3do_pal -//cdi.cpp + +//misc/cdi.cpp -cdi490a -cdi910 -cdimono1 -cdimono2 -//cps1.cpp + +//capcom/cps1.cpp -sfach -sfzbch -sfzch -wofch -//jaguar.cpp + +//atari/jaguar.cpp -jaguar -jaguarcd -//neogeo.cpp + +//neogeo/neogeo.cpp -aes -ng_mv1 -ng_mv1f -ng_mv1fz -ng_mv2f -ng_mv4f -//saturn.cpp + +//sega/saturn.cpp -hisaturn -saturn -saturneu -saturnjp -saturnkr -vsaturn -//sis630.cpp + +//ibmpc/sis630.cpp -shutms11 -//vectrex.cpp + +//misc/vectrex.cpp -vectrex diff --git a/src/mame/arcadia/arcadia.cpp b/src/mame/arcadia/arcadia.cpp index 7710621eacc..e8bcd875cc1 100644 --- a/src/mame/arcadia/arcadia.cpp +++ b/src/mame/arcadia/arcadia.cpp @@ -120,7 +120,7 @@ anything in hardware. No cartridge has been found which uses them. ******************************************************************************/ #include "emu.h" -#include "includes/arcadia.h" +#include "arcadia.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/arcadia/arcadia.h b/src/mame/arcadia/arcadia.h index 83ed1c0c3e1..033c4c92290 100644 --- a/src/mame/arcadia/arcadia.h +++ b/src/mame/arcadia/arcadia.h @@ -11,7 +11,7 @@ #pragma once #include "cpu/s2650/s2650.h" -#include "audio/arcadia.h" +#include "arcadia_a.h" #include "bus/arcadia/slot.h" #include "bus/arcadia/rom.h" diff --git a/src/mame/arcadia/arcadia_a.cpp b/src/mame/arcadia/arcadia_a.cpp index 46c7c9ee64f..f4498fc18b7 100644 --- a/src/mame/arcadia/arcadia_a.cpp +++ b/src/mame/arcadia/arcadia_a.cpp @@ -13,7 +13,7 @@ #include "emu.h" -#include "includes/arcadia.h" +#include "arcadia.h" //known UVI audio clocks #define UVI_NTSC 15734 diff --git a/src/mame/arcadia/arcadia_v.cpp b/src/mame/arcadia/arcadia_v.cpp index cbfa442bc13..4701360672f 100644 --- a/src/mame/arcadia/arcadia_v.cpp +++ b/src/mame/arcadia/arcadia_v.cpp @@ -223,7 +223,7 @@ collisions, one is for sprite/sprite collisions. #include "emu.h" -#include "includes/arcadia.h" +#include "arcadia.h" static const uint8_t chars[0x40][8]={ // read from the screen generated from a palladium diff --git a/src/mame/ascii/msx.cpp b/src/mame/ascii/msx.cpp index 6eb2a89b626..330597b7f83 100644 --- a/src/mame/ascii/msx.cpp +++ b/src/mame/ascii/msx.cpp @@ -528,12 +528,12 @@ PCB Layouts missing #include "emu.h" #include "cpu/z80/r800.h" -#include "includes/msx.h" +#include "msx.h" #include "formats/dsk_dsk.h" #include "formats/dmk_dsk.h" -#include "machine/msx_matsushita.h" -#include "machine/msx_s1985.h" -#include "machine/msx_systemflags.h" +#include "msx_matsushita.h" +#include "msx_s1985.h" +#include "msx_systemflags.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/ascii/msx.h b/src/mame/ascii/msx.h index a94d877886f..57c1a853465 100644 --- a/src/mame/ascii/msx.h +++ b/src/mame/ascii/msx.h @@ -37,7 +37,7 @@ #include "bus/msx_slot/fs4600.h" #include "bus/msx_slot/panasonic08.h" #include "bus/msx_slot/sony08.h" -#include "machine/msx_switched.h" +#include "msx_switched.h" #define TC8521_TAG "rtc" diff --git a/src/mame/ascii/msx_m.cpp b/src/mame/ascii/msx_m.cpp index 8d9df9f7aa8..e39279fd820 100644 --- a/src/mame/ascii/msx_m.cpp +++ b/src/mame/ascii/msx_m.cpp @@ -14,7 +14,7 @@ */ #include "emu.h" -#include "includes/msx.h" +#include "msx.h" #define VERBOSE 0 diff --git a/src/mame/atari/a2600.cpp b/src/mame/atari/a2600.cpp index 8ede846dad3..bb97f149e5e 100644 --- a/src/mame/atari/a2600.cpp +++ b/src/mame/atari/a2600.cpp @@ -87,7 +87,7 @@ E1 Prog ROM 42 DEMON/DIAMOND (CX2615) #include "emu.h" -#include "includes/a2600.h" +#include "a2600.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/atari/a2600.h b/src/mame/atari/a2600.h index 28d2a9b2521..0b571542df4 100644 --- a/src/mame/atari/a2600.h +++ b/src/mame/atari/a2600.h @@ -22,7 +22,7 @@ #include "bus/vcs_ctrl/ctrl.h" #include "cpu/m6502/m6507.h" #include "sound/tiaintf.h" -#include "video/tia.h" +#include "tia.h" #define USE_NEW_RIOT 0 diff --git a/src/mame/atari/a7800.cpp b/src/mame/atari/a7800.cpp index a1aa0ad908b..e2b06af8e0c 100644 --- a/src/mame/atari/a7800.cpp +++ b/src/mame/atari/a7800.cpp @@ -102,7 +102,7 @@ #include "sound/tiaintf.h" #include "sound/tiasound.h" #include "machine/mos6530n.h" -#include "video/maria.h" +#include "maria.h" #include "bus/a7800/a78_carts.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/atari/antic.h b/src/mame/atari/antic.h index 982ad8dfa1d..ac16dac1411 100644 --- a/src/mame/atari/antic.h +++ b/src/mame/atari/antic.h @@ -15,7 +15,7 @@ #pragma once -#include "video/gtia.h" +#include "gtia.h" class antic_device : public device_t, public device_video_interface diff --git a/src/mame/atari/arcadecl.cpp b/src/mame/atari/arcadecl.cpp index dc7ecc5c9ae..d4ef61f5cc5 100644 --- a/src/mame/atari/arcadecl.cpp +++ b/src/mame/atari/arcadecl.cpp @@ -69,12 +69,12 @@ #include "emu.h" -#include "includes/arcadecl.h" +#include "arcadecl.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" #include "machine/watchdog.h" #include "sound/okim6295.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "emupal.h" #include "speaker.h" diff --git a/src/mame/atari/arcadecl.h b/src/mame/atari/arcadecl.h index bd692281c2d..822efebd53f 100644 --- a/src/mame/atari/arcadecl.h +++ b/src/mame/atari/arcadecl.h @@ -11,7 +11,7 @@ #pragma once #include "machine/timer.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "sound/okim6295.h" #include "screen.h" diff --git a/src/mame/atari/arcadecl_v.cpp b/src/mame/atari/arcadecl_v.cpp index aa8ec654940..ec45440c59f 100644 --- a/src/mame/atari/arcadecl_v.cpp +++ b/src/mame/atari/arcadecl_v.cpp @@ -11,8 +11,8 @@ #include "emu.h" -#include "video/atarimo.h" -#include "includes/arcadecl.h" +#include "atarimo.h" +#include "arcadecl.h" /************************************* * diff --git a/src/mame/atari/asteroid.cpp b/src/mame/atari/asteroid.cpp index dec5afb13d2..04efc06c9c9 100644 --- a/src/mame/atari/asteroid.cpp +++ b/src/mame/atari/asteroid.cpp @@ -246,22 +246,121 @@ NOTE: Previous program versions, for the second line would only show 4 digits. ***************************************************************************/ #include "emu.h" -#include "includes/asteroid.h" +#include "asteroid.h" + #include "cpu/m6502/m6502.h" #include "machine/74259.h" #include "machine/output_latch.h" #include "machine/rescap.h" #include "machine/watchdog.h" +#include "sound/discrete.h" #include "sound/pokey.h" -#include "video/avgdvg.h" #include "video/vector.h" + #include "screen.h" +#include "speaker.h" #include "astdelux.lh" #define MASTER_CLOCK (XTAL(12'096'000)) #define CLOCK_3KHZ (MASTER_CLOCK / 4096) + +/************************************************************************/ +/* Lunar Lander Sound System Analog emulation by K.Wilkins Nov 2000 */ +/* Questions/Suggestions to mame@esplexo.co.uk */ +/************************************************************************/ +#define LLANDER_TONE3K_EN NODE_01 +#define LLANDER_TONE6K_EN NODE_02 +#define LLANDER_THRUST_DATA NODE_03 +#define LLANDER_EXPLOD_EN NODE_04 +#define LLANDER_NOISE_RESET NODE_05 + +#define LLANDER_NOISE NODE_10 +#define LLANDER_TONE_3K_SND NODE_11 +#define LLANDER_TONE_6K_SND NODE_12 +#define LLANDER_THRUST_EXPLOD_SND NODE_13 + +static const discrete_lfsr_desc llander_lfsr = +{ + DISC_CLK_IS_FREQ, + 16, /* Bit Length */ + 0, /* Reset Value */ + 6, /* Use Bit 6 as XOR input 0 */ + 14, /* Use Bit 14 as XOR input 1 */ + DISC_LFSR_XNOR, /* Feedback stage1 is inverted XOR */ + DISC_LFSR_IN0, /* Feedback stage2 is just stage 1 output external feed not used */ + DISC_LFSR_REPLACE, /* Feedback stage3 replaces the shifted register contents */ + 0x000001, /* Everything is shifted into the first bit only */ + 0, /* Output not inverted */ + 14 /* Output bit */ +}; + +static DISCRETE_SOUND_START(llander_discrete) + /************************************************/ + /* llander Effects Relataive Gain Table */ + /* */ + /* Effect V-ampIn Gain ratio Relative */ + /* Tone3k 4 10/390 9.2 */ + /* Tone6k 4 10/390 9.2 */ + /* Explode 3.8 10/6.8*2 1000.0 */ + /* Thrust 3.8 10/6.8*2 600.0 */ + /* NOTE: Thrust gain has to be tweaked, due to */ + /* the filter stage. */ + /************************************************/ + + /* NODE GAIN OFFSET INIT */ + DISCRETE_INPUTX_DATA(LLANDER_THRUST_DATA, 600.0/7*7.6, 0, 0) + DISCRETE_INPUT_LOGIC(LLANDER_TONE3K_EN) + DISCRETE_INPUT_LOGIC(LLANDER_TONE6K_EN) + DISCRETE_INPUT_LOGIC(LLANDER_EXPLOD_EN) + DISCRETE_INPUT_PULSE(LLANDER_NOISE_RESET, 1) + + DISCRETE_LFSR_NOISE(NODE_20, 1, LLANDER_NOISE_RESET, 12000, 1, 0, 0, &llander_lfsr) // 12KHz Noise source for thrust + DISCRETE_RCFILTER(LLANDER_NOISE, NODE_20, 2247, 1e-6) + + DISCRETE_SQUAREWFIX(LLANDER_TONE_3K_SND, LLANDER_TONE3K_EN, 3000, 9.2, 50, 0, 0) // 3KHz + + DISCRETE_SQUAREWFIX(LLANDER_TONE_6K_SND, LLANDER_TONE6K_EN, 6000, 9.2, 50, 0, 0) // 6KHz + + DISCRETE_MULTIPLY(NODE_30, LLANDER_NOISE, LLANDER_THRUST_DATA) // Mix in 12KHz Noise source for thrust + /* TBD - replace this line with a Sallen-Key Bandpass macro */ + DISCRETE_FILTER2(NODE_31, 1, NODE_30, 89.5, (1.0 / 7.6), DISC_FILTER_BANDPASS) + DISCRETE_MULTIPLY(NODE_32, NODE_30, 1000.0/600.0) // Explode adds original noise source onto filtered source + DISCRETE_ONOFF(NODE_33, LLANDER_EXPLOD_EN, NODE_32) + DISCRETE_ADDER2(NODE_34, 1, NODE_31, NODE_33) + /* TBD - replace this line with a Active Lowpass macro */ + DISCRETE_FILTER1(LLANDER_THRUST_EXPLOD_SND, 1, NODE_34, 560, DISC_FILTER_LOWPASS) + + DISCRETE_ADDER3(NODE_90, 1, LLANDER_TONE_3K_SND, LLANDER_TONE_6K_SND, LLANDER_THRUST_EXPLOD_SND) // Mix all four sound sources + DISCRETE_GAIN(NODE_91, NODE_90, 65534.0/(9.2+9.2+600+1000)) + + DISCRETE_OUTPUT(NODE_90, 65534.0/(9.2+9.2+600+1000)) // Take the output from the mixer +DISCRETE_SOUND_END + +void asteroid_state::llander_snd_reset_w(uint8_t data) +{ + /* Resets the LFSR that is used for the white noise generator */ + m_discrete->write(LLANDER_NOISE_RESET, 0); /* Reset */ +} + +void asteroid_state::llander_sounds_w(uint8_t data) +{ + m_discrete->write(LLANDER_THRUST_DATA, data & 0x07); /* Thrust volume */ + m_discrete->write(LLANDER_TONE3K_EN, data & 0x10); /* Tone 3KHz enable */ + m_discrete->write(LLANDER_TONE6K_EN, data & 0x20); /* Tone 6KHz enable */ + m_discrete->write(LLANDER_EXPLOD_EN, data & 0x08); /* Explosion */ +} + + +void asteroid_state::llander_sound(machine_config &config) +{ + SPEAKER(config, "mono").front_center(); + + DISCRETE(config, m_discrete, llander_discrete).add_route(ALL_OUTPUTS, "mono", 1.0); +} + + /************************************* * * Coin counters diff --git a/src/mame/atari/asteroid.h b/src/mame/atari/asteroid.h index bfe0c1e4c22..6cb800bbe6e 100644 --- a/src/mame/atari/asteroid.h +++ b/src/mame/atari/asteroid.h @@ -5,11 +5,16 @@ Atari Asteroids hardware *************************************************************************/ +#ifndef MAME_ATARI_ASTEROID_H +#define MAME_ATARI_ASTEROID_H + +#pragma once + +#include "avgdvg.h" -#include "sound/discrete.h" -#include "video/avgdvg.h" #include "machine/74153.h" #include "machine/er2055.h" +#include "sound/discrete.h" class asteroid_state : public driver_device { @@ -86,3 +91,5 @@ public: void asteroid_map(address_map &map); void llander_map(address_map &map); }; + +#endif // MAME_ATARI_ASTEROID_H diff --git a/src/mame/atari/asteroid_a.cpp b/src/mame/atari/asteroid_a.cpp index ba965b77f4f..a7c496806f3 100644 --- a/src/mame/atari/asteroid_a.cpp +++ b/src/mame/atari/asteroid_a.cpp @@ -7,7 +7,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/asteroid.h" +#include "asteroid.h" #include "machine/74259.h" #include "speaker.h" diff --git a/src/mame/atari/asteroid_m.cpp b/src/mame/atari/asteroid_m.cpp index 72744e42110..c4ec5c1ea67 100644 --- a/src/mame/atari/asteroid_m.cpp +++ b/src/mame/atari/asteroid_m.cpp @@ -10,8 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/avgdvg.h" -#include "includes/asteroid.h" +#include "asteroid.h" INTERRUPT_GEN_MEMBER(asteroid_state::asteroid_interrupt) diff --git a/src/mame/atari/atari400.cpp b/src/mame/atari/atari400.cpp index 166d4ad1aca..aceb310a217 100644 --- a/src/mame/atari/atari400.cpp +++ b/src/mame/atari/atari400.cpp @@ -40,13 +40,13 @@ ******************************************************************************/ #include "emu.h" -#include "includes/atari400.h" +#include "atari400.h" #include "cpu/m6502/m6502.h" #include "machine/6821pia.h" #include "machine/ram.h" #include "machine/timer.h" -#include "machine/atarifdc.h" +#include "atarifdc.h" #include "sound/dac.h" #include "sound/pokey.h" diff --git a/src/mame/atari/atari400.h b/src/mame/atari/atari400.h index 4dc151c9f5c..4282d1cea83 100644 --- a/src/mame/atari/atari400.h +++ b/src/mame/atari/atari400.h @@ -19,8 +19,8 @@ #include "machine/6821pia.h" #include "machine/ram.h" #include "sound/pokey.h" -#include "video/antic.h" -#include "video/gtia.h" +#include "antic.h" +#include "gtia.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/atari/atari400_m.cpp b/src/mame/atari/atari400_m.cpp index d911c1c2ce5..7433971dd09 100644 --- a/src/mame/atari/atari400_m.cpp +++ b/src/mame/atari/atari400_m.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/atari400.h" +#include "atari400.h" #include "sound/pokey.h" #define VERBOSE_POKEY 1 diff --git a/src/mame/atari/atari400_v.cpp b/src/mame/atari/atari400_v.cpp index c17cf89c625..d3f1a15b148 100644 --- a/src/mame/atari/atari400_v.cpp +++ b/src/mame/atari/atari400_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/atari400.h" +#include "atari400.h" #include "screen.h" //#define VERBOSE 1 diff --git a/src/mame/atari/atarifb.cpp b/src/mame/atari/atarifb.cpp index 68baedc3217..b2e53e57627 100644 --- a/src/mame/atari/atarifb.cpp +++ b/src/mame/atari/atarifb.cpp @@ -95,7 +95,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/atarifb.h" +#include "atarifb.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/atarifb_a.cpp b/src/mame/atari/atarifb_a.cpp index 1a241886671..4a53bb3ee5a 100644 --- a/src/mame/atari/atarifb_a.cpp +++ b/src/mame/atari/atarifb_a.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/atarifb.h" +#include "atarifb.h" #include "sound/discrete.h" diff --git a/src/mame/atari/atarifb_m.cpp b/src/mame/atari/atarifb_m.cpp index 5c31ae29be3..3054835ca31 100644 --- a/src/mame/atari/atarifb_m.cpp +++ b/src/mame/atari/atarifb_m.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/atarifb.h" +#include "atarifb.h" #include "sound/discrete.h" diff --git a/src/mame/atari/atarifb_v.cpp b/src/mame/atari/atarifb_v.cpp index 3cd865fb978..83d7ff969c0 100644 --- a/src/mame/atari/atarifb_v.cpp +++ b/src/mame/atari/atarifb_v.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/atarifb.h" +#include "atarifb.h" /************************************* diff --git a/src/mame/atari/atarig1.cpp b/src/mame/atari/atarig1.cpp index a00a7ed7c04..f5ed25a8688 100644 --- a/src/mame/atari/atarig1.cpp +++ b/src/mame/atari/atarig1.cpp @@ -21,7 +21,7 @@ #include "emu.h" -#include "includes/atarig1.h" +#include "atarig1.h" #include "machine/eeprompar.h" #include "machine/watchdog.h" #include "emupal.h" diff --git a/src/mame/atari/atarig1.h b/src/mame/atari/atarig1.h index 9da6c518bbd..59bc8400ff4 100644 --- a/src/mame/atari/atarig1.h +++ b/src/mame/atari/atarig1.h @@ -6,12 +6,12 @@ *************************************************************************/ -#include "audio/atarijsa.h" +#include "atarijsa.h" #include "machine/adc0808.h" -#include "machine/atarigen.h" -#include "machine/slapstic.h" +#include "atarigen.h" +#include "slapstic.h" #include "machine/timer.h" -#include "video/atarirle.h" +#include "atarirle.h" #include "cpu/m68000/m68000.h" #include "tilemap.h" diff --git a/src/mame/atari/atarig1_v.cpp b/src/mame/atari/atarig1_v.cpp index 50fd1319a3a..8534bf4a867 100644 --- a/src/mame/atari/atarig1_v.cpp +++ b/src/mame/atari/atarig1_v.cpp @@ -7,8 +7,8 @@ ****************************************************************************/ #include "emu.h" -#include "video/atarirle.h" -#include "includes/atarig1.h" +#include "atarirle.h" +#include "atarig1.h" diff --git a/src/mame/atari/atarig42.cpp b/src/mame/atari/atarig42.cpp index a23009e6c8f..897df598da6 100644 --- a/src/mame/atari/atarig42.cpp +++ b/src/mame/atari/atarig42.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/atarig42.h" +#include "atarig42.h" #include "machine/eeprompar.h" #include "machine/watchdog.h" #include "emupal.h" diff --git a/src/mame/atari/atarig42.h b/src/mame/atari/atarig42.h index 9af7b12aa51..da94495a84f 100644 --- a/src/mame/atari/atarig42.h +++ b/src/mame/atari/atarig42.h @@ -10,12 +10,12 @@ #pragma once -#include "audio/atarijsa.h" -#include "machine/atarigen.h" -#include "video/atarirle.h" +#include "atarijsa.h" +#include "atarigen.h" +#include "atarirle.h" #include "cpu/m68000/m68000.h" #include "machine/adc0808.h" -#include "machine/asic65.h" +#include "asic65.h" #include "machine/timer.h" #include "tilemap.h" diff --git a/src/mame/atari/atarig42_v.cpp b/src/mame/atari/atarig42_v.cpp index 374486412ba..32746d9e525 100644 --- a/src/mame/atari/atarig42_v.cpp +++ b/src/mame/atari/atarig42_v.cpp @@ -22,8 +22,8 @@ #include "emu.h" -#include "video/atarirle.h" -#include "includes/atarig42.h" +#include "atarirle.h" +#include "atarig42.h" diff --git a/src/mame/atari/atarigt.cpp b/src/mame/atari/atarigt.cpp index be775512aae..70abb0fceef 100644 --- a/src/mame/atari/atarigt.cpp +++ b/src/mame/atari/atarigt.cpp @@ -54,7 +54,7 @@ #include "emu.h" -#include "includes/atarigt.h" +#include "atarigt.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/atarigt.h b/src/mame/atari/atarigt.h index 73eb1015662..3cbc93752a7 100644 --- a/src/mame/atari/atarigt.h +++ b/src/mame/atari/atarigt.h @@ -6,11 +6,11 @@ *************************************************************************/ -#include "audio/cage.h" +#include "cage.h" #include "machine/adc0808.h" -#include "machine/atarigen.h" +#include "atarigen.h" #include "machine/timer.h" -#include "video/atarirle.h" +#include "atarirle.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/atari/atarigt_v.cpp b/src/mame/atari/atarigt_v.cpp index e5b723be46b..9914838914a 100644 --- a/src/mame/atari/atarigt_v.cpp +++ b/src/mame/atari/atarigt_v.cpp @@ -22,8 +22,8 @@ #include "emu.h" -#include "video/atarirle.h" -#include "includes/atarigt.h" +#include "atarirle.h" +#include "atarigt.h" /************************************* diff --git a/src/mame/atari/atarigx2.cpp b/src/mame/atari/atarigx2.cpp index 60bd14d901c..6437a10b839 100644 --- a/src/mame/atari/atarigx2.cpp +++ b/src/mame/atari/atarigx2.cpp @@ -26,7 +26,7 @@ #include "emu.h" -#include "includes/atarigx2.h" +#include "atarigx2.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/atarigx2.h b/src/mame/atari/atarigx2.h index 33a96923109..43c2fe3b834 100644 --- a/src/mame/atari/atarigx2.h +++ b/src/mame/atari/atarigx2.h @@ -10,12 +10,12 @@ #pragma once -#include "audio/atarijsa.h" +#include "atarijsa.h" #include "machine/adc0808.h" -#include "machine/atarigen.h" -#include "machine/atarixga.h" +#include "atarigen.h" +#include "atarixga.h" #include "machine/timer.h" -#include "video/atarirle.h" +#include "atarirle.h" #include "tilemap.h" diff --git a/src/mame/atari/atarigx2_v.cpp b/src/mame/atari/atarigx2_v.cpp index c376ac43112..f06bbb8c4bc 100644 --- a/src/mame/atari/atarigx2_v.cpp +++ b/src/mame/atari/atarigx2_v.cpp @@ -22,8 +22,8 @@ #include "emu.h" -#include "video/atarirle.h" -#include "includes/atarigx2.h" +#include "atarirle.h" +#include "atarigx2.h" diff --git a/src/mame/atari/atarijsa.cpp b/src/mame/atari/atarijsa.cpp index a19e9540487..765de024b78 100644 --- a/src/mame/atari/atarijsa.cpp +++ b/src/mame/atari/atarijsa.cpp @@ -74,7 +74,7 @@ ALL: the LPF (low pass filter) bit which selectively places a lowpass filter in ***************************************************************************/ #include "emu.h" -#include "audio/atarijsa.h" +#include "atarijsa.h" #define JSA_MASTER_CLOCK XTAL(3'579'545) diff --git a/src/mame/atari/atarijsa.h b/src/mame/atari/atarijsa.h index 66f3af5f55a..7d3efe36663 100644 --- a/src/mame/atari/atarijsa.h +++ b/src/mame/atari/atarijsa.h @@ -18,7 +18,7 @@ #include "sound/pokey.h" #include "sound/tms5220.h" #include "sound/ymopm.h" -#include "machine/atariscom.h" +#include "atariscom.h" //************************************************************************** diff --git a/src/mame/atari/atarisac.cpp b/src/mame/atari/atarisac.cpp index 3232dc570a0..ac21f8ed86d 100644 --- a/src/mame/atari/atarisac.cpp +++ b/src/mame/atari/atarisac.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/atarisac.h" +#include "atarisac.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/atari/atarisac.h b/src/mame/atari/atarisac.h index 145074ee18d..f085fc78168 100644 --- a/src/mame/atari/atarisac.h +++ b/src/mame/atari/atarisac.h @@ -13,7 +13,7 @@ #pragma once -#include "audio/atarijsa.h" +#include "atarijsa.h" #include "machine/gen_latch.h" #include "sound/dac.h" diff --git a/src/mame/atari/atarist.cpp b/src/mame/atari/atarist.cpp index abf5ecaadac..4f933d1bea1 100644 --- a/src/mame/atari/atarist.cpp +++ b/src/mame/atari/atarist.cpp @@ -2,8 +2,8 @@ // copyright-holders:Curt Coder, Olivier Galibert #include "emu.h" -#include "machine/ataristb.h" -#include "video/atarist.h" +#include "ataristb.h" +#include "atarist_v.h" #include "bus/centronics/ctronics.h" #include "bus/generic/slot.h" diff --git a/src/mame/atari/atarist_v.cpp b/src/mame/atari/atarist_v.cpp index c1c3abc4f53..d55a2c05ad2 100644 --- a/src/mame/atari/atarist_v.cpp +++ b/src/mame/atari/atarist_v.cpp @@ -12,7 +12,7 @@ */ #include "emu.h" -#include "video/atarist.h" +#include "atarist_v.h" #include "cpu/m68000/m68000.h" #include "screen.h" diff --git a/src/mame/atari/ataristb.cpp b/src/mame/atari/ataristb.cpp index e1daa535a5d..9e4364bce77 100644 --- a/src/mame/atari/ataristb.cpp +++ b/src/mame/atari/ataristb.cpp @@ -2,7 +2,7 @@ // copyright-holders:Curt Coder, Olivier Galibert #include "emu.h" -#include "machine/ataristb.h" +#include "ataristb.h" diff --git a/src/mame/atari/atarisy1.cpp b/src/mame/atari/atarisy1.cpp index 6c5ef11afe4..bcd12646eba 100644 --- a/src/mame/atari/atarisy1.cpp +++ b/src/mame/atari/atarisy1.cpp @@ -194,14 +194,14 @@ RoadBlasters (aka Future Vette):005* #include "emu.h" -#include "includes/atarisy1.h" +#include "atarisy1.h" #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "machine/eeprompar.h" #include "machine/watchdog.h" #include "sound/pokey.h" #include "sound/ymopm.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "speaker.h" diff --git a/src/mame/atari/atarisy1.h b/src/mame/atari/atarisy1.h index 480e9fad1cd..04ecd2244e4 100644 --- a/src/mame/atari/atarisy1.h +++ b/src/mame/atari/atarisy1.h @@ -15,11 +15,11 @@ #include "machine/adc0808.h" #include "machine/gen_latch.h" #include "machine/input_merger.h" -#include "machine/slapstic.h" +#include "slapstic.h" #include "machine/timer.h" #include "sound/tms5220.h" #include "sound/ymopm.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/atarisy1_v.cpp b/src/mame/atari/atarisy1_v.cpp index 32ce38e1135..6a29ae2e8be 100644 --- a/src/mame/atari/atarisy1_v.cpp +++ b/src/mame/atari/atarisy1_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/atarisy1.h" +#include "atarisy1.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/atari/atarisy2.cpp b/src/mame/atari/atarisy2.cpp index 306cdd9a271..0f63d9c596c 100644 --- a/src/mame/atari/atarisy2.cpp +++ b/src/mame/atari/atarisy2.cpp @@ -126,7 +126,7 @@ #include "emu.h" -#include "includes/atarisy2.h" +#include "atarisy2.h" #include "machine/adc0808.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/atarisy2.h b/src/mame/atari/atarisy2.h index 99c612d5616..2d3e59dd80c 100644 --- a/src/mame/atari/atarisy2.h +++ b/src/mame/atari/atarisy2.h @@ -10,13 +10,13 @@ #include "cpu/t11/t11.h" #include "machine/bankdev.h" #include "machine/gen_latch.h" -#include "machine/slapstic.h" +#include "slapstic.h" #include "machine/timer.h" #include "machine/watchdog.h" #include "sound/pokey.h" #include "sound/tms5220.h" #include "sound/ymopm.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/atarisy2_v.cpp b/src/mame/atari/atarisy2_v.cpp index d106fcc1e93..f932e78983b 100644 --- a/src/mame/atari/atarisy2_v.cpp +++ b/src/mame/atari/atarisy2_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/atarisy2.h" +#include "atarisy2.h" /************************************* diff --git a/src/mame/atari/atarittl.cpp b/src/mame/atari/atarittl.cpp index 4c0036256a6..2bfce11ff7f 100644 --- a/src/mame/atari/atarittl.cpp +++ b/src/mame/atari/atarittl.cpp @@ -71,9 +71,9 @@ #include "machine/netlist.h" #include "netlist/nl_setup.h" -#include "machine/nl_stuntcyc.h" -#include "machine/nl_gtrak10.h" -#include "machine/nl_tank.h" +#include "nl_stuntcyc.h" +#include "nl_gtrak10.h" +#include "nl_tank.h" #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" #include "screen.h" diff --git a/src/mame/atari/atarivad.cpp b/src/mame/atari/atarivad.cpp index 15385cfc93b..0182f814944 100644 --- a/src/mame/atari/atarivad.cpp +++ b/src/mame/atari/atarivad.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "emu.h" -#include "video/atarivad.h" -#include "video/atarimo.h" +#include "atarivad.h" +#include "atarimo.h" #include "screen.h" diff --git a/src/mame/atari/atarivad.h b/src/mame/atari/atarivad.h index e1f214adda2..d51b31ba9dc 100644 --- a/src/mame/atari/atarivad.h +++ b/src/mame/atari/atarivad.h @@ -11,7 +11,7 @@ #ifndef MAME_VIDEO_ATARIVAD_H #define MAME_VIDEO_ATARIVAD_H -#include "video/atarimo.h" +#include "atarimo.h" #include "tilemap.h" diff --git a/src/mame/atari/atetris.cpp b/src/mame/atari/atetris.cpp index 3d1c08893d8..8175757238f 100644 --- a/src/mame/atari/atetris.cpp +++ b/src/mame/atari/atetris.cpp @@ -100,7 +100,7 @@ Notes: #include "emu.h" -#include "machine/slapstic.h" +#include "slapstic.h" #include "cpu/m6502/m6502.h" #include "cpu/mcs48/mcs48.h" diff --git a/src/mame/atari/avalnche.cpp b/src/mame/atari/avalnche.cpp index e110cb62b02..d229e0ad265 100644 --- a/src/mame/atari/avalnche.cpp +++ b/src/mame/atari/avalnche.cpp @@ -33,7 +33,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/avalnche.h" +#include "avalnche.h" #include "cpu/m6502/m6502.h" #include "machine/74259.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/avalnche_a.cpp b/src/mame/atari/avalnche_a.cpp index 3f63d9ca6b1..5007b106dbd 100644 --- a/src/mame/atari/avalnche_a.cpp +++ b/src/mame/atari/avalnche_a.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/avalnche.h" +#include "avalnche.h" #include "sound/discrete.h" #include "speaker.h" diff --git a/src/mame/atari/badlands.cpp b/src/mame/atari/badlands.cpp index 3d9eb1dfcfc..4745c5b9655 100644 --- a/src/mame/atari/badlands.cpp +++ b/src/mame/atari/badlands.cpp @@ -165,7 +165,7 @@ Measurements - #include "emu.h" -#include "includes/badlands.h" +#include "badlands.h" #include "emupal.h" diff --git a/src/mame/atari/badlands.h b/src/mame/atari/badlands.h index f2505fd88ce..71dd4e2bed5 100644 --- a/src/mame/atari/badlands.h +++ b/src/mame/atari/badlands.h @@ -18,7 +18,7 @@ #include "machine/watchdog.h" #include "machine/timer.h" #include "sound/ymopm.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "speaker.h" #include "tilemap.h" diff --git a/src/mame/atari/badlands_m.cpp b/src/mame/atari/badlands_m.cpp index b4c8d4f327b..5bc3fcd0b8a 100644 --- a/src/mame/atari/badlands_m.cpp +++ b/src/mame/atari/badlands_m.cpp @@ -14,7 +14,7 @@ #include "emu.h" #include "machine/gen_latch.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "screen.h" /************************************* diff --git a/src/mame/atari/badlands_v.cpp b/src/mame/atari/badlands_v.cpp index e3f32549ecd..da51026d627 100644 --- a/src/mame/atari/badlands_v.cpp +++ b/src/mame/atari/badlands_v.cpp @@ -7,8 +7,8 @@ ***************************************************************************/ #include "emu.h" -#include "video/atarimo.h" -#include "includes/badlands.h" +#include "atarimo.h" +#include "badlands.h" diff --git a/src/mame/atari/badlandsbl.cpp b/src/mame/atari/badlandsbl.cpp index f2676871903..42febffddeb 100644 --- a/src/mame/atari/badlandsbl.cpp +++ b/src/mame/atari/badlandsbl.cpp @@ -40,7 +40,7 @@ ***************************************************************************************/ #include "emu.h" -#include "includes/badlands.h" +#include "badlands.h" #include "emupal.h" uint32_t badlandsbl_state::screen_update_badlandsbl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/atari/bartop52.cpp b/src/mame/atari/bartop52.cpp index 8205ebba815..b29de87eb41 100644 --- a/src/mame/atari/bartop52.cpp +++ b/src/mame/atari/bartop52.cpp @@ -18,18 +18,20 @@ */ #include "emu.h" -#include "includes/atari400.h" +#include "atari400.h" +#include "gtia.h" #include "cpu/m6502/m6502.h" #include "machine/timer.h" #include "sound/spkrdev.h" #include "sound/pokey.h" -#include "video/gtia.h" #include "screen.h" #include "speaker.h" +namespace { + class bartop52_state : public atari_common_state { public: @@ -169,4 +171,6 @@ ROM_START(barbball) ROM_LOAD( "5200.rom", 0xf800, 0x0800, BAD_DUMP CRC(4248d3e3) SHA1(6ad7a1e8c9fad486fbec9498cb48bf5bc3adc530) ) ROM_END +} // anonymous namespace + GAME( 1983, barbball, 0, a5200, bartop52, bartop52_state, empty_init, ROT0, "Atari", "Barroom Baseball (prototype)", MACHINE_NOT_WORKING ) diff --git a/src/mame/atari/batman.cpp b/src/mame/atari/batman.cpp index b3b76b07636..2ad7b2b134b 100644 --- a/src/mame/atari/batman.cpp +++ b/src/mame/atari/batman.cpp @@ -20,11 +20,11 @@ #include "emu.h" -#include "includes/batman.h" +#include "batman.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" #include "machine/watchdog.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "speaker.h" diff --git a/src/mame/atari/batman.h b/src/mame/atari/batman.h index 1075ae80e76..da68ff9f4f3 100644 --- a/src/mame/atari/batman.h +++ b/src/mame/atari/batman.h @@ -10,9 +10,9 @@ #pragma once -#include "audio/atarijsa.h" -#include "video/atarimo.h" -#include "video/atarivad.h" +#include "atarijsa.h" +#include "atarimo.h" +#include "atarivad.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/batman_v.cpp b/src/mame/atari/batman_v.cpp index 9d9746580ec..ee4d5a875bc 100644 --- a/src/mame/atari/batman_v.cpp +++ b/src/mame/atari/batman_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/batman.h" +#include "batman.h" diff --git a/src/mame/atari/beathead.cpp b/src/mame/atari/beathead.cpp index 7713ced9826..bfabcfb271a 100644 --- a/src/mame/atari/beathead.cpp +++ b/src/mame/atari/beathead.cpp @@ -100,7 +100,7 @@ #include "emu.h" -#include "includes/beathead.h" +#include "beathead.h" #include "machine/eeprompar.h" #include "machine/watchdog.h" #include "speaker.h" diff --git a/src/mame/atari/beathead.h b/src/mame/atari/beathead.h index 3c8c471631f..7c4802ecaa5 100644 --- a/src/mame/atari/beathead.h +++ b/src/mame/atari/beathead.h @@ -12,7 +12,7 @@ #include "machine/timer.h" #include "cpu/asap/asap.h" -#include "audio/atarijsa.h" +#include "atarijsa.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/atari/beathead_v.cpp b/src/mame/atari/beathead_v.cpp index 39bde2b0bf6..581c8b80a56 100644 --- a/src/mame/atari/beathead_v.cpp +++ b/src/mame/atari/beathead_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/beathead.h" +#include "beathead.h" diff --git a/src/mame/atari/blstroid.cpp b/src/mame/atari/blstroid.cpp index d9a3fb5289d..49f3a0efe74 100644 --- a/src/mame/atari/blstroid.cpp +++ b/src/mame/atari/blstroid.cpp @@ -20,7 +20,7 @@ #include "emu.h" -#include "includes/blstroid.h" +#include "blstroid.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/blstroid.h b/src/mame/atari/blstroid.h index c3b475c7e52..4cb4378aa6f 100644 --- a/src/mame/atari/blstroid.h +++ b/src/mame/atari/blstroid.h @@ -10,10 +10,10 @@ #pragma once -#include "machine/atarigen.h" +#include "atarigen.h" #include "machine/timer.h" -#include "audio/atarijsa.h" -#include "video/atarimo.h" +#include "atarijsa.h" +#include "atarimo.h" #include "tilemap.h" class blstroid_state : public atarigen_state diff --git a/src/mame/atari/blstroid_v.cpp b/src/mame/atari/blstroid_v.cpp index 7f34a71dd7b..794353d7464 100644 --- a/src/mame/atari/blstroid_v.cpp +++ b/src/mame/atari/blstroid_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/blstroid.h" +#include "blstroid.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/atari/bsktball.cpp b/src/mame/atari/bsktball.cpp index 9498f88b173..202f16b4222 100644 --- a/src/mame/atari/bsktball.cpp +++ b/src/mame/atari/bsktball.cpp @@ -27,7 +27,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bsktball.h" +#include "bsktball.h" #include "cpu/m6502/m6502.h" #include "machine/74259.h" diff --git a/src/mame/atari/bsktball_a.cpp b/src/mame/atari/bsktball_a.cpp index 082322e41ff..218bab16555 100644 --- a/src/mame/atari/bsktball_a.cpp +++ b/src/mame/atari/bsktball_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/bsktball.h" +#include "bsktball.h" #include "sound/discrete.h" /*************************************************************************** diff --git a/src/mame/atari/bsktball_m.cpp b/src/mame/atari/bsktball_m.cpp index 1f4ebd5efa8..d90ad416ba0 100644 --- a/src/mame/atari/bsktball_m.cpp +++ b/src/mame/atari/bsktball_m.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bsktball.h" +#include "bsktball.h" /*************************************************************************** bsktball_nmion_w diff --git a/src/mame/atari/bsktball_v.cpp b/src/mame/atari/bsktball_v.cpp index 1cd97b297d6..e1ed9abd1d6 100644 --- a/src/mame/atari/bsktball_v.cpp +++ b/src/mame/atari/bsktball_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bsktball.h" +#include "bsktball.h" void bsktball_state::bsktball_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/atari/bwidow.cpp b/src/mame/atari/bwidow.cpp index c28b0544202..0d4f814c47d 100644 --- a/src/mame/atari/bwidow.cpp +++ b/src/mame/atari/bwidow.cpp @@ -219,14 +219,13 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bwidow.h" +#include "bwidow.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" -#include "video/vector.h" -#include "video/avgdvg.h" -#include "sound/pokey.h" #include "sound/discrete.h" +#include "sound/pokey.h" +#include "video/vector.h" #include "screen.h" diff --git a/src/mame/atari/bwidow.h b/src/mame/atari/bwidow.h index 20bed5458b9..293e3a592be 100644 --- a/src/mame/atari/bwidow.h +++ b/src/mame/atari/bwidow.h @@ -4,7 +4,7 @@ #ifndef MAME_INCLUDES_BWIDOW_H #define MAME_INCLUDES_BWIDOW_H -#include "video/avgdvg.h" +#include "avgdvg.h" #include "machine/er2055.h" #define MASTER_CLOCK (XTAL(12'096'000)) diff --git a/src/mame/atari/bwidow_a.cpp b/src/mame/atari/bwidow_a.cpp index e2d2d6c6b2c..34926e53895 100644 --- a/src/mame/atari/bwidow_a.cpp +++ b/src/mame/atari/bwidow_a.cpp @@ -4,7 +4,7 @@ #include "emu.h" -#include "includes/bwidow.h" +#include "bwidow.h" #include "sound/pokey.h" #include "sound/discrete.h" diff --git a/src/mame/atari/bzone.cpp b/src/mame/atari/bzone.cpp index 3685d0f3ee4..986346c1aed 100644 --- a/src/mame/atari/bzone.cpp +++ b/src/mame/atari/bzone.cpp @@ -207,13 +207,15 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bzone.h" +#include "bzone.h" + +#include "avgdvg.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" #include "video/vector.h" -#include "video/avgdvg.h" #include "sound/pokey.h" + #include "speaker.h" #include "bzone.lh" diff --git a/src/mame/atari/bzone.h b/src/mame/atari/bzone.h index f699326df24..b88bfa7f10d 100644 --- a/src/mame/atari/bzone.h +++ b/src/mame/atari/bzone.h @@ -10,9 +10,9 @@ #pragma once -#include "audio/redbaron.h" +#include "redbaron.h" #include "machine/er2055.h" -#include "machine/mathbox.h" +#include "mathbox.h" #include "sound/discrete.h" #include "screen.h" diff --git a/src/mame/atari/bzone_a.cpp b/src/mame/atari/bzone_a.cpp index 62e522da25e..311a751d722 100644 --- a/src/mame/atari/bzone_a.cpp +++ b/src/mame/atari/bzone_a.cpp @@ -20,7 +20,7 @@ D0 explosion enable gates a noise generator */ #include "emu.h" -#include "includes/bzone.h" +#include "bzone.h" #include "sound/discrete.h" #include "sound/pokey.h" diff --git a/src/mame/atari/canyon.cpp b/src/mame/atari/canyon.cpp index db10f7c0a0c..0515254305e 100644 --- a/src/mame/atari/canyon.cpp +++ b/src/mame/atari/canyon.cpp @@ -39,7 +39,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/canyon.h" +#include "canyon.h" #include "cpu/m6502/m6502.h" #include "sound/discrete.h" diff --git a/src/mame/atari/canyon_a.cpp b/src/mame/atari/canyon_a.cpp index bac731ea036..395fb8d45d7 100644 --- a/src/mame/atari/canyon_a.cpp +++ b/src/mame/atari/canyon_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/canyon.h" +#include "canyon.h" #include "sound/discrete.h" diff --git a/src/mame/atari/canyon_v.cpp b/src/mame/atari/canyon_v.cpp index a5ac16e9d64..75f8cffe6a8 100644 --- a/src/mame/atari/canyon_v.cpp +++ b/src/mame/atari/canyon_v.cpp @@ -7,7 +7,7 @@ Atari Canyon Bomber video emulation ***************************************************************************/ #include "emu.h" -#include "includes/canyon.h" +#include "canyon.h" void canyon_state::canyon_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/atari/ccastles.cpp b/src/mame/atari/ccastles.cpp index e31d09f0047..8d1dc7fb357 100644 --- a/src/mame/atari/ccastles.cpp +++ b/src/mame/atari/ccastles.cpp @@ -120,7 +120,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ccastles.h" +#include "ccastles.h" #include "cpu/m6502/m6502.h" #include "machine/rescap.h" diff --git a/src/mame/atari/ccastles_v.cpp b/src/mame/atari/ccastles_v.cpp index 4784167e80b..fa962a4bd16 100644 --- a/src/mame/atari/ccastles_v.cpp +++ b/src/mame/atari/ccastles_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ccastles.h" +#include "ccastles.h" #include "video/resnet.h" diff --git a/src/mame/atari/centiped.cpp b/src/mame/atari/centiped.cpp index 4486d972846..0f936acdfee 100644 --- a/src/mame/atari/centiped.cpp +++ b/src/mame/atari/centiped.cpp @@ -415,7 +415,7 @@ each direction to assign the boundries. ***************************************************************************/ #include "emu.h" -#include "includes/centiped.h" +#include "centiped.h" #include "cpu/m6502/m6502.h" #include "cpu/s2650/s2650.h" diff --git a/src/mame/atari/centiped_v.cpp b/src/mame/atari/centiped_v.cpp index 7055d8cf984..3c6ac0cc1c8 100644 --- a/src/mame/atari/centiped_v.cpp +++ b/src/mame/atari/centiped_v.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/centiped.h" +#include "centiped.h" /************************************* diff --git a/src/mame/atari/cloak.cpp b/src/mame/atari/cloak.cpp index 5dacb21df5c..b94e285235f 100644 --- a/src/mame/atari/cloak.cpp +++ b/src/mame/atari/cloak.cpp @@ -117,7 +117,7 @@ */ #include "emu.h" -#include "includes/cloak.h" +#include "cloak.h" #include "cpu/m6502/m6502.h" #include "sound/pokey.h" diff --git a/src/mame/atari/cloak_v.cpp b/src/mame/atari/cloak_v.cpp index 24dd7a086de..ad06c20a283 100644 --- a/src/mame/atari/cloak_v.cpp +++ b/src/mame/atari/cloak_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/cloak.h" +#include "cloak.h" #define NUM_PENS (0x40) diff --git a/src/mame/atari/cloud9.cpp b/src/mame/atari/cloud9.cpp index d4ef47dca59..f9a03634530 100644 --- a/src/mame/atari/cloud9.cpp +++ b/src/mame/atari/cloud9.cpp @@ -93,7 +93,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/cloud9.h" +#include "cloud9.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/cloud9_v.cpp b/src/mame/atari/cloud9_v.cpp index bb9cb18ae98..a95b0d5ab36 100644 --- a/src/mame/atari/cloud9_v.cpp +++ b/src/mame/atari/cloud9_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/cloud9.h" +#include "cloud9.h" #include "video/resnet.h" diff --git a/src/mame/atari/copsnrob.cpp b/src/mame/atari/copsnrob.cpp index 52f0514dcbe..f037fdc5368 100644 --- a/src/mame/atari/copsnrob.cpp +++ b/src/mame/atari/copsnrob.cpp @@ -57,7 +57,7 @@ Added Dip locations according to manual. ***************************************************************************/ #include "emu.h" -#include "includes/copsnrob.h" +#include "copsnrob.h" #include "cpu/m6502/m6502.h" diff --git a/src/mame/atari/copsnrob_a.cpp b/src/mame/atari/copsnrob_a.cpp index ef6c60e8a87..47df37d824d 100644 --- a/src/mame/atari/copsnrob_a.cpp +++ b/src/mame/atari/copsnrob_a.cpp @@ -5,7 +5,7 @@ * Nov 2010, Derrick Renaud ************************************************************************/ #include "emu.h" -#include "includes/copsnrob.h" +#include "copsnrob.h" #include "sound/discrete.h" #include "speaker.h" diff --git a/src/mame/atari/copsnrob_v.cpp b/src/mame/atari/copsnrob_v.cpp index 5ea31ff2c68..7f147a4a45d 100644 --- a/src/mame/atari/copsnrob_v.cpp +++ b/src/mame/atari/copsnrob_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/copsnrob.h" +#include "copsnrob.h" uint32_t copsnrob_state::screen_update_copsnrob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/atari/cyberbal.cpp b/src/mame/atari/cyberbal.cpp index 17034767e28..4107c59da38 100644 --- a/src/mame/atari/cyberbal.cpp +++ b/src/mame/atari/cyberbal.cpp @@ -22,7 +22,7 @@ #include "emu.h" -#include "includes/cyberbal.h" +#include "cyberbal.h" #include "machine/eeprompar.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/cyberbal.h b/src/mame/atari/cyberbal.h index 8e676edec1b..1f69c0c997e 100644 --- a/src/mame/atari/cyberbal.h +++ b/src/mame/atari/cyberbal.h @@ -10,10 +10,10 @@ #pragma once -#include "machine/slapstic.h" -#include "audio/atarijsa.h" -#include "audio/atarisac.h" -#include "video/atarimo.h" +#include "slapstic.h" +#include "atarijsa.h" +#include "atarisac.h" +#include "atarimo.h" #include "cpu/m68000/m68000.h" #include "machine/timer.h" #include "emupal.h" diff --git a/src/mame/atari/cyberbal_v.cpp b/src/mame/atari/cyberbal_v.cpp index 1f5cb34f233..eceb66e3adb 100644 --- a/src/mame/atari/cyberbal_v.cpp +++ b/src/mame/atari/cyberbal_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/cyberbal.h" +#include "cyberbal.h" #define SCREEN_WIDTH (42*16) diff --git a/src/mame/atari/cybstorm.cpp b/src/mame/atari/cybstorm.cpp index b447a34dc07..eb3ef8cd2c5 100644 --- a/src/mame/atari/cybstorm.cpp +++ b/src/mame/atari/cybstorm.cpp @@ -19,7 +19,7 @@ #include "emu.h" -#include "includes/cybstorm.h" +#include "cybstorm.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/cybstorm.h b/src/mame/atari/cybstorm.h index 3a13776b601..d9fee49e96a 100644 --- a/src/mame/atari/cybstorm.h +++ b/src/mame/atari/cybstorm.h @@ -10,9 +10,9 @@ #pragma once -#include "audio/atarijsa.h" +#include "atarijsa.h" #include "machine/bankdev.h" -#include "video/atarivad.h" +#include "atarivad.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/cybstorm_v.cpp b/src/mame/atari/cybstorm_v.cpp index b27c73824c8..0815730c815 100644 --- a/src/mame/atari/cybstorm_v.cpp +++ b/src/mame/atari/cybstorm_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/cybstorm.h" +#include "cybstorm.h" diff --git a/src/mame/atari/destroyr.cpp b/src/mame/atari/destroyr.cpp index 62561c2a314..5ac190f0f49 100644 --- a/src/mame/atari/destroyr.cpp +++ b/src/mame/atari/destroyr.cpp @@ -20,7 +20,7 @@ TODO: #include "machine/netlist.h" #include "netlist/nl_setup.h" -#include "audio/nl_destroyr.h" +#include "nl_destroyr.h" #include "destroyr.lh" diff --git a/src/mame/atari/dragrace.cpp b/src/mame/atari/dragrace.cpp index 86d42456e8a..0fb85b02dda 100644 --- a/src/mame/atari/dragrace.cpp +++ b/src/mame/atari/dragrace.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dragrace.h" +#include "dragrace.h" #include "cpu/m6800/m6800.h" #include "machine/74259.h" diff --git a/src/mame/atari/dragrace_a.cpp b/src/mame/atari/dragrace_a.cpp index 56f68bd34cc..f1bc41ebce3 100644 --- a/src/mame/atari/dragrace_a.cpp +++ b/src/mame/atari/dragrace_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/dragrace.h" +#include "dragrace.h" #include "sound/discrete.h" /************************************************************************/ diff --git a/src/mame/atari/dragrace_v.cpp b/src/mame/atari/dragrace_v.cpp index 8e3469212fc..6446c536721 100644 --- a/src/mame/atari/dragrace_v.cpp +++ b/src/mame/atari/dragrace_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dragrace.h" +#include "dragrace.h" TILE_GET_INFO_MEMBER(dragrace_state::get_tile_info) diff --git a/src/mame/atari/eprom.cpp b/src/mame/atari/eprom.cpp index d1af9ae8ddc..52fbea13998 100644 --- a/src/mame/atari/eprom.cpp +++ b/src/mame/atari/eprom.cpp @@ -26,7 +26,7 @@ #include "emu.h" -#include "includes/eprom.h" +#include "eprom.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/eprom.h b/src/mame/atari/eprom.h index a61c426761a..5eaa628b9a9 100644 --- a/src/mame/atari/eprom.h +++ b/src/mame/atari/eprom.h @@ -12,8 +12,8 @@ #include "machine/adc0808.h" #include "machine/timer.h" -#include "audio/atarijsa.h" -#include "video/atarimo.h" +#include "atarijsa.h" +#include "atarimo.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/eprom_v.cpp b/src/mame/atari/eprom_v.cpp index ff1f6f92e4b..cef48d48db9 100644 --- a/src/mame/atari/eprom_v.cpp +++ b/src/mame/atari/eprom_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/eprom.h" +#include "eprom.h" /************************************* diff --git a/src/mame/atari/firetrk.cpp b/src/mame/atari/firetrk.cpp index 36ceb9d8344..352c9770da3 100644 --- a/src/mame/atari/firetrk.cpp +++ b/src/mame/atari/firetrk.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/firetrk.h" +#include "firetrk.h" #include "cpu/m6800/m6800.h" #include "sound/discrete.h" diff --git a/src/mame/atari/firetrk_a.cpp b/src/mame/atari/firetrk_a.cpp index da10bfc3560..628548bd54d 100644 --- a/src/mame/atari/firetrk_a.cpp +++ b/src/mame/atari/firetrk_a.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/firetrk.h" +#include "firetrk.h" #include "sound/discrete.h" diff --git a/src/mame/atari/firetrk_v.cpp b/src/mame/atari/firetrk_v.cpp index 5998473c148..cf0f2098872 100644 --- a/src/mame/atari/firetrk_v.cpp +++ b/src/mame/atari/firetrk_v.cpp @@ -7,7 +7,7 @@ Atari Fire Truck + Super Bug + Monte Carlo video emulation ***************************************************************************/ #include "emu.h" -#include "includes/firetrk.h" +#include "firetrk.h" static const rectangle playfield_window(0x02a, 0x115, 0x000, 0x0ff); diff --git a/src/mame/atari/flyball.cpp b/src/mame/atari/flyball.cpp index 4e6138ee824..947bf7e1c55 100644 --- a/src/mame/atari/flyball.cpp +++ b/src/mame/atari/flyball.cpp @@ -23,7 +23,7 @@ Etched in copper on top of board: #include "machine/netlist.h" #include "netlist/nl_setup.h" -#include "audio/nl_flyball.h" +#include "nl_flyball.h" static constexpr XTAL MASTER_CLOCK = 12.096_MHz_XTAL; static constexpr XTAL PIXEL_CLOCK = MASTER_CLOCK / 2; diff --git a/src/mame/atari/foodf.cpp b/src/mame/atari/foodf.cpp index fabdbf84618..724496a3117 100644 --- a/src/mame/atari/foodf.cpp +++ b/src/mame/atari/foodf.cpp @@ -76,7 +76,7 @@ #include "emu.h" -#include "includes/foodf.h" +#include "foodf.h" #include "cpu/m68000/m68000.h" #include "machine/adc0808.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/foodf_v.cpp b/src/mame/atari/foodf_v.cpp index abc0969f7b0..706c7ca1cac 100644 --- a/src/mame/atari/foodf_v.cpp +++ b/src/mame/atari/foodf_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/foodf.h" +#include "foodf.h" #include "video/resnet.h" diff --git a/src/mame/atari/gauntlet.cpp b/src/mame/atari/gauntlet.cpp index 258cd6b5410..cda4c5ad381 100644 --- a/src/mame/atari/gauntlet.cpp +++ b/src/mame/atari/gauntlet.cpp @@ -121,7 +121,7 @@ #include "emu.h" -#include "includes/gauntlet.h" +#include "gauntlet.h" #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/gauntlet.h b/src/mame/atari/gauntlet.h index 32f30d48783..e0c0129a78a 100644 --- a/src/mame/atari/gauntlet.h +++ b/src/mame/atari/gauntlet.h @@ -12,9 +12,9 @@ #include "machine/74259.h" #include "machine/gen_latch.h" -#include "machine/slapstic.h" +#include "slapstic.h" #include "machine/timer.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "sound/pokey.h" #include "sound/tms5220.h" #include "sound/ymopm.h" diff --git a/src/mame/atari/gauntlet_v.cpp b/src/mame/atari/gauntlet_v.cpp index 08603b09784..31cb27f3f57 100644 --- a/src/mame/atari/gauntlet_v.cpp +++ b/src/mame/atari/gauntlet_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/gauntlet.h" +#include "gauntlet.h" diff --git a/src/mame/atari/gtia.cpp b/src/mame/atari/gtia.cpp index 4ea3c0b6b9a..62d70ecfac7 100644 --- a/src/mame/atari/gtia.cpp +++ b/src/mame/atari/gtia.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/gtia.h" +#include "gtia.h" #include "screen.h" #define GTIA_P0 0x01 diff --git a/src/mame/atari/harddriv.cpp b/src/mame/atari/harddriv.cpp index 4a1c0de707b..1bef4ed24e6 100644 --- a/src/mame/atari/harddriv.cpp +++ b/src/mame/atari/harddriv.cpp @@ -325,7 +325,7 @@ Notes: ****************************************************************************/ #include "emu.h" -#include "includes/harddriv.h" +#include "harddriv.h" #include "machine/timer.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/harddriv.h b/src/mame/atari/harddriv.h index c4757b09902..435d02af0c3 100644 --- a/src/mame/atari/harddriv.h +++ b/src/mame/atari/harddriv.h @@ -10,8 +10,8 @@ #pragma once -#include "audio/atarijsa.h" -#include "machine/slapstic.h" +#include "atarijsa.h" +#include "slapstic.h" #include "bus/rs232/rs232.h" @@ -23,7 +23,7 @@ #include "machine/74259.h" #include "machine/adc0808.h" -#include "machine/asic65.h" +#include "asic65.h" #include "machine/eeprompar.h" #include "machine/mc68681.h" #include "machine/timekpr.h" diff --git a/src/mame/atari/harddriv_a.cpp b/src/mame/atari/harddriv_a.cpp index eef4fe6e3a5..a9a876c643e 100644 --- a/src/mame/atari/harddriv_a.cpp +++ b/src/mame/atari/harddriv_a.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/harddriv.h" +#include "harddriv.h" #include "cpu/tms32010/tms32010.h" #include "speaker.h" diff --git a/src/mame/atari/harddriv_m.cpp b/src/mame/atari/harddriv_m.cpp index 57abbcd7a0a..47d1a910883 100644 --- a/src/mame/atari/harddriv_m.cpp +++ b/src/mame/atari/harddriv_m.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/harddriv.h" +#include "harddriv.h" /************************************* diff --git a/src/mame/atari/harddriv_v.cpp b/src/mame/atari/harddriv_v.cpp index a1281fb14ec..83c7fa519f9 100644 --- a/src/mame/atari/harddriv_v.cpp +++ b/src/mame/atari/harddriv_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cpu/tms34010/tms34010.h" -#include "includes/harddriv.h" +#include "harddriv.h" diff --git a/src/mame/atari/irobot.cpp b/src/mame/atari/irobot.cpp index b627d539d86..060e6ec4c45 100644 --- a/src/mame/atari/irobot.cpp +++ b/src/mame/atari/irobot.cpp @@ -80,7 +80,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/irobot.h" +#include "irobot.h" #include "cpu/m6809/m6809.h" #include "machine/adc0808.h" #include "machine/nvram.h" diff --git a/src/mame/atari/irobot_m.cpp b/src/mame/atari/irobot_m.cpp index ba136b8b43e..dfb5987e7e8 100644 --- a/src/mame/atari/irobot_m.cpp +++ b/src/mame/atari/irobot_m.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cpu/m6809/m6809.h" -#include "includes/irobot.h" +#include "irobot.h" /* Note: * There's probably something wrong with the way the Mathbox gets started. diff --git a/src/mame/atari/irobot_v.cpp b/src/mame/atari/irobot_v.cpp index 9fcdba47479..a8f49d57898 100644 --- a/src/mame/atari/irobot_v.cpp +++ b/src/mame/atari/irobot_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/irobot.h" +#include "irobot.h" #define BITMAP_WIDTH 256 diff --git a/src/mame/atari/jagblit.ipp b/src/mame/atari/jagblit.ipp index 59f95a00d3b..86c3bc9d8d7 100644 --- a/src/mame/atari/jagblit.ipp +++ b/src/mame/atari/jagblit.ipp @@ -12,7 +12,7 @@ #define COMMAND -- blitter command bits for blitter #define A1FIXED -- fixed A1 flag bits for blitter #define A2FIXED -- fixed A2 flag bits for blitter - #include "jagblit.ipp" + #include "jagblit.hxx" ****************************************************************************/ diff --git a/src/mame/atari/jaguar.cpp b/src/mame/atari/jaguar.cpp index cb888ceb78d..264e134709e 100644 --- a/src/mame/atari/jaguar.cpp +++ b/src/mame/atari/jaguar.cpp @@ -335,7 +335,7 @@ Notes: #include "emu.h" -#include "includes/jaguar.h" +#include "jaguar.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/atari/jaguar.h b/src/mame/atari/jaguar.h index fc72c1d408c..d0f4d9b7d67 100644 --- a/src/mame/atari/jaguar.h +++ b/src/mame/atari/jaguar.h @@ -12,7 +12,7 @@ #include "machine/eepromser.h" #include "machine/vt83c461.h" #include "imagedev/snapquik.h" -#include "video/jag_blitter.h" +#include "jag_blitter.h" #include "cdrom.h" #include "imagedev/chd_cd.h" #include "screen.h" diff --git a/src/mame/atari/jaguar_a.cpp b/src/mame/atari/jaguar_a.cpp index 863eb63f398..2e0469ea82c 100644 --- a/src/mame/atari/jaguar_a.cpp +++ b/src/mame/atari/jaguar_a.cpp @@ -145,7 +145,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/jaguar.h" +#include "jaguar.h" #include "cpu/jaguar/jaguar.h" diff --git a/src/mame/atari/jaguar_v.cpp b/src/mame/atari/jaguar_v.cpp index 9992d850c9c..7da08c21026 100644 --- a/src/mame/atari/jaguar_v.cpp +++ b/src/mame/atari/jaguar_v.cpp @@ -145,7 +145,7 @@ #include "emu.h" #include "cpu/mips/mips1.h" #include "cpu/m68000/m68000.h" -#include "includes/jaguar.h" +#include "jaguar.h" #include "jagblit.h" diff --git a/src/mame/atari/jedi.cpp b/src/mame/atari/jedi.cpp index 7981afd62d0..12f35514699 100644 --- a/src/mame/atari/jedi.cpp +++ b/src/mame/atari/jedi.cpp @@ -118,7 +118,7 @@ #include "machine/adc0808.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "includes/jedi.h" +#include "jedi.h" /************************************* diff --git a/src/mame/atari/jedi_a.cpp b/src/mame/atari/jedi_a.cpp index 003cda873a7..b4324d54720 100644 --- a/src/mame/atari/jedi_a.cpp +++ b/src/mame/atari/jedi_a.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/jedi.h" +#include "jedi.h" #include "cpu/m6502/m6502.h" #include "machine/rescap.h" #include "sound/pokey.h" diff --git a/src/mame/atari/jedi_v.cpp b/src/mame/atari/jedi_v.cpp index 11ee7c4e752..24176fc0aab 100644 --- a/src/mame/atari/jedi_v.cpp +++ b/src/mame/atari/jedi_v.cpp @@ -17,7 +17,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/jedi.h" +#include "jedi.h" #include diff --git a/src/mame/atari/klax.cpp b/src/mame/atari/klax.cpp index 1e1a44f1e00..199f5812378 100644 --- a/src/mame/atari/klax.cpp +++ b/src/mame/atari/klax.cpp @@ -20,7 +20,7 @@ #include "emu.h" -#include "includes/klax.h" +#include "klax.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/atari/klax.h b/src/mame/atari/klax.h index c2b0a14f1dd..8117ed99b7e 100644 --- a/src/mame/atari/klax.h +++ b/src/mame/atari/klax.h @@ -12,7 +12,7 @@ #include "machine/timer.h" #include "sound/msm5205.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/klax_v.cpp b/src/mame/atari/klax_v.cpp index 4ec30e3ae40..27b1e12bebf 100644 --- a/src/mame/atari/klax_v.cpp +++ b/src/mame/atari/klax_v.cpp @@ -7,8 +7,8 @@ ****************************************************************************/ #include "emu.h" -#include "video/atarimo.h" -#include "includes/klax.h" +#include "atarimo.h" +#include "klax.h" /************************************* diff --git a/src/mame/atari/liberatr.cpp b/src/mame/atari/liberatr.cpp index 0876baf87b3..08b4ca2b250 100644 --- a/src/mame/atari/liberatr.cpp +++ b/src/mame/atari/liberatr.cpp @@ -137,7 +137,7 @@ #include "emu.h" -#include "includes/liberatr.h" +#include "liberatr.h" #include "machine/rescap.h" #include "speaker.h" diff --git a/src/mame/atari/liberatr_v.cpp b/src/mame/atari/liberatr_v.cpp index 8739bd3fafd..a13e9311da6 100644 --- a/src/mame/atari/liberatr_v.cpp +++ b/src/mame/atari/liberatr_v.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/liberatr.h" +#include "liberatr.h" #define NUM_PENS (0x18) diff --git a/src/mame/atari/llander.cpp b/src/mame/atari/llander.cpp deleted file mode 100644 index 82324455beb..00000000000 --- a/src/mame/atari/llander.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:K.Wilkins -/*************************************************************************** - - Lunar Lander Specific Sound Code - -***************************************************************************/ - -#include "emu.h" -#include "includes/asteroid.h" -#include "sound/discrete.h" -#include "speaker.h" - -/************************************************************************/ -/* Lunar Lander Sound System Analog emulation by K.Wilkins Nov 2000 */ -/* Questions/Suggestions to mame@esplexo.co.uk */ -/************************************************************************/ -#define LLANDER_TONE3K_EN NODE_01 -#define LLANDER_TONE6K_EN NODE_02 -#define LLANDER_THRUST_DATA NODE_03 -#define LLANDER_EXPLOD_EN NODE_04 -#define LLANDER_NOISE_RESET NODE_05 - -#define LLANDER_NOISE NODE_10 -#define LLANDER_TONE_3K_SND NODE_11 -#define LLANDER_TONE_6K_SND NODE_12 -#define LLANDER_THRUST_EXPLOD_SND NODE_13 - -static const discrete_lfsr_desc llander_lfsr = -{ - DISC_CLK_IS_FREQ, - 16, /* Bit Length */ - 0, /* Reset Value */ - 6, /* Use Bit 6 as XOR input 0 */ - 14, /* Use Bit 14 as XOR input 1 */ - DISC_LFSR_XNOR, /* Feedback stage1 is inverted XOR */ - DISC_LFSR_IN0, /* Feedback stage2 is just stage 1 output external feed not used */ - DISC_LFSR_REPLACE, /* Feedback stage3 replaces the shifted register contents */ - 0x000001, /* Everything is shifted into the first bit only */ - 0, /* Output not inverted */ - 14 /* Output bit */ -}; - -static DISCRETE_SOUND_START(llander_discrete) - /************************************************/ - /* llander Effects Relataive Gain Table */ - /* */ - /* Effect V-ampIn Gain ratio Relative */ - /* Tone3k 4 10/390 9.2 */ - /* Tone6k 4 10/390 9.2 */ - /* Explode 3.8 10/6.8*2 1000.0 */ - /* Thrust 3.8 10/6.8*2 600.0 */ - /* NOTE: Thrust gain has to be tweaked, due to */ - /* the filter stage. */ - /************************************************/ - - /* NODE GAIN OFFSET INIT */ - DISCRETE_INPUTX_DATA(LLANDER_THRUST_DATA, 600.0/7*7.6, 0, 0) - DISCRETE_INPUT_LOGIC(LLANDER_TONE3K_EN) - DISCRETE_INPUT_LOGIC(LLANDER_TONE6K_EN) - DISCRETE_INPUT_LOGIC(LLANDER_EXPLOD_EN) - DISCRETE_INPUT_PULSE(LLANDER_NOISE_RESET, 1) - - DISCRETE_LFSR_NOISE(NODE_20, 1, LLANDER_NOISE_RESET, 12000, 1, 0, 0, &llander_lfsr) // 12KHz Noise source for thrust - DISCRETE_RCFILTER(LLANDER_NOISE, NODE_20, 2247, 1e-6) - - DISCRETE_SQUAREWFIX(LLANDER_TONE_3K_SND, LLANDER_TONE3K_EN, 3000, 9.2, 50, 0, 0) // 3KHz - - DISCRETE_SQUAREWFIX(LLANDER_TONE_6K_SND, LLANDER_TONE6K_EN, 6000, 9.2, 50, 0, 0) // 6KHz - - DISCRETE_MULTIPLY(NODE_30, LLANDER_NOISE, LLANDER_THRUST_DATA) // Mix in 12KHz Noise source for thrust - /* TBD - replace this line with a Sallen-Key Bandpass macro */ - DISCRETE_FILTER2(NODE_31, 1, NODE_30, 89.5, (1.0 / 7.6), DISC_FILTER_BANDPASS) - DISCRETE_MULTIPLY(NODE_32, NODE_30, 1000.0/600.0) // Explode adds original noise source onto filtered source - DISCRETE_ONOFF(NODE_33, LLANDER_EXPLOD_EN, NODE_32) - DISCRETE_ADDER2(NODE_34, 1, NODE_31, NODE_33) - /* TBD - replace this line with a Active Lowpass macro */ - DISCRETE_FILTER1(LLANDER_THRUST_EXPLOD_SND, 1, NODE_34, 560, DISC_FILTER_LOWPASS) - - DISCRETE_ADDER3(NODE_90, 1, LLANDER_TONE_3K_SND, LLANDER_TONE_6K_SND, LLANDER_THRUST_EXPLOD_SND) // Mix all four sound sources - DISCRETE_GAIN(NODE_91, NODE_90, 65534.0/(9.2+9.2+600+1000)) - - DISCRETE_OUTPUT(NODE_90, 65534.0/(9.2+9.2+600+1000)) // Take the output from the mixer -DISCRETE_SOUND_END - -void asteroid_state::llander_snd_reset_w(uint8_t data) -{ - /* Resets the LFSR that is used for the white noise generator */ - m_discrete->write(LLANDER_NOISE_RESET, 0); /* Reset */ -} - -void asteroid_state::llander_sounds_w(uint8_t data) -{ - m_discrete->write(LLANDER_THRUST_DATA, data & 0x07); /* Thrust volume */ - m_discrete->write(LLANDER_TONE3K_EN, data & 0x10); /* Tone 3KHz enable */ - m_discrete->write(LLANDER_TONE6K_EN, data & 0x20); /* Tone 6KHz enable */ - m_discrete->write(LLANDER_EXPLOD_EN, data & 0x08); /* Explosion */ -} - - -void asteroid_state::llander_sound(machine_config &config) -{ - SPEAKER(config, "mono").front_center(); - - DISCRETE(config, m_discrete, llander_discrete).add_route(ALL_OUTPUTS, "mono", 1.0); -} diff --git a/src/mame/atari/lynx.cpp b/src/mame/atari/lynx.cpp index 44bb4f82fd3..2f781a2a5a1 100644 --- a/src/mame/atari/lynx.cpp +++ b/src/mame/atari/lynx.cpp @@ -17,7 +17,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/lynx.h" +#include "lynx.h" #include "cpu/m6502/m65sc02.h" #include "softlist_dev.h" diff --git a/src/mame/atari/lynx_m.cpp b/src/mame/atari/lynx_m.cpp index efec05ee408..984faaaf49f 100644 --- a/src/mame/atari/lynx_m.cpp +++ b/src/mame/atari/lynx_m.cpp @@ -5,7 +5,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/lynx.h" +#include "lynx.h" #include "cpu/m6502/m65sc02.h" #include "corestr.h" diff --git a/src/mame/atari/marblmd2.cpp b/src/mame/atari/marblmd2.cpp index ce546f69890..2da70cc4cb3 100644 --- a/src/mame/atari/marblmd2.cpp +++ b/src/mame/atari/marblmd2.cpp @@ -23,9 +23,9 @@ #include "emu.h" -#include "audio/atarijsa.h" -#include "video/atarimo.h" -#include "video/atarivad.h" +#include "atarijsa.h" +#include "atarimo.h" +#include "atarivad.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/maxaflex.cpp b/src/mame/atari/maxaflex.cpp index b06517e12f3..62325f915d4 100644 --- a/src/mame/atari/maxaflex.cpp +++ b/src/mame/atari/maxaflex.cpp @@ -13,7 +13,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/atari400.h" +#include "atari400.h" #include "cpu/m6502/m6502.h" #include "cpu/m6805/m68705.h" @@ -25,7 +25,7 @@ #include "sound/spkrdev.h" #include "sound/pokey.h" -#include "video/gtia.h" +#include "gtia.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/atari/mediagx.cpp b/src/mame/atari/mediagx.cpp index 670f735b71c..9e706bf6d7c 100644 --- a/src/mame/atari/mediagx.cpp +++ b/src/mame/atari/mediagx.cpp @@ -67,14 +67,16 @@ */ #include "emu.h" +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "machine/lpci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" #include "machine/idectrl.h" #include "machine/timer.h" #include "sound/dmadac.h" #include "video/ramdac.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/atari/metalmx.cpp b/src/mame/atari/metalmx.cpp index 266fed2f80b..3f166109601 100644 --- a/src/mame/atari/metalmx.cpp +++ b/src/mame/atari/metalmx.cpp @@ -256,7 +256,7 @@ Logic: ***************************************************************************/ #include "emu.h" -#include "includes/metalmx.h" +#include "metalmx.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/atari/metalmx.h b/src/mame/atari/metalmx.h index 03a34274776..3dd7e419540 100644 --- a/src/mame/atari/metalmx.h +++ b/src/mame/atari/metalmx.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/cage.h" +#include "cage.h" #include "cpu/adsp2100/adsp2100.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/atari/mhavoc.cpp b/src/mame/atari/mhavoc.cpp index 264b9e9ac79..7ec3832d1cd 100644 --- a/src/mame/atari/mhavoc.cpp +++ b/src/mame/atari/mhavoc.cpp @@ -190,10 +190,11 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mhavoc.h" +#include "mhavoc.h" + +#include "avgdvg.h" #include "cpu/m6502/m6502.h" -#include "video/avgdvg.h" #include "video/vector.h" #include "machine/eeprompar.h" #include "machine/rescap.h" diff --git a/src/mame/atari/mhavoc_m.cpp b/src/mame/atari/mhavoc_m.cpp index 49419f2bd3c..ec2e11414db 100644 --- a/src/mame/atari/mhavoc_m.cpp +++ b/src/mame/atari/mhavoc_m.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cpu/m6502/m6502.h" -#include "includes/mhavoc.h" +#include "mhavoc.h" /************************************* diff --git a/src/mame/atari/nitedrvr.cpp b/src/mame/atari/nitedrvr.cpp index 33b75b7376c..08cd5ba0530 100644 --- a/src/mame/atari/nitedrvr.cpp +++ b/src/mame/atari/nitedrvr.cpp @@ -37,7 +37,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/nitedrvr.h" +#include "nitedrvr.h" #include "cpu/m6502/m6502.h" #include "machine/rescap.h" diff --git a/src/mame/atari/nitedrvr_a.cpp b/src/mame/atari/nitedrvr_a.cpp index d376a3d3a06..d8f83464b0d 100644 --- a/src/mame/atari/nitedrvr_a.cpp +++ b/src/mame/atari/nitedrvr_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/nitedrvr.h" +#include "nitedrvr.h" #include "sound/discrete.h" diff --git a/src/mame/atari/nitedrvr_m.cpp b/src/mame/atari/nitedrvr_m.cpp index 6c9b7a34c49..2402bde8680 100644 --- a/src/mame/atari/nitedrvr_m.cpp +++ b/src/mame/atari/nitedrvr_m.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/nitedrvr.h" +#include "nitedrvr.h" #include "sound/discrete.h" /*************************************************************************** diff --git a/src/mame/atari/nitedrvr_v.cpp b/src/mame/atari/nitedrvr_v.cpp index fe9e5b1d009..cd72d94f37b 100644 --- a/src/mame/atari/nitedrvr_v.cpp +++ b/src/mame/atari/nitedrvr_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/nitedrvr.h" +#include "nitedrvr.h" void nitedrvr_state::draw_box(bitmap_ind16 &bitmap, const rectangle &cliprect, int bx, int by, int ex, int ey) diff --git a/src/mame/atari/offtwall.cpp b/src/mame/atari/offtwall.cpp index 157a2858ee8..c303a855dc5 100644 --- a/src/mame/atari/offtwall.cpp +++ b/src/mame/atari/offtwall.cpp @@ -20,7 +20,7 @@ #include "emu.h" -#include "includes/offtwall.h" +#include "offtwall.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/offtwall.h b/src/mame/atari/offtwall.h index 840cd0902ff..6027e0ba236 100644 --- a/src/mame/atari/offtwall.h +++ b/src/mame/atari/offtwall.h @@ -10,9 +10,9 @@ #pragma once -#include "audio/atarijsa.h" -#include "video/atarimo.h" -#include "video/atarivad.h" +#include "atarijsa.h" +#include "atarimo.h" +#include "atarivad.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/offtwall_v.cpp b/src/mame/atari/offtwall_v.cpp index d60f75dc519..730473212a5 100644 --- a/src/mame/atari/offtwall_v.cpp +++ b/src/mame/atari/offtwall_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/offtwall.h" +#include "offtwall.h" diff --git a/src/mame/atari/orbit.cpp b/src/mame/atari/orbit.cpp index 295bf643bdf..138c06aa679 100644 --- a/src/mame/atari/orbit.cpp +++ b/src/mame/atari/orbit.cpp @@ -20,7 +20,7 @@ Atari Orbit Driver ***************************************************************************/ #include "emu.h" -#include "includes/orbit.h" +#include "orbit.h" #include "cpu/m6800/m6800.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/orbit_a.cpp b/src/mame/atari/orbit_a.cpp index 175a8551595..23cf47b8f6f 100644 --- a/src/mame/atari/orbit_a.cpp +++ b/src/mame/atari/orbit_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/orbit.h" +#include "orbit.h" /************************************* * diff --git a/src/mame/atari/orbit_v.cpp b/src/mame/atari/orbit_v.cpp index c1db3fc2efd..5f872bee3fa 100644 --- a/src/mame/atari/orbit_v.cpp +++ b/src/mame/atari/orbit_v.cpp @@ -7,7 +7,7 @@ Atari Orbit video emulation ***************************************************************************/ #include "emu.h" -#include "includes/orbit.h" +#include "orbit.h" void orbit_state::playfield_w(offs_t offset, uint8_t data) { diff --git a/src/mame/atari/pofo.cpp b/src/mame/atari/pofo.cpp index 4933dea6720..21cd26692b4 100644 --- a/src/mame/atari/pofo.cpp +++ b/src/mame/atari/pofo.cpp @@ -37,7 +37,7 @@ #include "bus/pofo/ccm.h" #include "bus/pofo/exp.h" #include "machine/nvram.h" -#include "machine/pofo_kbd.h" +#include "pofo_kbd.h" #include "machine/ram.h" #include "machine/timer.h" #include "sound/pcd3311.h" diff --git a/src/mame/atari/pofo_kbd.cpp b/src/mame/atari/pofo_kbd.cpp index c5aa80d0955..2b2010c6652 100644 --- a/src/mame/atari/pofo_kbd.cpp +++ b/src/mame/atari/pofo_kbd.cpp @@ -3,7 +3,7 @@ #include "emu.h" -#include "machine/pofo_kbd.h" +#include "pofo_kbd.h" #include "machine/keyboard.ipp" diff --git a/src/mame/atari/pong.cpp b/src/mame/atari/pong.cpp index 8fa0c9f4126..7bd96d00b6a 100644 --- a/src/mame/atari/pong.cpp +++ b/src/mame/atari/pong.cpp @@ -57,10 +57,10 @@ TODO: Volleyball... #include "netlist/devices/net_lib.h" -#include "machine/nl_breakout.h" -#include "machine/nl_rebound.h" -#include "machine/nl_pong.h" -#include "machine/nl_pongdoubles.h" +#include "nl_breakout.h" +#include "nl_rebound.h" +#include "nl_pong.h" +#include "nl_pongdoubles.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/atari/poolshrk.cpp b/src/mame/atari/poolshrk.cpp index c8bcabdbc36..788f2fb994b 100644 --- a/src/mame/atari/poolshrk.cpp +++ b/src/mame/atari/poolshrk.cpp @@ -7,7 +7,7 @@ Atari Poolshark Driver ***************************************************************************/ #include "emu.h" -#include "includes/poolshrk.h" +#include "poolshrk.h" #include "cpu/m6800/m6800.h" #include "sound/discrete.h" diff --git a/src/mame/atari/poolshrk_a.cpp b/src/mame/atari/poolshrk_a.cpp index b69d2f4c9b4..8afcb513aa8 100644 --- a/src/mame/atari/poolshrk_a.cpp +++ b/src/mame/atari/poolshrk_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/poolshrk.h" +#include "poolshrk.h" #include "sound/discrete.h" /************************************************************************/ diff --git a/src/mame/atari/poolshrk_v.cpp b/src/mame/atari/poolshrk_v.cpp index d87c7028eb3..e3854257d52 100644 --- a/src/mame/atari/poolshrk_v.cpp +++ b/src/mame/atari/poolshrk_v.cpp @@ -7,7 +7,7 @@ Atari Poolshark video emulation ***************************************************************************/ #include "emu.h" -#include "includes/poolshrk.h" +#include "poolshrk.h" diff --git a/src/mame/atari/quantum.cpp b/src/mame/atari/quantum.cpp index 16e0ef8a14a..e95094aeb80 100644 --- a/src/mame/atari/quantum.cpp +++ b/src/mame/atari/quantum.cpp @@ -49,13 +49,15 @@ NOTE: The Atari 136002-125 PROM in the sets below wasn't dumped from an actual ***************************************************************************/ #include "emu.h" +#include "avgdvg.h" + #include "cpu/m68000/m68000.h" -#include "video/vector.h" -#include "video/avgdvg.h" -#include "sound/pokey.h" -#include "sound/discrete.h" #include "machine/watchdog.h" #include "machine/x2212.h" +#include "sound/discrete.h" +#include "sound/pokey.h" +#include "video/vector.h" + #include "screen.h" #include "speaker.h" diff --git a/src/mame/atari/rampart.cpp b/src/mame/atari/rampart.cpp index f0317706a49..6ccb7cdd40b 100644 --- a/src/mame/atari/rampart.cpp +++ b/src/mame/atari/rampart.cpp @@ -25,7 +25,7 @@ #include "emu.h" -#include "includes/rampart.h" +#include "rampart.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/rampart.h b/src/mame/atari/rampart.h index df87e551677..ff9760b76ec 100644 --- a/src/mame/atari/rampart.h +++ b/src/mame/atari/rampart.h @@ -10,11 +10,11 @@ #pragma once -#include "machine/slapstic.h" +#include "slapstic.h" #include "machine/timer.h" #include "sound/okim6295.h" #include "sound/ymopl.h" -#include "video/atarimo.h" +#include "atarimo.h" #include "screen.h" class rampart_state : public driver_device diff --git a/src/mame/atari/rampart_v.cpp b/src/mame/atari/rampart_v.cpp index 1277d658e76..39fd346f368 100644 --- a/src/mame/atari/rampart_v.cpp +++ b/src/mame/atari/rampart_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/rampart.h" +#include "rampart.h" /************************************* * diff --git a/src/mame/atari/redbaron.cpp b/src/mame/atari/redbaron.cpp index 7873ac577cb..2db97bd8eeb 100644 --- a/src/mame/atari/redbaron.cpp +++ b/src/mame/atari/redbaron.cpp @@ -17,7 +17,7 @@ */ #include "emu.h" -#include "audio/redbaron.h" +#include "redbaron.h" #include "sound/pokey.h" #include diff --git a/src/mame/atari/relief.cpp b/src/mame/atari/relief.cpp index 16b6b824001..d9fbc3cc70e 100644 --- a/src/mame/atari/relief.cpp +++ b/src/mame/atari/relief.cpp @@ -87,7 +87,7 @@ ROM labels are in this format: #include "emu.h" -#include "includes/relief.h" +#include "relief.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/relief.h b/src/mame/atari/relief.h index a3eb0f1239e..823f6a974e6 100644 --- a/src/mame/atari/relief.h +++ b/src/mame/atari/relief.h @@ -12,8 +12,8 @@ #include "sound/okim6295.h" #include "sound/ymopl.h" -#include "video/atarimo.h" -#include "video/atarivad.h" +#include "atarimo.h" +#include "atarivad.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/relief_v.cpp b/src/mame/atari/relief_v.cpp index b8a4d405eb2..bf38bf2d1b1 100644 --- a/src/mame/atari/relief_v.cpp +++ b/src/mame/atari/relief_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/relief.h" +#include "relief.h" diff --git a/src/mame/atari/shuuz.cpp b/src/mame/atari/shuuz.cpp index 93ee80dc573..8d6842d9de0 100644 --- a/src/mame/atari/shuuz.cpp +++ b/src/mame/atari/shuuz.cpp @@ -20,7 +20,7 @@ #include "emu.h" -#include "includes/shuuz.h" +#include "shuuz.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/shuuz.h b/src/mame/atari/shuuz.h index cfe3a0db8b9..da385533471 100644 --- a/src/mame/atari/shuuz.h +++ b/src/mame/atari/shuuz.h @@ -10,8 +10,8 @@ #pragma once -#include "video/atarimo.h" -#include "video/atarivad.h" +#include "atarimo.h" +#include "atarivad.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/shuuz_v.cpp b/src/mame/atari/shuuz_v.cpp index 8c2013e8c4a..301cd6e3e7a 100644 --- a/src/mame/atari/shuuz_v.cpp +++ b/src/mame/atari/shuuz_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/shuuz.h" +#include "shuuz.h" diff --git a/src/mame/atari/skullxbo.cpp b/src/mame/atari/skullxbo.cpp index e45a86b200a..9115f4b4a29 100644 --- a/src/mame/atari/skullxbo.cpp +++ b/src/mame/atari/skullxbo.cpp @@ -20,7 +20,7 @@ #include "emu.h" -#include "includes/skullxbo.h" +#include "skullxbo.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/skullxbo.h b/src/mame/atari/skullxbo.h index 0262881b079..f09b51c047a 100644 --- a/src/mame/atari/skullxbo.h +++ b/src/mame/atari/skullxbo.h @@ -10,10 +10,10 @@ #pragma once -#include "machine/atarigen.h" +#include "atarigen.h" #include "machine/timer.h" -#include "audio/atarijsa.h" -#include "video/atarimo.h" +#include "atarijsa.h" +#include "atarimo.h" #include "tilemap.h" class skullxbo_state : public atarigen_state diff --git a/src/mame/atari/skullxbo_v.cpp b/src/mame/atari/skullxbo_v.cpp index 0d1e5e926ba..95b314ca399 100644 --- a/src/mame/atari/skullxbo_v.cpp +++ b/src/mame/atari/skullxbo_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/skullxbo.h" +#include "skullxbo.h" diff --git a/src/mame/atari/skydiver.cpp b/src/mame/atari/skydiver.cpp index 4cf1db44455..863f8e43ac9 100644 --- a/src/mame/atari/skydiver.cpp +++ b/src/mame/atari/skydiver.cpp @@ -89,7 +89,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/skydiver.h" +#include "skydiver.h" #include "cpu/m6800/m6800.h" #include "sound/discrete.h" diff --git a/src/mame/atari/skydiver_a.cpp b/src/mame/atari/skydiver_a.cpp index dc1a303d9de..ea00a060e25 100644 --- a/src/mame/atari/skydiver_a.cpp +++ b/src/mame/atari/skydiver_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/skydiver.h" +#include "skydiver.h" #include "sound/discrete.h" diff --git a/src/mame/atari/skydiver_v.cpp b/src/mame/atari/skydiver_v.cpp index 7b4256333b6..02efc143ced 100644 --- a/src/mame/atari/skydiver_v.cpp +++ b/src/mame/atari/skydiver_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/skydiver.h" +#include "skydiver.h" #include "sound/discrete.h" diff --git a/src/mame/atari/skyraid.cpp b/src/mame/atari/skyraid.cpp index 8c249df687c..08d2b58b40b 100644 --- a/src/mame/atari/skyraid.cpp +++ b/src/mame/atari/skyraid.cpp @@ -7,7 +7,7 @@ Atari Sky Raider driver ***************************************************************************/ #include "emu.h" -#include "includes/skyraid.h" +#include "skyraid.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/skyraid_a.cpp b/src/mame/atari/skyraid_a.cpp index bf472d72de6..b0b0000e92e 100644 --- a/src/mame/atari/skyraid_a.cpp +++ b/src/mame/atari/skyraid_a.cpp @@ -6,7 +6,7 @@ ************************************************************************/ #include "emu.h" -#include "includes/skyraid.h" +#include "skyraid.h" /* Discrete Sound Input Nodes */ diff --git a/src/mame/atari/skyraid_v.cpp b/src/mame/atari/skyraid_v.cpp index 7e15caa40e3..05004185b16 100644 --- a/src/mame/atari/skyraid_v.cpp +++ b/src/mame/atari/skyraid_v.cpp @@ -7,7 +7,7 @@ Atari Sky Raider video emulation ***************************************************************************/ #include "emu.h" -#include "includes/skyraid.h" +#include "skyraid.h" void skyraid_state::video_start() diff --git a/src/mame/atari/slapstic.cpp b/src/mame/atari/slapstic.cpp index dfef29b2844..b2de723df47 100644 --- a/src/mame/atari/slapstic.cpp +++ b/src/mame/atari/slapstic.cpp @@ -197,7 +197,7 @@ #include "emu.h" -#include "machine/slapstic.h" +#include "slapstic.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/atari/sprint2.cpp b/src/mame/atari/sprint2.cpp index 856056f586f..5ad67136259 100644 --- a/src/mame/atari/sprint2.cpp +++ b/src/mame/atari/sprint2.cpp @@ -20,7 +20,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/sprint2.h" +#include "sprint2.h" #include "cpu/m6502/m6502.h" #include "sound/discrete.h" diff --git a/src/mame/atari/sprint2_a.cpp b/src/mame/atari/sprint2_a.cpp index 068143070c6..95fb6ee3eac 100644 --- a/src/mame/atari/sprint2_a.cpp +++ b/src/mame/atari/sprint2_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/sprint2.h" +#include "sprint2.h" /************************************************************************/ diff --git a/src/mame/atari/sprint2_v.cpp b/src/mame/atari/sprint2_v.cpp index dbcc0a21d2d..1f00c6cc3fe 100644 --- a/src/mame/atari/sprint2_v.cpp +++ b/src/mame/atari/sprint2_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/sprint2.h" +#include "sprint2.h" void sprint2_state::palette(palette_device &palette) const diff --git a/src/mame/atari/sprint4.cpp b/src/mame/atari/sprint4.cpp index f5e5049ead3..8c422ad1541 100644 --- a/src/mame/atari/sprint4.cpp +++ b/src/mame/atari/sprint4.cpp @@ -7,7 +7,7 @@ Atari Sprint 4 driver ***************************************************************************/ #include "emu.h" -#include "audio/sprint4.h" +#include "sprint4_a.h" #include "cpu/m6502/m6502.h" #include "machine/74259.h" diff --git a/src/mame/atari/sprint4_a.cpp b/src/mame/atari/sprint4_a.cpp index 51e86a9b72b..d2a9cdc91b7 100644 --- a/src/mame/atari/sprint4_a.cpp +++ b/src/mame/atari/sprint4_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "sprint4.h" +#include "sprint4_a.h" #include "sound/discrete.h" diff --git a/src/mame/atari/sprint8.cpp b/src/mame/atari/sprint8.cpp index ef9653f4886..5dee6532124 100644 --- a/src/mame/atari/sprint8.cpp +++ b/src/mame/atari/sprint8.cpp @@ -7,7 +7,7 @@ Atari Sprint 8 driver ***************************************************************************/ #include "emu.h" -#include "includes/sprint8.h" +#include "sprint8.h" #include "cpu/m6800/m6800.h" diff --git a/src/mame/atari/sprint8_a.cpp b/src/mame/atari/sprint8_a.cpp index c05a83bc890..de0962e259a 100644 --- a/src/mame/atari/sprint8_a.cpp +++ b/src/mame/atari/sprint8_a.cpp @@ -6,7 +6,7 @@ ************************************************************************/ #include "emu.h" -#include "includes/sprint8.h" +#include "sprint8.h" #include "speaker.h" diff --git a/src/mame/atari/sprint8_v.cpp b/src/mame/atari/sprint8_v.cpp index 5de26f55658..c38636f7fbc 100644 --- a/src/mame/atari/sprint8_v.cpp +++ b/src/mame/atari/sprint8_v.cpp @@ -7,7 +7,7 @@ Atari Sprint 8 video emulation ***************************************************************************/ #include "emu.h" -#include "includes/sprint8.h" +#include "sprint8.h" void sprint8_state::sprint8_palette(palette_device &palette) const diff --git a/src/mame/atari/starshp1.cpp b/src/mame/atari/starshp1.cpp index 354167efce5..3b6b1436816 100644 --- a/src/mame/atari/starshp1.cpp +++ b/src/mame/atari/starshp1.cpp @@ -10,7 +10,7 @@ Atari Starship 1 driver ***************************************************************************/ #include "emu.h" -#include "includes/starshp1.h" +#include "starshp1.h" #include "cpu/m6502/m6502.h" #include "machine/74259.h" diff --git a/src/mame/atari/starshp1_a.cpp b/src/mame/atari/starshp1_a.cpp index f236ae5faab..5b262b7403e 100644 --- a/src/mame/atari/starshp1_a.cpp +++ b/src/mame/atari/starshp1_a.cpp @@ -6,7 +6,7 @@ ************************************************************************/ #include "emu.h" -#include "includes/starshp1.h" +#include "starshp1.h" #include "sound/discrete.h" diff --git a/src/mame/atari/starshp1_v.cpp b/src/mame/atari/starshp1_v.cpp index d10266753fd..710607abccd 100644 --- a/src/mame/atari/starshp1_v.cpp +++ b/src/mame/atari/starshp1_v.cpp @@ -7,7 +7,7 @@ Atari Starship 1 video emulation ***************************************************************************/ #include "emu.h" -#include "includes/starshp1.h" +#include "starshp1.h" void starshp1_state::set_pens() diff --git a/src/mame/atari/starwars.cpp b/src/mame/atari/starwars.cpp index 63d5a40b436..f5b509ac607 100644 --- a/src/mame/atari/starwars.cpp +++ b/src/mame/atari/starwars.cpp @@ -25,14 +25,15 @@ ***************************************************************************/ #include "emu.h" -#include "includes/starwars.h" +#include "starwars.h" + +#include "avgdvg.h" #include "cpu/m6809/m6809.h" #include "machine/74259.h" #include "machine/adc0808.h" #include "machine/watchdog.h" #include "video/vector.h" -#include "video/avgdvg.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/atari/starwars.h b/src/mame/atari/starwars.h index 8ddb945ba56..7f3706ee3fb 100644 --- a/src/mame/atari/starwars.h +++ b/src/mame/atari/starwars.h @@ -12,7 +12,7 @@ #include "machine/6532riot.h" #include "machine/gen_latch.h" -#include "machine/slapstic.h" +#include "slapstic.h" #include "machine/x2212.h" #include "sound/pokey.h" #include "sound/tms5220.h" diff --git a/src/mame/atari/starwars_a.cpp b/src/mame/atari/starwars_a.cpp index 2ade0c31c18..9ae8b02a147 100644 --- a/src/mame/atari/starwars_a.cpp +++ b/src/mame/atari/starwars_a.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/starwars.h" +#include "starwars.h" /************************************* diff --git a/src/mame/atari/starwars_m.cpp b/src/mame/atari/starwars_m.cpp index 93836c10d2e..9417dabc789 100644 --- a/src/mame/atari/starwars_m.cpp +++ b/src/mame/atari/starwars_m.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/starwars.h" +#include "starwars.h" /* Constants for matrix processor operations */ diff --git a/src/mame/atari/subs.cpp b/src/mame/atari/subs.cpp index 27db54a2313..ed9f3bc7269 100644 --- a/src/mame/atari/subs.cpp +++ b/src/mame/atari/subs.cpp @@ -20,7 +20,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/subs.h" +#include "subs.h" #include "cpu/m6502/m6502.h" #include "machine/74259.h" diff --git a/src/mame/atari/subs_a.cpp b/src/mame/atari/subs_a.cpp index 7ca93c95fb5..f9f0f1a5c8c 100644 --- a/src/mame/atari/subs_a.cpp +++ b/src/mame/atari/subs_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/subs.h" +#include "subs.h" #include "sound/discrete.h" diff --git a/src/mame/atari/subs_m.cpp b/src/mame/atari/subs_m.cpp index 6c2d9e41dde..6cfc87ecd56 100644 --- a/src/mame/atari/subs_m.cpp +++ b/src/mame/atari/subs_m.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/subs.h" +#include "subs.h" /*************************************************************************** diff --git a/src/mame/atari/subs_v.cpp b/src/mame/atari/subs_v.cpp index 4611c1e01cd..27ace00b6c3 100644 --- a/src/mame/atari/subs_v.cpp +++ b/src/mame/atari/subs_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/subs.h" +#include "subs.h" #include "sound/discrete.h" WRITE_LINE_MEMBER(subs_state::invert1_w) diff --git a/src/mame/atari/tank8.cpp b/src/mame/atari/tank8.cpp index 06114fc4d39..95379f5c69a 100644 --- a/src/mame/atari/tank8.cpp +++ b/src/mame/atari/tank8.cpp @@ -7,7 +7,7 @@ Atari Tank 8 driver ***************************************************************************/ #include "emu.h" -#include "includes/tank8.h" +#include "tank8.h" #include "cpu/m6800/m6800.h" #include "sound/discrete.h" diff --git a/src/mame/atari/tank8_a.cpp b/src/mame/atari/tank8_a.cpp index 4db13355148..b16c8c8c167 100644 --- a/src/mame/atari/tank8_a.cpp +++ b/src/mame/atari/tank8_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/tank8.h" +#include "tank8.h" #include "sound/discrete.h" diff --git a/src/mame/atari/tank8_v.cpp b/src/mame/atari/tank8_v.cpp index 6ad9375d745..8d114ce3650 100644 --- a/src/mame/atari/tank8_v.cpp +++ b/src/mame/atari/tank8_v.cpp @@ -7,7 +7,7 @@ Atari Tank 8 video emulation ***************************************************************************/ #include "emu.h" -#include "includes/tank8.h" +#include "tank8.h" void tank8_state::tank8_palette(palette_device &palette) const diff --git a/src/mame/atari/tempest.cpp b/src/mame/atari/tempest.cpp index ec44346443d..6a57980f0a3 100644 --- a/src/mame/atari/tempest.cpp +++ b/src/mame/atari/tempest.cpp @@ -276,18 +276,22 @@ Note: Roms for Tempest Analog Vector-Generator PCB Assembly A037383-03 or A03738 ***************************************************************************/ #include "emu.h" +#include "avgdvg.h" +#include "mathbox.h" + #include "cpu/m6502/m6502.h" -#include "machine/mathbox.h" +#include "machine/er2055.h" #include "machine/rescap.h" #include "machine/watchdog.h" -#include "video/avgdvg.h" -#include "video/vector.h" -#include "machine/er2055.h" #include "sound/pokey.h" +#include "video/vector.h" + #include "screen.h" #include "speaker.h" +namespace { + static constexpr XTAL MASTER_CLOCK = 12.096_MHz_XTAL; static constexpr XTAL CLOCK_3KHZ = MASTER_CLOCK / 4096; @@ -909,6 +913,8 @@ ROM_START( temptube ) ROMX_LOAD( "136002-127.e1", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3)) ROM_END +} // anonymous namespace + /************************************* * diff --git a/src/mame/atari/thunderj.cpp b/src/mame/atari/thunderj.cpp index dbe6564df84..066184f7d1e 100644 --- a/src/mame/atari/thunderj.cpp +++ b/src/mame/atari/thunderj.cpp @@ -37,7 +37,7 @@ #include "emu.h" -#include "includes/thunderj.h" +#include "thunderj.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/thunderj.h b/src/mame/atari/thunderj.h index 2cc279117eb..1a54dc7150c 100644 --- a/src/mame/atari/thunderj.h +++ b/src/mame/atari/thunderj.h @@ -10,9 +10,9 @@ #pragma once -#include "audio/atarijsa.h" -#include "video/atarimo.h" -#include "video/atarivad.h" +#include "atarijsa.h" +#include "atarimo.h" +#include "atarivad.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/thunderj_v.cpp b/src/mame/atari/thunderj_v.cpp index db6dc0fc7ff..bb27cb09be6 100644 --- a/src/mame/atari/thunderj_v.cpp +++ b/src/mame/atari/thunderj_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/thunderj.h" +#include "thunderj.h" diff --git a/src/mame/atari/tomcat.cpp b/src/mame/atari/tomcat.cpp index 248735a0409..b38848d6a6f 100644 --- a/src/mame/atari/tomcat.cpp +++ b/src/mame/atari/tomcat.cpp @@ -25,11 +25,12 @@ */ #include "emu.h" +#include "avgdvg.h" + #include "cpu/m68000/m68000.h" #include "cpu/tms32010/tms32010.h" #include "cpu/m6502/m6502.h" #include "video/vector.h" -#include "video/avgdvg.h" #include "machine/74259.h" #include "machine/adc0808.h" #include "machine/timekpr.h" @@ -39,6 +40,7 @@ #include "sound/pokey.h" #include "sound/tms5220.h" #include "sound/ymopm.h" + #include "screen.h" #include "speaker.h" diff --git a/src/mame/atari/toobin.cpp b/src/mame/atari/toobin.cpp index 68f34218255..08d793ae044 100644 --- a/src/mame/atari/toobin.cpp +++ b/src/mame/atari/toobin.cpp @@ -23,7 +23,7 @@ #include "emu.h" -#include "includes/toobin.h" +#include "toobin.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/toobin.h b/src/mame/atari/toobin.h index 861a5620ad2..4728ec3b454 100644 --- a/src/mame/atari/toobin.h +++ b/src/mame/atari/toobin.h @@ -10,8 +10,8 @@ #pragma once -#include "audio/atarijsa.h" -#include "video/atarimo.h" +#include "atarijsa.h" +#include "atarimo.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/toobin_v.cpp b/src/mame/atari/toobin_v.cpp index d1fe95c1e7e..b767bc87bed 100644 --- a/src/mame/atari/toobin_v.cpp +++ b/src/mame/atari/toobin_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/toobin.h" +#include "toobin.h" diff --git a/src/mame/atari/tourtabl.cpp b/src/mame/atari/tourtabl.cpp index d11940961b5..122667da571 100644 --- a/src/mame/atari/tourtabl.cpp +++ b/src/mame/atari/tourtabl.cpp @@ -13,7 +13,7 @@ #include "cpu/m6502/m6507.h" #include "machine/watchdog.h" #include "sound/tiaintf.h" -#include "video/tia.h" +#include "tia.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/atari/triplhnt.cpp b/src/mame/atari/triplhnt.cpp index f36f59ae742..5833214e761 100644 --- a/src/mame/atari/triplhnt.cpp +++ b/src/mame/atari/triplhnt.cpp @@ -9,7 +9,7 @@ Atari Triple Hunt Driver ***************************************************************************/ #include "emu.h" -#include "includes/triplhnt.h" +#include "triplhnt.h" #include "cpu/m6800/m6800.h" #include "machine/nvram.h" #include "speaker.h" diff --git a/src/mame/atari/triplhnt_a.cpp b/src/mame/atari/triplhnt_a.cpp index d0ddba719d2..9c7cca937dd 100644 --- a/src/mame/atari/triplhnt_a.cpp +++ b/src/mame/atari/triplhnt_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/triplhnt.h" +#include "triplhnt.h" #include "sound/discrete.h" diff --git a/src/mame/atari/triplhnt_v.cpp b/src/mame/atari/triplhnt_v.cpp index bd9a1566596..0e4e6604b72 100644 --- a/src/mame/atari/triplhnt_v.cpp +++ b/src/mame/atari/triplhnt_v.cpp @@ -7,7 +7,7 @@ Atari Triple Hunt video emulation ***************************************************************************/ #include "emu.h" -#include "includes/triplhnt.h" +#include "triplhnt.h" TILE_GET_INFO_MEMBER(triplhnt_state::get_tile_info) diff --git a/src/mame/atari/tunhunt.cpp b/src/mame/atari/tunhunt.cpp index 10885dd218b..3c9fcd06c72 100644 --- a/src/mame/atari/tunhunt.cpp +++ b/src/mame/atari/tunhunt.cpp @@ -46,7 +46,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/tunhunt.h" +#include "tunhunt.h" #include "cpu/m6502/m6502.h" #include "machine/rescap.h" diff --git a/src/mame/atari/tunhunt_v.cpp b/src/mame/atari/tunhunt_v.cpp index a9fbcc8e7c5..489f8cf69c6 100644 --- a/src/mame/atari/tunhunt_v.cpp +++ b/src/mame/atari/tunhunt_v.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/tunhunt.h" +#include "tunhunt.h" /****************************************************************************************/ diff --git a/src/mame/atari/tvboy.cpp b/src/mame/atari/tvboy.cpp index b1588cae326..153cef6339e 100644 --- a/src/mame/atari/tvboy.cpp +++ b/src/mame/atari/tvboy.cpp @@ -11,7 +11,7 @@ TODO: #include "emu.h" -#include "includes/a2600.h" +#include "a2600.h" #include "machine/bankdev.h" #include "screen.h" diff --git a/src/mame/atari/ultratnk.cpp b/src/mame/atari/ultratnk.cpp index 19be1b1f5b0..7d639721e11 100644 --- a/src/mame/atari/ultratnk.cpp +++ b/src/mame/atari/ultratnk.cpp @@ -7,9 +7,10 @@ Atari Ultra Tank driver ***************************************************************************/ #include "emu.h" -#include "includes/ultratnk.h" +#include "ultratnk.h" + +#include "sprint4_a.h" -#include "audio/sprint4.h" #include "cpu/m6502/m6502.h" #include "machine/74259.h" #include "speaker.h" diff --git a/src/mame/atari/ultratnk_v.cpp b/src/mame/atari/ultratnk_v.cpp index a2d22a6888d..04f6fc67f2d 100644 --- a/src/mame/atari/ultratnk_v.cpp +++ b/src/mame/atari/ultratnk_v.cpp @@ -7,8 +7,8 @@ Atari Ultra Tank video emulation ***************************************************************************/ #include "emu.h" -#include "includes/ultratnk.h" -#include "audio/sprint4.h" +#include "ultratnk.h" +#include "sprint4_a.h" void ultratnk_state::ultratnk_palette(palette_device &palette) const diff --git a/src/mame/atari/videopin.cpp b/src/mame/atari/videopin.cpp index d2dee57baf4..83580fc733c 100644 --- a/src/mame/atari/videopin.cpp +++ b/src/mame/atari/videopin.cpp @@ -18,7 +18,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/videopin.h" +#include "videopin.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/videopin_a.cpp b/src/mame/atari/videopin_a.cpp index 023cbd06377..a253243c242 100644 --- a/src/mame/atari/videopin_a.cpp +++ b/src/mame/atari/videopin_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/videopin.h" +#include "videopin.h" #include "sound/discrete.h" diff --git a/src/mame/atari/videopin_v.cpp b/src/mame/atari/videopin_v.cpp index 70be91fcd9d..543aaa9651b 100644 --- a/src/mame/atari/videopin_v.cpp +++ b/src/mame/atari/videopin_v.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/videopin.h" +#include "videopin.h" diff --git a/src/mame/atari/vindictr.cpp b/src/mame/atari/vindictr.cpp index 2a1e31d56cb..a3f70baefd3 100644 --- a/src/mame/atari/vindictr.cpp +++ b/src/mame/atari/vindictr.cpp @@ -20,7 +20,7 @@ #include "emu.h" -#include "includes/vindictr.h" +#include "vindictr.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/vindictr.h b/src/mame/atari/vindictr.h index 604f2382bf3..5970698bb53 100644 --- a/src/mame/atari/vindictr.h +++ b/src/mame/atari/vindictr.h @@ -11,8 +11,8 @@ #pragma once #include "machine/timer.h" -#include "audio/atarijsa.h" -#include "video/atarimo.h" +#include "atarijsa.h" +#include "atarimo.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/vindictr_v.cpp b/src/mame/atari/vindictr_v.cpp index 1cdd69d0ee4..b1e1e0bce2d 100644 --- a/src/mame/atari/vindictr_v.cpp +++ b/src/mame/atari/vindictr_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/vindictr.h" +#include "vindictr.h" diff --git a/src/mame/atari/wolfpack.cpp b/src/mame/atari/wolfpack.cpp index bc7291a2abb..13d5183adb1 100644 --- a/src/mame/atari/wolfpack.cpp +++ b/src/mame/atari/wolfpack.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/wolfpack.h" +#include "wolfpack.h" #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" diff --git a/src/mame/atari/wolfpack_v.cpp b/src/mame/atari/wolfpack_v.cpp index ecbaea61e32..6bced900b90 100644 --- a/src/mame/atari/wolfpack_v.cpp +++ b/src/mame/atari/wolfpack_v.cpp @@ -7,7 +7,7 @@ Atari Wolf Pack (prototype) video emulation ***************************************************************************/ #include "emu.h" -#include "includes/wolfpack.h" +#include "wolfpack.h" void wolfpack_state::wolfpack_palette(palette_device &palette) const diff --git a/src/mame/atari/xybots.cpp b/src/mame/atari/xybots.cpp index ef1e958affc..b9558089848 100644 --- a/src/mame/atari/xybots.cpp +++ b/src/mame/atari/xybots.cpp @@ -20,7 +20,7 @@ #include "emu.h" -#include "includes/xybots.h" +#include "xybots.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/atari/xybots.h b/src/mame/atari/xybots.h index fb51623b00b..81318cc594d 100644 --- a/src/mame/atari/xybots.h +++ b/src/mame/atari/xybots.h @@ -10,9 +10,9 @@ #pragma once -#include "machine/slapstic.h" -#include "audio/atarijsa.h" -#include "video/atarimo.h" +#include "slapstic.h" +#include "atarijsa.h" +#include "atarimo.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/atari/xybots_v.cpp b/src/mame/atari/xybots_v.cpp index 9da142807b9..4584b50ebb3 100644 --- a/src/mame/atari/xybots_v.cpp +++ b/src/mame/atari/xybots_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/xybots.h" +#include "xybots.h" diff --git a/src/mame/atlus/patapata.cpp b/src/mame/atlus/patapata.cpp index 60a868fc334..5df02b7894a 100644 --- a/src/mame/atlus/patapata.cpp +++ b/src/mame/atlus/patapata.cpp @@ -18,7 +18,7 @@ maybe close to jalmah.cpp? */ #include "emu.h" -#include "machine/nmk112.h" +#include "nmk112.h" #include "cpu/m68000/m68000.h" #include "machine/timer.h" diff --git a/src/mame/bally/astrohome.cpp b/src/mame/bally/astrohome.cpp deleted file mode 100644 index d619001c162..00000000000 --- a/src/mame/bally/astrohome.cpp +++ /dev/null @@ -1,294 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Nicola Salmoria, Mike Coates, Frank Palazzolo, Aaron Giles, Dirk Best -/**************************************************************************** - - Bally Astrocade consumer hardware - -****************************************************************************/ - -#include "emu.h" -#include "includes/astrocde.h" - -#include "cpu/z80/z80.h" -#include "machine/ram.h" -#include "sound/astrocde.h" - -#include "bus/astrocde/slot.h" -#include "bus/astrocde/rom.h" -#include "bus/astrocde/exp.h" -#include "bus/astrocde/ram.h" -#include "bus/astrocde/ctrl.h" -#include "bus/astrocde/accessory.h" - -#include "softlist_dev.h" -#include "speaker.h" - - -namespace { - -class astrocde_home_state : public astrocde_state -{ -public: - astrocde_home_state(const machine_config &mconfig, device_type type, const char *tag) - : astrocde_state(mconfig, type, tag) - , m_cart(*this, "cartslot") - , m_exp(*this, "exp") - , m_ctrl(*this, "ctrl%u", 1U) - , m_accessory(*this, "accessory") - , m_keypad(*this, "KEYPAD%u", 0U) - { } - - void astrocde(machine_config &config); - - void init_astrocde(); - -protected: - virtual void machine_start() override; - -private: - uint8_t inputs_r(offs_t offset); - - void astrocade_io(address_map &map); - void astrocade_mem(address_map &map); - - required_device m_cart; - required_device m_exp; - required_device_array m_ctrl; - required_device m_accessory; - required_ioport_array<4> m_keypad; -}; - -/********************************************************************************* - * - * Memory maps - * - * $0000 to $1FFF: 8K on-board ROM (could be one of three available BIOS dumps) - * $2000 to $3FFF: 8K cartridge ROM - * $4000 to $4FFF: 4K screen RAM - * $5000 to $FFFF: 44K address space not available in standard machine. With a - * sufficiently large RAM expansion, all of this RAM can be added, and accessed - * by an extended BASIC program. Bally and Astrocade BASIC can access from - * $5000 to $7FFF if available. - * - *********************************************************************************/ - -void astrocde_home_state::astrocade_mem(address_map &map) -{ - map(0x0000, 0x0fff).rom().w(FUNC(astrocde_home_state::astrocade_funcgen_w)); - map(0x1000, 0x3fff).rom(); /* Star Fortress writes in here?? */ - map(0x4000, 0x4fff).ram().share("videoram"); /* ASG */ - //map(0x5000, 0xffff).rw("exp", FUNC(astrocade_exp_device::read), FUNC(astrocade_exp_device::write)); -} - - -void astrocde_home_state::astrocade_io(address_map &map) -{ - map(0x00, 0x0f).select(0xff00).rw(FUNC(astrocde_state::video_register_r), FUNC(astrocde_state::video_register_w)); - map(0x10, 0x1f).select(0xff00).r("astrocade1", FUNC(astrocade_io_device::read)); - map(0x10, 0x18).select(0xff00).w("astrocade1", FUNC(astrocade_io_device::write)); - map(0x19, 0x19).mirror(0xff00).w(FUNC(astrocde_state::expand_register_w)); -} - -/************************************* - * - * Input ports - * - * - * The Astrocade has ports for four hand controllers. Each controller has a - * knob on top that can be simultaneously pushed as an eight-way joystick and - * twisted as a paddle, in addition to a trigger button. The knob can twist - * through about 270 degrees, registering 256 unique positions. It does not - * autocenter. When selecting options on the menu, twisting the knob to the - * right gives lower numbers, and twisting to the left gives larger numbers. - * Paddle games like Clowns have more intuitive behavior -- twisting to the - * right moves the character right. - * - * There is a 24-key keypad on the system itself (6 rows, 4 columns). It is - * labeled for the built-in calculator, but overlays were released for other - * programs, the most popular being the BASIC cartridges, which allowed a - * large number of inputs by making the bottom row shift buttons. The labels - * below first list the calculator key, then the BASIC keys in the order of no - * shift, GREEN shift, RED shift, BLUE shift, WORDS shift. - * - *************************************/ - -uint8_t astrocde_home_state::inputs_r(offs_t offset) -{ - if (BIT(offset, 2)) - return m_keypad[offset & 3]->read(); - else - return m_ctrl[offset & 3]->read_handle(); -} - -static INPUT_PORTS_START( astrocde ) - PORT_START("KEYPAD0") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("% \xC3\xB7 [ ] LIST") PORT_CODE(KEYCODE_O) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("/ x J K L NEXT") PORT_CODE(KEYCODE_SLASH_PAD) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("x - V W X IF") PORT_CODE(KEYCODE_ASTERISK) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("- + & @ * GOTO") PORT_CODE(KEYCODE_MINUS_PAD) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("+ = # % : PRINT") PORT_CODE(KEYCODE_PLUS_PAD) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("= WORDS Shift") PORT_CODE(KEYCODE_ENTER_PAD) - PORT_BIT(0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) - - PORT_START("KEYPAD1") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("\xE2\x86\x93 HALT RUN") PORT_CODE(KEYCODE_PGDN) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CH 9 G H I STEP") PORT_CODE(KEYCODE_H) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("9 6 S T U RND") PORT_CODE(KEYCODE_9) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("6 3 \xE2\x86\x91 . \xE2\x86\x93 BOX") PORT_CODE(KEYCODE_6) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("3 ERASE ( ; )") PORT_CODE(KEYCODE_3) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME(". BLUE Shift") PORT_CODE(KEYCODE_STOP) - PORT_BIT(0xc0, IP_ACTIVE_HIGH, IPT_UNUSED) - - PORT_START("KEYPAD2") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("\xE2\x86\x91 PAUSE / \\") PORT_CODE(KEYCODE_PGUP) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("MS 8 D E F TO") PORT_CODE(KEYCODE_S) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("8 5 P Q R RETN") PORT_CODE(KEYCODE_8) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("5 2 \xE2\x86\x90 ' \xE2\x86\x92 LINE") PORT_CODE(KEYCODE_5) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("2 0 < \" > INPUT") PORT_CODE(KEYCODE_2) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("0 RED Shift") PORT_CODE(KEYCODE_0) - PORT_BIT(0xc0, IP_ACTIVE_HIGH, IPT_UNUSED) - - PORT_START("KEYPAD3") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("C GO +10") PORT_CODE(KEYCODE_C) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("MR 7 A B C FOR") PORT_CODE(KEYCODE_R) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("7 4 M N O GOSB") PORT_CODE(KEYCODE_7) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("4 1 Y Z ! CLEAR") PORT_CODE(KEYCODE_4) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("1 SPACE $ , ?") PORT_CODE(KEYCODE_1) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CE GREEN Shift") PORT_CODE(KEYCODE_E) - PORT_BIT(0xc0, IP_ACTIVE_HIGH, IPT_UNUSED) -INPUT_PORTS_END - - -/************************************* - * - * Machine drivers - * - *************************************/ - -static void astrocade_cart(device_slot_interface &device) -{ - device.option_add_internal("rom", ASTROCADE_ROM_STD); - device.option_add_internal("rom_256k", ASTROCADE_ROM_256K); - device.option_add_internal("rom_512k", ASTROCADE_ROM_512K); - device.option_add_internal("rom_cass", ASTROCADE_ROM_CASS); -} - -static void astrocade_exp(device_slot_interface &device) -{ - device.option_add("blue_ram_4k", ASTROCADE_BLUERAM_4K); - device.option_add("blue_ram_16k", ASTROCADE_BLUERAM_16K); - device.option_add("blue_ram_32k", ASTROCADE_BLUERAM_32K); - device.option_add("viper_sys1", ASTROCADE_VIPER_SYS1); - device.option_add("lil_white_ram", ASTROCADE_WHITERAM); - device.option_add("rl64_ram", ASTROCADE_RL64RAM); -} - - -void astrocde_home_state::astrocde(machine_config &config) -{ - /* basic machine hardware */ - Z80(config, m_maincpu, ASTROCADE_CLOCK/4); /* 1.789 MHz */ - m_maincpu->set_addrmap(AS_PROGRAM, &astrocde_home_state::astrocade_mem); - m_maincpu->set_addrmap(AS_IO, &astrocde_home_state::astrocade_io); - - config.set_perfect_quantum(m_maincpu); - - /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(ASTROCADE_CLOCK, 455, 0, 352, 262, 0, 240); - m_screen->set_screen_update(FUNC(astrocde_state::screen_update_astrocde)); - m_screen->set_palette(m_palette); - - PALETTE(config, "palette", FUNC(astrocde_home_state::astrocade_palette), 512); - - /* control ports */ - for (uint32_t port = 0; port < 4; port++) - { - ASTROCADE_CTRL_PORT(config, m_ctrl[port], astrocade_controllers, port == 0 ? "joy" : nullptr); - m_ctrl[port]->ltpen_handler().set(FUNC(astrocde_home_state::lightpen_trigger_w)); - } - - /* sound hardware */ - SPEAKER(config, "mono").front_center(); - ASTROCADE_IO(config, m_astrocade_sound1, ASTROCADE_CLOCK/4); - m_astrocade_sound1->si_cb().set(FUNC(astrocde_home_state::inputs_r)); - m_astrocade_sound1->pot_cb<0>().set(m_ctrl[0], FUNC(astrocade_ctrl_port_device::read_knob)); - m_astrocade_sound1->pot_cb<1>().set(m_ctrl[1], FUNC(astrocade_ctrl_port_device::read_knob)); - m_astrocade_sound1->pot_cb<2>().set(m_ctrl[2], FUNC(astrocade_ctrl_port_device::read_knob)); - m_astrocade_sound1->pot_cb<3>().set(m_ctrl[3], FUNC(astrocade_ctrl_port_device::read_knob)); - m_astrocade_sound1->add_route(ALL_OUTPUTS, "mono", 1.0); - - /* expansion port */ - ASTROCADE_EXP_SLOT(config, m_exp, astrocade_exp, nullptr); - - /* cartridge */ - ASTROCADE_CART_SLOT(config, m_cart, astrocade_cart, nullptr); - - /* cartridge */ - ASTROCADE_ACCESSORY_PORT(config, m_accessory, m_screen, astrocade_accessories, nullptr); - m_accessory->ltpen_handler().set(FUNC(astrocde_home_state::lightpen_trigger_w)); - - /* Software lists */ - SOFTWARE_LIST(config, "cart_list").set_original("astrocde"); -} - - -/************************************* - * - * ROM definitions - * - *************************************/ - -ROM_START( astrocde ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "astro.bin", 0x0000, 0x2000, CRC(ebc77f3a) SHA1(b902c941997c9d150a560435bf517c6a28137ecc) ) -ROM_END - -ROM_START( astrocdl ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "ballyhlc.bin", 0x0000, 0x2000, CRC(d7c517ba) SHA1(6b2bef5d970e54ed204549f58ba6d197a8bfd3cc) ) -ROM_END - -ROM_START( astrocdw ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "bioswhit.bin", 0x0000, 0x2000, CRC(6eb53e79) SHA1(d84341feec1a0a0e8aa6151b649bc3cf6ef69fbf) ) -ROM_END - -/************************************* - * - * Driver initialization - * - *************************************/ - -void astrocde_home_state::init_astrocde() -{ - m_video_config = AC_SOUND_PRESENT; -} - -void astrocde_home_state::machine_start() -{ - if (m_cart->exists()) - m_maincpu->space(AS_PROGRAM).install_read_handler(0x2000, 0x3fff, read8sm_delegate(*m_cart, FUNC(astrocade_cart_slot_device::read_rom))); - - // if no RAM is mounted and the handlers are installed, the system starts with garbage on screen and a RESET is necessary - // thus, install RAM only if an expansion is mounted - if (m_exp->get_card_mounted()) - { - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x5000, 0xffff, read8sm_delegate(*m_exp, FUNC(astrocade_exp_device::read)), write8sm_delegate(*m_exp, FUNC(astrocade_exp_device::write))); - m_maincpu->space(AS_IO).install_readwrite_handler(0x0080, 0x00ff, 0x0000, 0x0000, 0xff00, read8sm_delegate(*m_exp, FUNC(astrocade_exp_device::read_io)), write8sm_delegate(*m_exp, FUNC(astrocade_exp_device::write_io))); - } -} - -} // Anonymous namespace - - -/************************************* - * - * Driver definitions - * - *************************************/ - -/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ -CONS( 1978, astrocde, 0, 0, astrocde, astrocde, astrocde_home_state, init_astrocde, "Bally Manufacturing", "Bally Professional Arcade", MACHINE_SUPPORTS_SAVE ) -CONS( 1977, astrocdl, astrocde, 0, astrocde, astrocde, astrocde_home_state, init_astrocde, "Bally Manufacturing", "Bally Home Library Computer", MACHINE_SUPPORTS_SAVE ) -CONS( 1977, astrocdw, astrocde, 0, astrocde, astrocde, astrocde_home_state, init_astrocde, "Bally Manufacturing", "Bally Computer System", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/bandai/wswan.cpp b/src/mame/bandai/wswan.cpp index 00036fe890a..4986fdba4c6 100644 --- a/src/mame/bandai/wswan.cpp +++ b/src/mame/bandai/wswan.cpp @@ -25,10 +25,12 @@ ***************************************************************************/ #include "emu.h" +#include "wswan_v.h" + +#include "wswansound.h" + #include "cpu/v30mz/v30mz.h" #include "machine/nvram.h" -#include "audio/wswan.h" -#include "video/wswan.h" #include "bus/wswan/slot.h" #include "bus/wswan/rom.h" #include "emupal.h" diff --git a/src/mame/bandai/wswan_v.cpp b/src/mame/bandai/wswan_v.cpp index 7825e9a48cb..cd39e76805d 100644 --- a/src/mame/bandai/wswan_v.cpp +++ b/src/mame/bandai/wswan_v.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "emu.h" -#include "wswan.h" +#include "wswan_v.h" #include "screen.h" DEFINE_DEVICE_TYPE(WSWAN_VIDEO, wswan_video_device, "wswan_video", "Bandai WonderSwam VDP") diff --git a/src/mame/barcrest/mpu3.cpp b/src/mame/barcrest/mpu3.cpp index 86b9d11c526..cace1839f78 100644 --- a/src/mame/barcrest/mpu3.cpp +++ b/src/mame/barcrest/mpu3.cpp @@ -102,6 +102,8 @@ TODO: - Distinguish door switches using manual ***********************************************************************************************************/ #include "emu.h" +#include "awpvid.h" //Fruit Machines Only + #include "machine/6821pia.h" #include "machine/6840ptm.h" #include "machine/input_merger.h" @@ -166,8 +168,6 @@ TODO: - Distinguish door switches using manual #define LOG(x) do { if (MPU3VERBOSE) logerror x; } while (0) -#include "video/awpvid.h" //Fruit Machines Only - /* Lookup table for CHR data */ struct mpu3_chr_table diff --git a/src/mame/barcrest/mpu4.cpp b/src/mame/barcrest/mpu4.cpp index 0552d6065de..9bc886624ad 100644 --- a/src/mame/barcrest/mpu4.cpp +++ b/src/mame/barcrest/mpu4.cpp @@ -215,9 +215,9 @@ To change between them, follow these instructions: ***********************************************************************************************************/ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" -#include "video/awpvid.h" //Fruit Machines Only +#include "awpvid.h" //Fruit Machines Only #include "machine/rescap.h" #include "speaker.h" diff --git a/src/mame/barcrest/mpu4.h b/src/mame/barcrest/mpu4.h index 1ebbe456a2d..cf2471657d8 100644 --- a/src/mame/barcrest/mpu4.h +++ b/src/mame/barcrest/mpu4.h @@ -1,27 +1,26 @@ // license:BSD-3-Clause // copyright-holders:David Haywood +#include "mpu4_characteriser_bootleg.h" +#include "mpu4_characteriser_pal.h" +#include "mpu4_characteriser_pal_bwb.h" + +#include "bacta_datalogger.h" + +#include "cpu/m6809/m6809.h" #include "machine/6821pia.h" #include "machine/6840ptm.h" #include "machine/mc68681.h" +#include "machine/meters.h" #include "machine/nvram.h" +#include "machine/roc10937.h" +#include "machine/steppers.h" #include "machine/timer.h" - -#include "cpu/m6809/m6809.h" #include "sound/ay8910.h" #include "sound/okim6376.h" #include "sound/upd7759.h" #include "sound/ymopl.h" -#include "machine/bacta_datalogger.h" -#include "machine/meters.h" -#include "machine/mpu4_characteriser_bootleg.h" -#include "machine/mpu4_characteriser_pal.h" -#include "machine/mpu4_characteriser_pal_bwb.h" -#include "machine/roc10937.h" -#include "machine/steppers.h" - - #include "emupal.h" diff --git a/src/mame/barcrest/mpu4avan.cpp b/src/mame/barcrest/mpu4avan.cpp index ed58880df4b..162d322171f 100644 --- a/src/mame/barcrest/mpu4avan.cpp +++ b/src/mame/barcrest/mpu4avan.cpp @@ -10,7 +10,7 @@ */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4bwb.cpp b/src/mame/barcrest/mpu4bwb.cpp index b83eba3fb4d..2b1a0289f25 100644 --- a/src/mame/barcrest/mpu4bwb.cpp +++ b/src/mame/barcrest/mpu4bwb.cpp @@ -71,7 +71,7 @@ */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4concept.cpp b/src/mame/barcrest/mpu4concept.cpp index ae6fc1c618e..ed596afb670 100644 --- a/src/mame/barcrest/mpu4concept.cpp +++ b/src/mame/barcrest/mpu4concept.cpp @@ -3,7 +3,7 @@ /* MPU4 games by 'Concept' */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4crystal.cpp b/src/mame/barcrest/mpu4crystal.cpp index 71be9c43135..a5f03688497 100644 --- a/src/mame/barcrest/mpu4crystal.cpp +++ b/src/mame/barcrest/mpu4crystal.cpp @@ -5,7 +5,7 @@ /* Crystal games tend to have scrambled ROM + a different sound chip */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4dealem.cpp b/src/mame/barcrest/mpu4dealem.cpp index 880b02b3760..c7635ff4b6a 100644 --- a/src/mame/barcrest/mpu4dealem.cpp +++ b/src/mame/barcrest/mpu4dealem.cpp @@ -12,7 +12,7 @@ the Deal 'Em board design, rather than the one they ultimately used, suggesting #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" #include "video/resnet.h" #include "video/mc6845.h" diff --git a/src/mame/barcrest/mpu4empire.cpp b/src/mame/barcrest/mpu4empire.cpp index e5a21f62cb7..61b46b1447d 100644 --- a/src/mame/barcrest/mpu4empire.cpp +++ b/src/mame/barcrest/mpu4empire.cpp @@ -3,7 +3,7 @@ /* MPU4 games by 'Empire' */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4mdm.cpp b/src/mame/barcrest/mpu4mdm.cpp index f62743b2951..99484b75141 100644 --- a/src/mame/barcrest/mpu4mdm.cpp +++ b/src/mame/barcrest/mpu4mdm.cpp @@ -3,7 +3,7 @@ /* MPU4 games by MDM */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4misc.cpp b/src/mame/barcrest/mpu4misc.cpp index f070853deae..5d895ed21d5 100644 --- a/src/mame/barcrest/mpu4misc.cpp +++ b/src/mame/barcrest/mpu4misc.cpp @@ -3,7 +3,7 @@ /* MPU4 sets from various other manufactuers which appear to be based off unique code / behaviors (no barcrest headers etc.) */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4mod2sw.cpp b/src/mame/barcrest/mpu4mod2sw.cpp index 7e51323f2c1..2e8afe4caaa 100644 --- a/src/mame/barcrest/mpu4mod2sw.cpp +++ b/src/mame/barcrest/mpu4mod2sw.cpp @@ -15,7 +15,7 @@ */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4mod4oki.cpp b/src/mame/barcrest/mpu4mod4oki.cpp index a3b9e174701..b9e186d19f6 100644 --- a/src/mame/barcrest/mpu4mod4oki.cpp +++ b/src/mame/barcrest/mpu4mod4oki.cpp @@ -139,7 +139,7 @@ */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4mod4yam.cpp b/src/mame/barcrest/mpu4mod4yam.cpp index 64650b51591..0868129c951 100644 --- a/src/mame/barcrest/mpu4mod4yam.cpp +++ b/src/mame/barcrest/mpu4mod4yam.cpp @@ -3,7 +3,7 @@ /* This is MPU4 MOD4 with a Y2413 instead of an OKI */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4plasma.cpp b/src/mame/barcrest/mpu4plasma.cpp index 95c98417d43..dc64223601d 100644 --- a/src/mame/barcrest/mpu4plasma.cpp +++ b/src/mame/barcrest/mpu4plasma.cpp @@ -7,7 +7,7 @@ // code currently uses a 'screen' but it has been since decided this is not how to handle such display types in MAME. #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" #include "cpu/m68000/m68000.h" #include "screen.h" diff --git a/src/mame/barcrest/mpu4union.cpp b/src/mame/barcrest/mpu4union.cpp index 3beb2960309..2a052add3dd 100644 --- a/src/mame/barcrest/mpu4union.cpp +++ b/src/mame/barcrest/mpu4union.cpp @@ -3,7 +3,7 @@ /* MPU4 games by 'Union' */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4unsorted.cpp b/src/mame/barcrest/mpu4unsorted.cpp index a6842ae65ce..ee20502c614 100644 --- a/src/mame/barcrest/mpu4unsorted.cpp +++ b/src/mame/barcrest/mpu4unsorted.cpp @@ -15,7 +15,7 @@ */ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" namespace { diff --git a/src/mame/barcrest/mpu4vid.cpp b/src/mame/barcrest/mpu4vid.cpp index 8da08e6d22f..342a5777eb6 100644 --- a/src/mame/barcrest/mpu4vid.cpp +++ b/src/mame/barcrest/mpu4vid.cpp @@ -175,7 +175,7 @@ TODO: - BWB sampled sound seems to not play despite hookup. ***********************************************************************************************************/ #include "emu.h" -#include "includes/mpu4.h" +#include "mpu4.h" #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/barcrest/mpu5.cpp b/src/mame/barcrest/mpu5.cpp index c2bfacd671d..2bd2366d988 100644 --- a/src/mame/barcrest/mpu5.cpp +++ b/src/mame/barcrest/mpu5.cpp @@ -141,7 +141,7 @@ MPU5 Horizon and Genesis machines use also a mux PCB for LEDs, lamps and buttons #include "emu.h" -#include "includes/mpu5.h" +#include "mpu5.h" #include "speaker.h" diff --git a/src/mame/barcrest/mpu5.h b/src/mame/barcrest/mpu5.h index d09b67eb528..eae2a755340 100644 --- a/src/mame/barcrest/mpu5.h +++ b/src/mame/barcrest/mpu5.h @@ -1,12 +1,13 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_MPU5_H -#define MAME_INCLUDES_MPU5_H +#ifndef MAME_BARCREST_MPU5_H +#define MAME_BARCREST_MPU5_H #pragma once +#include "sec.h" + #include "machine/68340.h" -#include "machine/sec.h" class mpu5_state : public driver_device @@ -56,4 +57,4 @@ private: INPUT_PORTS_EXTERN( mpu5 ); -#endif // MAME_INCLUDES_MPU5_H +#endif // MAME_BARCREST_MPU5_H diff --git a/src/mame/barcrest/mpu5sw.cpp b/src/mame/barcrest/mpu5sw.cpp index 495a8c0ab44..b1687fd053f 100644 --- a/src/mame/barcrest/mpu5sw.cpp +++ b/src/mame/barcrest/mpu5sw.cpp @@ -76,7 +76,7 @@ CON2 = Male DB9 for stake/jackpot D15 |_| 12V */ #include "emu.h" -#include "includes/mpu5.h" +#include "mpu5.h" // MFME2MAME layouts: #include "m5addams.lh" diff --git a/src/mame/be/bebox.cpp b/src/mame/be/bebox.cpp index 8f3a53d2ae3..9aec5606578 100644 --- a/src/mame/be/bebox.cpp +++ b/src/mame/be/bebox.cpp @@ -10,7 +10,7 @@ /* Core includes */ #include "emu.h" -#include "includes/bebox.h" +#include "bebox.h" /* Components */ #include "video/clgd542x.h" diff --git a/src/mame/be/bebox_m.cpp b/src/mame/be/bebox_m.cpp index 204fc095cc9..e4c30054d15 100644 --- a/src/mame/be/bebox_m.cpp +++ b/src/mame/be/bebox_m.cpp @@ -91,7 +91,7 @@ /* Core includes */ #include "emu.h" -#include "includes/bebox.h" +#include "bebox.h" /* Components */ #include "video/pc_vga.h" diff --git a/src/mame/bfm/bfcobra.cpp b/src/mame/bfm/bfcobra.cpp index 5741b50af9c..e37fa563bcc 100644 --- a/src/mame/bfm/bfcobra.cpp +++ b/src/mame/bfm/bfcobra.cpp @@ -103,7 +103,7 @@ #include "emu.h" -#include "video/bfm_dm01.h" +#include "bfm_dm01.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" diff --git a/src/mame/bfm/bfm_ad5.cpp b/src/mame/bfm/bfm_ad5.cpp index 4dab82980d5..35066900f67 100644 --- a/src/mame/bfm/bfm_ad5.cpp +++ b/src/mame/bfm/bfm_ad5.cpp @@ -114,9 +114,9 @@ A21 |30| CE1 */ #include "emu.h" -#include "includes/bfm_ad5.h" +#include "bfm_ad5.h" #include "machine/mcf5206e.h" -#include "machine/bfm_sc45_helper.h" +#include "bfm_sc45_helper.h" #include "speaker.h" void adder5_state::init_ad5() diff --git a/src/mame/bfm/bfm_ad5sw.cpp b/src/mame/bfm/bfm_ad5sw.cpp index a809b7dc762..b1ecf978284 100644 --- a/src/mame/bfm/bfm_ad5sw.cpp +++ b/src/mame/bfm/bfm_ad5sw.cpp @@ -13,8 +13,8 @@ */ #include "emu.h" -#include "includes/bfm_ad5.h" -#include "includes/bfm_sc4.h" // TODO: untangle from this +#include "bfm_ad5.h" +#include "bfm_sc4.h" // TODO: untangle from this #define ad5plds \ diff --git a/src/mame/bfm/bfm_adr2.cpp b/src/mame/bfm/bfm_adr2.cpp index 43784a6baf2..1b947b8826a 100644 --- a/src/mame/bfm/bfm_adr2.cpp +++ b/src/mame/bfm/bfm_adr2.cpp @@ -94,10 +94,10 @@ E000-FFFF | R | D D D D D D D D | 8K ROM #include "emu.h" -#include "video/bfm_adr2.h" +#include "bfm_adr2.h" #include "cpu/m6809/m6809.h" -#include "machine/bfm_bd1.h" // vfd +#include "bfm_bd1.h" // vfd #include "emupal.h" #include "screen.h" diff --git a/src/mame/bfm/bfm_sc1.cpp b/src/mame/bfm/bfm_sc1.cpp index 00092d95722..998e642cfac 100644 --- a/src/mame/bfm/bfm_sc1.cpp +++ b/src/mame/bfm/bfm_sc1.cpp @@ -88,20 +88,24 @@ Optional (on expansion card) (Viper) ***************************************************************************/ #include "emu.h" + +#include "bfm_adr2.h" +#include "bfm_bd1.h" // vfd +#include "bfm_comn.h" + +#include "awpvid.h" + #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" -#include "video/awpvid.h" -#include "video/bfm_adr2.h" -#include "machine/steppers.h" // stepper motor -#include "machine/bfm_bd1.h" // vfd +#include "machine/gen_latch.h" #include "machine/meters.h" -#include "sound/ay8910.h" -#include "sound/upd7759.h" #include "machine/nvram.h" -#include "machine/gen_latch.h" -#include "machine/watchdog.h" -#include "machine/bfm_comn.h" #include "machine/rescap.h" +#include "machine/steppers.h" // stepper motor +#include "machine/watchdog.h" +#include "sound/ay8910.h" +#include "sound/upd7759.h" + #include "speaker.h" #include "sc1_vfd.lh" @@ -119,6 +123,8 @@ Optional (on expansion card) (Viper) #include "sc1str4.lh" +namespace { + class bfm_sc1_state : public driver_device { public: @@ -1293,6 +1299,8 @@ void bfm_sc1_state::init_clatt() save_state(); } +} // anonymous namespace + // ROM definition /////////////////////////////////////////////////////////////////// diff --git a/src/mame/bfm/bfm_sc2.cpp b/src/mame/bfm/bfm_sc2.cpp index 3e94b8a4759..017a5035bec 100644 --- a/src/mame/bfm/bfm_sc2.cpp +++ b/src/mame/bfm/bfm_sc2.cpp @@ -143,24 +143,24 @@ Adder hardware: #include "emu.h" +#include "bfm_adr2.h" +#include "bfm_bd1.h" // vfd +#include "bfm_comn.h" +#include "bfm_dm01.h" + +#include "awpvid.h" + #include "cpu/m6809/m6809.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "video/bfm_adr2.h" - #include "sound/upd7759.h" #include "sound/ymopl.h" /* fruit machines only */ -#include "video/awpvid.h" -#include "video/bfm_dm01.h" #include "machine/steppers.h" -#include "machine/bfm_comn.h" - -#include "machine/bfm_bd1.h" // vfd #include "machine/meters.h" #include "machine/rescap.h" diff --git a/src/mame/bfm/bfm_sc4.cpp b/src/mame/bfm/bfm_sc4.cpp index 5f54f3502c3..4150c8be60f 100644 --- a/src/mame/bfm/bfm_sc4.cpp +++ b/src/mame/bfm/bfm_sc4.cpp @@ -33,15 +33,15 @@ */ #include "emu.h" -#include "includes/bfm_sc4.h" -#include "machine/bfm_sc45_helper.h" +#include "bfm_sc4.h" +#include "bfm_sc45_helper.h" + +#include "awpvid.h" //DMD01 #include "cpu/m68000/m68000.h" +#include "cpu/m6809/m6809.h" #include "machine/68307.h" #include "machine/68340.h" -#include "video/awpvid.h" -//DMD01 -#include "cpu/m6809/m6809.h" #include "speaker.h" diff --git a/src/mame/bfm/bfm_sc4.h b/src/mame/bfm/bfm_sc4.h index a60215c2dca..764307e84fd 100644 --- a/src/mame/bfm/bfm_sc4.h +++ b/src/mame/bfm/bfm_sc4.h @@ -7,17 +7,17 @@ #pragma once -#include "machine/sec.h" +#include "sec.h" #include "machine/steppers.h" // stepper motor -#include "machine/bfm_bda.h" +#include "bfm_bda.h" #include "sound/ymz280b.h" #include "machine/mc68681.h" #include "machine/nvram.h" #include "machine/68307.h" #include "machine/68340.h" -#include "video/bfm_dm01.h" +#include "bfm_dm01.h" #define SC45_BUTTON_MATRIX_1_0 IPT_BUTTON1 #define SC45_BUTTON_MATRIX_1_1 IPT_BUTTON2 diff --git a/src/mame/bfm/bfm_sc5.cpp b/src/mame/bfm/bfm_sc5.cpp index 43a509329d3..4e696e3e4aa 100644 --- a/src/mame/bfm/bfm_sc5.cpp +++ b/src/mame/bfm/bfm_sc5.cpp @@ -136,11 +136,12 @@ PL1 = Compact Flash Slot #include "emu.h" -#include "includes/bfm_sc5.h" +#include "bfm_sc5.h" -#include "machine/bfm_sc45_helper.h" +#include "awpvid.h" + +#include "bfm_sc45_helper.h" #include "machine/mcf5206e.h" -#include "video/awpvid.h" #include "speaker.h" #include "bfm_sc5.lh" diff --git a/src/mame/bfm/bfm_sc5.h b/src/mame/bfm/bfm_sc5.h index 2f461a33fcd..dc44493e382 100644 --- a/src/mame/bfm/bfm_sc5.h +++ b/src/mame/bfm/bfm_sc5.h @@ -5,7 +5,7 @@ #pragma once -#include "includes/bfm_sc4.h" +#include "bfm_sc4.h" #include "cpu/m68000/m68000.h" class bfm_sc5_state : public bfm_sc45_state diff --git a/src/mame/bfm/bfm_sc5sw.cpp b/src/mame/bfm/bfm_sc5sw.cpp index 5280fe1392e..b349a98c3ef 100644 --- a/src/mame/bfm/bfm_sc5sw.cpp +++ b/src/mame/bfm/bfm_sc5sw.cpp @@ -12,8 +12,8 @@ */ #include "emu.h" -#include "includes/bfm_sc5.h" -#include "includes/bfm_sc4.h" // TODO: untangle from this +#include "bfm_sc5.h" +#include "bfm_sc4.h" // TODO: untangle from this #define sc5pld \ diff --git a/src/mame/bfm/bfmsys83.cpp b/src/mame/bfm/bfmsys83.cpp index 304923a563c..a5b654979d6 100644 --- a/src/mame/bfm/bfmsys83.cpp +++ b/src/mame/bfm/bfmsys83.cpp @@ -5,7 +5,7 @@ #include "emu.h" #include "cpu/m6800/m6800.h" #include "sound/ay8910.h" -#include "machine/bfm_comn.h" +#include "bfm_comn.h" #include "speaker.h" diff --git a/src/mame/bfm/bfmsys85.cpp b/src/mame/bfm/bfmsys85.cpp index f3c4a0f610b..a672c85b321 100644 --- a/src/mame/bfm/bfmsys85.cpp +++ b/src/mame/bfm/bfmsys85.cpp @@ -57,20 +57,26 @@ ___________________________________________________________________________ ***************************************************************************/ #include "emu.h" +#include "bfm_comn.h" + +#include "awpvid.h" + #include "cpu/m6809/m6809.h" -#include "video/awpvid.h" #include "machine/6850acia.h" #include "machine/clock.h" #include "machine/meters.h" +#include "machine/nvram.h" #include "machine/roc10937.h" // vfd #include "machine/steppers.h" // stepper motor #include "sound/ay8910.h" -#include "machine/nvram.h" -#include "machine/bfm_comn.h" + #include "speaker.h" #include "bfmsys85.lh" + +namespace { + class bfmsys85_state : public driver_device { public: @@ -767,6 +773,9 @@ void bfmsys85_state::init_nodecode() b85_find_project_string(); } +} // anonymous namespace + + #define MACHINE_FLAGS MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE|MACHINE_REQUIRES_ARTWORK #define MACHINE_FLAGS_MECHANICAL MACHINE_FLAGS|MACHINE_MECHANICAL diff --git a/src/mame/bfm/rastersp.cpp b/src/mame/bfm/rastersp.cpp index 4b42f285fb9..ba4073bad5f 100644 --- a/src/mame/bfm/rastersp.cpp +++ b/src/mame/bfm/rastersp.cpp @@ -17,18 +17,20 @@ ****************************************************************************/ #include "emu.h" +#include "bacta_datalogger.h" + #include "bus/nscsi/cd.h" #include "bus/nscsi/hd.h" #include "cpu/i386/i386.h" #include "cpu/tms32031/tms32031.h" #include "machine/53c7xx.h" -#include "machine/bacta_datalogger.h" #include "machine/mc146818.h" #include "machine/nvram.h" #include "machine/timer.h" #include "machine/watchdog.h" #include "machine/z80scc.h" #include "sound/dac.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/bitcorp/gamate.cpp b/src/mame/bitcorp/gamate.cpp index 3f737193d1b..5218223f293 100644 --- a/src/mame/bitcorp/gamate.cpp +++ b/src/mame/bitcorp/gamate.cpp @@ -12,10 +12,10 @@ ******************************************************************************/ #include "emu.h" +#include "gamate_v.h" #include "sound/ay8910.h" #include "bus/gamate/slot.h" #include "cpu/m6502/m6502.h" -#include "video/gamate.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/bitcorp/gamate_v.cpp b/src/mame/bitcorp/gamate_v.cpp index 2aed5a48e83..0107c42c9a2 100644 --- a/src/mame/bitcorp/gamate_v.cpp +++ b/src/mame/bitcorp/gamate_v.cpp @@ -25,7 +25,7 @@ */ #include "emu.h" -#include "video/gamate.h" +#include "gamate_v.h" #include "screen.h" DEFINE_DEVICE_TYPE(GAMATE_VIDEO, gamate_video_device, "gamate_vid", "Gamate Video Hardware") diff --git a/src/mame/bnpo/b2m.cpp b/src/mame/bnpo/b2m.cpp index be1d182fd05..f67f60ed26f 100644 --- a/src/mame/bnpo/b2m.cpp +++ b/src/mame/bnpo/b2m.cpp @@ -33,7 +33,7 @@ Need a schematic so that the fdc could be repaired. #include "emu.h" #include "cpu/i8085/i8085.h" #include "machine/i8251.h" -#include "includes/b2m.h" +#include "b2m.h" #include "formats/smx_dsk.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/bnpo/b2m_m.cpp b/src/mame/bnpo/b2m_m.cpp index 74334bdada6..12693a1e881 100644 --- a/src/mame/bnpo/b2m_m.cpp +++ b/src/mame/bnpo/b2m_m.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "cpu/i8085/i8085.h" -#include "includes/b2m.h" +#include "b2m.h" uint8_t b2m_state::keyboard_r(offs_t offset) { diff --git a/src/mame/bondwell/bw12.cpp b/src/mame/bondwell/bw12.cpp index d141b6d5ce0..6ecf5fae5c2 100644 --- a/src/mame/bondwell/bw12.cpp +++ b/src/mame/bondwell/bw12.cpp @@ -26,7 +26,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/bw12.h" +#include "bw12.h" #include "bus/rs232/rs232.h" #include "sound/dac.h" #include "screen.h" diff --git a/src/mame/bondwell/bw2.cpp b/src/mame/bondwell/bw2.cpp index 048542ad02d..14f38fc75b7 100644 --- a/src/mame/bondwell/bw2.cpp +++ b/src/mame/bondwell/bw2.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bw2.h" +#include "bw2.h" #include "bus/rs232/rs232.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/booth/apexc.cpp b/src/mame/booth/apexc.cpp index 4a6e31ceb6f..c00b8c48a72 100644 --- a/src/mame/booth/apexc.cpp +++ b/src/mame/booth/apexc.cpp @@ -9,7 +9,7 @@ */ #include "emu.h" -#include "includes/apexc.h" +#include "apexc.h" void apexc_state::machine_start() { diff --git a/src/mame/booth/apexc.h b/src/mame/booth/apexc.h index b5ac0d31113..2cd9e9a1e13 100644 --- a/src/mame/booth/apexc.h +++ b/src/mame/booth/apexc.h @@ -6,7 +6,7 @@ #pragma once #include "cpu/apexc/apexc.h" -#include "machine/apexc.h" +#include "apexc_m.h" #include "softlist_dev.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/booth/apexc_m.cpp b/src/mame/booth/apexc_m.cpp index 9f6fff31fb9..6c7c23fb42b 100644 --- a/src/mame/booth/apexc_m.cpp +++ b/src/mame/booth/apexc_m.cpp @@ -9,7 +9,7 @@ */ #include "emu.h" -#include "machine/apexc.h" +#include "apexc_m.h" DEFINE_DEVICE_TYPE(APEXC_CYLINDER, apexc_cylinder_image_device, "apexc_cylinder_image", "APEXC Cylinder") DEFINE_DEVICE_TYPE(APEXC_TAPE_PUNCHER, apexc_tape_puncher_image_device, "apexc_tape_puncher_image", "APEXC Tape Puncher") diff --git a/src/mame/booth/apexc_v.cpp b/src/mame/booth/apexc_v.cpp index fbc7561f043..4f99121c988 100644 --- a/src/mame/booth/apexc_v.cpp +++ b/src/mame/booth/apexc_v.cpp @@ -9,7 +9,7 @@ */ #include "emu.h" -#include "includes/apexc.h" +#include "apexc.h" #include diff --git a/src/mame/canon/x07.cpp b/src/mame/canon/x07.cpp index c5e17aa5ab8..c8ef2b404a7 100644 --- a/src/mame/canon/x07.cpp +++ b/src/mame/canon/x07.cpp @@ -29,7 +29,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/x07.h" +#include "x07.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/capcom/1942.cpp b/src/mame/capcom/1942.cpp index 36b845f05ab..49d1c471809 100644 --- a/src/mame/capcom/1942.cpp +++ b/src/mame/capcom/1942.cpp @@ -165,14 +165,14 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/1942.h" +#include "1942.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "machine/netlist.h" #include "speaker.h" -#include "audio/nl_1942.h" +#include "nl_1942.h" namespace { diff --git a/src/mame/capcom/1942_v.cpp b/src/mame/capcom/1942_v.cpp index 8cb3cc11e65..0fc2a2c9001 100644 --- a/src/mame/capcom/1942_v.cpp +++ b/src/mame/capcom/1942_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/1942.h" +#include "1942.h" /*************************************************************************** diff --git a/src/mame/capcom/1943.cpp b/src/mame/capcom/1943.cpp index 0d592d0c810..26c7e7938c3 100644 --- a/src/mame/capcom/1943.cpp +++ b/src/mame/capcom/1943.cpp @@ -40,7 +40,7 @@ */ #include "emu.h" -#include "includes/1943.h" +#include "1943.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/capcom/1943_v.cpp b/src/mame/capcom/1943_v.cpp index 32437c08769..b5c73f1575b 100644 --- a/src/mame/capcom/1943_v.cpp +++ b/src/mame/capcom/1943_v.cpp @@ -30,7 +30,7 @@ other 2 bits (output & 0x0c) unknown ***************************************************************************/ #include "emu.h" -#include "includes/1943.h" +#include "1943.h" /*************************************************************************** diff --git a/src/mame/capcom/bionicc.cpp b/src/mame/capcom/bionicc.cpp index d3dbb6663c1..fb2af5b2ee7 100644 --- a/src/mame/capcom/bionicc.cpp +++ b/src/mame/capcom/bionicc.cpp @@ -86,7 +86,7 @@ #include "cpu/z80/z80.h" #include "machine/timer.h" #include "video/bufsprite.h" -#include "video/tigeroad_spr.h" +#include "tigeroad_spr.h" #include "sound/ymopm.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/capcom/cbasebal.cpp b/src/mame/capcom/cbasebal.cpp index d28bc9dac9d..c3c323efe0d 100644 --- a/src/mame/capcom/cbasebal.cpp +++ b/src/mame/capcom/cbasebal.cpp @@ -17,7 +17,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/kabuki.h" // needed for decoding functions only +#include "kabuki.h" // needed for decoding functions only #include "machine/eepromser.h" #include "sound/okim6295.h" #include "sound/ymopl.h" diff --git a/src/mame/capcom/commando.cpp b/src/mame/capcom/commando.cpp index 9fce55bea7c..5f11831d9c9 100644 --- a/src/mame/capcom/commando.cpp +++ b/src/mame/capcom/commando.cpp @@ -163,7 +163,7 @@ Notes: #include "emu.h" -#include "includes/commando.h" +#include "commando.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/capcom/commando_v.cpp b/src/mame/capcom/commando_v.cpp index 92fd2e65112..03e58723750 100644 --- a/src/mame/capcom/commando_v.cpp +++ b/src/mame/capcom/commando_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/commando.h" +#include "commando.h" void commando_state::commando_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/capcom/cps1.cpp b/src/mame/capcom/cps1.cpp index c8b7cc75b65..ea46efbb3f3 100644 --- a/src/mame/capcom/cps1.cpp +++ b/src/mame/capcom/cps1.cpp @@ -240,7 +240,7 @@ Stephh's log (2006.09.20) : ***************************************************************************/ #include "emu.h" -#include "includes/cps1.h" +#include "cps1.h" #include "cpu/z80/z80.h" #include "cpu/pic16c5x/pic16c5x.h" @@ -250,7 +250,7 @@ Stephh's log (2006.09.20) : #include "sound/okim6295.h" #include "sound/qsound.h" #include "sound/ymopm.h" -#include "machine/kabuki.h" +#include "kabuki.h" #include "speaker.h" diff --git a/src/mame/capcom/cps1_v.cpp b/src/mame/capcom/cps1_v.cpp index 26bef37b923..c3a0fe16531 100644 --- a/src/mame/capcom/cps1_v.cpp +++ b/src/mame/capcom/cps1_v.cpp @@ -450,7 +450,7 @@ The games seem to use them to mark platforms, kill zones and no-go areas. ***************************************************************************/ #include "emu.h" -#include "includes/cps1.h" +#include "cps1.h" #define VERBOSE 0 diff --git a/src/mame/capcom/cps1bl_5205.cpp b/src/mame/capcom/cps1bl_5205.cpp index d6ee2e6c56a..507f11002c7 100644 --- a/src/mame/capcom/cps1bl_5205.cpp +++ b/src/mame/capcom/cps1bl_5205.cpp @@ -30,7 +30,7 @@ knightsb3: OK. */ #include "emu.h" -#include "includes/fcrash.h" +#include "fcrash.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/capcom/cps1bl_pic.cpp b/src/mame/capcom/cps1bl_pic.cpp index d8a1efd5d07..d6ece77ad21 100644 --- a/src/mame/capcom/cps1bl_pic.cpp +++ b/src/mame/capcom/cps1bl_pic.cpp @@ -43,7 +43,7 @@ brightness circuity present on pcb? */ #include "emu.h" -#include "includes/fcrash.h" +#include "fcrash.h" #include "cpu/m68000/m68000.h" #include "cpu/pic16c5x/pic16c5x.h" diff --git a/src/mame/capcom/cps2.cpp b/src/mame/capcom/cps2.cpp index 6e7a2cafcc2..fecc18716f2 100644 --- a/src/mame/capcom/cps2.cpp +++ b/src/mame/capcom/cps2.cpp @@ -626,9 +626,9 @@ Stephh's inputs notes (based on some tests on the "parent" set) : #include "emu.h" -#include "includes/cps1.h" -#include "machine/cps2comm.h" -#include "machine/cps2crypt.h" +#include "cps1.h" +#include "cps2comm.h" +#include "cps2crypt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/capcom/cps2crypt.cpp b/src/mame/capcom/cps2crypt.cpp index b9b1e523736..fc85ca349ac 100644 --- a/src/mame/capcom/cps2crypt.cpp +++ b/src/mame/capcom/cps2crypt.cpp @@ -113,7 +113,7 @@ the decryption keys. *******************************************************************************/ #include "emu.h" -#include "includes/cps1.h" +#include "cps1.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/capcom/cps3.cpp b/src/mame/capcom/cps3.cpp index a96cd815fa1..eca8368042d 100644 --- a/src/mame/capcom/cps3.cpp +++ b/src/mame/capcom/cps3.cpp @@ -584,7 +584,7 @@ Hardware registers info #include "cpu/sh/sh2.h" #include "machine/intelfsh.h" #include "machine/nvram.h" -#include "includes/cps3.h" +#include "cps3.h" #include "bus/nscsi/cd.h" #include "machine/wd33c9x.h" #include "screen.h" diff --git a/src/mame/capcom/cps3.h b/src/mame/capcom/cps3.h index 3a648535e4d..6ed933aeeaf 100644 --- a/src/mame/capcom/cps3.h +++ b/src/mame/capcom/cps3.h @@ -13,7 +13,7 @@ #include "machine/intelfsh.h" #include "cpu/sh/sh2.h" -#include "audio/cps3.h" +#include "cps3_a.h" #include "machine/timer.h" #include "emupal.h" diff --git a/src/mame/capcom/cps3_a.cpp b/src/mame/capcom/cps3_a.cpp index 27a1be1c7ca..95dfe625c3e 100644 --- a/src/mame/capcom/cps3_a.cpp +++ b/src/mame/capcom/cps3_a.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "cps3.h" +#include "cps3_a.h" // device type definition diff --git a/src/mame/capcom/exedexes.cpp b/src/mame/capcom/exedexes.cpp index 858edb0f2be..1d0dec0a432 100644 --- a/src/mame/capcom/exedexes.cpp +++ b/src/mame/capcom/exedexes.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/exedexes.h" +#include "exedexes.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/capcom/exedexes_v.cpp b/src/mame/capcom/exedexes_v.cpp index 7a782a63f19..bb5aae24b30 100644 --- a/src/mame/capcom/exedexes_v.cpp +++ b/src/mame/capcom/exedexes_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/exedexes.h" +#include "exedexes.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/capcom/fcrash.cpp b/src/mame/capcom/fcrash.cpp index 519591de3e0..1d6d16098fc 100644 --- a/src/mame/capcom/fcrash.cpp +++ b/src/mame/capcom/fcrash.cpp @@ -97,7 +97,7 @@ brightness circuity present on pcb? */ #include "emu.h" -#include "includes/fcrash.h" +#include "fcrash.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/capcom/fcrash.h b/src/mame/capcom/fcrash.h index 7af41624be9..39a13a887b5 100644 --- a/src/mame/capcom/fcrash.h +++ b/src/mame/capcom/fcrash.h @@ -11,7 +11,7 @@ #pragma once -#include "includes/cps1.h" +#include "cps1.h" class fcrash_state : public cps_state { diff --git a/src/mame/capcom/higemaru.cpp b/src/mame/capcom/higemaru.cpp index 36d50837204..97dde736728 100644 --- a/src/mame/capcom/higemaru.cpp +++ b/src/mame/capcom/higemaru.cpp @@ -13,7 +13,7 @@ Use Player 1 joystick and button, then press START1 to go to next screen. ****************************************************************************/ #include "emu.h" -#include "includes/higemaru.h" +#include "higemaru.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/capcom/higemaru_v.cpp b/src/mame/capcom/higemaru_v.cpp index 1b40c6e4320..f9b91f70e37 100644 --- a/src/mame/capcom/higemaru_v.cpp +++ b/src/mame/capcom/higemaru_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni #include "emu.h" -#include "includes/higemaru.h" +#include "higemaru.h" void higemaru_state::higemaru_videoram_w(offs_t offset, uint8_t data) { diff --git a/src/mame/capcom/kenseim.cpp b/src/mame/capcom/kenseim.cpp index 1e27600f9cc..546e3cf9857 100644 --- a/src/mame/capcom/kenseim.cpp +++ b/src/mame/capcom/kenseim.cpp @@ -143,7 +143,7 @@ GND | 20 #include "emu.h" #include "cpu/z80/tmpz84c011.h" #include "machine/mb89363b.h" -#include "includes/cps1.h" +#include "cps1.h" #include "kenseim.lh" class kenseim_state : public cps_state diff --git a/src/mame/capcom/lastduel.cpp b/src/mame/capcom/lastduel.cpp index ab0391d49cc..bebdb764eb1 100644 --- a/src/mame/capcom/lastduel.cpp +++ b/src/mame/capcom/lastduel.cpp @@ -121,7 +121,7 @@ Notes: **************************************************************************/ #include "emu.h" -#include "includes/lastduel.h" +#include "lastduel.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/capcom/lastduel_v.cpp b/src/mame/capcom/lastduel_v.cpp index 908a216a3fc..18bbd23bfea 100644 --- a/src/mame/capcom/lastduel_v.cpp +++ b/src/mame/capcom/lastduel_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lastduel.h" +#include "lastduel.h" /*************************************************************************** diff --git a/src/mame/capcom/lwings.cpp b/src/mame/capcom/lwings.cpp index bab5c7d5244..70c26e9c604 100644 --- a/src/mame/capcom/lwings.cpp +++ b/src/mame/capcom/lwings.cpp @@ -55,7 +55,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/lwings.h" +#include "lwings.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/capcom/lwings_v.cpp b/src/mame/capcom/lwings_v.cpp index 0c5842987c3..76c7897dede 100644 --- a/src/mame/capcom/lwings_v.cpp +++ b/src/mame/capcom/lwings_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lwings.h" +#include "lwings.h" /*************************************************************************** diff --git a/src/mame/capcom/mitchell.cpp b/src/mame/capcom/mitchell.cpp index f2699a601af..f6fdf65c470 100644 --- a/src/mame/capcom/mitchell.cpp +++ b/src/mame/capcom/mitchell.cpp @@ -119,7 +119,7 @@ mw-9.rom = ST M27C1001 / GFX #include "emu.h" -#include "machine/kabuki.h" // needed for decoding functions only +#include "kabuki.h" // needed for decoding functions only #include "cpu/z80/z80.h" #include "machine/74157.h" diff --git a/src/mame/capcom/sidearms.cpp b/src/mame/capcom/sidearms.cpp index 758685c0fd9..42ef833e881 100644 --- a/src/mame/capcom/sidearms.cpp +++ b/src/mame/capcom/sidearms.cpp @@ -51,7 +51,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/sidearms.h" +#include "sidearms.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/capcom/sidearms_v.cpp b/src/mame/capcom/sidearms_v.cpp index 01d4dddeea1..d0087e80ccc 100644 --- a/src/mame/capcom/sidearms_v.cpp +++ b/src/mame/capcom/sidearms_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/sidearms.h" +#include "sidearms.h" void sidearms_state::videoram_w(offs_t offset, uint8_t data) { diff --git a/src/mame/capcom/sonson.cpp b/src/mame/capcom/sonson.cpp index 6b7749c0989..a90b9328449 100644 --- a/src/mame/capcom/sonson.cpp +++ b/src/mame/capcom/sonson.cpp @@ -51,7 +51,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/sonson.h" +#include "sonson.h" #include "cpu/m6809/m6809.h" #include "machine/74259.h" diff --git a/src/mame/capcom/sonson_v.cpp b/src/mame/capcom/sonson_v.cpp index 95e0e161555..56accb6a418 100644 --- a/src/mame/capcom/sonson_v.cpp +++ b/src/mame/capcom/sonson_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/sonson.h" +#include "sonson.h" /*************************************************************************** diff --git a/src/mame/capcom/srumbler.cpp b/src/mame/capcom/srumbler.cpp index ebb331ca617..2781eaf1b62 100644 --- a/src/mame/capcom/srumbler.cpp +++ b/src/mame/capcom/srumbler.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/srumbler.h" +#include "srumbler.h" #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/capcom/srumbler_v.cpp b/src/mame/capcom/srumbler_v.cpp index 727977ef8f4..7d435413c66 100644 --- a/src/mame/capcom/srumbler_v.cpp +++ b/src/mame/capcom/srumbler_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/srumbler.h" +#include "srumbler.h" /*************************************************************************** diff --git a/src/mame/capcom/supduck.cpp b/src/mame/capcom/supduck.cpp index 7843214b0be..318d4474da8 100644 --- a/src/mame/capcom/supduck.cpp +++ b/src/mame/capcom/supduck.cpp @@ -34,7 +34,7 @@ There are known flyers that show an alternate title of HELL OUT #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "video/bufsprite.h" -#include "video/tigeroad_spr.h" +#include "tigeroad_spr.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/capcom/tigeroad.cpp b/src/mame/capcom/tigeroad.cpp index fee1095f4b3..f56449c25c8 100644 --- a/src/mame/capcom/tigeroad.cpp +++ b/src/mame/capcom/tigeroad.cpp @@ -52,7 +52,7 @@ single plane board. ***************************************************************************/ #include "emu.h" -#include "includes/tigeroad.h" +#include "tigeroad.h" #include "machine/gen_latch.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/capcom/tigeroad.h b/src/mame/capcom/tigeroad.h index bb5123031f4..a1b7de6a1dc 100644 --- a/src/mame/capcom/tigeroad.h +++ b/src/mame/capcom/tigeroad.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino -#include "video/tigeroad_spr.h" +#include "tigeroad_spr.h" #include "cpu/m68000/m68000.h" #include "cpu/m6805/m68705.h" diff --git a/src/mame/capcom/tigeroad_m.cpp b/src/mame/capcom/tigeroad_m.cpp index 7515190ba90..a25a78e5e96 100644 --- a/src/mame/capcom/tigeroad_m.cpp +++ b/src/mame/capcom/tigeroad_m.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino #include "emu.h" -#include "includes/tigeroad.h" +#include "tigeroad.h" u16 pushman_state::mcu_comm_r(offs_t offset, u16 mem_mask) { diff --git a/src/mame/capcom/tigeroad_v.cpp b/src/mame/capcom/tigeroad_v.cpp index adf1dc542d5..fc734d13771 100644 --- a/src/mame/capcom/tigeroad_v.cpp +++ b/src/mame/capcom/tigeroad_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino #include "emu.h" -#include "includes/tigeroad.h" +#include "tigeroad.h" void tigeroad_state::videoram_w(offs_t offset, u16 data, u16 mem_mask) diff --git a/src/mame/capcom/vulgus.cpp b/src/mame/capcom/vulgus.cpp index d15f826c8f1..970908fd47e 100644 --- a/src/mame/capcom/vulgus.cpp +++ b/src/mame/capcom/vulgus.cpp @@ -44,7 +44,7 @@ All Clocks and Vsync verified by Corrado Tomaselli (August 2012) ***************************************************************************/ #include "emu.h" -#include "includes/vulgus.h" +#include "vulgus.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/capcom/vulgus_v.cpp b/src/mame/capcom/vulgus_v.cpp index 0971a709e47..103e60386b6 100644 --- a/src/mame/capcom/vulgus_v.cpp +++ b/src/mame/capcom/vulgus_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/vulgus.h" +#include "vulgus.h" /*************************************************************************** diff --git a/src/mame/casio/fp6000.cpp b/src/mame/casio/fp6000.cpp index 8516d758cba..7b3b6558f58 100644 --- a/src/mame/casio/fp6000.cpp +++ b/src/mame/casio/fp6000.cpp @@ -22,7 +22,7 @@ #include "video/mc6845.h" #include "sound/spkrdev.h" #include "bus/centronics/ctronics.h" -#include "machine/fp6000_kbd.h" +#include "fp6000_kbd.h" #include "imagedev/cassette.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/cbm/c128.cpp b/src/mame/cbm/c128.cpp index f12fbd3a2a1..7fbf395245a 100644 --- a/src/mame/cbm/c128.cpp +++ b/src/mame/cbm/c128.cpp @@ -24,7 +24,7 @@ #include "imagedev/snapquik.h" #include "cpu/m6502/m8502.h" #include "cpu/z80/z80.h" -#include "machine/cbm_snqk.h" +#include "cbm_snqk.h" #include "machine/input_merger.h" #include "machine/mos6526.h" #include "machine/mos8722.h" diff --git a/src/mame/cbm/c64.cpp b/src/mame/cbm/c64.cpp index 0897a742a15..29779e8b897 100644 --- a/src/mame/cbm/c64.cpp +++ b/src/mame/cbm/c64.cpp @@ -26,7 +26,7 @@ #include "bus/vcs_ctrl/ctrl.h" #include "cpu/m6502/m6510.h" #include "imagedev/snapquik.h" -#include "machine/cbm_snqk.h" +#include "cbm_snqk.h" #include "machine/input_merger.h" #include "machine/mos6526.h" #include "machine/pla.h" diff --git a/src/mame/cbm/cbm2.cpp b/src/mame/cbm/cbm2.cpp index 021dbfa8779..5c9e7ee069e 100644 --- a/src/mame/cbm/cbm2.cpp +++ b/src/mame/cbm/cbm2.cpp @@ -20,7 +20,7 @@ #include "bus/vcs_ctrl/ctrl.h" #include "cpu/m6502/m6509.h" #include "cpu/i86/i86.h" -#include "machine/cbm_snqk.h" +#include "cbm_snqk.h" #include "machine/6525tpi.h" #include "machine/ds75160a.h" #include "machine/ds75161a.h" diff --git a/src/mame/cbm/cbm_snqk.cpp b/src/mame/cbm/cbm_snqk.cpp index 4d11b6597bb..ecf9f2cf1b1 100644 --- a/src/mame/cbm/cbm_snqk.cpp +++ b/src/mame/cbm/cbm_snqk.cpp @@ -7,7 +7,7 @@ ***********************************************/ #include "emu.h" -#include "machine/cbm_snqk.h" +#include "cbm_snqk.h" /* prg file format * sfx file format diff --git a/src/mame/cbm/pet.cpp b/src/mame/cbm/pet.cpp index 77b4974916b..b086fb65566 100644 --- a/src/mame/cbm/pet.cpp +++ b/src/mame/cbm/pet.cpp @@ -169,7 +169,7 @@ ROM sockets: UA3 2K or 4K character #include "imagedev/snapquik.h" #include "machine/6522via.h" #include "machine/6821pia.h" -#include "machine/cbm_snqk.h" +#include "cbm_snqk.h" #include "machine/input_merger.h" #include "machine/pla.h" #include "machine/ram.h" diff --git a/src/mame/cbm/plus4.cpp b/src/mame/cbm/plus4.cpp index aa84c9991ff..4092e92a361 100644 --- a/src/mame/cbm/plus4.cpp +++ b/src/mame/cbm/plus4.cpp @@ -24,7 +24,7 @@ #include "bus/vcs_ctrl/ctrl.h" #include "cpu/m6502/m7501.h" #include "imagedev/snapquik.h" -#include "machine/cbm_snqk.h" +#include "cbm_snqk.h" #include "machine/input_merger.h" #include "machine/mos6529.h" #include "machine/mos6551.h" diff --git a/src/mame/cbm/vic20.cpp b/src/mame/cbm/vic20.cpp index fe9da4f1723..780ba25c053 100644 --- a/src/mame/cbm/vic20.cpp +++ b/src/mame/cbm/vic20.cpp @@ -20,7 +20,7 @@ #include "bus/vic20/user.h" #include "cpu/m6502/m6510.h" #include "machine/6522via.h" -#include "machine/cbm_snqk.h" +#include "cbm_snqk.h" #include "machine/ram.h" #include "sound/mos6560.h" diff --git a/src/mame/cccp/lviv.cpp b/src/mame/cccp/lviv.cpp index 38cd0601e06..c3c1da95f51 100644 --- a/src/mame/cccp/lviv.cpp +++ b/src/mame/cccp/lviv.cpp @@ -284,7 +284,7 @@ Timings: *******************************************************************************/ #include "emu.h" -#include "includes/lviv.h" +#include "lviv.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/cccp/lviv_m.cpp b/src/mame/cccp/lviv_m.cpp index 81930081fbc..ab44ec2683d 100644 --- a/src/mame/cccp/lviv_m.cpp +++ b/src/mame/cccp/lviv_m.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lviv.h" +#include "lviv.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/cccp/lviv_v.cpp b/src/mame/cccp/lviv_v.cpp index 65aeb6ced32..81a28bade6a 100644 --- a/src/mame/cccp/lviv_v.cpp +++ b/src/mame/cccp/lviv_v.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lviv.h" +#include "lviv.h" const rgb_t lviv_state::s_palette[8] = { diff --git a/src/mame/cccp/mikro80.cpp b/src/mame/cccp/mikro80.cpp index c1dd5968fe6..0863af75bf4 100644 --- a/src/mame/cccp/mikro80.cpp +++ b/src/mame/cccp/mikro80.cpp @@ -22,7 +22,7 @@ ToDo: #include "emu.h" #include "cpu/i8085/i8085.h" #include "formats/rk_cas.h" -#include "includes/mikro80.h" +#include "mikro80.h" #include "emupal.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/cccp/mikro80_m.cpp b/src/mame/cccp/mikro80_m.cpp index 1bfe4617854..02487aa77b6 100644 --- a/src/mame/cccp/mikro80_m.cpp +++ b/src/mame/cccp/mikro80_m.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/mikro80.h" +#include "mikro80.h" /* Driver initialization */ void mikro80_state::init_mikro80() diff --git a/src/mame/cccp/pk8000.cpp b/src/mame/cccp/pk8000.cpp index 2eb135fa126..55721841498 100644 --- a/src/mame/cccp/pk8000.cpp +++ b/src/mame/cccp/pk8000.cpp @@ -10,7 +10,8 @@ PK-8000 ****************************************************************************/ #include "emu.h" -#include "video/pk8000.h" + +#include "pk8000_v.h" #include "cpu/i8085/i8085.h" #include "machine/i8255.h" @@ -24,6 +25,8 @@ PK-8000 #include "formats/fmsx_cas.h" +namespace { + class pk8000_state : public pk8000_base_state { public: @@ -405,6 +408,9 @@ ROM_START( pk8002 ) ROM_LOAD( "pk8002.rom", 0x0000, 0x4000, CRC(07b9ae71) SHA1(2137a41cc095c7aba58b7b109fce63f30a4568b2)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/cccp/pk8020.cpp b/src/mame/cccp/pk8020.cpp index 1dfc53323d3..db5c34087db 100644 --- a/src/mame/cccp/pk8020.cpp +++ b/src/mame/cccp/pk8020.cpp @@ -27,7 +27,7 @@ BK8T - Keys to navigate initial config screen are mostly unknown #include "emu.h" -#include "includes/pk8020.h" +#include "pk8020.h" #include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/cccp/pk8020_m.cpp b/src/mame/cccp/pk8020_m.cpp index 8a8b1661482..64c2986df39 100644 --- a/src/mame/cccp/pk8020_m.cpp +++ b/src/mame/cccp/pk8020_m.cpp @@ -11,7 +11,7 @@ #include "emu.h" -#include "includes/pk8020.h" +#include "pk8020.h" #define DESCRIBE_DECPLM 1 diff --git a/src/mame/cccp/pk8020_v.cpp b/src/mame/cccp/pk8020_v.cpp index 5ac06457619..a78f9b4820f 100644 --- a/src/mame/cccp/pk8020_v.cpp +++ b/src/mame/cccp/pk8020_v.cpp @@ -10,7 +10,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/pk8020.h" +#include "pk8020.h" void pk8020_state::video_start() { diff --git a/src/mame/cccp/sm7238.cpp b/src/mame/cccp/sm7238.cpp index 86311d78fb5..0bd2aa5312e 100644 --- a/src/mame/cccp/sm7238.cpp +++ b/src/mame/cccp/sm7238.cpp @@ -22,7 +22,7 @@ #include "machine/bankdev.h" #include "machine/clock.h" #include "machine/i8251.h" -#include "machine/km035.h" +#include "km035.h" #include "machine/nvram.h" #include "machine/pic8259.h" #include "machine/pit8253.h" diff --git a/src/mame/cccp/ut88.cpp b/src/mame/cccp/ut88.cpp index d4af2707ce1..496caa3b167 100644 --- a/src/mame/cccp/ut88.cpp +++ b/src/mame/cccp/ut88.cpp @@ -23,7 +23,7 @@ too slow. ****************************************************************************/ #include "emu.h" -#include "includes/ut88.h" +#include "ut88.h" #include "formats/rk_cas.h" #include "ut88mini.lh" diff --git a/src/mame/cccp/ut88_m.cpp b/src/mame/cccp/ut88_m.cpp index b94b5f9f1c7..8328b39c283 100644 --- a/src/mame/cccp/ut88_m.cpp +++ b/src/mame/cccp/ut88_m.cpp @@ -13,7 +13,7 @@ #include "cpu/i8085/i8085.h" #include "imagedev/cassette.h" #include "machine/i8255.h" -#include "includes/ut88.h" +#include "ut88.h" static const uint8_t hex_to_7seg[16] = { diff --git a/src/mame/cccp/vector06.cpp b/src/mame/cccp/vector06.cpp index 7446bdf7952..6073fab822d 100644 --- a/src/mame/cccp/vector06.cpp +++ b/src/mame/cccp/vector06.cpp @@ -33,7 +33,7 @@ TODO: ****************************************************************************/ #include "emu.h" -#include "includes/vector06.h" +#include "vector06.h" #include "formats/vector06_dsk.h" #include "screen.h" diff --git a/src/mame/cccp/vector06_m.cpp b/src/mame/cccp/vector06_m.cpp index 630c0948fec..a23eb90c244 100644 --- a/src/mame/cccp/vector06_m.cpp +++ b/src/mame/cccp/vector06_m.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/vector06.h" +#include "vector06.h" #include "screen.h" diff --git a/src/mame/cccp/vector06_v.cpp b/src/mame/cccp/vector06_v.cpp index 285583f030a..86f3d452045 100644 --- a/src/mame/cccp/vector06_v.cpp +++ b/src/mame/cccp/vector06_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/vector06.h" +#include "vector06.h" uint32_t vector06_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/chromatics/cgc7900.cpp b/src/mame/chromatics/cgc7900.cpp index 8ffaeca2ddf..40911469fb6 100644 --- a/src/mame/chromatics/cgc7900.cpp +++ b/src/mame/chromatics/cgc7900.cpp @@ -52,7 +52,7 @@ */ #include "emu.h" -#include "includes/cgc7900.h" +#include "cgc7900.h" #include "speaker.h" #define VERBOSE 1 diff --git a/src/mame/chromatics/cgc7900_v.cpp b/src/mame/chromatics/cgc7900_v.cpp index 90ff7bd702e..a86c08f6afb 100644 --- a/src/mame/chromatics/cgc7900_v.cpp +++ b/src/mame/chromatics/cgc7900_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/cgc7900.h" +#include "cgc7900.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/cinemat/cinemat.cpp b/src/mame/cinemat/cinemat.cpp index b9d9cce7a89..d59b36405ef 100644 --- a/src/mame/cinemat/cinemat.cpp +++ b/src/mame/cinemat/cinemat.cpp @@ -30,7 +30,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/cinemat.h" +#include "cinemat.h" #include "speaker.h" #include "armora.lh" diff --git a/src/mame/cinemat/cinemat.h b/src/mame/cinemat/cinemat.h index 791317cfdbb..387c803f71f 100644 --- a/src/mame/cinemat/cinemat.h +++ b/src/mame/cinemat/cinemat.h @@ -11,7 +11,7 @@ #pragma once #include "cpu/ccpu/ccpu.h" -#include "audio/cinemat.h" +#include "cinemat_a.h" #include "machine/74259.h" #include "sound/ay8910.h" #include "sound/samples.h" diff --git a/src/mame/cinemat/cinemat_a.cpp b/src/mame/cinemat/cinemat_a.cpp index 3d9cb981888..866ed382711 100644 --- a/src/mame/cinemat/cinemat_a.cpp +++ b/src/mame/cinemat/cinemat_a.cpp @@ -19,20 +19,20 @@ ***************************************************************************/ #include "emu.h" -#include "includes/cinemat.h" - -#include "audio/nl_armora.h" -#include "audio/nl_barrier.h" -#include "audio/nl_boxingb.h" -#include "audio/nl_ripoff.h" -#include "audio/nl_solarq.h" -#include "audio/nl_spacewar.h" -#include "audio/nl_speedfrk.h" -#include "audio/nl_starcas.h" -#include "audio/nl_starhawk.h" -#include "audio/nl_sundance.h" -#include "audio/nl_tailg.h" -#include "audio/nl_warrior.h" +#include "cinemat.h" + +#include "nl_armora.h" +#include "nl_barrier.h" +#include "nl_boxingb.h" +#include "nl_ripoff.h" +#include "nl_solarq.h" +#include "nl_spacewar.h" +#include "nl_speedfrk.h" +#include "nl_starcas.h" +#include "nl_starhawk.h" +#include "nl_sundance.h" +#include "nl_tailg.h" +#include "nl_warrior.h" #include "cpu/z80/z80.h" #include "machine/z80daisy.h" #include "machine/z80ctc.h" diff --git a/src/mame/cinemat/cinemat_v.cpp b/src/mame/cinemat/cinemat_v.cpp index 5d38416f280..b06139807d8 100644 --- a/src/mame/cinemat/cinemat_v.cpp +++ b/src/mame/cinemat/cinemat_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/cinemat.h" +#include "cinemat.h" /************************************* diff --git a/src/mame/cinemat/jack.cpp b/src/mame/cinemat/jack.cpp index 9ec0491af9d..9a17fb8caa9 100644 --- a/src/mame/cinemat/jack.cpp +++ b/src/mame/cinemat/jack.cpp @@ -81,7 +81,7 @@ Stephh's Notes: ***************************************************************************/ #include "emu.h" -#include "includes/jack.h" +#include "jack.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/cinemat/jack_v.cpp b/src/mame/cinemat/jack_v.cpp index 70a08c05fee..3cb6ebfac22 100644 --- a/src/mame/cinemat/jack_v.cpp +++ b/src/mame/cinemat/jack_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/jack.h" +#include "jack.h" diff --git a/src/mame/cinemat/leland.cpp b/src/mame/cinemat/leland.cpp index 0f2559a99b4..e4c35488fed 100644 --- a/src/mame/cinemat/leland.cpp +++ b/src/mame/cinemat/leland.cpp @@ -59,8 +59,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/leland.h" -#include "audio/leland.h" +#include "leland.h" +#include "leland_a.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" diff --git a/src/mame/cinemat/leland_a.cpp b/src/mame/cinemat/leland_a.cpp index b67471686e7..eb76aa34361 100644 --- a/src/mame/cinemat/leland_a.cpp +++ b/src/mame/cinemat/leland_a.cpp @@ -80,7 +80,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/leland.h" +#include "leland_a.h" #include "cpu/z80/z80.h" #include "speaker.h" diff --git a/src/mame/cinemat/leland_m.cpp b/src/mame/cinemat/leland_m.cpp index 29bdba56f70..691d91b0378 100644 --- a/src/mame/cinemat/leland_m.cpp +++ b/src/mame/cinemat/leland_m.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/leland.h" -#include "audio/leland.h" +#include "leland.h" +#include "leland_a.h" #include "cpu/z80/z80.h" diff --git a/src/mame/cinemat/leland_v.cpp b/src/mame/cinemat/leland_v.cpp index 33a3b93e516..e6562c19324 100644 --- a/src/mame/cinemat/leland_v.cpp +++ b/src/mame/cinemat/leland_v.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/leland.h" -#include "audio/leland.h" +#include "leland.h" +#include "leland_a.h" /* constants */ diff --git a/src/mame/citoh/cit101.cpp b/src/mame/citoh/cit101.cpp index 97ec2c97ffa..094185b43be 100644 --- a/src/mame/citoh/cit101.cpp +++ b/src/mame/citoh/cit101.cpp @@ -65,7 +65,7 @@ The NVR checksum error reported when the terminal is first used is nonfatal. Def #include "machine/i8255.h" #include "screen.h" -#include "machine/cit101_kbd.h" +#include "cit101_kbd.h" class cit101_state : public driver_device { diff --git a/src/mame/citoh/cit220.cpp b/src/mame/citoh/cit220.cpp index 3db7854c425..998f9552443 100644 --- a/src/mame/citoh/cit220.cpp +++ b/src/mame/citoh/cit220.cpp @@ -15,7 +15,7 @@ and the SCN2674 video timing parameters appear to be identical. #include "emu.h" //#include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" -#include "machine/cit220_kbd.h" +#include "cit220_kbd.h" //#include "machine/eeprompar.h" #include "machine/i8251.h" #include "machine/mc68681.h" diff --git a/src/mame/coleco/adam.cpp b/src/mame/coleco/adam.cpp index 071b6e3b813..0fc80ecd6c4 100644 --- a/src/mame/coleco/adam.cpp +++ b/src/mame/coleco/adam.cpp @@ -300,7 +300,7 @@ Mark Gordon */ #include "emu.h" -#include "includes/adam.h" +#include "adam.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/coleco/adam.h b/src/mame/coleco/adam.h index 66bcac4663e..47ef46e4e6c 100644 --- a/src/mame/coleco/adam.h +++ b/src/mame/coleco/adam.h @@ -11,7 +11,7 @@ #include "bus/coleco/cartridge/exp.h" #include "cpu/z80/z80.h" #include "cpu/m6800/m6801.h" -#include "machine/coleco.h" +#include "coleco_m.h" #include "machine/ram.h" #include "sound/sn76496.h" #include "video/tms9928a.h" diff --git a/src/mame/coleco/coleco.cpp b/src/mame/coleco/coleco.cpp index 9d3f8e53f44..6c2e215e097 100644 --- a/src/mame/coleco/coleco.cpp +++ b/src/mame/coleco/coleco.cpp @@ -69,7 +69,7 @@ */ #include "emu.h" -#include "includes/coleco.h" +#include "coleco.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/coleco/coleco.h b/src/mame/coleco/coleco.h index 01e25a4a367..adfdcc0b4cb 100644 --- a/src/mame/coleco/coleco.h +++ b/src/mame/coleco/coleco.h @@ -11,7 +11,7 @@ #include "machine/ram.h" #include "sound/sn76496.h" #include "video/tms9928a.h" -#include "machine/coleco.h" +#include "coleco_m.h" #include "bus/coleco/cartridge/exp.h" class coleco_state : public driver_device diff --git a/src/mame/coleco/coleco_m.cpp b/src/mame/coleco/coleco_m.cpp index e95e6786903..25bbbfcb060 100644 --- a/src/mame/coleco/coleco_m.cpp +++ b/src/mame/coleco/coleco_m.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Balfour, Ben Bruscella, Sean Young #include "emu.h" -#include "machine/coleco.h" +#include "coleco_m.h" // ColecoVision Controller static INPUT_PORTS_START( ctrl1 ) diff --git a/src/mame/comad/funybubl.cpp b/src/mame/comad/funybubl.cpp index 95d0b0e1535..e026e2c6139 100644 --- a/src/mame/comad/funybubl.cpp +++ b/src/mame/comad/funybubl.cpp @@ -51,7 +51,7 @@ Note: SW2, SW3 & SW4 not populated #include "emu.h" -#include "includes/funybubl.h" +#include "funybubl.h" #include "cpu/z80/z80.h" #include "screen.h" diff --git a/src/mame/comad/funybubl_v.cpp b/src/mame/comad/funybubl_v.cpp index 3e2160fe2a6..0f5ff2c324e 100644 --- a/src/mame/comad/funybubl_v.cpp +++ b/src/mame/comad/funybubl_v.cpp @@ -8,7 +8,7 @@ todo - convert to tilemap #include "emu.h" -#include "includes/funybubl.h" +#include "funybubl.h" rgb_t funybubl_state::funybubl_R6B6G6(uint32_t raw) { diff --git a/src/mame/comad/galspnbl.cpp b/src/mame/comad/galspnbl.cpp index 2d603ea1df3..b09c53ff964 100644 --- a/src/mame/comad/galspnbl.cpp +++ b/src/mame/comad/galspnbl.cpp @@ -45,7 +45,7 @@ Other: Actel A1020B 84pin PLCC, Cypress CY7384A 84pin PLCC ***************************************************************************/ #include "emu.h" -#include "includes/galspnbl.h" +#include "galspnbl.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/comad/galspnbl.h b/src/mame/comad/galspnbl.h index ae300f66477..a19f1bfcc00 100644 --- a/src/mame/comad/galspnbl.h +++ b/src/mame/comad/galspnbl.h @@ -12,8 +12,10 @@ #pragma once +#include "tecmo_spr.h" + #include "machine/gen_latch.h" -#include "video/tecmo_spr.h" + #include "emupal.h" #include "screen.h" diff --git a/src/mame/comad/galspnbl_v.cpp b/src/mame/comad/galspnbl_v.cpp index 07ff42d6954..b15505c1714 100644 --- a/src/mame/comad/galspnbl_v.cpp +++ b/src/mame/comad/galspnbl_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/galspnbl.h" +#include "galspnbl.h" void galspnbl_state::galspnbl_palette(palette_device &palette) const diff --git a/src/mame/comad/zerozone.cpp b/src/mame/comad/zerozone.cpp index 2775e945915..2afcc9556e5 100644 --- a/src/mame/comad/zerozone.cpp +++ b/src/mame/comad/zerozone.cpp @@ -31,7 +31,7 @@ #include "emu.h" -#include "includes/zerozone.h" +#include "zerozone.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" diff --git a/src/mame/comad/zerozone_v.cpp b/src/mame/comad/zerozone_v.cpp index 5228875c15a..3ca44d55b5c 100644 --- a/src/mame/comad/zerozone_v.cpp +++ b/src/mame/comad/zerozone_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/zerozone.h" +#include "zerozone.h" void zerozone_state::tilemap_w(offs_t offset, uint16_t data, uint16_t mem_mask) { diff --git a/src/mame/comx/comx35.cpp b/src/mame/comx/comx35.cpp index f54f82cb915..d2a440f744c 100644 --- a/src/mame/comx/comx35.cpp +++ b/src/mame/comx/comx35.cpp @@ -17,7 +17,7 @@ */ #include "emu.h" -#include "includes/comx35.h" +#include "comx35.h" #include "formats/imageutl.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/comx/comx35_v.cpp b/src/mame/comx/comx35_v.cpp index 05b4a3ba88d..dac6e8b4cda 100644 --- a/src/mame/comx/comx35_v.cpp +++ b/src/mame/comx/comx35_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/comx35.h" +#include "comx35.h" #include "cpu/cosmac/cosmac.h" #include "sound/cdp1869.h" diff --git a/src/mame/concept/concept.cpp b/src/mame/concept/concept.cpp index 749133661ec..f907ff0810a 100644 --- a/src/mame/concept/concept.cpp +++ b/src/mame/concept/concept.cpp @@ -38,7 +38,7 @@ */ #include "emu.h" -#include "includes/concept.h" +#include "concept.h" #include "cpu/m68000/m68000.h" #include "bus/a2bus/a2corvus.h" diff --git a/src/mame/concept/concept_m.cpp b/src/mame/concept/concept_m.cpp index ff70dfd656d..35bc3019d3a 100644 --- a/src/mame/concept/concept_m.cpp +++ b/src/mame/concept/concept_m.cpp @@ -7,7 +7,7 @@ */ #include "emu.h" -#include "includes/concept.h" +#include "concept.h" #define VERBOSE 1 diff --git a/src/mame/conitec/prof180x.cpp b/src/mame/conitec/prof180x.cpp index 1ad7758c54b..3954d9df9ab 100644 --- a/src/mame/conitec/prof180x.cpp +++ b/src/mame/conitec/prof180x.cpp @@ -23,7 +23,7 @@ #include "emu.h" -#include "includes/prof180x.h" +#include "prof180x.h" #include "cpu/z180/z180.h" #include "imagedev/floppy.h" diff --git a/src/mame/conitec/prof80.cpp b/src/mame/conitec/prof80.cpp index 0a211bac96f..a557a1e1f1e 100644 --- a/src/mame/conitec/prof80.cpp +++ b/src/mame/conitec/prof80.cpp @@ -26,7 +26,7 @@ */ #include "emu.h" -#include "includes/prof80.h" +#include "prof80.h" #include "softlist_dev.h" diff --git a/src/mame/conitec/prof80.h b/src/mame/conitec/prof80.h index 8dcefe0c7e8..70d92ab867f 100644 --- a/src/mame/conitec/prof80.h +++ b/src/mame/conitec/prof80.h @@ -10,7 +10,7 @@ #include "cpu/z80/z80.h" #include "imagedev/floppy.h" #include "machine/z80daisy.h" -#include "machine/prof80mmu.h" +#include "prof80mmu.h" #include "machine/74259.h" #include "machine/ram.h" #include "machine/rescap.h" diff --git a/src/mame/cvs/cvs.cpp b/src/mame/cvs/cvs.cpp index 11ea09a25c9..bc421eb314e 100644 --- a/src/mame/cvs/cvs.cpp +++ b/src/mame/cvs/cvs.cpp @@ -96,7 +96,7 @@ Todo & FIXME: ***************************************************************************/ #include "emu.h" -#include "includes/cvs.h" +#include "cvs.h" #include "speaker.h" diff --git a/src/mame/cvs/cvs_v.cpp b/src/mame/cvs/cvs_v.cpp index db1cc92b24c..484539313a2 100644 --- a/src/mame/cvs/cvs_v.cpp +++ b/src/mame/cvs/cvs_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "cpu/s2650/s2650.h" -#include "includes/cvs.h" +#include "cvs.h" #define SPRITE_PEN_BASE (0x820) diff --git a/src/mame/cvs/galaxia.cpp b/src/mame/cvs/galaxia.cpp index c54e038f618..c905cd9e7bb 100644 --- a/src/mame/cvs/galaxia.cpp +++ b/src/mame/cvs/galaxia.cpp @@ -76,7 +76,7 @@ TODO: */ #include "emu.h" -#include "includes/galaxia.h" +#include "galaxia.h" #include "machine/s2636.h" #include "cpu/s2650/s2650.h" diff --git a/src/mame/cvs/galaxia.h b/src/mame/cvs/galaxia.h index 8e930eb1a00..a92a49ee0d3 100644 --- a/src/mame/cvs/galaxia.h +++ b/src/mame/cvs/galaxia.h @@ -10,7 +10,7 @@ #pragma once -#include "includes/cvs.h" +#include "cvs.h" #include "tilemap.h" class galaxia_state : public cvs_state diff --git a/src/mame/cvs/galaxia_v.cpp b/src/mame/cvs/galaxia_v.cpp index 98370919e96..a1179538bf2 100644 --- a/src/mame/cvs/galaxia_v.cpp +++ b/src/mame/cvs/galaxia_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/galaxia.h" +#include "galaxia.h" #define SPRITE_PEN_BASE (0x10) #define STAR_PEN (0x18) diff --git a/src/mame/cvs/quasar.cpp b/src/mame/cvs/quasar.cpp index 243d673b629..d46d99f2cef 100644 --- a/src/mame/cvs/quasar.cpp +++ b/src/mame/cvs/quasar.cpp @@ -31,7 +31,7 @@ I8085 Sound Board ************************************************************************/ #include "emu.h" -#include "includes/quasar.h" +#include "quasar.h" #include "cpu/s2650/s2650.h" #include "cpu/mcs48/mcs48.h" #include "speaker.h" diff --git a/src/mame/cvs/quasar.h b/src/mame/cvs/quasar.h index 27e2df4de22..0db746289c2 100644 --- a/src/mame/cvs/quasar.h +++ b/src/mame/cvs/quasar.h @@ -10,7 +10,7 @@ #pragma once -#include "includes/cvs.h" +#include "cvs.h" class quasar_state : public cvs_state { diff --git a/src/mame/cvs/quasar_v.cpp b/src/mame/cvs/quasar_v.cpp index 742256f8cfd..0ddded0a0f5 100644 --- a/src/mame/cvs/quasar_v.cpp +++ b/src/mame/cvs/quasar_v.cpp @@ -18,7 +18,7 @@ #include "emu.h" #include "cpu/s2650/s2650.h" -#include "includes/quasar.h" +#include "quasar.h" void quasar_state::quasar_palette(palette_device &palette) const { diff --git a/src/mame/cybiko/cybiko.cpp b/src/mame/cybiko/cybiko.cpp index e6347e26f6e..0d7f9e3d38b 100644 --- a/src/mame/cybiko/cybiko.cpp +++ b/src/mame/cybiko/cybiko.cpp @@ -19,7 +19,7 @@ ToDo: #include "emu.h" -#include "includes/cybiko.h" +#include "cybiko.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/cybiko/cybiko_m.cpp b/src/mame/cybiko/cybiko_m.cpp index e35055ff545..54225b51c06 100644 --- a/src/mame/cybiko/cybiko_m.cpp +++ b/src/mame/cybiko/cybiko_m.cpp @@ -13,7 +13,7 @@ */ #include "emu.h" -#include "includes/cybiko.h" +#include "cybiko.h" #define LOG_LEVEL 1 #define _logerror(level,x) do { if (LOG_LEVEL > level) logerror x; } while (0) diff --git a/src/mame/dai/dai.cpp b/src/mame/dai/dai.cpp index 927bca3e4da..2836a137483 100644 --- a/src/mame/dai/dai.cpp +++ b/src/mame/dai/dai.cpp @@ -61,7 +61,7 @@ Timings: *******************************************************************************/ #include "emu.h" -#include "includes/dai.h" +#include "dai.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/dai/dai.h b/src/mame/dai/dai.h index a9670e75f2e..402fd9893f7 100644 --- a/src/mame/dai/dai.h +++ b/src/mame/dai/dai.h @@ -9,7 +9,7 @@ #ifndef MAME_INCLUDES_DAI_H #define MAME_INCLUDES_DAI_H -#include "audio/dai_snd.h" +#include "dai_snd.h" #include "cpu/i8085/i8085.h" #include "imagedev/cassette.h" diff --git a/src/mame/dai/dai_m.cpp b/src/mame/dai/dai_m.cpp index bd39bfe8212..074e9655e27 100644 --- a/src/mame/dai/dai_m.cpp +++ b/src/mame/dai/dai_m.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dai.h" +#include "dai.h" #define DEBUG_DAI_PORTS 0 diff --git a/src/mame/dai/dai_v.cpp b/src/mame/dai/dai_v.cpp index a5c7488b12a..99298ba1d1e 100644 --- a/src/mame/dai/dai_v.cpp +++ b/src/mame/dai/dai_v.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dai.h" +#include "dai.h" #define DEBUG_DAI_VIDEO 0 diff --git a/src/mame/dataeast/actfancr.cpp b/src/mame/dataeast/actfancr.cpp index 8bec93fd074..ccb0e1975d9 100644 --- a/src/mame/dataeast/actfancr.cpp +++ b/src/mame/dataeast/actfancr.cpp @@ -19,8 +19,8 @@ #include "emu.h" -#include "video/decbac06.h" -#include "video/decmxc06.h" +#include "decbac06.h" +#include "decmxc06.h" #include "cpu/h6280/h6280.h" #include "cpu/m6502/m6502.h" diff --git a/src/mame/dataeast/astrof.cpp b/src/mame/dataeast/astrof.cpp index d04d0c8d672..58c058613f4 100644 --- a/src/mame/dataeast/astrof.cpp +++ b/src/mame/dataeast/astrof.cpp @@ -59,7 +59,7 @@ #include "emu.h" -#include "includes/astrof.h" +#include "astrof.h" #include "cpu/m6502/m6502.h" diff --git a/src/mame/dataeast/astrof_a.cpp b/src/mame/dataeast/astrof_a.cpp index b9d141c698c..361184c0ccd 100644 --- a/src/mame/dataeast/astrof_a.cpp +++ b/src/mame/dataeast/astrof_a.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/astrof.h" +#include "astrof.h" #include "speaker.h" diff --git a/src/mame/dataeast/backfire.cpp b/src/mame/dataeast/backfire.cpp index 198d4d6b07c..2f835bd36d4 100644 --- a/src/mame/dataeast/backfire.cpp +++ b/src/mame/dataeast/backfire.cpp @@ -14,14 +14,14 @@ #include "emu.h" #include "machine/adc0808.h" -#include "machine/decocrpt.h" -#include "machine/deco156.h" +#include "decocrpt.h" +#include "deco156_m.h" #include "machine/eepromser.h" #include "sound/okim6295.h" #include "sound/ymz280b.h" #include "cpu/arm/arm.h" -#include "video/deco16ic.h" -#include "video/decospr.h" +#include "deco16ic.h" +#include "decospr.h" #include "emupal.h" #include "layout/generic.h" #include "screen.h" diff --git a/src/mame/dataeast/boogwing.cpp b/src/mame/dataeast/boogwing.cpp index d254f266e18..336785df1b3 100644 --- a/src/mame/dataeast/boogwing.cpp +++ b/src/mame/dataeast/boogwing.cpp @@ -83,11 +83,11 @@ */ #include "emu.h" -#include "includes/boogwing.h" +#include "boogwing.h" #include "cpu/m68000/m68000.h" -#include "machine/deco102.h" -#include "machine/decocrpt.h" +#include "deco102.h" +#include "decocrpt.h" #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "sound/ymopm.h" diff --git a/src/mame/dataeast/boogwing.h b/src/mame/dataeast/boogwing.h index 724ad448bbe..641d54a8f36 100644 --- a/src/mame/dataeast/boogwing.h +++ b/src/mame/dataeast/boogwing.h @@ -8,11 +8,11 @@ #include "cpu/h6280/h6280.h" #include "sound/okim6295.h" -#include "video/deco16ic.h" -#include "video/deco_ace.h" +#include "deco16ic.h" +#include "deco_ace.h" #include "video/bufsprite.h" -#include "video/decospr.h" -#include "machine/deco104.h" +#include "decospr.h" +#include "deco104.h" #include "screen.h" class boogwing_state : public driver_device diff --git a/src/mame/dataeast/boogwing_v.cpp b/src/mame/dataeast/boogwing_v.cpp index d70d8f684d6..4f36d15e480 100644 --- a/src/mame/dataeast/boogwing_v.cpp +++ b/src/mame/dataeast/boogwing_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Haywood #include "emu.h" -#include "includes/boogwing.h" +#include "boogwing.h" void boogwing_state::video_start() diff --git a/src/mame/dataeast/btime.cpp b/src/mame/dataeast/btime.cpp index 93caecd59e2..1caffb102fc 100644 --- a/src/mame/dataeast/btime.cpp +++ b/src/mame/dataeast/btime.cpp @@ -145,13 +145,13 @@ A few notes: ***************************************************************************/ #include "emu.h" -#include "includes/btime.h" +#include "btime.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" #include "sound/discrete.h" -#include "machine/decocpu7.h" -#include "machine/deco222.h" +#include "decocpu7.h" +#include "deco222.h" #include "speaker.h" #define MASTER_CLOCK XTAL(12'000'000) diff --git a/src/mame/dataeast/btime_m.cpp b/src/mame/dataeast/btime_m.cpp index 8d3df4633dd..f71c55c80ea 100644 --- a/src/mame/dataeast/btime_m.cpp +++ b/src/mame/dataeast/btime_m.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Zsolt Vasvari, Couriersud #include "emu.h" -#include "includes/btime.h" +#include "btime.h" #define BASE 0xb000 diff --git a/src/mame/dataeast/btime_v.cpp b/src/mame/dataeast/btime_v.cpp index 7e592aeb0dd..1868969a6e9 100644 --- a/src/mame/dataeast/btime_v.cpp +++ b/src/mame/dataeast/btime_v.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/btime.h" +#include "btime.h" /*************************************************************************** diff --git a/src/mame/dataeast/bwing.cpp b/src/mame/dataeast/bwing.cpp index d1d941f5ddf..eb70b5b0247 100644 --- a/src/mame/dataeast/bwing.cpp +++ b/src/mame/dataeast/bwing.cpp @@ -25,7 +25,7 @@ Known issues: // Directives #include "emu.h" -#include "includes/bwing.h" +#include "bwing.h" #include "cpu/m6502/deco16.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/dataeast/bwing_v.cpp b/src/mame/dataeast/bwing_v.cpp index d722416fd28..32887c5dae1 100644 --- a/src/mame/dataeast/bwing_v.cpp +++ b/src/mame/dataeast/bwing_v.cpp @@ -12,7 +12,7 @@ revised by Alex W. Jackson // Directives #include "emu.h" -#include "includes/bwing.h" +#include "bwing.h" //**************************************************************************** diff --git a/src/mame/dataeast/cbuster.cpp b/src/mame/dataeast/cbuster.cpp index e6a04f6e389..5241bab2a8a 100644 --- a/src/mame/dataeast/cbuster.cpp +++ b/src/mame/dataeast/cbuster.cpp @@ -39,7 +39,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/cbuster.h" +#include "cbuster.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" diff --git a/src/mame/dataeast/cbuster.h b/src/mame/dataeast/cbuster.h index 2e5455df15b..3391c35e375 100644 --- a/src/mame/dataeast/cbuster.h +++ b/src/mame/dataeast/cbuster.h @@ -13,8 +13,8 @@ #include "machine/gen_latch.h" #include "cpu/h6280/h6280.h" #include "video/bufsprite.h" -#include "video/decospr.h" -#include "video/deco16ic.h" +#include "decospr.h" +#include "deco16ic.h" #include "emupal.h" class cbuster_state : public driver_device diff --git a/src/mame/dataeast/cbuster_v.cpp b/src/mame/dataeast/cbuster_v.cpp index a7da299739e..0dd30279438 100644 --- a/src/mame/dataeast/cbuster_v.cpp +++ b/src/mame/dataeast/cbuster_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/cbuster.h" +#include "cbuster.h" /******************************************************************************/ diff --git a/src/mame/dataeast/cninja.cpp b/src/mame/dataeast/cninja.cpp index b8f02f18b68..4412efb3ed8 100644 --- a/src/mame/dataeast/cninja.cpp +++ b/src/mame/dataeast/cninja.cpp @@ -43,11 +43,11 @@ Note about version levels using Mutant Fighter as the example: ***************************************************************************/ #include "emu.h" -#include "includes/cninja.h" +#include "cninja.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" -#include "machine/decocrpt.h" +#include "decocrpt.h" #include "sound/okim6295.h" #include "sound/ymopm.h" #include "sound/ymopn.h" diff --git a/src/mame/dataeast/cninja.h b/src/mame/dataeast/cninja.h index 396a94f8171..6c94e752829 100644 --- a/src/mame/dataeast/cninja.h +++ b/src/mame/dataeast/cninja.h @@ -8,12 +8,12 @@ #include "cpu/h6280/h6280.h" #include "sound/okim6295.h" -#include "video/deco16ic.h" +#include "deco16ic.h" #include "video/bufsprite.h" -#include "video/decospr.h" -#include "machine/deco_irq.h" -#include "machine/deco146.h" -#include "machine/deco104.h" +#include "decospr.h" +#include "deco_irq.h" +#include "deco146.h" +#include "deco104.h" #include "machine/gen_latch.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/dataeast/cninja_v.cpp b/src/mame/dataeast/cninja_v.cpp index 3362e679f7a..aaddb608c70 100644 --- a/src/mame/dataeast/cninja_v.cpp +++ b/src/mame/dataeast/cninja_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/cninja.h" +#include "cninja.h" /******************************************************************************/ diff --git a/src/mame/dataeast/compgolf.cpp b/src/mame/dataeast/compgolf.cpp index 0c40d28ccbb..f5c8e8f2b58 100644 --- a/src/mame/dataeast/compgolf.cpp +++ b/src/mame/dataeast/compgolf.cpp @@ -18,7 +18,7 @@ #include "screen.h" #include "speaker.h" -#include "includes/compgolf.h" +#include "compgolf.h" /************************************* diff --git a/src/mame/dataeast/compgolf_v.cpp b/src/mame/dataeast/compgolf_v.cpp index 310126b5933..550fe6e21bc 100644 --- a/src/mame/dataeast/compgolf_v.cpp +++ b/src/mame/dataeast/compgolf_v.cpp @@ -8,7 +8,7 @@ ****************************************************************************************/ #include "emu.h" -#include "includes/compgolf.h" +#include "compgolf.h" void compgolf_state::compgolf_palette(palette_device &palette) const diff --git a/src/mame/dataeast/darkseal.cpp b/src/mame/dataeast/darkseal.cpp index bd935020dcf..45e0d17313e 100644 --- a/src/mame/dataeast/darkseal.cpp +++ b/src/mame/dataeast/darkseal.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/darkseal.h" +#include "darkseal.h" #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" diff --git a/src/mame/dataeast/darkseal.h b/src/mame/dataeast/darkseal.h index ea5ec8eed56..e14bc07aa7e 100644 --- a/src/mame/dataeast/darkseal.h +++ b/src/mame/dataeast/darkseal.h @@ -7,9 +7,9 @@ #include "machine/gen_latch.h" #include "cpu/h6280/h6280.h" -#include "video/deco16ic.h" +#include "deco16ic.h" #include "video/bufsprite.h" -#include "video/decospr.h" +#include "decospr.h" #include "emupal.h" class darkseal_state : public driver_device diff --git a/src/mame/dataeast/darkseal_v.cpp b/src/mame/dataeast/darkseal_v.cpp index f8b71bda064..7e7b4597e08 100644 --- a/src/mame/dataeast/darkseal_v.cpp +++ b/src/mame/dataeast/darkseal_v.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/darkseal.h" +#include "darkseal.h" /***************************************************************************/ diff --git a/src/mame/dataeast/dassault.cpp b/src/mame/dataeast/dassault.cpp index a9202bcf403..3fb99741b16 100644 --- a/src/mame/dataeast/dassault.cpp +++ b/src/mame/dataeast/dassault.cpp @@ -210,7 +210,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/dassault.h" +#include "dassault.h" #include "cpu/m68000/m68000.h" #include "machine/mb8421.h" diff --git a/src/mame/dataeast/dassault.h b/src/mame/dataeast/dassault.h index 343c770ab98..107902a2e6d 100644 --- a/src/mame/dataeast/dassault.h +++ b/src/mame/dataeast/dassault.h @@ -9,10 +9,10 @@ #include "machine/gen_latch.h" #include "cpu/h6280/h6280.h" #include "sound/okim6295.h" -#include "video/deco16ic.h" -#include "video/decocomn.h" +#include "deco16ic.h" +#include "decocomn.h" #include "video/bufsprite.h" -#include "video/decospr.h" +#include "decospr.h" #include "emupal.h" class dassault_state : public driver_device diff --git a/src/mame/dataeast/dassault_v.cpp b/src/mame/dataeast/dassault_v.cpp index 77e887cea3b..de2035d17ab 100644 --- a/src/mame/dataeast/dassault_v.cpp +++ b/src/mame/dataeast/dassault_v.cpp @@ -16,7 +16,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/dassault.h" +#include "dassault.h" #include "screen.h" /******************************************************************************/ diff --git a/src/mame/dataeast/dblewing.cpp b/src/mame/dataeast/dblewing.cpp index acb62fce76f..88706ab89f2 100644 --- a/src/mame/dataeast/dblewing.cpp +++ b/src/mame/dataeast/dblewing.cpp @@ -70,15 +70,15 @@ Notes: #include "emu.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "machine/deco102.h" -#include "machine/deco104.h" -#include "machine/decocrpt.h" +#include "deco102.h" +#include "deco104.h" +#include "decocrpt.h" #include "machine/gen_latch.h" #include "machine/input_merger.h" #include "sound/okim6295.h" #include "sound/ymopm.h" -#include "video/deco16ic.h" -#include "video/decospr.h" +#include "deco16ic.h" +#include "decospr.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/dataeast/dec0.cpp b/src/mame/dataeast/dec0.cpp index f70955f2168..a46fffe92a0 100644 --- a/src/mame/dataeast/dec0.cpp +++ b/src/mame/dataeast/dec0.cpp @@ -391,7 +391,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/dec0.h" +#include "dec0.h" #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" diff --git a/src/mame/dataeast/dec0.h b/src/mame/dataeast/dec0.h index b97de7b2f28..64acd7500b1 100644 --- a/src/mame/dataeast/dec0.h +++ b/src/mame/dataeast/dec0.h @@ -12,8 +12,8 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" #include "video/bufsprite.h" -#include "video/decbac06.h" -#include "video/decmxc06.h" +#include "decbac06.h" +#include "decmxc06.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/dataeast/dec0_m.cpp b/src/mame/dataeast/dec0_m.cpp index 926c2c58967..94d3ca91952 100644 --- a/src/mame/dataeast/dec0_m.cpp +++ b/src/mame/dataeast/dec0_m.cpp @@ -9,7 +9,7 @@ Data East machine functions - Bryan McPhail, mish@tendril.co.uk *******************************************************************************/ #include "emu.h" -#include "includes/dec0.h" +#include "dec0.h" #include "cpu/h6280/h6280.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/dataeast/dec0_v.cpp b/src/mame/dataeast/dec0_v.cpp index d0eb0bcf99b..68ff43d47da 100644 --- a/src/mame/dataeast/dec0_v.cpp +++ b/src/mame/dataeast/dec0_v.cpp @@ -7,7 +7,7 @@ *********************************************************************/ #include "emu.h" -#include "includes/dec0.h" +#include "dec0.h" /******************************************************************************/ diff --git a/src/mame/dataeast/dec8.cpp b/src/mame/dataeast/dec8.cpp index 607af5f542b..354a47b4061 100644 --- a/src/mame/dataeast/dec8.cpp +++ b/src/mame/dataeast/dec8.cpp @@ -42,12 +42,12 @@ To do: ***************************************************************************/ #include "emu.h" -#include "includes/dec8.h" +#include "dec8.h" #include "cpu/m6502/m6502.h" #include "cpu/m6809/hd6309.h" #include "cpu/m6809/m6809.h" -#include "machine/deco222.h" +#include "deco222.h" #include "sound/msm5205.h" #include "sound/ymopn.h" #include "sound/ymopl.h" diff --git a/src/mame/dataeast/dec8.h b/src/mame/dataeast/dec8.h index bcfe503ef72..7b6df939967 100644 --- a/src/mame/dataeast/dec8.h +++ b/src/mame/dataeast/dec8.h @@ -10,10 +10,10 @@ #include "machine/input_merger.h" #include "sound/msm5205.h" #include "video/bufsprite.h" -#include "video/decbac06.h" -#include "video/deckarn.h" -#include "video/decmxc06.h" -#include "video/decrmc3.h" +#include "decbac06.h" +#include "deckarn.h" +#include "decmxc06.h" +#include "decrmc3.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/dataeast/dec8_v.cpp b/src/mame/dataeast/dec8_v.cpp index 76ab7a4a0b9..579dfa6dd5e 100644 --- a/src/mame/dataeast/dec8_v.cpp +++ b/src/mame/dataeast/dec8_v.cpp @@ -44,7 +44,7 @@ sprites. ***************************************************************************/ #include "emu.h" -#include "includes/dec8.h" +#include "dec8.h" void dec8_state::dec8_bg_data_w(offs_t offset, uint8_t data) { diff --git a/src/mame/dataeast/deco102.cpp b/src/mame/dataeast/deco102.cpp index 0c643c529aa..7ef08661527 100644 --- a/src/mame/dataeast/deco102.cpp +++ b/src/mame/dataeast/deco102.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "cpu/m68000/m68000.h" -#include "machine/deco102.h" +#include "deco102.h" static uint16_t decrypt(uint16_t data, int address, int select_xor) { diff --git a/src/mame/dataeast/deco156.cpp b/src/mame/dataeast/deco156.cpp index b868845c06a..837df667acf 100644 --- a/src/mame/dataeast/deco156.cpp +++ b/src/mame/dataeast/deco156.cpp @@ -17,13 +17,13 @@ #include "emu.h" #include "cpu/arm/arm.h" -#include "machine/decocrpt.h" -#include "machine/deco156.h" +#include "decocrpt.h" +#include "deco156_m.h" #include "machine/eepromser.h" #include "sound/okim6295.h" #include "sound/ymz280b.h" -#include "video/deco16ic.h" -#include "video/decospr.h" +#include "deco16ic.h" +#include "decospr.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/dataeast/deco156_m.cpp b/src/mame/dataeast/deco156_m.cpp index d763611d517..d1dae4948cb 100644 --- a/src/mame/dataeast/deco156_m.cpp +++ b/src/mame/dataeast/deco156_m.cpp @@ -33,7 +33,7 @@ */ #include "emu.h" -#include "machine/deco156.h" +#include "deco156_m.h" static void decrypt(uint32_t *src, uint32_t *dst, int length) diff --git a/src/mame/dataeast/deco16ic.cpp b/src/mame/dataeast/deco16ic.cpp index f0d521a05ae..59f16889aea 100644 --- a/src/mame/dataeast/deco16ic.cpp +++ b/src/mame/dataeast/deco16ic.cpp @@ -173,7 +173,7 @@ Rowscroll style: ***************************************************************************/ #include "emu.h" -#include "video/deco16ic.h" +#include "deco16ic.h" #include "screen.h" DEFINE_DEVICE_TYPE(DECO16IC, deco16ic_device, "deco16ic", "DECO 55 / 56 / 74 / 141 Tilemap Generator") diff --git a/src/mame/dataeast/deco32.cpp b/src/mame/dataeast/deco32.cpp index 182f8aee647..619ba2c7a18 100644 --- a/src/mame/dataeast/deco32.cpp +++ b/src/mame/dataeast/deco32.cpp @@ -370,13 +370,14 @@ NOTE: There are several unpopulated locations (denoted by *) for additional rom ***************************************************************************/ #include "emu.h" -#include "includes/deco32.h" +#include "deco32.h" + +#include "deco156_m.h" +#include "decocrpt.h" #include "cpu/arm/arm.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" -#include "machine/decocrpt.h" -#include "machine/deco156.h" #include "machine/input_merger.h" #include "speaker.h" diff --git a/src/mame/dataeast/deco32.h b/src/mame/dataeast/deco32.h index f262861240e..4ef33f700b7 100644 --- a/src/mame/dataeast/deco32.h +++ b/src/mame/dataeast/deco32.h @@ -1,23 +1,32 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail +#ifndef MAME_DATAEAST_DECO32_H +#define MAME_DATAEAST_DECO32_H + +#pragma once + +#include "deco104.h" +#include "deco146.h" +#include "deco16ic.h" +#include "deco_ace.h" +#include "deco_irq.h" +#include "decospr.h" + +#include "decobsmt.h" +#include "namco_c355spr.h" + #include "cpu/h6280/h6280.h" -#include "audio/decobsmt.h" -#include "video/bufsprite.h" -#include "video/decospr.h" -#include "video/deco16ic.h" -#include "video/deco_ace.h" -#include "machine/deco_irq.h" #include "machine/eepromser.h" #include "machine/gen_latch.h" #include "sound/lc7535.h" #include "sound/okim6295.h" #include "sound/ymopm.h" -#include "machine/deco146.h" -#include "machine/deco104.h" -#include "video/namco_c355spr.h" +#include "video/bufsprite.h" + #include "emupal.h" #include "screen.h" + class deco32_state : public driver_device { public: @@ -308,3 +317,5 @@ private: void lockloadu_sound_map(address_map &map); bool m_gun_speaker_disabled; }; + +#endif // MAME_DATAEAST_DECO32_H diff --git a/src/mame/dataeast/deco32_v.cpp b/src/mame/dataeast/deco32_v.cpp index 6d785feb4a1..d91df0b5e81 100644 --- a/src/mame/dataeast/deco32_v.cpp +++ b/src/mame/dataeast/deco32_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail #include "emu.h" -#include "includes/deco32.h" +#include "deco32.h" /******************************************************************************/ diff --git a/src/mame/dataeast/deco_ace.cpp b/src/mame/dataeast/deco_ace.cpp index c12fc522daa..65354495077 100644 --- a/src/mame/dataeast/deco_ace.cpp +++ b/src/mame/dataeast/deco_ace.cpp @@ -66,7 +66,7 @@ #include "emu.h" -#include "video/deco_ace.h" +#include "deco_ace.h" #include diff --git a/src/mame/dataeast/deco_mlc.cpp b/src/mame/dataeast/deco_mlc.cpp index 5154be2e8c6..0839d0d0301 100644 --- a/src/mame/dataeast/deco_mlc.cpp +++ b/src/mame/dataeast/deco_mlc.cpp @@ -108,9 +108,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/deco_mlc.h" +#include "deco_mlc.h" -#include "machine/deco156.h" +#include "deco156_m.h" #include "machine/eepromser.h" #include "cpu/arm/arm.h" #include "cpu/sh/sh2.h" diff --git a/src/mame/dataeast/deco_mlc.h b/src/mame/dataeast/deco_mlc.h index f89c273b0eb..81e33683cea 100644 --- a/src/mame/dataeast/deco_mlc.h +++ b/src/mame/dataeast/deco_mlc.h @@ -2,7 +2,7 @@ // copyright-holders:Bryan McPhail #include "machine/eepromser.h" -#include "machine/deco146.h" +#include "deco146.h" #include "machine/timer.h" #include "sound/ymz280b.h" #include "emupal.h" diff --git a/src/mame/dataeast/deco_mlc_v.cpp b/src/mame/dataeast/deco_mlc_v.cpp index b16bb9d7b89..1c3781522d1 100644 --- a/src/mame/dataeast/deco_mlc_v.cpp +++ b/src/mame/dataeast/deco_mlc_v.cpp @@ -11,7 +11,7 @@ */ #include "emu.h" -#include "includes/deco_mlc.h" +#include "deco_mlc.h" #include diff --git a/src/mame/dataeast/decocass.cpp b/src/mame/dataeast/decocass.cpp index 87106f31a47..9b789f5bc8f 100644 --- a/src/mame/dataeast/decocass.cpp +++ b/src/mame/dataeast/decocass.cpp @@ -55,12 +55,12 @@ *******************************************************************************/ #include "emu.h" -#include "includes/decocass.h" +#include "decocass.h" #include "cpu/m6502/m6502.h" #include "cpu/mcs48/mcs48.h" -#include "machine/deco222.h" -#include "machine/decocass_tape.h" +#include "deco222.h" +#include "decocass_tape.h" #include "sound/ay8910.h" #include "speaker.h" diff --git a/src/mame/dataeast/decocass.h b/src/mame/dataeast/decocass.h index 6e4fda69d85..fa44cec97b6 100644 --- a/src/mame/dataeast/decocass.h +++ b/src/mame/dataeast/decocass.h @@ -12,7 +12,7 @@ #endif #define LOG(n,x) do { if (LOGLEVEL >= n) logerror x; } while (0) -#include "machine/decocass_tape.h" +#include "decocass_tape.h" #include "machine/gen_latch.h" #include "machine/timer.h" #include "machine/watchdog.h" diff --git a/src/mame/dataeast/decocass_m.cpp b/src/mame/dataeast/decocass_m.cpp index f85fa959d8c..b7a6a62b259 100644 --- a/src/mame/dataeast/decocass_m.cpp +++ b/src/mame/dataeast/decocass_m.cpp @@ -9,8 +9,8 @@ #include "emu.h" #include "cpu/m6502/m6502.h" #include "cpu/mcs48/mcs48.h" -#include "includes/decocass.h" -#include "machine/decocass_tape.h" +#include "decocass.h" +#include "decocass_tape.h" /* dongle type #1: jumpers C and D assignments */ #define MAKE_MAP(m0,m1,m2,m3,m4,m5,m6,m7) \ diff --git a/src/mame/dataeast/decocass_tape.cpp b/src/mame/dataeast/decocass_tape.cpp index 1dc296ae3f4..e29d53a0e91 100644 --- a/src/mame/dataeast/decocass_tape.cpp +++ b/src/mame/dataeast/decocass_tape.cpp @@ -7,7 +7,7 @@ ***********************************************************************/ #include "emu.h" -#include "machine/decocass_tape.h" +#include "decocass_tape.h" #include "cpu/m6502/m6502.h" #include "cpu/mcs48/mcs48.h" diff --git a/src/mame/dataeast/decocass_v.cpp b/src/mame/dataeast/decocass_v.cpp index a9b0e6ea8ae..56382d02575 100644 --- a/src/mame/dataeast/decocass_v.cpp +++ b/src/mame/dataeast/decocass_v.cpp @@ -124,7 +124,7 @@ ***********************************************************************/ #include "emu.h" -#include "includes/decocass.h" +#include "decocass.h" static const uint32_t tile_offset[32*32] = { diff --git a/src/mame/dataeast/decocomn.cpp b/src/mame/dataeast/decocomn.cpp index 0d221d2e863..6d13a1a0d2d 100644 --- a/src/mame/dataeast/decocomn.cpp +++ b/src/mame/dataeast/decocomn.cpp @@ -7,7 +7,7 @@ #include "emu.h" -#include "video/decocomn.h" +#include "decocomn.h" DEFINE_DEVICE_TYPE(DECOCOMN, decocomn_device, "decocomn", "DECO Common Video Functions") diff --git a/src/mame/dataeast/decocrpt.cpp b/src/mame/dataeast/decocrpt.cpp index ad5e212414b..20ab8f0e147 100644 --- a/src/mame/dataeast/decocrpt.cpp +++ b/src/mame/dataeast/decocrpt.cpp @@ -44,7 +44,7 @@ Sotsugyo Shousho 1995 *******************************************************************************/ #include "emu.h" -#include "machine/decocrpt.h" +#include "decocrpt.h" static const uint16_t xor_masks[16] = { diff --git a/src/mame/dataeast/dietgo.cpp b/src/mame/dataeast/dietgo.cpp index 93ee2e319bd..df44ea6db53 100644 --- a/src/mame/dataeast/dietgo.cpp +++ b/src/mame/dataeast/dietgo.cpp @@ -28,11 +28,11 @@ PAL16R6A 11H #include "sound/okim6295.h" #include "sound/ymopm.h" -#include "machine/decocrpt.h" -#include "machine/deco102.h" -#include "machine/deco104.h" -#include "video/deco16ic.h" -#include "video/decospr.h" +#include "decocrpt.h" +#include "deco102.h" +#include "deco104.h" +#include "deco16ic.h" +#include "decospr.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/dataeast/dreambal.cpp b/src/mame/dataeast/dreambal.cpp index 2161f2fd9f5..edd0f39796a 100644 --- a/src/mame/dataeast/dreambal.cpp +++ b/src/mame/dataeast/dreambal.cpp @@ -23,11 +23,11 @@ lamps? #include "emu.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "machine/deco104.h" -#include "machine/decocrpt.h" +#include "deco104.h" +#include "decocrpt.h" #include "machine/eepromser.h" #include "sound/okim6295.h" -#include "video/deco16ic.h" +#include "deco16ic.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/dataeast/exprraid.cpp b/src/mame/dataeast/exprraid.cpp index 854f8145584..c73fb741681 100644 --- a/src/mame/dataeast/exprraid.cpp +++ b/src/mame/dataeast/exprraid.cpp @@ -206,7 +206,7 @@ Stephh's notes (based on the games M6502 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/exprraid.h" +#include "exprraid.h" #include "cpu/m6502/deco16.h" #include "cpu/m6502/m6502.h" diff --git a/src/mame/dataeast/exprraid_v.cpp b/src/mame/dataeast/exprraid_v.cpp index 166d42f01fe..d10c8fbf27c 100644 --- a/src/mame/dataeast/exprraid_v.cpp +++ b/src/mame/dataeast/exprraid_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi #include "emu.h" -#include "includes/exprraid.h" +#include "exprraid.h" void exprraid_state::exprraid_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/dataeast/funkyjet.cpp b/src/mame/dataeast/funkyjet.cpp index 6e1a70db8ac..17179832b49 100644 --- a/src/mame/dataeast/funkyjet.cpp +++ b/src/mame/dataeast/funkyjet.cpp @@ -93,13 +93,13 @@ Notes: #include "emu.h" -#include "machine/deco146.h" -#include "video/deco16ic.h" -#include "video/decospr.h" +#include "deco146.h" +#include "deco16ic.h" +#include "decospr.h" #include "cpu/h6280/h6280.h" #include "cpu/m68000/m68000.h" -#include "machine/decocrpt.h" +#include "decocrpt.h" #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "sound/ymopm.h" diff --git a/src/mame/dataeast/karnov.cpp b/src/mame/dataeast/karnov.cpp index 89904f14642..3998c71bf3a 100644 --- a/src/mame/dataeast/karnov.cpp +++ b/src/mame/dataeast/karnov.cpp @@ -87,8 +87,8 @@ Stephh's notes (based on the games M68000 code and some tests) : #include "sound/ymopn.h" #include "sound/ymopl.h" #include "video/bufsprite.h" -#include "video/deckarn.h" -#include "video/decrmc3.h" +#include "deckarn.h" +#include "decrmc3.h" #include "screen.h" #include "speaker.h" #include "tilemap.h" diff --git a/src/mame/dataeast/kchamp.cpp b/src/mame/dataeast/kchamp.cpp index ebca5ee63c1..b9fcbf035f8 100644 --- a/src/mame/dataeast/kchamp.cpp +++ b/src/mame/dataeast/kchamp.cpp @@ -65,7 +65,7 @@ IO ports and memory map changes. Dip switches differ too. ***************************************************************************/ #include "emu.h" -#include "includes/kchamp.h" +#include "kchamp.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/dataeast/kchamp_v.cpp b/src/mame/dataeast/kchamp_v.cpp index b213ef78741..2aab806866a 100644 --- a/src/mame/dataeast/kchamp_v.cpp +++ b/src/mame/dataeast/kchamp_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/kchamp.h" +#include "kchamp.h" void kchamp_state::kchamp_palette(palette_device &palette) const diff --git a/src/mame/dataeast/kingobox.cpp b/src/mame/dataeast/kingobox.cpp index a380c9d5cd0..e6e703ece4b 100644 --- a/src/mame/dataeast/kingobox.cpp +++ b/src/mame/dataeast/kingobox.cpp @@ -18,7 +18,7 @@ Main CPU: ***************************************************************************/ #include "emu.h" -#include "includes/kingobox.h" +#include "kingobox.h" #include "cpu/z80/z80.h" #include "machine/clock.h" diff --git a/src/mame/dataeast/kingobox_v.cpp b/src/mame/dataeast/kingobox_v.cpp index 9803d3d3a7d..589a0118a67 100644 --- a/src/mame/dataeast/kingobox_v.cpp +++ b/src/mame/dataeast/kingobox_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ernesto Corvi #include "emu.h" #include "video/resnet.h" -#include "includes/kingobox.h" +#include "kingobox.h" /*************************************************************************** diff --git a/src/mame/dataeast/lemmings.cpp b/src/mame/dataeast/lemmings.cpp index f011f5cd59d..705ec7aff33 100644 --- a/src/mame/dataeast/lemmings.cpp +++ b/src/mame/dataeast/lemmings.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lemmings.h" +#include "lemmings.h" #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/dataeast/lemmings.h b/src/mame/dataeast/lemmings.h index 2b86cb37ed6..fb8927a191f 100644 --- a/src/mame/dataeast/lemmings.h +++ b/src/mame/dataeast/lemmings.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail #include "video/bufsprite.h" -#include "video/decospr.h" -#include "machine/deco146.h" +#include "decospr.h" +#include "deco146.h" #include "machine/gen_latch.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/dataeast/lemmings_v.cpp b/src/mame/dataeast/lemmings_v.cpp index aa8fa71ab43..04a232e740b 100644 --- a/src/mame/dataeast/lemmings_v.cpp +++ b/src/mame/dataeast/lemmings_v.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lemmings.h" +#include "lemmings.h" #include diff --git a/src/mame/dataeast/liberate.cpp b/src/mame/dataeast/liberate.cpp index 4eeafc7b8eb..e8bd9ead34a 100644 --- a/src/mame/dataeast/liberate.cpp +++ b/src/mame/dataeast/liberate.cpp @@ -17,12 +17,12 @@ *******************************************************************************/ #include "emu.h" -#include "includes/liberate.h" +#include "liberate.h" #include "cpu/m6502/deco16.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" -#include "machine/deco222.h" +#include "deco222.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/dataeast/liberate_v.cpp b/src/mame/dataeast/liberate_v.cpp index 313b5cb7a8b..8807072f060 100644 --- a/src/mame/dataeast/liberate_v.cpp +++ b/src/mame/dataeast/liberate_v.cpp @@ -14,7 +14,7 @@ #include "emu.h" #include "cpu/m6502/deco16.h" #include "cpu/m6502/m6502.h" -#include "includes/liberate.h" +#include "liberate.h" #if 0 void liberate_state::debug_print(bitmap_ind16 &bitmap) diff --git a/src/mame/dataeast/madalien.cpp b/src/mame/dataeast/madalien.cpp index b4de105cc1f..de88279dfc1 100644 --- a/src/mame/dataeast/madalien.cpp +++ b/src/mame/dataeast/madalien.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/madalien.h" +#include "madalien.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" diff --git a/src/mame/dataeast/madalien_a.cpp b/src/mame/dataeast/madalien_a.cpp index 067330ee24a..7032da6f9a5 100644 --- a/src/mame/dataeast/madalien_a.cpp +++ b/src/mame/dataeast/madalien_a.cpp @@ -6,7 +6,7 @@ ************************************************************************/ #include "emu.h" -#include "includes/madalien.h" +#include "madalien.h" #include "sound/discrete.h" diff --git a/src/mame/dataeast/madalien_v.cpp b/src/mame/dataeast/madalien_v.cpp index 8303131ca6a..fed490e9ac1 100644 --- a/src/mame/dataeast/madalien_v.cpp +++ b/src/mame/dataeast/madalien_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/madalien.h" +#include "madalien.h" #include "video/mc6845.h" #include "screen.h" diff --git a/src/mame/dataeast/madmotor.cpp b/src/mame/dataeast/madmotor.cpp index 54db3439ec2..847184979b6 100644 --- a/src/mame/dataeast/madmotor.cpp +++ b/src/mame/dataeast/madmotor.cpp @@ -24,8 +24,8 @@ #include "sound/okim6295.h" #include "sound/ymopm.h" #include "sound/ymopn.h" -#include "video/decbac06.h" -#include "video/decmxc06.h" +#include "decbac06.h" +#include "decmxc06.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/dataeast/metlclsh.cpp b/src/mame/dataeast/metlclsh.cpp index 4c481bfaf21..749e209cc75 100644 --- a/src/mame/dataeast/metlclsh.cpp +++ b/src/mame/dataeast/metlclsh.cpp @@ -34,7 +34,7 @@ metlclsh: ***************************************************************************/ #include "emu.h" -#include "includes/metlclsh.h" +#include "metlclsh.h" #include "cpu/m6809/m6809.h" #include "sound/ymopn.h" diff --git a/src/mame/dataeast/metlclsh_v.cpp b/src/mame/dataeast/metlclsh_v.cpp index 327d690c3ca..523e5fbd44b 100644 --- a/src/mame/dataeast/metlclsh_v.cpp +++ b/src/mame/dataeast/metlclsh_v.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/metlclsh.h" +#include "metlclsh.h" void metlclsh_state::metlclsh_rambank_w(uint8_t data) diff --git a/src/mame/dataeast/mirage.cpp b/src/mame/dataeast/mirage.cpp index 9e4dbf7806a..6822ce3114a 100644 --- a/src/mame/dataeast/mirage.cpp +++ b/src/mame/dataeast/mirage.cpp @@ -40,12 +40,12 @@ MR_01-.3A [a0b758aa] #include "emu.h" #include "cpu/m68000/m68000.h" -#include "machine/decocrpt.h" +#include "decocrpt.h" #include "machine/eepromser.h" -#include "video/deco16ic.h" +#include "deco16ic.h" #include "sound/okim6295.h" #include "video/bufsprite.h" -#include "video/decospr.h" +#include "decospr.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/dataeast/pcktgal.cpp b/src/mame/dataeast/pcktgal.cpp index ed7a72673a9..20e02f7299a 100644 --- a/src/mame/dataeast/pcktgal.cpp +++ b/src/mame/dataeast/pcktgal.cpp @@ -16,8 +16,8 @@ #include "emu.h" -#include "machine/deco222.h" -#include "video/decbac06.h" +#include "deco222.h" +#include "decbac06.h" #include "cpu/m6502/m6502.h" #include "machine/gen_latch.h" diff --git a/src/mame/dataeast/pktgaldx.cpp b/src/mame/dataeast/pktgaldx.cpp index 22609266cc5..751084ffc9d 100644 --- a/src/mame/dataeast/pktgaldx.cpp +++ b/src/mame/dataeast/pktgaldx.cpp @@ -57,11 +57,11 @@ bootleg todo: */ #include "emu.h" -#include "includes/pktgaldx.h" +#include "pktgaldx.h" #include "cpu/m68000/m68000.h" -#include "machine/decocrpt.h" -#include "machine/deco102.h" +#include "decocrpt.h" +#include "deco102.h" #include "sound/okim6295.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/dataeast/pktgaldx.h b/src/mame/dataeast/pktgaldx.h index 266e1765aa0..263ef852b46 100644 --- a/src/mame/dataeast/pktgaldx.h +++ b/src/mame/dataeast/pktgaldx.h @@ -11,9 +11,9 @@ #pragma once #include "sound/okim6295.h" -#include "video/decospr.h" -#include "video/deco16ic.h" -#include "machine/deco104.h" +#include "decospr.h" +#include "deco16ic.h" +#include "deco104.h" #include "emupal.h" class pktgaldx_state : public driver_device diff --git a/src/mame/dataeast/pktgaldx_v.cpp b/src/mame/dataeast/pktgaldx_v.cpp index cb32ae8b900..e1c60315bc4 100644 --- a/src/mame/dataeast/pktgaldx_v.cpp +++ b/src/mame/dataeast/pktgaldx_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Bryan McPhail #include "emu.h" -#include "includes/pktgaldx.h" +#include "pktgaldx.h" #include "screen.h" /* Video on the orginal */ diff --git a/src/mame/dataeast/progolf.cpp b/src/mame/dataeast/progolf.cpp index 0811bb49b94..fbfe985b508 100644 --- a/src/mame/dataeast/progolf.cpp +++ b/src/mame/dataeast/progolf.cpp @@ -146,8 +146,8 @@ GCM/GBM/GAM - Harris M3 7603-5 Bipolar PROM (compatible with 82S123) #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" #include "video/mc6845.h" -#include "machine/deco222.h" -#include "machine/decocpu6.h" +#include "deco222.h" +#include "decocpu6.h" #include "machine/gen_latch.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/dataeast/rohga.cpp b/src/mame/dataeast/rohga.cpp index 604ce57e8fe..72670e830c6 100644 --- a/src/mame/dataeast/rohga.cpp +++ b/src/mame/dataeast/rohga.cpp @@ -115,9 +115,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/rohga.h" +#include "rohga.h" -#include "machine/decocrpt.h" +#include "decocrpt.h" #include "cpu/m68000/m68000.h" #include "sound/ymopm.h" diff --git a/src/mame/dataeast/rohga.h b/src/mame/dataeast/rohga.h index 5f0c3ded9f1..37440b29143 100644 --- a/src/mame/dataeast/rohga.h +++ b/src/mame/dataeast/rohga.h @@ -10,11 +10,11 @@ #pragma once -#include "machine/deco104.h" -#include "machine/deco146.h" -#include "video/deco16ic.h" -#include "video/decocomn.h" -#include "video/decospr.h" +#include "deco104.h" +#include "deco146.h" +#include "deco16ic.h" +#include "decocomn.h" +#include "decospr.h" #include "cpu/h6280/h6280.h" #include "sound/okim6295.h" diff --git a/src/mame/dataeast/rohga_v.cpp b/src/mame/dataeast/rohga_v.cpp index 9c6c6c2b343..631a9f6b724 100644 --- a/src/mame/dataeast/rohga_v.cpp +++ b/src/mame/dataeast/rohga_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/rohga.h" +#include "rohga.h" #include "screen.h" diff --git a/src/mame/dataeast/scregg.cpp b/src/mame/dataeast/scregg.cpp index e1dbc8a8936..b08f3020f9b 100644 --- a/src/mame/dataeast/scregg.cpp +++ b/src/mame/dataeast/scregg.cpp @@ -52,13 +52,15 @@ it as ASCII text. ***************************************************************************/ #include "emu.h" -#include "includes/btime.h" +#include "btime.h" #include "cpu/m6502/m6502.h" #include "machine/timer.h" #include "sound/ay8910.h" + #include "speaker.h" +namespace { class scregg_state : public btime_state { @@ -426,6 +428,8 @@ void scregg_state::init_rockduck() } } +} // anonymous namespace + GAME( 1983, dommy, 0, dommy, scregg, scregg_state, empty_init, ROT270, "Technos Japan", "Dommy", MACHINE_SUPPORTS_SAVE ) GAME( 1983, scregg, 0, scregg, scregg, scregg_state, empty_init, ROT270, "Technos Japan", "Scrambled Egg", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/dataeast/shootout.cpp b/src/mame/dataeast/shootout.cpp index 750241dff83..d1326cdbed2 100644 --- a/src/mame/dataeast/shootout.cpp +++ b/src/mame/dataeast/shootout.cpp @@ -44,7 +44,7 @@ #include "emu.h" -#include "machine/deco222.h" +#include "deco222.h" #include "cpu/m6502/m6502.h" #include "machine/gen_latch.h" diff --git a/src/mame/dataeast/sidepckt.cpp b/src/mame/dataeast/sidepckt.cpp index 70180cfef33..7f13cf481c1 100644 --- a/src/mame/dataeast/sidepckt.cpp +++ b/src/mame/dataeast/sidepckt.cpp @@ -132,7 +132,7 @@ Additional notes: ***************************************************************************/ #include "emu.h" -#include "includes/sidepckt.h" +#include "sidepckt.h" #include "cpu/m6809/m6809.h" #include "cpu/m6502/m6502.h" diff --git a/src/mame/dataeast/sidepckt_v.cpp b/src/mame/dataeast/sidepckt_v.cpp index 90cf122c262..083610f44a4 100644 --- a/src/mame/dataeast/sidepckt_v.cpp +++ b/src/mame/dataeast/sidepckt_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/sidepckt.h" +#include "sidepckt.h" void sidepckt_state::sidepckt_palette(palette_device &palette) const diff --git a/src/mame/dataeast/simpl156.cpp b/src/mame/dataeast/simpl156.cpp index af884de3354..64facf8b13e 100644 --- a/src/mame/dataeast/simpl156.cpp +++ b/src/mame/dataeast/simpl156.cpp @@ -93,10 +93,10 @@ even be configurable. */ #include "emu.h" -#include "includes/simpl156.h" +#include "simpl156.h" -#include "machine/decocrpt.h" -#include "machine/deco156.h" +#include "decocrpt.h" +#include "deco156_m.h" #include "cpu/arm/arm.h" #include "machine/eepromser.h" #include "sound/okim6295.h" diff --git a/src/mame/dataeast/simpl156.h b/src/mame/dataeast/simpl156.h index 13de1f79751..eb52b85e836 100644 --- a/src/mame/dataeast/simpl156.h +++ b/src/mame/dataeast/simpl156.h @@ -8,8 +8,8 @@ #include "machine/eepromser.h" #include "sound/okim6295.h" -#include "video/deco16ic.h" -#include "video/decospr.h" +#include "deco16ic.h" +#include "decospr.h" #include "emupal.h" class simpl156_state : public driver_device diff --git a/src/mame/dataeast/simpl156_v.cpp b/src/mame/dataeast/simpl156_v.cpp index ebc85e0451a..4c378e73eac 100644 --- a/src/mame/dataeast/simpl156_v.cpp +++ b/src/mame/dataeast/simpl156_v.cpp @@ -5,7 +5,7 @@ */ #include "emu.h" -#include "includes/simpl156.h" +#include "simpl156.h" #include "screen.h" diff --git a/src/mame/dataeast/sshangha.cpp b/src/mame/dataeast/sshangha.cpp index 8694589e4a5..ea10a2e6d19 100644 --- a/src/mame/dataeast/sshangha.cpp +++ b/src/mame/dataeast/sshangha.cpp @@ -78,7 +78,7 @@ HB-PCB-A5 M6100691A (distributed by Taito) ***************************************************************************/ #include "emu.h" -#include "includes/sshangha.h" +#include "sshangha.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/dataeast/sshangha.h b/src/mame/dataeast/sshangha.h index 0bb028a5649..577514d87e7 100644 --- a/src/mame/dataeast/sshangha.h +++ b/src/mame/dataeast/sshangha.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, Charles MacDonald, David Haywood -#include "video/deco16ic.h" -#include "video/decospr.h" -#include "machine/deco146.h" +#include "deco16ic.h" +#include "decospr.h" +#include "deco146.h" #include "emupal.h" class sshangha_state : public driver_device diff --git a/src/mame/dataeast/sshangha_v.cpp b/src/mame/dataeast/sshangha_v.cpp index 4756a469625..8f927de2264 100644 --- a/src/mame/dataeast/sshangha_v.cpp +++ b/src/mame/dataeast/sshangha_v.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/sshangha.h" +#include "sshangha.h" /******************************************************************************/ diff --git a/src/mame/dataeast/stadhero.cpp b/src/mame/dataeast/stadhero.cpp index 819d0b3093f..afe60bd5fe5 100644 --- a/src/mame/dataeast/stadhero.cpp +++ b/src/mame/dataeast/stadhero.cpp @@ -90,7 +90,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/stadhero.h" +#include "stadhero.h" #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" diff --git a/src/mame/dataeast/stadhero.h b/src/mame/dataeast/stadhero.h index 9ffa1b5d779..efd91b46eba 100644 --- a/src/mame/dataeast/stadhero.h +++ b/src/mame/dataeast/stadhero.h @@ -2,8 +2,8 @@ // copyright-holders:Bryan McPhail #include "machine/gen_latch.h" -#include "video/decbac06.h" -#include "video/decmxc06.h" +#include "decbac06.h" +#include "decmxc06.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/dataeast/stadhero_v.cpp b/src/mame/dataeast/stadhero_v.cpp index bdf8c3d8c61..8d57bf0747a 100644 --- a/src/mame/dataeast/stadhero_v.cpp +++ b/src/mame/dataeast/stadhero_v.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/stadhero.h" +#include "stadhero.h" /******************************************************************************/ diff --git a/src/mame/dataeast/supbtime.cpp b/src/mame/dataeast/supbtime.cpp index 446ff5f6cc1..60ef66c8a25 100644 --- a/src/mame/dataeast/supbtime.cpp +++ b/src/mame/dataeast/supbtime.cpp @@ -60,7 +60,7 @@ Stephh's notes (based on the games M68000 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/supbtime.h" +#include "supbtime.h" #include "emupal.h" #define TUMBLEP_HACK 0 diff --git a/src/mame/dataeast/supbtime.h b/src/mame/dataeast/supbtime.h index c1a195670d6..9d180b1f451 100644 --- a/src/mame/dataeast/supbtime.h +++ b/src/mame/dataeast/supbtime.h @@ -11,10 +11,10 @@ #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" -#include "machine/decocrpt.h" +#include "decocrpt.h" #include "machine/gen_latch.h" -#include "video/decospr.h" -#include "video/deco16ic.h" +#include "decospr.h" +#include "deco16ic.h" #include "sound/okim6295.h" #include "sound/ymopm.h" #include "screen.h" diff --git a/src/mame/dataeast/supbtime_v.cpp b/src/mame/dataeast/supbtime_v.cpp index 8213afa543b..738e9c5e474 100644 --- a/src/mame/dataeast/supbtime_v.cpp +++ b/src/mame/dataeast/supbtime_v.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/supbtime.h" +#include "supbtime.h" uint32_t supbtime_state::screen_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, bool use_offsets) diff --git a/src/mame/dataeast/thedeep.cpp b/src/mame/dataeast/thedeep.cpp index f6df4bf2173..c027a1a8d21 100644 --- a/src/mame/dataeast/thedeep.cpp +++ b/src/mame/dataeast/thedeep.cpp @@ -58,8 +58,8 @@ NOTE: There is manual for Run Deep which is (c) 1988 by World Games. Is Cream Co #include "emu.h" -#include "video/decbac06.h" -#include "video/decmxc06.h" +#include "decbac06.h" +#include "decmxc06.h" #include "cpu/m6502/r65c02.h" #include "cpu/mcs51/mcs51.h" diff --git a/src/mame/dataeast/tryout.cpp b/src/mame/dataeast/tryout.cpp index 39df25d61b4..cdcf57e6811 100644 --- a/src/mame/dataeast/tryout.cpp +++ b/src/mame/dataeast/tryout.cpp @@ -20,7 +20,7 @@ $208 strikes count ****************************************************************/ #include "emu.h" -#include "includes/tryout.h" +#include "tryout.h" #include "cpu/m6502/m6502.h" #include "machine/gen_latch.h" diff --git a/src/mame/dataeast/tryout_v.cpp b/src/mame/dataeast/tryout_v.cpp index bc1e7cc06c6..4c2a9ce8295 100644 --- a/src/mame/dataeast/tryout_v.cpp +++ b/src/mame/dataeast/tryout_v.cpp @@ -8,7 +8,7 @@ ****************************************************************/ #include "emu.h" -#include "includes/tryout.h" +#include "tryout.h" void tryout_state::palette(palette_device &palette) const diff --git a/src/mame/dataeast/tumbleb.cpp b/src/mame/dataeast/tumbleb.cpp index bfb5b822eec..4716e704f35 100644 --- a/src/mame/dataeast/tumbleb.cpp +++ b/src/mame/dataeast/tumbleb.cpp @@ -299,14 +299,14 @@ Stephh's notes (based on the games M68000 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/tumbleb.h" +#include "tumbleb.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" #include "cpu/mcs51/mcs51.h" // for semicom mcu #include "cpu/pic16c5x/pic16c5x.h" -#include "machine/decocrpt.h" +#include "decocrpt.h" #include "sound/okim6295.h" #include "sound/ymopm.h" #include "sound/ymopl.h" diff --git a/src/mame/dataeast/tumbleb.h b/src/mame/dataeast/tumbleb.h index 7eca558b2bb..64d78784a04 100644 --- a/src/mame/dataeast/tumbleb.h +++ b/src/mame/dataeast/tumbleb.h @@ -7,7 +7,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" -#include "video/decospr.h" +#include "decospr.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/dataeast/tumbleb_v.cpp b/src/mame/dataeast/tumbleb_v.cpp index b22a788f28c..c3534199be4 100644 --- a/src/mame/dataeast/tumbleb_v.cpp +++ b/src/mame/dataeast/tumbleb_v.cpp @@ -17,7 +17,7 @@ to switch between 8*8 tiles and 16*16 tiles. ***************************************************************************/ #include "emu.h" -#include "includes/tumbleb.h" +#include "tumbleb.h" /******************************************************************************/ diff --git a/src/mame/dataeast/vaportra.cpp b/src/mame/dataeast/vaportra.cpp index 203877d77da..1093a4cdc3c 100644 --- a/src/mame/dataeast/vaportra.cpp +++ b/src/mame/dataeast/vaportra.cpp @@ -17,7 +17,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/vaportra.h" +#include "vaportra.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" diff --git a/src/mame/dataeast/vaportra.h b/src/mame/dataeast/vaportra.h index 20cca719902..52be254a94c 100644 --- a/src/mame/dataeast/vaportra.h +++ b/src/mame/dataeast/vaportra.h @@ -13,8 +13,8 @@ #include "cpu/h6280/h6280.h" #include "machine/gen_latch.h" #include "video/bufsprite.h" -#include "video/deco16ic.h" -#include "video/decmxc06.h" +#include "deco16ic.h" +#include "decmxc06.h" #include "emupal.h" class vaportra_state : public driver_device diff --git a/src/mame/dataeast/vaportra_v.cpp b/src/mame/dataeast/vaportra_v.cpp index 222458c7168..f7e194c043a 100644 --- a/src/mame/dataeast/vaportra_v.cpp +++ b/src/mame/dataeast/vaportra_v.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/vaportra.h" +#include "vaportra.h" /******************************************************************************/ diff --git a/src/mame/ddr/huebler.cpp b/src/mame/ddr/huebler.cpp index 3ae27bb4d3c..02651a584f8 100644 --- a/src/mame/ddr/huebler.cpp +++ b/src/mame/ddr/huebler.cpp @@ -36,7 +36,7 @@ Cassette considerations */ #include "emu.h" -#include "includes/huebler.h" +#include "huebler.h" #include "speaker.h" #include "screen.h" diff --git a/src/mame/ddr/llc2.cpp b/src/mame/ddr/llc2.cpp index b472f5433fb..0aa4a5406a4 100644 --- a/src/mame/ddr/llc2.cpp +++ b/src/mame/ddr/llc2.cpp @@ -25,7 +25,7 @@ ToDo: #include "cpu/z80/z80.h" #include "imagedev/cassette.h" -#include "machine/k7659kb.h" +#include "k7659kb.h" #include "machine/ram.h" #include "machine/z80ctc.h" #include "machine/z80daisy.h" diff --git a/src/mame/ddr/pcm.cpp b/src/mame/ddr/pcm.cpp index 0a2f86146d2..03b3a0d6586 100644 --- a/src/mame/ddr/pcm.cpp +++ b/src/mame/ddr/pcm.cpp @@ -57,7 +57,7 @@ ToDo: #include "cpu/z80/z80.h" #include "machine/z80daisy.h" #include "imagedev/cassette.h" -#include "machine/k7659kb.h" +#include "k7659kb.h" #include "machine/z80ctc.h" #include "machine/z80sio.h" #include "machine/z80pio.h" diff --git a/src/mame/dec/decmate2.cpp b/src/mame/dec/decmate2.cpp index 42917992b20..0c401a2766f 100644 --- a/src/mame/dec/decmate2.cpp +++ b/src/mame/dec/decmate2.cpp @@ -56,7 +56,7 @@ #include "machine/ay31015.h" #include "machine/clock.h" #include "machine/com8116.h" -#include "machine/dec_lk201.h" +#include "dec_lk201.h" #include "machine/wd_fdc.h" #include "machine/z80sio.h" #include "video/crt9007.h" diff --git a/src/mame/dec/decstation.cpp b/src/mame/dec/decstation.cpp index 09a3794a253..5a3920c231a 100644 --- a/src/mame/dec/decstation.cpp +++ b/src/mame/dec/decstation.cpp @@ -61,7 +61,7 @@ #include "cpu/mips/mips3.h" #include "machine/ram.h" #include "machine/timer.h" -#include "machine/decioga.h" +#include "decioga.h" #include "machine/mc146818.h" #include "machine/z80scc.h" #include "machine/ncr5390.h" @@ -69,7 +69,7 @@ #include "machine/nscsi_bus.h" #include "bus/nscsi/cd.h" #include "bus/nscsi/hd.h" -#include "machine/dec_lk201.h" +#include "dec_lk201.h" #include "machine/am79c90.h" #include "machine/dc7085.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/dec/decwritr.cpp b/src/mame/dec/decwritr.cpp index 1723a61bfbb..a611086d461 100644 --- a/src/mame/dec/decwritr.cpp +++ b/src/mame/dec/decwritr.cpp @@ -14,7 +14,7 @@ #include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" #include "machine/74259.h" -#include "machine/dc305.h" +#include "dc305.h" #include "machine/er1400.h" #include "machine/i8251.h" #include "machine/input_merger.h" diff --git a/src/mame/dec/pdp11.cpp b/src/mame/dec/pdp11.cpp index 88fd1160838..6d9292456de 100644 --- a/src/mame/dec/pdp11.cpp +++ b/src/mame/dec/pdp11.cpp @@ -94,7 +94,7 @@ #include "cpu/t11/t11.h" #include "cpu/i86/i186.h" #include "machine/dl11.h" -#include "machine/rx01.h" +#include "rx01.h" namespace { diff --git a/src/mame/dec/rainbow.cpp b/src/mame/dec/rainbow.cpp index 242c289fb7d..000821799a4 100644 --- a/src/mame/dec/rainbow.cpp +++ b/src/mame/dec/rainbow.cpp @@ -325,7 +325,7 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND). #include "cpu/i86/i86.h" #include "cpu/z80/z80.h" -#include "video/vtvideo.h" +#include "vtvideo.h" #include "video/upd7220.h" #include "machine/wd_fdc.h" @@ -345,7 +345,7 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND). #include "bus/rs232/terminal.h" #include "machine/i8251.h" -#include "machine/dec_lk201.h" +#include "dec_lk201.h" #include "machine/nvram.h" #include "machine/ripple_counter.h" #include "machine/timer.h" diff --git a/src/mame/dec/rx01.cpp b/src/mame/dec/rx01.cpp index d791bd0fb80..a8fca77df27 100644 --- a/src/mame/dec/rx01.cpp +++ b/src/mame/dec/rx01.cpp @@ -13,7 +13,7 @@ */ #include "emu.h" -#include "machine/rx01.h" +#include "rx01.h" #include "cpu/rx01/rx01.h" #include "formats/basicdsk.h" diff --git a/src/mame/dec/vax11.cpp b/src/mame/dec/vax11.cpp index 89fc7d16003..34061d3061a 100644 --- a/src/mame/dec/vax11.cpp +++ b/src/mame/dec/vax11.cpp @@ -68,7 +68,7 @@ #include "emu.h" #include "cpu/t11/t11.h" #include "machine/terminal.h" -#include "machine/rx01.h" +#include "rx01.h" class vax11_state : public driver_device diff --git a/src/mame/dec/vt100.cpp b/src/mame/dec/vt100.cpp index dac026b92a3..e54e32c8e83 100644 --- a/src/mame/dec/vt100.cpp +++ b/src/mame/dec/vt100.cpp @@ -48,8 +48,8 @@ #include "machine/input_merger.h" #include "machine/ins8250.h" #include "machine/rstbuf.h" -#include "machine/vt100_kbd.h" -#include "video/vtvideo.h" +#include "vt100_kbd.h" +#include "vtvideo.h" #include "screen.h" #include "vt100.lh" diff --git a/src/mame/dec/vt240.cpp b/src/mame/dec/vt240.cpp index ad68313c0fc..bdf51fecbfe 100644 --- a/src/mame/dec/vt240.cpp +++ b/src/mame/dec/vt240.cpp @@ -7,15 +7,16 @@ ****************************************************************************/ #include "emu.h" +#include "dec_lk201.h" + +#include "ms7004.h" #include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" #include "cpu/t11/t11.h" #include "machine/clock.h" -#include "machine/dec_lk201.h" #include "machine/i8251.h" #include "machine/mc68681.h" -#include "machine/ms7004.h" #include "machine/bankdev.h" #include "machine/x2212.h" #include "video/upd7220.h" diff --git a/src/mame/dec/vtvideo.cpp b/src/mame/dec/vtvideo.cpp index 8afe52f9b82..eecfd80fb5f 100644 --- a/src/mame/dec/vtvideo.cpp +++ b/src/mame/dec/vtvideo.cpp @@ -58,7 +58,7 @@ FIXME: work out the differences and identify common code between VT and Rainbow. **********************************************************************/ #include "emu.h" -#include "video/vtvideo.h" +#include "vtvideo.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/dgrm/blackt96.cpp b/src/mame/dgrm/blackt96.cpp index 161532f0d8e..ce7942b4a42 100644 --- a/src/mame/dgrm/blackt96.cpp +++ b/src/mame/dgrm/blackt96.cpp @@ -80,10 +80,12 @@ Bugs (all of these looks BTANBs): */ #include "emu.h" +#include "snk68_spr.h" + #include "cpu/pic16c5x/pic16c5x.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" -#include "video/snk68_spr.h" + #include "emupal.h" #include "speaker.h" #include "tilemap.h" diff --git a/src/mame/dgrm/pokechmp.cpp b/src/mame/dgrm/pokechmp.cpp index c4b6c0ef3a1..4a59b659710 100644 --- a/src/mame/dgrm/pokechmp.cpp +++ b/src/mame/dgrm/pokechmp.cpp @@ -41,7 +41,7 @@ ClawGrip, Jul 2006 */ #include "emu.h" -#include "includes/pokechmp.h" +#include "pokechmp.h" #include "cpu/m6502/m6502.h" #include "sound/okim6295.h" diff --git a/src/mame/dgrm/pokechmp_v.cpp b/src/mame/dgrm/pokechmp_v.cpp index 25a1cfa72d4..f0132a08589 100644 --- a/src/mame/dgrm/pokechmp_v.cpp +++ b/src/mame/dgrm/pokechmp_v.cpp @@ -3,7 +3,7 @@ /* Poke Champ */ #include "emu.h" -#include "includes/pokechmp.h" +#include "pokechmp.h" void pokechmp_state::pokechmp_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/dicksmth/super80.cpp b/src/mame/dicksmth/super80.cpp index e2e953d2f17..a4c1999d72f 100644 --- a/src/mame/dicksmth/super80.cpp +++ b/src/mame/dicksmth/super80.cpp @@ -207,7 +207,7 @@ ToDo: ***********************************************************************************************************/ #include "emu.h" -#include "includes/super80.h" +#include "super80.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/dicksmth/super80_m.cpp b/src/mame/dicksmth/super80_m.cpp index ef1bc072a3b..5b14c8cb6d3 100644 --- a/src/mame/dicksmth/super80_m.cpp +++ b/src/mame/dicksmth/super80_m.cpp @@ -3,8 +3,10 @@ /* Super80.cpp written by Robbbert, 2005-2009. See driver source for documentation. */ #include "emu.h" -#include "includes/super80.h" -#include "machine/z80bin.h" +#include "super80.h" + +#include "z80bin.h" + /**************************** PIO ******************************************************************************/ diff --git a/src/mame/dicksmth/super80_v.cpp b/src/mame/dicksmth/super80_v.cpp index 1f19578ece7..5bdbf556c0b 100644 --- a/src/mame/dicksmth/super80_v.cpp +++ b/src/mame/dicksmth/super80_v.cpp @@ -5,7 +5,7 @@ #include "emu.h" -#include "includes/super80.h" +#include "super80.h" diff --git a/src/mame/dooyong/dooyong.cpp b/src/mame/dooyong/dooyong.cpp index 05e02f09e48..f6446b78ace 100644 --- a/src/mame/dooyong/dooyong.cpp +++ b/src/mame/dooyong/dooyong.cpp @@ -75,7 +75,7 @@ are almost identical, except for much darker BG layer colors). ***************************************************************************/ #include "emu.h" -#include "video/dooyong.h" +#include "dooyong_v.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/dooyong/dooyong_v.cpp b/src/mame/dooyong/dooyong_v.cpp index 634b974bed6..25fc0a0ef55 100644 --- a/src/mame/dooyong/dooyong_v.cpp +++ b/src/mame/dooyong/dooyong_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Vas Crabb #include "emu.h" -#include "video/dooyong.h" +#include "dooyong_v.h" #include "screen.h" diff --git a/src/mame/dooyong/gundealr.cpp b/src/mame/dooyong/gundealr.cpp index cb0c6689ab4..e13b6615757 100644 --- a/src/mame/dooyong/gundealr.cpp +++ b/src/mame/dooyong/gundealr.cpp @@ -69,7 +69,7 @@ Z80 CPU - 12MHz/2 ***************************************************************************/ #include "emu.h" -#include "includes/gundealr.h" +#include "gundealr.h" #include "cpu/z80/z80.h" #include "sound/ymopn.h" diff --git a/src/mame/dooyong/gundealr_v.cpp b/src/mame/dooyong/gundealr_v.cpp index cd8bfbe4ef2..fbb7e2acd00 100644 --- a/src/mame/dooyong/gundealr_v.cpp +++ b/src/mame/dooyong/gundealr_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gundealr.h" +#include "gundealr.h" /*************************************************************************** diff --git a/src/mame/dynax/ddenlovr.cpp b/src/mame/dynax/ddenlovr.cpp index 30b1239d87b..8f023a30237 100644 --- a/src/mame/dynax/ddenlovr.cpp +++ b/src/mame/dynax/ddenlovr.cpp @@ -118,7 +118,7 @@ Notes: **********************************************************************************************************************/ #include "emu.h" -#include "includes/dynax.h" +#include "dynax.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/dynax/dynax.cpp b/src/mame/dynax/dynax.cpp index 182f0cdb4ac..604495f52b3 100644 --- a/src/mame/dynax/dynax.cpp +++ b/src/mame/dynax/dynax.cpp @@ -78,7 +78,7 @@ TODO: *********************************************************************************************************************/ #include "emu.h" -#include "includes/dynax.h" +#include "dynax.h" #include "cpu/tlcs90/tlcs90.h" #include "cpu/z80/z80.h" diff --git a/src/mame/dynax/dynax.h b/src/mame/dynax/dynax.h index fc3ef3325bb..c11efdd467f 100644 --- a/src/mame/dynax/dynax.h +++ b/src/mame/dynax/dynax.h @@ -16,7 +16,7 @@ #include "sound/msm5205.h" #include "sound/okim6295.h" #include "machine/74259.h" -#include "video/dynax_blitter_rev2.h" +#include "dynax_blitter_rev2.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/dynax/dynax_v.cpp b/src/mame/dynax/dynax_v.cpp index 3f454213591..6cc919e6a60 100644 --- a/src/mame/dynax/dynax_v.cpp +++ b/src/mame/dynax/dynax_v.cpp @@ -20,7 +20,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dynax.h" +#include "dynax.h" // Log Blitter //#define VERBOSE 1 diff --git a/src/mame/dynax/realbrk.cpp b/src/mame/dynax/realbrk.cpp index 69b961966fa..235cf06796a 100644 --- a/src/mame/dynax/realbrk.cpp +++ b/src/mame/dynax/realbrk.cpp @@ -44,7 +44,7 @@ To Do: ***************************************************************************/ #include "emu.h" -#include "includes/realbrk.h" +#include "realbrk.h" #include "cpu/m68000/m68000.h" #include "sound/ymopl.h" diff --git a/src/mame/dynax/realbrk_v.cpp b/src/mame/dynax/realbrk_v.cpp index 1dd7d72a382..044a590e071 100644 --- a/src/mame/dynax/realbrk_v.cpp +++ b/src/mame/dynax/realbrk_v.cpp @@ -22,7 +22,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/realbrk.h" +#include "realbrk.h" void realbrk_state::realbrk_flipscreen_w(offs_t offset, u16 data, u16 mem_mask) diff --git a/src/mame/edevices/fantland.cpp b/src/mame/edevices/fantland.cpp index dbd7d52c02d..16cf813cc54 100644 --- a/src/mame/edevices/fantland.cpp +++ b/src/mame/edevices/fantland.cpp @@ -42,7 +42,7 @@ Year + Game Main CPU Sound CPU Sound Video ***************************************************************************************/ #include "emu.h" -#include "includes/fantland.h" +#include "fantland.h" #include "cpu/i86/i86.h" #include "cpu/nec/nec.h" diff --git a/src/mame/edevices/fantland_v.cpp b/src/mame/edevices/fantland_v.cpp index 4134c196801..2c01f72e4ab 100644 --- a/src/mame/edevices/fantland_v.cpp +++ b/src/mame/edevices/fantland_v.cpp @@ -61,7 +61,7 @@ ***************************************************************************************/ #include "emu.h" -#include "includes/fantland.h" +#include "fantland.h" void fantland_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) { diff --git a/src/mame/edevices/mugsmash.cpp b/src/mame/edevices/mugsmash.cpp index d5390742256..4ad4053c25f 100644 --- a/src/mame/edevices/mugsmash.cpp +++ b/src/mame/edevices/mugsmash.cpp @@ -42,7 +42,7 @@ behavior we use . */ #include "emu.h" -#include "includes/mugsmash.h" +#include "mugsmash.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/edevices/mugsmash_v.cpp b/src/mame/edevices/mugsmash_v.cpp index 12222aadc99..266cd4b1d18 100644 --- a/src/mame/edevices/mugsmash_v.cpp +++ b/src/mame/edevices/mugsmash_v.cpp @@ -3,7 +3,7 @@ /* video/mugsmash.c - see drivers/mugsmash.c for more info */ #include "emu.h" -#include "includes/mugsmash.h" +#include "mugsmash.h" void mugsmash_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ) { diff --git a/src/mame/edevices/mwarr.cpp b/src/mame/edevices/mwarr.cpp index 6cac71b03cb..7d46dc1f15c 100644 --- a/src/mame/edevices/mwarr.cpp +++ b/src/mame/edevices/mwarr.cpp @@ -46,7 +46,7 @@ Notes: #include "emupal.h" #include "screen.h" #include "speaker.h" -#include "video/edevices.h" +#include "edevices.h" #define MASTER_CLOCK XTAL(12'000'000) #define SOUND_CLOCK XTAL(45'000'000) diff --git a/src/mame/edevices/stlforce.cpp b/src/mame/edevices/stlforce.cpp index 9ddb0240cf8..008bc2d5bbc 100644 --- a/src/mame/edevices/stlforce.cpp +++ b/src/mame/edevices/stlforce.cpp @@ -70,7 +70,7 @@ TO DO : */ #include "emu.h" -#include "includes/stlforce.h" +#include "stlforce.h" void stlforce_state::eeprom_w(uint8_t data) diff --git a/src/mame/edevices/stlforce.h b/src/mame/edevices/stlforce.h index 155f65c62df..df0abb95fff 100644 --- a/src/mame/edevices/stlforce.h +++ b/src/mame/edevices/stlforce.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#include "video/edevices.h" +#include "edevices.h" #include "machine/eepromser.h" #include "emupal.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/efo/cedar_magnet.cpp b/src/mame/efo/cedar_magnet.cpp index 65bfb73b073..89bd13ffe85 100644 --- a/src/mame/efo/cedar_magnet.cpp +++ b/src/mame/efo/cedar_magnet.cpp @@ -269,6 +269,12 @@ MASTER BOARD */ #include "emu.h" +#include "cedar_magnet_plane.h" +#include "cedar_magnet_sprite.h" +#include "cedar_magnet_flop.h" + +#include "efo_zsu.h" + #include "cpu/z80/z80.h" #include "machine/z80daisy.h" #include "machine/z80pio.h" @@ -276,11 +282,6 @@ MASTER BOARD #include "machine/z80ctc.h" #include "sound/ay8910.h" -#include "audio/efo_zsu.h" -#include "machine/cedar_magnet_plane.h" -#include "machine/cedar_magnet_sprite.h" -#include "machine/cedar_magnet_flop.h" - #include "emupal.h" #include "screen.h" diff --git a/src/mame/efo/cedar_magnet_plane.h b/src/mame/efo/cedar_magnet_plane.h index fbbb7d48579..532a9ba628b 100644 --- a/src/mame/efo/cedar_magnet_plane.h +++ b/src/mame/efo/cedar_magnet_plane.h @@ -6,7 +6,7 @@ #pragma once -#include "machine/cedar_magnet_board.h" +#include "cedar_magnet_board.h" #include "machine/z80pio.h" DECLARE_DEVICE_TYPE(CEDAR_MAGNET_PLANE, cedar_magnet_plane_device) diff --git a/src/mame/efo/cedar_magnet_sprite.h b/src/mame/efo/cedar_magnet_sprite.h index 78c334d6796..feb6c38604d 100644 --- a/src/mame/efo/cedar_magnet_sprite.h +++ b/src/mame/efo/cedar_magnet_sprite.h @@ -5,7 +5,7 @@ #pragma once -#include "machine/cedar_magnet_board.h" +#include "cedar_magnet_board.h" #include "cpu/z80/z80.h" #include "machine/z80daisy.h" diff --git a/src/mame/efo/cidelsa.cpp b/src/mame/efo/cidelsa.cpp index 2624f148781..d6d48a242a5 100644 --- a/src/mame/efo/cidelsa.cpp +++ b/src/mame/efo/cidelsa.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/cidelsa.h" +#include "cidelsa.h" /* CDP1802 Interface */ diff --git a/src/mame/efo/cidelsa_v.cpp b/src/mame/efo/cidelsa_v.cpp index 6bb3d33ce46..27d25096a5a 100644 --- a/src/mame/efo/cidelsa_v.cpp +++ b/src/mame/efo/cidelsa_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/cidelsa.h" +#include "cidelsa.h" #include "speaker.h" diff --git a/src/mame/einis/pecom.cpp b/src/mame/einis/pecom.cpp index 1395a62f47d..af17614b05d 100644 --- a/src/mame/einis/pecom.cpp +++ b/src/mame/einis/pecom.cpp @@ -26,7 +26,7 @@ TODO: ****************************************************************************/ #include "emu.h" -#include "includes/pecom.h" +#include "pecom.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/einis/pecom_m.cpp b/src/mame/einis/pecom_m.cpp index ddf0b82e4c8..39d64049338 100644 --- a/src/mame/einis/pecom_m.cpp +++ b/src/mame/einis/pecom_m.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/pecom.h" +#include "pecom.h" TIMER_CALLBACK_MEMBER(pecom_state::reset_tick) diff --git a/src/mame/einis/pecom_v.cpp b/src/mame/einis/pecom_v.cpp index 904f7907518..1143f837cf9 100644 --- a/src/mame/einis/pecom_v.cpp +++ b/src/mame/einis/pecom_v.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/pecom.h" +#include "pecom.h" void pecom_state::cdp1869_w(offs_t offset, uint8_t data) diff --git a/src/mame/elektronika/bk.cpp b/src/mame/elektronika/bk.cpp index 36ecaa2ff5e..ba15ed99110 100644 --- a/src/mame/elektronika/bk.cpp +++ b/src/mame/elektronika/bk.cpp @@ -28,7 +28,7 @@ TODO: #include "emu.h" -#include "includes/bk.h" +#include "bk.h" #include "formats/rk_cas.h" diff --git a/src/mame/elektronika/bk_m.cpp b/src/mame/elektronika/bk_m.cpp index 9a5ab095316..d0566302510 100644 --- a/src/mame/elektronika/bk_m.cpp +++ b/src/mame/elektronika/bk_m.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/bk.h" +#include "bk.h" TIMER_CALLBACK_MEMBER(bk_state::keyboard_callback) diff --git a/src/mame/elektronika/dvk_kcgd.cpp b/src/mame/elektronika/dvk_kcgd.cpp index 83c108f589b..1cde1f449b2 100644 --- a/src/mame/elektronika/dvk_kcgd.cpp +++ b/src/mame/elektronika/dvk_kcgd.cpp @@ -39,7 +39,7 @@ #include "bus/rs232/rs232.h" #include "cpu/t11/t11.h" #include "machine/dl11.h" -#include "machine/ms7004.h" +#include "ms7004.h" #include "machine/timer.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/elektronika/dvk_ksm.cpp b/src/mame/elektronika/dvk_ksm.cpp index 16bf05ad422..51c5560551f 100644 --- a/src/mame/elektronika/dvk_ksm.cpp +++ b/src/mame/elektronika/dvk_ksm.cpp @@ -57,7 +57,7 @@ ksm|DVK KSM, #include "machine/clock.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/ms7004.h" +#include "ms7004.h" #include "machine/pic8259.h" #include "machine/timer.h" diff --git a/src/mame/elektronika/ms6102.cpp b/src/mame/elektronika/ms6102.cpp index 72168560a13..5d51f1dea0c 100644 --- a/src/mame/elektronika/ms6102.cpp +++ b/src/mame/elektronika/ms6102.cpp @@ -31,6 +31,9 @@ ****************************************************************************/ #include "emu.h" +#include "kr1601rr1.h" + +#include "vt100_kbd.h" #include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" @@ -39,10 +42,8 @@ #include "machine/i8214.h" #include "machine/i8251.h" #include "machine/i8257.h" -#include "machine/kr1601rr1.h" #include "machine/pit8253.h" #include "machine/ripple_counter.h" -#include "machine/vt100_kbd.h" #include "video/i8275.h" #include "emupal.h" diff --git a/src/mame/ensoniq/esq1.cpp b/src/mame/ensoniq/esq1.cpp index 767f794608c..b39b7c2d67a 100644 --- a/src/mame/ensoniq/esq1.cpp +++ b/src/mame/ensoniq/esq1.cpp @@ -186,7 +186,7 @@ NOTES: #include "machine/input_merger.h" #include "machine/mc68681.h" #include "machine/wd_fdc.h" -#include "machine/esqpanel.h" +#include "esqpanel.h" #include "sound/es5503.h" #include "speaker.h" diff --git a/src/mame/ensoniq/esq5505.cpp b/src/mame/ensoniq/esq5505.cpp index 495878dd39e..b0afb3f603d 100644 --- a/src/mame/ensoniq/esq5505.cpp +++ b/src/mame/ensoniq/esq5505.cpp @@ -167,9 +167,9 @@ #include "cpu/m68000/m68000.h" #include "formats/esq16_dsk.h" #include "imagedev/floppy.h" -#include "machine/esqlcd.h" -#include "machine/esqpanel.h" -#include "machine/esqvfd.h" +#include "esqlcd.h" +#include "esqpanel.h" +#include "esqvfd.h" #include "machine/hd63450.h" // compatible with MC68450, which is what these really have #include "machine/mc68681.h" #include "machine/wd_fdc.h" diff --git a/src/mame/ensoniq/esqasr.cpp b/src/mame/ensoniq/esqasr.cpp index af0c49e5f22..9f1319f90e2 100644 --- a/src/mame/ensoniq/esqasr.cpp +++ b/src/mame/ensoniq/esqasr.cpp @@ -41,7 +41,7 @@ #include "cpu/es5510/es5510.h" #include "machine/68340.h" -#include "machine/esqvfd.h" +#include "esqvfd.h" #include "machine/upd765.h" #include "sound/es5506.h" #include "sound/esqpump.h" diff --git a/src/mame/ensoniq/esqkt.cpp b/src/mame/ensoniq/esqkt.cpp index 87cd3e7c89a..904e0696bdb 100644 --- a/src/mame/ensoniq/esqkt.cpp +++ b/src/mame/ensoniq/esqkt.cpp @@ -91,7 +91,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/esqpanel.h" +#include "esqpanel.h" #include "bus/midi/midi.h" #include "cpu/es5510/es5510.h" diff --git a/src/mame/ensoniq/esqmr.cpp b/src/mame/ensoniq/esqmr.cpp index fc963699f5d..fed626afe5d 100644 --- a/src/mame/ensoniq/esqmr.cpp +++ b/src/mame/ensoniq/esqmr.cpp @@ -200,13 +200,13 @@ ***************************************************************************/ #include "emu.h" -#include "machine/esqvfd.h" +#include "esqvfd.h" #include "cpu/m6805/m68hc05.h" #include "machine/68340.h" #include "machine/68340ser.h" #include "sound/es5506.h" -#include "machine/esqpanel.h" +#include "esqpanel.h" //#include "machine/mb8421.h" #include "speaker.h" diff --git a/src/mame/ensoniq/esqpanel.h b/src/mame/ensoniq/esqpanel.h index 52481a12d10..58c2398ad36 100644 --- a/src/mame/ensoniq/esqpanel.h +++ b/src/mame/ensoniq/esqpanel.h @@ -5,8 +5,8 @@ #pragma once -#include "machine/esqvfd.h" -#include "machine/esqlcd.h" +#include "esqvfd.h" +#include "esqlcd.h" #include "diserial.h" diff --git a/src/mame/enterprise/ep64.cpp b/src/mame/enterprise/ep64.cpp index bc842019c42..e86c39ffd38 100644 --- a/src/mame/enterprise/ep64.cpp +++ b/src/mame/enterprise/ep64.cpp @@ -160,7 +160,7 @@ Notes: (All IC's shown) #include "imagedev/cassette.h" #include "machine/ram.h" #include "sound/dave.h" -#include "video/nick.h" +#include "nick.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/eolith/eolith.cpp b/src/mame/eolith/eolith.cpp index 5fb754b8dce..ca812464a60 100644 --- a/src/mame/eolith/eolith.cpp +++ b/src/mame/eolith/eolith.cpp @@ -101,7 +101,7 @@ *********************************************************************/ #include "emu.h" -#include "includes/eolith.h" +#include "eolith.h" #include "cpu/e132xs/e132xs.h" #include "cpu/mcs51/mcs51.h" diff --git a/src/mame/eolith/eolith16.cpp b/src/mame/eolith/eolith16.cpp index 070a79ccad3..47f4d2b408b 100644 --- a/src/mame/eolith/eolith16.cpp +++ b/src/mame/eolith/eolith16.cpp @@ -12,7 +12,7 @@ **********************************************************************/ #include "emu.h" -#include "includes/eolith.h" +#include "eolith.h" #include "cpu/e132xs/e132xs.h" #include "machine/eepromser.h" diff --git a/src/mame/eolith/eolith_v.cpp b/src/mame/eolith/eolith_v.cpp index cd852a6c811..82d06470f22 100644 --- a/src/mame/eolith/eolith_v.cpp +++ b/src/mame/eolith/eolith_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Tomasz Slanina,Pierpaolo Prazzoli #include "emu.h" -#include "includes/eolith.h" +#include "eolith.h" void eolith_state::eolith_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) diff --git a/src/mame/eolith/vegaeo.cpp b/src/mame/eolith/vegaeo.cpp index 30405dedb1b..c644b62f369 100644 --- a/src/mame/eolith/vegaeo.cpp +++ b/src/mame/eolith/vegaeo.cpp @@ -14,7 +14,7 @@ *********************************************************************/ #include "emu.h" -#include "includes/eolith.h" +#include "eolith.h" #include "cpu/e132xs/e132xs.h" #include "machine/at28c16.h" diff --git a/src/mame/epoch/gamepock.cpp b/src/mame/epoch/gamepock.cpp index aac570d03ee..15812fe565f 100644 --- a/src/mame/epoch/gamepock.cpp +++ b/src/mame/epoch/gamepock.cpp @@ -3,7 +3,7 @@ #include "emu.h" -#include "includes/gamepock.h" +#include "gamepock.h" #include "bus/generic/carts.h" #include "cpu/upd7810/upd7810.h" diff --git a/src/mame/epoch/gamepock_m.cpp b/src/mame/epoch/gamepock_m.cpp index 6b188d2a312..a201770be0c 100644 --- a/src/mame/epoch/gamepock_m.cpp +++ b/src/mame/epoch/gamepock_m.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol #include "emu.h" -#include "includes/gamepock.h" +#include "gamepock.h" #include "cpu/upd7810/upd7810.h" diff --git a/src/mame/epson/hx20.cpp b/src/mame/epson/hx20.cpp index ec0fa540156..e578ad7f989 100644 --- a/src/mame/epson/hx20.cpp +++ b/src/mame/epson/hx20.cpp @@ -39,7 +39,7 @@ */ #include "emu.h" -#include "includes/hx20.h" +#include "hx20.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/epson/px8.cpp b/src/mame/epson/px8.cpp index f8aab1fea03..04314f805f7 100644 --- a/src/mame/epson/px8.cpp +++ b/src/mame/epson/px8.cpp @@ -30,7 +30,7 @@ */ #include "emu.h" -#include "includes/px8.h" +#include "px8.h" #include "machine/rescap.h" #include "machine/upd7001.h" diff --git a/src/mame/epson/qx10.cpp b/src/mame/epson/qx10.cpp index abe2f6b9225..dc53ba16b9a 100644 --- a/src/mame/epson/qx10.cpp +++ b/src/mame/epson/qx10.cpp @@ -45,7 +45,7 @@ #include "machine/output_latch.h" #include "machine/pic8259.h" #include "machine/pit8253.h" -#include "machine/qx10kbd.h" +#include "qx10kbd.h" #include "machine/ram.h" #include "machine/upd765.h" #include "machine/z80sio.h" diff --git a/src/mame/epson/qx10kbd.cpp b/src/mame/epson/qx10kbd.cpp index 64105686b9e..7d4deaef976 100644 --- a/src/mame/epson/qx10kbd.cpp +++ b/src/mame/epson/qx10kbd.cpp @@ -3,7 +3,7 @@ // TODO: LEDs #include "emu.h" -#include "machine/qx10kbd.h" +#include "qx10kbd.h" #include "cpu/mcs48/mcs48.h" diff --git a/src/mame/ericsson/eispc.cpp b/src/mame/ericsson/eispc.cpp index 3690e5757ef..605a3a63e27 100644 --- a/src/mame/ericsson/eispc.cpp +++ b/src/mame/ericsson/eispc.cpp @@ -43,7 +43,7 @@ #include "emu.h" -#include "machine/eispc_kb.h" +#include "eispc_kb.h" #include "epc.lh" // Devices diff --git a/src/mame/excelent/aquarium.cpp b/src/mame/excelent/aquarium.cpp index f761c21728a..e8bad570836 100644 --- a/src/mame/excelent/aquarium.cpp +++ b/src/mame/excelent/aquarium.cpp @@ -51,7 +51,7 @@ Notes: #include "emu.h" -#include "includes/aquarium.h" +#include "aquarium.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/excelent/aquarium.h b/src/mame/excelent/aquarium.h index dfccd53bb58..4457a028792 100644 --- a/src/mame/excelent/aquarium.h +++ b/src/mame/excelent/aquarium.h @@ -8,7 +8,7 @@ #include "machine/gen_latch.h" #include "machine/mb3773.h" #include "sound/okim6295.h" -#include "video/excellent_spr.h" +#include "excellent_spr.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/excelent/aquarium_v.cpp b/src/mame/excelent/aquarium_v.cpp index f8daef4bc4f..1ef063f643f 100644 --- a/src/mame/excelent/aquarium_v.cpp +++ b/src/mame/excelent/aquarium_v.cpp @@ -3,7 +3,7 @@ /* Aquarium */ #include "emu.h" -#include "includes/aquarium.h" +#include "aquarium.h" /* TXT Layer */ diff --git a/src/mame/excelent/gcpinbal.cpp b/src/mame/excelent/gcpinbal.cpp index 135cf88262e..ed94f9e939a 100644 --- a/src/mame/excelent/gcpinbal.cpp +++ b/src/mame/excelent/gcpinbal.cpp @@ -81,7 +81,7 @@ NOTE: Mask ROMs from Power Flipper Pinball Shooting have not been dumped, but as ***************************************************************************/ #include "emu.h" -#include "includes/gcpinbal.h" +#include "gcpinbal.h" #include "cpu/m68000/m68000.h" #include "screen.h" diff --git a/src/mame/excelent/gcpinbal.h b/src/mame/excelent/gcpinbal.h index ad6eb8ed669..72c5799f55d 100644 --- a/src/mame/excelent/gcpinbal.h +++ b/src/mame/excelent/gcpinbal.h @@ -9,7 +9,7 @@ #include "machine/mb3773.h" #include "sound/es8712.h" #include "sound/okim6295.h" -#include "video/excellent_spr.h" +#include "excellent_spr.h" #include "emupal.h" #include "machine/timer.h" #include "screen.h" diff --git a/src/mame/excelent/gcpinbal_v.cpp b/src/mame/excelent/gcpinbal_v.cpp index 4e251129f33..2809f34e7a2 100644 --- a/src/mame/excelent/gcpinbal_v.cpp +++ b/src/mame/excelent/gcpinbal_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Graves, R. Belmont, David Haywood #include "emu.h" -#include "includes/gcpinbal.h" +#include "gcpinbal.h" #include "screen.h" diff --git a/src/mame/excelent/witch.cpp b/src/mame/excelent/witch.cpp index 2e8daafc252..b053a61bcf0 100644 --- a/src/mame/excelent/witch.cpp +++ b/src/mame/excelent/witch.cpp @@ -221,7 +221,7 @@ TODO : */ #include "emu.h" -#include "includes/witch.h" +#include "witch.h" TILE_GET_INFO_MEMBER(witch_state::get_gfx0_tile_info) diff --git a/src/mame/exidy/carpolo.cpp b/src/mame/exidy/carpolo.cpp index a36b6d7b7b4..7bc70465373 100644 --- a/src/mame/exidy/carpolo.cpp +++ b/src/mame/exidy/carpolo.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/carpolo.h" +#include "carpolo.h" #include "machine/74153.h" #include "machine/6821pia.h" diff --git a/src/mame/exidy/carpolo.h b/src/mame/exidy/carpolo.h index 7636acbb948..ddea779f6de 100644 --- a/src/mame/exidy/carpolo.h +++ b/src/mame/exidy/carpolo.h @@ -19,7 +19,7 @@ #include "machine/74153.h" #include "machine/netlist.h" #include "netlist/nl_setup.h" -#include "audio/nl_carpolo.h" +#include "nl_carpolo.h" #include "emupal.h" class carpolo_state : public driver_device diff --git a/src/mame/exidy/carpolo_m.cpp b/src/mame/exidy/carpolo_m.cpp index b7fa090757b..1cb6d984301 100644 --- a/src/mame/exidy/carpolo_m.cpp +++ b/src/mame/exidy/carpolo_m.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "cpu/m6502/m6502.h" #include "machine/6821pia.h" -#include "includes/carpolo.h" +#include "carpolo.h" /************************************* diff --git a/src/mame/exidy/carpolo_v.cpp b/src/mame/exidy/carpolo_v.cpp index 69d6b50713f..5cbc19801d4 100644 --- a/src/mame/exidy/carpolo_v.cpp +++ b/src/mame/exidy/carpolo_v.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/carpolo.h" +#include "carpolo.h" /* the screen elements' priorties determine their color */ diff --git a/src/mame/exidy/circus.cpp b/src/mame/exidy/circus.cpp index 3640c666fd9..4a74e9c0558 100644 --- a/src/mame/exidy/circus.cpp +++ b/src/mame/exidy/circus.cpp @@ -46,7 +46,7 @@ D000 Paddle Position and Interrupt Reset (where applicable) ***************************************************************************/ #include "emu.h" -#include "includes/circus.h" +#include "circus.h" #include "cpu/m6502/m6502.h" #include "screen.h" diff --git a/src/mame/exidy/circus_a.cpp b/src/mame/exidy/circus_a.cpp index a1d302e77ac..127bc1a86d5 100644 --- a/src/mame/exidy/circus_a.cpp +++ b/src/mame/exidy/circus_a.cpp @@ -2,7 +2,7 @@ // copyright-holders:Mike Coates #include "emu.h" #include "sound/samples.h" -#include "includes/circus.h" +#include "circus.h" const char *const circus_sample_names[] = { diff --git a/src/mame/exidy/circus_v.cpp b/src/mame/exidy/circus_v.cpp index dfcfeb51ad5..c84367a3822 100644 --- a/src/mame/exidy/circus_v.cpp +++ b/src/mame/exidy/circus_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "sound/samples.h" -#include "includes/circus.h" +#include "circus.h" void circus_state::circus_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/exidy/exidy.cpp b/src/mame/exidy/exidy.cpp index 08435cc607c..7f6e6fc72e7 100644 --- a/src/mame/exidy/exidy.cpp +++ b/src/mame/exidy/exidy.cpp @@ -152,7 +152,7 @@ Fax 1982 6502 FXL, FLA ***************************************************************************/ #include "emu.h" -#include "audio/exidy.h" +#include "exidysound.h" #include "cpu/m6502/m6502.h" #include "machine/6821pia.h" diff --git a/src/mame/exidy/exidy440.cpp b/src/mame/exidy/exidy440.cpp index ca2185b56f1..71ed6e69b0c 100644 --- a/src/mame/exidy/exidy440.cpp +++ b/src/mame/exidy/exidy440.cpp @@ -234,7 +234,7 @@ Who Dunit 1988 6809 ***************************************************************************/ #include "emu.h" -#include "includes/exidy440.h" +#include "exidy440.h" #include "cpu/m6809/m6809.h" #include "machine/nvram.h" diff --git a/src/mame/exidy/exidy440.h b/src/mame/exidy/exidy440.h index 4f04fdd6164..9fc30faea98 100644 --- a/src/mame/exidy/exidy440.h +++ b/src/mame/exidy/exidy440.h @@ -10,7 +10,7 @@ #pragma once -#include "audio/exidy440.h" +#include "exidy440_a.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/exidy/exidy440_a.cpp b/src/mame/exidy/exidy440_a.cpp index 7d92dd02b8e..a7f13bdeeca 100644 --- a/src/mame/exidy/exidy440_a.cpp +++ b/src/mame/exidy/exidy440_a.cpp @@ -10,8 +10,8 @@ ***************************************************************************/ #include "emu.h" -#include "audio/exidy440.h" -#include "includes/exidy440.h" +#include "exidy440_a.h" +#include "exidy440.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/exidy/exidy440_v.cpp b/src/mame/exidy/exidy440_v.cpp index 3c4aab7e827..fb746f3b68c 100644 --- a/src/mame/exidy/exidy440_v.cpp +++ b/src/mame/exidy/exidy440_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/exidy440.h" +#include "exidy440.h" #define PIXEL_CLOCK (EXIDY440_MASTER_CLOCK / 2) diff --git a/src/mame/exidy/exidy_a.cpp b/src/mame/exidy/exidy_a.cpp deleted file mode 100644 index 6c107bf15fe..00000000000 --- a/src/mame/exidy/exidy_a.cpp +++ /dev/null @@ -1,1045 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Aaron Giles -/************************************************************************* - - Exidy 6502 hardware - -*************************************************************************/ - -#include "emu.h" -#include "audio/exidy.h" - -#include "cpu/z80/z80.h" -#include "machine/input_merger.h" -#include "machine/rescap.h" -#include "cpu/m6502/m6502.h" -#include "speaker.h" - - - -/************************************* - * - * Constants - * - *************************************/ - -#define CRYSTAL_OSC (XTAL(3'579'545)) -#define SH8253_CLOCK (CRYSTAL_OSC / 2) -#define SH6840_CLOCK (CRYSTAL_OSC / 4) -#define SH6532_CLOCK (CRYSTAL_OSC / 4) -#define CVSD_CLOCK (1.0 / (0.693 * (RES_K(2.4) + 2.0 * RES_K(20)) * CAP_P(2200))) -#define CVSD_Z80_CLOCK (CRYSTAL_OSC / 2) -#define BASE_VOLUME (32767 / 6) - - -/************************************* - * - * 6840 clock counting helper - * - *************************************/ - -inline void exidy_sound_device::sh6840_apply_clock(exidy_sound_device::sh6840_timer_channel *t, int clocks) -{ - /* dual 8-bit case */ - if (t->cr & 0x04) - { - /* handle full decrements */ - while (clocks > t->counter.b.l) - { - clocks -= t->counter.b.l + 1; - t->counter.b.l = t->timer; - - /* decrement MSB */ - if (!t->counter.b.h--) - { - t->state = 0; - t->counter.w = t->timer; - } - - /* state goes high when MSB is 0 */ - else if (!t->counter.b.h) - { - t->state = 1; - t->clocks++; - } - } - - /* subtract off the remainder */ - t->counter.b.l -= clocks; - } - - /* 16-bit case */ - else - { - /* handle full decrements */ - while (clocks > t->counter.w) - { - clocks -= t->counter.w + 1; - t->state ^= 1; - t->clocks += t->state; - t->counter.w = t->timer; - } - - /* subtract off the remainder */ - t->counter.w -= clocks; - } -} - - - -/************************************* - * - * Noise generation helper - * - *************************************/ - -inline int exidy_sound_device::sh6840_update_noise(int clocks) -{ - uint32_t newxor; - int noise_clocks = 0; - int i; - - /* loop over clocks */ - for (i = 0; i < clocks; i++) - { - /* shift the LFSR. its a LOOOONG LFSR, so we need - * four longs to hold it all! - * first we grab new sample, then shift the high bits, - * then the low ones; finally or in the result and see if we've - * had a 0->1 transition */ - newxor = (m_sh6840_LFSR_3 ^ m_sh6840_LFSR_2) >> 31; /* high bits of 3 and 2 xored is new xor */ - m_sh6840_LFSR_3 <<= 1; - m_sh6840_LFSR_3 |= m_sh6840_LFSR_2 >> 31; - m_sh6840_LFSR_2 <<= 1; - m_sh6840_LFSR_2 |= m_sh6840_LFSR_1 >> 31; - m_sh6840_LFSR_1 <<= 1; - m_sh6840_LFSR_1 |= m_sh6840_LFSR_0 >> 31; - m_sh6840_LFSR_0 <<= 1; - m_sh6840_LFSR_0 |= newxor ^ m_sh6840_LFSR_oldxor; - m_sh6840_LFSR_oldxor = newxor; - /*printf("LFSR: %4x, %4x, %4x, %4x\n", sh6840_LFSR_3, sh6840_LFSR_2, sh6840_LFSR_1, sh6840_LFSR_0);*/ - /* if we clocked 0->1, that will serve as an external clock */ - if ((m_sh6840_LFSR_2 & 0x03) == 0x01) /* tap is at 96th bit */ - { - noise_clocks++; - } - } - return noise_clocks; -} - - - -/************************************* - * - * 6840 state saving - * - *************************************/ - -void exidy_sound_device::sh6840_register_state_globals() -{ - save_item(NAME(m_sh6840_volume)); - save_item(NAME(m_sh6840_MSB_latch)); - save_item(NAME(m_sh6840_LSB_latch)); - save_item(NAME(m_sh6840_LFSR_oldxor)); - save_item(NAME(m_sh6840_LFSR_0)); - save_item(NAME(m_sh6840_LFSR_1)); - save_item(NAME(m_sh6840_LFSR_2)); - save_item(NAME(m_sh6840_LFSR_3)); - save_item(NAME(m_sh6840_clock_count)); - save_item(NAME(m_sfxctrl)); - save_item(NAME(m_sh6840_timer[0].cr)); - save_item(NAME(m_sh6840_timer[0].state)); - save_item(NAME(m_sh6840_timer[0].leftovers)); - save_item(NAME(m_sh6840_timer[0].timer)); - save_item(NAME(m_sh6840_timer[0].clocks)); - save_item(NAME(m_sh6840_timer[0].counter.w)); - save_item(NAME(m_sh6840_timer[1].cr)); - save_item(NAME(m_sh6840_timer[1].state)); - save_item(NAME(m_sh6840_timer[1].leftovers)); - save_item(NAME(m_sh6840_timer[1].timer)); - save_item(NAME(m_sh6840_timer[1].clocks)); - save_item(NAME(m_sh6840_timer[1].counter.w)); - save_item(NAME(m_sh6840_timer[2].cr)); - save_item(NAME(m_sh6840_timer[2].state)); - save_item(NAME(m_sh6840_timer[2].leftovers)); - save_item(NAME(m_sh6840_timer[2].timer)); - save_item(NAME(m_sh6840_timer[2].clocks)); - save_item(NAME(m_sh6840_timer[2].counter.w)); -} - -/************************************* - * - * Audio startup routines - * - *************************************/ - -void exidy_sound_device::common_sh_start() -{ - int sample_rate = SH8253_CLOCK.value(); - - m_sh6840_clocks_per_sample = (int)(SH6840_CLOCK.dvalue() / (double)sample_rate * (double)(1 << 24)); - - /* allocate the stream */ - m_stream = stream_alloc(0, 1, sample_rate); - - sh6840_register_state_globals(); -} - -DEFINE_DEVICE_TYPE(EXIDY, exidy_sound_device, "exidy_sfx", "Exidy SFX") - -exidy_sound_device::exidy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : exidy_sound_device(mconfig, EXIDY, tag, owner, clock) -{ -} - -exidy_sh8253_sound_device::exidy_sh8253_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) - : exidy_sound_device(mconfig, type, tag, owner, clock), - m_riot(*this, "riot"), - m_cvsd(*this, "cvsd"), - m_cvsd_filter(*this, "cvsd_filter"), - m_cvsd_filter2(*this, "cvsd_filter2"), - m_cvsdcpu(*this, "cvsdcpu"), - m_tms(*this, "tms"), - m_pia(*this, "pia") -{ -} - -exidy_sound_device::exidy_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, type, tag, owner, clock), - device_sound_interface(mconfig, *this), - m_stream(nullptr), - m_freq_to_step(0), - m_sh6840_MSB_latch(0), - m_sh6840_LSB_latch(0), - m_sh6840_LFSR_oldxor(0), - m_sh6840_LFSR_0(0xffffffff), - m_sh6840_LFSR_1(0xffffffff), - m_sh6840_LFSR_2(0xffffffff), - m_sh6840_LFSR_3(0xffffffff), - m_sh6840_clocks_per_sample(0), - m_sh6840_clock_count(0), - m_sfxctrl(0) -{ -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void exidy_sound_device::device_start() -{ - common_sh_start(); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void exidy_sound_device::device_reset() -{ - common_sh_reset(); -} - -//------------------------------------------------- -// sound_stream_update - handle a stream update -//------------------------------------------------- - -void exidy_sound_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) -{ - sh6840_timer_channel *sh6840_timer = m_sh6840_timer; - - /* hack to skip the expensive lfsr noise generation unless at least one of the 3 channels actually depends on it being generated */ - int noisy = ((sh6840_timer[0].cr & sh6840_timer[1].cr & sh6840_timer[2].cr & 0x02) == 0); - auto &buffer = outputs[0]; - - /* loop over samples */ - for (int sampindex = 0; sampindex < buffer.samples(); sampindex++) - { - sh6840_timer_channel *t; - int clocks; - s32 sample = 0; - - /* determine how many 6840 clocks this sample */ - m_sh6840_clock_count += m_sh6840_clocks_per_sample; - int clocks_this_sample = m_sh6840_clock_count >> 24; - m_sh6840_clock_count &= (1 << 24) - 1; - - /* skip if nothing enabled */ - if ((sh6840_timer[0].cr & 0x01) == 0) - { - int noise_clocks_this_sample = 0; - uint32_t chan0_clocks; - - /* generate E-clocked noise if configured to do so */ - if (noisy && !(m_sfxctrl & 0x01)) - noise_clocks_this_sample = sh6840_update_noise(clocks_this_sample); - - /* handle timer 0 if enabled */ - t = &sh6840_timer[0]; - chan0_clocks = t->clocks; - clocks = (t->cr & 0x02) ? clocks_this_sample : noise_clocks_this_sample; - sh6840_apply_clock(t, clocks); - if (t->state && !(m_sfxctrl & 0x02) && (t->cr & 0x80)) - sample += m_sh6840_volume[0]; - - /* generate channel 0-clocked noise if configured to do so */ - if (noisy && (m_sfxctrl & 0x01)) - noise_clocks_this_sample = sh6840_update_noise(t->clocks - chan0_clocks); - - /* handle timer 1 if enabled */ - t = &sh6840_timer[1]; - clocks = (t->cr & 0x02) ? clocks_this_sample : noise_clocks_this_sample; - sh6840_apply_clock(t, clocks); - if (t->state && (t->cr & 0x80)) - sample += m_sh6840_volume[1]; - - /* handle timer 2 if enabled */ - t = &sh6840_timer[2]; - clocks = (t->cr & 0x02) ? clocks_this_sample : noise_clocks_this_sample; - /* prescale */ - if (t->cr & 0x01) - { - clocks += t->leftovers; - t->leftovers = clocks % 8; - clocks /= 8; - } - sh6840_apply_clock(t, clocks); - if (t->state && (t->cr & 0x80)) - sample += m_sh6840_volume[2]; - } - - /* music (if present) */ - sample += generate_music_sample(); - - /* stash */ - buffer.put_int(sampindex, sample, 32768); - } -} - -s32 exidy_sound_device::generate_music_sample() -{ - return 0; -} - -s32 exidy_sh8253_sound_device::generate_music_sample() -{ - sh8253_timer_channel *c; - s32 sample = 0; - - /* music channel 0 */ - c = &m_sh8253_timer[0]; - if (c->enable) - { - c->fraction += c->step; - if (c->fraction & 0x0800000) - sample += BASE_VOLUME; - } - - /* music channel 1 */ - c = &m_sh8253_timer[1]; - if (c->enable) - { - c->fraction += c->step; - if (c->fraction & 0x0800000) - sample += BASE_VOLUME; - } - - /* music channel 2 */ - c = &m_sh8253_timer[2]; - if (c->enable) - { - c->fraction += c->step; - if (c->fraction & 0x0800000) - sample += BASE_VOLUME; - } - - return sample; -} - - - -/************************************* - * - * Audio reset routines - * - *************************************/ - -void exidy_sound_device::common_sh_reset() -{ - /* 6840 */ - memset(m_sh6840_timer, 0, sizeof(m_sh6840_timer)); - m_sh6840_MSB_latch = 0; - m_sh6840_LSB_latch = 0; - m_sh6840_volume[0] = 0; - m_sh6840_volume[1] = 0; - m_sh6840_volume[2] = 0; - m_sh6840_clock_count = 0; - m_sfxctrl = 0; - - /* LFSR */ - m_sh6840_LFSR_oldxor = 0; - m_sh6840_LFSR_0 = 0xffffffff; - m_sh6840_LFSR_1 = 0xffffffff; - m_sh6840_LFSR_2 = 0xffffffff; - m_sh6840_LFSR_3 = 0xffffffff; -} - - -/************************************* - * - * 6532 interface - * - *************************************/ - -void exidy_sh8253_sound_device::r6532_porta_w(uint8_t data) -{ - if (m_cvsd.found()) - m_cvsdcpu->set_input_line(INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE); - - if (m_tms.found()) - { - logerror("(%f)%s:TMS5220 data write = %02X\n", machine().time().as_double(), machine().describe_context(), m_riot->porta_out_get()); - m_tms->data_w(data); - } -} - -uint8_t exidy_sh8253_sound_device::r6532_porta_r() -{ - uint8_t status = 0xff; - if (m_tms.found()) - { - status = m_tms->status_r(); - logerror("(%f)%s:TMS5220 status read = %02X\n", machine().time().as_double(), machine().describe_context(), status); - } - return status; -} - -void exidy_sh8253_sound_device::r6532_portb_w(uint8_t data) -{ - if (m_tms.found()) - { - m_tms->rsq_w(BIT(data, 0)); - m_tms->wsq_w(BIT(data, 1)); - } -} - - -uint8_t exidy_sh8253_sound_device::r6532_portb_r() -{ - uint8_t newdata = m_riot->portb_in_get(); - if (m_tms.found()) - { - newdata &= ~0x0c; - if (m_tms->readyq_r()) newdata |= 0x04; - if (m_tms->intq_r()) newdata |= 0x08; - } - return newdata; -} - - -/************************************* - * - * 8253 state saving - * - *************************************/ - - -void exidy_sh8253_sound_device::sh8253_register_state_globals() -{ - save_item(NAME(m_sh8253_timer[0].clstate)); - save_item(NAME(m_sh8253_timer[0].enable)); - save_item(NAME(m_sh8253_timer[0].count)); - save_item(NAME(m_sh8253_timer[0].step)); - save_item(NAME(m_sh8253_timer[0].fraction)); - save_item(NAME(m_sh8253_timer[1].clstate)); - save_item(NAME(m_sh8253_timer[1].enable)); - save_item(NAME(m_sh8253_timer[1].count)); - save_item(NAME(m_sh8253_timer[1].step)); - save_item(NAME(m_sh8253_timer[1].fraction)); - save_item(NAME(m_sh8253_timer[2].clstate)); - save_item(NAME(m_sh8253_timer[2].enable)); - save_item(NAME(m_sh8253_timer[2].count)); - save_item(NAME(m_sh8253_timer[2].step)); - save_item(NAME(m_sh8253_timer[2].fraction)); -} - -/************************************* - * - * 8253 timer handlers - * - *************************************/ - -void exidy_sh8253_sound_device::sh8253_w(offs_t offset, uint8_t data) -{ - int chan; - - m_stream->update(); - - switch (offset) - { - case 0: - case 1: - case 2: - chan = offset; - if (!m_sh8253_timer[chan].clstate) - { - m_sh8253_timer[chan].clstate = 1; - m_sh8253_timer[chan].count = (m_sh8253_timer[chan].count & 0xff00) | (data & 0x00ff); - } - else - { - m_sh8253_timer[chan].clstate = 0; - m_sh8253_timer[chan].count = (m_sh8253_timer[chan].count & 0x00ff) | ((data << 8) & 0xff00); - if (m_sh8253_timer[chan].count) - m_sh8253_timer[chan].step = m_freq_to_step * SH8253_CLOCK.dvalue() / m_sh8253_timer[chan].count; - else - m_sh8253_timer[chan].step = 0; - } - break; - - case 3: - chan = (data & 0xc0) >> 6; - m_sh8253_timer[chan].enable = ((data & 0x0e) != 0); - break; - } -} - - - -/************************************* - * - * 6840 timer handlers - * - *************************************/ - -uint8_t exidy_sound_device::sh6840_r(offs_t offset) -{ - /* force an update of the stream */ - m_stream->update(); - - switch (offset) - { - /* offset 0: Motorola datasheet says it isn't used, Hitachi datasheet says it reads as 0s always*/ - case 0: - return 0; - /* offset 1 reads the status register: bits 2 1 0 correspond to ints on channels 2,1,0, and bit 7 is an 'OR' of bits 2,1,0 */ - case 1: - logerror("%s:exidy_sh6840_r - unexpected read, status register is TODO!\n", machine().describe_context()); - return 0; - /* offsets 2,4,6 read channel 0,1,2 MSBs and latch the LSB*/ - case 2: case 4: case 6: - m_sh6840_LSB_latch = m_sh6840_timer[((offset>>1)-1)].counter.b.l; - return m_sh6840_timer[((offset>>1)-1)].counter.b.h; - /* offsets 3,5,7 read the LSB latch*/ - default: /* case 3,5,7 */ - return m_sh6840_LSB_latch; - } -} - - -void exidy_sound_device::sh6840_w(offs_t offset, uint8_t data) -{ - sh6840_timer_channel *sh6840_timer = m_sh6840_timer; - - /* force an update of the stream */ - m_stream->update(); - - switch (offset) - { - /* offset 0 writes to either channel 0 control or channel 2 control */ - case 0: - if (sh6840_timer[1].cr & 0x01) - sh6840_timer[0].cr = data; - else - sh6840_timer[2].cr = data; - - /* only support mode 0 and 2 */ - if (((data >> 3) & 5) != 0) - fatalerror("exidy_sh6840_w - channel %d configured for mode %d\n", (sh6840_timer[1].cr & 0x01) ? 0 : 2, (data >> 3) & 7); - break; - - /* offset 1 writes to channel 1 control */ - case 1: - sh6840_timer[1].cr = data; - - /* only support mode 0 and 2 */ - if (((data >> 3) & 5) != 0) - fatalerror("exidy_sh6840_w - channel 1 configured for mode %d\n", (data >> 3) & 7); - break; - - /* offsets 2/4/6 write to the common MSB latch */ - case 2: - case 4: - case 6: - m_sh6840_MSB_latch = data; - break; - - /* offsets 3/5/7 write to the LSB controls */ - case 3: - case 5: - case 7: - { - /* latch the timer value */ - int ch = (offset - 3) / 2; - sh6840_timer[ch].timer = (m_sh6840_MSB_latch << 8) | (data & 0xff); - - /* if CR4 is clear, the value is loaded immediately */ - if (!(sh6840_timer[ch].cr & 0x10)) - sh6840_timer[ch].counter.w = sh6840_timer[ch].timer; - break; - } - } -} - - - -/************************************* - * - * External sound effect controls - * - *************************************/ - -void exidy_sound_device::sfxctrl_w(offs_t offset, uint8_t data) -{ - m_stream->update(); - - switch (offset) - { - case 0: - m_sfxctrl = data; - break; - - case 1: - case 2: - case 3: - m_sh6840_volume[offset - 1] = ((data & 7) * BASE_VOLUME) / 7; - break; - } -} - - - -/************************************* - * - * Sound filter control - * - *************************************/ - -void venture_sound_device::filter_w(uint8_t data) -{ - logerror("exidy_sound_filter_w = %02X\n", data); -} - - - -/************************************* - * - * Venture, etc. - * - *************************************/ - - -DEFINE_DEVICE_TYPE(EXIDY_VENTURE, venture_sound_device, "venture_sound", "Exidy SFX+PSG") - -venture_sound_device::venture_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : venture_sound_device(mconfig, EXIDY_VENTURE, tag, owner, clock) -{ -} - -venture_sound_device::venture_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) - : exidy_sh8253_sound_device(mconfig, type, tag, owner, clock) - , m_pa_callback(*this) - , m_pb_callback(*this) - , m_ca2_callback(*this) - , m_cb2_callback(*this) -{ -} - -void venture_sound_device::device_resolve_objects() -{ - m_pa_callback.resolve_safe(); - m_pb_callback.resolve_safe(); - m_ca2_callback.resolve_safe(); - m_cb2_callback.resolve_safe(); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void exidy_sh8253_sound_device::device_start() -{ - common_sh_start(); - - /* 8253 */ - m_freq_to_step = (1 << 24) / SH8253_CLOCK; - - sh8253_register_state_globals(); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void exidy_sh8253_sound_device::device_reset() -{ - common_sh_reset(); - - /* 8253 */ - memset(m_sh8253_timer, 0, sizeof(m_sh8253_timer)); -} - - -void venture_sound_device::pa_w(uint8_t data) -{ - m_pia->porta_w(data); -} - - -void venture_sound_device::pb_w(uint8_t data) -{ - m_pia->portb_w(data); -} - - -WRITE_LINE_MEMBER(venture_sound_device::ca_w) -{ - m_pia->ca1_w(state); -} - - -WRITE_LINE_MEMBER(venture_sound_device::cb_w) -{ - m_pia->cb1_w(state); -} - - -void venture_sound_device::pia_pa_w(uint8_t data) -{ - m_pa_callback(data); -} - - -void venture_sound_device::pia_pb_w(uint8_t data) -{ - m_pb_callback(data); -} - - -WRITE_LINE_MEMBER(venture_sound_device::pia_ca2_w) -{ - m_ca2_callback(state); -} - - -WRITE_LINE_MEMBER(venture_sound_device::pia_cb2_w) -{ - m_cb2_callback(state); -} - - -void venture_sound_device::venture_audio_map(address_map &map) -{ - map.global_mask(0x7fff); - map(0x0000, 0x007f).mirror(0x0780).ram(); - map(0x0800, 0x087f).mirror(0x0780).rw("riot", FUNC(riot6532_device::read), FUNC(riot6532_device::write)); - map(0x1000, 0x1003).mirror(0x07fc).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1800, 0x1803).mirror(0x07fc).w(FUNC(venture_sound_device::sh8253_w)); - map(0x2000, 0x27ff).w(FUNC(venture_sound_device::filter_w)); - map(0x2800, 0x2807).mirror(0x07f8).rw(FUNC(venture_sound_device::sh6840_r), FUNC(venture_sound_device::sh6840_w)); - map(0x3000, 0x3003).mirror(0x07fc).w(FUNC(venture_sound_device::sfxctrl_w)); - map(0x5800, 0x7fff).rom(); -} - - -void venture_sound_device::device_add_mconfig(machine_config &config) -{ - m6502_device &audiocpu(M6502(config, "audiocpu", 3579545/4)); - audiocpu.set_addrmap(AS_PROGRAM, &venture_sound_device::venture_audio_map); - - RIOT6532(config, m_riot, SH6532_CLOCK); - m_riot->in_pa_callback().set(FUNC(venture_sound_device::r6532_porta_r)); - m_riot->out_pa_callback().set(FUNC(venture_sound_device::r6532_porta_w)); - m_riot->in_pb_callback().set(FUNC(venture_sound_device::r6532_portb_r)); - m_riot->out_pb_callback().set(FUNC(venture_sound_device::r6532_portb_w)); - m_riot->irq_callback().set("audioirq", FUNC(input_merger_device::in_w<0>)); - - PIA6821(config, m_pia, 0); - m_pia->writepa_handler().set(FUNC(venture_sound_device::pia_pa_w)); - m_pia->writepb_handler().set(FUNC(venture_sound_device::pia_pb_w)); - m_pia->ca2_handler().set(FUNC(venture_sound_device::pia_ca2_w)); - m_pia->cb2_handler().set(FUNC(venture_sound_device::pia_cb2_w)); - m_pia->irqb_handler().set("audioirq", FUNC(input_merger_device::in_w<1>)); - - INPUT_MERGER_ANY_HIGH(config, "audioirq").output_handler().set_inputline("audiocpu", m6502_device::IRQ_LINE); // open collector - - SPEAKER(config, "mono").front_center(); - - this->add_route(ALL_OUTPUTS, "mono", 0.50); -} - - - -/************************************* - * - * CVSD sound for Mouse Trap - * - *************************************/ - -DEFINE_DEVICE_TYPE(EXIDY_MTRAP, mtrap_sound_device, "mtrap_sound", "Exidy SFX+PSG+CVSD") - -mtrap_sound_device::mtrap_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : venture_sound_device(mconfig, EXIDY_MTRAP, tag, owner, clock) - , m_cvsd_timer(*this,"cvsd_timer") - , m_cvsd_clk(false) -{ -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void mtrap_sound_device::device_start() -{ - common_sh_start(); - - /* 8253 */ - m_freq_to_step = (1 << 24) / SH8253_CLOCK; - - sh8253_register_state_globals(); - - save_item(NAME(m_cvsd_clk)); -} - -TIMER_DEVICE_CALLBACK_MEMBER(mtrap_sound_device::cvsd_timer) -{ - m_cvsd_clk = !m_cvsd_clk; - m_cvsd->clock_w(m_cvsd_clk); -} - -void mtrap_sound_device::voiceio_w(offs_t offset, uint8_t data) -{ - if (!(offset & 0x10)) - m_cvsd->digit_w(data & 1); - - if (!(offset & 0x20)) - m_riot->portb_in_set(data & 1, 0xff); -} - - -uint8_t mtrap_sound_device::voiceio_r(offs_t offset) -{ - uint8_t retval = 0xff; // this should probably be open bus - if (!(offset & 0x80)) - { - retval &= 0xf0; - uint8_t porta = m_riot->porta_out_get(); - uint8_t data = (porta & 0x06) >> 1; - data |= (porta & 0x01) << 2; - data |= (porta & 0x08); - retval |= data; - } - - if (!(offset & 0x40)) - { - retval &= 0x7f; - retval |= (m_cvsd_clk << 7); - } - - return retval; -} - - -void mtrap_sound_device::cvsd_map(address_map &map) -{ - map.global_mask(0x3fff); - map(0x0000, 0x3fff).rom().region("cvsdcpu", 0); -} - - -void mtrap_sound_device::cvsd_iomap(address_map &map) -{ - map.global_mask(0xff); - map(0x00, 0xff).rw(FUNC(mtrap_sound_device::voiceio_r), FUNC(mtrap_sound_device::voiceio_w)); -} - - -void mtrap_sound_device::device_add_mconfig(machine_config &config) -{ - venture_sound_device::device_add_mconfig(config); - - Z80(config, m_cvsdcpu, CVSD_Z80_CLOCK); - m_cvsdcpu->set_addrmap(AS_PROGRAM, &mtrap_sound_device::cvsd_map); - m_cvsdcpu->set_addrmap(AS_IO, &mtrap_sound_device::cvsd_iomap); - - TIMER(config, m_cvsd_timer).configure_periodic(FUNC(mtrap_sound_device::cvsd_timer), attotime::from_hz(CVSD_CLOCK*2.0)); // this is a 555 timer with 53% duty cycle, within margin of error of 50% duty cycle; the handler clocks on both clock edges, hence * 2.0 - - /* audio hardware */ - FILTER_BIQUAD(config, m_cvsd_filter2).opamp_mfb_lowpass_setup(RES_K(10), RES_K(3.9), RES_K(18), CAP_N(20), CAP_N(2.2)); - m_cvsd_filter2->add_route(ALL_OUTPUTS, "mono", 1.0); - FILTER_BIQUAD(config, m_cvsd_filter).opamp_mfb_lowpass_setup(RES_K(10), RES_K(3.9), RES_K(18), CAP_N(20), CAP_N(2.2)); - m_cvsd_filter->add_route(ALL_OUTPUTS, m_cvsd_filter2, 1.0); - MC3417(config, m_cvsd, 0).add_route(ALL_OUTPUTS, m_cvsd_filter, 0.3086); // each filter has gain of 1.8 for total gain of 3.24, 0.3086 cancels this out. was 0.8 - -} - - -/************************************* - * - * Victory - * - *************************************/ - -#define VICTORY_AUDIO_CPU_CLOCK (XTAL(3'579'545) / 4) -#define VICTORY_LOG_SOUND 0 - - - -uint8_t victory_sound_device::response_r() -{ - uint8_t ret = m_pia->b_output(); - - if (!machine().side_effects_disabled()) - { - if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound response read = %02X\n", machine().describe_context(), ret); - - m_pia_cb1 = 0; - m_pia->cb1_w(m_pia_cb1); - } - - return ret; -} - - -uint8_t victory_sound_device::status_r() -{ - uint8_t ret = (m_pia_ca1 << 7) | (m_pia_cb1 << 6); - - if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound status read = %02X\n", machine().describe_context(), ret); - - return ret; -} - - -TIMER_CALLBACK_MEMBER(victory_sound_device::delayed_command_w) -{ - m_pia->porta_w(param); - m_pia_ca1 = 0; - m_pia->ca1_w(m_pia_ca1); -} - -void victory_sound_device::command_w(uint8_t data) -{ - if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound command = %02X\n", machine().describe_context(), data); - - machine().scheduler().synchronize(timer_expired_delegate(FUNC(victory_sound_device::delayed_command_w), this), data); -} - - -WRITE_LINE_MEMBER(victory_sound_device::irq_clear_w) -{ - if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound IRQ clear = %02X\n", machine().describe_context(), state); - - if (!state) - { - m_pia_ca1 = 1; - m_pia->ca1_w(m_pia_ca1); - } -} - - -WRITE_LINE_MEMBER(victory_sound_device::main_ack_w) -{ - if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound Main ACK W = %02X\n", machine().describe_context(), state); - - if (m_victory_sound_response_ack_clk && !state) - { - m_pia_cb1 = 1; - m_pia->cb1_w(m_pia_cb1); - } - - m_victory_sound_response_ack_clk = state; -} - - -DEFINE_DEVICE_TYPE(EXIDY_VICTORY, victory_sound_device, "victory_sound", "Exidy SFX+PSG+Speech") - -victory_sound_device::victory_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : exidy_sh8253_sound_device(mconfig, EXIDY_VICTORY, tag, owner, clock) - , m_victory_sound_response_ack_clk(0) -{ -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void victory_sound_device::device_start() -{ - save_item(NAME(m_victory_sound_response_ack_clk)); - save_item(NAME(m_pia_ca1)); - save_item(NAME(m_pia_cb1)); - - exidy_sh8253_sound_device::device_start(); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void victory_sound_device::device_reset() -{ - exidy_sh8253_sound_device::device_reset(); - - /* the flip-flop @ F4 is reset */ - m_victory_sound_response_ack_clk = 0; - m_pia_cb1 = 1; - m_pia->cb1_w(m_pia_cb1); - - /* these two lines shouldn't be needed, but it avoids the log entry - as the sound CPU checks port A before the main CPU ever writes to it */ - m_pia->porta_w(0); - m_pia_ca1 = 1; - m_pia->ca1_w(m_pia_ca1); -} - - -void victory_sound_device::victory_audio_map(address_map &map) -{ - map(0x0000, 0x00ff).mirror(0x0f00).ram(); - map(0x1000, 0x107f).mirror(0x0f80).rw("riot", FUNC(riot6532_device::read), FUNC(riot6532_device::write)); - map(0x2000, 0x2003).mirror(0x0ffc).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x3000, 0x3003).mirror(0x0ffc).w(FUNC(victory_sound_device::sh8253_w)); - map(0x4000, 0x4fff).noprw(); - map(0x5000, 0x5007).mirror(0x0ff8).rw(FUNC(victory_sound_device::sh6840_r), FUNC(victory_sound_device::sh6840_w)); - map(0x6000, 0x6003).mirror(0x0ffc).w(FUNC(victory_sound_device::sfxctrl_w)); - map(0x7000, 0xafff).noprw(); - map(0xb000, 0xffff).rom(); -} - - -void victory_sound_device::device_add_mconfig(machine_config &config) -{ - m6502_device &audiocpu(M6502(config, "audiocpu", VICTORY_AUDIO_CPU_CLOCK)); - audiocpu.set_addrmap(AS_PROGRAM, &victory_sound_device::victory_audio_map); - - RIOT6532(config, m_riot, SH6532_CLOCK); - m_riot->in_pa_callback().set(FUNC(victory_sound_device::r6532_porta_r)); - m_riot->out_pa_callback().set(FUNC(victory_sound_device::r6532_porta_w)); - m_riot->in_pb_callback().set(FUNC(victory_sound_device::r6532_portb_r)); - m_riot->out_pb_callback().set(FUNC(victory_sound_device::r6532_portb_w)); - m_riot->irq_callback().set("audioirq", FUNC(input_merger_device::in_w<0>)); - - PIA6821(config, m_pia, 0); - m_pia->ca2_handler().set(FUNC(victory_sound_device::irq_clear_w)); - m_pia->cb2_handler().set(FUNC(victory_sound_device::main_ack_w)); - m_pia->irqb_handler().set("audioirq", FUNC(input_merger_device::in_w<1>)); - - INPUT_MERGER_ANY_HIGH(config, "audioirq").output_handler().set_inputline("audiocpu", m6502_device::IRQ_LINE); // open collector - - SPEAKER(config, "mono").front_center(); - - this->add_route(ALL_OUTPUTS, "mono", 1.0); - - TMS5220(config, m_tms, 640000).add_route(ALL_OUTPUTS, "mono", 1.0); -} diff --git a/src/mame/exidy/exidy_a.h b/src/mame/exidy/exidy_a.h deleted file mode 100644 index f81e890c6e2..00000000000 --- a/src/mame/exidy/exidy_a.h +++ /dev/null @@ -1,233 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_EXIDY_H -#define MAME_AUDIO_EXIDY_H - -#pragma once - -#include "machine/6532riot.h" -#include "machine/6821pia.h" -#include "machine/timer.h" -#include "sound/flt_biquad.h" -#include "sound/hc55516.h" -#include "sound/tms5220.h" - - -class exidy_sound_device : public device_t, - public device_sound_interface -{ - /* 6840 variables */ - struct sh6840_timer_channel - { - uint8_t cr = 0; - uint8_t state = 0; - uint8_t leftovers = 0; - uint16_t timer = 0; - uint32_t clocks = 0; - union - { -#ifdef LSB_FIRST - struct { uint8_t l, h; } b; -#else - struct { uint8_t h, l; } b; -#endif - uint16_t w; - } counter; - }; - -public: - exidy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - ~exidy_sound_device() {} - - uint8_t sh6840_r(offs_t offset); - void sh6840_w(offs_t offset, uint8_t data); - void sfxctrl_w(offs_t offset, uint8_t data); - -protected: - exidy_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - void common_sh_start(); - void common_sh_reset(); - - void sh6840_register_state_globals(); - - // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; - virtual s32 generate_music_sample(); - - static inline void sh6840_apply_clock(sh6840_timer_channel *t, int clocks); - - /* sound streaming variables */ - sound_stream *m_stream; - double m_freq_to_step; - -private: - // internal state - sh6840_timer_channel m_sh6840_timer[3]; - int16_t m_sh6840_volume[3]; - uint8_t m_sh6840_MSB_latch; - uint8_t m_sh6840_LSB_latch; - uint8_t m_sh6840_LFSR_oldxor; - uint32_t m_sh6840_LFSR_0; - uint32_t m_sh6840_LFSR_1; - uint32_t m_sh6840_LFSR_2; - uint32_t m_sh6840_LFSR_3; - uint32_t m_sh6840_clocks_per_sample; - uint32_t m_sh6840_clock_count; - - uint8_t m_sfxctrl; - - inline int sh6840_update_noise(int clocks); -}; - -DECLARE_DEVICE_TYPE(EXIDY, exidy_sound_device) - -class exidy_sh8253_sound_device : public exidy_sound_device -{ - struct sh8253_timer_channel - { - uint8_t clstate = 0; - uint8_t enable = 0; - uint16_t count = 0; - uint32_t step = 0; - uint32_t fraction = 0; - }; - -protected: - exidy_sh8253_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - virtual s32 generate_music_sample() override; - - void r6532_porta_w(uint8_t data); - uint8_t r6532_porta_r(); - void r6532_portb_w(uint8_t data); - uint8_t r6532_portb_r(); - - void sh8253_w(offs_t offset, uint8_t data); - - void sh8253_register_state_globals(); - - /* 8253 variables */ - sh8253_timer_channel m_sh8253_timer[3]; - - /* 6532 variables */ - required_device m_riot; - - /* 5220/CVSD variables */ - optional_device m_cvsd; - optional_device m_cvsd_filter; - optional_device m_cvsd_filter2; - optional_device m_cvsdcpu; - optional_device m_tms; - required_device m_pia; -}; - -class venture_sound_device : public exidy_sh8253_sound_device -{ -public: - venture_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - // configuration access - auto pa_callback() { return m_pa_callback.bind(); } - auto pb_callback() { return m_pb_callback.bind(); } - auto ca2_callback() { return m_ca2_callback.bind(); } - auto cb2_callback() { return m_cb2_callback.bind(); } - - // external access - void pa_w(uint8_t data); - void pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(ca_w); - DECLARE_WRITE_LINE_MEMBER(cb_w); - -protected: - venture_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - // device-level overrides - virtual void device_resolve_objects() override; - virtual void device_add_mconfig(machine_config &config) override; - - void venture_audio_map(address_map &map); - -private: - void filter_w(uint8_t data); - - void pia_pa_w(uint8_t data); - void pia_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_ca2_w); - DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); - - void venture_audio(machine_config &config); - - devcb_write8 m_pa_callback; - devcb_write8 m_pb_callback; - devcb_write_line m_ca2_callback; - devcb_write_line m_cb2_callback; -}; - -DECLARE_DEVICE_TYPE(EXIDY_VENTURE, venture_sound_device) - -class mtrap_sound_device : public venture_sound_device -{ -public: - mtrap_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_add_mconfig(machine_config &config) override; - -private: - required_device m_cvsd_timer; - TIMER_DEVICE_CALLBACK_MEMBER(cvsd_timer); - void voiceio_w(offs_t offset, uint8_t data); - uint8_t voiceio_r(offs_t offset); - bool m_cvsd_clk; - - void cvsd_map(address_map &map); - void cvsd_iomap(address_map &map); -}; - -DECLARE_DEVICE_TYPE(EXIDY_MTRAP, mtrap_sound_device) - -class victory_sound_device : public exidy_sh8253_sound_device -{ -public: - victory_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - // external access - uint8_t response_r(); - uint8_t status_r(); - void command_w(uint8_t data); - -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - virtual void device_add_mconfig(machine_config &config) override; - -private: - DECLARE_WRITE_LINE_MEMBER(irq_clear_w); - DECLARE_WRITE_LINE_MEMBER(main_ack_w); - - void victory_audio_map(address_map &map); - - // internal state - uint8_t m_victory_sound_response_ack_clk; /* 7474 @ F4 */ - - TIMER_CALLBACK_MEMBER( delayed_command_w ); - - int m_pia_ca1 = 0; - int m_pia_cb1 = 0; -}; - -DECLARE_DEVICE_TYPE(EXIDY_VICTORY, victory_sound_device) - -#endif // MAME_AUDIO_EXIDY_H diff --git a/src/mame/exidy/micropolis.cpp b/src/mame/exidy/micropolis.cpp index a2f89885b00..ec57ac39a1f 100644 --- a/src/mame/exidy/micropolis.cpp +++ b/src/mame/exidy/micropolis.cpp @@ -30,7 +30,7 @@ BE02 and BE03 - read data, write data #include "emu.h" -#include "machine/micropolis.h" +#include "micropolis.h" /*************************************************************************** diff --git a/src/mame/exidy/sorcerer.cpp b/src/mame/exidy/sorcerer.cpp index 70c542f03b2..2a0f08e8790 100644 --- a/src/mame/exidy/sorcerer.cpp +++ b/src/mame/exidy/sorcerer.cpp @@ -163,7 +163,7 @@ Exidy Sorcerer Video/Disk Unit: ********************************************************************************/ #include "emu.h" -#include "includes/sorcerer.h" +#include "sorcerer.h" #include "emupal.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/exidy/sorcerer.h b/src/mame/exidy/sorcerer.h index 8c3c78560fc..d55f7344573 100644 --- a/src/mame/exidy/sorcerer.h +++ b/src/mame/exidy/sorcerer.h @@ -20,7 +20,7 @@ #include "imagedev/snapquik.h" #include "machine/ay31015.h" #include "machine/clock.h" -#include "machine/micropolis.h" +#include "micropolis.h" #include "machine/ram.h" #include "machine/wd_fdc.h" #include "machine/z80dma.h" diff --git a/src/mame/exidy/sorcerer_m.cpp b/src/mame/exidy/sorcerer_m.cpp index fdd3273b58d..86b0616bbe4 100644 --- a/src/mame/exidy/sorcerer_m.cpp +++ b/src/mame/exidy/sorcerer_m.cpp @@ -7,8 +7,10 @@ *******************************************************************************/ #include "emu.h" -#include "includes/sorcerer.h" -#include "machine/z80bin.h" +#include "sorcerer.h" + +#include "z80bin.h" + // ************ TIMERS ************** /* timer for sorcerer serial chip transmit and receive */ diff --git a/src/mame/exidy/starfire.cpp b/src/mame/exidy/starfire.cpp index 1953fd70081..6f7a3ce6195 100644 --- a/src/mame/exidy/starfire.cpp +++ b/src/mame/exidy/starfire.cpp @@ -51,7 +51,7 @@ a Star Fire set with labels r1436-11 to r1445-11 is known to exist. ***************************************************************************/ #include "emu.h" -#include "includes/starfire.h" +#include "starfire.h" #include "cpu/z80/z80.h" #include "speaker.h" diff --git a/src/mame/exidy/starfire.h b/src/mame/exidy/starfire.h index 4b45180e6be..7ceee360930 100644 --- a/src/mame/exidy/starfire.h +++ b/src/mame/exidy/starfire.h @@ -13,8 +13,8 @@ #include "machine/netlist.h" #include "machine/pit8253.h" #include "netlist/nl_setup.h" -#include "audio/nl_fireone.h" -#include "audio/nl_starfire.h" +#include "nl_fireone.h" +#include "nl_starfire.h" #include "sound/dac.h" #include "screen.h" diff --git a/src/mame/exidy/starfire_v.cpp b/src/mame/exidy/starfire_v.cpp index 07c28fbe23c..f92cb186b59 100644 --- a/src/mame/exidy/starfire_v.cpp +++ b/src/mame/exidy/starfire_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/starfire.h" +#include "starfire.h" diff --git a/src/mame/exidy/vertigo.cpp b/src/mame/exidy/vertigo.cpp index 48a092ec38d..9a9f512d9c4 100644 --- a/src/mame/exidy/vertigo.cpp +++ b/src/mame/exidy/vertigo.cpp @@ -12,8 +12,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/vertigo.h" -#include "audio/exidy440.h" +#include "vertigo.h" +#include "exidy440_a.h" #include "speaker.h" #include "cpu/m6805/m68705.h" diff --git a/src/mame/exidy/vertigo.h b/src/mame/exidy/vertigo.h index d100b0dfe8f..13db5a285a7 100644 --- a/src/mame/exidy/vertigo.h +++ b/src/mame/exidy/vertigo.h @@ -10,7 +10,7 @@ #pragma once -#include "audio/exidy440.h" +#include "exidy440_a.h" #include "machine/74148.h" #include "machine/adc0808.h" #include "video/vector.h" diff --git a/src/mame/exidy/vertigo_m.cpp b/src/mame/exidy/vertigo_m.cpp index 3b6fa3a0b8a..9ec42ac2ea2 100644 --- a/src/mame/exidy/vertigo_m.cpp +++ b/src/mame/exidy/vertigo_m.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/vertigo.h" +#include "vertigo.h" diff --git a/src/mame/exidy/vertigo_v.cpp b/src/mame/exidy/vertigo_v.cpp index a0185729dae..6e30a6f5b65 100644 --- a/src/mame/exidy/vertigo_v.cpp +++ b/src/mame/exidy/vertigo_v.cpp @@ -46,7 +46,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/vertigo.h" +#include "vertigo.h" /************************************* diff --git a/src/mame/exidy/victory.cpp b/src/mame/exidy/victory.cpp index 63bce95b124..3cb61c017cc 100644 --- a/src/mame/exidy/victory.cpp +++ b/src/mame/exidy/victory.cpp @@ -97,9 +97,12 @@ ***************************************************************************/ #include "emu.h" + +#include "victory.h" + +#include "exidysound.h" + #include "cpu/z80/z80.h" -#include "audio/exidy.h" -#include "includes/victory.h" #include "machine/nvram.h" #include "machine/z80pio.h" diff --git a/src/mame/exidy/victory_v.cpp b/src/mame/exidy/victory_v.cpp index 638e061df6f..7cf46aecd41 100644 --- a/src/mame/exidy/victory_v.cpp +++ b/src/mame/exidy/victory_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/victory.h" +#include "victory.h" diff --git a/src/mame/f32/crospang.cpp b/src/mame/f32/crospang.cpp index 9f3c124e01c..4ffd084f693 100644 --- a/src/mame/f32/crospang.cpp +++ b/src/mame/f32/crospang.cpp @@ -27,7 +27,7 @@ */ #include "emu.h" -#include "includes/crospang.h" +#include "crospang.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/f32/crospang.h b/src/mame/f32/crospang.h index 8440fd8d891..4f57a59e68e 100644 --- a/src/mame/f32/crospang.h +++ b/src/mame/f32/crospang.h @@ -10,8 +10,10 @@ #pragma once +#include "decospr.h" + #include "machine/gen_latch.h" -#include "video/decospr.h" + #include "tilemap.h" class crospang_state : public driver_device diff --git a/src/mame/f32/crospang_v.cpp b/src/mame/f32/crospang_v.cpp index 57284f44a7c..86c08a7e62c 100644 --- a/src/mame/f32/crospang_v.cpp +++ b/src/mame/f32/crospang_v.cpp @@ -12,7 +12,7 @@ */ #include "emu.h" -#include "includes/crospang.h" +#include "crospang.h" void crospang_state::tilebank_select_w(u16 data) diff --git a/src/mame/f32/silvmil.cpp b/src/mame/f32/silvmil.cpp index 2d5ccf5dbbe..5e8d9ffc305 100644 --- a/src/mame/f32/silvmil.cpp +++ b/src/mame/f32/silvmil.cpp @@ -24,12 +24,13 @@ Very likely to be 'whatever crystals we had on hand which were close enough for */ #include "emu.h" +#include "decospr.h" + #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "sound/ymopm.h" -#include "video/decospr.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/fairch/channelf.cpp b/src/mame/fairch/channelf.cpp index 2823d98b96e..4b31216ea4a 100644 --- a/src/mame/fairch/channelf.cpp +++ b/src/mame/fairch/channelf.cpp @@ -19,7 +19,7 @@ ******************************************************************/ #include "emu.h" -#include "includes/channelf.h" +#include "channelf.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/fairch/channelf.h b/src/mame/fairch/channelf.h index be0612cfb31..393490af2a3 100644 --- a/src/mame/fairch/channelf.h +++ b/src/mame/fairch/channelf.h @@ -11,7 +11,7 @@ #pragma once #include "cpu/f8/f8.h" -#include "audio/channelf.h" +#include "channelf_a.h" #include "bus/chanf/slot.h" #include "bus/chanf/rom.h" diff --git a/src/mame/fairch/channelf_a.cpp b/src/mame/fairch/channelf_a.cpp index ec4971d35df..bd1dbe765f1 100644 --- a/src/mame/fairch/channelf_a.cpp +++ b/src/mame/fairch/channelf_a.cpp @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Juergen Buchmueller, Frank Palazzolo, Sean Riddle #include "emu.h" -#include "audio/channelf.h" +#include "channelf_a.h" #define MAX_AMPLITUDE 0x7fff diff --git a/src/mame/fairch/channelf_v.cpp b/src/mame/fairch/channelf_v.cpp index 2b4c77914b6..c7b2d06bdee 100644 --- a/src/mame/fairch/channelf_v.cpp +++ b/src/mame/fairch/channelf_v.cpp @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Juergen Buchmueller, Frank Palazzolo, Sean Riddle #include "emu.h" -#include "includes/channelf.h" +#include "channelf.h" static constexpr rgb_t channelf_pens[] = { diff --git a/src/mame/fairlight/cmi.cpp b/src/mame/fairlight/cmi.cpp index aaecd61bb13..23d8873e332 100644 --- a/src/mame/fairlight/cmi.cpp +++ b/src/mame/fairlight/cmi.cpp @@ -78,9 +78,9 @@ #include "emu.h" -#include "audio/cmi01a.h" -#include "machine/cmi_ankbd.h" -#include "machine/cmi_mkbd.h" +#include "cmi01a.h" +#include "cmi_ankbd.h" +#include "cmi_mkbd.h" #include "bus/midi/midi.h" diff --git a/src/mame/fairlight/cmi01a.cpp b/src/mame/fairlight/cmi01a.cpp index 786d3f38048..105a535a2a9 100644 --- a/src/mame/fairlight/cmi01a.cpp +++ b/src/mame/fairlight/cmi01a.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/cmi01a.h" +#include "cmi01a.h" #define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/falco/falco500.cpp b/src/mame/falco/falco500.cpp index 1bb4136587b..89c31360a90 100644 --- a/src/mame/falco/falco500.cpp +++ b/src/mame/falco/falco500.cpp @@ -81,7 +81,7 @@ #include "cpu/z80/z80.h" #include "machine/bankdev.h" #include "machine/clock.h" -#include "machine/f5220_kbd.h" +#include "f5220_kbd.h" #include "machine/nvram.h" #include "machine/z80ctc.h" #include "machine/z80sio.h" diff --git a/src/mame/fidelity/fidel_as12.cpp b/src/mame/fidelity/fidel_as12.cpp index 3dd4f04f925..106d79a4240 100644 --- a/src/mame/fidelity/fidel_as12.cpp +++ b/src/mame/fidelity/fidel_as12.cpp @@ -16,7 +16,7 @@ magnetic chess board sensors. See fidel_sc12.cpp for a more technical descriptio ******************************************************************************/ #include "emu.h" -#include "machine/fidel_clockdiv.h" +#include "fidel_clockdiv.h" #include "bus/generic/carts.h" #include "bus/generic/slot.h" diff --git a/src/mame/fidelity/fidel_clockdiv.cpp b/src/mame/fidelity/fidel_clockdiv.cpp index 77fd9de9b16..fcd0192a467 100644 --- a/src/mame/fidelity/fidel_clockdiv.cpp +++ b/src/mame/fidelity/fidel_clockdiv.cpp @@ -15,7 +15,7 @@ TODO: ******************************************************************************/ #include "emu.h" -#include "machine/fidel_clockdiv.h" +#include "fidel_clockdiv.h" // machine start diff --git a/src/mame/fidelity/fidel_elite.cpp b/src/mame/fidelity/fidel_elite.cpp index 4b09d381f51..894805bed6c 100644 --- a/src/mame/fidelity/fidel_elite.cpp +++ b/src/mame/fidelity/fidel_elite.cpp @@ -59,7 +59,7 @@ uninteresting to emulate as separate drivers. ******************************************************************************/ #include "emu.h" -#include "machine/fidel_clockdiv.h" +#include "fidel_clockdiv.h" #include "bus/generic/carts.h" #include "bus/generic/slot.h" diff --git a/src/mame/fidelity/fidel_sc12.cpp b/src/mame/fidelity/fidel_sc12.cpp index 45d4d8da342..f6bbc9d084b 100644 --- a/src/mame/fidelity/fidel_sc12.cpp +++ b/src/mame/fidelity/fidel_sc12.cpp @@ -45,7 +45,7 @@ If control Q4 is set, printer data can be read from I0. ******************************************************************************/ #include "emu.h" -#include "machine/fidel_clockdiv.h" +#include "fidel_clockdiv.h" #include "bus/generic/carts.h" #include "bus/generic/slot.h" diff --git a/src/mame/fujitsu/fm7.cpp b/src/mame/fujitsu/fm7.cpp index ee8ce06f813..61bf8f427c8 100644 --- a/src/mame/fujitsu/fm7.cpp +++ b/src/mame/fujitsu/fm7.cpp @@ -38,7 +38,7 @@ ************************************************************************************************/ #include "emu.h" -#include "includes/fm7.h" +#include "fm7.h" #include "cpu/m6809/m6809.h" #include "cpu/i86/i86.h" diff --git a/src/mame/fujitsu/fm7_v.cpp b/src/mame/fujitsu/fm7_v.cpp index 69567c85688..b25b736c767 100644 --- a/src/mame/fujitsu/fm7_v.cpp +++ b/src/mame/fujitsu/fm7_v.cpp @@ -7,7 +7,7 @@ */ #include "emu.h" -#include "includes/fm7.h" +#include "fm7.h" #include "cpu/m6809/m6809.h" #include "screen.h" diff --git a/src/mame/fujitsu/fmtowns.cpp b/src/mame/fujitsu/fmtowns.cpp index eaf43755706..59e5829e3ad 100644 --- a/src/mame/fujitsu/fmtowns.cpp +++ b/src/mame/fujitsu/fmtowns.cpp @@ -231,7 +231,7 @@ Notes: */ #include "emu.h" -#include "includes/fmtowns.h" +#include "fmtowns.h" #include "bus/scsi/scsi.h" #include "bus/scsi/scsihd.h" diff --git a/src/mame/fujitsu/fmtowns.h b/src/mame/fujitsu/fmtowns.h index 3d41c7cccec..b08afb95d1d 100644 --- a/src/mame/fujitsu/fmtowns.h +++ b/src/mame/fujitsu/fmtowns.h @@ -9,7 +9,7 @@ #include "imagedev/chd_cd.h" #include "imagedev/floppy.h" #include "machine/fm_scsi.h" -#include "machine/fmt_icmem.h" +#include "fmt_icmem.h" #include "machine/nvram.h" #include "machine/pic8259.h" #include "machine/pit8253.h" diff --git a/src/mame/fujitsu/fmtowns_v.cpp b/src/mame/fujitsu/fmtowns_v.cpp index 268ea13dd6a..f93026156d3 100644 --- a/src/mame/fujitsu/fmtowns_v.cpp +++ b/src/mame/fujitsu/fmtowns_v.cpp @@ -91,7 +91,7 @@ */ #include "emu.h" -#include "includes/fmtowns.h" +#include "fmtowns.h" #include "machine/pic8259.h" #include "machine/ram.h" diff --git a/src/mame/funtech/supracan.cpp b/src/mame/funtech/supracan.cpp index 4f2e218dff9..53224ccfc30 100644 --- a/src/mame/funtech/supracan.cpp +++ b/src/mame/funtech/supracan.cpp @@ -80,7 +80,7 @@ DEBUG TRICKS: #include "cpu/m6502/m6502.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" -#include "audio/acan.h" +#include "acan.h" #include "emupal.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/funworld/4roses.cpp b/src/mame/funworld/4roses.cpp index 43dd8810110..0c946ced9c1 100644 --- a/src/mame/funworld/4roses.cpp +++ b/src/mame/funworld/4roses.cpp @@ -173,7 +173,7 @@ #include "emu.h" -#include "includes/funworld.h" +#include "funworld.h" #include "cpu/m6502/m65c02.h" #include "machine/nvram.h" diff --git a/src/mame/funworld/funworld.cpp b/src/mame/funworld/funworld.cpp index b14dc5d9e68..30b9ea3dd1d 100644 --- a/src/mame/funworld/funworld.cpp +++ b/src/mame/funworld/funworld.cpp @@ -744,7 +744,7 @@ ****************************************************************************************/ #include "emu.h" -#include "includes/funworld.h" +#include "funworld.h" #include "cpu/m6502/m65sc02.h" #include "cpu/m6502/r65c02.h" diff --git a/src/mame/funworld/funworld_v.cpp b/src/mame/funworld/funworld_v.cpp index 90efd4d8351..092cf6a6f8a 100644 --- a/src/mame/funworld/funworld_v.cpp +++ b/src/mame/funworld/funworld_v.cpp @@ -47,7 +47,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/funworld.h" +#include "funworld.h" void funworld_state::funworld_palette(palette_device &palette) const diff --git a/src/mame/funworld/photoply.cpp b/src/mame/funworld/photoply.cpp index ceadf4a083e..61d9f4ebada 100644 --- a/src/mame/funworld/photoply.cpp +++ b/src/mame/funworld/photoply.cpp @@ -21,14 +21,18 @@ TODO: *******************************************************************************************************/ #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "machine/eepromser.h" #include "machine/lpci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" #include "machine/idectrl.h" #include "video/clgd542x.h" +namespace { + class photoply_state : public pcat_base_state { public: @@ -604,6 +608,9 @@ ROM_START(photoply2k4) DISK_IMAGE( "pp2004", 0, SHA1(a3f8861cf91cf7e7446ec931f812e774ada20802) ) ROM_END +} // anonymous namespace + + GAME( 1998, photoply98sp, 0, photoply, photoply, photoply_state, empty_init, ROT0, "Funworld", "Photo Play 1998 (Spain)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_UNEMULATED_PROTECTION ) GAME( 1999, photoply99sp, 0, photoply_dx4_100, photoply, photoply_state, empty_init, ROT0, "Funworld", "Photo Play 1999 (Spain)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_UNEMULATED_PROTECTION ) GAME( 1999, photoply99nl, photoply99sp, photoply_dx4_100, photoply, photoply_state, empty_init, ROT0, "Funworld", "Photo Play 1999 (Netherlands)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_UNEMULATED_PROTECTION ) diff --git a/src/mame/funworld/snookr10.cpp b/src/mame/funworld/snookr10.cpp index 6a616fdda12..38982c61768 100644 --- a/src/mame/funworld/snookr10.cpp +++ b/src/mame/funworld/snookr10.cpp @@ -617,7 +617,7 @@ #include "emu.h" -#include "includes/snookr10.h" +#include "snookr10.h" #include "cpu/m6502/m65sc02.h" #include "machine/nvram.h" diff --git a/src/mame/funworld/snookr10_v.cpp b/src/mame/funworld/snookr10_v.cpp index 572ff966a30..3b1de94af9f 100644 --- a/src/mame/funworld/snookr10_v.cpp +++ b/src/mame/funworld/snookr10_v.cpp @@ -30,7 +30,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/snookr10.h" +#include "snookr10.h" void snookr10_state::snookr10_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/fuuki/fuukifg2.cpp b/src/mame/fuuki/fuukifg2.cpp index 087df8ac464..d83d4e92f63 100644 --- a/src/mame/fuuki/fuukifg2.cpp +++ b/src/mame/fuuki/fuukifg2.cpp @@ -46,7 +46,7 @@ To Do: ***************************************************************************/ #include "emu.h" -#include "includes/fuukifg2.h" +#include "fuukifg2.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/fuuki/fuukifg2.h b/src/mame/fuuki/fuukifg2.h index 6565c367c8c..e5e5be3b718 100644 --- a/src/mame/fuuki/fuukifg2.h +++ b/src/mame/fuuki/fuukifg2.h @@ -7,7 +7,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" -#include "video/fuukifg.h" +#include "fuukifg.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/fuuki/fuukifg2_v.cpp b/src/mame/fuuki/fuukifg2_v.cpp index e8f67e76542..553333677b1 100644 --- a/src/mame/fuuki/fuukifg2_v.cpp +++ b/src/mame/fuuki/fuukifg2_v.cpp @@ -27,7 +27,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/fuukifg2.h" +#include "fuukifg2.h" /*************************************************************************** diff --git a/src/mame/fuuki/fuukifg3.cpp b/src/mame/fuuki/fuukifg3.cpp index bcb2c1c808e..8260def7c62 100644 --- a/src/mame/fuuki/fuukifg3.cpp +++ b/src/mame/fuuki/fuukifg3.cpp @@ -164,7 +164,7 @@ There is an Asura Buster known to exist on a FG3-SUB-EP containing all EPROMs ***************************************************************************/ #include "emu.h" -#include "includes/fuukifg3.h" +#include "fuukifg3.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/fuuki/fuukifg3.h b/src/mame/fuuki/fuukifg3.h index 5bce3f0ea9b..59900aab6b7 100644 --- a/src/mame/fuuki/fuukifg3.h +++ b/src/mame/fuuki/fuukifg3.h @@ -5,7 +5,7 @@ #pragma once -#include "video/fuukifg.h" +#include "fuukifg.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/fuuki/fuukifg3_v.cpp b/src/mame/fuuki/fuukifg3_v.cpp index 7709e19a815..6c9bec8c064 100644 --- a/src/mame/fuuki/fuukifg3_v.cpp +++ b/src/mame/fuuki/fuukifg3_v.cpp @@ -30,7 +30,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/fuukifg3.h" +#include "fuukifg3.h" /*************************************************************************** diff --git a/src/mame/gaelco/blmbycar.cpp b/src/mame/gaelco/blmbycar.cpp index 12e1ee5e1a4..55a4bf74bcc 100644 --- a/src/mame/gaelco/blmbycar.cpp +++ b/src/mame/gaelco/blmbycar.cpp @@ -28,7 +28,7 @@ Check game speed, it depends on a bit we toggle.. ***************************************************************************/ #include "emu.h" -#include "includes/blmbycar.h" +#include "blmbycar.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" diff --git a/src/mame/gaelco/blmbycar.h b/src/mame/gaelco/blmbycar.h index e8b54aa1174..bdda69de237 100644 --- a/src/mame/gaelco/blmbycar.h +++ b/src/mame/gaelco/blmbycar.h @@ -6,7 +6,7 @@ ***************************************************************************/ -#include "video/gaelco_wrally_sprites.h" +#include "gaelco_wrally_sprites.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/gaelco/blmbycar_v.cpp b/src/mame/gaelco/blmbycar_v.cpp index fd56b17c866..cc4f4c8986d 100644 --- a/src/mame/gaelco/blmbycar_v.cpp +++ b/src/mame/gaelco/blmbycar_v.cpp @@ -31,7 +31,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "emu.h" -#include "includes/blmbycar.h" +#include "blmbycar.h" #include "screen.h" diff --git a/src/mame/gaelco/gaelco.cpp b/src/mame/gaelco/gaelco.cpp index 081a24c57c2..69aa5f08bad 100644 --- a/src/mame/gaelco/gaelco.cpp +++ b/src/mame/gaelco/gaelco.cpp @@ -91,7 +91,7 @@ Year Game PCB NOTES ***************************************************************************/ #include "emu.h" -#include "includes/gaelco.h" +#include "gaelco.h" #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/gaelco/gaelco.h b/src/mame/gaelco/gaelco.h index 4ac88b2d37e..47c1738b9a4 100644 --- a/src/mame/gaelco/gaelco.h +++ b/src/mame/gaelco/gaelco.h @@ -8,7 +8,7 @@ #include "machine/gen_latch.h" #include "machine/74259.h" -#include "machine/gaelcrpt.h" +#include "gaelcrpt.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/gaelco/gaelco2.cpp b/src/mame/gaelco/gaelco2.cpp index 51dc2c9f610..8494e37fb30 100644 --- a/src/mame/gaelco/gaelco2.cpp +++ b/src/mame/gaelco/gaelco2.cpp @@ -35,9 +35,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gaelco2.h" +#include "gaelco2.h" -#include "machine/gaelco_ds5002fp.h" +#include "gaelco_ds5002fp.h" #include "cpu/mcs51/mcs51.h" #include "machine/eepromser.h" diff --git a/src/mame/gaelco/gaelco2_m.cpp b/src/mame/gaelco/gaelco2_m.cpp index 5d8c121a710..86010953b73 100644 --- a/src/mame/gaelco/gaelco2_m.cpp +++ b/src/mame/gaelco/gaelco2_m.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gaelco2.h" +#include "gaelco2.h" #include "machine/eepromser.h" #include "chd.h" diff --git a/src/mame/gaelco/gaelco2_v.cpp b/src/mame/gaelco/gaelco2_v.cpp index 4f0cb75a76a..e98d47bccac 100644 --- a/src/mame/gaelco/gaelco2_v.cpp +++ b/src/mame/gaelco/gaelco2_v.cpp @@ -79,7 +79,7 @@ Multi monitor notes: ***************************************************************************/ #include "emu.h" -#include "includes/gaelco2.h" +#include "gaelco2.h" #include "screen.h" diff --git a/src/mame/gaelco/gaelco3d.cpp b/src/mame/gaelco/gaelco3d.cpp index 7a71718a080..a6b058db91c 100644 --- a/src/mame/gaelco/gaelco3d.cpp +++ b/src/mame/gaelco/gaelco3d.cpp @@ -146,7 +146,7 @@ REF. 970429 **************************************************************************/ #include "emu.h" -#include "includes/gaelco3d.h" +#include "gaelco3d.h" #include "cpu/m68000/m68000.h" #include "emupal.h" diff --git a/src/mame/gaelco/gaelco3d.h b/src/mame/gaelco/gaelco3d.h index 100f824065e..4b9918d8cbe 100644 --- a/src/mame/gaelco/gaelco3d.h +++ b/src/mame/gaelco/gaelco3d.h @@ -16,7 +16,7 @@ #include "cpu/tms32031/tms32031.h" #include "machine/74259.h" #include "machine/eepromser.h" -#include "machine/gaelco3d.h" +#include "gaelco3d_m.h" #include "machine/gen_latch.h" #include "machine/timer.h" #include "sound/dmadac.h" diff --git a/src/mame/gaelco/gaelco3d_m.cpp b/src/mame/gaelco/gaelco3d_m.cpp index a2d195782c1..6edc2d15ff2 100644 --- a/src/mame/gaelco/gaelco3d_m.cpp +++ b/src/mame/gaelco/gaelco3d_m.cpp @@ -29,7 +29,7 @@ ***************************************************************************/ #include "emu.h" -#include "gaelco3d.h" +#include "gaelco3d_m.h" //#define SHARED_MEM_DRIVER (1) diff --git a/src/mame/gaelco/gaelco3d_v.cpp b/src/mame/gaelco/gaelco3d_v.cpp index fc2a0b2fdeb..78e70f37a9a 100644 --- a/src/mame/gaelco/gaelco3d_v.cpp +++ b/src/mame/gaelco/gaelco3d_v.cpp @@ -9,7 +9,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/gaelco3d.h" +#include "gaelco3d.h" #include "cpu/tms32031/tms32031.h" #include "video/rgbutil.h" diff --git a/src/mame/gaelco/gaelco_ds5002fp.cpp b/src/mame/gaelco/gaelco_ds5002fp.cpp index cd7e64123f6..ca19f2ed2a2 100644 --- a/src/mame/gaelco/gaelco_ds5002fp.cpp +++ b/src/mame/gaelco/gaelco_ds5002fp.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood #include "emu.h" -#include "machine/gaelco_ds5002fp.h" +#include "gaelco_ds5002fp.h" #include "cpu/mcs51/mcs51.h" #include "machine/nvram.h" diff --git a/src/mame/gaelco/gaelco_v.cpp b/src/mame/gaelco/gaelco_v.cpp index 4b6fba30585..c2498b15bb0 100644 --- a/src/mame/gaelco/gaelco_v.cpp +++ b/src/mame/gaelco/gaelco_v.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gaelco.h" +#include "gaelco.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/gaelco/glass.cpp b/src/mame/gaelco/glass.cpp index 231612f2e53..c39d42ae16e 100644 --- a/src/mame/gaelco/glass.cpp +++ b/src/mame/gaelco/glass.cpp @@ -12,9 +12,9 @@ Todo: ***************************************************************************/ #include "emu.h" -#include "includes/glass.h" +#include "glass.h" -#include "machine/gaelco_ds5002fp.h" +#include "gaelco_ds5002fp.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" #include "sound/okim6295.h" diff --git a/src/mame/gaelco/glass_v.cpp b/src/mame/gaelco/glass_v.cpp index c20835ac0f6..da6a6b6ceec 100644 --- a/src/mame/gaelco/glass_v.cpp +++ b/src/mame/gaelco/glass_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/glass.h" +#include "glass.h" /*************************************************************************** diff --git a/src/mame/gaelco/splash.cpp b/src/mame/gaelco/splash.cpp index f5be982e578..f77d91f2a82 100644 --- a/src/mame/gaelco/splash.cpp +++ b/src/mame/gaelco/splash.cpp @@ -46,7 +46,7 @@ More notes about Funny Strip protection issues at the bottom of source file (ini ***************************************************************************/ #include "emu.h" -#include "includes/splash.h" +#include "splash.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/gaelco/splash_v.cpp b/src/mame/gaelco/splash_v.cpp index fb8264a6780..de7798f7b93 100644 --- a/src/mame/gaelco/splash_v.cpp +++ b/src/mame/gaelco/splash_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/splash.h" +#include "splash.h" /*************************************************************************** diff --git a/src/mame/gaelco/targeth.cpp b/src/mame/gaelco/targeth.cpp index a88e6bf1f8e..b5832a885aa 100644 --- a/src/mame/gaelco/targeth.cpp +++ b/src/mame/gaelco/targeth.cpp @@ -64,9 +64,9 @@ DS5002FP Box contains: ***************************************************************************/ #include "emu.h" -#include "includes/targeth.h" +#include "targeth.h" -#include "machine/gaelco_ds5002fp.h" +#include "gaelco_ds5002fp.h" #include "cpu/mcs51/mcs51.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" diff --git a/src/mame/gaelco/targeth_v.cpp b/src/mame/gaelco/targeth_v.cpp index d86ddbee927..9620ef5c61b 100644 --- a/src/mame/gaelco/targeth_v.cpp +++ b/src/mame/gaelco/targeth_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/targeth.h" +#include "targeth.h" /*************************************************************************** diff --git a/src/mame/gaelco/thoop2.cpp b/src/mame/gaelco/thoop2.cpp index 33b6d045ebd..485125d6360 100644 --- a/src/mame/gaelco/thoop2.cpp +++ b/src/mame/gaelco/thoop2.cpp @@ -55,9 +55,9 @@ Measurements from actual PCB: ***************************************************************************/ #include "emu.h" -#include "includes/thoop2.h" +#include "thoop2.h" -#include "machine/gaelco_ds5002fp.h" +#include "gaelco_ds5002fp.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" diff --git a/src/mame/gaelco/thoop2_v.cpp b/src/mame/gaelco/thoop2_v.cpp index debb6007d94..5d4c4e6e05b 100644 --- a/src/mame/gaelco/thoop2_v.cpp +++ b/src/mame/gaelco/thoop2_v.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/thoop2.h" +#include "thoop2.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/gaelco/wrally.cpp b/src/mame/gaelco/wrally.cpp index 766b50285ba..bffaa300a3f 100644 --- a/src/mame/gaelco/wrally.cpp +++ b/src/mame/gaelco/wrally.cpp @@ -125,9 +125,9 @@ The PCB has a layout that can either use the 4 rom set of I7, I9, I11 & I13 or l ***************************************************************************/ #include "emu.h" -#include "includes/wrally.h" +#include "wrally.h" -#include "machine/gaelco_ds5002fp.h" +#include "gaelco_ds5002fp.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" diff --git a/src/mame/gaelco/wrally.h b/src/mame/gaelco/wrally.h index 25be846ffff..15da782b68f 100644 --- a/src/mame/gaelco/wrally.h +++ b/src/mame/gaelco/wrally.h @@ -6,8 +6,8 @@ #pragma once #include "machine/74259.h" -#include "machine/gaelcrpt.h" -#include "video/gaelco_wrally_sprites.h" +#include "gaelcrpt.h" +#include "gaelco_wrally_sprites.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/gaelco/wrally_v.cpp b/src/mame/gaelco/wrally_v.cpp index f908e0fbac9..1d6b62d50bd 100644 --- a/src/mame/gaelco/wrally_v.cpp +++ b/src/mame/gaelco/wrally_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/wrally.h" +#include "wrally.h" /*************************************************************************** diff --git a/src/mame/gaelco/xorworld.cpp b/src/mame/gaelco/xorworld.cpp index 974cde61906..fdb362255d7 100644 --- a/src/mame/gaelco/xorworld.cpp +++ b/src/mame/gaelco/xorworld.cpp @@ -30,7 +30,7 @@ EEPROM chip: 93C46 ***************************************************************************/ #include "emu.h" -#include "includes/xorworld.h" +#include "xorworld.h" #include "cpu/m68000/m68000.h" #include "machine/74259.h" diff --git a/src/mame/gaelco/xorworld_v.cpp b/src/mame/gaelco/xorworld_v.cpp index f8dae49ec93..5cd8fed5647 100644 --- a/src/mame/gaelco/xorworld_v.cpp +++ b/src/mame/gaelco/xorworld_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia #include "emu.h" -#include "includes/xorworld.h" +#include "xorworld.h" /*************************************************************************** diff --git a/src/mame/galaxian/dambustr.cpp b/src/mame/galaxian/dambustr.cpp index f0d48403fa7..7efb12fa2fe 100644 --- a/src/mame/galaxian/dambustr.cpp +++ b/src/mame/galaxian/dambustr.cpp @@ -51,8 +51,8 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "emu.h" -#include "includes/galaxold.h" -#include "audio/galaxian.h" +#include "galaxold.h" +#include "galaxian_a.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/galaxian/fastfred.cpp b/src/mame/galaxian/fastfred.cpp index 0427e91e830..ed52f16697c 100644 --- a/src/mame/galaxian/fastfred.cpp +++ b/src/mame/galaxian/fastfred.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/fastfred.h" +#include "fastfred.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/galaxian/fastfred.h b/src/mame/galaxian/fastfred.h index e61fd21339a..3b1c075ae1f 100644 --- a/src/mame/galaxian/fastfred.h +++ b/src/mame/galaxian/fastfred.h @@ -6,13 +6,15 @@ driver by Zsolt Vasvari ***************************************************************************/ -#ifndef MAME_INCLUDES_FASTFRED_H -#define MAME_INCLUDES_FASTFRED_H +#ifndef MAME_GALAXIAN_FASTFRED_H +#define MAME_GALAXIAN_FASTFRED_H #pragma once +#include "galaxold.h" + #include "machine/74259.h" -#include "includes/galaxold.h" + #include "tilemap.h" class fastfred_state : public galaxold_state @@ -106,4 +108,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_FASTFRED_H +#endif // MAME_GALAXIAN_FASTFRED_H diff --git a/src/mame/galaxian/fastfred_v.cpp b/src/mame/galaxian/fastfred_v.cpp index 5594131f0af..bd757ba207e 100644 --- a/src/mame/galaxian/fastfred_v.cpp +++ b/src/mame/galaxian/fastfred_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/fastfred.h" +#include "fastfred.h" diff --git a/src/mame/galaxian/galaxian.cpp b/src/mame/galaxian/galaxian.cpp index 24787e32547..52de834c087 100644 --- a/src/mame/galaxian/galaxian.cpp +++ b/src/mame/galaxian/galaxian.cpp @@ -719,13 +719,13 @@ TODO: - streakng/ghostmun: $4800-4bff - smooncrs : fix read/writes at/to unmapped memory (when player 2, "cocktail" mode) + fix the ?#! bug with "bullets" (when player 2, "cocktail" mode) - timefgtr : missing player bullets, sprite ROM extend(see later levels), sound is too slow, some sprites missing -- zigzag : full Dip Switches and Inputs -- zigzag2 : full Dip Switches and Inputs -- jumpbug : full Dip Switches and Inputs - missing possible discrete sounds -- jumpbugb : full Dip Switches and Inputs - missing possible discrete sounds -- levers : full Dip Switches and Inputs -- kingball : full Dip Switches and Inputs -- kingbalj : full Dip Switches and Inputs +- zigzag : full DIP Switches and Inputs +- zigzag2 : full DIP Switches and Inputs +- jumpbug : full DIP Switches and Inputs - missing possible discrete sounds +- jumpbugb : full DIP Switches and Inputs - missing possible discrete sounds +- levers : full DIP Switches and Inputs +- kingball : full DIP Switches and Inputs +- kingbalj : full DIP Switches and Inputs - frogg : fix read/writes at/to unmapped/wrong memory - scprpng : fix read/writes at/to unmapped/wrong memory - scorpion : check whether konami filters are used @@ -734,10 +734,11 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/galaxian.h" -#include "audio/cclimber.h" -#include "audio/galaxian.h" +#include "galaxian.h" +#include "galaxian_a.h" + +#include "cclimber_a.h" #include "cpu/s2650/s2650.h" #include "cpu/z80/z80.h" @@ -747,7 +748,7 @@ TODO: #include "screen.h" #include "speaker.h" -#include "audio/nl_konami.h" +#include "nl_konami.h" /************************************* diff --git a/src/mame/galaxian/galaxian_a.cpp b/src/mame/galaxian/galaxian_a.cpp index 18fc0c32d3b..ef7486a29f5 100644 --- a/src/mame/galaxian/galaxian_a.cpp +++ b/src/mame/galaxian/galaxian_a.cpp @@ -23,8 +23,8 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "audio/galaxian.h" -#include "includes/galaxian.h" +#include "galaxian_a.h" +#include "galaxian.h" #include "speaker.h" /************************************* diff --git a/src/mame/galaxian/galaxian_rockclim.cpp b/src/mame/galaxian/galaxian_rockclim.cpp index 16891e723ad..ed970816e26 100644 --- a/src/mame/galaxian/galaxian_rockclim.cpp +++ b/src/mame/galaxian/galaxian_rockclim.cpp @@ -2,7 +2,7 @@ // copyright-holders:Tomasz Slanina, David Haywood #include "emu.h" -#include "includes/galaxian.h" +#include "galaxian.h" namespace { diff --git a/src/mame/galaxian/galaxian_v.cpp b/src/mame/galaxian/galaxian_v.cpp index e94bd6f28f7..a432f16297d 100644 --- a/src/mame/galaxian/galaxian_v.cpp +++ b/src/mame/galaxian/galaxian_v.cpp @@ -214,7 +214,7 @@ H=B0: 0C,0C,0D,0D,0E,0E,0F,0F 0C,0C,2D,2D,0E,0E,2F,2F #include "emu.h" #include "video/resnet.h" -#include "includes/galaxian.h" +#include "galaxian.h" diff --git a/src/mame/galaxian/galaxold.cpp b/src/mame/galaxian/galaxold.cpp index 52d205bfb1d..caad315e73d 100644 --- a/src/mame/galaxian/galaxold.cpp +++ b/src/mame/galaxian/galaxold.cpp @@ -54,8 +54,8 @@ Stephh's notes (based on the games Z80 code and some tests) for other games : ***************************************************************************/ #include "emu.h" -#include "includes/galaxold.h" -#include "audio/galaxian.h" +#include "galaxold.h" +#include "galaxian_a.h" #include "cpu/z80/z80.h" #include "cpu/s2650/s2650.h" diff --git a/src/mame/galaxian/galaxold_m.cpp b/src/mame/galaxian/galaxold_m.cpp index c7a57bd1754..4c8421b8e5c 100644 --- a/src/mame/galaxian/galaxold_m.cpp +++ b/src/mame/galaxian/galaxold_m.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/galaxold.h" +#include "galaxold.h" uint8_t galaxold_state::hunchbkg_intack() diff --git a/src/mame/galaxian/galaxold_v.cpp b/src/mame/galaxian/galaxold_v.cpp index b2c43177759..fd10e4dacf3 100644 --- a/src/mame/galaxian/galaxold_v.cpp +++ b/src/mame/galaxian/galaxold_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/galaxold.h" +#include "galaxold.h" #define STARS_COLOR_BASE (memregion("proms")->bytes()) #define BULLETS_COLOR_BASE (STARS_COLOR_BASE + 64) diff --git a/src/mame/galaxian/scobra.cpp b/src/mame/galaxian/scobra.cpp index b99619b9e94..ab627c1e4a4 100644 --- a/src/mame/galaxian/scobra.cpp +++ b/src/mame/galaxian/scobra.cpp @@ -36,7 +36,7 @@ Notes/Tidbits: ***************************************************************************/ #include "emu.h" -#include "includes/scramble.h" +#include "scramble.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" diff --git a/src/mame/galaxian/scramble.cpp b/src/mame/galaxian/scramble.cpp index f8f8ad489db..54b89e18cbc 100644 --- a/src/mame/galaxian/scramble.cpp +++ b/src/mame/galaxian/scramble.cpp @@ -29,7 +29,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/scramble.h" +#include "scramble.h" #include "cpu/s2650/s2650.h" #include "cpu/z80/z80.h" diff --git a/src/mame/galaxian/scramble.h b/src/mame/galaxian/scramble.h index ac829c5882c..2f3306a6c83 100644 --- a/src/mame/galaxian/scramble.h +++ b/src/mame/galaxian/scramble.h @@ -1,13 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_SCRAMBLE_H -#define MAME_INCLUDES_SCRAMBLE_H +#ifndef MAME_GALAXIAN_SCRAMBLE_H +#define MAME_GALAXIAN_SCRAMBLE_H #pragma once +#include "galaxold.h" + #include "machine/gen_latch.h" #include "machine/i8255.h" -#include "includes/galaxold.h" #include "sound/digitalk.h" #include "sound/flt_rc.h" #include "sound/tms5110.h" @@ -150,4 +151,4 @@ private: std::unique_ptr m_harem_decrypted_opcodes; }; -#endif // MAME_INCLUDES_SCRAMBLE_H +#endif // MAME_GALAXIAN_SCRAMBLE_H diff --git a/src/mame/galaxian/scramble_a.cpp b/src/mame/galaxian/scramble_a.cpp index 4329d5012d1..35b11032d2e 100644 --- a/src/mame/galaxian/scramble_a.cpp +++ b/src/mame/galaxian/scramble_a.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/scramble.h" +#include "scramble.h" #include "cpu/z80/z80.h" #include "machine/7474.h" diff --git a/src/mame/galaxian/scramble_m.cpp b/src/mame/galaxian/scramble_m.cpp index bfddb25f684..da39a79e46b 100644 --- a/src/mame/galaxian/scramble_m.cpp +++ b/src/mame/galaxian/scramble_m.cpp @@ -12,7 +12,7 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" -#include "includes/scramble.h" +#include "scramble.h" MACHINE_RESET_MEMBER(scramble_state,scramble) diff --git a/src/mame/galaxy/galaxy.cpp b/src/mame/galaxy/galaxy.cpp index f1de6cadf48..d4a033356bf 100644 --- a/src/mame/galaxy/galaxy.cpp +++ b/src/mame/galaxy/galaxy.cpp @@ -28,7 +28,7 @@ ToDo: ***************************************************************************/ #include "emu.h" -#include "includes/galaxy.h" +#include "galaxy.h" #include "cpu/z80/z80.h" #include "formats/gtp_cas.h" diff --git a/src/mame/galaxy/galaxy_m.cpp b/src/mame/galaxy/galaxy_m.cpp index 987915bf2f9..e031eee0f36 100644 --- a/src/mame/galaxy/galaxy_m.cpp +++ b/src/mame/galaxy/galaxy_m.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "includes/galaxy.h" +#include "galaxy.h" /*************************************************************************** I/O devices diff --git a/src/mame/galaxy/galaxy_v.cpp b/src/mame/galaxy/galaxy_v.cpp index ba18fc8b5ac..68e061c5d1e 100644 --- a/src/mame/galaxy/galaxy_v.cpp +++ b/src/mame/galaxy/galaxy_v.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/galaxy.h" +#include "galaxy.h" #include "cpu/z80/z80.h" diff --git a/src/mame/gamepark/gp32.cpp b/src/mame/gamepark/gp32.cpp index aaafd025e63..2a84059509f 100644 --- a/src/mame/gamepark/gp32.cpp +++ b/src/mame/gamepark/gp32.cpp @@ -32,7 +32,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/gp32.h" +#include "gp32.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" diff --git a/src/mame/gameplan/gameplan.cpp b/src/mame/gameplan/gameplan.cpp index ad75cbdbbb1..a182dfd9670 100644 --- a/src/mame/gameplan/gameplan.cpp +++ b/src/mame/gameplan/gameplan.cpp @@ -75,7 +75,7 @@ TODO: ****************************************************************************/ #include "emu.h" -#include "includes/gameplan.h" +#include "gameplan.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" diff --git a/src/mame/gameplan/gameplan_v.cpp b/src/mame/gameplan/gameplan_v.cpp index e5174674689..6621e504a1d 100644 --- a/src/mame/gameplan/gameplan_v.cpp +++ b/src/mame/gameplan/gameplan_v.cpp @@ -9,7 +9,7 @@ driver by Chris Moore ****************************************************************************/ #include "emu.h" -#include "includes/gameplan.h" +#include "gameplan.h" diff --git a/src/mame/gameplan/trvquest.cpp b/src/mame/gameplan/trvquest.cpp index e14b46a3563..446a420ef27 100644 --- a/src/mame/gameplan/trvquest.cpp +++ b/src/mame/gameplan/trvquest.cpp @@ -37,12 +37,13 @@ Notes: */ #include "emu.h" -#include "includes/gameplan.h" +#include "gameplan.h" #include "cpu/m6809/m6809.h" #include "machine/6522via.h" #include "machine/nvram.h" #include "sound/ay8910.h" + #include "speaker.h" diff --git a/src/mame/gametron/gatron.cpp b/src/mame/gametron/gatron.cpp index ac428dd0e67..2fde1255a56 100644 --- a/src/mame/gametron/gatron.cpp +++ b/src/mame/gametron/gatron.cpp @@ -322,7 +322,7 @@ #include "emu.h" -#include "includes/gatron.h" +#include "gatron.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" diff --git a/src/mame/gametron/gatron_v.cpp b/src/mame/gametron/gatron_v.cpp index 2508a909d83..42ddf6874b7 100644 --- a/src/mame/gametron/gatron_v.cpp +++ b/src/mame/gametron/gatron_v.cpp @@ -20,7 +20,7 @@ #include "emu.h" -#include "includes/gatron.h" +#include "gatron.h" void gatron_state::videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/gametron/sbugger.cpp b/src/mame/gametron/sbugger.cpp index 52536def52d..915242fc29e 100644 --- a/src/mame/gametron/sbugger.cpp +++ b/src/mame/gametron/sbugger.cpp @@ -100,7 +100,7 @@ Sound PCB */ #include "emu.h" -#include "includes/sbugger.h" +#include "sbugger.h" #include "cpu/i8085/i8085.h" #include "machine/i8155.h" diff --git a/src/mame/gametron/sbugger_v.cpp b/src/mame/gametron/sbugger_v.cpp index fb32c49b745..45090fa8577 100644 --- a/src/mame/gametron/sbugger_v.cpp +++ b/src/mame/gametron/sbugger_v.cpp @@ -3,7 +3,7 @@ /* Space Bugger - Video Hardware */ #include "emu.h" -#include "includes/sbugger.h" +#include "sbugger.h" TILE_GET_INFO_MEMBER(sbugger_state::get_tile_info) { diff --git a/src/mame/gottlieb/exterm.cpp b/src/mame/gottlieb/exterm.cpp index c037bcdbe69..25d8bf59d1a 100644 --- a/src/mame/gottlieb/exterm.cpp +++ b/src/mame/gottlieb/exterm.cpp @@ -63,7 +63,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/exterm.h" +#include "exterm.h" #include "cpu/m6502/m6502.h" #include "machine/nvram.h" diff --git a/src/mame/gottlieb/exterm_v.cpp b/src/mame/gottlieb/exterm_v.cpp index 4049ab85571..044073b6db8 100644 --- a/src/mame/gottlieb/exterm_v.cpp +++ b/src/mame/gottlieb/exterm_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/exterm.h" +#include "exterm.h" /************************************* diff --git a/src/mame/gottlieb/gottlieb.cpp b/src/mame/gottlieb/gottlieb.cpp index 80058da3fc3..96ee4038043 100644 --- a/src/mame/gottlieb/gottlieb.cpp +++ b/src/mame/gottlieb/gottlieb.cpp @@ -197,7 +197,7 @@ VBlank duration: 1/VSYNC * (16/256) = 1017.6 us ***************************************************************************/ #include "emu.h" -#include "includes/gottlieb.h" +#include "gottlieb.h" #include "machine/nvram.h" #include "machine/rescap.h" diff --git a/src/mame/gottlieb/gottlieb.h b/src/mame/gottlieb/gottlieb.h index d9385698367..a979c578db3 100644 --- a/src/mame/gottlieb/gottlieb.h +++ b/src/mame/gottlieb/gottlieb.h @@ -6,7 +6,7 @@ ***************************************************************************/ -#include "audio/gottlieb.h" +#include "gottlieb_a.h" #include "cpu/i86/i86.h" #include "cpu/m6502/m6502.h" #include "sound/samples.h" diff --git a/src/mame/gottlieb/gottlieb_v.cpp b/src/mame/gottlieb/gottlieb_v.cpp index 58b7bcba6fb..98e3eff5170 100644 --- a/src/mame/gottlieb/gottlieb_v.cpp +++ b/src/mame/gottlieb/gottlieb_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gottlieb.h" +#include "gottlieb.h" #include "video/resnet.h" diff --git a/src/mame/gridcomp/gridcomp.cpp b/src/mame/gridcomp/gridcomp.cpp index a94810a1488..1f33e36ab01 100644 --- a/src/mame/gridcomp/gridcomp.cpp +++ b/src/mame/gridcomp/gridcomp.cpp @@ -68,7 +68,7 @@ #include "bus/ieee488/ieee488.h" #include "bus/rs232/rs232.h" #include "cpu/i86/i86.h" -#include "machine/gridkeyb.h" +#include "gridkeyb.h" #include "machine/i7220.h" #include "machine/i80130.h" #include "machine/i8255.h" diff --git a/src/mame/gridcomp/gridkeyb.cpp b/src/mame/gridcomp/gridkeyb.cpp index 59f4bf8529e..5614ea011a8 100644 --- a/src/mame/gridcomp/gridkeyb.cpp +++ b/src/mame/gridcomp/gridkeyb.cpp @@ -12,7 +12,7 @@ #include "emu.h" -#include "machine/gridkeyb.h" +#include "gridkeyb.h" #include "machine/keyboard.ipp" diff --git a/src/mame/grundy/newbrain.cpp b/src/mame/grundy/newbrain.cpp index 4f7c0e2ae7d..4613b6d0a33 100644 --- a/src/mame/grundy/newbrain.cpp +++ b/src/mame/grundy/newbrain.cpp @@ -49,7 +49,7 @@ */ #include "emu.h" -#include "includes/newbrain.h" +#include "newbrain.h" #include "speaker.h" #include "screen.h" diff --git a/src/mame/grundy/newbrain_v.cpp b/src/mame/grundy/newbrain_v.cpp index 1124c427603..a6e72aa047f 100644 --- a/src/mame/grundy/newbrain_v.cpp +++ b/src/mame/grundy/newbrain_v.cpp @@ -9,7 +9,7 @@ */ #include "emu.h" -#include "includes/newbrain.h" +#include "newbrain.h" #include "screen.h" #define VERBOSE 0 diff --git a/src/mame/handheld/hh_sm510.cpp b/src/mame/handheld/hh_sm510.cpp index 3ba1fa0192d..298bbdec48d 100644 --- a/src/mame/handheld/hh_sm510.cpp +++ b/src/mame/handheld/hh_sm510.cpp @@ -137,7 +137,7 @@ The MCUs used were not imported from Sharp, but cloned by USSR, renamed to ***************************************************************************/ #include "emu.h" -#include "includes/hh_sm510.h" +#include "hh_sm510.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/handheld/hh_tms1k.cpp b/src/mame/handheld/hh_tms1k.cpp index 65f5b595116..4ad3d0b2c72 100644 --- a/src/mame/handheld/hh_tms1k.cpp +++ b/src/mame/handheld/hh_tms1k.cpp @@ -193,7 +193,7 @@ on Joerg Woerner's datamath.org: http://www.datamath.org/IC_List.htm ***************************************************************************/ #include "emu.h" -#include "includes/hh_tms1k.h" +#include "hh_tms1k.h" #include "machine/clock.h" #include "machine/ds8874.h" diff --git a/src/mame/handheld/rzone.cpp b/src/mame/handheld/rzone.cpp index bdef9e0320a..abae24156fb 100644 --- a/src/mame/handheld/rzone.cpp +++ b/src/mame/handheld/rzone.cpp @@ -30,7 +30,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/hh_sm510.h" +#include "hh_sm510.h" #include "machine/timer.h" #include "screen.h" diff --git a/src/mame/handheld/tispeak.cpp b/src/mame/handheld/tispeak.cpp index ea147a69b2b..667647474f1 100644 --- a/src/mame/handheld/tispeak.cpp +++ b/src/mame/handheld/tispeak.cpp @@ -411,7 +411,7 @@ Y-1320 : T.I. Dataman ***************************************************************************/ #include "emu.h" -#include "includes/hh_tms1k.h" +#include "hh_tms1k.h" #include "bus/generic/carts.h" #include "bus/generic/slot.h" diff --git a/src/mame/handheld/tispellb.cpp b/src/mame/handheld/tispellb.cpp index ae8ecd7ab81..3826fcae96c 100644 --- a/src/mame/handheld/tispellb.cpp +++ b/src/mame/handheld/tispellb.cpp @@ -58,7 +58,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/hh_tms1k.h" +#include "hh_tms1k.h" #include "machine/tms6100.h" #include "speaker.h" diff --git a/src/mame/hds/hds200.cpp b/src/mame/hds/hds200.cpp index e9a2649cb98..7bb1327c2c0 100644 --- a/src/mame/hds/hds200.cpp +++ b/src/mame/hds/hds200.cpp @@ -32,7 +32,7 @@ #include "emu.h" -#include "machine/hds200_kbd.h" +#include "hds200_kbd.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" diff --git a/src/mame/hec2hrp/hec2hrp.cpp b/src/mame/hec2hrp/hec2hrp.cpp index 57c4a5782aa..a0a02243d10 100644 --- a/src/mame/hec2hrp/hec2hrp.cpp +++ b/src/mame/hec2hrp/hec2hrp.cpp @@ -83,7 +83,7 @@ TODO : Add cartridge functionality */ #include "emu.h" -#include "includes/hec2hrp.h" +#include "hec2hrp.h" #include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/hec2hrp/hec2hrp_m.cpp b/src/mame/hec2hrp/hec2hrp_m.cpp index 064de7de28d..fc7554a8bd3 100644 --- a/src/mame/hec2hrp/hec2hrp_m.cpp +++ b/src/mame/hec2hrp/hec2hrp_m.cpp @@ -38,7 +38,7 @@ More information: **********************************************************************************************/ #include "emu.h" -#include "includes/hec2hrp.h" +#include "hec2hrp.h" #include "cpu/z80/z80.h" diff --git a/src/mame/hec2hrp/hec2hrp_v.cpp b/src/mame/hec2hrp/hec2hrp_v.cpp index 77011d332fe..bac559a365e 100644 --- a/src/mame/hec2hrp/hec2hrp_v.cpp +++ b/src/mame/hec2hrp/hec2hrp_v.cpp @@ -6,7 +6,7 @@ #include "emu.h" -#include "includes/hec2hrp.h" +#include "hec2hrp.h" #include "screen.h" diff --git a/src/mame/hegener/mephisto_academy.cpp b/src/mame/hegener/mephisto_academy.cpp index cf7b9495cd5..439caff2368 100644 --- a/src/mame/hegener/mephisto_academy.cpp +++ b/src/mame/hegener/mephisto_academy.cpp @@ -25,8 +25,8 @@ Module PCB is the same as Super Mondial II College, label HGS 10 116 05. #include "cpu/m6502/m65c02.h" #include "machine/74259.h" #include "machine/nvram.h" -#include "machine/mmboard.h" -#include "video/mmdisplay2.h" +#include "mmboard.h" +#include "mmdisplay2.h" #include "video/pwm.h" // internal artwork diff --git a/src/mame/hegener/mephisto_amsterdam.cpp b/src/mame/hegener/mephisto_amsterdam.cpp index cf223d3c668..d8cbdba3a42 100644 --- a/src/mame/hegener/mephisto_amsterdam.cpp +++ b/src/mame/hegener/mephisto_amsterdam.cpp @@ -15,9 +15,9 @@ TODO: #include "emu.h" #include "cpu/m68000/m68000.h" -#include "machine/mmboard.h" +#include "mmboard.h" #include "sound/dac.h" -#include "video/mmdisplay1.h" +#include "mmdisplay1.h" #include "speaker.h" diff --git a/src/mame/hegener/mephisto_berlin.cpp b/src/mame/hegener/mephisto_berlin.cpp index 5a748549e9f..5a1d32073e8 100644 --- a/src/mame/hegener/mephisto_berlin.cpp +++ b/src/mame/hegener/mephisto_berlin.cpp @@ -18,8 +18,8 @@ TODO: #include "cpu/m68000/m68000.h" #include "machine/nvram.h" -#include "machine/mmboard.h" -#include "video/mmdisplay2.h" +#include "mmboard.h" +#include "mmdisplay2.h" // internal artwork #include "mephisto_berlin.lh" diff --git a/src/mame/hegener/mephisto_brikett.cpp b/src/mame/hegener/mephisto_brikett.cpp index a6bc8debf1a..492baa41c5c 100644 --- a/src/mame/hegener/mephisto_brikett.cpp +++ b/src/mame/hegener/mephisto_brikett.cpp @@ -79,7 +79,7 @@ BTANB: #include "machine/sensorboard.h" #include "machine/timer.h" #include "sound/dac.h" -#include "video/mmdisplay1.h" +#include "mmdisplay1.h" #include "video/pwm.h" #include "speaker.h" diff --git a/src/mame/hegener/mephisto_glasgow.cpp b/src/mame/hegener/mephisto_glasgow.cpp index 4070113b574..f4b79cb76de 100644 --- a/src/mame/hegener/mephisto_glasgow.cpp +++ b/src/mame/hegener/mephisto_glasgow.cpp @@ -36,9 +36,9 @@ Hardware notes: #include "emu.h" #include "cpu/m68000/m68000.h" -#include "machine/mmboard.h" +#include "mmboard.h" #include "sound/dac.h" -#include "video/mmdisplay1.h" +#include "mmdisplay1.h" #include "speaker.h" diff --git a/src/mame/hegener/mephisto_milano.cpp b/src/mame/hegener/mephisto_milano.cpp index 6e9fce53faf..3523bb4b67c 100644 --- a/src/mame/hegener/mephisto_milano.cpp +++ b/src/mame/hegener/mephisto_milano.cpp @@ -21,7 +21,7 @@ Nigel Short is basically a Milano 2.00 #include "machine/74259.h" #include "machine/nvram.h" #include "machine/sensorboard.h" -#include "video/mmdisplay2.h" +#include "mmdisplay2.h" #include "video/pwm.h" // internal artwork diff --git a/src/mame/hegener/mephisto_mm1.cpp b/src/mame/hegener/mephisto_mm1.cpp index fe0a17108fa..b7e71e50ca4 100644 --- a/src/mame/hegener/mephisto_mm1.cpp +++ b/src/mame/hegener/mephisto_mm1.cpp @@ -43,9 +43,9 @@ TODO: #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "cpu/cosmac/cosmac.h" -#include "machine/mmboard.h" +#include "mmboard.h" #include "sound/dac.h" -#include "video/mmdisplay1.h" +#include "mmdisplay1.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/hegener/mephisto_mm2.cpp b/src/mame/hegener/mephisto_mm2.cpp index 31bece547ff..efc0da63e8b 100644 --- a/src/mame/hegener/mephisto_mm2.cpp +++ b/src/mame/hegener/mephisto_mm2.cpp @@ -89,9 +89,9 @@ MM VI (Saitek, 1994) is on different hardware, H8 CPU. #include "bus/generic/carts.h" #include "cpu/m6502/r65c02.h" #include "machine/74259.h" -#include "machine/mmboard.h" +#include "mmboard.h" #include "sound/dac.h" -#include "video/mmdisplay1.h" +#include "mmdisplay1.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/hegener/mephisto_modena.cpp b/src/mame/hegener/mephisto_modena.cpp index 6d8aa72ba96..f221f9e1714 100644 --- a/src/mame/hegener/mephisto_modena.cpp +++ b/src/mame/hegener/mephisto_modena.cpp @@ -24,7 +24,7 @@ Hardware notes: #include "machine/sensorboard.h" #include "machine/timer.h" #include "sound/dac.h" -#include "video/mmdisplay1.h" +#include "mmdisplay1.h" #include "video/pwm.h" #include "speaker.h" diff --git a/src/mame/hegener/mephisto_modular.cpp b/src/mame/hegener/mephisto_modular.cpp index 5fbdb7d45fd..0c3aa1878b9 100644 --- a/src/mame/hegener/mephisto_modular.cpp +++ b/src/mame/hegener/mephisto_modular.cpp @@ -88,8 +88,8 @@ Reminder: unsupported on Almeria and Portorose 1.01, this is not a bug. #include "cpu/m68000/m68000.h" #include "machine/nvram.h" #include "machine/timer.h" -#include "machine/mmboard.h" -#include "video/mmdisplay2.h" +#include "mmboard.h" +#include "mmdisplay2.h" // internal artwork #include "mephisto_alm16.lh" // clickable diff --git a/src/mame/hegener/mephisto_modular_tm.cpp b/src/mame/hegener/mephisto_modular_tm.cpp index d31a707eaf9..cbd169e1d47 100644 --- a/src/mame/hegener/mephisto_modular_tm.cpp +++ b/src/mame/hegener/mephisto_modular_tm.cpp @@ -45,8 +45,8 @@ After boot, it copies ROM to RAM, probably to circumvent waitstates on slow ROM. #include "cpu/m68000/m68000.h" #include "machine/nvram.h" #include "machine/timer.h" -#include "machine/mmboard.h" -#include "video/mmdisplay2.h" +#include "mmboard.h" +#include "mmdisplay2.h" // internal artwork #include "mephisto_modular_tm.lh" // clickable diff --git a/src/mame/hegener/mephisto_montec.cpp b/src/mame/hegener/mephisto_montec.cpp index 4cbf8a47845..5239bbb1136 100644 --- a/src/mame/hegener/mephisto_montec.cpp +++ b/src/mame/hegener/mephisto_montec.cpp @@ -25,7 +25,7 @@ Hardware notes: #include "cpu/m6502/r65c02.h" #include "machine/74259.h" #include "machine/nvram.h" -#include "machine/mmboard.h" +#include "mmboard.h" #include "sound/dac.h" #include "video/pcf2100.h" #include "video/pwm.h" diff --git a/src/mame/hegener/mephisto_polgar.cpp b/src/mame/hegener/mephisto_polgar.cpp index 9d53f17861c..3f9aa1749ce 100644 --- a/src/mame/hegener/mephisto_polgar.cpp +++ b/src/mame/hegener/mephisto_polgar.cpp @@ -20,8 +20,8 @@ The 10MHz version has a W65C02P-8 @ 9.83MHz. #include "cpu/m6502/r65c02.h" #include "machine/74259.h" #include "machine/nvram.h" -#include "machine/mmboard.h" -#include "video/mmdisplay2.h" +#include "mmboard.h" +#include "mmdisplay2.h" // internal artwork #include "mephisto_polgar.lh" diff --git a/src/mame/hegener/mephisto_risc.cpp b/src/mame/hegener/mephisto_risc.cpp index a81e5a6fd8d..1e20f5284e9 100644 --- a/src/mame/hegener/mephisto_risc.cpp +++ b/src/mame/hegener/mephisto_risc.cpp @@ -22,9 +22,9 @@ Hardware notes: #include "cpu/m6502/m65sc02.h" #include "machine/74259.h" #include "machine/nvram.h" -#include "machine/mmboard.h" +#include "mmboard.h" #include "machine/chessmachine.h" -#include "video/mmdisplay2.h" +#include "mmdisplay2.h" // internal artwork #include "mephisto_risc.lh" diff --git a/src/mame/hp/hp2640.cpp b/src/mame/hp/hp2640.cpp index 35438955326..150921db303 100644 --- a/src/mame/hp/hp2640.cpp +++ b/src/mame/hp/hp2640.cpp @@ -109,7 +109,7 @@ #include "bus/rs232/rs232.h" #include "machine/ay31015.h" #include "machine/clock.h" -#include "machine/hp2640_tape.h" +#include "hp2640_tape.h" #include "sound/beep.h" #include "emupal.h" #include "speaker.h" diff --git a/src/mame/hp/hp48.cpp b/src/mame/hp/hp48.cpp index 85f2607f514..0862b8ed70d 100644 --- a/src/mame/hp/hp48.cpp +++ b/src/mame/hp/hp48.cpp @@ -9,7 +9,7 @@ **********************************************************************/ #include "emu.h" -#include "includes/hp48.h" +#include "hp48.h" #include "machine/nvram.h" #include "screen.h" diff --git a/src/mame/hp/hp48.h b/src/mame/hp/hp48.h index ade82d9492f..16cad569601 100644 --- a/src/mame/hp/hp48.h +++ b/src/mame/hp/hp48.h @@ -13,7 +13,7 @@ #pragma once #include "cpu/saturn/saturn.h" -#include "machine/hp48_port.h" +#include "hp48_port.h" #include "sound/dac.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/hp/hp48_m.cpp b/src/mame/hp/hp48_m.cpp index 4c0a561a78f..ebc50cdae3d 100644 --- a/src/mame/hp/hp48_m.cpp +++ b/src/mame/hp/hp48_m.cpp @@ -9,7 +9,7 @@ **********************************************************************/ #include "emu.h" -#include "includes/hp48.h" +#include "hp48.h" #include "cpu/saturn/saturn.h" #include "machine/nvram.h" diff --git a/src/mame/hp/hp48_port.cpp b/src/mame/hp/hp48_port.cpp index 7648486df67..cacc61f3297 100644 --- a/src/mame/hp/hp48_port.cpp +++ b/src/mame/hp/hp48_port.cpp @@ -9,8 +9,8 @@ **********************************************************************/ #include "emu.h" -#include "machine/hp48_port.h" -#include "includes/hp48.h" +#include "hp48_port.h" +#include "hp48.h" #include "logmacro.h" diff --git a/src/mame/hp/hp48_v.cpp b/src/mame/hp/hp48_v.cpp index 572610024ef..09d519243e4 100644 --- a/src/mame/hp/hp48_v.cpp +++ b/src/mame/hp/hp48_v.cpp @@ -9,7 +9,7 @@ **********************************************************************/ #include "emu.h" -#include "includes/hp48.h" +#include "hp48.h" /*************************************************************************** DEBUGGING diff --git a/src/mame/hp/hp80.cpp b/src/mame/hp/hp80.cpp index 68f8203c48e..de744a90076 100644 --- a/src/mame/hp/hp80.cpp +++ b/src/mame/hp/hp80.cpp @@ -79,7 +79,7 @@ #include "sound/beep.h" #include "sound/dac.h" #include "machine/1ma6.h" -#include "machine/hp80_optrom.h" +#include "hp80_optrom.h" #include "machine/ram.h" #include "softlist_dev.h" #include "machine/bankdev.h" diff --git a/src/mame/hp/hp9825.cpp b/src/mame/hp/hp9825.cpp index b4a0b5120a7..a993c318981 100644 --- a/src/mame/hp/hp9825.cpp +++ b/src/mame/hp/hp9825.cpp @@ -41,9 +41,9 @@ #include "emu.h" #include "cpu/hphybrid/hphybrid.h" #include "machine/timer.h" -#include "machine/hp9825_tape.h" -#include "machine/hp98x5_io_sys.h" -#include "machine/hp9825_optrom.h" +#include "hp9825_tape.h" +#include "hp98x5_io_sys.h" +#include "hp9825_optrom.h" #include "bus/hp9845_io/hp9845_io.h" #include "imagedev/bitbngr.h" #include "speaker.h" diff --git a/src/mame/hp/hp9845.cpp b/src/mame/hp/hp9845.cpp index 5a48ad857a6..de2df3a7c48 100644 --- a/src/mame/hp/hp9845.cpp +++ b/src/mame/hp/hp9845.cpp @@ -36,9 +36,9 @@ // - Fast LPU processor (dump of microcode PROMs is not available) #include "emu.h" -#include "includes/hp9845.h" +#include "hp9845.h" -#include "machine/hp9845_optrom.h" +#include "hp9845_optrom.h" #include "bus/hp9845_io/hp9845_io.h" #include "machine/timer.h" @@ -48,7 +48,7 @@ #include "hp9845b.lh" -#include "machine/hp9845_printer.h" +#include "hp9845_printer.h" // Debugging #define VERBOSE 0 diff --git a/src/mame/hp/hp9845.h b/src/mame/hp/hp9845.h index 2e0ac69e2e8..00217deb7fb 100644 --- a/src/mame/hp/hp9845.h +++ b/src/mame/hp/hp9845.h @@ -16,7 +16,7 @@ #include "screen.h" #include "machine/ram.h" #include "machine/timer.h" -#include "machine/hp98x5_io_sys.h" +#include "hp98x5_io_sys.h" class hp9845_base_state : public driver_device { diff --git a/src/mame/hp/hp_ipc.cpp b/src/mame/hp/hp_ipc.cpp index 3c554d83f98..962a88591f9 100644 --- a/src/mame/hp/hp_ipc.cpp +++ b/src/mame/hp/hp_ipc.cpp @@ -356,7 +356,7 @@ Software to look for ******************************************************************************/ #include "emu.h" -#include "machine/hp_ipc_optrom.h" +#include "hp_ipc_optrom.h" #include "bus/hp_hil/hil_devices.h" #include "bus/hp_hil/hp_hil.h" diff --git a/src/mame/ibm6580/ibm6580.cpp b/src/mame/ibm6580/ibm6580.cpp index 6150ad482e3..03cd1f57ac1 100644 --- a/src/mame/ibm6580/ibm6580.cpp +++ b/src/mame/ibm6580/ibm6580.cpp @@ -158,7 +158,7 @@ Notes on floppy drive: #include "machine/i8257.h" #include "machine/pic8259.h" #include "machine/pit8253.h" -#include "machine/ibm6580_kbd.h" +#include "ibm6580_kbd.h" //nclude "machine/ibm6580_fdc.h" #include "machine/ram.h" #include "machine/upd765.h" diff --git a/src/mame/ibmpc/calchase.cpp b/src/mame/ibmpc/calchase.cpp index 1bd7ca579a4..5a68b845335 100644 --- a/src/mame/ibmpc/calchase.cpp +++ b/src/mame/ibmpc/calchase.cpp @@ -132,12 +132,13 @@ something wrong in the disk geometry reported by calchase.chd (20,255,63) since #include "emu.h" +#include "pcshare.h" + #include "bus/isa/trident.h" #include "cpu/i386/i386.h" #include "machine/lpci.h" #include "machine/pckeybrd.h" #include "machine/idectrl.h" -#include "machine/pcshare.h" #include "machine/ds128x.h" #include "machine/nvram.h" #include "sound/dac.h" diff --git a/src/mame/ibmpc/fruitpc.cpp b/src/mame/ibmpc/fruitpc.cpp index fc09ea7b8c3..b8fd10fdef2 100644 --- a/src/mame/ibmpc/fruitpc.cpp +++ b/src/mame/ibmpc/fruitpc.cpp @@ -20,14 +20,18 @@ =====================================================================================*/ #include "emu.h" +#include "pcshare.h" + +#include "bus/isa/isa.h" +#include "bus/isa/sblaster.h" #include "cpu/i386/i386.h" +#include "machine/idectrl.h" #include "machine/pci.h" #include "machine/pckeybrd.h" -#include "machine/idectrl.h" #include "video/pc_vga.h" -#include "machine/pcshare.h" -#include "bus/isa/isa.h" -#include "bus/isa/sblaster.h" + + +namespace { class fruitpc_state : public pcat_base_state { @@ -170,4 +174,7 @@ ROM_START( fruitpc ) DISK_IMAGE( "fruit", 0,SHA1(df250ff06a97fa141a4144034f7035ac2947c53c) ) ROM_END +} // anonymous namespace + + GAME( 2006, fruitpc, 0, fruitpc, fruitpc, fruitpc_state, empty_init, ROT0, "", "Fruit Land", MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/ibmpc/pangofun.cpp b/src/mame/ibmpc/pangofun.cpp index 7987ce994b5..3dfaf4e9843 100644 --- a/src/mame/ibmpc/pangofun.cpp +++ b/src/mame/ibmpc/pangofun.cpp @@ -98,12 +98,16 @@ Arcade Version (Coin-Op) by InfoCube (Pisa, Italy) **************************************************************************************************/ #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" -#include "machine/pcshare.h" #include "video/pc_vga.h" #include "screen.h" +namespace { + class pangofun_state : public pcat_base_state { public: @@ -202,4 +206,7 @@ void pangofun_state::init_pangofun() { } +} // anonymous namespace + + GAME( 1995, pangofun, 0, pangofun, pangofun, pangofun_state, init_pangofun, ROT0, "InfoCube", "Pango Fun (Italy)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) diff --git a/src/mame/ibmpc/paokaipc.cpp b/src/mame/ibmpc/paokaipc.cpp index 7423a2aa1d4..ca24b71fd75 100644 --- a/src/mame/ibmpc/paokaipc.cpp +++ b/src/mame/ibmpc/paokaipc.cpp @@ -23,14 +23,18 @@ **************************************************************************************************/ #include "emu.h" + +#include "pcshare.h" + +#include "bus/isa/isa.h" +#include "bus/isa/sblaster.h" #include "cpu/i386/i386.h" +#include "machine/idectrl.h" #include "machine/pci.h" #include "machine/pckeybrd.h" -#include "machine/idectrl.h" #include "video/pc_vga.h" -#include "machine/pcshare.h" -#include "bus/isa/isa.h" -#include "bus/isa/sblaster.h" + +namespace { class paokaipc_state : public pcat_base_state { @@ -121,4 +125,6 @@ ROM_START( gogostrk ) DISK_IMAGE( "ggs-5-2-07", 0,SHA1(f214fd39ec8ac02f008823f4b179ea6c6835e1b8) ) ROM_END +} // anonymous namespace + GAME( 2007?, gogostrk, 0, paokaipc, gogostrk, paokaipc_state, empty_init, ROT0, "American Alpha / Paokai", "Go Go Strike", MACHINE_IS_SKELETON ) // motherboard is dated 2006, if the CF card string is a date it's 2007 diff --git a/src/mame/ibmpc/pcat_dyn.cpp b/src/mame/ibmpc/pcat_dyn.cpp index ebb18989fb8..f8b9f702a47 100644 --- a/src/mame/ibmpc/pcat_dyn.cpp +++ b/src/mame/ibmpc/pcat_dyn.cpp @@ -22,8 +22,9 @@ If the output isn't satisfactory, it prints "I/O BOARD FAILURE". #include "emu.h" +#include "pcshare.h" + #include "cpu/i386/i386.h" -#include "machine/pcshare.h" #include "machine/bankdev.h" #include "machine/ds128x.h" #include "machine/ins8250.h" @@ -38,6 +39,7 @@ If the output isn't satisfactory, it prints "I/O BOARD FAILURE". #include "screen.h" +namespace { class pcat_dyn_state : public pcat_base_state { @@ -277,6 +279,8 @@ ROM_START(toursol1) ROM_LOAD("rtc", 0, 128, BAD_DUMP CRC(732f64c8) SHA1(5386eac3afef9b16af8dd7766e577f7ac700d9cc)) ROM_END +} // anonymous namespace + GAME( 1995, toursol, 0, pcat_dyn, pcat_dyn, pcat_dyn_state, empty_init, ROT0, "Dynamo", "Tournament Solitaire (V1.06, 08/03/95)", MACHINE_UNEMULATED_PROTECTION ) GAME( 1995, toursol1, toursol, pcat_dyn, pcat_dyn, pcat_dyn_state, empty_init, ROT0, "Dynamo", "Tournament Solitaire (V1.04, 06/22/95)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) diff --git a/src/mame/ibmpc/pcat_nit.cpp b/src/mame/ibmpc/pcat_nit.cpp index 51d0bc47f70..3191f6ced78 100644 --- a/src/mame/ibmpc/pcat_nit.cpp +++ b/src/mame/ibmpc/pcat_nit.cpp @@ -84,12 +84,16 @@ Smitdogg #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" -#include "machine/pcshare.h" #include "machine/ins8250.h" #include "machine/microtch.h" -#include "video/clgd542x.h" #include "machine/nvram.h" +#include "video/clgd542x.h" + +namespace { class pcat_nit_state : public pcat_base_state { @@ -447,6 +451,8 @@ void pcat_nit_state::init_pcat_nit() subdevice("nvram")->set_base(m_banked_nvram.get(), 0x2000); } +} // anonymous namespace + GAME( 1993, streetg, 0, pcat_nit, pcat_nit, pcat_nit_state, init_pcat_nit, ROT0, "New Image Technologies", "Street Games (Revision 4)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) GAME( 1993, streetgr3, streetg, pcat_nit, pcat_nit, pcat_nit_state, init_pcat_nit, ROT0, "New Image Technologies", "Street Games (Revision 3)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) GAME( 1993, streetg2, 0, pcat_nit, pcat_nit, pcat_nit_state, init_pcat_nit, ROT0, "New Image Technologies", "Street Games II (Revision 7C)", MACHINE_NO_SOUND ) // Street Games II+, 10-0007-07 083194 diff --git a/src/mame/ibmpc/quakeat.cpp b/src/mame/ibmpc/quakeat.cpp index df81ec7a5aa..5fc80a67b48 100644 --- a/src/mame/ibmpc/quakeat.cpp +++ b/src/mame/ibmpc/quakeat.cpp @@ -82,12 +82,16 @@ TODO: */ #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" -#include "machine/pcshare.h" #include "emupal.h" #include "screen.h" +namespace { + class quakeat_state : public pcat_base_state { public: @@ -176,5 +180,7 @@ ROM_START(quake) DISK_IMAGE( "quakeat", 0, SHA1(c44695b9d521273c9d3c0e18c88f0dca0185bd7b) ) ROM_END +} // anonymous namespace + GAME( 1998, quake, 0, quake, quake, quakeat_state, empty_init, ROT0, "Lazer-Tron / iD Software", "Quake Arcade Tournament (Release Beta 2)", MACHINE_IS_SKELETON ) diff --git a/src/mame/ibmpc/queen.cpp b/src/mame/ibmpc/queen.cpp index bd0c488d95d..70791d7c10c 100644 --- a/src/mame/ibmpc/queen.cpp +++ b/src/mame/ibmpc/queen.cpp @@ -27,13 +27,15 @@ processor speed is 533MHz <- likely to be a Celeron or a Pentium III class CPU - #include "emu.h" +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "machine/lpci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" #include "machine/idectrl.h" #include "video/pc_vga.h" +namespace { class queen_state : public pcat_base_state { @@ -315,5 +317,7 @@ ROM_START( queen ) DISK_IMAGE( "pqiidediskonmodule", 0,SHA1(a56efcc711b1c5a2e63160b3088001a8c4fb56c2) ) ROM_END +} // anonymous namespace + GAME( 2002?, queen, 0, queen, 0, queen_state, empty_init, ROT0, "STG", "Queen?", MACHINE_IS_SKELETON ) diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp index 7ccdf6ec902..677516408cd 100644 --- a/src/mame/igs/goldstar.cpp +++ b/src/mame/igs/goldstar.cpp @@ -213,12 +213,13 @@ #include "emu.h" -#include "includes/goldstar.h" +#include "goldstar.h" + +#include "segacrp2_device.h" +#include "segacrpt_device.h" #include "cpu/z80/z80.h" #include "cpu/mcs51/mcs51.h" -#include "machine/segacrpt_device.h" -#include "machine/segacrp2_device.h" #include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/okim6295.h" diff --git a/src/mame/igs/goldstar_v.cpp b/src/mame/igs/goldstar_v.cpp index 2e402b4b926..4bb23466081 100644 --- a/src/mame/igs/goldstar_v.cpp +++ b/src/mame/igs/goldstar_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/goldstar.h" +#include "goldstar.h" diff --git a/src/mame/igs/igs017.cpp b/src/mame/igs/igs017.cpp index d61a265f7a3..67c54eaad28 100644 --- a/src/mame/igs/igs017.cpp +++ b/src/mame/igs/igs017.cpp @@ -53,12 +53,12 @@ Notes: #include "cpu/m68000/m68000.h" #include "cpu/z180/z180.h" #include "machine/i8255.h" -#include "machine/igs022.h" +#include "igs022.h" #include "machine/ticket.h" #include "machine/timer.h" #include "sound/okim6295.h" #include "sound/ymopl.h" -#include "video/igs017_igs031.h" +#include "igs017_igs031.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/igs/igs_fear.cpp b/src/mame/igs/igs_fear.cpp index dadfc11e395..00761ceef06 100644 --- a/src/mame/igs/igs_fear.cpp +++ b/src/mame/igs/igs_fear.cpp @@ -5,7 +5,7 @@ #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "machine/nvram.h" -#include "machine/pgmcrypt.h" +#include "pgmcrypt.h" #include "sound/ics2115.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/igs/igs_m027.cpp b/src/mame/igs/igs_m027.cpp index b6937c3b4d2..78cb7467945 100644 --- a/src/mame/igs/igs_m027.cpp +++ b/src/mame/igs/igs_m027.cpp @@ -25,8 +25,8 @@ #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "machine/nvram.h" -#include "machine/pgmcrypt.h" -#include "video/igs017_igs031.h" +#include "pgmcrypt.h" +#include "igs017_igs031.h" #include "screen.h" diff --git a/src/mame/igs/igs_m036.cpp b/src/mame/igs/igs_m036.cpp index 414bc9fe802..8fe3f5bca20 100644 --- a/src/mame/igs/igs_m036.cpp +++ b/src/mame/igs/igs_m036.cpp @@ -60,7 +60,7 @@ check more info and photo from cjdh2.zip!!! #include "emu.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" -#include "machine/igs036crypt.h" +#include "igs036crypt.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/igs/iqblock.cpp b/src/mame/igs/iqblock.cpp index 3ad16be2a32..548ff62c6e4 100644 --- a/src/mame/igs/iqblock.cpp +++ b/src/mame/igs/iqblock.cpp @@ -50,7 +50,7 @@ Grndtour: ***************************************************************************/ #include "emu.h" -#include "includes/iqblock.h" +#include "iqblock.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" diff --git a/src/mame/igs/iqblock_v.cpp b/src/mame/igs/iqblock_v.cpp index 85b1aa77636..2b46092e814 100644 --- a/src/mame/igs/iqblock_v.cpp +++ b/src/mame/igs/iqblock_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria, Ernesto Corvi #include "emu.h" -#include "includes/iqblock.h" +#include "iqblock.h" /*************************************************************************** diff --git a/src/mame/igs/lordgun.cpp b/src/mame/igs/lordgun.cpp index 96b9ff27621..8eaecbdbfe4 100644 --- a/src/mame/igs/lordgun.cpp +++ b/src/mame/igs/lordgun.cpp @@ -40,7 +40,7 @@ Notes: *************************************************************************************************************/ #include "emu.h" -#include "includes/lordgun.h" +#include "lordgun.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/igs/lordgun_v.cpp b/src/mame/igs/lordgun_v.cpp index ec3b479611e..4b36a23e6e4 100644 --- a/src/mame/igs/lordgun_v.cpp +++ b/src/mame/igs/lordgun_v.cpp @@ -38,7 +38,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: *************************************************************************************************************/ #include "emu.h" -#include "includes/lordgun.h" +#include "lordgun.h" /*************************************************************************** diff --git a/src/mame/igs/pgm.cpp b/src/mame/igs/pgm.cpp index 2fe96d6494a..646b843063c 100644 --- a/src/mame/igs/pgm.cpp +++ b/src/mame/igs/pgm.cpp @@ -192,15 +192,15 @@ Notes: */ #include "emu.h" -#include "includes/pgm.h" - -#include "machine/pgmprot_igs025_igs012.h" -#include "machine/pgmprot_igs025_igs022.h" -#include "machine/pgmprot_igs025_igs028.h" -#include "machine/pgmprot_igs027a_type1.h" -#include "machine/pgmprot_igs027a_type2.h" -#include "machine/pgmprot_igs027a_type3.h" -#include "machine/pgmprot_orlegend.h" +#include "pgm.h" + +#include "pgmprot_igs025_igs012.h" +#include "pgmprot_igs025_igs022.h" +#include "pgmprot_igs025_igs028.h" +#include "pgmprot_igs027a_type1.h" +#include "pgmprot_igs027a_type2.h" +#include "pgmprot_igs027a_type3.h" +#include "pgmprot_orlegend.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/igs/pgm.h b/src/mame/igs/pgm.h index 6382f17f97a..bbce9abaaff 100644 --- a/src/mame/igs/pgm.h +++ b/src/mame/igs/pgm.h @@ -5,10 +5,10 @@ #pragma once -#include "machine/igs025.h" -#include "machine/igs022.h" -#include "machine/igs028.h" -#include "machine/pgmcrypt.h" +#include "igs025.h" +#include "igs022.h" +#include "igs028.h" +#include "pgmcrypt.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" diff --git a/src/mame/igs/pgm2.cpp b/src/mame/igs/pgm2.cpp index 3f20e243577..98f42d32913 100644 --- a/src/mame/igs/pgm2.cpp +++ b/src/mame/igs/pgm2.cpp @@ -92,7 +92,7 @@ */ #include "emu.h" -#include "includes/pgm2.h" +#include "pgm2.h" // checked on startup, or doesn't boot u32 pgm2_state::unk_startup_r() diff --git a/src/mame/igs/pgm2.h b/src/mame/igs/pgm2.h index b1b0b402892..10e1070875f 100644 --- a/src/mame/igs/pgm2.h +++ b/src/mame/igs/pgm2.h @@ -8,13 +8,13 @@ #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "sound/ymz770.h" -#include "machine/igs036crypt.h" +#include "igs036crypt.h" #include "screen.h" #include "speaker.h" #include "machine/nvram.h" #include "machine/timer.h" #include "machine/atmel_arm_aic.h" -#include "machine/pgm2_memcard.h" +#include "pgm2_memcard.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/igs/pgm2_v.cpp b/src/mame/igs/pgm2_v.cpp index 1e5e6d311f2..f9d2fc6563f 100644 --- a/src/mame/igs/pgm2_v.cpp +++ b/src/mame/igs/pgm2_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" -#include "includes/pgm2.h" +#include "pgm2.h" inline void pgm2_state::draw_sprite_pixel(const rectangle &cliprect, u32 palette_offset, s16 realx, s16 realy, u16 pal) { diff --git a/src/mame/igs/pgm_v.cpp b/src/mame/igs/pgm_v.cpp index a632049b261..1d11f8574a9 100644 --- a/src/mame/igs/pgm_v.cpp +++ b/src/mame/igs/pgm_v.cpp @@ -4,7 +4,7 @@ /* see drivers/pgm.c for notes on where improvements can be made */ #include "emu.h" -#include "includes/pgm.h" +#include "pgm.h" #include "screen.h" diff --git a/src/mame/igs/pgmprot_igs025_igs012.cpp b/src/mame/igs/pgmprot_igs025_igs012.cpp index 23551a78281..2c28f8f40da 100644 --- a/src/mame/igs/pgmprot_igs025_igs012.cpp +++ b/src/mame/igs/pgmprot_igs025_igs012.cpp @@ -18,8 +18,8 @@ ***********************************************************************/ #include "emu.h" -#include "includes/pgm.h" -#include "machine/pgmprot_igs025_igs012.h" +#include "pgm.h" +#include "pgmprot_igs025_igs012.h" /* Dragon World 2 */ diff --git a/src/mame/igs/pgmprot_igs025_igs022.cpp b/src/mame/igs/pgmprot_igs025_igs022.cpp index 0bba9402785..d5b21b92b3d 100644 --- a/src/mame/igs/pgmprot_igs025_igs022.cpp +++ b/src/mame/igs/pgmprot_igs025_igs022.cpp @@ -15,8 +15,8 @@ ************************************************************************/ #include "emu.h" -#include "includes/pgm.h" -#include "machine/pgmprot_igs025_igs022.h" +#include "pgm.h" +#include "pgmprot_igs025_igs022.h" /* The IGS022 is an MCU which performs encrypted DMA used by: diff --git a/src/mame/igs/pgmprot_igs025_igs028.cpp b/src/mame/igs/pgmprot_igs025_igs028.cpp index a6f1d220eff..55e9a02dee2 100644 --- a/src/mame/igs/pgmprot_igs025_igs028.cpp +++ b/src/mame/igs/pgmprot_igs025_igs028.cpp @@ -21,8 +21,8 @@ ***********************************************************************/ #include "emu.h" -#include "includes/pgm.h" -#include "machine/pgmprot_igs025_igs028.h" +#include "pgm.h" +#include "pgmprot_igs025_igs028.h" // tables are xored by table at $1998dc // tables are the same as drgw3 and drgw2 diff --git a/src/mame/igs/pgmprot_igs027a_type1.cpp b/src/mame/igs/pgmprot_igs027a_type1.cpp index e871c987868..f6c4d3fb97b 100644 --- a/src/mame/igs/pgmprot_igs027a_type1.cpp +++ b/src/mame/igs/pgmprot_igs027a_type1.cpp @@ -58,7 +58,7 @@ ***********************************************************************/ #include "emu.h" -#include "machine/pgmprot_igs027a_type1.h" +#include "pgmprot_igs027a_type1.h" #include "screen.h" diff --git a/src/mame/igs/pgmprot_igs027a_type1.h b/src/mame/igs/pgmprot_igs027a_type1.h index 3bf5c699550..85b86aa4bc1 100644 --- a/src/mame/igs/pgmprot_igs027a_type1.h +++ b/src/mame/igs/pgmprot_igs027a_type1.h @@ -1,6 +1,6 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, ElSemi, Xing Xing -#include "includes/pgm.h" +#include "pgm.h" class pgm_arm_type1_state : public pgm_state { diff --git a/src/mame/igs/pgmprot_igs027a_type2.cpp b/src/mame/igs/pgmprot_igs027a_type2.cpp index 9f02b19d851..a997e3b30ef 100644 --- a/src/mame/igs/pgmprot_igs027a_type2.cpp +++ b/src/mame/igs/pgmprot_igs027a_type2.cpp @@ -33,8 +33,8 @@ ***********************************************************************/ #include "emu.h" -#include "includes/pgm.h" -#include "machine/pgmprot_igs027a_type2.h" +#include "pgm.h" +#include "pgmprot_igs027a_type2.h" u32 pgm_arm_type2_state::arm7_latch_arm_r(offs_t offset, u32 mem_mask) { diff --git a/src/mame/igs/pgmprot_igs027a_type3.cpp b/src/mame/igs/pgmprot_igs027a_type3.cpp index 2c633b66394..a1e0f139ba1 100644 --- a/src/mame/igs/pgmprot_igs027a_type3.cpp +++ b/src/mame/igs/pgmprot_igs027a_type3.cpp @@ -44,8 +44,8 @@ ***********************************************************************/ #include "emu.h" -#include "includes/pgm.h" -#include "machine/pgmprot_igs027a_type3.h" +#include "pgm.h" +#include "pgmprot_igs027a_type3.h" void pgm_arm_type3_state::svg_arm7_ram_sel_w(u32 data) { diff --git a/src/mame/igs/pgmprot_orlegend.cpp b/src/mame/igs/pgmprot_orlegend.cpp index f936180d815..8fd516ce357 100644 --- a/src/mame/igs/pgmprot_orlegend.cpp +++ b/src/mame/igs/pgmprot_orlegend.cpp @@ -13,8 +13,8 @@ ***********************************************************************/ #include "emu.h" -#include "includes/pgm.h" -#include "machine/pgmprot_orlegend.h" +#include "pgm.h" +#include "pgmprot_orlegend.h" void pgm_asic3_state::asic3_compute_hold(int y, int z) { diff --git a/src/mame/informer/informer_207_376.cpp b/src/mame/informer/informer_207_376.cpp index a10483728d3..5f99eaeec62 100644 --- a/src/mame/informer/informer_207_376.cpp +++ b/src/mame/informer/informer_207_376.cpp @@ -38,7 +38,7 @@ #include "sound/beep.h" #include "bus/rs232/rs232.h" #include "bus/rs232/printer.h" -#include "machine/informer_207_376_kbd.h" +#include "informer_207_376_kbd.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/informer/informer_213.cpp b/src/mame/informer/informer_213.cpp index a3f1b309577..cc2aefdc3c9 100644 --- a/src/mame/informer/informer_213.cpp +++ b/src/mame/informer/informer_213.cpp @@ -22,7 +22,7 @@ #include "cpu/m6809/m6809.h" #include "machine/nvram.h" #include "machine/z80scc.h" -#include "machine/informer_213_kbd.h" +#include "informer_213_kbd.h" #include "bus/rs232/rs232.h" #include "bus/rs232/printer.h" #include "sound/beep.h" diff --git a/src/mame/intel/imds2.cpp b/src/mame/intel/imds2.cpp index 66eb334afbe..50bf08d26b5 100644 --- a/src/mame/intel/imds2.cpp +++ b/src/mame/intel/imds2.cpp @@ -79,7 +79,7 @@ // the content of floppy disk. #include "emu.h" -#include "machine/imds2ioc.h" +#include "imds2ioc.h" #include "cpu/i8085/i8085.h" #include "machine/74259.h" diff --git a/src/mame/intel/imds2ioc.cpp b/src/mame/intel/imds2ioc.cpp index 7fbf1f98d06..2340e9aeaa3 100644 --- a/src/mame/intel/imds2ioc.cpp +++ b/src/mame/intel/imds2ioc.cpp @@ -12,7 +12,7 @@ // - Adjust speed of processors. Wait states are not accounted for yet. #include "emu.h" -#include "machine/imds2ioc.h" +#include "imds2ioc.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/intel/intellec4.cpp b/src/mame/intel/intellec4.cpp index fc87a1a3606..7dd24266750 100644 --- a/src/mame/intel/intellec4.cpp +++ b/src/mame/intel/intellec4.cpp @@ -41,7 +41,7 @@ */ #include "emu.h" -#include "machine/imm6_76.h" +#include "imm6_76.h" #include "bus/intellec4/intellec4.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/intel/isbc.cpp b/src/mame/intel/isbc.cpp index 6d972d1c0fd..d64c9e5293c 100644 --- a/src/mame/intel/isbc.cpp +++ b/src/mame/intel/isbc.cpp @@ -28,8 +28,8 @@ able to deal with 256byte sectors so fails to load the irmx 512byte sector image #include "machine/z80sio.h" #include "bus/centronics/ctronics.h" #include "bus/isbx/isbx.h" -#include "machine/isbc_215g.h" -#include "machine/isbc_208.h" +#include "isbc_215g.h" +#include "isbc_208.h" class isbc_state : public driver_device { diff --git a/src/mame/interpro/interpro.cpp b/src/mame/interpro/interpro.cpp index a8f6daef2ab..3ca5c542805 100644 --- a/src/mame/interpro/interpro.cpp +++ b/src/mame/interpro/interpro.cpp @@ -230,10 +230,10 @@ #include "cpu/clipper/clipper.h" #include "machine/cammu.h" -#include "machine/interpro_ioga.h" -#include "machine/interpro_mcga.h" -#include "machine/interpro_sga.h" -#include "machine/interpro_arbga.h" +#include "interpro_ioga.h" +#include "interpro_mcga.h" +#include "interpro_sga.h" +#include "interpro_arbga.h" #include "imagedev/floppy.h" #include "machine/ram.h" diff --git a/src/mame/interton/vc4000.cpp b/src/mame/interton/vc4000.cpp index 817a8b673d8..4adf96c3718 100644 --- a/src/mame/interton/vc4000.cpp +++ b/src/mame/interton/vc4000.cpp @@ -132,7 +132,7 @@ Q-0900^76203F0161063005080E492DCD4890597877103F020E75105A0A0C1E89F4101879 ******************************************************************************/ #include "emu.h" -#include "includes/vc4000.h" +#include "vc4000.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/interton/vc4000.h b/src/mame/interton/vc4000.h index 01abc40f41e..bef161461e1 100644 --- a/src/mame/interton/vc4000.h +++ b/src/mame/interton/vc4000.h @@ -11,7 +11,7 @@ #pragma once -#include "audio/vc4000.h" +#include "vc4000_a.h" #include "cpu/s2650/s2650.h" #include "imagedev/snapquik.h" #include "imagedev/cassette.h" diff --git a/src/mame/interton/vc4000_a.cpp b/src/mame/interton/vc4000_a.cpp index 0454af936a5..9004d256635 100644 --- a/src/mame/interton/vc4000_a.cpp +++ b/src/mame/interton/vc4000_a.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "vc4000.h" +#include "vc4000_a.h" DEFINE_DEVICE_TYPE(VC4000_SND, vc4000_sound_device, "vc4000_sound", "Interton Electronic VC 4000 Custom Sound") diff --git a/src/mame/interton/vc4000_v.cpp b/src/mame/interton/vc4000_v.cpp index 8caf09fb779..03fe5f68005 100644 --- a/src/mame/interton/vc4000_v.cpp +++ b/src/mame/interton/vc4000_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Peter Trauner, Manfred Schneider, Robbbert // thanks-to:Manfred Schneider #include "emu.h" -#include "includes/vc4000.h" +#include "vc4000.h" /* diff --git a/src/mame/intv/intv.cpp b/src/mame/intv/intv.cpp index fbba9b7dccc..4953c6468d8 100644 --- a/src/mame/intv/intv.cpp +++ b/src/mame/intv/intv.cpp @@ -51,7 +51,7 @@ RO-3-9506 = 8KiB (4Kiw) self decoding address mask rom with external address dec #include "emu.h" -#include "includes/intv.h" +#include "intv.h" #include "cpu/m6502/m6502.h" #include "cpu/cp1610/cp1610.h" diff --git a/src/mame/intv/intv.h b/src/mame/intv/intv.h index 25bed009c10..c11e22946f8 100644 --- a/src/mame/intv/intv.h +++ b/src/mame/intv/intv.h @@ -11,7 +11,7 @@ #pragma once #include "sound/ay8910.h" -#include "video/stic.h" +#include "stic.h" #include "video/tms9927.h" #include "bus/intv/ecs.h" diff --git a/src/mame/intv/intv_m.cpp b/src/mame/intv/intv_m.cpp index a73293b29f4..211a38972f3 100644 --- a/src/mame/intv/intv_m.cpp +++ b/src/mame/intv/intv_m.cpp @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Nathan Woods,Frank Palazzolo #include "emu.h" -#include "video/stic.h" +#include "stic.h" #include "video/tms9927.h" -#include "includes/intv.h" +#include "intv.h" #include "cpu/cp1610/cp1610.h" // Dual Port Memory handlers diff --git a/src/mame/intv/intv_v.cpp b/src/mame/intv/intv_v.cpp index 32478790473..c7903976908 100644 --- a/src/mame/intv/intv_v.cpp +++ b/src/mame/intv/intv_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Nathan Woods,Frank Palazzolo #include "emu.h" #include "video/tms9927.h" -#include "includes/intv.h" +#include "intv.h" void intv_state::video_start() { diff --git a/src/mame/intv/stic.cpp b/src/mame/intv/stic.cpp index 42bf1a0f963..7beff96da82 100644 --- a/src/mame/intv/stic.cpp +++ b/src/mame/intv/stic.cpp @@ -8,7 +8,7 @@ *********************************************************************/ #include "emu.h" -#include "video/stic.h" +#include "stic.h" #include "screen.h" diff --git a/src/mame/irem/irem.cpp b/src/mame/irem/irem.cpp index b10a97a2200..5d4c27008e2 100644 --- a/src/mame/irem/irem.cpp +++ b/src/mame/irem/irem.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/irem.h" +#include "irem.h" #include "cpu/m6800/m6801.h" #include "sound/discrete.h" diff --git a/src/mame/irem/irem.h b/src/mame/irem/irem.h index 91294d374c4..78e52f0ece7 100644 --- a/src/mame/irem/irem.h +++ b/src/mame/irem/irem.h @@ -8,7 +8,7 @@ #include "sound/ay8910.h" #include "sound/msm5205.h" #include "machine/netlist.h" -#include "audio/nl_kidniki.h" +#include "nl_kidniki.h" class irem_audio_device : public device_t { diff --git a/src/mame/irem/m10.cpp b/src/mame/irem/m10.cpp index e01078229f6..40fd4a0f4e4 100644 --- a/src/mame/irem/m10.cpp +++ b/src/mame/irem/m10.cpp @@ -113,7 +113,7 @@ Notes (couriersud) ***************************************************************************/ #include "emu.h" -#include "includes/m10.h" +#include "m10.h" #include "cpu/m6502/m6502.h" #include "machine/rescap.h" diff --git a/src/mame/irem/m107.cpp b/src/mame/irem/m107.cpp index a8234d72e6e..7e05273ba80 100644 --- a/src/mame/irem/m107.cpp +++ b/src/mame/irem/m107.cpp @@ -26,12 +26,12 @@ confirmed for m107 games as well. *******************************************************************************/ #include "emu.h" -#include "includes/m107.h" -#include "includes/iremipt.h" +#include "m107.h" +#include "iremipt.h" #include "cpu/nec/nec.h" #include "machine/gen_latch.h" -#include "machine/irem_cpu.h" +#include "irem_cpu.h" #include "sound/iremga20.h" #include "sound/ymopm.h" #include "speaker.h" diff --git a/src/mame/irem/m107_v.cpp b/src/mame/irem/m107_v.cpp index 860af7e4621..65d8a3fc0a5 100644 --- a/src/mame/irem/m107_v.cpp +++ b/src/mame/irem/m107_v.cpp @@ -38,7 +38,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/m107.h" +#include "m107.h" diff --git a/src/mame/irem/m10_v.cpp b/src/mame/irem/m10_v.cpp index b21d7ccaa52..524d76390b0 100644 --- a/src/mame/irem/m10_v.cpp +++ b/src/mame/irem/m10_v.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/m10.h" +#include "m10.h" static const uint32_t extyoffs[] = { diff --git a/src/mame/irem/m52.cpp b/src/mame/irem/m52.cpp index e864f9a8a2c..eb382246660 100644 --- a/src/mame/irem/m52.cpp +++ b/src/mame/irem/m52.cpp @@ -46,9 +46,9 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "audio/irem.h" -#include "includes/iremipt.h" -#include "includes/m52.h" +#include "irem.h" +#include "iremipt.h" +#include "m52.h" #define MASTER_CLOCK XTAL(18'432'000) diff --git a/src/mame/irem/m52_v.cpp b/src/mame/irem/m52_v.cpp index 4f2c725a551..ecc1599a339 100644 --- a/src/mame/irem/m52_v.cpp +++ b/src/mame/irem/m52_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/m52.h" +#include "m52.h" #define BGHEIGHT 128 diff --git a/src/mame/irem/m57.cpp b/src/mame/irem/m57.cpp index 7377b320cef..d2d3d1eb1ba 100644 --- a/src/mame/irem/m57.cpp +++ b/src/mame/irem/m57.cpp @@ -50,11 +50,11 @@ ****************************************************************************/ #include "emu.h" -#include "includes/m57.h" -#include "includes/iremipt.h" +#include "m57.h" +#include "iremipt.h" #include "cpu/z80/z80.h" -#include "audio/irem.h" +#include "irem.h" #include "screen.h" diff --git a/src/mame/irem/m57_v.cpp b/src/mame/irem/m57_v.cpp index 524ef9d1c45..5ae9aef0cdb 100644 --- a/src/mame/irem/m57_v.cpp +++ b/src/mame/irem/m57_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/m57.h" +#include "m57.h" /*************************************************************************** diff --git a/src/mame/irem/m58.cpp b/src/mame/irem/m58.cpp index fd0507bc4f9..2d9b02d4789 100644 --- a/src/mame/irem/m58.cpp +++ b/src/mame/irem/m58.cpp @@ -14,9 +14,9 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "audio/irem.h" -#include "includes/iremipt.h" -#include "includes/m58.h" +#include "irem.h" +#include "iremipt.h" +#include "m58.h" #define MASTER_CLOCK XTAL(18'432'000) diff --git a/src/mame/irem/m58_v.cpp b/src/mame/irem/m58_v.cpp index bfb64367857..edd364b0b94 100644 --- a/src/mame/irem/m58_v.cpp +++ b/src/mame/irem/m58_v.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/m58.h" +#include "m58.h" diff --git a/src/mame/irem/m62.cpp b/src/mame/irem/m62.cpp index d2e0c230c72..65e5f8d3fa8 100644 --- a/src/mame/irem/m62.cpp +++ b/src/mame/irem/m62.cpp @@ -76,8 +76,8 @@ other supported games as well. **************************************************************************/ #include "emu.h" -#include "includes/m62.h" -#include "includes/iremipt.h" +#include "m62.h" +#include "iremipt.h" #include "cpu/z80/z80.h" #include "screen.h" diff --git a/src/mame/irem/m62.h b/src/mame/irem/m62.h index 540a6dda6aa..20eef286118 100644 --- a/src/mame/irem/m62.h +++ b/src/mame/irem/m62.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/irem.h" +#include "irem.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/irem/m62_bkungfu.cpp b/src/mame/irem/m62_bkungfu.cpp index b9a9d6ab339..e78c7e0466c 100644 --- a/src/mame/irem/m62_bkungfu.cpp +++ b/src/mame/irem/m62_bkungfu.cpp @@ -13,8 +13,8 @@ TODO: *******************************************************************************/ #include "emu.h" -#include "includes/m62.h" -#include "includes/iremipt.h" +#include "m62.h" +#include "iremipt.h" class m62_bkungfu_state : public m62_state { diff --git a/src/mame/irem/m62_v.cpp b/src/mame/irem/m62_v.cpp index eebc7e3b1ca..8ff7691f497 100644 --- a/src/mame/irem/m62_v.cpp +++ b/src/mame/irem/m62_v.cpp @@ -17,7 +17,7 @@ Tile/sprite priority system (for the Kung Fu Master M62 board): #include "emu.h" #include "video/resnet.h" -#include "includes/m62.h" +#include "m62.h" /*************************************************************************** diff --git a/src/mame/irem/m72.cpp b/src/mame/irem/m72.cpp index ad61969c536..c0f94a632ab 100644 --- a/src/mame/irem/m72.cpp +++ b/src/mame/irem/m72.cpp @@ -187,14 +187,14 @@ other supported games as well. ***************************************************************************/ #include "emu.h" -#include "includes/m72.h" -#include "includes/iremipt.h" +#include "m72.h" +#include "iremipt.h" #include "cpu/nec/nec.h" #include "cpu/nec/v25.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "machine/irem_cpu.h" +#include "irem_cpu.h" #include "machine/rstbuf.h" #include "sound/ymopm.h" #include "speaker.h" diff --git a/src/mame/irem/m72.h b/src/mame/irem/m72.h index 8dae31cb6c9..34e0b82d5c8 100644 --- a/src/mame/irem/m72.h +++ b/src/mame/irem/m72.h @@ -10,7 +10,7 @@ #pragma once -#include "audio/m72.h" +#include "m72_a.h" #include "cpu/mcs51/mcs51.h" #include "machine/mb8421.h" #include "machine/pic8259.h" diff --git a/src/mame/irem/m72_a.cpp b/src/mame/irem/m72_a.cpp index 0581361c649..e2ad871fb21 100644 --- a/src/mame/irem/m72_a.cpp +++ b/src/mame/irem/m72_a.cpp @@ -44,7 +44,7 @@ Shisensho II 1993 Rev 3.34 M81 Yes ***************************************************************************/ #include "emu.h" -#include "m72.h" +#include "m72_a.h" DEFINE_DEVICE_TYPE(IREM_M72_AUDIO, m72_audio_device, "m72_audio", "Irem M72 Audio") diff --git a/src/mame/irem/m72_v.cpp b/src/mame/irem/m72_v.cpp index c7f5ca9957e..e3a5fff878c 100644 --- a/src/mame/irem/m72_v.cpp +++ b/src/mame/irem/m72_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/m72.h" +#include "m72.h" #include "cpu/nec/v25.h" /*************************************************************************** diff --git a/src/mame/irem/m90.cpp b/src/mame/irem/m90.cpp index 20cf6f11fe3..b62849f4727 100644 --- a/src/mame/irem/m90.cpp +++ b/src/mame/irem/m90.cpp @@ -16,13 +16,13 @@ *****************************************************************************/ #include "emu.h" -#include "includes/m90.h" -#include "includes/iremipt.h" +#include "m90.h" +#include "iremipt.h" #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "machine/irem_cpu.h" +#include "irem_cpu.h" #include "machine/rstbuf.h" #include "sound/dac.h" #include "sound/ymopm.h" diff --git a/src/mame/irem/m90.h b/src/mame/irem/m90.h index 41e5380e6cc..fd3baec5edf 100644 --- a/src/mame/irem/m90.h +++ b/src/mame/irem/m90.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/m72.h" +#include "m72_a.h" #include "cpu/nec/v25.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/irem/m90_v.cpp b/src/mame/irem/m90_v.cpp index a8786d7b19b..a373f7766ee 100644 --- a/src/mame/irem/m90_v.cpp +++ b/src/mame/irem/m90_v.cpp @@ -29,7 +29,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/m90.h" +#include "m90.h" #include "screen.h" #include diff --git a/src/mame/irem/m92.cpp b/src/mame/irem/m92.cpp index abedfe55d00..39aa78c3f01 100644 --- a/src/mame/irem/m92.cpp +++ b/src/mame/irem/m92.cpp @@ -207,13 +207,13 @@ psoldier dip locations still need verification. *****************************************************************************/ #include "emu.h" -#include "includes/m92.h" -#include "includes/iremipt.h" +#include "m92.h" +#include "iremipt.h" #include "cpu/nec/nec.h" #include "machine/eeprompar.h" #include "machine/gen_latch.h" -#include "machine/irem_cpu.h" +#include "irem_cpu.h" #include "sound/iremga20.h" #include "sound/ymopm.h" #include "speaker.h" diff --git a/src/mame/irem/m92_v.cpp b/src/mame/irem/m92_v.cpp index f2fe172d673..1bd79629c2f 100644 --- a/src/mame/irem/m92_v.cpp +++ b/src/mame/irem/m92_v.cpp @@ -42,7 +42,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/m92.h" +#include "m92.h" /*****************************************************************************/ diff --git a/src/mame/irem/redalert.cpp b/src/mame/irem/redalert.cpp index b1820d2da02..35f21b8c358 100644 --- a/src/mame/irem/redalert.cpp +++ b/src/mame/irem/redalert.cpp @@ -113,8 +113,8 @@ ****************************************************************************/ #include "emu.h" -#include "includes/redalert.h" -#include "audio/redalert.h" +#include "redalert.h" +#include "redalert_a.h" #include "cpu/m6502/m6502.h" diff --git a/src/mame/irem/redalert_a.cpp b/src/mame/irem/redalert_a.cpp index 6ed6cd5e2a3..9d684972cd8 100644 --- a/src/mame/irem/redalert_a.cpp +++ b/src/mame/irem/redalert_a.cpp @@ -10,7 +10,7 @@ ****************************************************************************/ #include "emu.h" -#include "redalert.h" +#include "redalert_a.h" #include "cpu/m6800/m6800.h" #include "cpu/m6502/m6502.h" diff --git a/src/mame/irem/redalert_v.cpp b/src/mame/irem/redalert_v.cpp index a29f0f612bd..edf03a59385 100644 --- a/src/mame/irem/redalert_v.cpp +++ b/src/mame/irem/redalert_v.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/redalert.h" +#include "redalert.h" #define NUM_CHARMAP_PENS 0x200 diff --git a/src/mame/irem/shisen.cpp b/src/mame/irem/shisen.cpp index 5158cdb2c00..365e26ddf1c 100644 --- a/src/mame/irem/shisen.cpp +++ b/src/mame/irem/shisen.cpp @@ -10,7 +10,7 @@ driver by Nicola Salmoria #include "emu.h" -#include "audio/m72.h" +#include "m72_a.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/irem/spartanxtec.cpp b/src/mame/irem/spartanxtec.cpp index 4917dc4069c..09be88b1ecf 100644 --- a/src/mame/irem/spartanxtec.cpp +++ b/src/mame/irem/spartanxtec.cpp @@ -20,7 +20,7 @@ probably an original bug? */ #include "emu.h" -#include "includes/iremipt.h" +#include "iremipt.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/irem/travrusa.cpp b/src/mame/irem/travrusa.cpp index a8578f94f00..dd7e83998ce 100644 --- a/src/mame/irem/travrusa.cpp +++ b/src/mame/irem/travrusa.cpp @@ -51,8 +51,8 @@ and 2764 eprom (swapped D3/D4 and D5/D6 data lines) ****************************************************************************/ #include "emu.h" -#include "includes/travrusa.h" -#include "audio/irem.h" +#include "travrusa.h" +#include "irem.h" #include "cpu/z80/z80.h" #include "screen.h" diff --git a/src/mame/irem/travrusa_v.cpp b/src/mame/irem/travrusa_v.cpp index 5498ffc7f3c..e6555d05331 100644 --- a/src/mame/irem/travrusa_v.cpp +++ b/src/mame/irem/travrusa_v.cpp @@ -15,7 +15,7 @@ J Clegg ***************************************************************************/ #include "emu.h" -#include "includes/travrusa.h" +#include "travrusa.h" /*************************************************************************** diff --git a/src/mame/irem/vigilant.cpp b/src/mame/irem/vigilant.cpp index e09727b87b3..8d73df04697 100644 --- a/src/mame/irem/vigilant.cpp +++ b/src/mame/irem/vigilant.cpp @@ -31,8 +31,8 @@ The game uses derivative hardware. ***************************************************************************/ #include "emu.h" -#include "includes/vigilant.h" -#include "includes/iremipt.h" +#include "vigilant.h" +#include "iremipt.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/irem/vigilant.h b/src/mame/irem/vigilant.h index 551491128d5..905f654034b 100644 --- a/src/mame/irem/vigilant.h +++ b/src/mame/irem/vigilant.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/m72.h" +#include "m72_a.h" #include "machine/timer.h" #include "emupal.h" diff --git a/src/mame/irem/vigilant_v.cpp b/src/mame/irem/vigilant_v.cpp index 511f1ee5fdd..c50b0a62920 100644 --- a/src/mame/irem/vigilant_v.cpp +++ b/src/mame/irem/vigilant_v.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/vigilant.h" +#include "vigilant.h" static const rectangle bottomvisiblearea(16*8, 48*8-1, 6*8, 32*8-1); diff --git a/src/mame/itech/iteagle.cpp b/src/mame/itech/iteagle.cpp index 63b31a951ab..efd0a2f2051 100644 --- a/src/mame/itech/iteagle.cpp +++ b/src/mame/itech/iteagle.cpp @@ -107,7 +107,7 @@ www.multitech.com #include "machine/vrc4373.h" #include "video/voodoo_pci.h" #include "sound/es1373.h" -#include "machine/iteagle_fpga.h" +#include "iteagle_fpga.h" #include "machine/pci-ide.h" #include "screen.h" diff --git a/src/mame/itech/itech32.cpp b/src/mame/itech/itech32.cpp index b04ae9feb27..835419ff137 100644 --- a/src/mame/itech/itech32.cpp +++ b/src/mame/itech/itech32.cpp @@ -390,7 +390,7 @@ Notes: ****************************************************************************/ #include "emu.h" -#include "includes/itech32.h" +#include "itech32.h" #include "cpu/m6800/m6801.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/itech/itech32_v.cpp b/src/mame/itech/itech32_v.cpp index d730da5a5ca..0f438d719cb 100644 --- a/src/mame/itech/itech32_v.cpp +++ b/src/mame/itech/itech32_v.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "cpu/m68000/m68000.h" -#include "includes/itech32.h" +#include "itech32.h" #include diff --git a/src/mame/itech/itech8.cpp b/src/mame/itech/itech8.cpp index 512d5625685..1ca1d6d8e8d 100644 --- a/src/mame/itech/itech8.cpp +++ b/src/mame/itech/itech8.cpp @@ -497,7 +497,7 @@ #include "emu.h" -#include "includes/itech8.h" +#include "itech8.h" #include "cpu/m68000/m68000.h" #include "cpu/m6809/hd6309.h" diff --git a/src/mame/itech/itech8_m.cpp b/src/mame/itech/itech8_m.cpp index 22b9685dfde..5ef4cd1cef3 100644 --- a/src/mame/itech/itech8_m.cpp +++ b/src/mame/itech/itech8_m.cpp @@ -71,7 +71,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "includes/itech8.h" +#include "itech8.h" #define MINDY 100 diff --git a/src/mame/itech/itech8_v.cpp b/src/mame/itech/itech8_v.cpp index 6be782028ab..a5033c14af0 100644 --- a/src/mame/itech/itech8_v.cpp +++ b/src/mame/itech/itech8_v.cpp @@ -91,7 +91,7 @@ #include "emu.h" #include "cpu/m6809/m6809.h" -#include "includes/itech8.h" +#include "itech8.h" /************************************* diff --git a/src/mame/jaleco/acommand.cpp b/src/mame/jaleco/acommand.cpp index ab0bcfeb350..80d5eeed7d7 100644 --- a/src/mame/jaleco/acommand.cpp +++ b/src/mame/jaleco/acommand.cpp @@ -58,16 +58,20 @@ JALCF1 BIN 1,048,576 02-07-99 1:11a JALCF1.BIN *******************************************************************************************/ #include "emu.h" + +#include "ms1_tmap.h" + #include "cpu/m68000/m68000.h" #include "machine/timer.h" #include "sound/okim6295.h" -#include "video/ms1_tmap.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" #include "acommand.lh" +namespace { class acommand_state : public driver_device { @@ -528,4 +532,6 @@ ROM_START( acommand ) ROM_LOAD( "jalmr17.bin", 0x080000, 0x080000, CRC(9d428fb7) SHA1(02f72938d73db932bd217620a175a05215f6016a) ) ROM_END +} // anonymous namespace + GAMEL( 1994, acommand, 0, acommand, acommand, acommand_state, empty_init, ROT0, "Jaleco", "Alien Command" , MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_acommand ) diff --git a/src/mame/jaleco/aeroboto.cpp b/src/mame/jaleco/aeroboto.cpp index 1a06e99ff86..7c80398df2d 100644 --- a/src/mame/jaleco/aeroboto.cpp +++ b/src/mame/jaleco/aeroboto.cpp @@ -26,7 +26,7 @@ Revisions: ****************************************************************************/ #include "emu.h" -#include "includes/aeroboto.h" +#include "aeroboto.h" #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" diff --git a/src/mame/jaleco/aeroboto_v.cpp b/src/mame/jaleco/aeroboto_v.cpp index a7257ddec08..42e3a5070a3 100644 --- a/src/mame/jaleco/aeroboto_v.cpp +++ b/src/mame/jaleco/aeroboto_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" -#include "includes/aeroboto.h" +#include "aeroboto.h" // how the starfield ROM is interpreted: 0=256x256x1 linear bitmap, 1=8x8x1x1024 tilemap diff --git a/src/mame/jaleco/argus.cpp b/src/mame/jaleco/argus.cpp index 9f66868d113..112af86f085 100644 --- a/src/mame/jaleco/argus.cpp +++ b/src/mame/jaleco/argus.cpp @@ -136,7 +136,7 @@ Known issues : #include "emu.h" -#include "includes/argus.h" +#include "argus.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/jaleco/argus.h b/src/mame/jaleco/argus.h index ed5bb354464..c3cd401c224 100644 --- a/src/mame/jaleco/argus.h +++ b/src/mame/jaleco/argus.h @@ -2,7 +2,7 @@ // copyright-holders:Yochizo #include "machine/timer.h" -#include "video/jalblend.h" +#include "jalblend.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/jaleco/argus_v.cpp b/src/mame/jaleco/argus_v.cpp index 0f2a27137f9..360a3922412 100644 --- a/src/mame/jaleco/argus_v.cpp +++ b/src/mame/jaleco/argus_v.cpp @@ -116,7 +116,7 @@ BG0 palette intensity ( $C47F, $C4FF ) ***************************************************************************/ #include "emu.h" -#include "includes/argus.h" +#include "argus.h" /*************************************************************************** diff --git a/src/mame/jaleco/bigstrkb.cpp b/src/mame/jaleco/bigstrkb.cpp index 8c272e9f746..66c4ce8a03c 100644 --- a/src/mame/jaleco/bigstrkb.cpp +++ b/src/mame/jaleco/bigstrkb.cpp @@ -15,7 +15,7 @@ */ #include "emu.h" -#include "includes/bigstrkb.h" +#include "bigstrkb.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" diff --git a/src/mame/jaleco/bigstrkb_v.cpp b/src/mame/jaleco/bigstrkb_v.cpp index b9014336f09..2136a03235b 100644 --- a/src/mame/jaleco/bigstrkb_v.cpp +++ b/src/mame/jaleco/bigstrkb_v.cpp @@ -3,7 +3,7 @@ /* Big Striker (bootleg) Video Hardware */ #include "emu.h" -#include "includes/bigstrkb.h" +#include "bigstrkb.h" /* Sprites */ diff --git a/src/mame/jaleco/bnstars.cpp b/src/mame/jaleco/bnstars.cpp index dffabc8cecd..d3b6128478c 100644 --- a/src/mame/jaleco/bnstars.cpp +++ b/src/mame/jaleco/bnstars.cpp @@ -88,11 +88,11 @@ ROMs : MR96004-10.1 [125661cd] (IC5 - Samples) */ #include "emu.h" -#include "includes/ms32.h" +#include "ms32.h" #include "cpu/z80/z80.h" #include "cpu/v60/v60.h" -#include "machine/jalcrpt.h" +#include "jalcrpt.h" #include "layout/generic.h" #include "speaker.h" diff --git a/src/mame/jaleco/cischeat.cpp b/src/mame/jaleco/cischeat.cpp index b9861050a90..cfe97e78277 100644 --- a/src/mame/jaleco/cischeat.cpp +++ b/src/mame/jaleco/cischeat.cpp @@ -182,11 +182,11 @@ Cisco Heat. ******************************************************************************/ #include "emu.h" -#include "includes/cischeat.h" +#include "cischeat.h" #include "cpu/m68000/m68000.h" #include "machine/adc0804.h" -#include "machine/jalcrpt.h" +#include "jalcrpt.h" #include "machine/nvram.h" #include "sound/okim6295.h" #include "sound/ymopm.h" diff --git a/src/mame/jaleco/cischeat.h b/src/mame/jaleco/cischeat.h index 548d829cb89..da4bc25216a 100644 --- a/src/mame/jaleco/cischeat.h +++ b/src/mame/jaleco/cischeat.h @@ -12,7 +12,7 @@ #include "machine/ticket.h" #include "machine/timer.h" #include "machine/watchdog.h" -#include "video/ms1_tmap.h" +#include "ms1_tmap.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/jaleco/cischeat_v.cpp b/src/mame/jaleco/cischeat_v.cpp index cd33b8936a3..62bd7bafc7e 100644 --- a/src/mame/jaleco/cischeat_v.cpp +++ b/src/mame/jaleco/cischeat_v.cpp @@ -49,7 +49,7 @@ Note: if MAME_DEBUG is defined, pressing Z or X with: ***************************************************************************/ #include "emu.h" -#include "includes/cischeat.h" +#include "cischeat.h" #define cischeat_tmap_DRAW(_n_) \ diff --git a/src/mame/jaleco/citycon.cpp b/src/mame/jaleco/citycon.cpp index 5960bab1b49..63149ef5e8a 100644 --- a/src/mame/jaleco/citycon.cpp +++ b/src/mame/jaleco/citycon.cpp @@ -10,7 +10,7 @@ Dip locations added from dip listing at crazykong.com ***************************************************************************/ #include "emu.h" -#include "includes/citycon.h" +#include "citycon.h" #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" diff --git a/src/mame/jaleco/citycon_v.cpp b/src/mame/jaleco/citycon_v.cpp index 14955208533..9f6438dcece 100644 --- a/src/mame/jaleco/citycon_v.cpp +++ b/src/mame/jaleco/citycon_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/citycon.h" +#include "citycon.h" /*************************************************************************** diff --git a/src/mame/jaleco/exerion.cpp b/src/mame/jaleco/exerion.cpp index f535aa619f5..430cf7c00af 100644 --- a/src/mame/jaleco/exerion.cpp +++ b/src/mame/jaleco/exerion.cpp @@ -120,7 +120,7 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/exerion.h" +#include "exerion.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/jaleco/exerion_v.cpp b/src/mame/jaleco/exerion_v.cpp index b7d882731f9..78e85b78e9d 100644 --- a/src/mame/jaleco/exerion_v.cpp +++ b/src/mame/jaleco/exerion_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/exerion.h" +#include "exerion.h" #define BACKGROUND_X_START 32 diff --git a/src/mame/jaleco/fcombat.cpp b/src/mame/jaleco/fcombat.cpp index f41a7c33179..214beff41a4 100644 --- a/src/mame/jaleco/fcombat.cpp +++ b/src/mame/jaleco/fcombat.cpp @@ -32,7 +32,7 @@ inputs + notes by stephh */ #include "emu.h" -#include "includes/fcombat.h" +#include "fcombat.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/jaleco/fcombat_v.cpp b/src/mame/jaleco/fcombat_v.cpp index 0fbe6315485..5491f184732 100644 --- a/src/mame/jaleco/fcombat_v.cpp +++ b/src/mame/jaleco/fcombat_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/fcombat.h" +#include "fcombat.h" TILE_GET_INFO_MEMBER(fcombat_state::get_bg_tile_info) diff --git a/src/mame/jaleco/ginganin.cpp b/src/mame/jaleco/ginganin.cpp index 35c6d4dcca6..06f31c37309 100644 --- a/src/mame/jaleco/ginganin.cpp +++ b/src/mame/jaleco/ginganin.cpp @@ -57,7 +57,7 @@ f5d6 print 7 digit BCD number: d0.l to (a1)+ color $3000 ***************************************************************************/ #include "emu.h" -#include "includes/ginganin.h" +#include "ginganin.h" #include "cpu/m68000/m68000.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/jaleco/ginganin_v.cpp b/src/mame/jaleco/ginganin_v.cpp index d21c7f054c1..bf1b095feb3 100644 --- a/src/mame/jaleco/ginganin_v.cpp +++ b/src/mame/jaleco/ginganin_v.cpp @@ -60,7 +60,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: **************************************************************************/ #include "emu.h" -#include "includes/ginganin.h" +#include "ginganin.h" /*************************************************************************** diff --git a/src/mame/jaleco/homerun.cpp b/src/mame/jaleco/homerun.cpp index 08d56b1ea9d..35e33c55ef6 100644 --- a/src/mame/jaleco/homerun.cpp +++ b/src/mame/jaleco/homerun.cpp @@ -109,7 +109,7 @@ This version of Homerun is not dumped. */ #include "emu.h" -#include "includes/homerun.h" +#include "homerun.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" diff --git a/src/mame/jaleco/homerun_v.cpp b/src/mame/jaleco/homerun_v.cpp index 47495cbe2ce..bea65f63d29 100644 --- a/src/mame/jaleco/homerun_v.cpp +++ b/src/mame/jaleco/homerun_v.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/homerun.h" +#include "homerun.h" /**************************************************************************/ diff --git a/src/mame/jaleco/jalcrpt.cpp b/src/mame/jaleco/jalcrpt.cpp index f1b6b270588..efa0274fab4 100644 --- a/src/mame/jaleco/jalcrpt.cpp +++ b/src/mame/jaleco/jalcrpt.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia, David Haywood #include "emu.h" -#include "machine/jalcrpt.h" +#include "jalcrpt.h" void phantasm_rom_decode(running_machine &machine, const char *region) diff --git a/src/mame/jaleco/jalmah.cpp b/src/mame/jaleco/jalmah.cpp index fb9d05fbccb..282a2dfce20 100644 --- a/src/mame/jaleco/jalmah.cpp +++ b/src/mame/jaleco/jalmah.cpp @@ -109,10 +109,13 @@ OSC: 12.000MHz *******************************************************************************************/ #include "emu.h" + +#include "ms1_tmap.h" + #include "cpu/m68000/m68000.h" #include "machine/timer.h" #include "sound/okim6295.h" -#include "video/ms1_tmap.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/jaleco/megasys1.cpp b/src/mame/jaleco/megasys1.cpp index e658e73b533..42573aab64c 100644 --- a/src/mame/jaleco/megasys1.cpp +++ b/src/mame/jaleco/megasys1.cpp @@ -124,13 +124,13 @@ RAM RW 0e0000-0effff* < < ***************************************************************************/ #include "emu.h" -#include "includes/megasys1.h" +#include "megasys1.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/ymopm.h" #include "sound/ymopn.h" -#include "machine/jalcrpt.h" +#include "jalcrpt.h" #include "speaker.h" #define SYS_A_CPU_CLOCK (XTAL(12'000'000) / 2) /* clock for main 68000 */ diff --git a/src/mame/jaleco/megasys1.h b/src/mame/jaleco/megasys1.h index 75fc9ffaed7..1b5c51a7970 100644 --- a/src/mame/jaleco/megasys1.h +++ b/src/mame/jaleco/megasys1.h @@ -16,7 +16,7 @@ #include "machine/timer.h" #include "sound/msm5205.h" #include "sound/okim6295.h" -#include "video/ms1_tmap.h" +#include "ms1_tmap.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/jaleco/megasys1_v.cpp b/src/mame/jaleco/megasys1_v.cpp index dcf99067f81..a20f3d171ad 100644 --- a/src/mame/jaleco/megasys1_v.cpp +++ b/src/mame/jaleco/megasys1_v.cpp @@ -194,7 +194,7 @@ actual code sent to the hardware. ***************************************************************************/ #include "emu.h" -#include "includes/megasys1.h" +#include "megasys1.h" #include "sound/ymopm.h" diff --git a/src/mame/jaleco/momoko.cpp b/src/mame/jaleco/momoko.cpp index 6cc102d0f7f..dc7901cc926 100644 --- a/src/mame/jaleco/momoko.cpp +++ b/src/mame/jaleco/momoko.cpp @@ -46,7 +46,7 @@ Stephh's notes (based on the game Z80 code and some tests) : *****************************************************************************/ #include "emu.h" -#include "includes/momoko.h" +#include "momoko.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/jaleco/momoko_v.cpp b/src/mame/jaleco/momoko_v.cpp index f8c45e61d75..1d319fc26fb 100644 --- a/src/mame/jaleco/momoko_v.cpp +++ b/src/mame/jaleco/momoko_v.cpp @@ -19,7 +19,7 @@ *******************************************************************************/ #include "emu.h" -#include "includes/momoko.h" +#include "momoko.h" void momoko_state::fg_scrollx_w(u8 data) diff --git a/src/mame/jaleco/ms1_tmap.cpp b/src/mame/jaleco/ms1_tmap.cpp index 0cee532f273..1dc2a62d8ef 100644 --- a/src/mame/jaleco/ms1_tmap.cpp +++ b/src/mame/jaleco/ms1_tmap.cpp @@ -17,7 +17,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/ms1_tmap.h" +#include "ms1_tmap.h" static constexpr int TILES_PER_PAGE_X = 0x20; static constexpr int TILES_PER_PAGE_Y = 0x20; diff --git a/src/mame/jaleco/ms32.cpp b/src/mame/jaleco/ms32.cpp index abd289b58f0..0867d269161 100644 --- a/src/mame/jaleco/ms32.cpp +++ b/src/mame/jaleco/ms32.cpp @@ -470,8 +470,8 @@ Notes from Charles MacDonald /********** BITS & PIECES **********/ #include "emu.h" -#include "includes/ms32.h" -#include "machine/jalcrpt.h" +#include "ms32.h" +#include "jalcrpt.h" #include "cpu/z80/z80.h" #include "cpu/v60/v60.h" diff --git a/src/mame/jaleco/ms32.h b/src/mame/jaleco/ms32.h index 3fe6b6b38a0..7d15d6d6928 100644 --- a/src/mame/jaleco/ms32.h +++ b/src/mame/jaleco/ms32.h @@ -7,8 +7,8 @@ #include "machine/gen_latch.h" #include "machine/timer.h" -#include "machine/jaleco_ms32_sysctrl.h" -#include "video/ms32_sprite.h" +#include "jaleco_ms32_sysctrl.h" +#include "ms32_sprite.h" #include "sound/ymf271.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/jaleco/ms32_v.cpp b/src/mame/jaleco/ms32_v.cpp index 609ecde5120..bd0fc60c8cc 100644 --- a/src/mame/jaleco/ms32_v.cpp +++ b/src/mame/jaleco/ms32_v.cpp @@ -15,7 +15,7 @@ priority should be given to #include "emu.h" -#include "includes/ms32.h" +#include "ms32.h" /********** Tilemaps **********/ diff --git a/src/mame/jaleco/psychic5.cpp b/src/mame/jaleco/psychic5.cpp index bdf5f4f3328..fdc5806f584 100644 --- a/src/mame/jaleco/psychic5.cpp +++ b/src/mame/jaleco/psychic5.cpp @@ -330,7 +330,7 @@ Notes (23-Jan-2016 AS): */ #include "emu.h" -#include "includes/psychic5.h" +#include "psychic5.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/jaleco/psychic5.h b/src/mame/jaleco/psychic5.h index 367c043fa94..517b3e24b2f 100644 --- a/src/mame/jaleco/psychic5.h +++ b/src/mame/jaleco/psychic5.h @@ -3,7 +3,7 @@ #include "machine/bankdev.h" #include "machine/timer.h" -#include "video/jalblend.h" +#include "jalblend.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/jaleco/psychic5_v.cpp b/src/mame/jaleco/psychic5_v.cpp index 59b78f8afe3..42215b0f33e 100644 --- a/src/mame/jaleco/psychic5_v.cpp +++ b/src/mame/jaleco/psychic5_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/psychic5.h" +#include "psychic5.h" #define BG_PAL_INTENSITY_RG 0x1fe diff --git a/src/mame/jaleco/skyfox.cpp b/src/mame/jaleco/skyfox.cpp index 2c3f3699322..ed1e745a447 100644 --- a/src/mame/jaleco/skyfox.cpp +++ b/src/mame/jaleco/skyfox.cpp @@ -24,7 +24,7 @@ Verified Dip locations and recommended settings with manual ***************************************************************************/ #include "emu.h" -#include "includes/skyfox.h" +#include "skyfox.h" #include "cpu/z80/z80.h" #include "sound/ymopn.h" diff --git a/src/mame/jaleco/skyfox_v.cpp b/src/mame/jaleco/skyfox_v.cpp index b16bd5bc831..22c10647343 100644 --- a/src/mame/jaleco/skyfox_v.cpp +++ b/src/mame/jaleco/skyfox_v.cpp @@ -39,7 +39,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/skyfox.h" +#include "skyfox.h" /*************************************************************************** diff --git a/src/mame/jaleco/tetrisp2.cpp b/src/mame/jaleco/tetrisp2.cpp index e96b34785dd..0a81d86866d 100644 --- a/src/mame/jaleco/tetrisp2.cpp +++ b/src/mame/jaleco/tetrisp2.cpp @@ -49,7 +49,7 @@ stepstag: ***************************************************************************/ #include "emu.h" -#include "includes/tetrisp2.h" +#include "tetrisp2.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" diff --git a/src/mame/jaleco/tetrisp2.h b/src/mame/jaleco/tetrisp2.h index 091c778fe03..432cc385f52 100644 --- a/src/mame/jaleco/tetrisp2.h +++ b/src/mame/jaleco/tetrisp2.h @@ -2,8 +2,8 @@ // copyright-holders:Luca Elia #include "machine/gen_latch.h" -#include "machine/jaleco_ms32_sysctrl.h" -#include "video/ms32_sprite.h" +#include "jaleco_ms32_sysctrl.h" +#include "ms32_sprite.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/jaleco/tetrisp2_v.cpp b/src/mame/jaleco/tetrisp2_v.cpp index 76cd16ee25a..e7481faaa54 100644 --- a/src/mame/jaleco/tetrisp2_v.cpp +++ b/src/mame/jaleco/tetrisp2_v.cpp @@ -33,7 +33,7 @@ To Do: ***************************************************************************/ #include "emu.h" -#include "includes/tetrisp2.h" +#include "tetrisp2.h" #include "screen.h" diff --git a/src/mame/jazz/jazz.cpp b/src/mame/jazz/jazz.cpp index 3f37a2dc605..b8afc332667 100644 --- a/src/mame/jazz/jazz.cpp +++ b/src/mame/jazz/jazz.cpp @@ -64,7 +64,7 @@ #include "machine/28fxxx.h" // various hardware -#include "machine/mct_adr.h" +#include "mct_adr.h" #include "machine/dp83932c.h" #include "machine/mc146818.h" #include "machine/ins8250.h" diff --git a/src/mame/jpm/guab.cpp b/src/mame/jpm/guab.cpp index d2c56d2c4bd..dd2dddc41d2 100644 --- a/src/mame/jpm/guab.cpp +++ b/src/mame/jpm/guab.cpp @@ -36,19 +36,20 @@ #include "emu.h" +#include "bacta_datalogger.h" + #include "cpu/m68000/m68000.h" #include "formats/guab_dsk.h" #include "imagedev/floppy.h" #include "machine/6840ptm.h" #include "machine/6850acia.h" -#include "machine/bacta_datalogger.h" - #include "machine/clock.h" #include "machine/i8255.h" #include "machine/wd_fdc.h" #include "sound/sn76496.h" #include "video/ef9369.h" #include "video/tms34061.h" + #include "emupal.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/jpm/jpmimpct.cpp b/src/mame/jpm/jpmimpct.cpp index 273b57306a3..a804989df9c 100644 --- a/src/mame/jpm/jpmimpct.cpp +++ b/src/mame/jpm/jpmimpct.cpp @@ -94,11 +94,13 @@ Thanks to Tony Friery and JPeMU for I/O routines and documentation. #include "emu.h" -#include "includes/jpmimpct.h" +#include "jpmimpct.h" + +#include "awpvid.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" -#include "video/awpvid.h" + #include "screen.h" #include "speaker.h" diff --git a/src/mame/jpm/jpmimpct.h b/src/mame/jpm/jpmimpct.h index f9c9198dfa0..09baa76c86e 100644 --- a/src/mame/jpm/jpmimpct.h +++ b/src/mame/jpm/jpmimpct.h @@ -5,17 +5,24 @@ JPM IMPACT with Video hardware ****************************************************************************/ +#ifndef MAME_JPM_JPMIMPCT_H +#define MAME_JPM_JPMIMPCT_H + +#pragma once + +#include "bacta_datalogger.h" + +#include "cpu/tms34010/tms34010.h" +#include "machine/i8255.h" +#include "machine/mc68681.h" #include "machine/meters.h" #include "machine/roc10937.h" #include "machine/steppers.h" #include "machine/timer.h" -#include "cpu/tms34010/tms34010.h" -#include "video/bt47x.h" -#include "machine/i8255.h" -#include "machine/mc68681.h" #include "sound/upd7759.h" +#include "video/bt47x.h" + #include "diserial.h" -#include "machine/bacta_datalogger.h" #include "emupal.h" @@ -215,3 +222,5 @@ private: optional_ioport m_touchx; optional_ioport m_touchy; }; + +#endif // MAME_JPM_JPMIMPCT_H diff --git a/src/mame/jpm/jpmimpct_v.cpp b/src/mame/jpm/jpmimpct_v.cpp index 4bb0c023558..193c1cfca20 100644 --- a/src/mame/jpm/jpmimpct_v.cpp +++ b/src/mame/jpm/jpmimpct_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cpu/tms34010/tms34010.h" -#include "includes/jpmimpct.h" +#include "jpmimpct.h" /************************************* * diff --git a/src/mame/jpm/jpmimpctsw.cpp b/src/mame/jpm/jpmimpctsw.cpp index 92eeec3456e..d5359a803b1 100644 --- a/src/mame/jpm/jpmimpctsw.cpp +++ b/src/mame/jpm/jpmimpctsw.cpp @@ -25,7 +25,7 @@ */ #include "emu.h" -#include "includes/jpmimpct.h" +#include "jpmimpct.h" // MFME2MAME layouts: #include "j6aceclb.lh" diff --git a/src/mame/jpm/jpmsru.cpp b/src/mame/jpm/jpmsru.cpp index 98fcb7276ec..456e1faba1d 100644 --- a/src/mame/jpm/jpmsru.cpp +++ b/src/mame/jpm/jpmsru.cpp @@ -41,9 +41,10 @@ #include "emu.h" -#include "audio/fruitsamples.h" -#include "audio/nl_jpmsru.h" -#include "video/awpvid.h" +#include "nl_jpmsru.h" + +#include "awpvid.h" +#include "fruitsamples.h" #include "cpu/tms9900/tms9980a.h" diff --git a/src/mame/jpm/jpmsys5.cpp b/src/mame/jpm/jpmsys5.cpp index ca6686d6c3a..ac52a288eb7 100644 --- a/src/mame/jpm/jpmsys5.cpp +++ b/src/mame/jpm/jpmsys5.cpp @@ -33,13 +33,14 @@ ***************************************************************************/ #include "emu.h" -#include "includes/jpmsys5.h" +#include "jpmsys5.h" -#include "machine/bacta_datalogger.h" +#include "bacta_datalogger.h" #include "machine/clock.h" #include "machine/input_merger.h" #include "sound/saa1099.h" + #include "screen.h" #include "speaker.h" diff --git a/src/mame/jpm/jpmsys5.h b/src/mame/jpm/jpmsys5.h index 4a46bab1bd7..111e0c61346 100644 --- a/src/mame/jpm/jpmsys5.h +++ b/src/mame/jpm/jpmsys5.h @@ -1,24 +1,27 @@ // license:BSD-3-Clause // copyright-holders:Philip Bennett, James Wallace, David Haywood -#ifndef MAME_INCLUDES_JPMSYS5_H -#define MAME_INCLUDES_JPMSYS5_H +#ifndef MAME_JPM_JPMSYS5_H +#define MAME_JPM_JPMSYS5_H #pragma once +#include "awpvid.h" + #include "cpu/m68000/m68000.h" #include "machine/6821pia.h" #include "machine/6840ptm.h" #include "machine/6850acia.h" +#include "machine/meters.h" +#include "machine/nvram.h" +#include "machine/roc10937.h" +#include "machine/steppers.h" #include "sound/upd7759.h" #include "sound/ymopl.h" #include "video/tms34061.h" -#include "machine/nvram.h" -#include "video/awpvid.h" -#include "machine/steppers.h" -#include "machine/roc10937.h" -#include "machine/meters.h" + #include "emupal.h" + class jpmsys5_state : public driver_device { public: @@ -192,4 +195,4 @@ private: int m_touch_shift_cnt = 0; }; -#endif // MAME_INCLUDES_JPMSYS5_H +#endif // MAME_JPM_JPMSYS5_H diff --git a/src/mame/jpm/jpmsys5sw.cpp b/src/mame/jpm/jpmsys5sw.cpp index 8e226fab7db..3f120b0f06d 100644 --- a/src/mame/jpm/jpmsys5sw.cpp +++ b/src/mame/jpm/jpmsys5sw.cpp @@ -13,7 +13,7 @@ #include "emu.h" -#include "includes/jpmsys5.h" +#include "jpmsys5.h" // MFME2MAME layouts: #include "j5ar80cla.lh" diff --git a/src/mame/kaneko/airbustr.cpp b/src/mame/kaneko/airbustr.cpp index 1ef4e50e485..fb99fd3e2f9 100644 --- a/src/mame/kaneko/airbustr.cpp +++ b/src/mame/kaneko/airbustr.cpp @@ -220,7 +220,7 @@ Code at 505: waits for bit 1 to go low, writes command, waits for bit */ #include "emu.h" -#include "includes/airbustr.h" +#include "airbustr.h" #include "cpu/z80/z80.h" #include "sound/okim6295.h" diff --git a/src/mame/kaneko/airbustr.h b/src/mame/kaneko/airbustr.h index db0eafa2d58..afa75ce7271 100644 --- a/src/mame/kaneko/airbustr.h +++ b/src/mame/kaneko/airbustr.h @@ -5,15 +5,16 @@ Air Buster *************************************************************************/ -#ifndef MAME_INCLUDES_AIRBUSTR_H -#define MAME_INCLUDES_AIRBUSTR_H +#ifndef MAME_KANEKO_AIRBUSTR_H +#define MAME_KANEKO_AIRBUSTR_H #pragma once +#include "kan_pand.h" + #include "machine/gen_latch.h" #include "machine/timer.h" #include "machine/watchdog.h" -#include "video/kan_pand.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" @@ -96,4 +97,4 @@ public: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_AIRBUSTR_H +#endif // MAME_KANEKO_AIRBUSTR_H diff --git a/src/mame/kaneko/airbustr_v.cpp b/src/mame/kaneko/airbustr_v.cpp index e3a847d2247..63b3b222b3f 100644 --- a/src/mame/kaneko/airbustr_v.cpp +++ b/src/mame/kaneko/airbustr_v.cpp @@ -33,7 +33,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/airbustr.h" +#include "airbustr.h" /* Scroll Registers diff --git a/src/mame/kaneko/djboy.cpp b/src/mame/kaneko/djboy.cpp index 7d28280702b..7a6560aba81 100644 --- a/src/mame/kaneko/djboy.cpp +++ b/src/mame/kaneko/djboy.cpp @@ -139,7 +139,7 @@ Notes: */ #include "emu.h" -#include "includes/djboy.h" +#include "djboy.h" #include "cpu/z80/z80.h" #include "sound/okim6295.h" diff --git a/src/mame/kaneko/djboy.h b/src/mame/kaneko/djboy.h index 8df13f4644d..4a53b6eeb64 100644 --- a/src/mame/kaneko/djboy.h +++ b/src/mame/kaneko/djboy.h @@ -5,15 +5,20 @@ DJ Boy *************************************************************************/ +#ifndef MAME_KANEKO_DJBOY_H +#define MAME_KANEKO_DJBOY_H + +#pragma once + +#include "kan_pand.h" #include "cpu/mcs51/mcs51.h" #include "machine/gen_latch.h" #include "machine/timer.h" -#include "video/kan_pand.h" + #include "emupal.h" #include "tilemap.h" -#define PROT_OUTPUT_BUFFER_SIZE 8 class djboy_state : public driver_device { @@ -47,6 +52,8 @@ public: void init_djboyj(); private: + static constexpr unsigned PROT_OUTPUT_BUFFER_SIZE = 8; + /* memory pointers */ required_shared_ptr m_videoram; required_shared_ptr m_paletteram; @@ -118,3 +125,5 @@ private: void soundcpu_am(address_map &map); void soundcpu_port_am(address_map &map); }; + +#endif // MAME_KANEKO_DJBOY_H diff --git a/src/mame/kaneko/djboy_v.cpp b/src/mame/kaneko/djboy_v.cpp index 888831a9194..8b00ae42340 100644 --- a/src/mame/kaneko/djboy_v.cpp +++ b/src/mame/kaneko/djboy_v.cpp @@ -6,8 +6,7 @@ * video hardware for DJ Boy */ #include "emu.h" -#include "video/kan_pand.h" -#include "includes/djboy.h" +#include "djboy.h" void djboy_state::djboy_scrollx_w(uint8_t data) { diff --git a/src/mame/kaneko/expro02.cpp b/src/mame/kaneko/expro02.cpp index 553f327b478..1a6faeb97fa 100644 --- a/src/mame/kaneko/expro02.cpp +++ b/src/mame/kaneko/expro02.cpp @@ -208,15 +208,15 @@ BTANB: */ #include "emu.h" -#include "includes/galpnipt.h" +#include "galpnipt.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" -#include "machine/kaneko_hit.h" +#include "kaneko_hit.h" #include "machine/timer.h" #include "machine/watchdog.h" -#include "video/kaneko_tmap.h" -#include "video/kaneko_spr.h" +#include "kaneko_tmap.h" +#include "kaneko_spr.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/kaneko/galpani2.cpp b/src/mame/kaneko/galpani2.cpp index 1cfffd86dbd..7e9956614f9 100644 --- a/src/mame/kaneko/galpani2.cpp +++ b/src/mame/kaneko/galpani2.cpp @@ -79,7 +79,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/galpani2.h" +#include "galpani2.h" #include "cpu/m68000/m68000.h" #include "screen.h" diff --git a/src/mame/kaneko/galpani2.h b/src/mame/kaneko/galpani2.h index d15315d72fa..275b236d4db 100644 --- a/src/mame/kaneko/galpani2.h +++ b/src/mame/kaneko/galpani2.h @@ -1,11 +1,11 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_GALPANI2_H -#define MAME_INCLUDES_GALPANI2_H +#ifndef MAME_KANEKO_GALPANI2_H +#define MAME_KANEKO_GALPANI2_H #pragma once -#include "video/kaneko_spr.h" +#include "kaneko_spr.h" #include "sound/okim6295.h" #include "machine/eepromser.h" #include "machine/timer.h" @@ -82,4 +82,4 @@ private: void galpani2_mem2(address_map &map); }; -#endif // MAME_INCLUDES_GALPANI2_H +#endif // MAME_KANEKO_GALPANI2_H diff --git a/src/mame/kaneko/galpani2_v.cpp b/src/mame/kaneko/galpani2_v.cpp index 186be0d1c63..df0e5130171 100644 --- a/src/mame/kaneko/galpani2_v.cpp +++ b/src/mame/kaneko/galpani2_v.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/galpani2.h" +#include "galpani2.h" #include "screen.h" /* diff --git a/src/mame/kaneko/galpani3.cpp b/src/mame/kaneko/galpani3.cpp index 20f3bee9f74..3d79147468f 100644 --- a/src/mame/kaneko/galpani3.cpp +++ b/src/mame/kaneko/galpani3.cpp @@ -66,12 +66,12 @@ Dumped by Uki #include "emu.h" #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" -#include "machine/kaneko_toybox.h" +#include "kaneko_toybox.h" #include "machine/timer.h" #include "machine/watchdog.h" #include "sound/ymz280b.h" -#include "video/kaneko_grap2.h" -#include "video/sknsspr.h" +#include "kaneko_grap2.h" +#include "sknsspr.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/kaneko/galpanic.cpp b/src/mame/kaneko/galpanic.cpp index a4006344859..3d4426dffff 100644 --- a/src/mame/kaneko/galpanic.cpp +++ b/src/mame/kaneko/galpanic.cpp @@ -67,9 +67,9 @@ Stephh's additional notes : #include "emu.h" -#include "includes/galpnipt.h" -#include "machine/kaneko_hit.h" -#include "video/kan_pand.h" +#include "galpnipt.h" +#include "kan_pand.h" +#include "kaneko_hit.h" #include "cpu/m68000/m68000.h" #include "machine/timer.h" diff --git a/src/mame/kaneko/galpnipt.h b/src/mame/kaneko/galpnipt.h index 9f5918921b6..ed34774aba3 100644 --- a/src/mame/kaneko/galpnipt.h +++ b/src/mame/kaneko/galpnipt.h @@ -5,6 +5,10 @@ Input port macros used by games in the galpanic.c driver *******************************************************************************/ +#ifndef MAME_KANEKO_GALPNIPT_H +#define MAME_KANEKO_GALPNIPT_H + +#pragma once /**************************** Inputs ****************************/ @@ -157,3 +161,5 @@ PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )\ PORT_DIPSETTING( 0x0040, DEF_STR( On ) )\ PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "SW2:8" ) + +#endif // MAME_KANEKO_GALPNIPT_H diff --git a/src/mame/kaneko/hvyunit.cpp b/src/mame/kaneko/hvyunit.cpp index a744d369fe0..2e3fcf7db8b 100644 --- a/src/mame/kaneko/hvyunit.cpp +++ b/src/mame/kaneko/hvyunit.cpp @@ -60,12 +60,15 @@ To Do: ***************************************************************************************/ #include "emu.h" + +#include "kan_pand.h" + #include "cpu/z80/z80.h" #include "cpu/mcs51/mcs51.h" #include "machine/gen_latch.h" #include "machine/timer.h" #include "sound/ymopn.h" -#include "video/kan_pand.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/kaneko/jchan.cpp b/src/mame/kaneko/jchan.cpp index 412ef71848c..916b2758e05 100644 --- a/src/mame/kaneko/jchan.cpp +++ b/src/mame/kaneko/jchan.cpp @@ -160,9 +160,9 @@ JC-301-00 W11 9510K7059 23C16000 U85 #include "machine/timer.h" #include "machine/watchdog.h" #include "sound/ymz280b.h" -#include "video/sknsspr.h" -#include "video/kaneko_tmap.h" -#include "machine/kaneko_toybox.h" +#include "sknsspr.h" +#include "kaneko_tmap.h" +#include "kaneko_toybox.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/kaneko/kan_pand.cpp b/src/mame/kaneko/kan_pand.cpp new file mode 100644 index 00000000000..1359262cfea --- /dev/null +++ b/src/mame/kaneko/kan_pand.cpp @@ -0,0 +1,294 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood, Luca Elia +/*********************************************************************** + + Kaneko Pandora Sprite Chip + GFX processor - PX79C480FP-3 (KANEKO, Pandora-Chip) + + This emulates the Kaneko Pandora Sprite Chip + which is found on several Kaneko boards. + + there several bootleg variants of this chip, + these are emulated in kan_panb.c instead. + + Original Games using this Chip + + Snow Bros + Air Buster + DJ Boy + Heavy Unit + Sand Scorpion + Gals Panic (1st release) + + The SemiCom games are also using this because + their bootleg chip appears to function in an + identical way. + + Rendering appears to be done to a framebuffer + and the video system can be instructed not to + clear this, allowing for 'sprite trail' effects + as used by Air Buster. + + The chip appears to be an 8-bit chip, and + when used on 16-bit CPUs only the MSB or LSB + of the data lines are connected. Address Lines + also appear to be swapped around on one of the + hookups. + + to use this in a driver you must hook functions to + VIDEO_UPDATE (copies framebuffer to screen) + and + VIDEO_EOF (renders the sprites to the framebuffer) + + also, you have to add the correspondent device in MACHINE_DRIVER + + spriteram should be accessed only with the + pandora_spriteram_r / pandora_spriteram_w or + pandora_spriteram_LSB_r / pandora_spriteram_LSB_w + handlers, depending on the CPU being used with it. + +***********************************************************************/ + +#include "emu.h" +#include "kan_pand.h" +#include "screen.h" + +DEFINE_DEVICE_TYPE(KANEKO_PANDORA, kaneko_pandora_device, "kaneko_pandora", "Kaneko PANDORA GFX") + +kaneko_pandora_device::kaneko_pandora_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, KANEKO_PANDORA, tag, owner, clock) + , device_video_interface(mconfig, *this) + , m_gfx_region(0) + , m_xoffset(0) + , m_yoffset(0) + , m_gfxdecode(*this, finder_base::DUMMY_TAG) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void kaneko_pandora_device::device_start() +{ + m_bg_pen = 0; + m_flip_screen = false; + + m_spriteram = std::make_unique(0x1000); + + m_sprites_bitmap = std::make_unique(screen().width(), screen().height()); + + save_item(NAME(m_clear_bitmap)); + save_item(NAME(m_bg_pen)); + save_item(NAME(m_flip_screen)); + save_pointer(NAME(m_spriteram), 0x1000); + save_item(NAME(*m_sprites_bitmap)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void kaneko_pandora_device::device_reset() +{ + memset(m_spriteram.get(), 0x00, 0x1000); + + m_clear_bitmap = 1; +} + + +/***************************************************************************** + IMPLEMENTATION +*****************************************************************************/ + +void kaneko_pandora_device::set_bg_pen( int pen ) +{ + m_bg_pen = pen; +} + +void kaneko_pandora_device::set_clear_bitmap( int clear ) +{ + m_clear_bitmap = clear; +} + +void kaneko_pandora_device::update( bitmap_ind16 &bitmap, const rectangle &cliprect ) +{ + if (!m_sprites_bitmap) + { + printf("ERROR: pandora_update with no pandora_sprites_bitmap\n"); + return; + } + + copybitmap_trans(bitmap, *m_sprites_bitmap, 0, 0, 0, 0, cliprect, 0); +} + + +void kaneko_pandora_device::draw( bitmap_ind16 &bitmap, const rectangle &cliprect ) +{ + int sx = 0, sy = 0, x = 0, y = 0, offs; + + + /* + * Sprite Tile Format + * ------------------ + * + * Byte | Bit(s) | Use + * -----+-76543210-+---------------- + * 0-2 | -------- | unused + * 3 | xxxx.... | Palette Bank + * 3 | .......x | XPos - Sign Bit + * 3 | ......x. | YPos - Sign Bit + * 3 | .....x.. | Use Relative offsets + * 4 | xxxxxxxx | XPos + * 5 | xxxxxxxx | YPos + * 6 | xxxxxxxx | Sprite Number (low 8 bits) + * 7 | ....xxxx | Sprite Number (high 4 bits) + * 7 | x....... | Flip Sprite Y-Axis + * 7 | .x...... | Flip Sprite X-Axis + */ + + for (offs = 0; offs < 0x1000; offs += 8) + { + int dx = m_spriteram[offs + 4]; + int dy = m_spriteram[offs + 5]; + int tilecolour = m_spriteram[offs + 3]; + int attr = m_spriteram[offs + 7]; + int flipx = attr & 0x80; + int flipy = (attr & 0x40) << 1; + int tile = ((attr & 0x3f) << 8) + (m_spriteram[offs + 6] & 0xff); + + if (tilecolour & 1) + dx |= 0x100; + if (tilecolour & 2) + dy |= 0x100; + + if (tilecolour & 4) + { + x += dx; + y += dy; + } + else + { + x = dx; + y = dy; + } + + if (m_flip_screen) + { + sx = 240 - x; + sy = 240 - y; + flipx = !flipx; + flipy = !flipy; + } + else + { + sx = x; + sy = y; + } + + /* global offset */ + sx += m_xoffset; + sy += m_yoffset; + + sx &= 0x1ff; + sy &= 0x1ff; + + if (sx & 0x100) + sx -= 0x200; + if (sy & 0x100) + sy -= 0x200; + + m_gfxdecode->gfx(m_gfx_region)->transpen(bitmap,cliprect, + tile, + (tilecolour & 0xf0) >> 4, + flipx, flipy, + sx,sy,0); + } +} + +void kaneko_pandora_device::eof( ) +{ + assert(m_spriteram != nullptr); + + // the games can disable the clearing of the sprite bitmap, to leave sprite trails + if (m_clear_bitmap) + m_sprites_bitmap->fill(m_bg_pen, screen().visible_area()); + + kaneko_pandora_device::draw(*m_sprites_bitmap, screen().visible_area()); +} + +/***************************************************************************** + DEVICE HANDLERS +*****************************************************************************/ + +void kaneko_pandora_device::spriteram_w(offs_t offset, uint8_t data) +{ + // it's either hooked up oddly on this, or on the 16-bit games + // either way, we swap the address lines so that the spriteram is in the same format + offset = bitswap<16>(offset, 15,14,13,12, 11, 7,6,5,4,3,2,1,0, 10,9,8 ); + + if (!m_spriteram) + { + printf("ERROR: spriteram_w with no m__spriteram\n"); + return; + } + + if (offset >= 0x1000) + { + logerror("spriteram_w write past spriteram, offset %04x %02x\n", offset, data); + return; + } + + m_spriteram[offset] = data; +} + +uint8_t kaneko_pandora_device::spriteram_r(offs_t offset) +{ + // it's either hooked up oddly on this, or on the 16-bit games + // either way, we swap the address lines so that the spriteram is in the same format + offset = bitswap<16>(offset, 15,14,13,12, 11, 7,6,5,4,3,2,1,0, 10,9,8 ); + + if (!m_spriteram) + { + printf("ERROR: spriteram_r with no m_spriteram\n"); + return 0x00; + } + + if (offset >= 0x1000) + { + logerror("spriteram_r read past spriteram, offset %04x\n", offset); + return 0x00; + } + return m_spriteram[offset]; +} + +/* I don't know if this MSB/LSB mirroring is correct, or if there is twice as much ram, with half of it unused */ +void kaneko_pandora_device::spriteram_LSB_w(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + if (!m_spriteram) + { + printf("ERROR: m_spriteram_LSB_w with no m_spriteram\n"); + return; + } + + if (ACCESSING_BITS_8_15) + { + m_spriteram[offset] = (data >> 8) & 0xff; + } + + if (ACCESSING_BITS_0_7) + { + m_spriteram[offset] = data & 0xff; + } +} + +uint16_t kaneko_pandora_device::spriteram_LSB_r(offs_t offset) +{ + if (!m_spriteram) + { + printf("ERROR: spriteram_LSB_r with no m_spriteram\n"); + return 0x0000; + } + + return m_spriteram[offset] | (m_spriteram[offset] << 8); +} diff --git a/src/mame/kaneko/kan_pand.h b/src/mame/kaneko/kan_pand.h new file mode 100644 index 00000000000..0ca59e0f6f3 --- /dev/null +++ b/src/mame/kaneko/kan_pand.h @@ -0,0 +1,66 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood, Luca Elia +/************************************************************************* + + kan_pand.h + + Implementation of Kaneko Pandora sprite chip + +**************************************************************************/ +#ifndef MAME_KANEKO_KAN_PAND_H +#define MAME_KANEKO_KAN_PAND_H + +#pragma once + +/*************************************************************************** + TYPE DEFINITIONS +***************************************************************************/ + +class kaneko_pandora_device : public device_t, + public device_video_interface +{ +public: + kaneko_pandora_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + // configuration + template void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward(tag)); } + void set_gfx_region(int gfxregion) { m_gfx_region = gfxregion; } + void set_offsets(int x_offset, int y_offset) + { + m_xoffset = x_offset; + m_yoffset = y_offset; + } + + void spriteram_w(offs_t offset, uint8_t data); + uint8_t spriteram_r(offs_t offset); + void spriteram_LSB_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t spriteram_LSB_r(offs_t offset); + void update( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void set_clear_bitmap( int clear ); + void eof(); + void set_bg_pen( int pen ); + void flip_screen_set(bool flip) { m_flip_screen = flip; } + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + void draw( bitmap_ind16 &bitmap, const rectangle &cliprect ); + +private: + // internal state + std::unique_ptr m_spriteram; + std::unique_ptr m_sprites_bitmap; /* bitmap to render sprites to, Pandora seems to be frame'buffered' */ + int m_clear_bitmap = 0; + int m_bg_pen = 0; // might work some other way.. + uint8_t m_gfx_region; + int m_xoffset; + int m_yoffset; + bool m_flip_screen = false; + required_device m_gfxdecode; +}; + +DECLARE_DEVICE_TYPE(KANEKO_PANDORA, kaneko_pandora_device) + +#endif // MAME_KANEKO_KAN_PAND_H diff --git a/src/mame/kaneko/kaneko16.cpp b/src/mame/kaneko/kaneko16.cpp index a3b0de23494..9a91e5cc967 100644 --- a/src/mame/kaneko/kaneko16.cpp +++ b/src/mame/kaneko/kaneko16.cpp @@ -98,7 +98,7 @@ Non-Bugs (happen on real PCB) ***************************************************************************/ #include "emu.h" -#include "includes/kaneko16.h" +#include "kaneko16.h" #include "speaker.h" diff --git a/src/mame/kaneko/kaneko16.h b/src/mame/kaneko/kaneko16.h index e977e790245..050a74ad650 100644 --- a/src/mame/kaneko/kaneko16.h +++ b/src/mame/kaneko/kaneko16.h @@ -5,18 +5,21 @@ -= Kaneko 16 Bit Games =- ***************************************************************************/ -#ifndef MAME_INCLUDES_KANEKO16_H -#define MAME_INCLUDES_KANEKO16_H +#ifndef MAME_KANEKO_KANEKO16_H +#define MAME_KANEKO_KANEKO16_H #pragma once +#include "kaneko_calc3.h" +#include "kaneko_hit.h" +#include "kaneko_spr.h" +#include "kaneko_tmap.h" +#include "kaneko_toybox.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "machine/gen_latch.h" -#include "machine/kaneko_calc3.h" -#include "machine/kaneko_hit.h" -#include "machine/kaneko_toybox.h" #include "machine/nvram.h" #include "machine/timer.h" #include "machine/watchdog.h" @@ -24,11 +27,11 @@ #include "sound/okim6295.h" #include "sound/ymopm.h" #include "video/bufsprite.h" -#include "video/kaneko_spr.h" -#include "video/kaneko_tmap.h" + #include "emupal.h" #include "screen.h" + class kaneko16_state : public driver_device { public: @@ -250,4 +253,4 @@ private: void shogwarr_map(address_map &map); }; -#endif +#endif // MAME_KANEKO_KANEKO16_H diff --git a/src/mame/kaneko/kaneko16_v.cpp b/src/mame/kaneko/kaneko16_v.cpp index a36ffeaf6dd..eb057b8677e 100644 --- a/src/mame/kaneko/kaneko16_v.cpp +++ b/src/mame/kaneko/kaneko16_v.cpp @@ -9,7 +9,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/kaneko16.h" +#include "kaneko16.h" #include "screen.h" diff --git a/src/mame/kaneko/kaneko_calc3.h b/src/mame/kaneko/kaneko_calc3.h index 49b317504f4..de3d0bf33e8 100644 --- a/src/mame/kaneko/kaneko_calc3.h +++ b/src/mame/kaneko/kaneko_calc3.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia, David Haywood /* CALC 3 */ -#ifndef MAME_MACHINE_KANEKO_CALC3_H -#define MAME_MACHINE_KANEKO_CALC3_H +#ifndef MAME_KANEKO_KANEKO_CALC3_H +#define MAME_KANEKO_KANEKO_CALC3_H #pragma once @@ -73,4 +73,4 @@ private: DECLARE_DEVICE_TYPE(KANEKO_CALC3, kaneko_calc3_device) -#endif // MAME_MACHINE_KANEKO_CALC3_H +#endif // MAME_KANEKO_KANEKO_CALC3_H diff --git a/src/mame/kaneko/kaneko_grap2.h b/src/mame/kaneko/kaneko_grap2.h index 082dbbbd40a..1c62c11f62b 100644 --- a/src/mame/kaneko/kaneko_grap2.h +++ b/src/mame/kaneko/kaneko_grap2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_KANEKO_GRAP2_H -#define MAME_VIDEO_KANEKO_GRAP2_H +#ifndef MAME_KANEKO_KANEKO_GRAP2_H +#define MAME_KANEKO_KANEKO_GRAP2_H #pragma once @@ -81,4 +81,4 @@ protected: DECLARE_DEVICE_TYPE(KANEKO_GRAP2, kaneko_grap2_device) -#endif // MAME_VIDEO_KANEKO_GRAP2_H +#endif // MAME_KANEKO_KANEKO_GRAP2_H diff --git a/src/mame/kaneko/kaneko_hit.h b/src/mame/kaneko/kaneko_hit.h index 492521a9f31..ea1b721187a 100644 --- a/src/mame/kaneko/kaneko_hit.h +++ b/src/mame/kaneko/kaneko_hit.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia, David Haywood,Stephane Humbert /* Kaneko Hit protection */ -#ifndef MAME_MACHINE_KANEKO_HIT_H -#define MAME_MACHINE_KANEKO_HIT_H +#ifndef MAME_KANEKO_KANEKO_HIT_H +#define MAME_KANEKO_KANEKO_HIT_H #pragma once @@ -84,4 +84,4 @@ private: DECLARE_DEVICE_TYPE(KANEKO_HIT, kaneko_hit_device) -#endif // MAME_MACHINE_KANEKO_HIT_H +#endif // MAME_KANEKO_KANEKO_HIT_H diff --git a/src/mame/kaneko/sandscrp.cpp b/src/mame/kaneko/sandscrp.cpp index afe64ddfd83..70a832b3d1a 100644 --- a/src/mame/kaneko/sandscrp.cpp +++ b/src/mame/kaneko/sandscrp.cpp @@ -73,15 +73,18 @@ Is there another alt program rom set labeled 9 & 10? */ #include "emu.h" -#include "cpu/z80/z80.h" + +#include "kan_pand.h" +#include "kaneko_hit.h" +#include "kaneko_tmap.h" + #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/okim6295.h" #include "sound/ymopn.h" -#include "video/kan_pand.h" -#include "machine/kaneko_hit.h" -#include "video/kaneko_tmap.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/kaneko/snowbros.cpp b/src/mame/kaneko/snowbros.cpp new file mode 100644 index 00000000000..d737d2c0f0c --- /dev/null +++ b/src/mame/kaneko/snowbros.cpp @@ -0,0 +1,3147 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood, Mike Coates +/*************************************************************************** + + Snow Brothers (Toaplan) / SemiCom Hardware + uses Kaneko's Pandora sprite chip (also used in DJ Boy, Air Buster ..) + +Snow Bros Nick & Tom +Toaplan, 1990 + + PCB Layout + ---------- + MIN16-02 + + |------------------------------------------| + | VOL YM3812 6116 4464 4464 | + | LA4460 YM3014 4464 4464 | + | 458 SBROS-4.29 SBROS1.40 | + | 2003 Z80B PANDORA | + |J D41101C-1 LS07 LS32 | + |A SBROS-3A.5 SBROS-2A.6 LS139 LS174| + |M LS245 LS74 LS04 16MHz| + |M 6264 6264 F32 LS74 LS74 | + |A 68000 LS20 F138 LS04 12MHz| + | LS04 LS148 LS251 LS00 | + | LS273 LS245 LS245 LS158 LS257 LS257 LS32 | + | | + | LS273 6116 6116 LS157 DSW2 DSW1 | + |------------------------------------------| + + Notes: + 68k clock: 8.000MHz + Z80B clock: 6.000MHz + YM3812 clock: 3.000MHz + VSync: 57.5Hz + HSync: 15.68kHz + + driver by Mike Coates + + Hyper Pacman addition by David Haywood + + some bits by Nicola Salmoria + + !!DO NOT TRUST THE SERVICE MODES FOR DIPSWITCH SETTINGS!! + +Stephh's notes (hyperpac): + + - According to the "Language" Dip Switch, this game is a Korean game. + (although the Language Dipswitch doesn't affect language, but yes + I believe SemiCom to be a Korean Company) + - There is no "cocktail mode", nor way to flip the screen. + +Notes: + +Cookie & Bibi 3 +This game is quite buggy. The test mode is incomplete and displays garbage +on the 'Dipswitch settings' screens, and during some of the attract mode +scenes the credit counter is not updated when you insert coins until the next +scene. Both these bugs are verified as occurring on the original hardware. + +Honey Doll / Twin Adventure + +These appear to have clipping problems on the left / right edges, but this +may be correct, the sprites which should be drawn there are simply blanked +out of the sprite list at that point.. (verify on real hw) + +Ma Cheon Ru + +The electrified maze + ball minigame appears unresponsive to controls, this +is because it actually requires you to move the joysticks in a circular +motion through all 8 directions at a very even speed, a task which is +practically impossible to perform on keyboard, and not even that easy with +a joystick. This is not an emulation bug. + + +***************************************************************************/ + +#include "emu.h" +#include "snowbros.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/mcs51/mcs51.h" // for semicom mcu +#include "cpu/z80/z80.h" +#include "machine/watchdog.h" +#include "sound/ymopm.h" +#include "sound/ymopl.h" + +#include "speaker.h" + + +void snowbros_state::snowbros_flipscreen_w(uint8_t data) +{ + m_pandora->flip_screen_set(!BIT(data, 7)); +} + + +void snowbros_state::bootleg_flipscreen_w(uint8_t data) +{ + flip_screen_set(~data & 0x80); +} + + +uint32_t snowbros_state::screen_update_snowbros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + /* This clears & redraws the entire screen each pass */ + bitmap.fill(0xf0, cliprect); + m_pandora->update(bitmap, cliprect); + return 0; +} + + +WRITE_LINE_MEMBER(snowbros_state::screen_vblank_snowbros) +{ + // rising edge + if (state) + { + m_pandora->eof(); + } +} + + + +void snowbros_state::snowbros_irq4_ack_w(uint16_t data) +{ + m_maincpu->set_input_line(4, CLEAR_LINE); +} + +void snowbros_state::snowbros_irq3_ack_w(uint16_t data) +{ + m_maincpu->set_input_line(3, CLEAR_LINE); +} + +void snowbros_state::snowbros_irq2_ack_w(uint16_t data) +{ + m_maincpu->set_input_line(2, CLEAR_LINE); +} + +TIMER_DEVICE_CALLBACK_MEMBER(snowbros_state::snowbros_irq) +{ + int scanline = param; + + if(scanline == 240) + m_maincpu->set_input_line(2, ASSERT_LINE); + + if(scanline == 128) + m_maincpu->set_input_line(3, ASSERT_LINE); + + if(scanline == 32) + m_maincpu->set_input_line(4, ASSERT_LINE); +} + +TIMER_DEVICE_CALLBACK_MEMBER(snowbros_state::snowbros3_irq) +{ + int status = m_oki->read(); + int scanline = param; + + if(scanline == 240) + m_maincpu->set_input_line(2, ASSERT_LINE); + + if(scanline == 128) + m_maincpu->set_input_line(3, ASSERT_LINE); + + if(scanline == 32) + m_maincpu->set_input_line(4, ASSERT_LINE); + + if (m_sb3_music_is_playing) + { + if ((status&0x08)==0x00) + { + m_oki->write(0x80|m_sb3_music); + m_oki->write(0x00|0x82); + } + + } + else + { + if ((status&0x08)==0x08) + { + m_oki->write(0x40); /* Stop playing music */ + } + } + +} + +uint16_t snowbros_state::toto_read(offs_t offset, uint16_t mem_mask) +{ + int pc = m_maincpu->pc(); + if ((pc!= 0x3f010) && (pc!= 0x38008)) printf("toto prot %08x %04x\n", pc, mem_mask); + return 0x0700; +} + +/* Snow Bros Memory Map */ + +void snowbros_state::snowbros_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom(); + map(0x100000, 0x103fff).ram(); + map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); + map(0x300001, 0x300001).r("soundlatch2", FUNC(generic_latch_8_device::read)); + map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); + map(0x400000, 0x400000).w(FUNC(snowbros_state::snowbros_flipscreen_w)); + map(0x500000, 0x500001).portr("DSW1"); + map(0x500002, 0x500003).portr("DSW2"); + map(0x500004, 0x500005).portr("SYSTEM"); + map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0x700000, 0x701fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ +} + +void snowbros_state::sound_map(address_map &map) +{ + map(0x0000, 0x7fff).rom(); + map(0x8000, 0x87ff).ram(); +} + +void snowbros_state::sound_io_map(address_map &map) +{ + map.global_mask(0xff); + map(0x02, 0x03).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); + map(0x04, 0x04).r(m_soundlatch, FUNC(generic_latch_8_device::read)); + map(0x04, 0x04).w("soundlatch2", FUNC(generic_latch_8_device::write)); // goes back to the main CPU, checked during boot +} + + +/* Semicom AT89C52 MCU */ + +// probably not endian safe +void snowbros_state::prot_p0_w(uint8_t data) +{ + uint16_t word = m_hyperpac_ram[m_semicom_prot_base + m_semicom_prot_offset]; + word = (word & 0xff00) | (data << 0); + m_hyperpac_ram[m_semicom_prot_base + m_semicom_prot_offset] = word; +} + +// probably not endian safe +void snowbros_state::prot_p1_w(uint8_t data) +{ + uint16_t word = m_hyperpac_ram[m_semicom_prot_base + m_semicom_prot_offset]; + word = (word & 0x00ff) | (data << 8); + m_hyperpac_ram[m_semicom_prot_base + m_semicom_prot_offset] = word; +} + +void snowbros_state::prot_p2_w(uint8_t data) +{ + // offset + m_semicom_prot_offset = data; +} + +/* Winter Bobble - bootleg GFX chip */ + +void snowbros_state::wintbob_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom(); + map(0x100000, 0x103fff).ram(); + map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); + map(0x300001, 0x300001).r("soundlatch2", FUNC(generic_latch_8_device::read)); + map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); + map(0x400000, 0x400000).w(FUNC(snowbros_state::bootleg_flipscreen_w)); + map(0x500000, 0x500001).portr("DSW1"); + map(0x500002, 0x500003).portr("DSW2"); + map(0x500004, 0x500005).portr("SYSTEM"); + map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0x700000, 0x701fff).ram().share("spriteram16b"); + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ +} + +/* Honey Doll */ + +void snowbros_state::honeydol_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom(); + map(0x100000, 0x10ffff).ram().share("hyperpac_ram"); + map(0x200000, 0x200001).nopw(); /* ? */ + map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); + map(0x400000, 0x400001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x500000, 0x500001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0x600000, 0x600001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ + map(0x800000, 0x800001).nopw(); /* ? */ + map(0x900000, 0x900001).portr("DSW1"); + map(0x900002, 0x900003).portr("DSW2"); + map(0x900004, 0x900005).portr("SYSTEM"); + map(0xa00000, 0xa007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0xb00000, 0xb01fff).ram().share("spriteram16b"); +} + +void snowbros_state::honeydol_sound_map(address_map &map) +{ + map(0x0000, 0x7fff).rom(); + map(0x8000, 0x87ff).ram(); + map(0xe010, 0xe010).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); +} + +void snowbros_state::honeydol_sound_io_map(address_map &map) +{ + map.global_mask(0xff); + map(0x02, 0x03).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); // not connected? + map(0x04, 0x04).r(m_soundlatch, FUNC(generic_latch_8_device::read)); + map(0x04, 0x04).nopw(); // still written but never actually read by the main CPU +} + +/* Twin Adventure */ + +void snowbros_state::twinadv_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom(); + map(0x100000, 0x10ffff).ram(); + map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); + map(0x300001, 0x300001).r("soundlatch2", FUNC(generic_latch_8_device::read)); + map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); + map(0x400000, 0x400000).w(FUNC(snowbros_state::bootleg_flipscreen_w)); + + map(0x500000, 0x500001).portr("DSW1"); + map(0x500002, 0x500003).portr("DSW2"); + map(0x500004, 0x500005).portr("SYSTEM"); + map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0x700000, 0x701fff).ram().share("spriteram16b"); + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ +} + +void snowbros_state::twinadv_oki_bank_w(uint8_t data) +{ + int bank = (data &0x02)>>1; + + if (data&0xfd) logerror ("Unused bank bits! %02x\n",data); + + m_oki->set_rom_bank(bank); +} + +void snowbros_state::twinadv_sound_io_map(address_map &map) +{ + map.global_mask(0xff); + map(0x02, 0x02).r(m_soundlatch, FUNC(generic_latch_8_device::read)); + map(0x02, 0x02).w("soundlatch2", FUNC(generic_latch_8_device::write)); // back to 68k? + map(0x04, 0x04).w(FUNC(snowbros_state::twinadv_oki_bank_w)); // oki bank? + map(0x06, 0x06).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); +} + + +/* SemiCom Memory Map + +the SemiCom games have slightly more ram and are protected +sound hardware is also different + +*/ + +void snowbros_state::hyperpac_map(address_map &map) +{ + map(0x000000, 0x0fffff).rom(); + map(0x100000, 0x10ffff).ram().share("hyperpac_ram"); + map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); +// map(0x400000, 0x400001) ??? + map(0x500000, 0x500001).portr("DSW1"); + map(0x500002, 0x500003).portr("DSW2"); + map(0x500004, 0x500005).portr("SYSTEM"); + + map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0x700000, 0x701fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ +} + +void snowbros_state::hyperpac_sound_map(address_map &map) +{ + map(0x0000, 0xcfff).rom(); + map(0xd000, 0xd7ff).ram(); + map(0xf000, 0xf001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); + map(0xf002, 0xf002).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0xf008, 0xf008).r(m_soundlatch, FUNC(generic_latch_8_device::read)); +} + +/* Same volume used for all samples at the Moment, could be right, we have no + way of knowing .. */ +uint16_t snowbros_state::sb3_sound_r() +{ + return 0x0003; +} + +void snowbros_state::sb3_play_music(int data) +{ + uint8_t *snd; + + /* sample is actually played in interrupt function so it loops */ + m_sb3_music = data; + + switch (data) + { + case 0x23: + case 0x26: + snd = memregion("oki")->base(); + memcpy(snd+0x20000, snd+0x80000+0x00000, 0x20000); + m_sb3_music_is_playing = 1; + break; + + case 0x24: + snd = memregion("oki")->base(); + memcpy(snd+0x20000, snd+0x80000+0x20000, 0x20000); + m_sb3_music_is_playing = 1; + break; + + case 0x25: + case 0x27: + case 0x28: + case 0x29: + case 0x2a: + case 0x2b: + case 0x2c: + case 0x2d: + snd = memregion("oki")->base(); + memcpy(snd+0x20000, snd+0x80000+0x40000, 0x20000); + m_sb3_music_is_playing = 1; + break; + + case 0x2e: + m_sb3_music_is_playing = 0; + break; + } +} + +void snowbros_state::sb3_play_sound (int data) +{ + int status = m_oki->read(); + + if ((status&0x01)==0x00) + { + m_oki->write(0x80|data); + m_oki->write(0x00|0x12); + } + else if ((status&0x02)==0x00) + { + m_oki->write(0x80|data); + m_oki->write(0x00|0x22); + } + else if ((status&0x04)==0x00) + { + m_oki->write(0x80|data); + m_oki->write(0x00|0x42); + } + + +} + +void snowbros_state::sb3_sound_w(uint16_t data) +{ + if (data == 0x00fe) + { + m_sb3_music_is_playing = 0; + m_oki->write(0x78); /* Stop sounds */ + } + else /* the alternating 0x00-0x2f or 0x30-0x5f might be something to do with the channels */ + { + data = data>>8; + + if (data <= 0x21) + { + sb3_play_sound(data); + } + + if (data>=0x22 && data<=0x31) + { + sb3_play_music(data); + } + + if ((data>=0x30) && (data<=0x51)) + { + sb3_play_sound(data-0x30); + } + + if (data>=0x52 && data<=0x5f) + { + sb3_play_music(data-0x30); + } + + } +} + + + +void snowbros_state::snowbros3_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom(); + map(0x100000, 0x103fff).ram(); + map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); + map(0x300000, 0x300001).r(FUNC(snowbros_state::sb3_sound_r)); // ? + map(0x300000, 0x300001).w(FUNC(snowbros_state::sb3_sound_w)); // ? + map(0x400000, 0x400000).w(FUNC(snowbros_state::bootleg_flipscreen_w)); + map(0x500000, 0x500001).portr("DSW1"); + map(0x500002, 0x500003).portr("DSW2"); + map(0x500004, 0x500005).portr("SYSTEM"); + map(0x600000, 0x6003ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0x700000, 0x7021ff).ram().share("spriteram16b"); + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ +} + +/* Final Tetris */ + +void snowbros_state::finalttr_map(address_map &map) +{ + map(0x000000, 0x0fffff).rom(); + map(0x100000, 0x103fff).ram().share("hyperpac_ram"); + map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); +// map(0x400000, 0x400001) ??? + + map(0x500000, 0x500001).portr("DSW1"); + map(0x500002, 0x500003).portr("DSW2"); + map(0x500004, 0x500005).portr("SYSTEM"); + + map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0x700000, 0x701fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); + map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ +} + + +// Yutnori protection. +// The sequence MEN is sent to the protection device, followed by the code request (4 bytes in all). +// After each byte, a number of NOPs are executed to give the device time to catch up. +// After the 4th byte, the code reads the device to get its response. +uint16_t snowbros_state::yutnori_prot_r() +{ + switch(m_yutnori_prot_val) // the 4th byte + { + case 0x33: // C3B6 + return 0xcc; + case 0x60: // 4878 + return 0xf9; + case 0xb8: // D820 + return 0x74; + } + logerror("%s: Unhandled protection sequence found: %02X\n", machine().describe_context(), m_yutnori_prot_val); + return 0; +} + +void snowbros_state::yutnori_prot_w(uint16_t data) +{ + m_yutnori_prot_val = data; +} + +void snowbros_state::yutnori_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom(); + + // 0x100000 clr.w on startup + + map(0x200000, 0x200001).rw(FUNC(snowbros_state::yutnori_prot_r),FUNC(snowbros_state::yutnori_prot_w)); // protection + + map(0x300000, 0x300001).portr("DSW1"); + map(0x300002, 0x300003).portr("DSW2"); + map(0x300004, 0x300005).portr("SYSTEM"); + + // could be one of the OKIs? but gets value to write from RAM, always seems to be 0? + map(0x30000c, 0x30000d).nopw(); + map(0x30000e, 0x30000f).nopr(); //.r(FUNC(snowbros_state::yutnori_unk_r)); // ?? + +// map(0x400000, 0x400001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // maybe? + map(0x400000, 0x400001).noprw(); + + map(0x500000, 0x5001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + + map(0x600000, 0x601fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); + + map(0x700000, 0x70ffff).ram(); + + map(0x800000, 0x800001).nopr().w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ + map(0x900000, 0x900001).nopr().w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ + map(0xa00000, 0xa00001).nopr().w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ +} + +static INPUT_PORTS_START( snowbros ) + PORT_START("DSW1") /* 500001 */ + PORT_DIPNAME( 0x01, 0x00, DEF_STR( Region ) ) PORT_DIPLOCATION("SW1:1") /* Listed as "NOT USE" in the manual */ + PORT_DIPSETTING( 0x00, DEF_STR( Europe ) ) + PORT_DIPSETTING( 0x01, "America (Romstar license)" ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW1:3" ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:4") + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x08, DEF_STR( On ) ) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:5,6") + PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) + PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) + PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) + PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) + PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) + PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) + PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:7,8") + PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) + PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) + PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) + PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) + PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) + PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) + PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Must be low or game stops! */ + /* probably VBlank */ + + PORT_START("DSW2") /* 500003 */ + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") + PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4") + PORT_DIPSETTING( 0x04, "100k and every 200k" ) + PORT_DIPSETTING( 0x0c, "100k Only" ) + PORT_DIPSETTING( 0x08, "200k Only" ) + PORT_DIPSETTING( 0x00, DEF_STR( None ) ) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6") + PORT_DIPSETTING( 0x20, "1" ) + PORT_DIPSETTING( 0x00, "2" ) + PORT_DIPSETTING( 0x30, "3" ) + PORT_DIPSETTING( 0x10, "4" ) + PORT_DIPNAME( 0x40, 0x40, "Invulnerability" ) PORT_DIPLOCATION("SW2:7") + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:8") /* Listed as "NOT USE" in the manual */ + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500005 */ + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( snowbroj ) + PORT_INCLUDE(snowbros) + + PORT_MODIFY("DSW1") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1") /* Listed as "NOT USE" in the manual */ + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x01, DEF_STR( On ) ) +INPUT_PORTS_END + +static INPUT_PORTS_START( ballboy3p ) + PORT_INCLUDE(snowbros) + + PORT_MODIFY("DSW1") // on the PCB in place of the dips there's the plug for the controls of the 3rd player + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_MODIFY("SYSTEM") + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_START3 ) +INPUT_PORTS_END + +static INPUT_PORTS_START( honeydol ) + PORT_START("DSW1") + PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x0003, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( 1C_2C ) ) + PORT_DIPNAME( 0x0004, 0x0004, "Show Girls" ) + PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( On ) ) + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Demo_Sounds ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( On ) ) + PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Level_Select ) ) /* Up & Down to set level, then punch to start */ + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, "Slide Show On Boot-up" ) /* Joystick to scroll. Seems to happen once at boot up, then the game auto starts */ + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* Must be low or game stops! */ + + PORT_START("DSW2") + PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) + PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x0001, DEF_STR( Harder ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) ) + PORT_DIPNAME( 0x000c, 0x000c, "Timer Speed" ) /* Based on Normal Difficulty, Stage 1-1 first try */ + PORT_DIPSETTING( 0x000c, DEF_STR( Normal ) ) /* About 40 Seconds */ + PORT_DIPSETTING( 0x0008, "Fast" ) /* About 35 Seconds */ + PORT_DIPSETTING( 0x0004, "Faster" ) /* About 30 Seconds */ + PORT_DIPSETTING( 0x0000, "Fastest" ) /* About 20 Seconds */ + PORT_DIPNAME( 0x0030, 0x0020, DEF_STR( Lives ) ) + PORT_DIPSETTING( 0x0000, "1" ) + PORT_DIPSETTING( 0x0010, "2" ) + PORT_DIPSETTING( 0x0020, "3" ) + PORT_DIPSETTING( 0x0030, "5" ) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, "Max Vs Round" ) + PORT_DIPSETTING( 0x0080, "3" ) /* 44 Seconds each */ + PORT_DIPSETTING( 0x0000, "1" ) /* 89 Seconds */ + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( twinadv ) + PORT_START("DSW1") + PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x0003, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( 1C_2C ) ) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Demo_Sounds ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( On ) ) + PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Flip_Screen ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Level_Select ) ) /* P1 Button 2 to advance, P1 Button 1 to start, starts game with 10 credits */ + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* Must be low or game stops! */ + + PORT_START("DSW2") + PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) + PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x0001, DEF_STR( Harder ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) ) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Lives ) ) + PORT_DIPSETTING( 0x0004, "3" ) + PORT_DIPSETTING( 0x0000, "5" ) + PORT_DIPNAME( 0x0008, 0x0008, "Ticket Mode #1" ) /* Shows on title screen "EVERY 4 GAMES = 1 TICKET" same as 0x0040 below? */ + PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, "Ticket Mode #2" ) /* Shows on title screen "EVERY 4 GAMES = 1 TICKET" same as 0x0008 above? */ + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x0080, DEF_STR( Free_Play ) ) /* Always shows 24 credits */ + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( 4in1boot ) + PORT_START("DSW1") /* 500001 */ + PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:2,3") + PORT_DIPSETTING( 0x04, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x06, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_DIPNAME( 0x78, 0x78, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:4,5,6,7") + PORT_DIPSETTING( 0x18, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x38, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x10, DEF_STR( 4C_2C ) ) + PORT_DIPSETTING( 0x58, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x30, DEF_STR( 3C_2C ) ) + PORT_DIPSETTING( 0x08, DEF_STR( 4C_3C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 4C_4C ) ) + PORT_DIPSETTING( 0x28, DEF_STR( 3C_3C ) ) + PORT_DIPSETTING( 0x50, DEF_STR( 2C_2C ) ) + PORT_DIPSETTING( 0x78, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x20, DEF_STR( 3C_4C ) ) + PORT_DIPSETTING( 0x48, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x40, DEF_STR( 2C_4C ) ) + PORT_DIPSETTING( 0x70, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x68, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x60, DEF_STR( 1C_4C ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW1:8") + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Must be low or game stops! */ + /* probably VBlank */ + + PORT_START("DSW2") /* 500003 */ + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") + PORT_DIPSETTING( 0x02, "1" ) + PORT_DIPSETTING( 0x00, "2" ) + PORT_DIPSETTING( 0x03, "3" ) + PORT_DIPSETTING( 0x01, "4" ) + PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW2:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500005 */ + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( hyperpac ) + PORT_START("DSW1") /* 500000.w */ + PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:2") // "Language" in the "test mode" + PORT_DIPSETTING( 0x0002, "3" ) // "Korean" + PORT_DIPSETTING( 0x0000, "5" ) // "English" + PORT_DIPNAME( 0x001c, 0x001c, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:3,4,5") + PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x000c, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x001c, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x0014, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x0018, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( 1C_3C ) ) + PORT_DIPNAME( 0x0060, 0x0060, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:6,7") + PORT_DIPSETTING( 0x0000, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x0060, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x0040, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Hardest ) ) // DEF_STR( Very_Hard ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW2") /* 500002.w */ + PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) + PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) + PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) + PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0000, "SW2:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500004.w */ + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( cookbib2 ) + PORT_START("DSW1") /* 500000.w */ + PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0002, 0x0002, "Max Vs Round" ) PORT_DIPLOCATION("SW1:2") // "Language" in the "test mode" + PORT_DIPSETTING( 0x0002, "3" ) + PORT_DIPSETTING( 0x0000, "1" ) + PORT_DIPNAME( 0x001c, 0x001c, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:3,4,5") + PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x000c, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x001c, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x0014, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x0018, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( 1C_3C ) ) + PORT_DIPNAME( 0x0060, 0x0060, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:6,7") + PORT_DIPSETTING( 0x0000, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x0060, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x0040, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Hardest ) ) // DEF_STR( Very_Hard ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW2") /* 500002.w */ + PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) + PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) + PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) + PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0000, "SW2:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500004.w */ + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( cookbib2c ) + PORT_INCLUDE(cookbib2) + + PORT_MODIFY("DSW1") + PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Language ) ) PORT_DIPLOCATION("SW1:2") + PORT_DIPSETTING( 0x0002, DEF_STR( English ) ) // Korean in test mode + PORT_DIPSETTING( 0x0000, DEF_STR( Korean ) ) // English in test mode +INPUT_PORTS_END + +static INPUT_PORTS_START( cookbib3 ) + PORT_START("DSW1") /* 500000.w */ + PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x000e, 0x000e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4") + PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x000a, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x000c, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( 1C_3C ) ) + PORT_DIPNAME( 0x0070, 0x0070, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7") + PORT_DIPSETTING( 0x0020, "Level 1" ) + PORT_DIPSETTING( 0x0010, "Level 2" ) + PORT_DIPSETTING( 0x0000, "Level 3" ) + PORT_DIPSETTING( 0x0070, "Level 4" ) + PORT_DIPSETTING( 0x0060, "Level 5" ) + PORT_DIPSETTING( 0x0050, "Level 6" ) + PORT_DIPSETTING( 0x0040, "Level 7" ) + PORT_DIPSETTING( 0x0030, "Level 8" ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW2") /* 500002.w */ + PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) + PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) + PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") /* Will go into negative credits and cause graphics issues */ + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500004.w */ + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( moremore ) + PORT_START("DSW1") /* 500000.w */ + PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x000e, 0x000e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4") + PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x000a, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x000c, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( 1C_3C ) ) + PORT_DIPNAME( 0x0070, 0x0070, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7") + PORT_DIPSETTING( 0x0020, "Level 1" ) + PORT_DIPSETTING( 0x0010, "Level 2" ) + PORT_DIPSETTING( 0x0000, "Level 3" ) + PORT_DIPSETTING( 0x0070, "Level 4" ) + PORT_DIPSETTING( 0x0060, "Level 5" ) + PORT_DIPSETTING( 0x0050, "Level 6" ) + PORT_DIPSETTING( 0x0040, "Level 7" ) + PORT_DIPSETTING( 0x0030, "Level 8" ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW2") /* 500002.w */ + PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) + PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) + PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500004.w */ + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +// don't trust the test mode! <-- Verified via actual game play: Demo Sounds, Coinage & Free Play +static INPUT_PORTS_START( mcheonru ) + PORT_START("DSW1") /* 500000.w */ + PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x000e, 0x000e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4") + PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) ) /* Duplicate */ + PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) ) /* Duplicate */ + PORT_DIPSETTING( 0x0004, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x000a, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x000c, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( 1C_3C ) ) + PORT_DIPNAME( 0x0070, 0x0070, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7") + PORT_DIPSETTING( 0x0020, "Level 1" ) + PORT_DIPSETTING( 0x0010, "Level 2" ) + PORT_DIPSETTING( 0x0000, "Level 3" ) + PORT_DIPSETTING( 0x0070, "Level 4" ) + PORT_DIPSETTING( 0x0060, "Level 5" ) + PORT_DIPSETTING( 0x0050, "Level 6" ) + PORT_DIPSETTING( 0x0040, "Level 7" ) + PORT_DIPSETTING( 0x0030, "Level 8" ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW2") /* 500002.w */ + PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:1") + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0002, 0x0002, "Tile Type" ) PORT_DIPLOCATION("SW2:2") /* Does NOT show up in service mode! */ + PORT_DIPSETTING( 0x0002, "Picture" ) + PORT_DIPSETTING( 0x0000, "Traditional" ) + PORT_DIPNAME( 0x0004, 0x0004, "Mini Game Frequency" ) PORT_DIPLOCATION("SW2:3") /* Does NOT show up in service mode! */ + PORT_DIPSETTING( 0x0004, "Every 3 Rounds" ) + PORT_DIPSETTING( 0x0000, "Every Round" ) + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:4") + PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:5") + PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:6") + PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7") + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500004.w */ + PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( twinkle ) + PORT_START("DSW1") /* 500000.w */ + PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x000e, 0x000e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4") + PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x000a, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x000c, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( 1C_3C ) ) + PORT_DIPNAME( 0x0070, 0x0070, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7") // this is what service mode lists, but I don't trust it. + PORT_DIPSETTING( 0x0020, "Level 1" ) + PORT_DIPSETTING( 0x0010, "Level 2" ) + PORT_DIPSETTING( 0x0000, "Level 3" ) + PORT_DIPSETTING( 0x0070, "Level 4" ) + PORT_DIPSETTING( 0x0060, "Level 5" ) + PORT_DIPSETTING( 0x0050, "Level 6" ) + PORT_DIPSETTING( 0x0040, "Level 7" ) + PORT_DIPSETTING( 0x0030, "Level 8" ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW2") /* 500002.w */ + PORT_DIPNAME( 0x0003, 0x0002, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") // unlisted in service mode + PORT_DIPSETTING( 0x0000, "1" ) + PORT_DIPSETTING( 0x0003, "2" ) + PORT_DIPSETTING( 0x0002, "3" ) + PORT_DIPSETTING( 0x0001, "4" ) + PORT_DIPUNKNOWN_DIPLOC( 0x0004, 0x0000, "SW2:3" ) + PORT_DIPUNKNOWN_DIPLOC( 0x0008, 0x0000, "SW2:4" ) + PORT_DIPNAME( 0x0010, 0x0010, "Pellet Animations" ) PORT_DIPLOCATION("SW2:5") // unlisted in service mode + PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x0020, 0x0000, "SW2:6" ) + PORT_DIPUNKNOWN_DIPLOC( 0x0040, 0x0000, "SW2:7" ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500004.w */ + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +// don't trust the test mode! <-- Verified via actual game play: Demo Sounds, Coinage & Free Play +static INPUT_PORTS_START( pzlbreak ) + PORT_START("DSW1") /* 500000.w */ + PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x000e, 0x000e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4") + PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x000a, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x000c, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( 1C_3C ) ) + PORT_DIPNAME( 0x0070, 0x0070, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7") + PORT_DIPSETTING( 0x0020, "Level 1" ) + PORT_DIPSETTING( 0x0010, "Level 2" ) + PORT_DIPSETTING( 0x0000, "Level 3" ) + PORT_DIPSETTING( 0x0070, "Level 4" ) + PORT_DIPSETTING( 0x0060, "Level 5" ) + PORT_DIPSETTING( 0x0050, "Level 6" ) + PORT_DIPSETTING( 0x0040, "Level 7" ) + PORT_DIPSETTING( 0x0030, "Level 8" ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW2") /* 500002.w */ + PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) + PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) + PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500004.w */ + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( toppyrap ) + PORT_START("DSW1") /* 500000.w */ + PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW1:2" ) + PORT_DIPNAME( 0x001c, 0x001c, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:3,4,5") + PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x000c, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x001c, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x0014, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x0018, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( 1C_3C ) ) + PORT_DIPNAME( 0x0060, 0x0060, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:6,7") + PORT_DIPSETTING( 0x0000, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x0060, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x0040, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Hardest ) ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW2") /* 500002.w */ + PORT_DIPNAME( 0x03, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") + PORT_DIPSETTING( 0x0000, "2" ) + PORT_DIPSETTING( 0x0003, "3" ) + PORT_DIPSETTING( 0x0002, "4" ) + PORT_DIPSETTING( 0x0001, "5" ) + PORT_DIPNAME( 0x000c, 0x000c, "Time" ) PORT_DIPLOCATION("SW2:3,4") + PORT_DIPSETTING( 0x0004, "40 Seconds" ) + PORT_DIPSETTING( 0x0008, "50 Seconds" ) + PORT_DIPSETTING( 0x000c, "60 Seconds" ) + PORT_DIPSETTING( 0x0000, "70 Seconds" ) + PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) + PORT_DIPNAME( 0x0020, 0x0020, "God Mode" ) PORT_DIPLOCATION("SW2:6") + PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, "Internal Test" ) PORT_DIPLOCATION("SW2:7") + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500004.w */ + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( finalttr ) + PORT_START("DSW1") /* 500001 */ + PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Demo_Sounds ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0001, DEF_STR( On ) ) + PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coinage ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x0030, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x0038, DEF_STR( 1C_1C ) ) +/* PORT_DIPSETTING( 0x0018, DEF_STR( 1C_1C ) ) Duplicate setting? */ + PORT_DIPSETTING( 0x0020, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x0028, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( 1C_4C ) ) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Must be low or game stops! */ + /* probably VBlank */ + PORT_START("DSW2") /* 500003 */ + PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x000c, 0x000c, "Time" ) + PORT_DIPSETTING( 0x0000, "60 Seconds" ) + PORT_DIPSETTING( 0x000c, "90 Seconds" ) + PORT_DIPSETTING( 0x0008, "120 Seconds" ) + PORT_DIPSETTING( 0x0004, "150 Seconds" ) + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") /* 500005 */ + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + +// ignore service mode, it shows a regular joystick + 3 buttons config, these game simply uses 6 buttons +static INPUT_PORTS_START( suhosong ) + PORT_START("DSW1") + PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW1:2" ) + PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW1:3" ) + PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW1:4" ) + PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW1:5" ) + PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW1:6" ) + PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW1:7" ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Button 4 / Stand / Stop / Drop / Full Bet / Take") PORT_CODE(KEYCODE_V) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Button 1 / High") PORT_CODE(KEYCODE_Z) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Button 2 / Low") PORT_CODE(KEYCODE_X) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Button 3 / Hit / Go / Double Up") PORT_CODE(KEYCODE_C) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Button 6 / Bet / Raise") PORT_CODE(KEYCODE_N) + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW2") + PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) + PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) + PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) + PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) + PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) + PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) + PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0000, "SW2:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Button 5 / Start / Double / Call / Check") PORT_CODE(KEYCODE_B) // Double != Double Up + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) +INPUT_PORTS_END + + + + +static INPUT_PORTS_START( yutnori ) + PORT_START("DSW1") + PORT_DIPNAME( 0x007, 0x0007, "Coin / Credit" ) PORT_DIPLOCATION("SW1:1,2,3") + PORT_DIPSETTING( 0x0004, "1 / 50" ) + PORT_DIPSETTING( 0x0003, "1 / 40" ) + PORT_DIPSETTING( 0x0002, "1 / 30" ) + PORT_DIPSETTING( 0x0007, "2 / 50" ) + PORT_DIPSETTING( 0x0006, "2 / 40" ) + PORT_DIPSETTING( 0x0005, "2 / 30" ) + PORT_DIPSETTING( 0x0001, "3 / 50" ) + PORT_DIPSETTING( 0x0000, "3 / 40" ) + PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5,6") + PORT_DIPSETTING( 0x0030, "1" ) + PORT_DIPSETTING( 0x0028, "2" ) + PORT_DIPSETTING( 0x0020, "3" ) + PORT_DIPSETTING( 0x0038, "4" ) + PORT_DIPSETTING( 0x0018, "5" ) + PORT_DIPSETTING( 0x0010, "6" ) + PORT_DIPSETTING( 0x0008, "7" ) + PORT_DIPSETTING( 0x0000, "8" ) + PORT_DIPNAME( 0xc0, 0xc0, "Mal Count" ) PORT_DIPLOCATION("SW1:7,8") + PORT_DIPSETTING( 0x40, "2" ) + PORT_DIPSETTING( 0xc0, "3" ) + PORT_DIPSETTING( 0x00, "4" ) + PORT_DIPSETTING( 0x80, "5" ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("DSW2") + PORT_DIPNAME( 0x03, 0x03, "Base Bet" ) PORT_DIPLOCATION("SW2:1,2") + PORT_DIPSETTING( 0x00, "20" ) + PORT_DIPSETTING( 0x01, "30" ) + PORT_DIPSETTING( 0x02, "40" ) + PORT_DIPSETTING( 0x03, "50" ) + PORT_DIPNAME( 0x0c, 0x0c, "Max Bet" ) PORT_DIPLOCATION("SW2:3,4") + PORT_DIPSETTING( 0x04, "150" ) + PORT_DIPSETTING( 0x08, "200" ) + PORT_DIPSETTING( 0x0c, "300" ) + PORT_DIPSETTING( 0x00, "400" ) + PORT_DIPNAME( 0x30, 0x30, "Score" ) PORT_DIPLOCATION("SW2:5,6") + PORT_DIPSETTING( 0x10, "800 1200 1600" ) + PORT_DIPSETTING( 0x30, "1000 1500 2000" ) + PORT_DIPSETTING( 0x00, "1200 1800 2400" ) + PORT_DIPSETTING( 0x20, "1000 2000 3000" ) + PORT_DIPNAME( 0x0040, 0x0040, "Bet -> Score" ) PORT_DIPLOCATION("SW2:7") + PORT_DIPSETTING( 0x0040, DEF_STR( On ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) + PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW2:8" ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + + PORT_START("SYSTEM") + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END + + +/* SnowBros */ + +static GFXDECODE_START( gfx_snowbros ) + GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0, 16 ) +GFXDECODE_END + +/* Honey Doll */ + +static const gfx_layout honeydol_tilelayout8bpp = +{ + 16,16, + RGN_FRAC(1,2), + 8, + { 0, 1, 2, 3, RGN_FRAC(1,2)+0, RGN_FRAC(1,2)+1, RGN_FRAC(1,2)+2, RGN_FRAC(1,2)+3}, + { STEP8(0,4), STEP8(8*32,4) }, + { STEP8(0,32), STEP8(16*32,32) }, + 32*32 +}; + +static GFXDECODE_START( gfx_honeydol ) + GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0, 64 ) // how does it use 0-15 + GFXDECODE_ENTRY( "gfx2", 0, honeydol_tilelayout8bpp, 0, 4 ) + +GFXDECODE_END + +static GFXDECODE_START( gfx_twinadv ) + GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0, 64 ) +GFXDECODE_END + +/* Winter Bobble */ + +static const gfx_layout tilelayout_wb = +{ + 16,16, + RGN_FRAC(1,1), + 4, + { 0, 1, 2, 3 }, + { STEP4(3*4,-4), STEP4(7*4,-4), STEP4(11*4,-4), STEP4(15*4,-4) }, + { STEP16(0,64) }, + 16*64 +}; + +static GFXDECODE_START( gfx_wb ) + GFXDECODE_ENTRY( "gfx1", 0, tilelayout_wb, 0, 16 ) +GFXDECODE_END + +/* SemiCom */ + +static const gfx_layout hyperpac_tilelayout = +{ + 16,16, + RGN_FRAC(1,1), + 4, + { 0, 1, 2, 3 }, + { 4, 0, 8*32+4, 8*32+0, 20,16, 8*32+20, 8*32+16, + 12, 8, 8*32+12, 8*32+8, 28, 24, 8*32+28, 8*32+24 }, + { 0*32, 2*32, 1*32, 3*32, 16*32+0*32, 16*32+2*32, 16*32+1*32, 16*32+3*32, + 4*32, 6*32, 5*32, 7*32, 16*32+4*32, 16*32+6*32, 16*32+5*32, 16*32+7*32 }, + 32*32 +}; + + +static const gfx_layout sb3_tilebglayout = +{ + 16,16, + RGN_FRAC(1,1), + 8, + {8, 9,10, 11, 0, 1, 2, 3 }, + { 0, 4, 16, 20, 32, 36, 48, 52, + 512+0,512+4,512+16,512+20,512+32,512+36,512+48,512+52}, + { 0*64, 1*64, 2*64, 3*64, 4*64, 5*64, 6*64, 7*64, + 1024+0*16,1024+1*64,1024+2*64,1024+3*64,1024+4*64,1024+5*64,1024+6*64,1024+7*64}, + 32*64 +}; + + +static GFXDECODE_START( gfx_sb3 ) + GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0, 16 ) + GFXDECODE_ENTRY( "gfx2", 0, sb3_tilebglayout, 0, 2 ) +GFXDECODE_END + +static GFXDECODE_START( gfx_hyperpac ) + GFXDECODE_ENTRY( "gfx1", 0, hyperpac_tilelayout, 0, 16 ) +GFXDECODE_END + +MACHINE_RESET_MEMBER(snowbros_state,semiprot) +{ + uint16_t *PROTDATA = (uint16_t*)memregion("user1")->base(); + int i; + + for (i = 0;i < 0x200/2;i++) + m_hyperpac_ram[0xf000/2 + i] = PROTDATA[i]; +} + +MACHINE_RESET_MEMBER(snowbros_state,finalttr) +{ + uint16_t *PROTDATA = (uint16_t*)memregion("user1")->base(); + int i; + + for (i = 0;i < 0x200/2;i++) + m_hyperpac_ram[0x2000/2 + i] = PROTDATA[i]; +} + +void snowbros_state::snowbros(machine_config &config) +{ + /* basic machine hardware */ + M68000(config, m_maincpu, XTAL(16'000'000)/2); /* 8 Mhz - confirmed */ + m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::snowbros_map); + TIMER(config, "scantimer", 0).configure_scanline(FUNC(snowbros_state::snowbros_irq), "screen", 0, 1); + WATCHDOG_TIMER(config, "watchdog"); + + Z80(config, m_soundcpu, XTAL(12'000'000)/2); /* 6 MHz - confirmed */ + m_soundcpu->set_addrmap(AS_PROGRAM, &snowbros_state::sound_map); + m_soundcpu->set_addrmap(AS_IO, &snowbros_state::sound_io_map); + + /* video hardware */ + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_refresh_hz(57.5); /* ~57.5 - confirmed */ + m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); + m_screen->set_size(32*8, 262); + m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); + m_screen->set_screen_update(FUNC(snowbros_state::screen_update_snowbros)); + m_screen->screen_vblank().set(FUNC(snowbros_state::screen_vblank_snowbros)); + m_screen->set_palette(m_palette); + + GFXDECODE(config, m_gfxdecode, m_palette, gfx_snowbros); + PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 256); + + KANEKO_PANDORA(config, m_pandora, 0); + m_pandora->set_gfxdecode_tag(m_gfxdecode); + + /* sound hardware */ + SPEAKER(config, "mono").front_center(); + + GENERIC_LATCH_8(config, m_soundlatch); + m_soundlatch->data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_NMI); + + GENERIC_LATCH_8(config, "soundlatch2"); + + ym3812_device &ymsnd(YM3812(config, "ymsnd", XTAL(12'000'000)/4)); /* 3 MHz - confirmed */ + ymsnd.irq_handler().set_inputline("soundcpu", 0); + ymsnd.add_route(ALL_OUTPUTS, "mono", 1.0); +} + +void snowbros_state::wintbob(machine_config &config) +{ + snowbros(config); + + /* basic machine hardware */ + m_maincpu->set_clock(10000000); /* 10mhz - Confirmed */ + m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::wintbob_map); + + config.device_remove("pandora"); + + /* video hardware */ + m_gfxdecode->set_info(gfx_wb); + + m_screen->set_screen_update(FUNC(snowbros_state::screen_update_wintbob)); + m_screen->screen_vblank().set_nop(); +} + +void snowbros_state::semicom(machine_config &config) +{ + snowbros(config); + + /* basic machine hardware */ + m_maincpu->set_clock(XTAL(12'000'000)); /* 12MHz - Confirmed */ + m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::hyperpac_map); + + m_soundcpu->set_clock(XTAL(16'000'000)/4); /* 4MHz - Confirmed */ + m_soundcpu->set_addrmap(AS_PROGRAM, &snowbros_state::hyperpac_sound_map); + m_soundcpu->set_addrmap(AS_IO, address_map_constructor()); + + m_gfxdecode->set_info(gfx_hyperpac); + + m_soundlatch->data_pending_callback().set_nop(); + + config.device_remove("soundlatch2"); + + /* sound hardware */ + ym2151_device &ymsnd(YM2151(config.replace(), "ymsnd", XTAL(16'000'000)/4)); /* 4MHz - Confirmed */ + ymsnd.irq_handler().set_inputline(m_soundcpu, 0); + ymsnd.add_route(0, "mono", 0.10); + ymsnd.add_route(1, "mono", 0.10); + + OKIM6295(config, m_oki, XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH); /* 1MHz & pin 7 High - Confirmed */ + m_oki->add_route(ALL_OUTPUTS, "mono", 1.0); +} + +void snowbros_state::semicom_mcu(machine_config &config) +{ + semicom(config); + + /* basic machine hardware */ + at89c52_device &prot(AT89C52(config, "protection", XTAL(16'000'000))); + prot.port_out_cb<0>().set(FUNC(snowbros_state::prot_p0_w)); + prot.port_out_cb<1>().set(FUNC(snowbros_state::prot_p1_w)); + prot.port_out_cb<2>().set(FUNC(snowbros_state::prot_p2_w)); +} + + +void snowbros_state::semiprot(machine_config &config) +{ + semicom(config); + MCFG_MACHINE_RESET_OVERRIDE(snowbros_state, semiprot) +} + + +void snowbros_state::honeydol(machine_config &config) +{ + /* basic machine hardware */ + M68000(config, m_maincpu, XTAL(12'000'000)); /* MC68000P12 @ 12MHz */ + m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::honeydol_map); + TIMER(config, "scantimer", 0).configure_scanline(FUNC(snowbros_state::snowbros_irq), "screen", 0, 1); + + Z80(config, m_soundcpu, XTAL(16'000'000)/4); /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */ + m_soundcpu->set_addrmap(AS_PROGRAM, &snowbros_state::honeydol_sound_map); + m_soundcpu->set_addrmap(AS_IO, &snowbros_state::honeydol_sound_io_map); + + /* video hardware */ + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_refresh_hz(57.5); + m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ + m_screen->set_size(32*8, 262); + m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); + m_screen->set_screen_update(FUNC(snowbros_state::screen_update_honeydol)); + m_screen->set_palette(m_palette); + + GFXDECODE(config, m_gfxdecode, m_palette, gfx_honeydol); + PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x800/2); + + /* sound hardware */ + SPEAKER(config, "mono").front_center(); + + GENERIC_LATCH_8(config, m_soundlatch); + m_soundlatch->data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_NMI); + + ym3812_device &ymsnd(YM3812(config, "ymsnd", XTAL(12'000'000)/4)); /* 3Mhz */ + ymsnd.irq_handler().set_inputline("soundcpu", 0); + ymsnd.add_route(ALL_OUTPUTS, "mono", 1.0); + + OKIM6295(config, m_oki, XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH); /* freq? */ + m_oki->add_route(ALL_OUTPUTS, "mono", 1.0); +} + +void snowbros_state::twinadv(machine_config &config) +{ + /* basic machine hardware */ + M68000(config, m_maincpu, XTAL(12'000'000)); /* 12MHz like Honey Doll ? */ + m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::twinadv_map); + TIMER(config, "scantimer", 0).configure_scanline(FUNC(snowbros_state::snowbros_irq), "screen", 0, 1); + WATCHDOG_TIMER(config, "watchdog"); + + Z80(config, m_soundcpu, XTAL(16'000'000)/4); /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */ + m_soundcpu->set_addrmap(AS_PROGRAM, &snowbros_state::sound_map); + m_soundcpu->set_addrmap(AS_IO, &snowbros_state::twinadv_sound_io_map); + m_soundcpu->set_vblank_int("screen", FUNC(snowbros_state::irq0_line_hold)); + + /* video hardware */ + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_refresh_hz(57.5); + m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ + m_screen->set_size(32*8, 262); + m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); + m_screen->set_screen_update(FUNC(snowbros_state::screen_update_twinadv)); + m_screen->set_palette(m_palette); + + GFXDECODE(config, m_gfxdecode, m_palette, gfx_twinadv); + PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x100); + + /* sound hardware */ + SPEAKER(config, "mono").front_center(); + + GENERIC_LATCH_8(config, m_soundlatch); + m_soundlatch->data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_NMI); + + GENERIC_LATCH_8(config, "soundlatch2"); + + /* sound hardware */ + OKIM6295(config, m_oki, XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH); /* freq? */ + m_oki->add_route(ALL_OUTPUTS, "mono", 1.0); +} + + +/* + +Final Tetris + +the pcb is korean and probably original even if it's very cheap. + +osc 12mhz +osc 3.579545mhz +68000 +z8004b +CA5101 (sound chip) +OKI M6295 (sound chip) +Intel P8752 (mcu) + +2x dips banks + +*/ + +void snowbros_state::finalttr(machine_config &config) +{ + semicom(config); + + m_maincpu->set_clock(XTAL(12'000'000)); + m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::finalttr_map); + + m_soundcpu->set_clock(XTAL(3'579'545)); + + MCFG_MACHINE_RESET_OVERRIDE(snowbros_state, finalttr) + + ym2151_device &ymsnd(YM2151(config.replace(), "ymsnd", XTAL(3'579'545))); /* possible but less likely 4MHz (12MHz/3) */ + ymsnd.irq_handler().set_inputline(m_soundcpu, 0); + ymsnd.add_route(0, "mono", 0.08); + ymsnd.add_route(1, "mono", 0.08); + + m_oki->set_clock(999900); + m_oki->reset_routes().add_route(ALL_OUTPUTS, "mono", 0.4); +} + + +void snowbros_state::_4in1(machine_config &config) +{ + semicom(config); + + /* basic machine hardware */ + m_gfxdecode->set_info(gfx_snowbros); +} + +void snowbros_state::snowbro3(machine_config &config) /* PCB has 16MHz & 12MHz OSCs */ +{ + /* basic machine hardware */ + M68000(config, m_maincpu, XTAL(12'000'000)); /* MC68000P10 CPU @ 12mhz or 8MHz (16MHz/2) ? */ + m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::snowbros3_map); + TIMER(config, "scantimer", 0).configure_scanline(FUNC(snowbros_state::snowbros3_irq), "screen", 0, 1); + WATCHDOG_TIMER(config, "watchdog"); + + /* video hardware */ + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_refresh_hz(60); + m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); + m_screen->set_size(32*8, 32*8); + m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); + m_screen->set_screen_update(FUNC(snowbros_state::screen_update_snowbro3)); + m_screen->set_palette(m_palette); + + GFXDECODE(config, m_gfxdecode, m_palette, gfx_sb3); + PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 512); + + /* sound hardware */ + SPEAKER(config, "mono").front_center(); + + OKIM6295(config, m_oki, XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH); // clock frequency & pin 7 not verified + m_oki->add_route(ALL_OUTPUTS, "mono", 1.0); +} + +void snowbros_state::yutnori(machine_config &config) +{ + /* basic machine hardware */ + M68000(config, m_maincpu, XTAL(16'000'000)/2); + m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::yutnori_map); + TIMER(config, "scantimer", 0).configure_scanline(FUNC(snowbros_state::snowbros_irq), "screen", 0, 1); + +// WATCHDOG_TIMER(config, "watchdog"); // maybe + + /* video hardware */ + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_refresh_hz(57.5); + m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); + m_screen->set_size(32*8, 262); + m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); + m_screen->set_screen_update(FUNC(snowbros_state::screen_update_snowbros)); + m_screen->screen_vblank().set(FUNC(snowbros_state::screen_vblank_snowbros)); + m_screen->set_palette(m_palette); + + GFXDECODE(config, m_gfxdecode, m_palette, gfx_hyperpac); + PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 256); + + KANEKO_PANDORA(config, m_pandora, 0); + m_pandora->set_gfxdecode_tag(m_gfxdecode); + + /* sound hardware */ + SPEAKER(config, "mono").front_center(); + + okim6295_device &oki1(OKIM6295(config, "oki1", XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified + oki1.add_route(ALL_OUTPUTS, "mono", 1.0); + + okim6295_device &oki2(OKIM6295(config, "oki2", XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified + oki2.add_route(ALL_OUTPUTS, "mono", 1.0); +} + +/*************************************************************************** + + ROM definitions + +***************************************************************************/ + +ROM_START( snowbros ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "sn6.bin", 0x00000, 0x20000, CRC(4899ddcf) SHA1(47d750d3022a80e47ffabe47566bb2556cc8d477) ) + ROM_LOAD16_BYTE( "sn5.bin", 0x00001, 0x20000, CRC(ad310d3f) SHA1(f39295b38d99087dbb9c5b00bf9cb963337a50e2) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) + /* where were these from, a bootleg? */ +// ROM_LOAD( "ch0", 0x00000, 0x20000, CRC(36d84dfe) SHA1(5d45a750220930bc409de30f19282bb143fbf94f) ) +// ROM_LOAD( "ch1", 0x20000, 0x20000, CRC(76347256) SHA1(48ec03965905adaba5e50eb3e42a2813f7883bb4) ) +// ROM_LOAD( "ch2", 0x40000, 0x20000, CRC(fdaa634c) SHA1(1271c74df7da7596caf67caae3c51b4c163a49f4) ) +// ROM_LOAD( "ch3", 0x60000, 0x20000, CRC(34024aef) SHA1(003a9b9ee3aaab3d787894d3d4126d372b19d2a8) ) +ROM_END + +ROM_START( snowbrosa ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "sbros-3a.5", 0x00000, 0x20000, CRC(10cb37e1) SHA1(786be4640f8df2c81a32decc189ea7657ace00c6) ) + ROM_LOAD16_BYTE( "sbros-2a.6", 0x00001, 0x20000, CRC(ab91cc1e) SHA1(8cff61539dc7d35fcbf110d3e54fc1883e7b8509) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) +ROM_END + +ROM_START( snowbrosb ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "sbros3-a", 0x00000, 0x20000, CRC(301627d6) SHA1(0d1dc70091c87e9c27916d4232ff31b7381a64e1) ) + ROM_LOAD16_BYTE( "sbros2-a", 0x00001, 0x20000, CRC(f6689f41) SHA1(e4fd27b930a31479c0d99e0ddd23d5db34044666) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) +ROM_END + +ROM_START( snowbrosc ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "3-a.ic5", 0x00000, 0x20000, CRC(e1bc346b) SHA1(a20c343d9ed2ad4f785d21076499008edad251f9) ) + ROM_LOAD16_BYTE( "2-a.ic6", 0x00001, 0x20000, CRC(1be27f9d) SHA1(76dd14480b9274831e51016f7bb57459d7b15cf9) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) +ROM_END + +ROM_START( snowbrosd ) /* Korean release, but no specific "For use in Korea only..." notice screen */ + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "sbk_3-a.bin", 0x00000, 0x20000, CRC(97174d40) SHA1(481e8c680af8b03d4bcf97b87ca0ba5a3ffca0d7) ) + ROM_LOAD16_BYTE( "sbk_2-a.bin", 0x00001, 0x20000, CRC(80cc80e5) SHA1(1eeca0924c93e9f0536683160e80c59871569088) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) +ROM_END + +ROM_START( snowbrosj )/* "For use in Japan only..." notice screen */ + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "snowbros.3", 0x00000, 0x20000, CRC(3f504f9e) SHA1(700758b114c3fde6ea8f84222af0850dba13cd3b) ) + ROM_LOAD16_BYTE( "snowbros.2", 0x00001, 0x20000, CRC(854b02bc) SHA1(4ad1548eef94dcb95119cb4a7dcdefa037591b5b) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + /* The gfx ROM (snowbros.1) was bad, I'm using the ones from the other sets. */ + ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) +ROM_END + +ROM_START( wintbob ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "wb3", 0x00000, 0x10000, CRC(b9719767) SHA1(431c97d409f2a5ff7f46116a4d8907e446434431) ) + ROM_LOAD16_BYTE( "wb1", 0x00001, 0x10000, CRC(a4488998) SHA1(4e927e31c1b865dbdba2b985c7a819a07e2e81b8) ) + + /* The wb03.bin below is bad, the set has a different copyright message (IN KOREA is replaced with 1990) + but also clearly suffers from bitrot at the following addresses + 4FC2, 5F02, 6642, D6C2, D742 + in all cases bit 0x20 is incorrectly set in the bad rom + */ + +// ROM_LOAD16_BYTE( "wb03.bin", 0x00000, 0x10000, CRC(df56e168) SHA1(20dbabdd97e6f3d4bf6500bf9e8476942cb48ae3) ) +// ROM_LOAD16_BYTE( "wb01.bin", 0x00001, 0x10000, CRC(05722f17) SHA1(9356e2488ea35e0a2978689f2ca6dfa0d57fd2ed) ) + + ROM_LOAD16_BYTE( "wb04.bin", 0x20000, 0x10000, CRC(53be758d) SHA1(56cf85ba23fe699031d73e8f367a1b8ac837d5f8) ) + ROM_LOAD16_BYTE( "wb02.bin", 0x20001, 0x10000, CRC(fc8e292e) SHA1(857cfeb0be121e64e6117120514ae1f2ffeae4d6) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "wb05.bin", 0x0000, 0x10000, CRC(53fe59df) SHA1(a99053e82b9fed76f744fa9f67078294641c6317) ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD16_BYTE( "wb13.bin", 0x00000, 0x10000, CRC(426921de) SHA1(5107c58e7e08d71895baa67fe260b17ebd61389c) ) + ROM_LOAD16_BYTE( "wb06.bin", 0x00001, 0x10000, CRC(68204937) SHA1(fd2ef93df5fd8aa2d36072858dbcfce41157ef3e) ) + ROM_LOAD16_BYTE( "wb12.bin", 0x20000, 0x10000, CRC(ef4e04c7) SHA1(17158b61b3c158e0491db9abb2e1a8c20d981d37) ) + ROM_LOAD16_BYTE( "wb07.bin", 0x20001, 0x10000, CRC(53f40978) SHA1(058bbf3b7877f0cd320383e0386c5959e0d6589b) ) + ROM_LOAD16_BYTE( "wb11.bin", 0x40000, 0x10000, CRC(41cb4563) SHA1(94f1d12d299ac08fc8522139e1927f0cf739be75) ) + ROM_LOAD16_BYTE( "wb08.bin", 0x40001, 0x10000, CRC(9497b88c) SHA1(367c6106276f3816528341f11f3a97ae458d25cd) ) + ROM_LOAD16_BYTE( "wb10.bin", 0x60000, 0x10000, CRC(5fa22b1e) SHA1(1164003d873e9738a3ca133cce689c7120061e3c) ) + ROM_LOAD16_BYTE( "wb09.bin", 0x60001, 0x10000, CRC(9be718ca) SHA1(5c195e4f13efbdb229201d2408d018861bf389cc) ) +ROM_END + + +ROM_START( snowbroswb ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "toa3.bin", 0x00000, 0x10000, CRC(55d302da) SHA1(235f1cd5adeb783f42bd7261e6f575826235c5b2) ) + ROM_LOAD16_BYTE( "toa1.bin", 0x00001, 0x10000, CRC(3c64e145) SHA1(46c3ba17aac516fc203d2d82ed5452b8212f5edb) ) + ROM_LOAD16_BYTE( "wb04.bin", 0x20000, 0x10000, CRC(53be758d) SHA1(56cf85ba23fe699031d73e8f367a1b8ac837d5f8) ) + ROM_LOAD16_BYTE( "wb02.bin", 0x20001, 0x10000, CRC(fc8e292e) SHA1(857cfeb0be121e64e6117120514ae1f2ffeae4d6) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "wb05.bin", 0x0000, 0x10000, CRC(53fe59df) SHA1(a99053e82b9fed76f744fa9f67078294641c6317) ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD16_BYTE( "wb13.bin", 0x00000, 0x10000, CRC(426921de) SHA1(5107c58e7e08d71895baa67fe260b17ebd61389c) ) + ROM_LOAD16_BYTE( "wb06.bin", 0x00001, 0x10000, CRC(68204937) SHA1(fd2ef93df5fd8aa2d36072858dbcfce41157ef3e) ) + ROM_LOAD16_BYTE( "wb12.bin", 0x20000, 0x10000, CRC(ef4e04c7) SHA1(17158b61b3c158e0491db9abb2e1a8c20d981d37) ) + ROM_LOAD16_BYTE( "wb07.bin", 0x20001, 0x10000, CRC(53f40978) SHA1(058bbf3b7877f0cd320383e0386c5959e0d6589b) ) + ROM_LOAD16_BYTE( "wb11.bin", 0x40000, 0x10000, CRC(41cb4563) SHA1(94f1d12d299ac08fc8522139e1927f0cf739be75) ) + ROM_LOAD16_BYTE( "wb08.bin", 0x40001, 0x10000, CRC(9497b88c) SHA1(367c6106276f3816528341f11f3a97ae458d25cd) ) + ROM_LOAD16_BYTE( "wb10.bin", 0x60000, 0x10000, CRC(5fa22b1e) SHA1(1164003d873e9738a3ca133cce689c7120061e3c) ) + ROM_LOAD16_BYTE( "wb09.bin", 0x60001, 0x10000, CRC(9be718ca) SHA1(5c195e4f13efbdb229201d2408d018861bf389cc) ) +ROM_END + +ROM_START( toto ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "u60.5j", 0x00000, 0x20000, CRC(39203792) SHA1(4c8d560be02a514cbf91774c7a0b4a95cf573356) ) + ROM_LOAD16_BYTE( "u51.4j", 0x00001, 0x20000, CRC(7b846cd4) SHA1(04aa0bbaab4303fb08dff52d5515f7e764f1be6d)) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "u46.4c", 0x0000, 0x8000, CRC(77b1ef42) SHA1(75e3c8c2b687669cc56f972dd7375dab5185859c) ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD( "u107.8k", 0x00000, 0x20000, CRC(4486153b) SHA1(a6dc0c17bf2328ab725bce4aaa0a413a42129fb0) ) + ROM_LOAD( "u108.8l", 0x20000, 0x20000, CRC(3286cf5f) SHA1(133366b0e10ab86111247cbedf329e8e3a7f2148) ) + ROM_LOAD( "u109.8m", 0x40000, 0x20000, CRC(464d7251) SHA1(f03ee54e9301ea87de4171cecdbad4a5e17929c4) ) + ROM_LOAD( "u110.8n", 0x60000, 0x20000, CRC(7dea56df) SHA1(7e7b9238837c6f4221cff416a2de21723d2c9272) ) +ROM_END + +/* Barko */ + +/* + +Honey Doll - Barko Corp 1995 + +Rom Board include a Cypress cy7C382-0JC chip + +Main Board : + +CPU : 1 X MC68000P12 + 1 X Z80B + +1 X Oki M6295 +2 X Cypress CY7C384A-XJC + +2 x quartz - 12Mhz and 16Mhz + +*/ + +ROM_START( honeydol ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "d-16.uh12", 0x00001, 0x20000, CRC(cee1a2e3) SHA1(6d1ff5358ec704616b724eea2ab9b60b84709eb1) ) + ROM_LOAD16_BYTE( "d-17.ui12", 0x00000, 0x20000, CRC(cac44154) SHA1(2c30dc033001fc9303da7e117e3401bc7af16607) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "d-12.uh15", 0x0000, 0x8000, CRC(386f1b63) SHA1(d719875226cd3d380e2ebec49209590d91b6f07b) ) + + ROM_REGION( 0x80000, "gfx1", 0 ) // 4 bpp gfx + ROM_LOAD( "d-13.1", 0x000000, 0x80000, CRC(ff6a57fb) SHA1(2fbf61f4ac2655a60b1fa82bb6d001f0ef8b4654) ) + + ROM_REGION( 0x200000, "gfx2", 0 ) + ROM_LOAD( "d-14.5", 0x000000, 0x80000, CRC(2178996f) SHA1(04368384cb191b28b23199c8175e93271ab79103) ) + ROM_LOAD( "d-15.6", 0x080000, 0x80000, CRC(6629239e) SHA1(5f462c04eb11c2b662236fd65bbf74fa08038eec) ) + ROM_LOAD( "d-18.9", 0x100000, 0x80000, CRC(0210507a) SHA1(5b7348bf253b1ae8bfa86cdee2ff80aa2b3faa79) ) + ROM_LOAD( "d-19.10", 0x180000, 0x80000, CRC(d27375d5) SHA1(2a39ce9b985e00a290c3ea75be3b1edbc00d39ec) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "d-11.u14", 0x00000, 0x40000, CRC(f3ee4861) SHA1(f24f1f855ae6c96a6d84a4b5e5c196df8f922d0a) ) +ROM_END + +/* + ++--------------------------------+ +| Z80A | +|GL324 6116 ua4| +|M6295 uh15 HY6264 ua5| +|J sra HY6264 ua6| +|A srb 84256 | +|M 84256 | +|M 84256 CY7C384A | +|A 84256 | +| SWA1 uh12 | +| 68000 84256 | +| SWA2 ui12 12MHz 16MHz | ++--------------------------------+ + +Produttore: Barko +N.revisione: S16K951102 +CPU +1x 68000 (main) +1x Z8400B (sound) +1x OKI M6295 (sound) +1x GL324 (sound) +1x CY7C384A +1x oscillator 12.000MHz +1x oscillator 16.000MHz + +ROMs + +1x 27256 (uh15) +2x M27C2001 (sra,srb) +1x AM27C010 (12) +1x D27C010 (13) +1x M27C4001 (14) +1x AT27C040 (15) +1x TMS27C040 (16) + +6x HY18CV8S (read protected) + +*/ + +ROM_START( twinadv ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "13.uh12", 0x00001, 0x20000, CRC(9f70a39b) SHA1(d49823be58b00c4c5a4f6cc4e4371531492aff1e) ) + ROM_LOAD16_BYTE( "12.ui12", 0x00000, 0x20000, CRC(d8776495) SHA1(15b93ded80bf9f240faef2d89b6076f33f1f4ece) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "uh15.bin", 0x0000, 0x8000, CRC(3d5acd08) SHA1(c19f686862dfc12d2fa91c2dd3d3b75d9cb410c3) ) + + ROM_REGION( 0x180000, "gfx1", 0 ) /* 4bpp gfx */ + ROM_LOAD( "16.ua4", 0x000000, 0x80000, CRC(f491e171) SHA1(f31b945b0c4b30d1b3dc6c5928b77aad4e956bc7) ) + ROM_LOAD( "15.ua5", 0x080000, 0x80000, CRC(79a08b8d) SHA1(034c0a3b9e27ac174092d265b32fb82d6ee45d47) ) + ROM_LOAD( "14.ua6", 0x100000, 0x80000, CRC(79faee0b) SHA1(7421a5fa038d01658ba5ac1f65ea87b97ac25c36) ) + + ROM_REGION( 0x080000, "oki", 0 ) /* Samples - both banks are almost the same */ + /* todo, check bank ordering .. */ + ROM_LOAD( "sra.bin", 0x00000, 0x40000, CRC(82f452c4) SHA1(95ad6ede87ceafb045ed7df40496baf96190b97f) ) // bank 1 + ROM_LOAD( "srb.bin", 0x40000, 0x40000, CRC(109e51e6) SHA1(3344c68d63bbad4a02b47143b2d2f72ce9bcb4bb) ) // bank 2 +ROM_END + +ROM_START( twinadvk ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "uh12", 0x00001, 0x20000, CRC(e0bcc738) SHA1(7fc6a793fcdd80122c0ac6409ae4cac5597b7b5a) ) + ROM_LOAD16_BYTE( "ui12", 0x00000, 0x20000, CRC(a3ee6451) SHA1(9c0b415a2f325513739f2047780c2a56df350aa5) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "uh15.bin", 0x0000, 0x8000, CRC(3d5acd08) SHA1(c19f686862dfc12d2fa91c2dd3d3b75d9cb410c3) ) + + ROM_REGION( 0x180000, "gfx1", 0 ) /* 4bpp gfx */ + ROM_LOAD( "ua4", 0x000000, 0x80000, CRC(a5aff49b) SHA1(ee162281ba643729ee007f9634c21fadd3c1cb48) ) + ROM_LOAD( "ua5", 0x080000, 0x80000, CRC(f83b3b97) SHA1(2e967d49ef411d164a0b6cf32444f60fcd8068a9) ) + ROM_LOAD( "ua6", 0x100000, 0x80000, CRC(4dfcffb9) SHA1(c157e031acbb321b9435389f9fc4e1ffebca106d) ) + + ROM_REGION( 0x080000, "oki", 0 ) /* Samples - both banks are almost the same */ + /* todo, check bank ordering .. */ + ROM_LOAD( "sra.bin", 0x00000, 0x40000, CRC(82f452c4) SHA1(95ad6ede87ceafb045ed7df40496baf96190b97f) ) // bank 1 + ROM_LOAD( "srb.bin", 0x40000, 0x40000, CRC(109e51e6) SHA1(3344c68d63bbad4a02b47143b2d2f72ce9bcb4bb) ) // bank 2 +ROM_END + +ROM_START( multi96 ) + ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "uh12", 0x00001, 0x20000, CRC(e912ea4e) SHA1(cf0b37d6b6fbdd311ef7b404c4ba2c6a7e1f8486) ) // sldh + ROM_LOAD16_BYTE( "ui12", 0x00000, 0x20000, CRC(ac99e837) SHA1(20bc1599f78a4eac65cae54350872fa292daa807) ) // sldh + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ + ROM_LOAD( "uh15.bin", 0x0000, 0x8000, CRC(3d5acd08) SHA1(c19f686862dfc12d2fa91c2dd3d3b75d9cb410c3) ) + + ROM_REGION( 0x180000, "gfx1", 0 ) /* 4bpp gfx */ + ROM_LOAD( "ua4", 0x000000, 0x80000, CRC(66cae586) SHA1(22af524b26241a6456b777a847db73ff8d3db11f) ) // sldh + ROM_LOAD( "ua5", 0x080000, 0x80000, CRC(0bd9f6bb) SHA1(400ddff7a76860caacfe8bfd803f9ccd2dba3356) ) // sldh + ROM_LOAD( "ua6", 0x100000, 0x80000, CRC(0e90b26c) SHA1(fd9b40988d03db8ed797abf859a8828bb65db8d5) ) // sldh + + ROM_REGION( 0x080000, "oki", 0 ) /* Samples - both banks are almost the same */ + /* todo, check bank ordering .. */ + ROM_LOAD( "sra.bin", 0x00000, 0x40000, CRC(82f452c4) SHA1(95ad6ede87ceafb045ed7df40496baf96190b97f) ) // bank 1 + ROM_LOAD( "srb.bin", 0x40000, 0x40000, CRC(109e51e6) SHA1(3344c68d63bbad4a02b47143b2d2f72ce9bcb4bb) ) // bank 2 +ROM_END + +/* SemiCom Games */ + +ROM_START( hyperpac ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "hyperpac.h12", 0x00001, 0x20000, CRC(2cf0531a) SHA1(c4321d728845035507352d0bcf4348d28b92e85e) ) + ROM_LOAD16_BYTE( "hyperpac.i12", 0x00000, 0x20000, CRC(9c7d85b8) SHA1(432d5fbe8bef875ce4a9aeb74a7b57dc79c709fd) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "hyperpac.u1", 0x00000, 0x10000 , CRC(03faf88e) SHA1(a8da883d4b765b809452bbffca37ff224edbe86d) ) + + ROM_REGION( 0x2000, "protection", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "at89c52.bin", 0x0000, 0x2000 , CRC(291f9326) SHA1(e440ce7d92188faa86e02e7f9db4ec6bce21efd3) ) /* decapped */ + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "hyperpac.j15", 0x00000, 0x40000, CRC(fb9f468d) SHA1(52857b1a04c64ac853340ebb8e92d98eabea8bc1) ) + + ROM_REGION( 0x0c0000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "hyperpac.a4", 0x000000, 0x40000, CRC(bd8673da) SHA1(8466355894da4d2c9a54d03a833cc9b4ec0c67eb) ) + ROM_LOAD( "hyperpac.a5", 0x040000, 0x40000, CRC(5d90cd82) SHA1(56be68478a81bb4e1011990da83334929a0ac886) ) + ROM_LOAD( "hyperpac.a6", 0x080000, 0x40000, CRC(61d86e63) SHA1(974c634607993924fa098eff106b1b288bec1e26) ) +ROM_END + +ROM_START( hyperpacb ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "hpacuh12.bin", 0x00001, 0x20000, CRC(633ab2c6) SHA1(534435fa602adebf651e1d42f7c96b01eb6634ef) ) + ROM_LOAD16_BYTE( "hpacui12.bin", 0x00000, 0x20000, CRC(23dc00d1) SHA1(8d4d00f450b94912adcbb24073f9b3b01eab0450) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "hyperpac.u1", 0x00000, 0x10000 , CRC(03faf88e) SHA1(a8da883d4b765b809452bbffca37ff224edbe86d) ) // was missing from this set, using the one from the original + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "hyperpac.j15", 0x00000, 0x40000, CRC(fb9f468d) SHA1(52857b1a04c64ac853340ebb8e92d98eabea8bc1) ) + + ROM_REGION( 0x0c0000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "hyperpac.a4", 0x000000, 0x40000, CRC(bd8673da) SHA1(8466355894da4d2c9a54d03a833cc9b4ec0c67eb) ) + ROM_LOAD( "hyperpac.a5", 0x040000, 0x40000, CRC(5d90cd82) SHA1(56be68478a81bb4e1011990da83334929a0ac886) ) + ROM_LOAD( "hyperpac.a6", 0x080000, 0x40000, CRC(61d86e63) SHA1(974c634607993924fa098eff106b1b288bec1e26) ) +ROM_END + +ROM_START( twinkle ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "uh12.bin", 0x00001, 0x20000, CRC(a99626fe) SHA1(489098a2ceb36df97b6b1d59b7b696300deee3ab) ) + ROM_LOAD16_BYTE( "ui12.bin", 0x00000, 0x20000, CRC(5af73684) SHA1(9be43e5c71152d515366e422eb077a41dbb3fe62) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "u1.bin", 0x00000, 0x10000 , CRC(e40481da) SHA1(1c1fabcb67693235eaa6ff59ae12a35854b5564a) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ + + ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there */ + ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200, CRC(00d3e4b4) SHA1(afa359a8b48605ff034133bad2a0a182429dec71) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "uj15.bin", 0x00000, 0x40000, CRC(0a534b37) SHA1(b7d780eb4668f1f757a60884c022f5bbc424dc97) ) + + ROM_REGION( 0x080000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "ua4.bin", 0x000000, 0x80000, CRC(6b64bb09) SHA1(547eac1ad931a6b937dff0b922d06af92cc7ab73) ) +ROM_END + +ROM_START( twinklea ) + ROM_REGION( 0x100000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "uh12.bin", 0x00001, 0x20000, CRC(6cc6e53c) SHA1(26584d2b99878230a33c1c2c8d71e758b0c09cac) ) // sldh + ROM_LOAD16_BYTE( "ui12.bin", 0x00000, 0x20000, CRC(79420382) SHA1(13183d819f5b7699e8e0974c193796151a0a9617) ) // sldh + + ROM_REGION( 0x10000, "soundcpu", 0 ) + ROM_LOAD( "u1.bin", 0x00000, 0x10000 , CRC(e40481da) SHA1(1c1fabcb67693235eaa6ff59ae12a35854b5564a) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) // Intel 87C52 MCU Code + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) // needs decapping + + ROM_REGION16_BE( 0x200, "user1", 0 ) // Data from Shared RAM + // this is not a real rom but instead the data extracted from shared ram, the MCU puts it there + ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200, BAD_DUMP CRC(00d3e4b4) SHA1(afa359a8b48605ff034133bad2a0a182429dec71) ) // this has been extracted for the parent set, seems to work for this set, too + + ROM_REGION( 0x040000, "oki", 0 ) + ROM_LOAD( "uj15.bin", 0x00000, 0x40000, CRC(0a534b37) SHA1(b7d780eb4668f1f757a60884c022f5bbc424dc97) ) + + ROM_REGION( 0x080000, "gfx1", 0 ) // Sprites + ROM_LOAD( "ua4.bin", 0x000000, 0x80000, CRC(6b64bb09) SHA1(547eac1ad931a6b937dff0b922d06af92cc7ab73) ) +ROM_END + +ROM_START( pzlbreak ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "4.uh12", 0x00001, 0x20000, CRC(b3f04f80) SHA1(79b5414727004719ff172e084a672b21e955f0bc) ) + ROM_LOAD16_BYTE( "5.ui12", 0x00000, 0x20000, CRC(13c298a0) SHA1(9455de7ea45c9a61ed6105023eb909c086c44007) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "0.u1", 0x00000, 0x10000 , CRC(1ad646b7) SHA1(0132baa097e48df2450afdcd316375dc546ea4d0) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ + + ROM_REGION16_BE( 0x200, "user1", ROMREGION_ERASEFF ) /* Data from Shared RAM */ + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there */ + ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200, CRC(092cb794) SHA1(eb2b336d97b440453ca37ee7605654b35dfb6bad) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "1.uj15", 0x00000, 0x40000, CRC(dbfae77c) SHA1(cc509d52cd9c608fc80df799890e62e7b4c143c6) ) + + ROM_REGION( 0x100000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "2.ua4", 0x000000, 0x80000, CRC(d211705a) SHA1(b3a7f8198dc8c034b17b843b2ab0298426de3f55) ) + ROM_LOAD( "3.ua5", 0x080000, 0x80000, CRC(6cdb73e9) SHA1(649e91ee54de2b359a207bed4d950db95515a3d8) ) +ROM_END + +ROM_START( pzlbreaka ) + ROM_REGION( 0x100000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "uh12", 0x00001, 0x20000, CRC(c8a82ca8) SHA1(ee19c253af9c7c8a33435d9d2494c50f16033572) ) + ROM_LOAD16_BYTE( "ui12", 0x00000, 0x20000, CRC(2f66c4ce) SHA1(4349f093ce1267c2ebcbf1233082661604f10851) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) + ROM_LOAD( "u1", 0x00000, 0x10000 , CRC(1ad646b7) SHA1(0132baa097e48df2450afdcd316375dc546ea4d0) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) // Intel 87C52 MCU Code + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) + + ROM_REGION16_BE( 0x200, "user1", ROMREGION_ERASEFF ) // Data from Shared RAM + // this is not a real rom but instead the data extracted from shared ram, the MCU puts it there + ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200, BAD_DUMP CRC(092cb794) SHA1(eb2b336d97b440453ca37ee7605654b35dfb6bad) ) // extracted from the parent set, so marked as bad + + ROM_REGION( 0x040000, "oki", 0 ) + ROM_LOAD( "uj15", 0x00000, 0x20000, CRC(5cdffcc5) SHA1(793a20bd0480cfea0dbf9397797428f6d105f724) ) // 1xxxxxxxxxxxxxxxx = 0xFF and half sized compared to the parent + + ROM_REGION( 0x100000, "gfx1", 0 ) + ROM_LOAD( "ua4", 0x000000, 0x80000, CRC(d211705a) SHA1(b3a7f8198dc8c034b17b843b2ab0298426de3f55) ) + ROM_LOAD( "ua5", 0x080000, 0x80000, CRC(eb3044bc) SHA1(c00e7b112b82c8eeb59c2a96168ea5156347f05e) ) // some differences compared to the parent +ROM_END + + +ROM_START( toppyrap ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "uh12.bin", 0x00001, 0x40000, CRC(6f5ad699) SHA1(42f7201d6274ff8338a7d4627af99001f473e841) ) + ROM_LOAD16_BYTE( "ui12.bin", 0x00000, 0x40000, CRC(caf5a7e1) SHA1(b521b2f06a804a52dad1b07657db2a29e1411844) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "u1.bin", 0x00000, 0x10000 , CRC(07f50947) SHA1(83740655ab5f677bd009191bb0de60e237aaa11c) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ + + ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ + /* this contains the code for 2 of the IRQ functions, but the game only uses one of them, the other is + executed from ROM. The version in ROM is slightly patched version so maybe there is an earlier revision + which uses the code provided by the MCU instead */ + ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200, CRC(0704e6c7) SHA1(22387257db569990378c304af9677e6dc1436207) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "uj15.bin", 0x00000, 0x20000, CRC(a3bacfd7) SHA1(d015d8bd26d0189fc13d09fefcb9b8baaaacec8a) ) + + ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "ua4.bin", 0x000000, 0x80000, CRC(a9577bcf) SHA1(9918d982ebee1c88bd203fa2b3ce2468c160fb95) ) + ROM_LOAD( "ua5.bin", 0x080000, 0x80000, CRC(7179d32d) SHA1(dae7126401b5bb7f99689587e05a8bf5033ec06e) ) + ROM_LOAD( "ua6.bin", 0x100000, 0x80000, CRC(4834e5b1) SHA1(cd8a4c329b2bfe1a9c2dea9d72ca09b71366c60a) ) + ROM_LOAD( "ua7.bin", 0x180000, 0x80000, CRC(663dd099) SHA1(84b52af54ac49e8b4bae23995e3cf94494be2bb3) ) +ROM_END + +ROM_START( moremore ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "u52.bin", 0x00001, 0x40000, CRC(cea4b246) SHA1(5febcb5dda6581caccfe9079b28c2366dfc1db2b) ) + ROM_LOAD16_BYTE( "u74.bin", 0x00000, 0x40000, CRC(2acdcb88) SHA1(74d661d07752bbccab7eab151209a414e9bf7675) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "u35.bin", 0x00000, 0x10000 , CRC(92dc95fc) SHA1(f04e63cc680835458246989532faf5657e28db13) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ + + ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there */ + ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(782dd2aa) SHA1(2587734271e0c85cb76bcdee171366c4e6fc9f81) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "u14.bin", 0x00000, 0x40000, CRC(90580088) SHA1(c64de2c0db95ab4ce06fc0a29c0cc8b7f3deeb28) ) + + ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "u75.bin", 0x000000, 0x80000, CRC(d671815c) SHA1(a7e8d3bf688ce51b5d9a2b306cc557974328c322) ) + ROM_LOAD( "u76.bin", 0x080000, 0x80000, CRC(e0d479e8) SHA1(454b53949664aca07a86229d3b6c9ce4e9449ea6) ) + ROM_LOAD( "u77.bin", 0x100000, 0x80000, CRC(60a281da) SHA1(3f268f8b1cd8efd3e32d0fcdba5483c93122800e) ) + ROM_LOAD( "u78.bin", 0x180000, 0x80000, CRC(e2723b4e) SHA1(6b4ba1e2e937b3231d76526af3f5a4a67144e4d5) ) +ROM_END + +ROM_START( moremorp ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "mmp_u52.bin", 0x00001, 0x40000, CRC(66baf9b2) SHA1(f1d383a94ef4313cb02c59ace17b9562eddcfb3c) ) + ROM_LOAD16_BYTE( "mmp_u74.bin", 0x00000, 0x40000, CRC(7c6fede5) SHA1(41bc539a6efe9eb2304243701857b972d2170bcf) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "mmp_u35.bin", 0x00000, 0x10000 , CRC(4d098cad) SHA1(a79d417e7525a25dd6697da9f3d1de269e759d2e) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ + + ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there */ + ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(782dd2aa) SHA1(2587734271e0c85cb76bcdee171366c4e6fc9f81) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "mmp_u14.bin", 0x00000, 0x40000, CRC(211a2566) SHA1(48138547822a8e76c101dd4189d581f80eee1e24) ) + + ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "mmp_u75.bin", 0x000000, 0x80000, CRC(af9e824e) SHA1(2b68813bf025a34b8958033108e4f8d39fd618cb) ) + ROM_LOAD( "mmp_u76.bin", 0x080000, 0x80000, CRC(c42af064) SHA1(f9d755e7cb52828d8594f7871932daf11443689f) ) + ROM_LOAD( "mmp_u77.bin", 0x100000, 0x80000, CRC(1d7396e1) SHA1(bde7e925051408dd2371b5da8235a6a4cae8cf6a) ) + ROM_LOAD( "mmp_u78.bin", 0x180000, 0x80000, CRC(5508d80b) SHA1(1b9a70a502b237fa11d1d55dce761e2def18873a) ) +ROM_END + +ROM_START( 3in1semi ) /* SemiCom Ser-4331-4 PCB */ + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "u52", 0x00001, 0x40000, CRC(b0e4a0f7) SHA1(e1f8b8ef020a85fcd7817814cf6c5d560e9e608d) ) + ROM_LOAD16_BYTE( "u74", 0x00000, 0x40000, CRC(266862c4) SHA1(2c5c513fee99bdb6e0ae3e0e644e516bdaddd629) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "u35", 0x00000, 0x10000 , CRC(e40481da) SHA1(1c1fabcb67693235eaa6ff59ae12a35854b5564a) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ + + ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there */ + ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(85deba7c) SHA1(44c6d9306b4f8e47182f4740a18971c49a8df8db) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "u14", 0x00000, 0x40000, CRC(c83c11be) SHA1(c05d96d61e5b8245232c85cbbcb7cc1e4e066492) ) + + ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "u75", 0x000000, 0x80000, CRC(b66a0db6) SHA1(a4e604eb3c0a5b16b4b0bb99219045bf2146287c) ) + ROM_LOAD( "u76", 0x080000, 0x80000, CRC(5f4b48ea) SHA1(e9dd1100d55b021b060990988c1e5271ce1ae35b) ) + ROM_LOAD( "u77", 0x100000, 0x80000, CRC(d44211e3) SHA1(53af19dec03e76912632450414cdbcbb31cc094c) ) + ROM_LOAD( "u78", 0x180000, 0x80000, CRC(af596afc) SHA1(875d7a51ff5c741cae4483d8da33df9cae8de52a) ) +ROM_END + +ROM_START( 3in1semia ) // SemiCom Ser-4331-4 PCB + ROM_REGION( 0x100000, "maincpu", 0 ) // 68000 Code + ROM_LOAD16_BYTE( "u52.bin", 0x00001, 0x40000, CRC(388334a8) SHA1(93823917682f1658a443d23ceb58eafa530d1854) ) + ROM_LOAD16_BYTE( "u74.bin", 0x00000, 0x40000, CRC(555ae716) SHA1(9a3d7d81d7c6fb8443d263087bb7dca7bc3918b6) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) // Z80 Code + ROM_LOAD( "u35.bin", 0x00000, 0x10000 , CRC(e40481da) SHA1(1c1fabcb67693235eaa6ff59ae12a35854b5564a) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) // Intel 87C52 MCU Code + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) + + ROM_REGION16_BE( 0x200, "user1", 0 ) // Data from Shared RAM + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there */ + ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(85deba7c) SHA1(44c6d9306b4f8e47182f4740a18971c49a8df8db) ) + + ROM_REGION( 0x040000, "oki", 0 ) // Samples + ROM_LOAD( "u14.bin", 0x00000, 0x40000, CRC(c83c11be) SHA1(c05d96d61e5b8245232c85cbbcb7cc1e4e066492) ) + + ROM_REGION( 0x200000, "gfx1", 0 ) // Sprites + ROM_LOAD( "u75.bin", 0x000000, 0x80000, CRC(9d705249) SHA1(99e0adca1f3f285692bf15c988b25d87f6b1dd90) ) + ROM_LOAD( "u76.bin", 0x080000, 0x80000, CRC(b65f5d79) SHA1(a9f19cf54f5ecdeca58f853f3053a686b89fea63) ) + ROM_LOAD( "u77.bin", 0x100000, 0x80000, CRC(b9728be9) SHA1(4ea7940f9d1d7c01cfcab92184b6513e4b0a83d7) ) + ROM_LOAD( "u78.bin", 0x180000, 0x20000, CRC(aefad49e) SHA1(246ea713eaaa6a01290eded36377437cb7e79fa8) ) // MX26C1000APC +ROM_END + +/* + +Ma Cheon Ru +SemiCom (c) 1999 + +PCB: Ser-4331-4 + + CPU: 68000, Z80 +Sound: OKIM6295, YM2151+YM3012 (rebadged as KA51+BS902) +Video: QuickLogic QL2003-XPL84C + OSC: 16MHz, 12MHz + +Measurements: + 68000 12MHz + Z80 4MHz (16MHz/4) + YM2151 4MHz (16MHz/4) +OKI 6295 1MHz (16MHz/16, pin 7 High) +*/ + +ROM_START( mcheonru ) /* SemiCom Ser-4331-4 PCB */ + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "u52", 0x00001, 0x40000, CRC(63fd8a9b) SHA1(53054d8072322842c32625ab38e7d62dc0e75627) ) + ROM_LOAD16_BYTE( "u74", 0x00000, 0x40000, CRC(3edb17ce) SHA1(0c6ea239f57eca114d75c173b77b2c8ef43d63a2) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "u35", 0x00000, 0x10000 , CRC(79e965b4) SHA1(268df67ec6ea828ae01a6e4d2da9ad2a08a837f1) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ + + ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there */ + ROM_LOAD( "protdata.bin", 0x00000, 0x200 , CRC(d61f4f07) SHA1(29485bce6e3a7ed2ace540bb81fe028456ae1ae9) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "u14", 0x00000, 0x40000, CRC(28a62d23) SHA1(24dbe6229647032599e02225de57650205dce5c3) ) + + ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "u75", 0x000000, 0x80000, CRC(0142c085) SHA1(9d948a63e4edcdb7f5cef0d2d7f118e6cbf4779e) ) + ROM_LOAD( "u76", 0x080000, 0x80000, CRC(27fda507) SHA1(87820348470979da730956066d3c820faedbec13) ) + ROM_LOAD( "u77", 0x100000, 0x80000, CRC(4dfe0550) SHA1(9a227114765ea5327b64061e4b4e4d4f19bd3293) ) + ROM_LOAD( "u78", 0x180000, 0x80000, CRC(f1b74978) SHA1(d1ac1bc212050d4f1a861045ab612115c73d3fd0) ) +ROM_END + +/* + +Cookie & Bibi 2 +SemiCom (c) 1996 + + CPU: MC68000P10, Z8400B Z80 +Sound: OKIM6295, YM2151+YM3012 (rebadged as AD-65, KA51+K-662) +Video: Lattice pLSI 1032-60LJ (square 84 pin socketed) + OSC: 16MHz, 12MHz +*/ + +ROM_START( cookbib2 ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "unico_02.uh12", 0x00001, 0x40000, CRC(b2909460) SHA1(2438638af870cfc105631d2b5e5a27a64ab5394d) ) // 27C020 + ROM_LOAD16_BYTE( "unico_01.ui12", 0x00000, 0x40000, CRC(65aafde2) SHA1(01f9f261527c35182f0445d641d987aa86ad750f) ) // 27C020 + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "unico_07.u1", 0x00000, 0x10000 , CRC(f59f1c9a) SHA1(2830261fd55249e015514fcb4cf8392e83b7fd0d) ) // 27C512 + + ROM_REGION( 0x2000, "protection", 0 ) /* P87C52EBPN (XSC6407A) Code (8052) */ + ROM_LOAD( "p87c52ebpn.bin", 0x0000, 0x2000 , CRC(ef042cef) SHA1(3089d5a3cb5ed663a8d89d59e427a06cffcd6219) ) /* dumped via laser glitching */ + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "unico_06.uj15", 0x00000, 0x20000, CRC(5e6f76b8) SHA1(725800143dfeaa6093ed5fcc5b9f15678ae9e547) ) // 27C010 + + ROM_REGION( 0x140000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "unico_05.ua4", 0x000000, 0x80000, CRC(89fb38ce) SHA1(1b39dd9c2743916b8d8af590bd92fe4819c2454b) ) // 27C040 + ROM_LOAD( "unico_04.ua5", 0x080000, 0x80000, CRC(f240111f) SHA1(b2c3b6e3d916fc68e1fd258b1279b6c39e1f0108) ) // 27C040 + ROM_LOAD( "unico_03.ua6", 0x100000, 0x40000, CRC(e1604821) SHA1(bede6bdd8331128b9f2b229d718133470bf407c9) ) // 27C020 + /* UA7 is unpopulated */ +ROM_END + +ROM_START( cookbib2a ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "unico.uh12", 0x00001, 0x40000, CRC(19421631) SHA1(00dfc474cee7d21d4b6bdbae2eabcdfde3584307) ) // non descriptive UNICO label with no numbers + ROM_LOAD16_BYTE( "unico.ui12", 0x00000, 0x40000, CRC(0d09ecf5) SHA1(16f787638041d38ee2567ca958ca4405324cf5fa) ) // both program ROMs are 27C020 + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "unico_07.u1", 0x00000, 0x10000 , CRC(f59f1c9a) SHA1(2830261fd55249e015514fcb4cf8392e83b7fd0d) ) // 27C512 + + ROM_REGION( 0x2000, "protection", 0 ) /* P87C52EBPN (XSC6407A) Code (8052) */ + ROM_LOAD( "p87c52ebpn.bin", 0x0000, 0x2000 , CRC(ef042cef) SHA1(3089d5a3cb5ed663a8d89d59e427a06cffcd6219) ) /* dumped via laser glitching */ + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "unico_06.uj15", 0x00000, 0x20000, CRC(5e6f76b8) SHA1(725800143dfeaa6093ed5fcc5b9f15678ae9e547) ) // 27C010 + + ROM_REGION( 0x140000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "unico_05.ua4", 0x000000, 0x80000, CRC(89fb38ce) SHA1(1b39dd9c2743916b8d8af590bd92fe4819c2454b) ) // 27C040 + ROM_LOAD( "unico_04.ua5", 0x080000, 0x80000, CRC(f240111f) SHA1(b2c3b6e3d916fc68e1fd258b1279b6c39e1f0108) ) // 27C040 + ROM_LOAD( "unico_03.ua6", 0x100000, 0x40000, CRC(e1604821) SHA1(bede6bdd8331128b9f2b229d718133470bf407c9) ) // 27C020 + /* UA7 is unpopulated */ +ROM_END + +ROM_START( cookbib2b ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "uh12.020", 0x00001, 0x40000, CRC(a44ec1f8) SHA1(0c741bf38f5cf667586cd1925417b6e17dbb8916) ) + ROM_LOAD16_BYTE( "ui12.020", 0x00000, 0x40000, CRC(bdbcd0d1) SHA1(9a6a85a492c21f6dd5daef964071a8a1c62f73c8) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "u1.512", 0x00000, 0x10000 , CRC(f59f1c9a) SHA1(2830261fd55249e015514fcb4cf8392e83b7fd0d) ) + + ROM_REGION( 0x2000, "protection", 0 ) /* P87C52EBPN (XSC6407A) Code (8052) */ + ROM_LOAD( "87c52.mcu", 0x0000, 0x2000 , NO_DUMP ) /* not dumped yet */ + + ROM_REGION( 0x200, "user1", 0 ) /* Data from Shared RAM */ + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there + + this one is hacked from the cookbib2 one, absolute code jump needed to be changed at least */ + ROM_LOAD16_WORD_SWAP( "protdata_alt.bin", 0x000, 0x200, BAD_DUMP CRC(bc136ead) SHA1(96459c2ccf7f95880421ba082c2414fa1040f3ed) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "uj15.010", 0x00000, 0x20000, CRC(5e6f76b8) SHA1(725800143dfeaa6093ed5fcc5b9f15678ae9e547) ) + + ROM_REGION( 0x180000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "ua4.040", 0x000000, 0x80000, CRC(f458d52e) SHA1(f6a145aaa57c64557479e63bb95732a98a7b8b85) ) + ROM_LOAD( "ua6.040", 0x080000, 0x80000, CRC(249e89b4) SHA1(2100eea2c3cee84a046ba7ff6cec1027966b895c) ) + ROM_LOAD( "ua8.040", 0x100000, 0x80000, CRC(caa25138) SHA1(784111255777f5774abf4d34c0a95b5e23a14c9f) ) +ROM_END + +// PCB is marked: "YFTE3" and "951121" on component side +// EPROMs are labelled: "UNICO" +ROM_START( cookbib2c ) // no ROM matches any of the other sets + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "unico.uh12", 0x00001, 0x40000, CRC(be021efa) SHA1(87e169e4987f4c31bcda147d0bf5f7fdbaa52f38) ) + ROM_LOAD16_BYTE( "unico.ui12", 0x00000, 0x40000, CRC(ed49a0e5) SHA1(fbb6c45559d82ec84253aac5e4e6ff0a8c4d04e0) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "unico.u1", 0x00000, 0x10000 , CRC(f1100b20) SHA1(92c78e028e9020743b68744a759a11638cf2c971) ) + + ROM_REGION( 0x2000, "protection", 0 ) /* P87C52EBPN (XSC6407A) Code (8052) */ + ROM_LOAD( "87c52.mcu", 0x0000, 0x2000 , NO_DUMP ) /* not dumped yet */ + + ROM_REGION( 0x200, "user1", 0 ) /* Data from Shared RAM */ + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there + + this one is hacked from the old cookbib2 one, absolute code jump needed to be changed at least */ + ROM_LOAD16_WORD_SWAP( "protdata.bin", 0x000, 0x200, BAD_DUMP CRC(b956f056) SHA1(aa9a73e8546b027ae8ef30b03524d302d07cae92) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "unico.uj15", 0x00000, 0x20000, CRC(ae5cc9e5) SHA1(f001c00fea76795ad2d7f4f0e436abecbc7ff00d) ) + + ROM_REGION( 0x140000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "unico.ua4", 0x000000, 0x80000, CRC(3de7a813) SHA1(fdf7e0a092a2056bd7e6443e035c86dde94a2300) ) + ROM_LOAD( "unico.ua5", 0x080000, 0x80000, CRC(6d543788) SHA1(efcd4f45e2bcdffcdd650c6e3bd543e877ce205a) ) + ROM_LOAD( "unico.ua6", 0x100000, 0x40000, CRC(13cc9bf4) SHA1(dec3561d953699ced17231b76980663fdcd6e155) ) +ROM_END + +ROM_START( cookbib3 ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "u52.bin", 0x00001, 0x40000, CRC(65134893) SHA1(b1f26794d1a85893aedf55adb2195ad244f90132) ) + ROM_LOAD16_BYTE( "u74.bin", 0x00000, 0x40000, CRC(c4ab8435) SHA1(7f97d3deafb3eb5412a44308ef20d3317405e94c) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "u35.bin", 0x0c000, 0x4000 , CRC(5dfd2a98) SHA1(193c0cd9272144c25cbc3660967424d34d0da185) ) /* bit strange but verified, not the first time SemiCom have done this, see bcstory.. */ + ROM_CONTINUE(0x8000,0x4000) + ROM_CONTINUE(0x4000,0x4000) + ROM_CONTINUE(0x0000,0x4000) + + ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ + + ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there */ + ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(c819b9a8) SHA1(1d425e8c9940c0e691149e5406dd71808bd73832) ) + /* the 'empty' pattern continued after 0x200 but the game doesn't use it or attempt to decrypt it */ + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "u14.bin", 0x00000, 0x20000, CRC(e5bf9288) SHA1(12fb9542f9105fe1a21a74a08cda4d6372b984ee) ) + + ROM_REGION( 0x180000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "u75.bin", 0x000000, 0x80000, CRC(cbe4d9c8) SHA1(81b043bd2b45ab2a8c9df0ba599c6220ed0c9fbf) ) + ROM_LOAD( "u76.bin", 0x080000, 0x80000, CRC(1be17b57) SHA1(57b58cc094d6b47ed6136266f1d34b8bad3f421f) ) + ROM_LOAD( "u77.bin", 0x100000, 0x80000, CRC(7823600d) SHA1(90d431f324b71758c49f3a72ee07701ceb76403f) ) +ROM_END + +ROM_START( 4in1boot ) /* snow bros, tetris, hyperman 1, pacman 2 */ + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "u52", 0x00001, 0x80000, CRC(71815878) SHA1(e3868f5687c1d8ec817671c50ade6c56ee83bfa1) ) + ROM_LOAD16_BYTE( "u74", 0x00000, 0x80000, CRC(e22d3fa2) SHA1(020ab92d8cbf37a9f8186a81934abb97088c16f9) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "u35", 0x00000, 0x10000 , CRC(c894ac80) SHA1(ee896675b5205ab2dbd0cbb13db16aa145391d06) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "u14", 0x00000, 0x40000, CRC(94b09b0e) SHA1(414de3e36eff85126038e8ff74145b35076e0a43) ) + + ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "u78", 0x000000, 0x200000, CRC(6c1fbc9c) SHA1(067f32cae89fd4d57b90be659d2d648e557c11df) ) +ROM_END + +ROM_START( snowbro3 ) + ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */ + ROM_LOAD16_BYTE( "ur4", 0x00000, 0x20000, CRC(19c13ffd) SHA1(4f9db70354bd410b7bcafa96be4591de8dc33d90) ) + ROM_LOAD16_BYTE( "ur3", 0x00001, 0x20000, CRC(3f32fa15) SHA1(1402c173c1df142ff9dd7b859689c075813a50e5) ) + + /* the sound is driven by an MCU */ + ROM_REGION( 0x10000, "cpu2", 0 ) + ROM_LOAD( "sound.mcu", 0x00000, 0x10000 , NO_DUMP ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD( "ua5", 0x000000, 0x80000, CRC(0604e385) SHA1(96acbc65a8db89a7be100f852dc07ba9a0313167) ) /* 16x16 tiles */ + + ROM_REGION( 0x400000, "gfx2", 0 ) /* 16x16 BG Tiles */ + ROM_LOAD( "un7", 0x000000, 0x200000, CRC(4a79da4c) SHA1(59207d116d39b9ee25c51affe520f5fdff34e536) ) + ROM_LOAD( "un8", 0x200000, 0x200000, CRC(7a4561a4) SHA1(1dd823369c09368d1f0ec8e1cb85d700f10ff448) ) + + ROM_REGION( 0x100000, "oki", 0 ) /* OKIM6295 samples */ + ROM_LOAD( "us5", 0x00000, 0x20000, CRC(7c6368ef) SHA1(53393c570c605f7582b61c630980041e2ed32e2d) ) + ROM_CONTINUE(0x80000,0x60000) +ROM_END + +ROM_START( ballboy ) + ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */ + ROM_LOAD16_BYTE( "27c010.ur4", 0x00000, 0x20000, CRC(5fb51b99) SHA1(07e12a3bb51fbb3f192b81497460231c7b609290) ) + ROM_LOAD16_BYTE( "27c010.ur3", 0x00001, 0x20000, CRC(a9c1fdda) SHA1(efb7eaab993f99d89d3b9c159c3b8eb18ace9c2c) ) + + /* the sound is driven by an MCU */ + ROM_REGION( 0x10000, "cpu2", 0 ) + ROM_LOAD( "sound.mcu", 0x00000, 0x10000 , NO_DUMP ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD( "27c040.ua5", 0x000000, 0x80000, CRC(0604e385) SHA1(96acbc65a8db89a7be100f852dc07ba9a0313167) ) /* 16x16 tiles */ + + ROM_REGION( 0x400000, "gfx2", 0 ) /* 16x16 BG Tiles */ + ROM_LOAD( "27c160.un7", 0x000000, 0x200000, CRC(4a79da4c) SHA1(59207d116d39b9ee25c51affe520f5fdff34e536) ) + ROM_LOAD( "27c160.un8", 0x200000, 0x200000, CRC(bfef8c44) SHA1(86930cfcaedbd111d5b985e87a76d2211d2ce2ec) ) + + ROM_REGION( 0x100000, "oki", 0 ) /* OKIM6295 samples */ + ROM_LOAD( "27c040.us5", 0x00000, 0x20000, CRC(7c6368ef) SHA1(53393c570c605f7582b61c630980041e2ed32e2d) ) + ROM_CONTINUE(0x80000,0x60000) +ROM_END + + +ROM_START( ballboy3p ) //PCB etched JOYCUS1B and 2001927 + ROM_REGION( 0x40000, "maincpu", 0 ) // 68000 code + ROM_LOAD16_BYTE( "ur4", 0x00000, 0x20000, CRC(32153d8f) SHA1(1fa698b93507fb775dfff6da8701ab65c986cac5) ) + ROM_LOAD16_BYTE( "ur3", 0x00001, 0x20000, CRC(4d462a75) SHA1(30a84a618bea5c64201329d02847382c2d0c84ba) ) + + // the sound is driven by an MCU + ROM_REGION( 0x10000, "cpu2", 0 ) + ROM_LOAD( "sound.mcu", 0x00000, 0x10000 , NO_DUMP ) + + ROM_REGION( 0x80000, "gfx1", 0 ) + ROM_LOAD( "ua5", 0x000000, 0x80000, CRC(fc72011f) SHA1(f1f10b34fd3365c6542299bd0224dad926d650b4) ) // 16x16 tiles + + ROM_REGION( 0x400000, "gfx2", 0 ) // 16x16 BG Tiles + ROM_LOAD( "un7", 0x000000, 0x400000, CRC(fe427e9d) SHA1(6932ad18b6807af860f8430e2a00e959d6c36a23) ) + + ROM_REGION( 0x100000, "oki", 0 ) // OKIM6295 samples + ROM_LOAD( "us5", 0x00000, 0x20000, CRC(7c6368ef) SHA1(53393c570c605f7582b61c630980041e2ed32e2d) ) // only ROM identical to the 2 player version + ROM_CONTINUE(0x80000,0x60000) +ROM_END + + +/* + +Information from Korean arcade gaming magazine + +name : Final Tetris +author : Jeil computer system +year : 1993.08.24 + +*/ + +ROM_START( finalttr ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "10.7o", 0x00000, 0x20000, CRC(eecc83e5) SHA1(48088a2fae8852a73a325a9659c24b241515eac3) ) + ROM_LOAD16_BYTE( "9.5o", 0x00001, 0x20000, CRC(58d3640e) SHA1(361bc64174a6c7b15a13e0d1f048c7ea270182ca) ) + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "12.5r", 0x00000, 0x10000, CRC(4bc21361) SHA1(dab9bea665c0f2fd7cee8ab7f3762e427911bcca) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ + + ROM_REGION( 0x200, "user1", 0 ) /* Data from Shared RAM */ + /* this is not a real rom but instead the data extracted from + shared ram, the MCU puts it there */ + ROM_LOAD16_WORD_SWAP( "protdata.bin", 0x00000, 0x200 , CRC(d5bbb006) SHA1(2f9ce6c4f4f5a304a807134da9c85c68a7b49200) ) + /* after 0xc7 the data read seems meaningless garbage, it doesn't appear to + stop at 0x102200, might be worth going back and checking if its simply random + values due to ram not being cleared, or actual data */ + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "11.7p", 0x00000, 0x20000, CRC(2e331022) SHA1(1e74c66d16eb9c8ae04acecbb4040dea037492cc) ) + + ROM_REGION( 0x100000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "5.1d", 0x00000, 0x40000, CRC(64a450f3) SHA1(d0560f68fe1527fda7852269ec39237ace66ab32) ) + ROM_LOAD( "6.1f", 0x40000, 0x40000, CRC(7281a3cc) SHA1(3f2ed7893bd7c5ff25ecb6eabce78ab66fe532a7) ) + ROM_LOAD( "7.1g", 0x80000, 0x40000, CRC(ec80f442) SHA1(870e44d28490a324f74af554604b9daa8422b86f) ) + ROM_LOAD( "9.1h", 0xc0000, 0x40000, CRC(2ebd316d) SHA1(2f1249ebd2a0bb0cc15259f7187201576a365fa6) ) +ROM_END + + + +ROM_START( suhosong ) + ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_LOAD16_BYTE( "su_ho_sung.uh12", 0x00001, 0x20000, CRC(6bd8bd08) SHA1(668398c9c77cc4cc52858daefd3cb13fbaf29a37) ) + ROM_LOAD16_BYTE( "su_ho_sung.ui12", 0x00000, 0x20000, CRC(79a4806e) SHA1(a4080ea70fa588ada384ffa9877f5cf965fb68df) ) + + + ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ + ROM_LOAD( "su_ho_sung.u1", 0x00000, 0x10000 , CRC(509ce74e) SHA1(a93add5ab674671078b55128281dcf9b0db46617) ) + + ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ + ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ + + ROM_REGION16_BE( 0x200, "user1", ROMREGION_ERASE00 ) /* Data from Shared RAM */ + ROM_LOAD16_WORD( "protdata.bin", 0x000, 0x200 , CRC(4478e251) SHA1(08489d6bfe5503c8eb62909e56a07193a922b4c1) ) + + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ + ROM_LOAD( "su_ho_sung.uj15", 0x00000, 0x40000, CRC(266fcae8) SHA1(0f15f880bde0c12b5c663ed387f9353c13b731b6) ) + + ROM_REGION( 0x180000, "gfx1", 0 ) /* Sprites */ + ROM_LOAD( "su_ho_sung.ua4", 0x000000, 0x80000, CRC(bc83a944) SHA1(fbd46648107c66f328b0a61c74b6b82c718e6f4b) ) + ROM_LOAD( "su_ho_sung.ua5", 0x080000, 0x80000, CRC(a1907ea4) SHA1(e21c29d12e50cce1434dbaff0929c207bfd33344) ) + ROM_LOAD( "su_ho_sung.ua6", 0x100000, 0x80000, CRC(92fea02c) SHA1(946c7bf55354875a1581ce484cb185b640f74166) ) +ROM_END + + +ROM_START( yutnori ) + ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 code */ + ROM_LOAD16_BYTE( "sys_d0-d7", 0x000001, 0x20000, CRC(d5c853da) SHA1(578f29c3a307f82fcaa23a7fe2931c0a673e777e) ) + ROM_LOAD16_BYTE( "sys_d8-d15", 0x000000, 0x20000, CRC(bf108119) SHA1(e64f64ddb577d6750cbc3a6c9d8d2ec4482cafe0) ) + + ROM_REGION( 0x4010, "mcu", 0 ) /* PIC code */ + ROM_LOAD( "pic16c64a-04-p", 0x000000, 0x4010, BAD_DUMP CRC(46fd3671) SHA1(54cf7a38f7743cdad73a2741183b2720ee42e6c8) ) // dump seems to be 99% empty, protected, only configuration bytes dumped? + + ROM_REGION( 0x120000, "gfx1", ROMREGION_ERASE00 ) + ROM_LOAD( "graphics_rom_1", 0x000000, 0x80000, CRC(d4881b49) SHA1(e169b7eca48a0bd66ad55fe21197a4bb491198bb) ) + ROM_LOAD( "graphics_rom_2", 0x080000, 0x80000, CRC(8cd9ce60) SHA1(d1db929ca6128ec2ebe983e6161f200ba421bd31) ) + ROM_LOAD( "graphics_rom_3", 0x100000, 0x20000, CRC(04f7c2ac) SHA1(927fa0f76ff1801845776d47aa5311f485b0b809) ) + + ROM_REGION(0x80000, "oki1", 0 ) // 2 banks, 1 large sample in each (music) + ROM_LOAD("sound rom", 0x000000, 0x080000, CRC(d24c2e43) SHA1(5c7a130048463558d695857ffc056a95a8072219) ) + + ROM_REGION(0x40000, "oki2", 0 ) + ROM_LOAD("voice_rom", 0x000000, 0x040000, CRC(25e85201) SHA1(6c0001e2942f49b62e1bbf3a68c59abad1e2f94c) ) +ROM_END + + + +void snowbros_state::init_cookbib2() +{ + save_item(NAME(m_semicom_prot_offset)); + + m_semicom_prot_base = 0xf000 / 2; +} + + +uint16_t snowbros_state::_4in1_02_read() +{ + return 0x0202; +} + +void snowbros_state::init_4in1boot() +{ + uint8_t *src = memregion("maincpu")->base(); + int len = memregion("maincpu")->bytes(); + + /* strange order */ + { + std::vector buffer(len); + for (int i = 0;i < len; i++) + if (i & 1) buffer[i] = bitswap<8>(src[i],6,7,5,4,3,2,1,0); + else buffer[i] = src[i]; + + memcpy(src, &buffer[0], len); + } + + src = memregion("soundcpu")->base(); + len = memregion("soundcpu")->bytes(); + + /* strange order */ + { + std::vector buffer(len); + for (int i = 0;i < len; i++) + buffer[i] = src[i^0x4000]; + memcpy(src,&buffer[0],len); + } + m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16smo_delegate(*this, FUNC(snowbros_state::_4in1_02_read))); +} + +void snowbros_state::init_snowbro3() +{ + uint8_t *src = memregion("maincpu")->base(); + int len = memregion("maincpu")->bytes(); + + /* strange order */ + { + std::vector buffer(len); + for (int i = 0;i < len; i++) + buffer[i] = src[bitswap<24>(i,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,3,4,1,2,0)]; + memcpy(src,&buffer[0],len); + } + + save_item(NAME(m_sb3_music_is_playing)); + save_item(NAME(m_sb3_music)); +} + +void snowbros_state::init_ballboy3p() +{ + init_snowbro3(); + + m_maincpu->space(AS_PROGRAM).unmap_write(0x400000, 0x400001); // unmap flipscreen as the DSW has been removed in favor of the controls for the 3rd player +} + +uint16_t snowbros_state::_3in1_read() +{ + return 0x000a; +} + +void snowbros_state::init_3in1semi() +{ + m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16smo_delegate(*this, FUNC(snowbros_state::_3in1_read))); +} + + +uint16_t snowbros_state::cookbib3_read() +{ + return 0x2a2a; +} + +void snowbros_state::init_cookbib3() +{ + m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16smo_delegate(*this, FUNC(snowbros_state::cookbib3_read))); +} + +void snowbros_state::init_pzlbreak() +{ + m_pandora->set_bg_pen(0xc0); +} + + + +void snowbros_state::init_toto() +{ + // every single rom has bits 0x10 and 0x08 swapped + uint8_t *src = memregion("maincpu")->base(); + int len = memregion("maincpu")->bytes(); + + for (int i = 0; i < len; i++) + { + src[i] = bitswap<8>(src[i], 7, 6, 5, 3, 4, 2, 1, 0); + } + + src = memregion("gfx1")->base(); + len = memregion("gfx1")->bytes(); + + for (int i = 0; i < len; i++) + { + src[i] = bitswap<8>(src[i], 7, 6, 5, 3, 4, 2, 1, 0); + } + + src = memregion("soundcpu")->base(); + len = memregion("soundcpu")->bytes(); + + for (int i = 0; i < len; i++) + { + src[i] = bitswap<8>(src[i], 7, 6, 5, 3, 4, 2, 1, 0); + } + + // protection? (just return 0x07) + m_maincpu->space(AS_PROGRAM).install_read_handler(0x500006, 0x500007, read16s_delegate(*this, FUNC(snowbros_state::toto_read))); +} + +void snowbros_state::init_hyperpac() +{ + save_item(NAME(m_semicom_prot_offset)); + m_semicom_prot_base = 0xe000 / 2; +} + + +void snowbros_state::init_yutnori() +{ + m_yutnori_prot_val = 0; + m_pandora->set_bg_pen(0xf0); + save_item(NAME(m_yutnori_prot_val)); +} + +GAME( 1990, snowbros, 0, snowbros, snowbros, snowbros_state, empty_init, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1990, snowbrosa, snowbros, snowbros, snowbros, snowbros_state, empty_init, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1990, snowbrosb, snowbros, snowbros, snowbros, snowbros_state, empty_init, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 3)", MACHINE_SUPPORTS_SAVE ) +GAME( 1990, snowbrosc, snowbros, snowbros, snowbros, snowbros_state, empty_init, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 4)", MACHINE_SUPPORTS_SAVE ) +GAME( 1990, snowbrosj, snowbros, snowbros, snowbroj, snowbros_state, empty_init, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (Japan)", MACHINE_SUPPORTS_SAVE ) +GAME( 1990, snowbrosd, snowbros, snowbros, snowbroj, snowbros_state, empty_init, ROT0, "Toaplan (Dooyong license)", "Snow Bros. - Nick & Tom (Dooyong license)", MACHINE_SUPPORTS_SAVE ) +GAME( 1990, wintbob, snowbros, wintbob, snowbros, snowbros_state, empty_init, ROT0, "bootleg (Sakowa Project Korea)", "The Winter Bobble (bootleg of Snow Bros.)", MACHINE_SUPPORTS_SAVE ) +GAME( 1990, snowbroswb, snowbros, wintbob, snowbros, snowbros_state, empty_init, ROT0, "bootleg", "Snow Bros. - Nick & Tom (The Winter Bobble hardware bootleg)", MACHINE_SUPPORTS_SAVE ) // this was probably unhacked back from the more common Winter Bobble to make it look more original + +GAME( 1996, toto, 0, snowbros, snowbros, snowbros_state, init_toto, ROT0, "SoftClub", "Come Back Toto", MACHINE_SUPPORTS_SAVE ) // modified from 'snowbros' code + +// none of the games below are on genuine SnowBros hardware, but they clone the functionality of it. + +// SemiCom / Jeil titles are protected, a dumb MCU copies code into RAM at startup, some also check for a specific return value from an address on startup. +GAME( 1993, finalttr, 0, finalttr, finalttr, snowbros_state, empty_init, ROT0, "Jeil Computer System", "Final Tetris", MACHINE_SUPPORTS_SAVE ) +GAME( 1995, hyperpac, 0, semicom_mcu, hyperpac, snowbros_state, init_hyperpac, ROT0, "SemiCom", "Hyper Pacman", MACHINE_SUPPORTS_SAVE ) +GAME( 1995, hyperpacb, hyperpac, semicom, hyperpac, snowbros_state, empty_init, ROT0, "bootleg", "Hyper Pacman (bootleg)", MACHINE_SUPPORTS_SAVE ) +GAME( 1996, cookbib2, 0, semicom_mcu, cookbib2, snowbros_state, init_cookbib2, ROT0, "SemiCom", "Cookie & Bibi 2 (English, set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1996, cookbib2a, cookbib2, semicom_mcu, cookbib2, snowbros_state, init_cookbib2, ROT0, "SemiCom", "Cookie & Bibi 2 (English, set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1996, cookbib2b, cookbib2, semiprot, cookbib2, snowbros_state, init_cookbib2, ROT0, "SemiCom", "Cookie & Bibi 2 (English, set 3)", MACHINE_SUPPORTS_SAVE ) // older? test mode looks even worse on this, but neither shows the correct dip info anyway +GAME( 1996, cookbib2c, cookbib2, semiprot, cookbib2c,snowbros_state, init_cookbib2, ROT0, "SemiCom", "Cookie & Bibi 2 (English / Korean)", MACHINE_SUPPORTS_SAVE ) // in this set the language switch actually works but its effects are inverted to what test mode shows. Sticker on PCB shows 95 so maybe earliest set? +GAME( 1996, toppyrap, 0, semiprot, toppyrap, snowbros_state, empty_init, ROT0, "SemiCom", "Toppy & Rappy", MACHINE_SUPPORTS_SAVE ) +GAME( 1997, cookbib3, 0, semiprot, cookbib3, snowbros_state, init_cookbib3, ROT0, "SemiCom", "Cookie & Bibi 3", MACHINE_SUPPORTS_SAVE ) +GAME( 1997, pzlbreak, 0, semiprot, pzlbreak, snowbros_state, init_pzlbreak, ROT0, "SemiCom / Tirano", "Puzzle Break (set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1997, pzlbreaka, pzlbreak, semiprot, pzlbreak, snowbros_state, init_pzlbreak, ROT0, "SemiCom / Tirano", "Puzzle Break (set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1997, suhosong, 0, semiprot, suhosong, snowbros_state, empty_init, ROT0, "SemiCom", "Su Ho Seong", MACHINE_SUPPORTS_SAVE ) +GAME( 1997, twinkle, 0, semiprot, twinkle, snowbros_state, empty_init, ROT0, "SemiCom / Tirano", "Twinkle (set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1997, twinklea, twinkle, semiprot, twinkle, snowbros_state, empty_init, ROT0, "SemiCom / Tirano", "Twinkle (set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1998, 3in1semi, 0, semiprot, moremore, snowbros_state, init_3in1semi, ROT0, "SemiCom / XESS", "New HyperMan (3-in-1 with Cookie & Bibi & HyperMan) (set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1998, 3in1semia, 3in1semi, semiprot, moremore, snowbros_state, init_3in1semi, ROT0, "SemiCom / XESS", "New HyperMan (3-in-1 with Cookie & Bibi & HyperMan) (set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1999, mcheonru, 0, semiprot, mcheonru, snowbros_state, init_3in1semi, ROT0, "SemiCom / AceVer", "Ma Cheon Ru", MACHINE_SUPPORTS_SAVE ) // a flyer exists for an English version called Arirang, AceVer team logo is displayed on it +GAME( 1999, moremore, 0, semiprot, moremore, snowbros_state, init_3in1semi, ROT0, "SemiCom / Exit", "More More", MACHINE_SUPPORTS_SAVE ) +GAME( 1999, moremorp, 0, semiprot, moremore, snowbros_state, init_3in1semi, ROT0, "SemiCom / Exit", "More More Plus", MACHINE_SUPPORTS_SAVE ) +// This is very similar to the SemiCom titles, but unprotected. +GAME( 2002, 4in1boot, 0, _4in1, 4in1boot, snowbros_state, init_4in1boot, ROT0, "K1 Soft", "Puzzle King (PacMan 2, Tetris, HyperMan 2, Snow Bros.)" , MACHINE_SUPPORTS_SAVE ) + +GAME( 1995, honeydol, 0, honeydol, honeydol, snowbros_state, empty_init, ROT0, "Barko Corp.", "Honey Doll", MACHINE_SUPPORTS_SAVE ) // based on snowbros code.. + +GAME( 1995, twinadv, 0, twinadv, twinadv, snowbros_state, empty_init, ROT0, "Barko Corp.", "Twin Adventure (World)", MACHINE_SUPPORTS_SAVE ) +GAME( 1995, twinadvk, twinadv, twinadv, twinadv, snowbros_state, empty_init, ROT0, "Barko Corp.", "Twin Adventure (Korea)", MACHINE_SUPPORTS_SAVE ) +GAME( 1996, multi96, twinadv, twinadv, twinadv, snowbros_state, empty_init, ROT0, "Barko Corp.", "Multi Game '96 (Italy)", MACHINE_SUPPORTS_SAVE ) + +// The Korean games database shows an earlier version of this called Ball Boy with a different title screen to the version of Ball Boy we have +// http://mamedev.emulab.it/undumped/images/Ballboy.jpg +// it is possible this 'ball boy' is the original bootleg, with snwobro3 being a hack of that, and the ballboy set we have a further hack of that +// these use an MCU to drive the sound +GAME( 2002, snowbro3, 0, snowbro3, snowbroj, snowbros_state, init_snowbro3, ROT0, "Syrmex", "Snow Brothers 3 - Magical Adventure", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // hacked from SnowBros code but released as an original game +GAME( 2003, ballboy, snowbro3, snowbro3, snowbroj, snowbros_state, init_snowbro3, ROT0, "bootleg", "Ball Boy (2 players)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 2004, ballboy3p, snowbro3, snowbro3, ballboy3p, snowbros_state, init_ballboy3p, ROT0, "bootleg", "Ball Boy (3 players)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +// protection appears to handle the sound, should check if it's just a block of code that is conditionally executed like some of the Semicom titles. +GAME( 1999, yutnori, 0, yutnori, yutnori, snowbros_state, init_yutnori, ROT0, "Nunal", "Puzzle Yutnori (Korea)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // Nunal is apparently Korean slang for Eyeball, hence the logo. Some places report 'JCC Soft' as the manufacturer diff --git a/src/mame/kaneko/snowbros.h b/src/mame/kaneko/snowbros.h new file mode 100644 index 00000000000..df007347fff --- /dev/null +++ b/src/mame/kaneko/snowbros.h @@ -0,0 +1,128 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood, Mike Coates +#ifndef MAME_INCLUDES_SNOWBROS_H +#define MAME_INCLUDES_SNOWBROS_H + +#pragma once + +#include "kan_pand.h" // for the original pandora + +#include "machine/gen_latch.h" +#include "machine/timer.h" +#include "sound/okim6295.h" + +#include "emupal.h" +#include "screen.h" + + +class snowbros_state : public driver_device +{ +public: + snowbros_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag), + m_maincpu(*this,"maincpu"), + m_soundcpu(*this, "soundcpu"), + m_oki(*this, "oki"), + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"), + m_screen(*this, "screen"), + m_soundlatch(*this, "soundlatch"), + m_pandora(*this, "pandora"), + m_hyperpac_ram(*this, "hyperpac_ram"), + m_bootleg_spriteram16(*this, "spriteram16b"), + m_semicom_prot_base(0) + { } + + void _4in1(machine_config &config); + void semiprot(machine_config &config); + void semicom_mcu(machine_config &config); + void yutnori(machine_config &config); + void snowbros(machine_config &config); + void semicom(machine_config &config); + void twinadv(machine_config &config); + void wintbob(machine_config &config); + void honeydol(machine_config &config); + void snowbro3(machine_config &config); + void finalttr(machine_config &config); + + void init_pzlbreak(); + void init_snowbro3(); + void init_ballboy3p(); + void init_cookbib3(); + void init_4in1boot(); + void init_3in1semi(); + void init_cookbib2(); + void init_toto(); + void init_hyperpac(); + void init_yutnori(); + +private: + required_device m_maincpu; + optional_device m_soundcpu; + optional_device m_oki; + required_device m_gfxdecode; + required_device m_palette; + required_device m_screen; + optional_device m_soundlatch; // not snowbro3 + + optional_device m_pandora; + optional_shared_ptr m_hyperpac_ram; + optional_shared_ptr m_bootleg_spriteram16; + + int m_sb3_music_is_playing = 0; + int m_sb3_music = 0; + uint8_t m_semicom_prot_offset = 0; + uint16_t m_semicom_prot_base; + uint16_t m_yutnori_prot_val = 0; + + void snowbros_flipscreen_w(uint8_t data); + void bootleg_flipscreen_w(uint8_t data); + void snowbros_irq4_ack_w(uint16_t data); + void snowbros_irq3_ack_w(uint16_t data); + void snowbros_irq2_ack_w(uint16_t data); + void prot_p0_w(uint8_t data); + void prot_p1_w(uint8_t data); + void prot_p2_w(uint8_t data); + uint16_t sb3_sound_r(); + uint16_t _4in1_02_read(); + uint16_t _3in1_read(); + uint16_t cookbib3_read(); + void twinadv_oki_bank_w(uint8_t data); + void sb3_sound_w(uint16_t data); + uint16_t toto_read(offs_t offset, uint16_t mem_mask = ~0); + void yutnori_prot_w(uint16_t data); + uint16_t yutnori_prot_r(); + + DECLARE_MACHINE_RESET(semiprot); + DECLARE_MACHINE_RESET(finalttr); + + uint32_t screen_update_snowbros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_honeydol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_twinadv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_snowbro3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_wintbob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + DECLARE_WRITE_LINE_MEMBER(screen_vblank_snowbros); + + TIMER_DEVICE_CALLBACK_MEMBER(snowbros_irq); + TIMER_DEVICE_CALLBACK_MEMBER(snowbros3_irq); + + void sb3_play_music(int data); + void sb3_play_sound(int data); + + void finalttr_map(address_map &map); + void honeydol_map(address_map &map); + void honeydol_sound_io_map(address_map &map); + void honeydol_sound_map(address_map &map); + void hyperpac_map(address_map &map); + void hyperpac_sound_map(address_map &map); + void snowbros3_map(address_map &map); + void snowbros_map(address_map &map); + void sound_io_map(address_map &map); + void sound_map(address_map &map); + void twinadv_map(address_map &map); + void twinadv_sound_io_map(address_map &map); + void wintbob_map(address_map &map); + void yutnori_map(address_map &map); +}; + +#endif // MAME_INCLUDES_SNOWBROS_H diff --git a/src/mame/kaneko/snowbros_v.cpp b/src/mame/kaneko/snowbros_v.cpp new file mode 100644 index 00000000000..6910e5b468f --- /dev/null +++ b/src/mame/kaneko/snowbros_v.cpp @@ -0,0 +1,275 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood, Luca Elia +/* bootlegs of Kaneko Pandora chip, with modifications */ + +#include "emu.h" +#include "snowbros.h" + +uint32_t snowbros_state::screen_update_honeydol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + uint16_t *spriteram16 = m_bootleg_spriteram16; + int sx=0, sy=0, x=0, y=0, offs; + /* sprites clip on left / right edges when scrolling, but it seems correct, + no extra sprite attribute bits are set during this time, the sprite co-ordinates + are simply set to 0 */ + + /* not standard snowbros video */ + + bitmap.fill(0xf0, cliprect); + + for (offs = 0x0000/2;offs < 0x2000/2;offs += 8) + { + int dx,dy,tilecolour,attr,flipx,flipy,tile; + + /* 8bpp gfx */ + dx = (spriteram16[offs+4]>>8) & 0xff; + dy = (spriteram16[offs+5]>>8) & 0xff; + tilecolour = (spriteram16[offs+3]>>8)&3; + attr = spriteram16[offs+7]>>8; + flipx = attr & 0x80; + flipy = (attr & 0x40) << 1; + tile = ((attr & 0x3f)<<8) + ((spriteram16[offs+6]>>8) & 0xff); + + x = dx; + y = dy; + + if (flip_screen()) + { + sx = 240 - x; + sy = 240 - y; + flipx = !flipx; + flipy = !flipy; + } + else + { + sx = x; + sy = y; + } + + m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, + tile, + tilecolour, + flipx, flipy, + sx,sy,0); + + /* second list interleaved with first (4bpp) ??? */ + dx = spriteram16[offs+4] & 0xff; + dy = spriteram16[offs+5] & 0xff; + tilecolour = spriteram16[offs+3]; + attr = spriteram16[offs+7]; + flipx = attr & 0x80; + flipy = (attr & 0x40) << 1; + tile = ((attr & 0x3f) << 8) + (spriteram16[offs+6] & 0xff); + + x = dx; + y = dy; + + if (flip_screen()) + { + sx = 240 - x; + sy = 240 - y; + flipx = !flipx; + flipy = !flipy; + } + else + { + sx = x; + sy = y; + } + + tilecolour = (tilecolour&0x03f0) >> 4; + tilecolour ^=0x3f; // unusual, but correct.. + + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + tile, + tilecolour, + flipx, flipy, + sx,sy,0); + } + return 0; +} + + +uint32_t snowbros_state::screen_update_twinadv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + uint16_t *spriteram16 = m_bootleg_spriteram16; + int sx=0, sy=0, x=0, y=0, offs; + /* sprites clip on left / right edges when scrolling, but it seems correct, + no extra sprite attribute bits are set during this time, the sprite co-ordinates + are simply set to 0 */ + + /* not standard snowbros video */ + + bitmap.fill(0xf0, cliprect); + + for (offs = 0x0000/2;offs < 0x2000/2;offs += 8) + { + int dx,dy,tilecolour,attr,flipx,flipy,tile; + + /* Similar to Honey Doll, but no 8bpp list / gfx */ + + dx = spriteram16[offs+4] & 0xff; + dy = spriteram16[offs+5] & 0xff; + tilecolour = spriteram16[offs+3]; + attr = spriteram16[offs+7]; + flipx = attr & 0x80; + flipy = (attr & 0x40) << 1; + tile = ((attr & 0x3f) << 8) + (spriteram16[offs+6] & 0xff); + + x = dx; + y = dy; + + if (flip_screen()) + { + sx = 240 - x; + sy = 240 - y; + flipx = !flipx; + flipy = !flipy; + } + else + { + sx = x; + sy = y; + } + + tilecolour = (tilecolour&0x00f0) >> 4; + tilecolour ^=0xf; // unusual, but correct.. + + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + tile, + tilecolour, + flipx, flipy, + sx,sy,0); + } + return 0; +} + + +uint32_t snowbros_state::screen_update_wintbob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + uint16_t *spriteram16 = m_bootleg_spriteram16; + int offs; + + bitmap.fill(m_palette->black_pen(), cliprect); + + for (offs = 0;offs < m_bootleg_spriteram16.bytes()/2;offs += 8) + { + int xpos = spriteram16[offs] & 0xff; + int ypos = spriteram16[offs+4] & 0xff; +/* int unk1 = spriteram16[offs+1] & 0x01;*/ /* Unknown .. Set for the Bottom Left part of Sprites */ + int disbl = spriteram16[offs+1] & 0x02; +/* int unk2 = spriteram16[offs+1] & 0x04;*/ /* Unknown .. Set for most things */ + int wrapr = spriteram16[offs+1] & 0x08; + int colr = (spriteram16[offs+1] & 0xf0) >> 4; + int tilen = (spriteram16[offs+2] << 8) + (spriteram16[offs+3] & 0xff); + int flipx = spriteram16[offs+2] & 0x80; + int flipy = (spriteram16[offs+2] & 0x40) << 1; + + if (wrapr == 8) xpos -= 256; + + if (flip_screen()) + { + xpos = 240 - xpos; + ypos = 240 - ypos; + flipx = !flipx; + flipy = !flipy; + } + + if ((xpos > -16) && (ypos > 0) && (xpos < 256) && (ypos < 240) && (disbl !=2)) + { + m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + tilen, + colr, + flipx, flipy, + xpos,ypos,0); + } + } + return 0; +} + + +uint32_t snowbros_state::screen_update_snowbro3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + uint16_t *spriteram16 = m_bootleg_spriteram16; + int sx=0, sy=0, x=0, y=0, offs; + + /* + * Sprite Tile Format + * ------------------ + * + * Byte | Bit(s) | Use + * -----+-76543210-+---------------- + * 0-5 | -------- | ? + * 6 | -------- | ? + * 7 | xxxx.... | Palette Bank + * 7 | .......x | XPos - Sign Bit + * 9 | xxxxxxxx | XPos + * 7 | ......x. | YPos - Sign Bit + * B | xxxxxxxx | YPos + * 7 | .....x.. | Use Relative offsets + * C | -------- | ? + * D | xxxxxxxx | Sprite Number (low 8 bits) + * E | -------- | ? + * F | ....xxxx | Sprite Number (high 4 bits) + * F | x....... | Flip Sprite Y-Axis + * F | .x...... | Flip Sprite X-Axis + */ + + /* This clears & redraws the entire screen each pass */ + + bitmap.fill(m_palette->black_pen(), cliprect); + + for (offs = 0;offs < m_bootleg_spriteram16.bytes()/2;offs += 8) + { + gfx_element *gfx = m_gfxdecode->gfx(0); + int dx = spriteram16[offs+4] & 0xff; + int dy = spriteram16[offs+5] & 0xff; + int tilecolour = spriteram16[offs+3]; + int attr = spriteram16[offs+7]; + int flipx = attr & 0x80; + int flipy = (attr & 0x40) << 1; + int tile = ((attr & 0xff) << 8) + (spriteram16[offs+6] & 0xff); + + if (tilecolour & 1) dx = -1 - (dx ^ 0xff); + if (tilecolour & 2) dy = -1 - (dy ^ 0xff); + if (tilecolour & 4) + { + x += dx; + y += dy; + } + else + { + x = dx; + y = dy; + } + + if (x > 511) x &= 0x1ff; + if (y > 511) y &= 0x1ff; + + if (flip_screen()) + { + sx = 240 - x; + sy = 240 - y; + flipx = !flipx; + flipy = !flipy; + } + else + { + sx = x; + sy = y; + } + + if (offs < 0x800) /* i guess this is the right way */ + { + gfx = m_gfxdecode->gfx(1); + tilecolour = 0x10; + } + + gfx->transpen(bitmap,cliprect, + tile, + (tilecolour & 0xf0) >> 4, + flipx, flipy, + sx,sy,0); + } + return 0; +} diff --git a/src/mame/kaneko/suprnova.cpp b/src/mame/kaneko/suprnova.cpp index 509809124cd..fecb85ae2da 100644 --- a/src/mame/kaneko/suprnova.cpp +++ b/src/mame/kaneko/suprnova.cpp @@ -147,7 +147,7 @@ NEP-16 */ #include "emu.h" -#include "includes/suprnova.h" +#include "suprnova.h" #include "cpu/sh/sh2.h" #include "machine/msm6242.h" diff --git a/src/mame/kaneko/suprnova.h b/src/mame/kaneko/suprnova.h index daab5920f99..f2cc0d783f7 100644 --- a/src/mame/kaneko/suprnova.h +++ b/src/mame/kaneko/suprnova.h @@ -5,7 +5,7 @@ #pragma once -#include "video/sknsspr.h" +#include "sknsspr.h" #include "cpu/sh/sh2.h" #include "machine/timer.h" diff --git a/src/mame/kaneko/suprnova_v.cpp b/src/mame/kaneko/suprnova_v.cpp index a38456e3f84..847621c712d 100644 --- a/src/mame/kaneko/suprnova_v.cpp +++ b/src/mame/kaneko/suprnova_v.cpp @@ -3,8 +3,8 @@ /* Super Kaneko Nova System video */ #include "emu.h" -#include "video/sknsspr.h" -#include "includes/suprnova.h" +#include "sknsspr.h" +#include "suprnova.h" /* draws ROZ with linescroll OR columnscroll to 16-bit indexed bitmap */ diff --git a/src/mame/kaypro/kay_kbd.cpp b/src/mame/kaypro/kay_kbd.cpp index 86d111d4d1e..6cf408fb981 100644 --- a/src/mame/kaypro/kay_kbd.cpp +++ b/src/mame/kaypro/kay_kbd.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "machine/kay_kbd.h" +#include "kay_kbd.h" #include "speaker.h" diff --git a/src/mame/kaypro/kaypro.cpp b/src/mame/kaypro/kaypro.cpp index 1c1d8367c11..0b9c6c6c4dd 100644 --- a/src/mame/kaypro/kaypro.cpp +++ b/src/mame/kaypro/kaypro.cpp @@ -47,8 +47,8 @@ **************************************************************************************************/ #include "emu.h" -#include "includes/kaypro.h" -#include "machine/kay_kbd.h" +#include "kaypro.h" +#include "kay_kbd.h" #include "formats/kaypro_dsk.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/kaypro/kaypro_m.cpp b/src/mame/kaypro/kaypro_m.cpp index 67ae03a66a2..17045eda92c 100644 --- a/src/mame/kaypro/kaypro_m.cpp +++ b/src/mame/kaypro/kaypro_m.cpp @@ -3,7 +3,7 @@ #include "emu.h" -#include "includes/kaypro.h" +#include "kaypro.h" diff --git a/src/mame/kaypro/kaypro_v.cpp b/src/mame/kaypro/kaypro_v.cpp index 03ae32f4547..4ba47f8ea0b 100644 --- a/src/mame/kaypro/kaypro_v.cpp +++ b/src/mame/kaypro/kaypro_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Robbbert #include "emu.h" -#include "includes/kaypro.h" +#include "kaypro.h" #include "screen.h" diff --git a/src/mame/kiwako/jongkyo.cpp b/src/mame/kiwako/jongkyo.cpp index dccc3611fc6..57b947b0d18 100644 --- a/src/mame/kiwako/jongkyo.cpp +++ b/src/mame/kiwako/jongkyo.cpp @@ -27,9 +27,12 @@ **********************************************************/ #include "emu.h" + +#include "segacrpt_device.h" + #include "cpu/z80/z80.h" -#include "machine/segacrpt_device.h" #include "sound/ay8910.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/kiwako/mrjong.cpp b/src/mame/kiwako/mrjong.cpp index 403744e3ce7..dbb1c9a4206 100644 --- a/src/mame/kiwako/mrjong.cpp +++ b/src/mame/kiwako/mrjong.cpp @@ -46,7 +46,7 @@ ROMs 6A, 7A, 8A, 9A: 2764 ***************************************************************************/ #include "emu.h" -#include "includes/mrjong.h" +#include "mrjong.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" diff --git a/src/mame/kiwako/mrjong_v.cpp b/src/mame/kiwako/mrjong_v.cpp index 3db2b131058..d4122b3c5b3 100644 --- a/src/mame/kiwako/mrjong_v.cpp +++ b/src/mame/kiwako/mrjong_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mrjong.h" +#include "mrjong.h" /*************************************************************************** diff --git a/src/mame/konami/3dom2.h b/src/mame/konami/3dom2.h index 5c3ba784e2c..e043cc31db1 100644 --- a/src/mame/konami/3dom2.h +++ b/src/mame/konami/3dom2.h @@ -13,7 +13,7 @@ #pragma once -#include "video/3dom2_te.h" +#include "3dom2_te.h" #include "cpu/dspp/dspp.h" #include "cpu/powerpc/ppc.h" diff --git a/src/mame/konami/3dom2_te.cpp b/src/mame/konami/3dom2_te.cpp index 5405f91c851..863e6bfd279 100644 --- a/src/mame/konami/3dom2_te.cpp +++ b/src/mame/konami/3dom2_te.cpp @@ -7,9 +7,9 @@ ***************************************************************************/ #include "emu.h" -#include "video/3dom2_te.h" +#include "3dom2_te.h" -#include "machine/3dom2.h" +#include "3dom2.h" #include diff --git a/src/mame/konami/88games.cpp b/src/mame/konami/88games.cpp index b7702c9edd5..d77303d508d 100644 --- a/src/mame/konami/88games.cpp +++ b/src/mame/konami/88games.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/88games.h" +#include "88games.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/konami/88games.h b/src/mame/konami/88games.h index 77f4171f3ea..5856c71a1a0 100644 --- a/src/mame/konami/88games.h +++ b/src/mame/konami/88games.h @@ -12,10 +12,10 @@ #include "cpu/m6809/konami.h" #include "sound/upd7759.h" -#include "video/k051316.h" -#include "video/k051960.h" -#include "video/k052109.h" -#include "video/konami_helper.h" +#include "k051316.h" +#include "k051960.h" +#include "k052109.h" +#include "konami_helper.h" class _88games_state : public driver_device { diff --git a/src/mame/konami/88games_v.cpp b/src/mame/konami/88games_v.cpp index 438ebfe5aba..1c555fffe33 100644 --- a/src/mame/konami/88games_v.cpp +++ b/src/mame/konami/88games_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/88games.h" +#include "88games.h" #include "screen.h" diff --git a/src/mame/konami/ajax.cpp b/src/mame/konami/ajax.cpp index f7f39fec058..b0d878997c3 100644 --- a/src/mame/konami/ajax.cpp +++ b/src/mame/konami/ajax.cpp @@ -14,11 +14,11 @@ #include "emu.h" -#include "includes/konamipt.h" -#include "video/k051316.h" -#include "video/k051960.h" -#include "video/k052109.h" -#include "video/konami_helper.h" +#include "konamipt.h" +#include "k051316.h" +#include "k051960.h" +#include "k052109.h" +#include "konami_helper.h" #include "cpu/m6809/hd6309.h" #include "cpu/m6809/konami.h" diff --git a/src/mame/konami/aliens.cpp b/src/mame/konami/aliens.cpp index e6693322bb6..d0dd005dd79 100644 --- a/src/mame/konami/aliens.cpp +++ b/src/mame/konami/aliens.cpp @@ -10,8 +10,8 @@ Preliminary driver by: ***************************************************************************/ #include "emu.h" -#include "includes/aliens.h" -#include "includes/konamipt.h" +#include "aliens.h" +#include "konamipt.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/aliens.h b/src/mame/konami/aliens.h index a02f6a10c68..4058cb8e817 100644 --- a/src/mame/konami/aliens.h +++ b/src/mame/konami/aliens.h @@ -14,8 +14,8 @@ #include "machine/bankdev.h" #include "machine/gen_latch.h" #include "sound/k007232.h" -#include "video/k051960.h" -#include "video/k052109.h" +#include "k051960.h" +#include "k052109.h" class aliens_state : public driver_device { diff --git a/src/mame/konami/aliens_v.cpp b/src/mame/konami/aliens_v.cpp index 8f759509b63..59e70a47d1f 100644 --- a/src/mame/konami/aliens_v.cpp +++ b/src/mame/konami/aliens_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Manuel Abadia #include "emu.h" -#include "includes/aliens.h" +#include "aliens.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/konami/asterix.cpp b/src/mame/konami/asterix.cpp index e43e75dbade..a26aa1332c1 100644 --- a/src/mame/konami/asterix.cpp +++ b/src/mame/konami/asterix.cpp @@ -13,8 +13,8 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/asterix.h" -#include "includes/konamipt.h" +#include "asterix.h" +#include "konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/asterix.h b/src/mame/konami/asterix.h index bc302748375..3599ee1a060 100644 --- a/src/mame/konami/asterix.h +++ b/src/mame/konami/asterix.h @@ -10,10 +10,10 @@ #pragma once -#include "video/k053251.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k053244_k053245.h" -#include "video/konami_helper.h" +#include "k053251.h" +#include "k054156_k054157_k056832.h" +#include "k053244_k053245.h" +#include "konami_helper.h" class asterix_state : public driver_device { diff --git a/src/mame/konami/asterix_v.cpp b/src/mame/konami/asterix_v.cpp index 22f79e3ce5f..815c97473ae 100644 --- a/src/mame/konami/asterix_v.cpp +++ b/src/mame/konami/asterix_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert #include "emu.h" -#include "includes/asterix.h" +#include "asterix.h" #include "screen.h" diff --git a/src/mame/konami/battlnts.cpp b/src/mame/konami/battlnts.cpp index 6c9e6523158..9a1f5f87393 100644 --- a/src/mame/konami/battlnts.cpp +++ b/src/mame/konami/battlnts.cpp @@ -13,8 +13,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/battlnts.h" -#include "includes/konamipt.h" +#include "battlnts.h" +#include "konamipt.h" #include "cpu/m6809/hd6309.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/battlnts.h b/src/mame/konami/battlnts.h index 4ac180d75f9..d27509f1aea 100644 --- a/src/mame/konami/battlnts.h +++ b/src/mame/konami/battlnts.h @@ -10,8 +10,8 @@ #pragma once -#include "video/k007342.h" -#include "video/k007420.h" +#include "k007342.h" +#include "k007420.h" class battlnts_state : public driver_device { diff --git a/src/mame/konami/battlnts_v.cpp b/src/mame/konami/battlnts_v.cpp index 18850a5d688..a362c9d05c3 100644 --- a/src/mame/konami/battlnts_v.cpp +++ b/src/mame/konami/battlnts_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia #include "emu.h" -#include "includes/battlnts.h" +#include "battlnts.h" /*************************************************************************** diff --git a/src/mame/konami/bishi.cpp b/src/mame/konami/bishi.cpp index 94fde314b9c..70af3c76970 100644 --- a/src/mame/konami/bishi.cpp +++ b/src/mame/konami/bishi.cpp @@ -86,7 +86,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/bishi.h" +#include "bishi.h" #include "cpu/m68000/m68000.h" #include "sound/ymz280b.h" diff --git a/src/mame/konami/bishi.h b/src/mame/konami/bishi.h index 3d09b3dcc2e..2209700aa48 100644 --- a/src/mame/konami/bishi.h +++ b/src/mame/konami/bishi.h @@ -11,10 +11,10 @@ #pragma once #include "machine/timer.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k055555.h" -#include "video/k054338.h" -#include "video/konami_helper.h" +#include "k054156_k054157_k056832.h" +#include "k055555.h" +#include "k054338.h" +#include "konami_helper.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/konami/bishi_v.cpp b/src/mame/konami/bishi_v.cpp index 5ffa8bce7bd..54bd0fb4a23 100644 --- a/src/mame/konami/bishi_v.cpp +++ b/src/mame/konami/bishi_v.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bishi.h" +#include "bishi.h" K056832_CB_MEMBER(bishi_state::tile_callback) diff --git a/src/mame/konami/bladestl.cpp b/src/mame/konami/bladestl.cpp index fb2c063977c..bc415ce2fc3 100644 --- a/src/mame/konami/bladestl.cpp +++ b/src/mame/konami/bladestl.cpp @@ -29,8 +29,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bladestl.h" -#include "includes/konamipt.h" +#include "bladestl.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "cpu/m6809/hd6309.h" diff --git a/src/mame/konami/bladestl.h b/src/mame/konami/bladestl.h index 1a1329211ea..dc65c6a0f60 100644 --- a/src/mame/konami/bladestl.h +++ b/src/mame/konami/bladestl.h @@ -14,9 +14,9 @@ #include "machine/timer.h" #include "sound/flt_rc.h" #include "sound/upd7759.h" -#include "video/k007342.h" -#include "video/k007420.h" -#include "video/k051733.h" +#include "k007342.h" +#include "k007420.h" +#include "k051733.h" #include "emupal.h" class bladestl_state : public driver_device diff --git a/src/mame/konami/bladestl_v.cpp b/src/mame/konami/bladestl_v.cpp index a4e738ebc21..b6e05e9e85e 100644 --- a/src/mame/konami/bladestl_v.cpp +++ b/src/mame/konami/bladestl_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia #include "emu.h" -#include "includes/bladestl.h" +#include "bladestl.h" void bladestl_state::bladestl_palette(palette_device &palette) const diff --git a/src/mame/konami/blockhl.cpp b/src/mame/konami/blockhl.cpp index 061a4b20ffb..d5ffd15dd02 100644 --- a/src/mame/konami/blockhl.cpp +++ b/src/mame/konami/blockhl.cpp @@ -18,7 +18,7 @@ *******************************************************************************/ #include "emu.h" -#include "includes/konamipt.h" +#include "konamipt.h" #include "cpu/m6809/konami.h" #include "cpu/z80/z80.h" @@ -26,8 +26,8 @@ #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/ymopm.h" -#include "video/k052109.h" -#include "video/k051960.h" +#include "k052109.h" +#include "k051960.h" #include "emupal.h" #include "speaker.h" diff --git a/src/mame/konami/bottom9.cpp b/src/mame/konami/bottom9.cpp index fc03aeea66e..3be8ea22262 100644 --- a/src/mame/konami/bottom9.cpp +++ b/src/mame/konami/bottom9.cpp @@ -16,11 +16,11 @@ #include "emu.h" -#include "includes/konamipt.h" -#include "video/k051316.h" -#include "video/k051960.h" -#include "video/k052109.h" -#include "video/konami_helper.h" +#include "konamipt.h" +#include "k051316.h" +#include "k051960.h" +#include "k052109.h" +#include "konami_helper.h" #include "cpu/m6809/hd6309.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/chqflag.cpp b/src/mame/konami/chqflag.cpp index 8162f74acf8..e1d7c4a6952 100644 --- a/src/mame/konami/chqflag.cpp +++ b/src/mame/konami/chqflag.cpp @@ -20,8 +20,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/chqflag.h" -#include "includes/konamipt.h" +#include "chqflag.h" +#include "konamipt.h" #include "cpu/z80/z80.h" #include "cpu/m6809/konami.h" diff --git a/src/mame/konami/chqflag.h b/src/mame/konami/chqflag.h index 5cbb32adf88..50204b54ed8 100644 --- a/src/mame/konami/chqflag.h +++ b/src/mame/konami/chqflag.h @@ -12,10 +12,10 @@ #include "machine/bankdev.h" #include "sound/k007232.h" -#include "video/k051960.h" -#include "video/k051316.h" -#include "video/k051733.h" -#include "video/konami_helper.h" +#include "k051960.h" +#include "k051316.h" +#include "k051733.h" +#include "konami_helper.h" #include "emupal.h" class chqflag_state : public driver_device diff --git a/src/mame/konami/chqflag_v.cpp b/src/mame/konami/chqflag_v.cpp index 75f775a0fb3..8fc9a35f8b9 100644 --- a/src/mame/konami/chqflag_v.cpp +++ b/src/mame/konami/chqflag_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/chqflag.h" +#include "chqflag.h" #include "screen.h" diff --git a/src/mame/konami/circusc.cpp b/src/mame/konami/circusc.cpp index 5474ca1f266..865a42a9170 100644 --- a/src/mame/konami/circusc.cpp +++ b/src/mame/konami/circusc.cpp @@ -52,13 +52,13 @@ This bug is due to 380_r02.6h, it differs from 380_q02.6h by 2 bytes, at ***************************************************************************/ #include "emu.h" -#include "includes/circusc.h" +#include "circusc.h" #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" #include "machine/74259.h" #include "machine/gen_latch.h" -#include "machine/konami1.h" +#include "konami1.h" #include "machine/watchdog.h" #include "sound/discrete.h" diff --git a/src/mame/konami/circusc_v.cpp b/src/mame/konami/circusc_v.cpp index 835e7b84f01..d39a7832181 100644 --- a/src/mame/konami/circusc_v.cpp +++ b/src/mame/konami/circusc_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/circusc.h" +#include "circusc.h" /*************************************************************************** diff --git a/src/mame/konami/cobra.cpp b/src/mame/konami/cobra.cpp index 587f7c6e712..e8d61425af5 100644 --- a/src/mame/konami/cobra.cpp +++ b/src/mame/konami/cobra.cpp @@ -322,7 +322,7 @@ #include "machine/jvshost.h" #include "machine/jvsdev.h" #include "machine/timekpr.h" -#include "video/k001604.h" +#include "k001604.h" #include "video/poly.h" #include "video/rgbutil.h" #include "sound/rf5c400.h" diff --git a/src/mame/konami/combatsc.cpp b/src/mame/konami/combatsc.cpp index e117e5bb410..4418892fa6e 100644 --- a/src/mame/konami/combatsc.cpp +++ b/src/mame/konami/combatsc.cpp @@ -121,7 +121,7 @@ Dip location and recommended settings verified with the US manual ***************************************************************************/ #include "emu.h" -#include "includes/combatsc.h" +#include "combatsc.h" #include "cpu/m6809/hd6309.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/combatsc.h b/src/mame/konami/combatsc.h index 128a9fe4f64..9296e108277 100644 --- a/src/mame/konami/combatsc.h +++ b/src/mame/konami/combatsc.h @@ -11,10 +11,10 @@ #pragma once #include "machine/gen_latch.h" -#include "machine/k007452.h" +#include "k007452.h" #include "sound/msm5205.h" #include "sound/upd7759.h" -#include "video/k007121.h" +#include "k007121.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/konami/combatsc_v.cpp b/src/mame/konami/combatsc_v.cpp index b2f65c0e42e..d17952d73a6 100644 --- a/src/mame/konami/combatsc_v.cpp +++ b/src/mame/konami/combatsc_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/combatsc.h" +#include "combatsc.h" void combatsc_state::palette(palette_device &palette) const { diff --git a/src/mame/konami/contra.cpp b/src/mame/konami/contra.cpp index 15dff5ebadf..53d20b28f3c 100644 --- a/src/mame/konami/contra.cpp +++ b/src/mame/konami/contra.cpp @@ -141,9 +141,9 @@ Notes: #include "emu.h" -#include "includes/konamipt.h" -#include "machine/k007452.h" -#include "video/k007121.h" +#include "konamipt.h" +#include "k007452.h" +#include "k007121.h" #include "cpu/m6809/hd6309.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/konami/crimfght.cpp b/src/mame/konami/crimfght.cpp index 7b051f3f471..91b20a15bbe 100644 --- a/src/mame/konami/crimfght.cpp +++ b/src/mame/konami/crimfght.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/konamipt.h" -#include "includes/crimfght.h" +#include "konamipt.h" +#include "crimfght.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/crimfght.h b/src/mame/konami/crimfght.h index eb90b5a06c9..4d391d5078f 100644 --- a/src/mame/konami/crimfght.h +++ b/src/mame/konami/crimfght.h @@ -14,8 +14,8 @@ #include "machine/bankdev.h" #include "machine/gen_latch.h" #include "sound/k007232.h" -#include "video/k052109.h" -#include "video/k051960.h" +#include "k052109.h" +#include "k051960.h" #include "emupal.h" class crimfght_state : public driver_device diff --git a/src/mame/konami/crimfght_v.cpp b/src/mame/konami/crimfght_v.cpp index 82c6e281610..7bcb3adb4b8 100644 --- a/src/mame/konami/crimfght_v.cpp +++ b/src/mame/konami/crimfght_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Manuel Abadia #include "emu.h" -#include "includes/crimfght.h" +#include "crimfght.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/konami/dbz.cpp b/src/mame/konami/dbz.cpp index 03de25d6d6d..2f64e7d5883 100644 --- a/src/mame/konami/dbz.cpp +++ b/src/mame/konami/dbz.cpp @@ -53,7 +53,7 @@ Notes: */ #include "emu.h" -#include "includes/dbz.h" +#include "dbz.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/dbz.h b/src/mame/konami/dbz.h index a6ac3a7395a..149e4123667 100644 --- a/src/mame/konami/dbz.h +++ b/src/mame/konami/dbz.h @@ -12,11 +12,11 @@ #include "machine/k053252.h" #include "machine/timer.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k053246_k053247_k055673.h" -#include "video/k053936.h" -#include "video/k053251.h" -#include "video/konami_helper.h" +#include "k054156_k054157_k056832.h" +#include "k053246_k053247_k055673.h" +#include "k053936.h" +#include "k053251.h" +#include "konami_helper.h" #include "tilemap.h" class dbz_state : public driver_device diff --git a/src/mame/konami/dbz_v.cpp b/src/mame/konami/dbz_v.cpp index efb24e1a753..43f5910a61c 100644 --- a/src/mame/konami/dbz_v.cpp +++ b/src/mame/konami/dbz_v.cpp @@ -11,7 +11,7 @@ #include "emu.h" -#include "includes/dbz.h" +#include "dbz.h" K056832_CB_MEMBER(dbz_state::tile_callback) diff --git a/src/mame/konami/ddribble.cpp b/src/mame/konami/ddribble.cpp index 3a35ad0698e..5ff4a56f7a4 100644 --- a/src/mame/konami/ddribble.cpp +++ b/src/mame/konami/ddribble.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ddribble.h" -#include "includes/konamipt.h" +#include "ddribble.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/ddribble_v.cpp b/src/mame/konami/ddribble_v.cpp index 6fa212fed44..76d4ff24f29 100644 --- a/src/mame/konami/ddribble_v.cpp +++ b/src/mame/konami/ddribble_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ddribble.h" +#include "ddribble.h" void ddribble_state::palette(palette_device &palette) const diff --git a/src/mame/konami/divebomb.cpp b/src/mame/konami/divebomb.cpp index 93d302f8de3..6a4caa7f7f0 100644 --- a/src/mame/konami/divebomb.cpp +++ b/src/mame/konami/divebomb.cpp @@ -91,7 +91,7 @@ To verify against original HW: ****************************************************************************/ #include "emu.h" -#include "includes/divebomb.h" +#include "divebomb.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/konami/divebomb.h b/src/mame/konami/divebomb.h index db356ef63e3..33403440b10 100644 --- a/src/mame/konami/divebomb.h +++ b/src/mame/konami/divebomb.h @@ -15,7 +15,7 @@ #include "machine/gen_latch.h" #include "machine/input_merger.h" #include "sound/sn76496.h" -#include "video/k051316.h" +#include "k051316.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/konami/divebomb_v.cpp b/src/mame/konami/divebomb_v.cpp index 406f79166a8..dfea3b252fb 100644 --- a/src/mame/konami/divebomb_v.cpp +++ b/src/mame/konami/divebomb_v.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/divebomb.h" +#include "divebomb.h" #include "video/resnet.h" diff --git a/src/mame/konami/djmain.cpp b/src/mame/konami/djmain.cpp index 77973cd3adb..f66091253a6 100644 --- a/src/mame/konami/djmain.cpp +++ b/src/mame/konami/djmain.cpp @@ -66,7 +66,7 @@ hard drive 3.5 adapter long 3.5 IDE cable 3.5 adapter PCB */ #include "emu.h" -#include "includes/djmain.h" +#include "djmain.h" #include "bus/ata/ataintf.h" #include "bus/ata/idehd.h" diff --git a/src/mame/konami/djmain.h b/src/mame/konami/djmain.h index ab57896c715..5862befdf33 100644 --- a/src/mame/konami/djmain.h +++ b/src/mame/konami/djmain.h @@ -6,9 +6,9 @@ #pragma once #include "bus/ata/ataintf.h" -#include "video/konami_helper.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k055555.h" +#include "konami_helper.h" +#include "k054156_k054157_k056832.h" +#include "k055555.h" #include "emupal.h" class djmain_state : public driver_device diff --git a/src/mame/konami/djmain_v.cpp b/src/mame/konami/djmain_v.cpp index 2c8d9bce710..62430ef0d78 100644 --- a/src/mame/konami/djmain_v.cpp +++ b/src/mame/konami/djmain_v.cpp @@ -6,7 +6,7 @@ */ #include "emu.h" -#include "includes/djmain.h" +#include "djmain.h" #define NUM_SPRITES (0x800 / 16) #define NUM_LAYERS 2 diff --git a/src/mame/konami/fastlane.cpp b/src/mame/konami/fastlane.cpp index e85f3f3cc5b..b1cd8d08250 100644 --- a/src/mame/konami/fastlane.cpp +++ b/src/mame/konami/fastlane.cpp @@ -13,9 +13,9 @@ #include "emu.h" -#include "includes/konamipt.h" -#include "video/k007121.h" -#include "video/k051733.h" +#include "konamipt.h" +#include "k007121.h" +#include "k051733.h" #include "cpu/m6809/hd6309.h" #include "machine/timer.h" diff --git a/src/mame/konami/finalizr.cpp b/src/mame/konami/finalizr.cpp index 6103226c533..17ec21cb9b6 100644 --- a/src/mame/konami/finalizr.cpp +++ b/src/mame/konami/finalizr.cpp @@ -13,12 +13,12 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/finalizr.h" -#include "includes/konamipt.h" +#include "finalizr.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "machine/gen_latch.h" -#include "machine/konami1.h" +#include "konami1.h" #include "machine/watchdog.h" #include "sound/dac.h" #include "sound/sn76496.h" diff --git a/src/mame/konami/finalizr_v.cpp b/src/mame/konami/finalizr_v.cpp index 76182cc3e3e..2927703b487 100644 --- a/src/mame/konami/finalizr_v.cpp +++ b/src/mame/konami/finalizr_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/finalizr.h" +#include "finalizr.h" #include "video/resnet.h" #include "screen.h" diff --git a/src/mame/konami/firebeat.cpp b/src/mame/konami/firebeat.cpp index 13bae4b1178..989f46bcb47 100644 --- a/src/mame/konami/firebeat.cpp +++ b/src/mame/konami/firebeat.cpp @@ -149,14 +149,14 @@ #include "machine/ins8250.h" #include "machine/intelfsh.h" #include "machine/mb8421.h" -#include "machine/midikbd.h" +#include "midikbd.h" #include "machine/rtc65271.h" #include "machine/timer.h" #include "sound/cdda.h" #include "sound/xt446.h" #include "sound/rf5c400.h" #include "sound/ymz280b.h" -#include "video/k057714.h" +#include "k057714.h" #include "imagedev/floppy.h" diff --git a/src/mame/konami/flkatck.cpp b/src/mame/konami/flkatck.cpp index 41561d1d77a..dadfa670a6d 100644 --- a/src/mame/konami/flkatck.cpp +++ b/src/mame/konami/flkatck.cpp @@ -15,9 +15,9 @@ NOTE: A USA version of Flak Attack is known to exist - currently not dumped #include "emu.h" -#include "includes/konamipt.h" -#include "machine/k007452.h" -#include "video/k007121.h" +#include "konamipt.h" +#include "k007452.h" +#include "k007121.h" #include "cpu/m6809/hd6309.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/gberet.cpp b/src/mame/konami/gberet.cpp index fb26d54251a..b152ec06cb1 100644 --- a/src/mame/konami/gberet.cpp +++ b/src/mame/konami/gberet.cpp @@ -186,8 +186,8 @@ TBP24S10.A12 - 256x4-bit bipolar PROM (possibly also a color PROM) ***************************************************************************/ #include "emu.h" -#include "includes/gberet.h" -#include "includes/konamipt.h" +#include "gberet.h" +#include "konamipt.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/gberet_v.cpp b/src/mame/konami/gberet_v.cpp index c21ba692db3..4f113bc5616 100644 --- a/src/mame/konami/gberet_v.cpp +++ b/src/mame/konami/gberet_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/gberet.h" +#include "gberet.h" /*************************************************************************** diff --git a/src/mame/konami/giclassic.cpp b/src/mame/konami/giclassic.cpp index db7d95e3a33..4ec9ec38f21 100644 --- a/src/mame/konami/giclassic.cpp +++ b/src/mame/konami/giclassic.cpp @@ -46,10 +46,10 @@ #include "emu.h" #include "cpu/m68000/m68000.h" #include "machine/k053252.h" -#include "video/k055555.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k053246_k053247_k055673.h" -#include "video/konami_helper.h" +#include "k055555.h" +#include "k054156_k054157_k056832.h" +#include "k053246_k053247_k055673.h" +#include "konami_helper.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/konami/gijoe.cpp b/src/mame/konami/gijoe.cpp index 2f42c42486d..df886dd541d 100644 --- a/src/mame/konami/gijoe.cpp +++ b/src/mame/konami/gijoe.cpp @@ -105,8 +105,8 @@ Known Issues ***************************************************************************/ #include "emu.h" -#include "includes/gijoe.h" -#include "includes/konamipt.h" +#include "gijoe.h" +#include "konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/gijoe.h b/src/mame/konami/gijoe.h index 9d3cd1d3834..f6a65a6fc86 100644 --- a/src/mame/konami/gijoe.h +++ b/src/mame/konami/gijoe.h @@ -11,10 +11,10 @@ #pragma once #include "sound/k054539.h" -#include "video/k053251.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k053246_k053247_k055673.h" -#include "video/konami_helper.h" +#include "k053251.h" +#include "k054156_k054157_k056832.h" +#include "k053246_k053247_k055673.h" +#include "konami_helper.h" #include "machine/k054321.h" #include "emupal.h" diff --git a/src/mame/konami/gijoe_v.cpp b/src/mame/konami/gijoe_v.cpp index 13bec02c520..72ddf914228 100644 --- a/src/mame/konami/gijoe_v.cpp +++ b/src/mame/konami/gijoe_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert #include "emu.h" -#include "includes/gijoe.h" +#include "gijoe.h" K053246_CB_MEMBER(gijoe_state::sprite_callback) { diff --git a/src/mame/konami/gradius3.cpp b/src/mame/konami/gradius3.cpp index d7e66c00589..c31d15937b3 100644 --- a/src/mame/konami/gradius3.cpp +++ b/src/mame/konami/gradius3.cpp @@ -23,8 +23,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gradius3.h" -#include "includes/konamipt.h" +#include "gradius3.h" +#include "konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/gradius3.h b/src/mame/konami/gradius3.h index b8bf8711d74..41aa0c9bf0c 100644 --- a/src/mame/konami/gradius3.h +++ b/src/mame/konami/gradius3.h @@ -12,9 +12,9 @@ #include "machine/timer.h" #include "sound/k007232.h" -#include "video/k052109.h" -#include "video/k051960.h" -#include "video/konami_helper.h" +#include "k052109.h" +#include "k051960.h" +#include "konami_helper.h" class gradius3_state : public driver_device { diff --git a/src/mame/konami/gradius3_v.cpp b/src/mame/konami/gradius3_v.cpp index 9403cd345dd..bd9e1d40784 100644 --- a/src/mame/konami/gradius3_v.cpp +++ b/src/mame/konami/gradius3_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/gradius3.h" +#include "gradius3.h" #include "screen.h" diff --git a/src/mame/konami/gticlub.cpp b/src/mame/konami/gticlub.cpp index 658bf7706dd..bacb6398475 100644 --- a/src/mame/konami/gticlub.cpp +++ b/src/mame/konami/gticlub.cpp @@ -232,12 +232,12 @@ Hang Pilot (uses an unknown but similar video board) 12W #include "machine/eepromser.h" #include "machine/k033906.h" #include "machine/k056230.h" -#include "machine/konppc.h" +#include "konppc.h" #include "sound/k056800.h" #include "sound/rf5c400.h" -#include "video/k001005.h" -#include "video/k001006.h" -#include "video/k001604.h" +#include "k001005.h" +#include "k001006.h" +#include "k001604.h" #include "video/voodoo.h" #include "emupal.h" diff --git a/src/mame/konami/gyruss.cpp b/src/mame/konami/gyruss.cpp index 7e6d6a9d5c5..30ccc0577e1 100644 --- a/src/mame/konami/gyruss.cpp +++ b/src/mame/konami/gyruss.cpp @@ -58,14 +58,14 @@ and 1 SFX channel controlled by an 8039: ***************************************************************************/ #include "emu.h" -#include "includes/gyruss.h" -#include "includes/konamipt.h" +#include "gyruss.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" #include "machine/74259.h" #include "machine/gen_latch.h" -#include "machine/konami1.h" +#include "konami1.h" #include "sound/ay8910.h" #include "sound/discrete.h" diff --git a/src/mame/konami/gyruss_v.cpp b/src/mame/konami/gyruss_v.cpp index 50c390ab30b..076d7b5029c 100644 --- a/src/mame/konami/gyruss_v.cpp +++ b/src/mame/konami/gyruss_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/gyruss.h" +#include "gyruss.h" /*************************************************************************** diff --git a/src/mame/konami/hcastle.cpp b/src/mame/konami/hcastle.cpp index 4080af1d507..a139d061700 100644 --- a/src/mame/konami/hcastle.cpp +++ b/src/mame/konami/hcastle.cpp @@ -10,8 +10,8 @@ #include "emu.h" -#include "includes/konamipt.h" -#include "video/k007121.h" +#include "konamipt.h" +#include "k007121.h" #include "cpu/m6809/konami.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/hexion.cpp b/src/mame/konami/hexion.cpp index c54ee9eb850..9b523bea91d 100644 --- a/src/mame/konami/hexion.cpp +++ b/src/mame/konami/hexion.cpp @@ -80,7 +80,7 @@ Notes: #include "emu.h" -#include "includes/konamipt.h" +#include "konamipt.h" #include "cpu/z80/z80.h" #include "machine/k053252.h" diff --git a/src/mame/konami/hornet.cpp b/src/mame/konami/hornet.cpp index 7558d64634d..7e2eda21489 100644 --- a/src/mame/konami/hornet.cpp +++ b/src/mame/konami/hornet.cpp @@ -356,13 +356,13 @@ Jumpers set on GFX PCB to scope monitor: #include "machine/ds2401.h" #include "machine/eepromser.h" #include "machine/k033906.h" -#include "machine/konami_gn676_lan.h" -#include "machine/konppc.h" +#include "konami_gn676_lan.h" +#include "konppc.h" #include "machine/timekpr.h" #include "machine/watchdog.h" #include "sound/k056800.h" #include "sound/rf5c400.h" -#include "video/k037122.h" +#include "k037122.h" #include "video/voodoo_2.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/konami/hyperspt.cpp b/src/mame/konami/hyperspt.cpp index 86c972f1faa..7bced29aad2 100644 --- a/src/mame/konami/hyperspt.cpp +++ b/src/mame/konami/hyperspt.cpp @@ -9,16 +9,16 @@ Based on drivers from Juno First emulator by Chris Hardy (chrish@kcbbs.gen.nz) ***************************************************************************/ #include "emu.h" -#include "includes/hyperspt.h" -#include "includes/konamipt.h" -#include "audio/hyprolyb.h" +#include "hyperspt.h" +#include "konamipt.h" +#include "hyprolyb.h" #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" #include "machine/74259.h" #include "machine/gen_latch.h" -#include "machine/konami1.h" +#include "konami1.h" #include "machine/nvram.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/hyperspt.h b/src/mame/konami/hyperspt.h index 068e0ff8f37..34364f3aee3 100644 --- a/src/mame/konami/hyperspt.h +++ b/src/mame/konami/hyperspt.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/trackfld.h" +#include "trackfld_a.h" #include "sound/dac.h" #include "sound/sn76496.h" #include "sound/vlm5030.h" diff --git a/src/mame/konami/hyperspt_v.cpp b/src/mame/konami/hyperspt_v.cpp index 2371a687673..43d572665ac 100644 --- a/src/mame/konami/hyperspt_v.cpp +++ b/src/mame/konami/hyperspt_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/hyperspt.h" +#include "hyperspt.h" /*************************************************************************** diff --git a/src/mame/konami/hyprolyb.cpp b/src/mame/konami/hyprolyb.cpp index c97d5612d03..28ba081806d 100644 --- a/src/mame/konami/hyprolyb.cpp +++ b/src/mame/konami/hyprolyb.cpp @@ -2,7 +2,7 @@ // copyright-holders:Chris Hardy #include "emu.h" #include "cpu/m6800/m6800.h" -#include "audio/hyprolyb.h" +#include "hyprolyb.h" DEFINE_DEVICE_TYPE(HYPROLYB_ADPCM, hyprolyb_adpcm_device, "hyprolyb_adpcm", "Hyper Olympics Audio") diff --git a/src/mame/konami/ironhors.cpp b/src/mame/konami/ironhors.cpp index 8f8cf08f04b..75c3e612b99 100644 --- a/src/mame/konami/ironhors.cpp +++ b/src/mame/konami/ironhors.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ironhors.h" -#include "includes/konamipt.h" +#include "ironhors.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/ironhors_v.cpp b/src/mame/konami/ironhors_v.cpp index 97e2aff8ed0..039bab309dd 100644 --- a/src/mame/konami/ironhors_v.cpp +++ b/src/mame/konami/ironhors_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/ironhors.h" +#include "ironhors.h" /*************************************************************************** diff --git a/src/mame/konami/jackal.cpp b/src/mame/konami/jackal.cpp index dfb15f4fb00..c362083c99f 100644 --- a/src/mame/konami/jackal.cpp +++ b/src/mame/konami/jackal.cpp @@ -71,8 +71,8 @@ Address Dir Data Description ***************************************************************************/ #include "emu.h" -#include "includes/jackal.h" -#include "includes/konamipt.h" +#include "jackal.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/jackal_v.cpp b/src/mame/konami/jackal_v.cpp index a3f5664409a..f3652cc020f 100644 --- a/src/mame/konami/jackal_v.cpp +++ b/src/mame/konami/jackal_v.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/jackal.h" +#include "jackal.h" void jackal_state::palette(palette_device &palette) const diff --git a/src/mame/konami/jailbrek.cpp b/src/mame/konami/jailbrek.cpp index 621495a4d01..31fc43c93e8 100644 --- a/src/mame/konami/jailbrek.cpp +++ b/src/mame/konami/jailbrek.cpp @@ -86,9 +86,9 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/jailbrek.h" -#include "includes/konamipt.h" -#include "machine/konami1.h" +#include "jailbrek.h" +#include "konamipt.h" +#include "konami1.h" #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/jailbrek_v.cpp b/src/mame/konami/jailbrek_v.cpp index c1519e6c0d0..92001a443ab 100644 --- a/src/mame/konami/jailbrek_v.cpp +++ b/src/mame/konami/jailbrek_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi #include "emu.h" -#include "includes/jailbrek.h" +#include "jailbrek.h" void jailbrek_state::jailbrek_palette(palette_device &palette) const { diff --git a/src/mame/konami/junofrst.cpp b/src/mame/konami/junofrst.cpp index 1e8363e910b..4f9ec9ad1ee 100644 --- a/src/mame/konami/junofrst.cpp +++ b/src/mame/konami/junofrst.cpp @@ -80,15 +80,15 @@ Blitter source graphics #include "emu.h" -#include "includes/tutankhm.h" -#include "includes/konamipt.h" +#include "tutankhm.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "cpu/mcs48/mcs48.h" #include "cpu/z80/z80.h" #include "machine/74259.h" #include "machine/gen_latch.h" -#include "machine/konami1.h" +#include "konami1.h" #include "machine/watchdog.h" #include "sound/ay8910.h" #include "sound/dac.h" diff --git a/src/mame/konami/k001005.h b/src/mame/konami/k001005.h index 2b9260a07ed..1a2e39ea451 100644 --- a/src/mame/konami/k001005.h +++ b/src/mame/konami/k001005.h @@ -7,7 +7,7 @@ #include "video/poly.h" #include "cpu/sharc/sharc.h" -#include "video/k001006.h" +#include "k001006.h" #include "video/rgbutil.h" #include diff --git a/src/mame/konami/k054156_k054157_k056832.h b/src/mame/konami/k054156_k054157_k056832.h index a24da2ee973..8645b6af628 100644 --- a/src/mame/konami/k054156_k054157_k056832.h +++ b/src/mame/konami/k054156_k054157_k056832.h @@ -5,7 +5,7 @@ #pragma once -#include "video/k055555.h" // still needs k055555_get_palette_index +#include "k055555.h" // still needs k055555_get_palette_index #include "tilemap.h" #define K056832_CB_MEMBER(_name) void _name(int layer, int *code, int *color, int *flags, int *priority) diff --git a/src/mame/konami/k573cass.h b/src/mame/konami/k573cass.h index 10e756b5922..1c5285851df 100644 --- a/src/mame/konami/k573cass.h +++ b/src/mame/konami/k573cass.h @@ -14,7 +14,7 @@ #include "machine/ds2401.h" #include "machine/x76f041.h" #include "machine/x76f100.h" -#include "machine/zs01.h" +#include "zs01.h" DECLARE_DEVICE_TYPE(KONAMI573_CASSETTE_SLOT, konami573_cassette_slot_device) diff --git a/src/mame/konami/k573dio.h b/src/mame/konami/k573dio.h index 209b0b06587..9b89fe4e708 100644 --- a/src/mame/konami/k573dio.h +++ b/src/mame/konami/k573dio.h @@ -5,7 +5,7 @@ #pragma once -#include "machine/k573fpga.h" +#include "k573fpga.h" #include "machine/ds2401.h" class k573dio_device : public device_t diff --git a/src/mame/konami/konamigx.cpp b/src/mame/konami/konamigx.cpp index 381c538640c..35ef08672a4 100644 --- a/src/mame/konami/konamigx.cpp +++ b/src/mame/konami/konamigx.cpp @@ -97,7 +97,7 @@ */ #include "emu.h" -#include "includes/konamigx.h" +#include "konamigx.h" #include "cpu/m68000/m68000.h" #include "cpu/tms57002/tms57002.h" diff --git a/src/mame/konami/konamigx.h b/src/mame/konami/konamigx.h index 3d53cb8b06e..ebf548ea6c1 100644 --- a/src/mame/konami/konamigx.h +++ b/src/mame/konami/konamigx.h @@ -11,12 +11,12 @@ #include "machine/timer.h" #include "sound/k056800.h" #include "sound/k054539.h" -#include "video/k053246_k053247_k055673.h" -#include "video/k053250.h" -#include "video/k053936.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k054338.h" -#include "video/k055555.h" +#include "k053246_k053247_k055673.h" +#include "k053250.h" +#include "k053936.h" +#include "k054156_k054157_k056832.h" +#include "k054338.h" +#include "k055555.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/konami/konamigx_m.cpp b/src/mame/konami/konamigx_m.cpp index 50b1ac1d09b..26bf5f14ab9 100644 --- a/src/mame/konami/konamigx_m.cpp +++ b/src/mame/konami/konamigx_m.cpp @@ -7,7 +7,7 @@ */ #include "emu.h" -#include "includes/konamigx.h" +#include "konamigx.h" /***************************************************************************/ /* */ diff --git a/src/mame/konami/konamigx_v.cpp b/src/mame/konami/konamigx_v.cpp index 26e87472aa0..34ac7efc7ef 100644 --- a/src/mame/konami/konamigx_v.cpp +++ b/src/mame/konami/konamigx_v.cpp @@ -6,8 +6,8 @@ */ #include "emu.h" -#include "video/k053250.h" -#include "includes/konamigx.h" +#include "k053250.h" +#include "konamigx.h" //#define GX_DEBUG diff --git a/src/mame/konami/konamim2.cpp b/src/mame/konami/konamim2.cpp index 90fd8e36dfb..d93828cb3e2 100644 --- a/src/mame/konami/konamim2.cpp +++ b/src/mame/konami/konamim2.cpp @@ -216,7 +216,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "machine/3dom2.h" +#include "3dom2.h" #include "bus/ata/ataintf.h" #include "bus/ata/cr589.h" diff --git a/src/mame/konami/konendev.cpp b/src/mame/konami/konendev.cpp index 3dca62dce11..a929ddedb3d 100644 --- a/src/mame/konami/konendev.cpp +++ b/src/mame/konami/konendev.cpp @@ -62,7 +62,7 @@ */ #include "emu.h" -#include "video/k057714.h" +#include "k057714.h" #include "cpu/h8/h83006.h" #include "cpu/powerpc/ppc.h" diff --git a/src/mame/konami/konmedal.cpp b/src/mame/konami/konmedal.cpp index 0ac5212c792..3e963834b6b 100644 --- a/src/mame/konami/konmedal.cpp +++ b/src/mame/konami/konmedal.cpp @@ -68,9 +68,9 @@ Konami PWB 402218 boards #include "sound/okim6295.h" #include "sound/upd7759.h" #include "sound/ymz280b.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k052109.h" -#include "video/konami_helper.h" +#include "k054156_k054157_k056832.h" +#include "k052109.h" +#include "konami_helper.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/konami/konmedal68k.cpp b/src/mame/konami/konmedal68k.cpp index b74648e5abc..50bfc1b9ade 100644 --- a/src/mame/konami/konmedal68k.cpp +++ b/src/mame/konami/konmedal68k.cpp @@ -28,9 +28,9 @@ #include "machine/timer.h" #include "machine/ticket.h" #include "sound/ymz280b.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k055555.h" -#include "video/konami_helper.h" +#include "k054156_k054157_k056832.h" +#include "k055555.h" +#include "konami_helper.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/konami/kpontoon.cpp b/src/mame/konami/kpontoon.cpp index 778630b2fb6..c4cf759ecc5 100644 --- a/src/mame/konami/kpontoon.cpp +++ b/src/mame/konami/kpontoon.cpp @@ -22,7 +22,7 @@ #include "cpu/z80/z80.h" #include "machine/k053252.h" #include "sound/k054539.h" -#include "video/k053246_k053247_k055673.h" +#include "k053246_k053247_k055673.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/konami/ksys573.cpp b/src/mame/konami/ksys573.cpp index c71f03162e0..4b7e3dd9ce3 100644 --- a/src/mame/konami/ksys573.cpp +++ b/src/mame/konami/ksys573.cpp @@ -397,13 +397,13 @@ Notes: (all ICs shown) #include "machine/ds2401.h" #include "machine/jvshost.h" #include "machine/linflash.h" -#include "machine/k573cass.h" -#include "machine/k573dio.h" -#include "machine/k573mcal.h" -#include "machine/k573mcr.h" -#include "machine/k573msu.h" -#include "machine/k573npu.h" -#include "machine/k573kara.h" +#include "k573cass.h" +#include "k573dio.h" +#include "k573mcal.h" +#include "k573mcr.h" +#include "k573msu.h" +#include "k573npu.h" +#include "k573kara.h" #include "machine/mb89371.h" #include "machine/ram.h" #include "machine/timekpr.h" diff --git a/src/mame/konami/labyrunr.cpp b/src/mame/konami/labyrunr.cpp index 6d17fdc9bac..30dcd844b77 100644 --- a/src/mame/konami/labyrunr.cpp +++ b/src/mame/konami/labyrunr.cpp @@ -12,9 +12,9 @@ #include "emu.h" -#include "includes/konamipt.h" -#include "video/k007121.h" -#include "video/k051733.h" +#include "konamipt.h" +#include "k007121.h" +#include "k051733.h" #include "cpu/m6809/hd6309.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/lethal.cpp b/src/mame/konami/lethal.cpp index 50df6687ec5..145bc34ac98 100644 --- a/src/mame/konami/lethal.cpp +++ b/src/mame/konami/lethal.cpp @@ -247,7 +247,7 @@ maybe some sprite placement issues ***************************************************************************/ #include "emu.h" -#include "includes/lethal.h" +#include "lethal.h" #include "cpu/m6809/m6809.h" #include "cpu/m6809/hd6309.h" diff --git a/src/mame/konami/lethal.h b/src/mame/konami/lethal.h index 16535a2f165..2792cc3e698 100644 --- a/src/mame/konami/lethal.h +++ b/src/mame/konami/lethal.h @@ -12,10 +12,10 @@ #include "machine/bankdev.h" #include "sound/k054539.h" -#include "video/konami_helper.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k053244_k053245.h" -#include "video/k054000.h" +#include "konami_helper.h" +#include "k054156_k054157_k056832.h" +#include "k053244_k053245.h" +#include "k054000.h" #include "machine/k054321.h" #include "emupal.h" diff --git a/src/mame/konami/lethal_v.cpp b/src/mame/konami/lethal_v.cpp index 0e8fe8c4b1e..4337ad43171 100644 --- a/src/mame/konami/lethal_v.cpp +++ b/src/mame/konami/lethal_v.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lethal.h" +#include "lethal.h" #include "screen.h" diff --git a/src/mame/konami/mainevt.cpp b/src/mame/konami/mainevt.cpp index f543531337a..3b6f990a17b 100644 --- a/src/mame/konami/mainevt.cpp +++ b/src/mame/konami/mainevt.cpp @@ -34,8 +34,8 @@ Both games run on Konami's PWB351024A PCB ***************************************************************************/ #include "emu.h" -#include "includes/mainevt.h" -#include "includes/konamipt.h" +#include "mainevt.h" +#include "konamipt.h" #include "cpu/z80/z80.h" #include "cpu/m6809/hd6309.h" diff --git a/src/mame/konami/mainevt.h b/src/mame/konami/mainevt.h index 586763fcc30..24ced743e00 100644 --- a/src/mame/konami/mainevt.h +++ b/src/mame/konami/mainevt.h @@ -12,10 +12,10 @@ #include "sound/upd7759.h" #include "sound/k007232.h" -#include "video/k052109.h" -#include "video/k051960.h" -#include "video/k051733.h" -#include "video/konami_helper.h" +#include "k052109.h" +#include "k051960.h" +#include "k051733.h" +#include "konami_helper.h" class mainevt_state : public driver_device { diff --git a/src/mame/konami/mainevt_v.cpp b/src/mame/konami/mainevt_v.cpp index 27dc728af8c..d31c2762790 100644 --- a/src/mame/konami/mainevt_v.cpp +++ b/src/mame/konami/mainevt_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mainevt.h" +#include "mainevt.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/konami/megazone.cpp b/src/mame/konami/megazone.cpp index f762fe13059..ff1bd66a039 100644 --- a/src/mame/konami/megazone.cpp +++ b/src/mame/konami/megazone.cpp @@ -181,8 +181,8 @@ Notes: #include "emu.h" -#include "includes/konamipt.h" -#include "machine/konami1.h" +#include "konamipt.h" +#include "konami1.h" #include "cpu/m6809/m6809.h" #include "cpu/mcs48/mcs48.h" diff --git a/src/mame/konami/midikbd.cpp b/src/mame/konami/midikbd.cpp index 3ec87ae9613..67d412b65c5 100644 --- a/src/mame/konami/midikbd.cpp +++ b/src/mame/konami/midikbd.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Carl #include "emu.h" -#include "machine/midikbd.h" +#include "midikbd.h" DEFINE_DEVICE_TYPE(MIDI_KBD, midi_keyboard_device, "midi_kbd", "Generic MIDI Keyboard") diff --git a/src/mame/konami/mikie.cpp b/src/mame/konami/mikie.cpp index 807df8b5e9f..a5fe2c06797 100644 --- a/src/mame/konami/mikie.cpp +++ b/src/mame/konami/mikie.cpp @@ -39,8 +39,8 @@ Stephh's notes (based on the games M6809 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/mikie.h" -#include "includes/konamipt.h" +#include "mikie.h" +#include "konamipt.h" #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/konami/mikie_v.cpp b/src/mame/konami/mikie_v.cpp index 552bdb07f88..9d0262f5dbc 100644 --- a/src/mame/konami/mikie_v.cpp +++ b/src/mame/konami/mikie_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/mikie.h" +#include "mikie.h" /*************************************************************************** diff --git a/src/mame/konami/mogura.cpp b/src/mame/konami/mogura.cpp index c43af657c5c..a06a8e665cd 100644 --- a/src/mame/konami/mogura.cpp +++ b/src/mame/konami/mogura.cpp @@ -3,7 +3,7 @@ /* Mogura Desse */ #include "emu.h" -#include "includes/konamipt.h" +#include "konamipt.h" #include "cpu/z80/z80.h" #include "sound/dac.h" diff --git a/src/mame/konami/moo.cpp b/src/mame/konami/moo.cpp index bfb62dae79d..84795e75c26 100644 --- a/src/mame/konami/moo.cpp +++ b/src/mame/konami/moo.cpp @@ -115,8 +115,8 @@ Bucky: ***************************************************************************/ #include "emu.h" -#include "includes/moo.h" -#include "includes/konamipt.h" +#include "moo.h" +#include "konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/moo.h b/src/mame/konami/moo.h index bde03efa299..5a4c9f10076 100644 --- a/src/mame/konami/moo.h +++ b/src/mame/konami/moo.h @@ -13,13 +13,13 @@ #include "sound/okim6295.h" #include "sound/k054539.h" #include "machine/k053252.h" -#include "video/k053251.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k053246_k053247_k055673.h" -#include "video/k054000.h" -#include "video/k054338.h" +#include "k053251.h" +#include "k054156_k054157_k056832.h" +#include "k053246_k053247_k055673.h" +#include "k054000.h" +#include "k054338.h" #include "machine/k054321.h" -#include "video/konami_helper.h" +#include "konami_helper.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/konami/moo_v.cpp b/src/mame/konami/moo_v.cpp index 9d9327a2c1b..fa9fa9da734 100644 --- a/src/mame/konami/moo_v.cpp +++ b/src/mame/konami/moo_v.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/moo.h" +#include "moo.h" K053246_CB_MEMBER(moo_state::sprite_callback) { diff --git a/src/mame/konami/mystwarr.cpp b/src/mame/konami/mystwarr.cpp index a28f8d405dd..c6a52329a78 100644 --- a/src/mame/konami/mystwarr.cpp +++ b/src/mame/konami/mystwarr.cpp @@ -133,10 +133,10 @@ we have no way of knowing which is the later/corrected version. **************************************************************************/ #include "emu.h" -#include "includes/mystwarr.h" -#include "includes/konamigx.h" -#include "includes/konamipt.h" -#include "video/k053250.h" +#include "mystwarr.h" +#include "konamigx.h" +#include "konamipt.h" +#include "k053250.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/mystwarr.h b/src/mame/konami/mystwarr.h index b70bac000dd..5a7506b81cf 100644 --- a/src/mame/konami/mystwarr.h +++ b/src/mame/konami/mystwarr.h @@ -1,13 +1,13 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont, Phil Stroffolino, Acho A. Tang, Nicola Salmoria -#include "includes/konamigx.h" -#include "video/k053246_k053247_k055673.h" +#include "konamigx.h" +#include "k053246_k053247_k055673.h" #include "sound/k054539.h" #include "machine/k053252.h" -#include "video/k055555.h" -#include "video/k054000.h" +#include "k055555.h" +#include "k054000.h" #include "machine/k054321.h" #include "machine/timer.h" #include "tilemap.h" diff --git a/src/mame/konami/mystwarr_v.cpp b/src/mame/konami/mystwarr_v.cpp index 1416e0cbc95..238891ccf04 100644 --- a/src/mame/konami/mystwarr_v.cpp +++ b/src/mame/konami/mystwarr_v.cpp @@ -8,8 +8,8 @@ */ #include "emu.h" -#include "includes/konamigx.h" -#include "includes/mystwarr.h" +#include "konamigx.h" +#include "mystwarr.h" // create a decoding buffer to hold decodable tiles so that the ROM test will pass by diff --git a/src/mame/konami/nemesis.cpp b/src/mame/konami/nemesis.cpp index 0279e8d7ec5..a0e38a4602f 100644 --- a/src/mame/konami/nemesis.cpp +++ b/src/mame/konami/nemesis.cpp @@ -105,8 +105,8 @@ initials ***************************************************************************/ #include "emu.h" -#include "includes/nemesis.h" -#include "includes/konamipt.h" +#include "nemesis.h" +#include "konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/nemesis_v.cpp b/src/mame/konami/nemesis_v.cpp index 7645a6d0702..b8982f9fd94 100644 --- a/src/mame/konami/nemesis_v.cpp +++ b/src/mame/konami/nemesis_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/nemesis.h" +#include "nemesis.h" #include "video/resnet.h" diff --git a/src/mame/konami/nwk-tr.cpp b/src/mame/konami/nwk-tr.cpp index 47a80b8c6ae..a23cfd4da9f 100644 --- a/src/mame/konami/nwk-tr.cpp +++ b/src/mame/konami/nwk-tr.cpp @@ -273,13 +273,13 @@ Thrill Drive 713A13 - 713A14 - #include "cpu/sharc/sharc.h" #include "machine/adc1213x.h" #include "machine/k033906.h" -#include "machine/konami_gn676_lan.h" -#include "machine/konppc.h" +#include "konami_gn676_lan.h" +#include "konppc.h" #include "machine/timekpr.h" //#include "machine/x76f041.h" #include "sound/k056800.h" #include "sound/rf5c400.h" -#include "video/k001604.h" +#include "k001604.h" #include "video/voodoo.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/konami/overdriv.cpp b/src/mame/konami/overdriv.cpp index 25e9e8d0b2b..3b668dfbef2 100644 --- a/src/mame/konami/overdriv.cpp +++ b/src/mame/konami/overdriv.cpp @@ -30,10 +30,10 @@ #include "machine/k053252.h" #include "machine/timer.h" -#include "video/k051316.h" -#include "video/k053246_k053247_k055673.h" -#include "video/k053251.h" -#include "video/konami_helper.h" +#include "k051316.h" +#include "k053246_k053247_k055673.h" +#include "k053251.h" +#include "konami_helper.h" #include "cpu/m68000/m68000.h" #include "cpu/m6809/m6809.h" @@ -42,7 +42,7 @@ #include "machine/rescap.h" #include "sound/k053260.h" #include "sound/ymopm.h" -#include "video/k053250.h" +#include "k053250.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/konami/pandoras.cpp b/src/mame/konami/pandoras.cpp index d22fa2923e1..6429a9d8d8e 100644 --- a/src/mame/konami/pandoras.cpp +++ b/src/mame/konami/pandoras.cpp @@ -24,8 +24,8 @@ Boards: ***************************************************************************/ #include "emu.h" -#include "includes/pandoras.h" -#include "includes/konamipt.h" +#include "pandoras.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/pandoras_v.cpp b/src/mame/konami/pandoras_v.cpp index 08b018cdc04..e64580cb292 100644 --- a/src/mame/konami/pandoras_v.cpp +++ b/src/mame/konami/pandoras_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia #include "emu.h" -#include "includes/pandoras.h" +#include "pandoras.h" #include "video/resnet.h" /*********************************************************************** diff --git a/src/mame/konami/parodius.cpp b/src/mame/konami/parodius.cpp index efcecf0c84f..5550bfd55e6 100644 --- a/src/mame/konami/parodius.cpp +++ b/src/mame/konami/parodius.cpp @@ -10,11 +10,11 @@ #include "emu.h" -#include "includes/konamipt.h" -#include "video/k052109.h" -#include "video/k053244_k053245.h" -#include "video/k053251.h" -#include "video/konami_helper.h" +#include "konamipt.h" +#include "k052109.h" +#include "k053244_k053245.h" +#include "k053251.h" +#include "konami_helper.h" #include "cpu/m6809/konami.h" // for the callback and the firq irq definition #include "cpu/z80/z80.h" diff --git a/src/mame/konami/pingpong.cpp b/src/mame/konami/pingpong.cpp index fda0ec3c6d6..613ae0da3ab 100644 --- a/src/mame/konami/pingpong.cpp +++ b/src/mame/konami/pingpong.cpp @@ -7,7 +7,7 @@ Ping Pong (c) 1985 Konami ***************************************************************************/ #include "emu.h" -#include "includes/pingpong.h" +#include "pingpong.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" diff --git a/src/mame/konami/pingpong_v.cpp b/src/mame/konami/pingpong_v.cpp index 73ff2d3be5c..60885fd2752 100644 --- a/src/mame/konami/pingpong_v.cpp +++ b/src/mame/konami/pingpong_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/pingpong.h" +#include "pingpong.h" diff --git a/src/mame/konami/piratesh.cpp b/src/mame/konami/piratesh.cpp index d6c987517f0..7791c1dc05a 100644 --- a/src/mame/konami/piratesh.cpp +++ b/src/mame/konami/piratesh.cpp @@ -30,7 +30,7 @@ #include "emu.h" -#include "includes/konamigx.h" // TODO: WHY? +#include "konamigx.h" // TODO: WHY? #include "cpu/m68000/m68000.h" #include "machine/gen_latch.h" @@ -39,11 +39,11 @@ #include "machine/ticket.h" #include "machine/timer.h" #include "sound/k054539.h" -#include "video/k053246_k053247_k055673.h" -#include "video/k053250_ps.h" -#include "video/k054000.h" -#include "video/k055555.h" -#include "video/konami_helper.h" +#include "k053246_k053247_k055673.h" +#include "k053250_ps.h" +#include "k054000.h" +#include "k055555.h" +#include "konami_helper.h" #include "speaker.h" diff --git a/src/mame/konami/plygonet.cpp b/src/mame/konami/plygonet.cpp index fe287efc9b2..bc6a14cd8db 100644 --- a/src/mame/konami/plygonet.cpp +++ b/src/mame/konami/plygonet.cpp @@ -71,7 +71,7 @@ #include "machine/k054321.h" #include "machine/watchdog.h" #include "sound/k054539.h" -#include "video/k053936.h" +#include "k053936.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/konami/pooyan.cpp b/src/mame/konami/pooyan.cpp index 284134f4ad0..5d5b9e7a7b2 100644 --- a/src/mame/konami/pooyan.cpp +++ b/src/mame/konami/pooyan.cpp @@ -11,9 +11,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/pooyan.h" -#include "includes/konamipt.h" -#include "audio/timeplt.h" +#include "pooyan.h" +#include "konamipt.h" +#include "timeplt_a.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/konami/pooyan_v.cpp b/src/mame/konami/pooyan_v.cpp index 235640b0659..2263b95c51c 100644 --- a/src/mame/konami/pooyan_v.cpp +++ b/src/mame/konami/pooyan_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/pooyan.h" +#include "pooyan.h" /*************************************************************************** diff --git a/src/mame/konami/qdrmfgp.cpp b/src/mame/konami/qdrmfgp.cpp index 3bd60a7d6c2..69e14159979 100644 --- a/src/mame/konami/qdrmfgp.cpp +++ b/src/mame/konami/qdrmfgp.cpp @@ -21,7 +21,7 @@ GP1 HDD data contents: ***************************************************************************/ #include "emu.h" -#include "includes/qdrmfgp.h" +#include "qdrmfgp.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" diff --git a/src/mame/konami/qdrmfgp.h b/src/mame/konami/qdrmfgp.h index 673a0ba355e..d7161e61322 100644 --- a/src/mame/konami/qdrmfgp.h +++ b/src/mame/konami/qdrmfgp.h @@ -9,8 +9,8 @@ #include "machine/timer.h" #include "sound/k054539.h" #include "machine/k053252.h" -#include "video/konami_helper.h" -#include "video/k054156_k054157_k056832.h" +#include "konami_helper.h" +#include "k054156_k054157_k056832.h" #include "emupal.h" class qdrmfgp_state : public driver_device diff --git a/src/mame/konami/qdrmfgp_v.cpp b/src/mame/konami/qdrmfgp_v.cpp index 8eb80c74aca..2d0db616d71 100644 --- a/src/mame/konami/qdrmfgp_v.cpp +++ b/src/mame/konami/qdrmfgp_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/qdrmfgp.h" +#include "qdrmfgp.h" K056832_CB_MEMBER(qdrmfgp_state::qdrmfgp_tile_callback) diff --git a/src/mame/konami/quickpick5.cpp b/src/mame/konami/quickpick5.cpp index 7f3e443cdc1..854059b21de 100644 --- a/src/mame/konami/quickpick5.cpp +++ b/src/mame/konami/quickpick5.cpp @@ -26,8 +26,8 @@ #include "machine/eepromser.h" #include "sound/k051649.h" #include "sound/okim6295.h" -#include "video/k053244_k053245.h" -#include "video/konami_helper.h" +#include "k053244_k053245.h" +#include "konami_helper.h" #include "machine/k053252.h" #include "machine/nvram.h" #include "machine/ticket.h" diff --git a/src/mame/konami/rockrage.cpp b/src/mame/konami/rockrage.cpp index e9463b041e5..40aef839b87 100644 --- a/src/mame/konami/rockrage.cpp +++ b/src/mame/konami/rockrage.cpp @@ -50,8 +50,8 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/rockrage.h" -#include "includes/konamipt.h" +#include "rockrage.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "cpu/m6809/hd6309.h" diff --git a/src/mame/konami/rockrage.h b/src/mame/konami/rockrage.h index 5cf2d1cbb6c..2bebad0870d 100644 --- a/src/mame/konami/rockrage.h +++ b/src/mame/konami/rockrage.h @@ -12,8 +12,8 @@ #include "machine/gen_latch.h" #include "sound/vlm5030.h" -#include "video/k007342.h" -#include "video/k007420.h" +#include "k007342.h" +#include "k007420.h" #include "emupal.h" class rockrage_state : public driver_device diff --git a/src/mame/konami/rockrage_v.cpp b/src/mame/konami/rockrage_v.cpp index 02fe31a1a7b..bffcf57aefe 100644 --- a/src/mame/konami/rockrage_v.cpp +++ b/src/mame/konami/rockrage_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia #include "emu.h" -#include "includes/rockrage.h" +#include "rockrage.h" void rockrage_state::rockrage_palette(palette_device &palette) const { diff --git a/src/mame/konami/rocnrope.cpp b/src/mame/konami/rocnrope.cpp index 7d0a63368b6..ad8845b9708 100644 --- a/src/mame/konami/rocnrope.cpp +++ b/src/mame/konami/rocnrope.cpp @@ -9,13 +9,13 @@ ***************************************************************************/ #include "emu.h" -#include "includes/rocnrope.h" -#include "includes/konamipt.h" -#include "audio/timeplt.h" +#include "rocnrope.h" +#include "konamipt.h" +#include "timeplt_a.h" #include "cpu/m6809/m6809.h" #include "machine/74259.h" -#include "machine/konami1.h" +#include "konami1.h" #include "machine/watchdog.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/konami/rocnrope_v.cpp b/src/mame/konami/rocnrope_v.cpp index c3d30dbfb02..f801249bf83 100644 --- a/src/mame/konami/rocnrope_v.cpp +++ b/src/mame/konami/rocnrope_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/rocnrope.h" +#include "rocnrope.h" /*************************************************************************** diff --git a/src/mame/konami/rollerg.cpp b/src/mame/konami/rollerg.cpp index e5d155b4c19..b43e66848d3 100644 --- a/src/mame/konami/rollerg.cpp +++ b/src/mame/konami/rollerg.cpp @@ -14,9 +14,9 @@ #include "emu.h" -#include "video/k051316.h" -#include "video/k053244_k053245.h" -#include "video/konami_helper.h" +#include "k051316.h" +#include "k053244_k053245.h" +#include "konami_helper.h" #include "cpu/m6809/konami.h" // for the callback and the firq irq definition #include "cpu/z80/z80.h" diff --git a/src/mame/konami/rungun.cpp b/src/mame/konami/rungun.cpp index 286b5a1e277..9e9134e43b2 100644 --- a/src/mame/konami/rungun.cpp +++ b/src/mame/konami/rungun.cpp @@ -37,8 +37,8 @@ *************************************************************************/ #include "emu.h" -#include "includes/rungun.h" -#include "includes/konamipt.h" +#include "rungun.h" +#include "konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/rungun.h b/src/mame/konami/rungun.h index a864858c554..d8baf50c008 100644 --- a/src/mame/konami/rungun.h +++ b/src/mame/konami/rungun.h @@ -12,10 +12,10 @@ #include "sound/k054539.h" #include "machine/k053252.h" -#include "video/k053246_k053247_k055673.h" -#include "video/k053936.h" +#include "k053246_k053247_k055673.h" +#include "k053936.h" #include "machine/k054321.h" -#include "video/konami_helper.h" +#include "konami_helper.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/konami/rungun_v.cpp b/src/mame/konami/rungun_v.cpp index 4e500c58680..70f3439e7f8 100644 --- a/src/mame/konami/rungun_v.cpp +++ b/src/mame/konami/rungun_v.cpp @@ -12,7 +12,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/rungun.h" +#include "rungun.h" /* TTL text plane stuff */ diff --git a/src/mame/konami/sbasketb.cpp b/src/mame/konami/sbasketb.cpp index e1ca44a30a3..127c4751bc3 100644 --- a/src/mame/konami/sbasketb.cpp +++ b/src/mame/konami/sbasketb.cpp @@ -41,14 +41,14 @@ CPU/Video Board Parts: ***************************************************************************/ #include "emu.h" -#include "includes/sbasketb.h" -#include "includes/konamipt.h" +#include "sbasketb.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" #include "machine/74259.h" #include "machine/gen_latch.h" -#include "machine/konami1.h" +#include "konami1.h" #include "machine/watchdog.h" #include "speaker.h" diff --git a/src/mame/konami/sbasketb.h b/src/mame/konami/sbasketb.h index ecd407eeb5a..b058824faf4 100644 --- a/src/mame/konami/sbasketb.h +++ b/src/mame/konami/sbasketb.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/trackfld.h" +#include "trackfld_a.h" #include "sound/dac.h" #include "sound/sn76496.h" #include "sound/vlm5030.h" diff --git a/src/mame/konami/sbasketb_v.cpp b/src/mame/konami/sbasketb_v.cpp index ce3d3628d41..80095b808af 100644 --- a/src/mame/konami/sbasketb_v.cpp +++ b/src/mame/konami/sbasketb_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/sbasketb.h" +#include "sbasketb.h" /*************************************************************************** diff --git a/src/mame/konami/scotrsht.cpp b/src/mame/konami/scotrsht.cpp index b9c52f34ec8..f18da1ff7ab 100644 --- a/src/mame/konami/scotrsht.cpp +++ b/src/mame/konami/scotrsht.cpp @@ -35,8 +35,8 @@ Stephh's notes (based on the game M6502 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/scotrsht.h" -#include "includes/konamipt.h" +#include "scotrsht.h" +#include "konamipt.h" #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/konami/scotrsht_v.cpp b/src/mame/konami/scotrsht_v.cpp index dc8083fe519..b1b2c269789 100644 --- a/src/mame/konami/scotrsht_v.cpp +++ b/src/mame/konami/scotrsht_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Pierpaolo Prazzoli #include "emu.h" -#include "includes/scotrsht.h" +#include "scotrsht.h" // Similar as Iron Horse diff --git a/src/mame/konami/shaolins.cpp b/src/mame/konami/shaolins.cpp index d10413f94cb..eef0d6cb8fe 100644 --- a/src/mame/konami/shaolins.cpp +++ b/src/mame/konami/shaolins.cpp @@ -99,7 +99,7 @@ Konami games from this era with some pins not used. ****************************************************************************/ #include "emu.h" -#include "includes/shaolins.h" +#include "shaolins.h" #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/shaolins_v.cpp b/src/mame/konami/shaolins_v.cpp index 79e50b75736..952f2f61917 100644 --- a/src/mame/konami/shaolins_v.cpp +++ b/src/mame/konami/shaolins_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/shaolins.h" +#include "shaolins.h" /*************************************************************************** diff --git a/src/mame/konami/simpsons.cpp b/src/mame/konami/simpsons.cpp index a82c3c28868..8d6880923fc 100644 --- a/src/mame/konami/simpsons.cpp +++ b/src/mame/konami/simpsons.cpp @@ -97,8 +97,8 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/simpsons.h" -#include "includes/konamipt.h" +#include "simpsons.h" +#include "konamipt.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" diff --git a/src/mame/konami/simpsons.h b/src/mame/konami/simpsons.h index 83ee79d33f5..926fc406e9a 100644 --- a/src/mame/konami/simpsons.h +++ b/src/mame/konami/simpsons.h @@ -6,10 +6,10 @@ #pragma once #include "cpu/m6809/konami.h" // for the callback and the firq irq definition -#include "video/k052109.h" -#include "video/k053251.h" -#include "video/k053246_k053247_k055673.h" -#include "video/konami_helper.h" +#include "k052109.h" +#include "k053251.h" +#include "k053246_k053247_k055673.h" +#include "konami_helper.h" class simpsons_state : public driver_device { diff --git a/src/mame/konami/simpsons_m.cpp b/src/mame/konami/simpsons_m.cpp index 995363e6fb6..2394b0eded8 100644 --- a/src/mame/konami/simpsons_m.cpp +++ b/src/mame/konami/simpsons_m.cpp @@ -4,7 +4,7 @@ #include "cpu/m6809/konami.h" #include "machine/eepromser.h" -#include "includes/simpsons.h" +#include "simpsons.h" /*************************************************************************** diff --git a/src/mame/konami/simpsons_v.cpp b/src/mame/konami/simpsons_v.cpp index 8c5d47df531..4e8bb92b308 100644 --- a/src/mame/konami/simpsons_v.cpp +++ b/src/mame/konami/simpsons_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi #include "emu.h" -#include "includes/simpsons.h" +#include "simpsons.h" /*************************************************************************** diff --git a/src/mame/konami/spy.cpp b/src/mame/konami/spy.cpp index 83376a86ccb..f5d119bd510 100644 --- a/src/mame/konami/spy.cpp +++ b/src/mame/konami/spy.cpp @@ -20,8 +20,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/spy.h" -#include "includes/konamipt.h" +#include "spy.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/spy.h b/src/mame/konami/spy.h index ec6bf5afbb3..06d2acbd6bc 100644 --- a/src/mame/konami/spy.h +++ b/src/mame/konami/spy.h @@ -11,9 +11,9 @@ #pragma once #include "sound/k007232.h" -#include "video/k052109.h" -#include "video/k051960.h" -#include "video/konami_helper.h" +#include "k052109.h" +#include "k051960.h" +#include "konami_helper.h" #include "emupal.h" class spy_state : public driver_device diff --git a/src/mame/konami/spy_v.cpp b/src/mame/konami/spy_v.cpp index a20356a0c37..4dea9261ee8 100644 --- a/src/mame/konami/spy_v.cpp +++ b/src/mame/konami/spy_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/spy.h" +#include "spy.h" #include "screen.h" diff --git a/src/mame/konami/surpratk.cpp b/src/mame/konami/surpratk.cpp index ce6c7b263ee..d054322cd9f 100644 --- a/src/mame/konami/surpratk.cpp +++ b/src/mame/konami/surpratk.cpp @@ -12,11 +12,11 @@ #include "emu.h" -#include "includes/konamipt.h" -#include "video/k052109.h" -#include "video/k053244_k053245.h" -#include "video/k053251.h" -#include "video/konami_helper.h" +#include "konamipt.h" +#include "k052109.h" +#include "k053244_k053245.h" +#include "k053251.h" +#include "konami_helper.h" #include "cpu/m6809/konami.h" // for the callback and the FIRQ IRQ definition #include "machine/bankdev.h" diff --git a/src/mame/konami/tasman.cpp b/src/mame/konami/tasman.cpp index e5319b787e4..0d6315dcf35 100644 --- a/src/mame/konami/tasman.cpp +++ b/src/mame/konami/tasman.cpp @@ -21,13 +21,13 @@ */ #include "emu.h" -#include "video/konami_helper.h" +#include "konami_helper.h" #include "cpu/m68000/m68000.h" #include "machine/k053252.h" #include "machine/timer.h" -#include "video/k053246_k053247_k055673.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k055555.h" +#include "k053246_k053247_k055673.h" +#include "k054156_k054157_k056832.h" +#include "k055555.h" #include "machine/eepromser.h" #include "emupal.h" #include "speaker.h" diff --git a/src/mame/konami/thunderx.cpp b/src/mame/konami/thunderx.cpp index 2295ef4f80d..b02e756546d 100644 --- a/src/mame/konami/thunderx.cpp +++ b/src/mame/konami/thunderx.cpp @@ -33,8 +33,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/thunderx.h" -#include "includes/konamipt.h" +#include "thunderx.h" +#include "konamipt.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/konami/thunderx.h b/src/mame/konami/thunderx.h index d19825d1495..23986680281 100644 --- a/src/mame/konami/thunderx.h +++ b/src/mame/konami/thunderx.h @@ -13,9 +13,9 @@ #include "cpu/m6809/konami.h" // for the callback and the firq irq definition #include "machine/bankdev.h" #include "sound/k007232.h" -#include "video/k051960.h" -#include "video/k052109.h" -#include "video/konami_helper.h" +#include "k051960.h" +#include "k052109.h" +#include "konami_helper.h" #include "emupal.h" class thunderx_state : public driver_device diff --git a/src/mame/konami/thunderx_v.cpp b/src/mame/konami/thunderx_v.cpp index df9e800a917..b9db5eed22f 100644 --- a/src/mame/konami/thunderx_v.cpp +++ b/src/mame/konami/thunderx_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Bryan McPhail, Manuel Abadia #include "emu.h" -#include "includes/thunderx.h" +#include "thunderx.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/konami/timeplt.cpp b/src/mame/konami/timeplt.cpp index e7dbeb64487..7d8ec72619a 100644 --- a/src/mame/konami/timeplt.cpp +++ b/src/mame/konami/timeplt.cpp @@ -48,9 +48,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/timeplt.h" -#include "includes/konamipt.h" -#include "audio/timeplt.h" +#include "timeplt.h" +#include "konamipt.h" +#include "timeplt_a.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/timeplt_v.cpp b/src/mame/konami/timeplt_v.cpp index e993d3c8434..8345de9edc4 100644 --- a/src/mame/konami/timeplt_v.cpp +++ b/src/mame/konami/timeplt_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/timeplt.h" +#include "timeplt.h" /*************************************************************************** diff --git a/src/mame/konami/tmnt.cpp b/src/mame/konami/tmnt.cpp index e43c6b68593..c81fd789e5f 100644 --- a/src/mame/konami/tmnt.cpp +++ b/src/mame/konami/tmnt.cpp @@ -139,8 +139,8 @@ Updates: ***************************************************************************/ #include "emu.h" -#include "includes/tmnt.h" -#include "includes/konamipt.h" +#include "tmnt.h" +#include "konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/m6805/m68705.h" diff --git a/src/mame/konami/tmnt.h b/src/mame/konami/tmnt.h index 4e9b3a2aa89..5a05d66b12f 100644 --- a/src/mame/konami/tmnt.h +++ b/src/mame/konami/tmnt.h @@ -10,13 +10,13 @@ #include "sound/k007232.h" #include "sound/k053260.h" #include "sound/k054539.h" -#include "video/k053244_k053245.h" -#include "video/k052109.h" -#include "video/k051960.h" -#include "video/k053251.h" -#include "video/k053936.h" -#include "video/k054000.h" -#include "video/konami_helper.h" +#include "k053244_k053245.h" +#include "k052109.h" +#include "k051960.h" +#include "k053251.h" +#include "k053936.h" +#include "k054000.h" +#include "konami_helper.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/konami/tmnt_v.cpp b/src/mame/konami/tmnt_v.cpp index e7d59a076cd..572dd49897b 100644 --- a/src/mame/konami/tmnt_v.cpp +++ b/src/mame/konami/tmnt_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/tmnt.h" +#include "tmnt.h" #include "screen.h" TILE_GET_INFO_MEMBER(glfgreat_state::glfgreat_get_roz_tile_info) diff --git a/src/mame/konami/tp84.cpp b/src/mame/konami/tp84.cpp index 480a5645cb1..c4646b050fb 100644 --- a/src/mame/konami/tp84.cpp +++ b/src/mame/konami/tp84.cpp @@ -64,8 +64,8 @@ C004 76489 #4 trigger ***************************************************************************/ #include "emu.h" -#include "includes/tp84.h" -#include "includes/konamipt.h" +#include "tp84.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/tp84_v.cpp b/src/mame/konami/tp84_v.cpp index 24996f784f4..43bdca7691e 100644 --- a/src/mame/konami/tp84_v.cpp +++ b/src/mame/konami/tp84_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/tp84.h" +#include "tp84.h" diff --git a/src/mame/konami/trackfld.cpp b/src/mame/konami/trackfld.cpp index cd356908304..a0ae87f77de 100644 --- a/src/mame/konami/trackfld.cpp +++ b/src/mame/konami/trackfld.cpp @@ -181,14 +181,14 @@ MAIN BOARD: ***************************************************************************/ #include "emu.h" -#include "includes/trackfld.h" -#include "includes/konamipt.h" -#include "audio/hyprolyb.h" +#include "trackfld.h" +#include "konamipt.h" +#include "hyprolyb.h" #include "cpu/z80/z80.h" #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" -#include "machine/konami1.h" +#include "konami1.h" #include "machine/nvram.h" #include "machine/watchdog.h" #include "speaker.h" diff --git a/src/mame/konami/trackfld.h b/src/mame/konami/trackfld.h index 16c7a8392dc..cd353ed42ab 100644 --- a/src/mame/konami/trackfld.h +++ b/src/mame/konami/trackfld.h @@ -10,7 +10,7 @@ #pragma once -#include "audio/trackfld.h" +#include "trackfld_a.h" #include "machine/74259.h" #include "sound/dac.h" #include "sound/sn76496.h" diff --git a/src/mame/konami/trackfld_a.cpp b/src/mame/konami/trackfld_a.cpp index 9a8a863d551..8534da5adc2 100644 --- a/src/mame/konami/trackfld_a.cpp +++ b/src/mame/konami/trackfld_a.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "sound/sn76496.h" #include "sound/msm5205.h" -#include "includes/trackfld.h" -#include "audio/trackfld.h" +#include "trackfld.h" +#include "trackfld_a.h" #define TIMER_RATE (4096/4) diff --git a/src/mame/konami/trackfld_v.cpp b/src/mame/konami/trackfld_v.cpp index bf5fb6510ed..66f8501452e 100644 --- a/src/mame/konami/trackfld_v.cpp +++ b/src/mame/konami/trackfld_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/trackfld.h" +#include "trackfld.h" /*************************************************************************** diff --git a/src/mame/konami/tutankhm.cpp b/src/mame/konami/tutankhm.cpp index 4afaa8c551f..10789b42c35 100644 --- a/src/mame/konami/tutankhm.cpp +++ b/src/mame/konami/tutankhm.cpp @@ -84,8 +84,8 @@ /***************************************************************************/ #include "emu.h" -#include "includes/tutankhm.h" -#include "includes/konamipt.h" +#include "tutankhm.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "machine/74259.h" diff --git a/src/mame/konami/tutankhm.h b/src/mame/konami/tutankhm.h index 86119b1ae56..0a4513c7291 100644 --- a/src/mame/konami/tutankhm.h +++ b/src/mame/konami/tutankhm.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/timeplt.h" +#include "timeplt_a.h" #include "emupal.h" #include "machine/timer.h" #include "screen.h" diff --git a/src/mame/konami/tutankhm_v.cpp b/src/mame/konami/tutankhm_v.cpp index 072b0988ca9..ae9dbc4372e 100644 --- a/src/mame/konami/tutankhm_v.cpp +++ b/src/mame/konami/tutankhm_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/tutankhm.h" +#include "tutankhm.h" #include "video/resnet.h" #define STAR_RNG_PERIOD ((1 << 17) - 1) diff --git a/src/mame/konami/twin16.cpp b/src/mame/konami/twin16.cpp index e3f8f3062a9..a814ab5d1f4 100644 --- a/src/mame/konami/twin16.cpp +++ b/src/mame/konami/twin16.cpp @@ -46,8 +46,8 @@ Known Issues: */ #include "emu.h" -#include "includes/twin16.h" -#include "includes/konamipt.h" +#include "twin16.h" +#include "konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/twin16_v.cpp b/src/mame/konami/twin16_v.cpp index 898f525f148..8cd549476f1 100644 --- a/src/mame/konami/twin16_v.cpp +++ b/src/mame/konami/twin16_v.cpp @@ -14,7 +14,7 @@ */ #include "emu.h" -#include "includes/twin16.h" +#include "twin16.h" diff --git a/src/mame/konami/ultraman.cpp b/src/mame/konami/ultraman.cpp index a0976b8eeb8..26a9d2631c7 100644 --- a/src/mame/konami/ultraman.cpp +++ b/src/mame/konami/ultraman.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ultraman.h" +#include "ultraman.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/konami/ultraman.h b/src/mame/konami/ultraman.h index 25038e5d032..d3cf46a213b 100644 --- a/src/mame/konami/ultraman.h +++ b/src/mame/konami/ultraman.h @@ -12,9 +12,9 @@ #include "machine/gen_latch.h" #include "machine/input_merger.h" -#include "video/k051960.h" -#include "video/k051316.h" -#include "video/konami_helper.h" +#include "k051960.h" +#include "k051316.h" +#include "konami_helper.h" class ultraman_state : public driver_device { diff --git a/src/mame/konami/ultraman_v.cpp b/src/mame/konami/ultraman_v.cpp index 9475b6d3029..46f52f63990 100644 --- a/src/mame/konami/ultraman_v.cpp +++ b/src/mame/konami/ultraman_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Manuel Abadia #include "emu.h" -#include "includes/ultraman.h" +#include "ultraman.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/konami/vendetta.cpp b/src/mame/konami/vendetta.cpp index f16501c8d51..3b8df47dc4b 100644 --- a/src/mame/konami/vendetta.cpp +++ b/src/mame/konami/vendetta.cpp @@ -89,12 +89,12 @@ #include "emu.h" -#include "includes/konamipt.h" -#include "video/k052109.h" -#include "video/k053246_k053247_k055673.h" -#include "video/k053251.h" -#include "video/k054000.h" -#include "video/konami_helper.h" +#include "konamipt.h" +#include "k052109.h" +#include "k053246_k053247_k055673.h" +#include "k053251.h" +#include "k054000.h" +#include "konami_helper.h" #include "cpu/m6809/konami.h" // for the callback and the firq irq definition #include "cpu/z80/z80.h" diff --git a/src/mame/konami/wecleman.cpp b/src/mame/konami/wecleman.cpp index a45d4ac70c5..d13516b4ba9 100644 --- a/src/mame/konami/wecleman.cpp +++ b/src/mame/konami/wecleman.cpp @@ -271,14 +271,14 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/wecleman.h" +#include "wecleman.h" #include "cpu/m68000/m68000.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" #include "machine/adc0804.h" #include "machine/gen_latch.h" -#include "machine/k007452.h" +#include "k007452.h" #include "sound/ymopm.h" #include "speaker.h" diff --git a/src/mame/konami/wecleman.h b/src/mame/konami/wecleman.h index 4487ad7feec..d775ae0b900 100644 --- a/src/mame/konami/wecleman.h +++ b/src/mame/konami/wecleman.h @@ -7,8 +7,8 @@ #include "machine/timer.h" #include "sound/k007232.h" -#include "video/k051316.h" -#include "machine/k007452.h" +#include "k051316.h" +#include "k007452.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/konami/wecleman_v.cpp b/src/mame/konami/wecleman_v.cpp index 8754ef00d2f..f35083d77f1 100644 --- a/src/mame/konami/wecleman_v.cpp +++ b/src/mame/konami/wecleman_v.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/wecleman.h" +#include "wecleman.h" #define BMP_PAD 8 #define BLEND_STEPS 16 diff --git a/src/mame/konami/xexex.cpp b/src/mame/konami/xexex.cpp index 78c1717cb00..120e5bd75c4 100644 --- a/src/mame/konami/xexex.cpp +++ b/src/mame/konami/xexex.cpp @@ -136,8 +136,8 @@ reference(xexexj) : https://www.youtube.com/watch?v=TegjBEvvGxI ***************************************************************************/ #include "emu.h" -#include "includes/xexex.h" -#include "includes/konamipt.h" +#include "xexex.h" +#include "konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/xexex.h b/src/mame/konami/xexex.h index 769719a6092..98e39872d2f 100644 --- a/src/mame/konami/xexex.h +++ b/src/mame/konami/xexex.h @@ -10,15 +10,15 @@ #pragma once -#include "video/k053250.h" +#include "k053250.h" #include "sound/flt_vol.h" #include "sound/k054539.h" #include "machine/k053252.h" -#include "video/k054156_k054157_k056832.h" -#include "video/k053246_k053247_k055673.h" -#include "video/k054338.h" -#include "video/k053251.h" -#include "video/konami_helper.h" +#include "k054156_k054157_k056832.h" +#include "k053246_k053247_k055673.h" +#include "k054338.h" +#include "k053251.h" +#include "konami_helper.h" #include "machine/k054321.h" #include "machine/timer.h" #include "emupal.h" diff --git a/src/mame/konami/xexex_v.cpp b/src/mame/konami/xexex_v.cpp index ce75e5023b1..bca3d8be56b 100644 --- a/src/mame/konami/xexex_v.cpp +++ b/src/mame/konami/xexex_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert #include "emu.h" -#include "includes/xexex.h" +#include "xexex.h" K053246_CB_MEMBER(xexex_state::sprite_callback) { diff --git a/src/mame/konami/xmen.cpp b/src/mame/konami/xmen.cpp index d481f369da4..8766e88d712 100644 --- a/src/mame/konami/xmen.cpp +++ b/src/mame/konami/xmen.cpp @@ -22,8 +22,8 @@ likewise a 2 screen game. ***************************************************************************/ #include "emu.h" -#include "includes/xmen.h" -#include "includes/konamipt.h" +#include "xmen.h" +#include "konamipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/konami/xmen.h b/src/mame/konami/xmen.h index cf844518570..8bd55ce3a17 100644 --- a/src/mame/konami/xmen.h +++ b/src/mame/konami/xmen.h @@ -8,10 +8,10 @@ #include "machine/gen_latch.h" #include "machine/timer.h" #include "sound/k054539.h" -#include "video/k053246_k053247_k055673.h" -#include "video/k053251.h" -#include "video/k052109.h" -#include "video/konami_helper.h" +#include "k053246_k053247_k055673.h" +#include "k053251.h" +#include "k052109.h" +#include "konami_helper.h" #include "machine/k054321.h" #include "screen.h" diff --git a/src/mame/konami/xmen_v.cpp b/src/mame/konami/xmen_v.cpp index 913f33100e4..198b1d1f755 100644 --- a/src/mame/konami/xmen_v.cpp +++ b/src/mame/konami/xmen_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/xmen.h" +#include "xmen.h" /*************************************************************************** diff --git a/src/mame/konami/yiear.cpp b/src/mame/konami/yiear.cpp index ad2b558d682..6e6a25a8c46 100644 --- a/src/mame/konami/yiear.cpp +++ b/src/mame/konami/yiear.cpp @@ -97,8 +97,8 @@ Sound: VLM5030 at 7B ***************************************************************************/ #include "emu.h" -#include "includes/yiear.h" -#include "includes/konamipt.h" +#include "yiear.h" +#include "konamipt.h" #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/yiear.h b/src/mame/konami/yiear.h index 9c5cde44c50..ec69092325b 100644 --- a/src/mame/konami/yiear.h +++ b/src/mame/konami/yiear.h @@ -6,7 +6,7 @@ #pragma once -#include "audio/trackfld.h" +#include "trackfld_a.h" #include "sound/sn76496.h" #include "sound/vlm5030.h" diff --git a/src/mame/konami/yiear_v.cpp b/src/mame/konami/yiear_v.cpp index bfba8a6029e..878fe49192b 100644 --- a/src/mame/konami/yiear_v.cpp +++ b/src/mame/konami/yiear_v.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/yiear.h" +#include "yiear.h" /*************************************************************************** diff --git a/src/mame/konami/zr107.cpp b/src/mame/konami/zr107.cpp index 48d167b1d44..e10c5a2711d 100644 --- a/src/mame/konami/zr107.cpp +++ b/src/mame/konami/zr107.cpp @@ -172,15 +172,15 @@ Check drivers/gticlub.cpp for details on the bottom board. #include "machine/adc083x.h" #include "machine/eepromser.h" #include "machine/k056230.h" -#include "machine/konppc.h" +#include "konppc.h" #include "machine/watchdog.h" #include "sound/k054539.h" #include "sound/k056800.h" -#include "video/k001005.h" -#include "video/k001006.h" -#include "video/k001604.h" -#include "video/k054156_k054157_k056832.h" -#include "video/konami_helper.h" +#include "k001005.h" +#include "k001006.h" +#include "k001604.h" +#include "k054156_k054157_k056832.h" +#include "konami_helper.h" #include "emupal.h" #include "speaker.h" diff --git a/src/mame/konami/zs01.cpp b/src/mame/konami/zs01.cpp index d3b07ea9312..a587763db5b 100644 --- a/src/mame/konami/zs01.cpp +++ b/src/mame/konami/zs01.cpp @@ -12,7 +12,7 @@ */ #include "emu.h" -#include "machine/zs01.h" +#include "zs01.h" #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/kyocera/kyocera.cpp b/src/mame/kyocera/kyocera.cpp index 0e30f17814b..334cee8bcac 100644 --- a/src/mame/kyocera/kyocera.cpp +++ b/src/mame/kyocera/kyocera.cpp @@ -60,7 +60,7 @@ #include "emu.h" -#include "includes/kyocera.h" +#include "kyocera.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/kyocera/kyocera_v.cpp b/src/mame/kyocera/kyocera_v.cpp index 6b910160fef..7f5af4a355f 100644 --- a/src/mame/kyocera/kyocera_v.cpp +++ b/src/mame/kyocera/kyocera_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/kyocera.h" +#include "kyocera.h" #include "screen.h" diff --git a/src/mame/lsi/octo_kbd.cpp b/src/mame/lsi/octo_kbd.cpp index 3129cdc5d61..16fed619365 100644 --- a/src/mame/lsi/octo_kbd.cpp +++ b/src/mame/lsi/octo_kbd.cpp @@ -2,7 +2,7 @@ // copyright-holders:Barry Rodewald #include "emu.h" -#include "machine/octo_kbd.h" +#include "octo_kbd.h" #include "machine/keyboard.ipp" diff --git a/src/mame/lsi/octopus.cpp b/src/mame/lsi/octopus.cpp index f8aa2a1c5f7..f4a40f893c2 100644 --- a/src/mame/lsi/octopus.cpp +++ b/src/mame/lsi/octopus.cpp @@ -116,7 +116,7 @@ It's a very rare computer. It has 2 processors, Z80 and 8088, so it can run both #include "machine/i8251.h" #include "machine/i8255.h" #include "machine/mc146818.h" -#include "machine/octo_kbd.h" +#include "octo_kbd.h" #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/ram.h" diff --git a/src/mame/luxor/abc1600.cpp b/src/mame/luxor/abc1600.cpp index 39434dbb35c..85a605ba6bd 100644 --- a/src/mame/luxor/abc1600.cpp +++ b/src/mame/luxor/abc1600.cpp @@ -47,7 +47,7 @@ */ #include "emu.h" -#include "includes/abc1600.h" +#include "abc1600.h" #include "softlist_dev.h" diff --git a/src/mame/luxor/abc1600.h b/src/mame/luxor/abc1600.h index 2526b6900b5..b91cd79bbfb 100644 --- a/src/mame/luxor/abc1600.h +++ b/src/mame/luxor/abc1600.h @@ -11,7 +11,7 @@ #include "cpu/m68000/m68000.h" #include "formats/abc1600_dsk.h" #include "imagedev/floppy.h" -#include "machine/abc1600mac.h" +#include "abc1600mac.h" #include "machine/e0516.h" #include "machine/nmc9306.h" #include "machine/ram.h" @@ -20,7 +20,7 @@ #include "machine/z80scc.h" #include "machine/z80sio.h" #include "machine/z8536.h" -#include "video/abc1600.h" +#include "abc1600_v.h" diff --git a/src/mame/luxor/abc1600_v.cpp b/src/mame/luxor/abc1600_v.cpp index b8b87f295bd..a3fcef6bba6 100644 --- a/src/mame/luxor/abc1600_v.cpp +++ b/src/mame/luxor/abc1600_v.cpp @@ -7,7 +7,7 @@ **********************************************************************/ #include "emu.h" -#include "includes/abc1600.h" +#include "abc1600.h" #include "abc1600.lh" #include "render.h" diff --git a/src/mame/luxor/abc80.cpp b/src/mame/luxor/abc80.cpp index 9860410d024..c088ed91434 100644 --- a/src/mame/luxor/abc80.cpp +++ b/src/mame/luxor/abc80.cpp @@ -81,7 +81,7 @@ ROM checksum program: */ #include "emu.h" -#include "includes/abc80.h" +#include "abc80.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/luxor/abc80.h b/src/mame/luxor/abc80.h index 5b10576295f..b504bac7be1 100644 --- a/src/mame/luxor/abc80.h +++ b/src/mame/luxor/abc80.h @@ -17,7 +17,7 @@ #include "machine/z80daisy.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" -#include "machine/abc80kb.h" +#include "abc80kb.h" #include "machine/keyboard.h" #include "machine/ram.h" #include "machine/z80pio.h" diff --git a/src/mame/luxor/abc800.cpp b/src/mame/luxor/abc800.cpp deleted file mode 100644 index be8000e5e25..00000000000 --- a/src/mame/luxor/abc800.cpp +++ /dev/null @@ -1,302 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Curt Coder -/***************************************************************************** - * - * video/abc800.c - * - ****************************************************************************/ - -#include "emu.h" -#include "includes/abc80x.h" -#include "screen.h" - - - -// this is needed because the MC6845 emulation does -// not position the active display area correctly -#define HORIZONTAL_PORCH_HACK 115 - - - -//************************************************************************** -// HIGH RESOLUTION GRAPHICS -//************************************************************************** - -//------------------------------------------------- -// hrs_w - high resolution scanline write -//------------------------------------------------- - -void abc800_state::hrs_w(uint8_t data) -{ - m_hrs = data; -} - - -//------------------------------------------------- -// hrc_w - high resolution color write -//------------------------------------------------- - -void abc800_state::hrc_w(uint8_t data) -{ - m_fgctl = data; -} - - - -//************************************************************************** -// ABC 800 COLOR -//************************************************************************** - -//------------------------------------------------- -// hr_update - high resolution screen update -//------------------------------------------------- - -void abc800c_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ - const pen_t *pen = m_palette->pens(); - - uint16_t addr = 0; - - for (int y = m_hrs; y < std::min(cliprect.max_y + 1, m_hrs + 480); y += 2) - { - int x = 0; - - for (int sx = 0; sx < 64; sx++) - { - uint8_t data = m_video_ram[addr++]; - - for (int dot = 0; dot < 4; dot++) - { - uint16_t fgctl_addr = ((m_fgctl & 0x7f) << 2) | ((data >> 6) & 0x03); - uint8_t fgctl = m_fgctl_prom->base()[fgctl_addr]; - int color = fgctl & 0x07; - - if (color) - { - bool black = bitmap.pix(y, x) == rgb_t::black(); - bool opaque = !BIT(fgctl, 3); - - if (black || opaque) - { - bitmap.pix(y, x) = pen[color]; - bitmap.pix(y, x + 1) = pen[color]; - - bitmap.pix(y + 1, x) = pen[color]; - bitmap.pix(y + 1, x + 1) = pen[color]; - } - } - - data <<= 2; - x += 2; - } - } - } -} - - -//------------------------------------------------- -// SCREEN_UPDATE( abc800c ) -//------------------------------------------------- - -uint32_t abc800c_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ - // clear screen - bitmap.fill(rgb_t::black(), cliprect); - - // draw text - if (!BIT(m_fgctl, 7)) - { - m_trom->screen_update(screen, bitmap, cliprect); - } - - // draw HR graphics - hr_update(bitmap, cliprect); - - return 0; -} - - -//------------------------------------------------- -// SAA5050_INTERFACE( trom_intf ) -//------------------------------------------------- - -uint8_t abc800c_state::char_ram_r(offs_t offset) -{ - int row = offset / 40; - int col = offset % 40; - - offset = ((row & 0x07) * 0x80) + col; - - if (row & 0x08) offset += 0x28; - if (row & 0x10) offset += 0x50; - - return m_char_ram[offset]; -} - - -//------------------------------------------------- -// PALETTE_INIT( abc800c ) -//------------------------------------------------- - -void abc800c_state::abc800c_palette(palette_device &palette) const -{ - palette.set_pen_color(0, rgb_t::black()); - palette.set_pen_color(1, rgb_t(0xff, 0x00, 0x00)); // red - palette.set_pen_color(2, rgb_t::green()); - palette.set_pen_color(3, rgb_t(0xff, 0xff, 0x00)); // yellow - palette.set_pen_color(4, rgb_t(0x00, 0x00, 0xff)); // blue - palette.set_pen_color(5, rgb_t(0xff, 0x00, 0xff)); // magenta - palette.set_pen_color(6, rgb_t(0x00, 0xff, 0xff)); // cyan - palette.set_pen_color(7, rgb_t::white()); -} - - -//------------------------------------------------- -// machine_config( abc800c_video ) -//------------------------------------------------- - -void abc800c_state::abc800c_video(machine_config &config) -{ - screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER)); - screen.set_screen_update(FUNC(abc800c_state::screen_update)); - screen.set_refresh_hz(50); - screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); - screen.set_size(480, 480); - screen.set_visarea(0, 480-1, 0, 480-1); - - PALETTE(config, m_palette, FUNC(abc800c_state::abc800c_palette), 8); - - SAA5052(config, m_trom, XTAL(12'000'000)/2); - m_trom->d_cb().set(FUNC(abc800c_state::char_ram_r)); - m_trom->set_screen_size(40, 24, 40); -} - - - -//************************************************************************** -// ABC 800 MONOCHROME -//************************************************************************** - -//------------------------------------------------- -// hr_update - high resolution screen update -//------------------------------------------------- - -void abc800m_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ - uint16_t addr = 0; - - const pen_t *pen = m_palette->pens(); - - for (int y = m_hrs; y < std::min(cliprect.max_y + 1, m_hrs + 240); y++) - { - int x = HORIZONTAL_PORCH_HACK; - - for (int sx = 0; sx < 64; sx++) - { - uint8_t data = m_video_ram[addr++]; - - for (int dot = 0; dot < 4; dot++) - { - uint16_t fgctl_addr = ((m_fgctl & 0x7f) << 2) | ((data >> 6) & 0x03); - int color = (m_fgctl_prom->base()[fgctl_addr] & 0x07) ? 1 : 0; - - bitmap.pix(y, x++) = pen[color]; - bitmap.pix(y, x++) = pen[color]; - - data <<= 2; - } - } - } -} - - -//------------------------------------------------- -// MC6845_UPDATE_ROW( abc800m_update_row ) -//------------------------------------------------- - -MC6845_UPDATE_ROW( abc800m_state::abc800m_update_row ) -{ - int column; - rgb_t fgpen = m_palette->pen(1); - - y += vbp; - - for (column = 0; column < x_count; column++) - { - int bit; - - uint16_t address = (m_char_ram[(ma + column) & 0x7ff] << 4) | (ra & 0x0f); - uint8_t data = (m_char_rom->base()[address & 0x7ff] & 0x3f); - - if (column == cursor_x) - { - data = 0x3f; - } - - data <<= 2; - - for (bit = 0; bit < ABC800_CHAR_WIDTH; bit++) - { - int x = hbp + (column * ABC800_CHAR_WIDTH) + bit; - - if (BIT(data, 7) && de) - { - bitmap.pix(y, x) = fgpen; - } - - data <<= 1; - } - } -} - - -//------------------------------------------------- -// SCREEN_UPDATE( abc800m ) -//------------------------------------------------- - -uint32_t abc800m_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ - // clear screen - bitmap.fill(rgb_t::black(), cliprect); - - // draw HR graphics - hr_update(bitmap, cliprect); - - // draw text - if (!BIT(m_fgctl, 7)) - { - m_crtc->screen_update(screen, bitmap, cliprect); - } - - return 0; -} - - -void abc800_state::video_start() -{ - // register for state saving - save_item(NAME(m_hrs)); - save_item(NAME(m_fgctl)); -} - - - -//------------------------------------------------- -// machine_config( abc800m_video ) -//------------------------------------------------- - -void abc800m_state::abc800m_video(machine_config &config) -{ - mc6845_device &mc6845(MC6845(config, MC6845_TAG, ABC800_CCLK)); - mc6845.set_screen(SCREEN_TAG); - mc6845.set_show_border_area(true); - mc6845.set_char_width(ABC800_CHAR_WIDTH); - mc6845.set_update_row_callback(FUNC(abc800m_state::abc800m_update_row)); - mc6845.out_vsync_callback().set(m_dart, FUNC(z80dart_device::rib_w)).invert(); - - screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER, rgb_t(0xff, 0xff, 0x00))); - screen.set_screen_update(FUNC(abc800m_state::screen_update)); - screen.set_raw(XTAL(12'000'000), 0x300, 0, 0x1e0, 0x13a, 0, 0xf0); - - PALETTE(config, m_palette, palette_device::MONOCHROME); -} diff --git a/src/mame/luxor/abc802.cpp b/src/mame/luxor/abc802.cpp deleted file mode 100644 index ff5c01c0287..00000000000 --- a/src/mame/luxor/abc802.cpp +++ /dev/null @@ -1,205 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Curt Coder -/***************************************************************************** - * - * video/abc802.c - * - ****************************************************************************/ - -#include "emu.h" -#include "includes/abc80x.h" -#include "screen.h" - - - -//------------------------------------------------- -// MC6845_UPDATE_ROW( abc802_update_row ) -//------------------------------------------------- - -MC6845_UPDATE_ROW( abc802_state::abc802_update_row ) -{ - /* - - PAL16R4 equation: - - IF (VCC) *OS = FC + RF / RC - *RG: = HS / *RG + *ATE / *RG + ATD / *RG + LL / - *RG + AT1 / *RG + AT0 / ATE + *ATD + *LL + - *AT1 + *AT0 - *RI: = *RI + *INV / *RI + LL / *INV + *LL - *RF: = HS / *RF + *ATE / *RF + ATD / *RF + LL / - *RF + AT1 / *RF + AT0 / ATE + *ATD + *LL + - *AT1 + AT0 - *RC: = HS / *RC + *ATE / *RC + *ATD / *RC + LL / - *RC + *ATI / *RC + AT0 / ATE + *LL + *AT1 + - *AT0 - IF (VCC) *O0 = *CUR + *AT0 / *CUR + ATE - *O1 = *CUR + *AT1 / *CUR + ATE - - - + = AND - / = OR - * = Inverted - - ATD Attribute data - ATE Attribute enable - AT0,AT1 Attribute address - CUR Cursor - FC FLSH clock - HS Horizontal sync - INV Inverted signal input - LL Load when Low - OEL Output Enable when Low - RC Row clear - RF Row flash - RG Row graphic - RI Row inverted - - */ - - const pen_t *pen = m_palette->pens(); - - int rf = 0, rc = 0, rg = 0; - - y += vbp; - - for (int column = 0; column < x_count; column++) - { - uint8_t code = m_char_ram[(ma + column) & 0x7ff]; - uint16_t address = code << 4; - uint8_t ra_latch = ra; - uint8_t data; - - int ri = (code & ABC802_INV) ? 1 : 0; - - if (column == cursor_x) - { - ra_latch = 0x0f; - } - - if ((m_flshclk && rf) || rc) - { - ra_latch = 0x0e; - } - - if (rg) - { - address |= 0x800; - } - - data = m_char_rom->base()[(address + ra_latch) & 0xfff]; - - if (data & ABC802_ATE) - { - int attr = data & 0x03; - int value = (data & ABC802_ATD) ? 1 : 0; - - switch (attr) - { - case 0x00: - // Row Graphic - rg = value; - break; - - case 0x01: - // Row Flash - rf = value; - break; - - case 0x02: - // Row Clear - rc = value; - break; - - case 0x03: - // undefined - break; - } - } - else - { - data <<= 2; - - if (m_80_40_mux) - { - for (int bit = 0; bit < ABC800_CHAR_WIDTH; bit++) - { - int x = hbp + ((column + 3) * ABC800_CHAR_WIDTH) + bit; - int color = (BIT(data, 7) ^ ri) && de; - - bitmap.pix(y, x) = pen[color]; - - data <<= 1; - } - } - else - { - for (int bit = 0; bit < ABC800_CHAR_WIDTH; bit++) - { - int x = hbp + ((column + 3) * ABC800_CHAR_WIDTH) + (bit << 1); - int color = (BIT(data, 7) ^ ri) && de; - - bitmap.pix(y, x) = pen[color]; - bitmap.pix(y, x + 1) = pen[color]; - - data <<= 1; - } - - column++; - } - } - } -} - - -//------------------------------------------------- -// vs_w - vertical sync write -//------------------------------------------------- - -WRITE_LINE_MEMBER( abc802_state::vs_w ) -{ - if (!state) - { - // flash clock - if (m_flshclk_ctr & 0x20) - { - m_flshclk = !m_flshclk; - m_flshclk_ctr = 0; - } - else - { - m_flshclk_ctr++; - } - } -} - - -void abc802_state::video_start() -{ - // register for state saving - save_item(NAME(m_flshclk_ctr)); - save_item(NAME(m_flshclk)); - save_item(NAME(m_80_40_mux)); -} - - -//------------------------------------------------- -// machine_config( abc802_video ) -//------------------------------------------------- - -void abc802_state::abc802_video(machine_config &config) -{ - mc6845_device &mc6845(MC6845(config, MC6845_TAG, ABC800_CCLK)); - mc6845.set_screen(SCREEN_TAG); - mc6845.set_show_border_area(true); - mc6845.set_char_width(ABC800_CHAR_WIDTH); - mc6845.set_update_row_callback(FUNC(abc802_state::abc802_update_row)); - mc6845.out_vsync_callback().set(FUNC(abc802_state::vs_w)); - mc6845.out_vsync_callback().append(m_dart, FUNC(z80dart_device::rib_w)).invert(); - - screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER, rgb_t::amber())); - screen.set_screen_update(MC6845_TAG, FUNC(mc6845_device::screen_update)); - screen.set_raw(XTAL(12'000'000), 0x300, 0, 0x1e0, 0x13a, 0, 0xf0); - - PALETTE(config, m_palette, palette_device::MONOCHROME); -} diff --git a/src/mame/luxor/abc806.cpp b/src/mame/luxor/abc806.cpp deleted file mode 100644 index 6917ade0d94..00000000000 --- a/src/mame/luxor/abc806.cpp +++ /dev/null @@ -1,510 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Curt Coder -/***************************************************************************** - * - * video/abc806.c - * - ****************************************************************************/ - -#include "emu.h" -#include "includes/abc80x.h" -#include "screen.h" - -//#define VERBOSE 1 -#include "logmacro.h" - - -#define HORIZONTAL_PORCH_HACK 109 -#define VERTICAL_PORCH_HACK 27 - - - -//------------------------------------------------- -// hrs_w - high resolution memory banking -//------------------------------------------------- - -void abc806_state::hrs_w(uint8_t data) -{ - /* - - bit signal description - - 0 VM15 visible screen memory area bit 0 - 1 VM16 visible screen memory area bit 1 - 2 VM17 visible screen memory area bit 2 - 3 VM18 visible screen memory area bit 3 - 4 F15 cpu accessible screen memory area bit 0 - 5 F16 cpu accessible screen memory area bit 1 - 6 F17 cpu accessible screen memory area bit 2 - 7 F18 cpu accessible screen memory area bit 3 - - */ - - LOG("%s HRS %02x\n", machine().describe_context(), data); - - m_hrs = data; -} - - -//------------------------------------------------- -// hrc_w - high resolution color write -//------------------------------------------------- - -void abc806_state::hrc_w(offs_t offset, uint8_t data) -{ - int reg = (offset >> 8) & 0x0f; - - m_hrc[reg] = data; -} - - -//------------------------------------------------- -// charram_r - character RAM read -//------------------------------------------------- - -uint8_t abc806_state::charram_r(offs_t offset) -{ - if (!machine().side_effects_disabled()) - m_attr_data = m_attr_ram[offset]; - - return m_char_ram[offset]; -} - - -//------------------------------------------------- -// charram_w - character RAM write -//------------------------------------------------- - -void abc806_state::charram_w(offs_t offset, uint8_t data) -{ - if (!machine().side_effects_disabled()) - m_attr_ram[offset] = m_attr_data; - - m_char_ram[offset] = data; -} - - -//------------------------------------------------- -// ami_r - attribute memory read -//------------------------------------------------- - -uint8_t abc806_state::ami_r() -{ - return m_attr_data; -} - - -//------------------------------------------------- -// amo_w - attribute memory write -//------------------------------------------------- - -void abc806_state::amo_w(uint8_t data) -{ - m_attr_data = data; -} - - -//------------------------------------------------- -// cli_r - palette PROM read -//------------------------------------------------- - -uint8_t abc806_state::cli_r(offs_t offset) -{ - /* - - bit description - - 0 HRU II data bit 0 - 1 HRU II data bit 1 - 2 HRU II data bit 2 - 3 HRU II data bit 3 - 4 - 5 - 6 - 7 RTC data output - - */ - - uint16_t hru2_addr = (m_hru2_a8 << 8) | (offset >> 8); - uint8_t data = m_hru2_prom->base()[hru2_addr] & 0x0f; - - LOG("HRU II %03x : %01x\n", hru2_addr, data); - - data |= m_rtc->dio_r() << 7; - - return data; -} - - -//------------------------------------------------- -// sti_r - protection device read -//------------------------------------------------- - -uint8_t abc806_state::sti_r() -{ - /* - - bit description - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 PROT DOUT - - */ - - return 0x7f; -} - - -//------------------------------------------------- -// sto_w - -//------------------------------------------------- - -void abc806_state::sto_w(uint8_t data) -{ - int level = BIT(data, 7); - - switch (data & 0x07) - { - case 0: - // external memory enable - LOG("%s EME %u\n", machine().describe_context(), level); - m_eme = level; - break; - case 1: - // 40/80 column display - m_40 = level; - break; - case 2: - // HRU II address line 8, PROT A0 - m_hru2_a8 = level; - break; - case 3: - // PROT INI - break; - case 4: - // text display enable - m_txoff = level; - break; - case 5: - // RTC chip select - m_rtc->cs_w(!level); - break; - case 6: - // RTC clock - m_rtc->clk_w(level); - break; - case 7: - // RTC data in, PROT DIN - m_rtc->dio_w(level); - break; - } -} - - -//------------------------------------------------- -// sso_w - sync offset write -//------------------------------------------------- - -void abc806_state::sso_w(uint8_t data) -{ - m_sync = data & 0x3f; -} - - -//------------------------------------------------- -// MC6845_UPDATE_ROW( abc806_update_row ) -//------------------------------------------------- - -MC6845_UPDATE_ROW( abc806_state::abc806_update_row ) -{ - const pen_t *pen = m_palette->pens(); - - int fg_color = 7; - int bg_color = 0; - int underline = 0; - int flash = 0; - int e5 = m_40; - int e6 = m_40; - int th = 0; - - y += m_sync + vbp; - - for (int column = 0; column < x_count; column++) - { - uint8_t data = m_char_ram[(ma + column) & 0x7ff]; - uint8_t attr = m_attr_ram[(ma + column) & 0x7ff]; - uint8_t rad_data; - - if ((attr & 0x07) == ((attr >> 3) & 0x07)) - { - // special case - switch (attr >> 6) - { - case 0: - // use previously selected attributes - break; - - case 1: - // reserved for future use - break; - - case 2: - // blank - fg_color = 0; - bg_color = 0; - underline = 0; - flash = 0; - break; - - case 3: - // double width - e5 = BIT(attr, 0); - e6 = BIT(attr, 1); - - // read attributes from next byte - attr = m_attr_ram[(ma + column + 1) & 0x7ff]; - - if (attr != 0x00) - { - fg_color = attr & 0x07; - bg_color = (attr >> 3) & 0x07; - underline = BIT(attr, 6); - flash = BIT(attr, 7); - } - break; - } - } - else - { - // normal case - fg_color = attr & 0x07; - bg_color = (attr >> 3) & 0x07; - underline = BIT(attr, 6); - flash = BIT(attr, 7); - e5 = m_40; - e6 = m_40; - } - - if (column == cursor_x) - { - rad_data = 0x0f; - } - else - { - uint16_t rad_addr = (e6 << 8) | (e5 << 7) | (flash << 6) | (underline << 4) | (m_flshclk << 5) | (ra & 0x0f); - rad_data = m_rad_prom->base()[rad_addr] & 0x0f; - } - - uint16_t chargen_addr = (th << 12) | (data << 4) | rad_data; - uint8_t chargen_data = m_char_rom->base()[chargen_addr & 0xfff] << 2; - int x = hbp + (column + 4) * ABC800_CHAR_WIDTH; - - for (int bit = 0; bit < ABC800_CHAR_WIDTH; bit++) - { - int color = BIT(chargen_data, 7) ? fg_color : bg_color; - if (!de) color = 0; - - bitmap.pix(y, x++) = pen[color]; - - if (e5 || e6) - { - bitmap.pix(y, x++) = pen[color]; - } - - chargen_data <<= 1; - } - - if (e5 || e6) - { - column++; - } - } -} - - -//------------------------------------------------- -// hs_w - horizontal sync write -//------------------------------------------------- - -WRITE_LINE_MEMBER( abc806_state::hs_w ) -{ - int vsync; - - if (!state) - { - m_v50_addr++; - - // clock current vsync value into the shift register - m_vsync_shift <<= 1; - m_vsync_shift |= m_vsync; - - vsync = BIT(m_vsync_shift, m_sync); - - if (!m_d_vsync && vsync) - { - // clear V50 address - m_v50_addr = 0; - } - else if (m_d_vsync && !vsync) - { - // flash clock - if (m_flshclk_ctr & 0x20) - { - m_flshclk = !m_flshclk; - m_flshclk_ctr = 0; - } - else - { - m_flshclk_ctr++; - } - } - - if (m_d_vsync != vsync) - { - // signal _DEW to DART - m_dart->rib_w(!vsync); - } - - m_d_vsync = vsync; - } -} - - -//------------------------------------------------- -// vs_w - vertical sync write -//------------------------------------------------- - -WRITE_LINE_MEMBER( abc806_state::vs_w ) -{ - m_vsync = state; -} - - -//------------------------------------------------- -// hr_update - high resolution screen update -//------------------------------------------------- - -void abc806_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ - const pen_t *pen = m_palette->pens(); - - uint32_t addr = (m_hrs & 0x0f) << 15; - - for (int y = m_sync + VERTICAL_PORCH_HACK; y < std::min(cliprect.max_y + 1, m_sync + VERTICAL_PORCH_HACK + 240); y++) - { - for (int sx = 0; sx < 128; sx++) - { - uint8_t data = m_video_ram[addr++]; - uint16_t dot = (m_hrc[data >> 4] << 8) | m_hrc[data & 0x0f]; - - for (int pixel = 0; pixel < 4; pixel++) - { - int x = HORIZONTAL_PORCH_HACK + (ABC800_CHAR_WIDTH * 4) - 16 + (sx * 4) + pixel; - - if (BIT(dot, 15) || (bitmap.pix(y, x) == rgb_t::black())) - { - bitmap.pix(y, x) = pen[(dot >> 12) & 0x07]; - } - - dot <<= 4; - } - } - } -} - - -void abc806_state::video_start() -{ - // register for state saving - save_item(NAME(m_txoff)); - save_item(NAME(m_40)); - save_item(NAME(m_flshclk_ctr)); - save_item(NAME(m_flshclk)); - save_item(NAME(m_attr_data)); - save_item(NAME(m_hrs)); - save_item(NAME(m_hrc)); - save_item(NAME(m_sync)); - save_item(NAME(m_v50_addr)); - save_item(NAME(m_hru2_a8)); - save_item(NAME(m_vsync_shift)); - save_item(NAME(m_vsync)); - save_item(NAME(m_d_vsync)); - - // initialize variables - for (auto & elem : m_hrc) - { - elem = 0; - } - - m_sync = 10; - m_d_vsync = 1; - m_vsync = 1; - m_40 = 1; -} - - -//------------------------------------------------- -// SCREEN_UPDATE( abc806 ) -//------------------------------------------------- - -uint32_t abc806_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ - // clear screen - bitmap.fill(rgb_t::black(), cliprect); - - if (!m_txoff) - { - // draw text - m_crtc->screen_update(screen, bitmap, cliprect); - } - - // draw HR graphics - hr_update(bitmap, cliprect); - - return 0; -} - - -//------------------------------------------------- -// PALETTE_INIT( abc806 ) -//------------------------------------------------- - -void abc806_state::abc806_palette(palette_device &palette) const -{ - palette.set_pen_color(0, rgb_t::black()); - palette.set_pen_color(1, rgb_t(0xff, 0x00, 0x00)); // red - palette.set_pen_color(2, rgb_t::green()); - palette.set_pen_color(3, rgb_t(0xff, 0xff, 0x00)); // yellow - palette.set_pen_color(4, rgb_t(0x00, 0x00, 0xff)); // blue - palette.set_pen_color(5, rgb_t(0xff, 0x00, 0xff)); // magenta - palette.set_pen_color(6, rgb_t(0x00, 0xff, 0xff)); // cyan - palette.set_pen_color(7, rgb_t::white()); -} - - -//------------------------------------------------- -// machine_config( abc806_video ) -//------------------------------------------------- - -void abc806_state::abc806_video(machine_config &config) -{ - MC6845(config, m_crtc, ABC800_CCLK); - m_crtc->set_screen(SCREEN_TAG); - m_crtc->set_show_border_area(true); - m_crtc->set_char_width(ABC800_CHAR_WIDTH); - m_crtc->set_update_row_callback(FUNC(abc806_state::abc806_update_row)); - m_crtc->out_hsync_callback().set(FUNC(abc806_state::hs_w)); - m_crtc->out_vsync_callback().set(FUNC(abc806_state::vs_w)); - - screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER)); - screen.set_screen_update(FUNC(abc806_state::screen_update)); - screen.set_raw(XTAL(12'000'000), 0x300, 0, 0x1e0, 0x13a, 0, 0xfa); - - PALETTE(config, m_palette, FUNC(abc806_state::abc806_palette), 8); -} diff --git a/src/mame/luxor/abc80_v.cpp b/src/mame/luxor/abc80_v.cpp index 31f182c9bb9..0a33d12390f 100644 --- a/src/mame/luxor/abc80_v.cpp +++ b/src/mame/luxor/abc80_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/abc80.h" +#include "abc80.h" #include "screen.h" diff --git a/src/mame/luxor/abc80x.cpp b/src/mame/luxor/abc80x.cpp index 4e8e2dda2a4..c08c65d8ea4 100644 --- a/src/mame/luxor/abc80x.cpp +++ b/src/mame/luxor/abc80x.cpp @@ -148,14 +148,993 @@ Notes: */ #include "emu.h" -#include "includes/abc80x.h" +#include "abc80x.h" +#include "screen.h" #include "softlist_dev.h" -#define LOG 0 +//#define VERBOSE 1 +#include "logmacro.h" + #define ABCBUS_TAG "bus" +//************************************************************************** +// HIGH RESOLUTION GRAPHICS +//************************************************************************** + +//------------------------------------------------- +// hrs_w - high resolution scanline write +//------------------------------------------------- + +void abc800_state::hrs_w(uint8_t data) +{ + m_hrs = data; +} + + +//------------------------------------------------- +// hrc_w - high resolution color write +//------------------------------------------------- + +void abc800_state::hrc_w(uint8_t data) +{ + m_fgctl = data; +} + + + +//************************************************************************** +// ABC 800 COLOR +//************************************************************************** + +//------------------------------------------------- +// hr_update - high resolution screen update +//------------------------------------------------- + +void abc800c_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + const pen_t *pen = m_palette->pens(); + + uint16_t addr = 0; + + for (int y = m_hrs; y < std::min(cliprect.max_y + 1, m_hrs + 480); y += 2) + { + int x = 0; + + for (int sx = 0; sx < 64; sx++) + { + uint8_t data = m_video_ram[addr++]; + + for (int dot = 0; dot < 4; dot++) + { + uint16_t fgctl_addr = ((m_fgctl & 0x7f) << 2) | ((data >> 6) & 0x03); + uint8_t fgctl = m_fgctl_prom->base()[fgctl_addr]; + int color = fgctl & 0x07; + + if (color) + { + bool black = bitmap.pix(y, x) == rgb_t::black(); + bool opaque = !BIT(fgctl, 3); + + if (black || opaque) + { + bitmap.pix(y, x) = pen[color]; + bitmap.pix(y, x + 1) = pen[color]; + + bitmap.pix(y + 1, x) = pen[color]; + bitmap.pix(y + 1, x + 1) = pen[color]; + } + } + + data <<= 2; + x += 2; + } + } + } +} + + +//------------------------------------------------- +// SCREEN_UPDATE( abc800c ) +//------------------------------------------------- + +uint32_t abc800c_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + // clear screen + bitmap.fill(rgb_t::black(), cliprect); + + // draw text + if (!BIT(m_fgctl, 7)) + { + m_trom->screen_update(screen, bitmap, cliprect); + } + + // draw HR graphics + hr_update(bitmap, cliprect); + + return 0; +} + + +//------------------------------------------------- +// SAA5050_INTERFACE( trom_intf ) +//------------------------------------------------- + +uint8_t abc800c_state::char_ram_r(offs_t offset) +{ + int row = offset / 40; + int col = offset % 40; + + offset = ((row & 0x07) * 0x80) + col; + + if (row & 0x08) offset += 0x28; + if (row & 0x10) offset += 0x50; + + return m_char_ram[offset]; +} + + +//------------------------------------------------- +// PALETTE_INIT( abc800c ) +//------------------------------------------------- + +void abc800c_state::abc800c_palette(palette_device &palette) const +{ + palette.set_pen_color(0, rgb_t::black()); + palette.set_pen_color(1, rgb_t(0xff, 0x00, 0x00)); // red + palette.set_pen_color(2, rgb_t::green()); + palette.set_pen_color(3, rgb_t(0xff, 0xff, 0x00)); // yellow + palette.set_pen_color(4, rgb_t(0x00, 0x00, 0xff)); // blue + palette.set_pen_color(5, rgb_t(0xff, 0x00, 0xff)); // magenta + palette.set_pen_color(6, rgb_t(0x00, 0xff, 0xff)); // cyan + palette.set_pen_color(7, rgb_t::white()); +} + + +//------------------------------------------------- +// machine_config( abc800c_video ) +//------------------------------------------------- + +void abc800c_state::abc800c_video(machine_config &config) +{ + screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER)); + screen.set_screen_update(FUNC(abc800c_state::screen_update)); + screen.set_refresh_hz(50); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); + screen.set_size(480, 480); + screen.set_visarea(0, 480-1, 0, 480-1); + + PALETTE(config, m_palette, FUNC(abc800c_state::abc800c_palette), 8); + + SAA5052(config, m_trom, XTAL(12'000'000)/2); + m_trom->d_cb().set(FUNC(abc800c_state::char_ram_r)); + m_trom->set_screen_size(40, 24, 40); +} + + + +//************************************************************************** +// ABC 800 MONOCHROME +//************************************************************************** + +//------------------------------------------------- +// hr_update - high resolution screen update +//------------------------------------------------- + +void abc800m_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + // this is needed because the MC6845 emulation does + // not position the active display area correctly + constexpr int HORIZONTAL_PORCH_HACK = 115; + + uint16_t addr = 0; + + const pen_t *pen = m_palette->pens(); + + for (int y = m_hrs; y < std::min(cliprect.max_y + 1, m_hrs + 240); y++) + { + int x = HORIZONTAL_PORCH_HACK; + + for (int sx = 0; sx < 64; sx++) + { + uint8_t data = m_video_ram[addr++]; + + for (int dot = 0; dot < 4; dot++) + { + uint16_t fgctl_addr = ((m_fgctl & 0x7f) << 2) | ((data >> 6) & 0x03); + int color = (m_fgctl_prom->base()[fgctl_addr] & 0x07) ? 1 : 0; + + bitmap.pix(y, x++) = pen[color]; + bitmap.pix(y, x++) = pen[color]; + + data <<= 2; + } + } + } +} + + +//------------------------------------------------- +// MC6845_UPDATE_ROW( abc800m_update_row ) +//------------------------------------------------- + +MC6845_UPDATE_ROW( abc800m_state::abc800m_update_row ) +{ + int column; + rgb_t fgpen = m_palette->pen(1); + + y += vbp; + + for (column = 0; column < x_count; column++) + { + int bit; + + uint16_t address = (m_char_ram[(ma + column) & 0x7ff] << 4) | (ra & 0x0f); + uint8_t data = (m_char_rom->base()[address & 0x7ff] & 0x3f); + + if (column == cursor_x) + { + data = 0x3f; + } + + data <<= 2; + + for (bit = 0; bit < ABC800_CHAR_WIDTH; bit++) + { + int x = hbp + (column * ABC800_CHAR_WIDTH) + bit; + + if (BIT(data, 7) && de) + { + bitmap.pix(y, x) = fgpen; + } + + data <<= 1; + } + } +} + + +//------------------------------------------------- +// SCREEN_UPDATE( abc800m ) +//------------------------------------------------- + +uint32_t abc800m_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + // clear screen + bitmap.fill(rgb_t::black(), cliprect); + + // draw HR graphics + hr_update(bitmap, cliprect); + + // draw text + if (!BIT(m_fgctl, 7)) + { + m_crtc->screen_update(screen, bitmap, cliprect); + } + + return 0; +} + + +void abc800_state::video_start() +{ + // register for state saving + save_item(NAME(m_hrs)); + save_item(NAME(m_fgctl)); +} + + + +//------------------------------------------------- +// machine_config( abc800m_video ) +//------------------------------------------------- + +void abc800m_state::abc800m_video(machine_config &config) +{ + mc6845_device &mc6845(MC6845(config, MC6845_TAG, ABC800_CCLK)); + mc6845.set_screen(SCREEN_TAG); + mc6845.set_show_border_area(true); + mc6845.set_char_width(ABC800_CHAR_WIDTH); + mc6845.set_update_row_callback(FUNC(abc800m_state::abc800m_update_row)); + mc6845.out_vsync_callback().set(m_dart, FUNC(z80dart_device::rib_w)).invert(); + + screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER, rgb_t(0xff, 0xff, 0x00))); + screen.set_screen_update(FUNC(abc800m_state::screen_update)); + screen.set_raw(XTAL(12'000'000), 0x300, 0, 0x1e0, 0x13a, 0, 0xf0); + + PALETTE(config, m_palette, palette_device::MONOCHROME); +} + + + +//------------------------------------------------- +// MC6845_UPDATE_ROW( abc802_update_row ) +//------------------------------------------------- + +MC6845_UPDATE_ROW( abc802_state::abc802_update_row ) +{ + /* + + PAL16R4 equation: + + IF (VCC) *OS = FC + RF / RC + *RG: = HS / *RG + *ATE / *RG + ATD / *RG + LL / + *RG + AT1 / *RG + AT0 / ATE + *ATD + *LL + + *AT1 + *AT0 + *RI: = *RI + *INV / *RI + LL / *INV + *LL + *RF: = HS / *RF + *ATE / *RF + ATD / *RF + LL / + *RF + AT1 / *RF + AT0 / ATE + *ATD + *LL + + *AT1 + AT0 + *RC: = HS / *RC + *ATE / *RC + *ATD / *RC + LL / + *RC + *ATI / *RC + AT0 / ATE + *LL + *AT1 + + *AT0 + IF (VCC) *O0 = *CUR + *AT0 / *CUR + ATE + *O1 = *CUR + *AT1 / *CUR + ATE + + + + = AND + / = OR + * = Inverted + + ATD Attribute data + ATE Attribute enable + AT0,AT1 Attribute address + CUR Cursor + FC FLSH clock + HS Horizontal sync + INV Inverted signal input + LL Load when Low + OEL Output Enable when Low + RC Row clear + RF Row flash + RG Row graphic + RI Row inverted + + */ + + const pen_t *pen = m_palette->pens(); + + int rf = 0, rc = 0, rg = 0; + + y += vbp; + + for (int column = 0; column < x_count; column++) + { + uint8_t code = m_char_ram[(ma + column) & 0x7ff]; + uint16_t address = code << 4; + uint8_t ra_latch = ra; + uint8_t data; + + int ri = (code & ABC802_INV) ? 1 : 0; + + if (column == cursor_x) + { + ra_latch = 0x0f; + } + + if ((m_flshclk && rf) || rc) + { + ra_latch = 0x0e; + } + + if (rg) + { + address |= 0x800; + } + + data = m_char_rom->base()[(address + ra_latch) & 0xfff]; + + if (data & ABC802_ATE) + { + int attr = data & 0x03; + int value = (data & ABC802_ATD) ? 1 : 0; + + switch (attr) + { + case 0x00: + // Row Graphic + rg = value; + break; + + case 0x01: + // Row Flash + rf = value; + break; + + case 0x02: + // Row Clear + rc = value; + break; + + case 0x03: + // undefined + break; + } + } + else + { + data <<= 2; + + if (m_80_40_mux) + { + for (int bit = 0; bit < ABC800_CHAR_WIDTH; bit++) + { + int x = hbp + ((column + 3) * ABC800_CHAR_WIDTH) + bit; + int color = (BIT(data, 7) ^ ri) && de; + + bitmap.pix(y, x) = pen[color]; + + data <<= 1; + } + } + else + { + for (int bit = 0; bit < ABC800_CHAR_WIDTH; bit++) + { + int x = hbp + ((column + 3) * ABC800_CHAR_WIDTH) + (bit << 1); + int color = (BIT(data, 7) ^ ri) && de; + + bitmap.pix(y, x) = pen[color]; + bitmap.pix(y, x + 1) = pen[color]; + + data <<= 1; + } + + column++; + } + } + } +} + + +//------------------------------------------------- +// vs_w - vertical sync write +//------------------------------------------------- + +WRITE_LINE_MEMBER( abc802_state::vs_w ) +{ + if (!state) + { + // flash clock + if (m_flshclk_ctr & 0x20) + { + m_flshclk = !m_flshclk; + m_flshclk_ctr = 0; + } + else + { + m_flshclk_ctr++; + } + } +} + + +void abc802_state::video_start() +{ + // register for state saving + save_item(NAME(m_flshclk_ctr)); + save_item(NAME(m_flshclk)); + save_item(NAME(m_80_40_mux)); +} + + +//------------------------------------------------- +// machine_config( abc802_video ) +//------------------------------------------------- + +void abc802_state::abc802_video(machine_config &config) +{ + mc6845_device &mc6845(MC6845(config, MC6845_TAG, ABC800_CCLK)); + mc6845.set_screen(SCREEN_TAG); + mc6845.set_show_border_area(true); + mc6845.set_char_width(ABC800_CHAR_WIDTH); + mc6845.set_update_row_callback(FUNC(abc802_state::abc802_update_row)); + mc6845.out_vsync_callback().set(FUNC(abc802_state::vs_w)); + mc6845.out_vsync_callback().append(m_dart, FUNC(z80dart_device::rib_w)).invert(); + + screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER, rgb_t::amber())); + screen.set_screen_update(MC6845_TAG, FUNC(mc6845_device::screen_update)); + screen.set_raw(XTAL(12'000'000), 0x300, 0, 0x1e0, 0x13a, 0, 0xf0); + + PALETTE(config, m_palette, palette_device::MONOCHROME); +} + + +//------------------------------------------------- +// hrs_w - high resolution memory banking +//------------------------------------------------- + +void abc806_state::hrs_w(uint8_t data) +{ + /* + + bit signal description + + 0 VM15 visible screen memory area bit 0 + 1 VM16 visible screen memory area bit 1 + 2 VM17 visible screen memory area bit 2 + 3 VM18 visible screen memory area bit 3 + 4 F15 cpu accessible screen memory area bit 0 + 5 F16 cpu accessible screen memory area bit 1 + 6 F17 cpu accessible screen memory area bit 2 + 7 F18 cpu accessible screen memory area bit 3 + + */ + + LOG("%s HRS %02x\n", machine().describe_context(), data); + + m_hrs = data; +} + + +//------------------------------------------------- +// hrc_w - high resolution color write +//------------------------------------------------- + +void abc806_state::hrc_w(offs_t offset, uint8_t data) +{ + int reg = (offset >> 8) & 0x0f; + + m_hrc[reg] = data; +} + + +//------------------------------------------------- +// charram_r - character RAM read +//------------------------------------------------- + +uint8_t abc806_state::charram_r(offs_t offset) +{ + if (!machine().side_effects_disabled()) + m_attr_data = m_attr_ram[offset]; + + return m_char_ram[offset]; +} + + +//------------------------------------------------- +// charram_w - character RAM write +//------------------------------------------------- + +void abc806_state::charram_w(offs_t offset, uint8_t data) +{ + if (!machine().side_effects_disabled()) + m_attr_ram[offset] = m_attr_data; + + m_char_ram[offset] = data; +} + + +//------------------------------------------------- +// ami_r - attribute memory read +//------------------------------------------------- + +uint8_t abc806_state::ami_r() +{ + return m_attr_data; +} + + +//------------------------------------------------- +// amo_w - attribute memory write +//------------------------------------------------- + +void abc806_state::amo_w(uint8_t data) +{ + m_attr_data = data; +} + + +//------------------------------------------------- +// cli_r - palette PROM read +//------------------------------------------------- + +uint8_t abc806_state::cli_r(offs_t offset) +{ + /* + + bit description + + 0 HRU II data bit 0 + 1 HRU II data bit 1 + 2 HRU II data bit 2 + 3 HRU II data bit 3 + 4 + 5 + 6 + 7 RTC data output + + */ + + uint16_t hru2_addr = (m_hru2_a8 << 8) | (offset >> 8); + uint8_t data = m_hru2_prom->base()[hru2_addr] & 0x0f; + + LOG("HRU II %03x : %01x\n", hru2_addr, data); + + data |= m_rtc->dio_r() << 7; + + return data; +} + + +//------------------------------------------------- +// sti_r - protection device read +//------------------------------------------------- + +uint8_t abc806_state::sti_r() +{ + /* + + bit description + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 PROT DOUT + + */ + + return 0x7f; +} + + +//------------------------------------------------- +// sto_w - +//------------------------------------------------- + +void abc806_state::sto_w(uint8_t data) +{ + int level = BIT(data, 7); + + switch (data & 0x07) + { + case 0: + // external memory enable + LOG("%s EME %u\n", machine().describe_context(), level); + m_eme = level; + break; + case 1: + // 40/80 column display + m_40 = level; + break; + case 2: + // HRU II address line 8, PROT A0 + m_hru2_a8 = level; + break; + case 3: + // PROT INI + break; + case 4: + // text display enable + m_txoff = level; + break; + case 5: + // RTC chip select + m_rtc->cs_w(!level); + break; + case 6: + // RTC clock + m_rtc->clk_w(level); + break; + case 7: + // RTC data in, PROT DIN + m_rtc->dio_w(level); + break; + } +} + + +//------------------------------------------------- +// sso_w - sync offset write +//------------------------------------------------- + +void abc806_state::sso_w(uint8_t data) +{ + m_sync = data & 0x3f; +} + + +//------------------------------------------------- +// MC6845_UPDATE_ROW( abc806_update_row ) +//------------------------------------------------- + +MC6845_UPDATE_ROW( abc806_state::abc806_update_row ) +{ + const pen_t *pen = m_palette->pens(); + + int fg_color = 7; + int bg_color = 0; + int underline = 0; + int flash = 0; + int e5 = m_40; + int e6 = m_40; + int th = 0; + + y += m_sync + vbp; + + for (int column = 0; column < x_count; column++) + { + uint8_t data = m_char_ram[(ma + column) & 0x7ff]; + uint8_t attr = m_attr_ram[(ma + column) & 0x7ff]; + uint8_t rad_data; + + if ((attr & 0x07) == ((attr >> 3) & 0x07)) + { + // special case + switch (attr >> 6) + { + case 0: + // use previously selected attributes + break; + + case 1: + // reserved for future use + break; + + case 2: + // blank + fg_color = 0; + bg_color = 0; + underline = 0; + flash = 0; + break; + + case 3: + // double width + e5 = BIT(attr, 0); + e6 = BIT(attr, 1); + + // read attributes from next byte + attr = m_attr_ram[(ma + column + 1) & 0x7ff]; + + if (attr != 0x00) + { + fg_color = attr & 0x07; + bg_color = (attr >> 3) & 0x07; + underline = BIT(attr, 6); + flash = BIT(attr, 7); + } + break; + } + } + else + { + // normal case + fg_color = attr & 0x07; + bg_color = (attr >> 3) & 0x07; + underline = BIT(attr, 6); + flash = BIT(attr, 7); + e5 = m_40; + e6 = m_40; + } + + if (column == cursor_x) + { + rad_data = 0x0f; + } + else + { + uint16_t rad_addr = (e6 << 8) | (e5 << 7) | (flash << 6) | (underline << 4) | (m_flshclk << 5) | (ra & 0x0f); + rad_data = m_rad_prom->base()[rad_addr] & 0x0f; + } + + uint16_t chargen_addr = (th << 12) | (data << 4) | rad_data; + uint8_t chargen_data = m_char_rom->base()[chargen_addr & 0xfff] << 2; + int x = hbp + (column + 4) * ABC800_CHAR_WIDTH; + + for (int bit = 0; bit < ABC800_CHAR_WIDTH; bit++) + { + int color = BIT(chargen_data, 7) ? fg_color : bg_color; + if (!de) color = 0; + + bitmap.pix(y, x++) = pen[color]; + + if (e5 || e6) + { + bitmap.pix(y, x++) = pen[color]; + } + + chargen_data <<= 1; + } + + if (e5 || e6) + { + column++; + } + } +} + + +//------------------------------------------------- +// hs_w - horizontal sync write +//------------------------------------------------- + +WRITE_LINE_MEMBER( abc806_state::hs_w ) +{ + int vsync; + + if (!state) + { + m_v50_addr++; + + // clock current vsync value into the shift register + m_vsync_shift <<= 1; + m_vsync_shift |= m_vsync; + + vsync = BIT(m_vsync_shift, m_sync); + + if (!m_d_vsync && vsync) + { + // clear V50 address + m_v50_addr = 0; + } + else if (m_d_vsync && !vsync) + { + // flash clock + if (m_flshclk_ctr & 0x20) + { + m_flshclk = !m_flshclk; + m_flshclk_ctr = 0; + } + else + { + m_flshclk_ctr++; + } + } + + if (m_d_vsync != vsync) + { + // signal _DEW to DART + m_dart->rib_w(!vsync); + } + + m_d_vsync = vsync; + } +} + + +//------------------------------------------------- +// vs_w - vertical sync write +//------------------------------------------------- + +WRITE_LINE_MEMBER( abc806_state::vs_w ) +{ + m_vsync = state; +} + + +//------------------------------------------------- +// hr_update - high resolution screen update +//------------------------------------------------- + +void abc806_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + constexpr int HORIZONTAL_PORCH_HACK = 109; + constexpr int VERTICAL_PORCH_HACK = 27; + + const pen_t *pen = m_palette->pens(); + + uint32_t addr = (m_hrs & 0x0f) << 15; + + for (int y = m_sync + VERTICAL_PORCH_HACK; y < std::min(cliprect.max_y + 1, m_sync + VERTICAL_PORCH_HACK + 240); y++) + { + for (int sx = 0; sx < 128; sx++) + { + uint8_t data = m_video_ram[addr++]; + uint16_t dot = (m_hrc[data >> 4] << 8) | m_hrc[data & 0x0f]; + + for (int pixel = 0; pixel < 4; pixel++) + { + int x = HORIZONTAL_PORCH_HACK + (ABC800_CHAR_WIDTH * 4) - 16 + (sx * 4) + pixel; + + if (BIT(dot, 15) || (bitmap.pix(y, x) == rgb_t::black())) + { + bitmap.pix(y, x) = pen[(dot >> 12) & 0x07]; + } + + dot <<= 4; + } + } + } +} + + +void abc806_state::video_start() +{ + // register for state saving + save_item(NAME(m_txoff)); + save_item(NAME(m_40)); + save_item(NAME(m_flshclk_ctr)); + save_item(NAME(m_flshclk)); + save_item(NAME(m_attr_data)); + save_item(NAME(m_hrs)); + save_item(NAME(m_hrc)); + save_item(NAME(m_sync)); + save_item(NAME(m_v50_addr)); + save_item(NAME(m_hru2_a8)); + save_item(NAME(m_vsync_shift)); + save_item(NAME(m_vsync)); + save_item(NAME(m_d_vsync)); + + // initialize variables + for (auto & elem : m_hrc) + { + elem = 0; + } + + m_sync = 10; + m_d_vsync = 1; + m_vsync = 1; + m_40 = 1; +} + + +//------------------------------------------------- +// SCREEN_UPDATE( abc806 ) +//------------------------------------------------- + +uint32_t abc806_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + // clear screen + bitmap.fill(rgb_t::black(), cliprect); + + if (!m_txoff) + { + // draw text + m_crtc->screen_update(screen, bitmap, cliprect); + } + + // draw HR graphics + hr_update(bitmap, cliprect); + + return 0; +} + + +//------------------------------------------------- +// PALETTE_INIT( abc806 ) +//------------------------------------------------- + +void abc806_state::abc806_palette(palette_device &palette) const +{ + palette.set_pen_color(0, rgb_t::black()); + palette.set_pen_color(1, rgb_t(0xff, 0x00, 0x00)); // red + palette.set_pen_color(2, rgb_t::green()); + palette.set_pen_color(3, rgb_t(0xff, 0xff, 0x00)); // yellow + palette.set_pen_color(4, rgb_t(0x00, 0x00, 0xff)); // blue + palette.set_pen_color(5, rgb_t(0xff, 0x00, 0xff)); // magenta + palette.set_pen_color(6, rgb_t(0x00, 0xff, 0xff)); // cyan + palette.set_pen_color(7, rgb_t::white()); +} + + +//------------------------------------------------- +// machine_config( abc806_video ) +//------------------------------------------------- + +void abc806_state::abc806_video(machine_config &config) +{ + MC6845(config, m_crtc, ABC800_CCLK); + m_crtc->set_screen(SCREEN_TAG); + m_crtc->set_show_border_area(true); + m_crtc->set_char_width(ABC800_CHAR_WIDTH); + m_crtc->set_update_row_callback(FUNC(abc806_state::abc806_update_row)); + m_crtc->out_hsync_callback().set(FUNC(abc806_state::hs_w)); + m_crtc->out_vsync_callback().set(FUNC(abc806_state::vs_w)); + + screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER)); + screen.set_screen_update(FUNC(abc806_state::screen_update)); + screen.set_raw(XTAL(12'000'000), 0x300, 0, 0x1e0, 0x13a, 0, 0xfa); + + PALETTE(config, m_palette, FUNC(abc806_state::abc806_palette), 8); +} + + //************************************************************************** // SOUND //************************************************************************** @@ -487,7 +1466,7 @@ void abc806_state::mao_w(offs_t offset, uint8_t data) int bank = offset >> 12; - if (LOG) logerror("MAO %04x %02x %02x\n",offset,bank,data); + LOG("MAO %04x %02x %02x\n",offset,bank,data); m_map[bank] = data; } @@ -807,7 +1786,7 @@ WRITE_LINE_MEMBER( abc800_state::sio_rtsb_w ) WRITE_LINE_MEMBER( abc800_state::keydtr_w ) { - if (LOG) logerror("%s KEYDTR %u\n",machine().describe_context(),state); + LOG("%s KEYDTR %u\n",machine().describe_context(),state); m_keydtr = state; } @@ -819,14 +1798,14 @@ WRITE_LINE_MEMBER( abc800_state::keydtr_w ) WRITE_LINE_MEMBER( abc802_state::lrs_w ) { - if (LOG) logerror("%s LRS %u\n",machine().describe_context(),state); + LOG("%s LRS %u\n",machine().describe_context(),state); m_lrs = state; } WRITE_LINE_MEMBER( abc802_state::mux80_40_w ) { - if (LOG) logerror("%s 80/40 MUX %u\n",machine().describe_context(),state); + LOG("%s 80/40 MUX %u\n",machine().describe_context(),state); m_80_40_mux = state; } diff --git a/src/mame/luxor/ds90.cpp b/src/mame/luxor/ds90.cpp index f3f8e8e0f19..e16b86c4b1c 100644 --- a/src/mame/luxor/ds90.cpp +++ b/src/mame/luxor/ds90.cpp @@ -24,7 +24,7 @@ #include "machine/wd_fdc.h" #include "machine/z80scc.h" #include "machine/z8536.h" -#include "video/abc1600.h" +#include "abc1600_v.h" #define MC68010_TAG "14m" #define NS32081_TAG "06o" diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 6a0c08be43b..3096e06fa24 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -9,7 +9,7 @@ ******************************************************************************/ -@source:1942.cpp +@source:capcom/1942.cpp 1942 // 12/1984 (c) 1984 1942a // 12/1984 (c) 1984 1942abl // bootleg @@ -18,7 +18,7 @@ 1942p // prototype 1942w // 12/1984 (c) 1984 + Williams Electronics license (c) 1985 -@source:1943.cpp +@source:capcom/1943.cpp 1943 // 6/1987 (c) 1987 (Euro) 1943b // bootleg 1943bj // bootleg @@ -30,14 +30,14 @@ 1943u // 6/1987 (c) 1987 (US) Rev C 1943ua // 6/1987 (c) 1987 (US) -@source:1945kiii.cpp +@source:promat/1945kiii.cpp 1945kiii // (c) 2000 Oriental 1945kiiin // (c) 2000 Oriental 1945kiiio // (c) 1999 Oriental flagrall // ? slspirit // (c) 1999 Promat -@source:20pacgal.cpp +@source:namco/20pacgal.cpp 20pacgal // (c) 2000 Ver 1.08 20pacgalr0 // (c) 2000 Ver 1.00 20pacgalr1 // (c) 2000 Ver 1.01 @@ -47,16 +47,16 @@ slspirit // (c) 1999 Promat 25pacman // (c) 2006 Ver 3.0 25pacmano // (c) 2005 Ver 2.0 - Same hardware as 20pacgal -@source:24cdjuke.cpp +@source:midcoin/24cdjuke.cpp 24cdjuke // (c) 1988 Midcoin -@source:2mindril.cpp +@source:taito/2mindril.cpp 2mindril // (c) 1993 Taito -@source:30test.cpp +@source:namco/30test.cpp 30test // (c) 1997 -@source:39in1.cpp +@source:misc/39in1.cpp 19in1 // MAME based bootleg 39in1 // MAME based bootleg 48in1 // MAME based bootleg @@ -73,7 +73,7 @@ plutus // (c) 200? I.A.M. pokrwild // (c) 200? I.A.M. rodent // (c) 2005 The Game Room -@source:3do.cpp +@source:misc/3do.cpp 3do // 3DO consoles 3do_pal // 3dobios // @@ -82,30 +82,30 @@ md23do // orbatak // sht3do // -@source:3x3puzzl.cpp +@source:promat/3x3puzzl.cpp 3x3puzzl // (c) 199? Ace 3x3puzzla // (c) 199? Ace casanova // -@source:4004clk.cpp +@source:homebrew/4004clk.cpp 4004clk // -@source:40love.cpp +@source:taito/40love.cpp 40love // A30 (c) 1984 Taito 40lovej // A30 (c) 1984 Taito fieldday // A23 (c) 1984 Taito undoukai // A17 (c) 1984 Taito -@source:iris_power.cpp +@source:sgi/iris_power.cpp 4d410 // (c) SGI 1991 -@source:4dpi.cpp +@source:sgi/4dpi.cpp 4d20 // IP6: Personal Iris 4D/20, R2000 @12.5MHz 4d25 // IP10: Personal Iris 4D/25, R3000 @20MHz 4d30 // IP14: Personal Iris 4D/30, R3000A @30MHz 4d35 // IP12: Personal Iris 4D/35, R3000A @36MHz -@source:4enlinea.cpp +@source:misc/4enlinea.cpp 4enlinea // (c) 1991 Compumatic / CIC Play 4enlineb // (c) 1991 Compumatic / CIC Play dardos // (c) 1992 Oper Coin @@ -113,7 +113,7 @@ k7_olym // (c) 1994 K7 Kursaal / NMI Electronics k7_olym30 // (c) 1994 K7 Kursaal / NMI Electronics sprtdart // (c) 1993 Compumatic / Desarrollos y Recambios S.L. -@source:4enraya.cpp +@source:misc/4enraya.cpp 4enraya // (c) 1990 IDSA 4enrayaa // chicgum @@ -128,20 +128,20 @@ unksig // 1998? unksiga // 1998? unksigb // 1998? -@source:4roses.cpp +@source:funworld/4roses.cpp 4roses // (c) 1999 Unknown 4rosesa // (c) 1999 Unknown rugby // (c) 1999 C.M.C. -@source:5clown.cpp +@source:misc/5clown.cpp 5clown // (c) IGS 1993 5clowna // (c) IGS 1993 5clownsp // (c) IGS 1993 -@source:68ksbc.cpp +@source:homebrew/68ksbc.cpp 68ksbc // -@source:8080bw.cpp +@source:midw8080/8080bw.cpp alieninv // Margamatics alieninvp2 // bootleg astropal // (c) 19?? Sidam @@ -270,36 +270,36 @@ vortex // 852 [1980] Zilec Electronics Ltd. yosakdon // (c) 1979 Yosaku To Donbei yosakdona // (c) 1979 Yosaku To Donbei -@source:88games.cpp +@source:konami/88games.cpp 88games // GX861 (c) 1988 hypsptsp // GX861 (c) 1988 (Japan) konami88 // GX861 (c) 1988 -@source:a1supply.cpp +@source:misc/a1supply.cpp tv21 // (c) 197? A-1 Supply tv21_3 // (c) 197? A-1 Supply tvpoker // (c) 197? A-1 Supply -@source:a2600.cpp +@source:atari/a2600.cpp a2600 // Atari 2600 a2600p // Atari 2600 PAL a2600_pop // Atari 2600 Point of Purchase Display -@source:a5105.cpp +@source:robotron/a5105.cpp a5105 // -@source:a51xx.cpp +@source:robotron/a51xx.cpp a5120 // a5130 // -@source:a7150.cpp +@source:robotron/a7150.cpp a7150 // -@source:a7800.cpp +@source:atari/a7800.cpp a7800 // Atari 7800 NTSC a7800p // Atari 7800 PAL -@source:aa310.cpp +@source:acorn/aa310.cpp aa500 // 1986 Acorn A500 aa500d // 1987 Acorn A500 Domesday aa305 // 1987 Acorn Archimedes 305 @@ -322,49 +322,49 @@ aa3020 // 1992 Acorn A3020 aa4000 // 1992 Acorn A4000 aa5000a // 1993 Acorn A5000 Alpha -@source:aaa.cpp +@source:skeleton/aaa.cpp aaa // -@source:abc1600.cpp +@source:luxor/abc1600.cpp abc1600 // -@source:abc80.cpp +@source:luxor/abc80.cpp abc80 // -@source:abc80x.cpp +@source:luxor/abc80x.cpp abc800c // abc800m // dtc // abc802 // abc806 // -@source:ac1.cpp +@source:ddr/ac1.cpp ac1 // 1984 Amateurcomputer AC1 ac1_32 // 1984 Amateurcomputer AC1 (32 lines) ac1scch // 1984 Amateurcomputer AC1 SCCH -@source:accomm.cpp +@source:acorn/accomm.cpp accomm // 1986 Acorn Commmunicator accommp // 1985 Acorn Commmunicator (prototype) accommb // 1987 Acorn Briefcase Communicator accommi // 1988 Acorn Communicator (Italian) -@source:acd.cpp +@source:skeleton/acd.cpp acd // -@source:aceex.cpp +@source:skeleton/aceex.cpp aceex2814 -@source:ace.cpp +@source:alliedl/ace.cpp ace // [1976 Allied Leisure] -@source:acefruit.cpp +@source:misc/acefruit.cpp acefruit // (c) 1982? ACE sidewndr // (c) 1981? ACE spellbnd // (c) 1981? ACE starspnr // (c) 1982? ACE -@source:aces1.cpp +@source:misc/aces1.cpp ac1bbclb // Big Break Club (Ace) ac1bbclba // ac1bluec // Blue Chip (Pcp) @@ -414,7 +414,7 @@ ac1totb // Top Of The Bill (Ace) ac1unk // ??? ac1xpres // Xpress (Pcp) -@source:acesp.cpp +@source:misc/acesp.cpp sp_atw // Around the World (Crystal) sp_beau // Beau Peep (Ace) sp_beau2 // Further Adventures Of Beau Peep (Ace) @@ -911,33 +911,33 @@ sp_zigzgk // sp_zigzgl // sp_zigzgm // -@source:aci_boris.cpp +@source:aci/aci_boris.cpp boris // borisa // -@source:aci_borisdpl.cpp +@source:aci/aci_borisdpl.cpp borisdpl // -@source:aci_ggm.cpp +@source:aci/aci_ggm.cpp ggm -@source:aci_prodigy.cpp +@source:aci/aci_prodigy.cpp prodigy -@source:acommand.cpp +@source:jaleco/acommand.cpp acommand // (c) 1990 -@source:acrnsys1.cpp +@source:acorn/acrnsys1.cpp acrnsys1 // 1979 Acorn System 1 (Microcomputer Kit) -@source:acrnsys.cpp +@source:acorn/acrnsys.cpp acrnsys2 // 1980 Acorn System 2 acrnsys3 // 1980 Acorn System 3 (6502) acrnsys3_6809 // 1980 Acorn System 3 (6809) acrnsys4 // 1980 Acorn System 4 acrnsys5 // 1982 Acorn System 5 -@source:actfancr.cpp +@source:dataeast/actfancr.cpp actfancr // (c) 1989 Data East Corporation (World) actfancr1 // (c) 1989 Data East Corporation (World) actfancr2 // (c) 1989 Data East Corporation (World) @@ -945,10 +945,10 @@ actfancrj // (c) 1989 Data East Corporation (Japan) triothep // (c) 1989 Data East Corporation (World) triothepj // (c) 1989 Data East Corporation (Japan) -@source:actions_atj2279b.cpp +@source:tvgames/actions_atj2279b.cpp rbitgen -@source:acvirus.cpp +@source:access/acvirus.cpp virusa // (c) 1997 Access GmbH virusb // (c) 1999 Access GmbH virusc // (c) 2002 Access GmbH @@ -956,28 +956,28 @@ virusrck // (c) 2001 Access GmbH virusrckxl // (c) 2002 Access GmbH viruscl // (c) 2004 Access GmbH -@source:adacp150.cpp +@source:skeleton/adacp150.cpp adacp150p // -@source:adam.cpp +@source:coleco/adam.cpp adam // Coleco Adam -@source:adds2020.cpp +@source:skeleton/adds2020.cpp adds2020 // -@source:adm11.cpp +@source:learsiegler/adm11.cpp adm12 // -@source:adm23.cpp +@source:learsiegler/adm23.cpp adm23 // -@source:adm31.cpp +@source:learsiegler/adm31.cpp adm31 // -@source:adm36.cpp +@source:learsiegler/adm36.cpp adm36 // -@source:adp.cpp +@source:adp/adp.cpp fashiong // (c) 1997 fashiong2 // (c) 1997 fstation // (c) 2000 @@ -986,14 +986,14 @@ quickjac // (c) 1993 skattv // (c) 1994 skattva // (c) 1995 -@source:advision.cpp +@source:entex/advision.cpp advision // Entex -@source:aeroboto.cpp +@source:jaleco/aeroboto.cpp aeroboto // (c) 1984 Williams formatz // (c) 1984 Jaleco -@source:aerofgt.cpp +@source:vsystem/aerofgt.cpp aerfboo2 // bootleg aerfboot // bootleg aerofgt // (c) 1992 Video System Co. @@ -1025,54 +1025,54 @@ turbofrcu // (c) 1991 Video System Co. (US) wbbc97 // (c) 1997 Comad kickball // (c) 1998 Seoung Youn -@source:age_candy.cpp +@source:misc/age_candy.cpp age_cand // AGE Candy Crane -@source:agat.cpp +@source:agat/agat.cpp agat7 // Agat-7 agat9 // Agat-9 -@source:aid80f.cpp +@source:skeleton/aid80f.cpp aid80f // -@source:aim65.cpp +@source:rockwell/aim65.cpp aim65 // Rockwell AIM65 -@source:aim65_40.cpp +@source:rockwell/aim65_40.cpp aim65_40 // Rockwell AIM65/40 -@source:airbase99.cpp +@source:skeleton/airbase99.cpp airbase99 -@source:airbustr.cpp +@source:kaneko/airbustr.cpp airbustr // (c) 1990 Kaneko + Namco airbustrb // bootleg airbustrj // (c) 1990 Kaneko + Namco (Japan) -@source:ajax.cpp +@source:konami/ajax.cpp ajax // GX770 (c) 1987 ajaxj // GX770 (c) 1987 (Japan) typhoon // GX770 (c) 1987 -@source:akaiax80.cpp +@source:akai/akaiax80.cpp ax80 -@source:akaivx600.cpp +@source:akai/akaivx600.cpp vx600 -@source:akkaarrh.cpp +@source:atari/akkaarrh.cpp akkaarrh // (c) 1982 Atari (prototype) -@source:albazc.cpp +@source:seta/albazc.cpp hanaroku // (c) 1988 Alba -@source:albazg.cpp +@source:alba/albazg.cpp yumefuda // (c) 198? Alba -@source:alcat7100.cpp +@source:skeleton/alcat7100.cpp alcat7100 // -@source:aleck64.cpp +@source:nintendo/aleck64.cpp 11beat // (c) 1998 Hudson aleck64 // (c) 1998 Nintendo/Seta doncdoon // (c) 2003 Aruze (Arcade TV Game List - P.90, Right, 8 from bottom) @@ -1087,24 +1087,24 @@ starsldr // (c) 1998 Hudson/Seta twrshaft // (c) 2003 Aruze vivdolls // (c) 1998 Visco -@source:aleisttl.cpp +@source:alliedl/aleisttl.cpp sburners // (c) 1975 Allied Leisure -@source:alesis.cpp +@source:alesis/alesis.cpp hr16 // hr16b // mmt8 // sr16 // -@source:alesis_qs.cpp +@source:skeleton/alesis_qs.cpp alesqs7 // -@source:alfaskop41xx.cpp +@source:skeleton/alfaskop41xx.cpp alfaskop4110 // alfaskop4120 // alfaskop4101 // -@source:alg.cpp +@source:amiga/alg.cpp alg_bios // aplatoon // (c) 199? Nova? crimep2 // (c) 1993 @@ -1136,7 +1136,7 @@ wsjr_15 // (c) 1991 zortonbr // (c) 1994 Picmatic zortonbr_100 // (c) 1993 Picmatic -@source:alien.cpp +@source:capcom/alien.cpp alien // (c) 2005 Capcom dkbanana // (c) 2007 Capcom dkbanans // (c) 2007 Capcom @@ -1150,7 +1150,7 @@ mmaruchana // (c) 2004 Capcom pingu // (c) 2006 The Pygos Group / Capcom wontame // (c) 2008 Capcom -@source:aliens.cpp +@source:konami/aliens.cpp aliens // GX875 (c) 1990 (World) aliens2 // GX875 (c) 1990 (World) aliens3 // GX875 (c) 1990 (World) @@ -1160,10 +1160,10 @@ aliensj // GX875 (c) 1990 (Japan) aliensj2 // GX875 (c) 1990 (Japan) aliensu // GX875 (c) 1990 (US) -@source:alinvade.cpp +@source:misc/alinvade.cpp alinvade // -@source:allied.cpp +@source:pinball/allied.cpp allied // circa33 // disco79 // @@ -1177,7 +1177,7 @@ suprpick // takefive // thndbolt // -@source:alpha68k.cpp +@source:alpha/alpha68k.cpp btlfield // Alpha-68K96II 'BT' (c) 1987 btlfieldb // bootleg gangwars // Alpha-68K96V (c) 1989 Alpha Denshi Co. @@ -1198,72 +1198,72 @@ timesold // Alpha-68K96II 'BT' (c) 1987 SNK / Romstar timesold1 // Alpha-68K96II 'BT' (c) 1987 -@source:alpha68k_i.cpp +@source:alpha/alpha68k_i.cpp paddlema // Alpha-68K96I 'PM' (c) 1988 SNK tnextspc // A8003 'NS' (c) 1989 - MASKROM tnextspc2 // A8003 'NS' (c) 1989 - EPROMs tnextspcj // A8003 'NS' (c) 1989 - Japan -@source:alpha68k_n.cpp +@source:alpha/alpha68k_n.cpp jongbou // (c) 1987 SNK jongbou2 // (c) 1987 SNK kyros // (c) 1987 World Games kyrosj // (c) 1986 Alpha Denshi Co. sstingry // (c) 1986 Alpha Denshi Co. -@source:alphajuno.cpp +@source:roland/alphajuno.cpp ajuno1 // ajuno2 // hs80 // mks50 // -@source:alphasma.cpp +@source:skeleton/alphasma.cpp asma2k // (c) 1997 Intelligent Peripheral Devices asmapro // (c) 1995 Intelligent Peripheral Devices -@source:alphasma3k.cpp +@source:skeleton/alphasma3k.cpp asma3k // (c) 2000 AlphaSmart, Inc. -@source:alphatan.cpp +@source:tangerin/alphatan.cpp alphatan // 1981 AlphaTantel -@source:alphatpx.cpp +@source:ta/alphatpx.cpp alphatp1 alphatp2 alphatp2u alphatp3 // 1982 Triumph-Adler alphatp30 -@source:alphatpc16.cpp +@source:ta/alphatpc16.cpp alphatpc16 -@source:alphatro.cpp +@source:ta/alphatro.cpp alphatro // alphatrob // alphatron // -@source:altair.cpp +@source:mits/altair.cpp al8800bt // -@source:alto1.cpp +@source:xerox/alto1.cpp alto1 // 1973 Xerox Alto I -@source:alto2.cpp +@source:xerox/alto2.cpp alto2 // -@source:altos2.cpp +@source:altos/altos2.cpp altos2 // Altos II terminal -@source:altos5.cpp +@source:altos/altos5.cpp altos5 // -@source:altos486.cpp +@source:altos/altos486.cpp altos486 -@source:altos8600.cpp +@source:altos/altos8600.cpp altos8600 -@source:alvg.cpp +@source:pinball/alvg.cpp agsoccer // agsoccer07 // agsoccera // @@ -1281,10 +1281,10 @@ wrldtour // wrldtour2 // wrldtour3 // -@source:am1000.cpp +@source:skeleton/am1000.cpp am1000 // (c) 1988 Alpha Micro -@source:amaticmg.cpp +@source:misc/amaticmg.cpp am_mg24 // (c) 2000 Amatic am_mg24a // (c) 2000 Amatic am_mg3 // (c) 2000 Amatic @@ -1297,7 +1297,7 @@ am_mg4v // (c) 2000 Amatic am_mg5hu // (c) Amatic suprstar // (c) 1996 Amatic -@source:ambush.cpp +@source:tecfri/ambush.cpp ambush // (c) 1983 ambushh // (c) 1983 ambushj // (c) 1983 Nippon Amuse license @@ -1306,13 +1306,13 @@ dkong3abl // bootleg mariobl // bootleg mariobla // bootleg -@source:amerihok.cpp +@source:misc/amerihok.cpp amerihok // -@source:amico2k.cpp +@source:trainer/amico2k.cpp amico2k // -@source:amiga.cpp +@source:amiga/amiga.cpp a1000 // Commodore Amiga 1000 a1000n // a1200 // Commodore Amiga 1200 @@ -1338,7 +1338,7 @@ cd32n // cdtv // Commodore CDTV cdtvn // -@source:ampoker2.cpp +@source:misc/ampoker2.cpp ampkr228 // 1990 bootleg? ampkr2b1 // 1990 bootleg ampkr2b2 // 1990 bootleg @@ -1357,24 +1357,24 @@ sigma2k // (c) 2000 Sigma sigmapkr // (c) 1995 Sigma videomat // 1990 bootleg -@source:ampex.cpp +@source:skeleton/ampex.cpp dialog80 // Ampex Dialogue 80 -@source:ampex210.cpp +@source:skeleton/ampex210.cpp ampex210p // ampex230p // -@source:ampro.cpp +@source:ampro/ampro.cpp ampro // -@source:ampscarp.cpp +@source:skeleton/ampscarp.cpp ampscarp // Motorola Amps Car Phone -@source:amspdwy.cpp +@source:misc/amspdwy.cpp amspdwy // no copyright notice, but (c) 1987 Enerdyne Technologies, Inc. amspdwya // no copyright notice, but (c) 1987 Enerdyne Technologies, Inc. -@source:amstr_pc.cpp +@source:amstrad/amstr_pc.cpp pc20 // 1988 Amstrad PC20 pc200 // 1988 Sinclair PC200 pc2086 // Amstrad PC2086 @@ -1383,7 +1383,7 @@ pc5086 // Amstrad PC5086 ppc512 // 1987 Amstrad PPC512 ppc640 // 1987 Amstrad PPC640 -@source:amstrad.cpp +@source:amstrad/amstrad.cpp al520ex // Patisonic Aleste 520EX (1993) cpc464 // Amstrad (Schneider in Germany) 1984 cpc464p // Amstrad CPC464 Plus - 1990 @@ -1396,38 +1396,38 @@ cpc664 // Amstrad (Schneider in Germany) 1985 gx4000 // Amstrad GX4000 - 1990 kccomp // VEB KC compact -@source:amusco.cpp +@source:misc/amusco.cpp amusco // 1987, Amusco. draw88pkr // 1988, BTE, Inc. -@source:amust.cpp +@source:skeleton/amust.cpp amust // -@source:anes.cpp +@source:misc/anes.cpp sanma // 2001, ANES tonpuu // 200?, ANES -@source:angelkds.cpp +@source:sega/angelkds.cpp angelkds // 833-6599 (c) 1988 Sega / Nasco? spcpostn // (c) 1986 Sega / Nasco -@source:anzterm.cpp +@source:skeleton/anzterm.cpp anzterm // Burroughs EF315-I220 -@source:apc.cpp +@source:nec/apc.cpp apc // -@source:apexc.cpp +@source:booth/apexc.cpp apexc // 1955(?) APEXC: All-Purpose Electronic X-ray Computer -@source:apf.cpp +@source:apf/apf.cpp apfimag // apfm1000 // -@source:apogee.cpp +@source:radio/apogee.cpp apogee // -@source:apollo.cpp +@source:apollo/apollo.cpp dn3000 // Apollo Workstation DN3000 15" Color (1988) dn3000_19i // Apollo Workstation DN3000 19" Monochrome (1987) dn3500 // Apollo Workstation DN3500 15" Color (1989) @@ -1438,10 +1438,10 @@ dsp3000 // Apollo Server DSP3000 (1987) dsp3500 // Apollo Server DSP3500 (1989) dsp5500 // Apollo Server DSP5500 (1991) -@source:apple1.cpp +@source:apple/apple1.cpp apple1 // Jul 1976 Apple 1 -@source:apple2.cpp +@source:apple/apple2.cpp ace100 // ??? 1982 Franklin Ace 100 ace1000 // 1982 Franklin ACE 1000 am64 // 1985 ASEM AM 64 (motherboard is marked AM-100 but it boots as "AM 64") @@ -1466,7 +1466,7 @@ albert // Albert am100 // ASEM AM100 dodo // GTAC Do-Do -@source:apple2e.cpp +@source:apple/apple2e.cpp apple2c // Apr 1984 Apple //c apple2c0 // ??? 1985 Apple //c (3.5 ROM) apple2c3 // Sep 1986 Apple //c (Original Mem. Exp.) @@ -1496,7 +1496,7 @@ zijini // 1989 Zi Jin I ace2200 // 1985 Franklin Ace 2200 ace500 // 1986 Franklin Ace 500 -@source:apple2gs.cpp +@source:apple/apple2gs.cpp apple2gs // Aug 1989 Apple IIgs ROM03 apple2gsr0 // Sep 1986 Apple IIgs ROM00 apple2gsr0p // June 19, 1986 Apple IIgs ROM00 prototype @@ -1504,55 +1504,55 @@ apple2gsr0p2 // March 10, 1986 Apple IIgs ROM00 prototype apple2gsr1 // Sep 1987 Apple IIgs ROM01 apple2gsr3p // ??? 198? Apple IIgs ROM03 prototype -@source:apple3.cpp +@source:apple/apple3.cpp apple3 // May 1980 Apple /// -@source:applix.cpp +@source:skeleton/applix.cpp applix // -@source:appoooh.cpp +@source:sanritsu/appoooh.cpp appoooh // (c) 1984 Sega, made by Sanritsu robowres // (c) 1986 Sega robowresb // bootleg -@source:apricot.cpp +@source:act/apricot.cpp apricot // 1983 ACT apricotxi // 1984 ACT -@source:apricotf.cpp +@source:act/apricotf.cpp f1 // f10 // f1e // f2 // -@source:apricotp.cpp +@source:act/apricotp.cpp fp // -@source:apxen.cpp +@source:act/apxen.cpp apxen // 1985 ACT -@source:aquarium.cpp +@source:excelent/aquarium.cpp aquarium // (c) 1996 Excellent System aquariumj // (c) 1996 Excellent System -@source:aquarius.cpp +@source:mattel/aquarius.cpp aquarius // 1983 Aquarius (NTSC) aquariusp // 1983 Aquarius (PAL) aquarius2 // 1984 Aquarius II -@source:arabian.cpp +@source:sunelect/arabian.cpp arabian // TVG13 (c) 1983 Sun Electronics arabiana // 136019 (c) 1983 Atari -@source:arachnid.cpp +@source:misc/arachnid.cpp arac6000 // (c) 1987/88/89/90 Arachnid Inc. arac6spa // (c) 1987/88/89/90 Arachnid Inc. -@source:arcadecl.cpp +@source:atari/arcadecl.cpp arcadecl // (proto) (c) 1992 sparkz // (proto) (c) 1992 -@source:arcadia.cpp +@source:arcadia/arcadia.cpp advsnha // Advision Home Arcade arcadia // Emerson Arcadia 2001 bndarc // Bandai Arcadia @@ -1586,19 +1586,19 @@ tunixha // Tunix Home Arcade tvg2000 // Schmid TVG 2000 vdmaster // Video Master -@source:argo.cpp +@source:cccp/argo.cpp argo // -@source:argox.cpp +@source:skeleton/argox.cpp os214 // -@source:argus.cpp +@source:jaleco/argus.cpp argus // (c) 1986 Jaleco butasan // (c) 1987 Jaleco - english subtitled butasanj // (c) 1987 Jaleco valtric // (c) 1986 Jaleco -@source:aristmk4.cpp +@source:aristocr/aristmk4.cpp 3bagflnz // (c) 1996 3bagflvt // (c) 1996 86lions // (c) 1985? @@ -1628,7 +1628,7 @@ topgear // (c) 1996 wildone // (c) 1997 wtigernz // (c) 1996 -@source:aristmk5.cpp +@source:acorn/aristmk5.cpp aristmk5 // (c) 1995, USA platform set chips adonis // (c) 1998 adonisa // (c) 1998 @@ -1861,7 +1861,7 @@ wthinga // (c) 2000 wtiger // (c) 1999 yukongl5 // (c) 2000 -@source:aristmk6.cpp +@source:aristocr/aristmk6.cpp aristmk6 // (c) 2000 5drag // (c) 2004 5dragsp // (c) 2004 @@ -2138,7 +2138,7 @@ wingoly // (c) 2005 zorroa6 // (c) 2003 zorroa6u // (c) 2005 -@source:arkanoid.cpp +@source:taito/arkanoid.cpp ark1ball // bootleg arkangc // bootleg arkangc2 // bootleg @@ -2167,7 +2167,7 @@ paddle2 // bootleg tetrsark // ??? (c) D.R.Korea tetrsark2 // ??? (c) D.R.Korea -@source:armedf.cpp +@source:nichibut/armedf.cpp armedf // (c) 1988 armedff // (c) 1988 Fillmore license bigfghtr // (c) 1989 @@ -2186,7 +2186,7 @@ terrafj // (c) 1987 Nichibutsu Japan terrafjb // (c) 1987 terrafu // (c) 1987 Nichibutsu USA -@source:arsystems.cpp +@source:amiga/arsystems.cpp ar_airh // (c) 1988 ar_airh2 // (c) 1988 ar_argh // @@ -2212,7 +2212,7 @@ ar_spot // (c) 1990 ar_sprg // (c) 1987 ar_xeon // (c) 1988 -@source:artmagic.cpp +@source:misc/artmagic.cpp cheesech // (c) 1994 shtstar // (c) 1994 Nova stonebal // (c) 1994 - 4 Players, v1-20 13/12/1994 @@ -2221,21 +2221,21 @@ stonebal2o // (c) 1994 - 2 Players, v1-20 21/10/1994 ultennis // (c) 1993 ultennisj // (c) 1993 -@source:ashnojoe.cpp +@source:taito/ashnojoe.cpp ashnojoe // ??? (c) 1990 Wave / Taito scessjoe // ??? (c) 1990 Wave / Taito -@source:asst128.cpp +@source:pc/asst128.cpp asst128 // -@source:asterix.cpp +@source:konami/asterix.cpp asterix // GX068 (c) 1992 (World) asterixaad // GX068 (c) 1992 (Asia) asterixeaa // GX068 (c) 1992 (World) asterixeac // GX068 (c) 1992 (World) asterixj // GX068 (c) 1992 (Japan) -@source:asteroid.cpp +@source:atari/asteroid.cpp aerolitos // Rodmar Elec. bootleg astdelux // 0351xx (c) 1980 astdelux1 // 0351xx (c) 1980 @@ -2257,7 +2257,7 @@ meteorite // Proel bootleg (c) 1979 meteorts // VCC bootleg (c) 1979 spcrocks // J.Estevez (c) 1981 -@source:astinvad.cpp +@source:stern/astinvad.cpp astinvad // (c) 1980 Stern betafrce // bootleg kamikaze // (c) 1979 Leijac Corporation @@ -2266,7 +2266,7 @@ spaceint // [1980] Shoei spaceintj // [1980] Shoei spcking2 // (c) 1979 Konami -@source:astrafr.cpp +@source:misc/astrafr.cpp as_acp // unknown ACP (Astra) as_bbr // Bullion Bars (Astra) as_bbra // @@ -2441,7 +2441,7 @@ as_wwc // as_wwd // as_wwe // -@source:astrcorp.cpp +@source:misc/astrcorp.cpp astoneag // (c) 2005 Astro Corp. dinodino // (c) 2005 Astro Corp. hacher // (c) 2005 bootleg (Gametron) @@ -2461,7 +2461,7 @@ winbingo // (c) 2006 Astro Corp. winbingoa // (c) 2006 Astro Corp. zulu // (c) 2004 Astro Corp. -@source:astrocde.cpp +@source:midway/astrocde.cpp demndrgn // (c) 1982 Bally Midway ebases // (c) 1980 gorf // (c) 1981 @@ -2475,7 +2475,7 @@ tenpindx // (c) 1983 Bally Midway wow // (c) 1980 wowg // (c) 1980 -@source:astrof.cpp +@source:dataeast/astrof.cpp abattle // Sidam abattle2 // Sidam acombat // bootleg @@ -2496,12 +2496,12 @@ strfight // bootleg (VGG) tomahawk // (c) 1980 Data East, Inc. tomahawk1 // (c) 1980 Data East, Inc. -@source:astrohome.cpp +@source:midway/astrohome.cpp astrocde // Bally Professional Arcade / Astrocade astrocdl // Bally Home Library Computer astrocdw // Bally Computer System (white case) -@source:astropc.cpp +@source:misc/astropc.cpp blackbd // blackbda // blackbdb // @@ -2511,7 +2511,7 @@ hawaii // oligam // rasce // -@source:asuka.cpp +@source:taito/asuka.cpp asuka // B68 (c) 1988 Taito Corporation (World) asukaj // B68 (c) 1988 Taito Corporation (Japan) asukaja // B68 (c) 1988 Taito Corporation (Japan) @@ -2540,7 +2540,7 @@ galmedes // (c) 1992 Visco (Japan) jigkmgri // B41 (c) 1988 Taito Corporation (Japan) mofflott // C17 (c) 1989 Taito Corporation (Japan) -@source:at.cpp +@source:at/at.cpp asi100b0 // ASI 100B0, identified as "HAM 12 TI 286 Motherboard ZERO WAIT" ab hier 286 at // 1987 AMI Bios and Diagnostics ataripc4 // Atari PC4 (286) @@ -2921,10 +2921,10 @@ via4386vio // Via 4386 VIO / Highscreen universal board (48 zi4dvs // Zida 4DVS motherboard (486) zito4dps // ZIDA Tomato board 4DPS (486) -@source:atari_4x4.cpp +@source:pinball/atari_4x4.cpp fourx4 // -@source:atari_s1.cpp +@source:pinball/atari_s1.cpp aavenger // atarians // midearth // @@ -2932,12 +2932,12 @@ mideartha // spcrider // time2000 // -@source:atari_s2.cpp +@source:pinball/atari_s2.cpp hercules // roadrunr // supermap // -@source:atari400.cpp +@source:atari/atari400.cpp a1200xl // 1982 Atari 1200 XL a130xe // 1986 Atari 130 XE a400 // 1979 Atari 400 @@ -2954,7 +2954,7 @@ a800xl // 1983 Atari 800 XL a800xlp // 1983 Atari 800 XL (PAL) xegs // 1987 Atari XE Game System -@source:atarifb.cpp +@source:atari/atarifb.cpp abaseb // 034711-034738 1979/06 [6502] abaseb2 // 034711-034738 1979/06 [6502] atarifb // 033xxx 1978/10 [6502] @@ -2963,7 +2963,7 @@ atarifb2 // 035330-035350 ??? [6502] atarifb4 // 034754 1979/04 [6502] soccer // 035222-035260 1980/04 [6502] -@source:atarig1.cpp +@source:atari/atarig1.cpp hydra // 136079 (c) 1990 hydrap // (proto) (c) 1990 hydrap2 // (proto) (c) 1990 @@ -2978,14 +2978,14 @@ pitfight7 // 136081 (c) 1990 pitfightb // bootleg pitfightj // Japan -@source:atarig42.cpp +@source:atari/atarig42.cpp dangerex // (proto) (c) 1992 guardian // 136092 (c) 1992 roadriot // 136089 (c) 1991 roadriota // 136089 (c) 1991 roadriotb // 136089 (c) 1991 -@source:atarigt.cpp +@source:atari/atarigt.cpp primrage // 136102 (c) 1994 primrage20 // 136102 (c) 1994 tmek // 136100 (c) 1994 @@ -2994,7 +2994,7 @@ tmek44 // 136100 (c) 1994 tmek45 // 136100 (c) 1994 tmek51p // 136100 (c) 1994 -@source:atarigx2.cpp +@source:atari/atarigx2.cpp motofren // 136094 (c) 1992 motofrenft // 136094 (c) 1992 motofrenmd // 136094 (c) 1992 @@ -3007,7 +3007,7 @@ spclordsa // 136095 (c) 1992 spclordsb // 136095 (c) 1992 spclordsg // 136095 (c) 1992 -@source:atarist.cpp +@source:atari/atarist.cpp falcon30 // Atari Falcon030 falcon40 // Atari Falcon040 (prototype) megast // Atari Mega ST @@ -3045,7 +3045,7 @@ tt030_fr // tt030_pl // tt030_uk // -@source:atarisy1.cpp +@source:atari/atarisy1.cpp atarisy1 // 136033 (c) 1984 indytemp // 136036 (c) 1985 indytemp2 // 136036 (c) 1985 @@ -3074,7 +3074,7 @@ roadrunn // 136040 (c) 1985 roadrunn1 // 136040 (c) 1985 roadrunn2 // 136040 (c) 1985 -@source:atarisy2.cpp +@source:atari/atarisy2.cpp 720 // 136047 (c) 1986 720g // 136047 (c) 1986 720gr1 // 136047 (c) 1986 @@ -3110,11 +3110,11 @@ ssprintg // 136042 (c) 1986 ssprintg1 // 136042 (c) 1986 ssprints // 136042 (c) 1986 -@source:atarisy4.cpp +@source:atari/atarisy4.cpp airrace // (proto) (c) 1985 laststar // (proto) (c) 1984 -@source:atarittl.cpp +@source:atari/atarittl.cpp antiairc // (c) 1975 Atari crashnsc // (c) 1975 Atari gtrak10 // (c) 1974 Atari / Kee @@ -3133,7 +3133,7 @@ stuntcyc // (c) 1976 Atari tank // (c) 1974 Atari / Kee tankii // (c) 1975 Atari / Kee -@source:atetris.cpp +@source:atari/atetris.cpp atetris // 136066 (c) 1988 atetrisa // 136066 (c) 1988 atetrisb // (bootleg) @@ -3146,29 +3146,29 @@ atetrisbp // atetrisc // 136066 (c) 1989 atetrisc2 // 136066 (c) 1989 -@source:atlantis.cpp +@source:midway/atlantis.cpp mwskins // (c) 2000 Midway mwskinsa // (c) 2000 Midway mwskinso // (c) 2000 Midway mwskinst // (c) 2000 Midway -@source:atm.cpp +@source:sinclair/atm.cpp atm // atmtb2 // -@source:atom.cpp +@source:acorn/atom.cpp atom // 1979 Acorn Atom atombb // 1982 Acorn Atom with BBC Basic atomeb // 1979 Acorn Atom with Eprom Box -@source:atpci.cpp +@source:at/atpci.cpp at586 // 19?? AT 586 at586x3 // 19?? AT 586 m55hipl // 19?? Micronics M55HI-Plus ficvt503 // 1997 FIC VT-503 ecssi5pi // Elitegroup SI5PI AIO -@source:atronic.cpp +@source:misc/atronic.cpp 3wishrd // Three Wishes Red abigchs // Big Cheese aclown // Clown @@ -3202,31 +3202,31 @@ atrwild atricmon atrbonpk -@source:att3b2.cpp +@source:att/att3b2.cpp 3b2_300 // 3b2_310 // 3b2_400 // 3b2_600 // -@source:att4425.cpp +@source:att/att4425.cpp att4425 // -@source:att610.cpp +@source:att/att610.cpp att610 // att615 // -@source:att630.cpp +@source:att/att630.cpp att630 // att730x // -@source:attache.cpp +@source:skeleton/attache.cpp attache // (c) 1982 Otrona attache816 // (c) 1983 Otrona -@source:attckufo.cpp +@source:misc/attckufo.cpp attckufo // (c) 1980 Ryoto Electric Co. -@source:atvtrack.cpp +@source:gaelco/atvtrack.cpp atvtrack // (c) 2002 - Ref 020419 atvtracka // (c) 2002 - Ref 020419 gfootbal // (c) 2002 - Ref 020201 @@ -3234,69 +3234,69 @@ smashdrv // (c) 2000 smashdrvb // (c) 2000 smashdrvs // (c) 2000 -@source:aussiebyte.cpp +@source:skeleton/aussiebyte.cpp aussieby // -@source:avalnche.cpp +@source:atari/avalnche.cpp avalnche // 030574 1978/04 [6502] cascade // bootleg catchp // 008837 prototype 1977/?? [6502] -@source:ave_arb.cpp +@source:ave/ave_arb.cpp arb // arbv2 // -@source:avigo.cpp +@source:ti/avigo.cpp avigo // 1997 Avigo avigo_de // 1997 Avigo (German) avigo_es // 1997 Avigo (Spanish) avigo_fr // 1997 Avigo (French) avigo_it // 1997 Avigo (Italian) -@source:aviion88k.cpp +@source:aviion/aviion88k.cpp aviion_4600 // Data General AViiON 4600 -@source:avrmax.cpp +@source:elektor/avrmax.cpp avrmax avrmaxg -@source:avt.cpp +@source:misc/avt.cpp avtbingo // (c) 1985 AVT avtnfl // (c) 1989 AVT avtsym14 // (c) 1985 AVT avtsym25 // (c) 1985 AVT -@source:ax20.cpp +@source:skeleton/ax20.cpp ax20 // -@source:aztarac.cpp +@source:misc/aztarac.cpp aztarac // (c) 1983 Centuri (vector game) -@source:b16.cpp +@source:hitachi/b16.cpp b16 // -@source:b2m.cpp +@source:bnpo/b2m.cpp b2m // b2mrom // -@source:babbage.cpp +@source:trainer/babbage.cpp babbage // -@source:backfire.cpp +@source:dataeast/backfire.cpp backfire // MBZ (c) 1995 backfirea // MBZ (c) 1995 -@source:badlands.cpp +@source:atari/badlands.cpp badlands // 136074 (c) 1989 -@source:badlands_ms.cpp +@source:atari/badlands_ms.cpp badlandsm -@source:badlandsbl.cpp +@source:atari/badlandsbl.cpp badlandsb // bootleg badlandsb2 // bootleg set 2 -@source:bagman.cpp +@source:valadon/bagman.cpp bagman // (c) 1982 bagmanj // (c) 1982 bagmans // (c) 1982 + Stern license @@ -3316,11 +3316,11 @@ sbagmani // (c) 1984 + Itisa license sbagmans // (c) 1984 + Stern license squaitsa // (c) 1985 -@source:bailey.cpp +@source:misc/bailey.cpp fun4 // (c) 1976 Bailey fun4a // (c) 1976 Bailey -@source:balsente.cpp +@source:midway/balsente.cpp cshift // (c) 1984 gghost // (c) 1984 gimeabrk // (c) 1985 @@ -3361,65 +3361,65 @@ triviayp // (c) 1984 triviaes4 // (c) 1988 (Maibesa hardware) triviaes5 // (c) 19?? (Maibesa hardware) -@source:banctec.cpp +@source:banctec/banctec.cpp banctec // BancTec ESeries panel -@source:bandai_design_master.cpp +@source:bandai/bandai_design_master.cpp bdesignm -@source:bankp.cpp +@source:sanritsu/bankp.cpp bankp // (c) 1984 Sega, made by Sanritsu combh // (c) 1987 Sega, made by Sanritsu -@source:banprestoms.cpp +@source:seibu/banprestoms.cpp marioun // tvdenwad // -@source:baraduke.cpp +@source:namco/baraduke.cpp aliensec // (c) 1985 baraduke // (c) 1985 metrocrs // (c) 1985 metrocrsa // (c) 1985 -@source:barata.cpp +@source:matic/barata.cpp barata // -@source:barni.cpp +@source:pinball/barni.cpp champion // redbarnp // -@source:bartop52.cpp +@source:atari/bartop52.cpp barbball // (proto) (c) 1983 -@source:basf7100.cpp +@source:skeleton/basf7100.cpp basf7120 // -@source:basic52.cpp +@source:intel/basic52.cpp basic31 // basic52 // -@source:basssta.cpp +@source:novation/basssta.cpp bassstr // sbasssta // -@source:batman.cpp +@source:atari/batman.cpp batman // 136085 (c) 1991 -@source:battlane.cpp +@source:technos/battlane.cpp battlane // -0215, -0216 (Data East part number) (c) 1986 + Taito license battlane2 // -0215, -0216 (Data East part number) (c) 1986 + Taito license battlane3 // -0215, -0216 (Data East part number) (c) 1986 + Taito license -@source:battlera.cpp +@source:dataeast/battlera.cpp battlera // (c) 1988 Data East Corporation (World) bldwolf // (c) 1988 Data East USA (US) bldwolfj // (c) 1988 Data East Corporation (Japan) -@source:battlex.cpp +@source:omori/battlex.cpp battlex // (c) 1982 Omori E. Co., Ltd. dodgeman // -@source:battlnts.cpp +@source:konami/battlnts.cpp battlnts // GX777 (c) 1987 battlntsa // GX777 (c) 1987 battlntsj // GX777 (c) 1987 (Japan) @@ -3427,7 +3427,7 @@ rackemup // GX765 (c) 1987 thehustl // GX765 (c) 1987 (Japan) thehustlj // GX765 (c) 1987 (Japan) -@source:bbc.cpp +@source:acorn/bbc.cpp abc110 // 1985 ABC 110 abc310 // 1985 ABC 310 acw443 // 1985 ABC 210/Cambridge Workstation @@ -3466,41 +3466,41 @@ torchh // 1982 Torch CH240 torch301 // 1984 Torch Model 301 torch725 // 1984 Torch Model 725 -@source:bbcbc.cpp +@source:unicard/bbcbc.cpp bbcbc // 1985 BBC Bridge Companion -@source:bbusters.cpp +@source:snk/bbusters.cpp bbusters // A9003 'BB' (c) 1989 bbustersu // A9003 'BB' (c) 1989 bbustersua // A9003 'BB' (c) 1989 bbustersj // bbustersja // -@source:bcs3.cpp +@source:ddr/bcs3.cpp bcs3 // bcs3a // bcs3b // bcs3c // bcs3d // -@source:beaminv.cpp +@source:misc/beaminv.cpp beaminv // (c) 1979 Tekunon Kougyou (Arcade TV Game List - P.95, Left, 9 from top) pacominv // (c) 1979 Pacom Corporation pacominva // Pacom Corporation ctainv // CTA Corporation -@source:beathead.cpp +@source:atari/beathead.cpp beathead // (proto) (c) 1993 -@source:bebox.cpp +@source:be/bebox.cpp bebox // BeBox Dual603-66 bebox2 // BeBox Dual603-133 -@source:beezer.cpp +@source:misc/beezer.cpp beezer // (c) 1982 beezer1 // (c) 1982 -@source:belatra.cpp +@source:misc/belatra.cpp fairyl2 // fairyl2a // fairyl2b // @@ -3509,10 +3509,10 @@ ldrink // ldrinka // merryjn // -@source:bert.cpp +@source:skeleton/bert.cpp bert // -@source:berzerk.cpp +@source:stern/berzerk.cpp berzerk // (c) 1980 berzerka // (c) 1980 berzerkb // (c) 1980 @@ -3522,19 +3522,19 @@ berzerks // (c) 1980 Sonic license(Spanish speech) frenzy // (c) 1982 moonwarp // (c) 1982 - prototype -@source:bestleag.cpp +@source:jaleco/bestleag.cpp bestleag // bootleg, by Playmark? bestleaw // bootleg -@source:beta.cpp +@source:pitronic/beta.cpp beta // -@source:betacam.cpp +@source:sony/betacam.cpp uvw1200 // 199? Sony Betacam-SP UVW-1200 uvw1600 // 199? Sony Betacam-SP UVW-1600 uvw1800 // 199? Sony Betacam-SP UVW-1800 -@source:bfcobra.cpp +@source:bfm/bfcobra.cpp beeline // 1991 BFM brkball // 1994 BFM / ATOD escounts // 1990 BFM @@ -3545,7 +3545,7 @@ qosb // 1992 BFM quizvadr // 1991 BFM trebltop // 1991 BFM -@source:bfm_ad5sw.cpp +@source:bfm/bfm_ad5sw.cpp ad5bpfpm // Bullseye Pounds For Points (Mazooma) ad5bpfpma // ad5bpfpmb // @@ -3796,7 +3796,7 @@ ad5vpaa // ad5vpab // ad5vpac // -@source:bfm_sc1.cpp +@source:bfm/bfm_sc1.cpp m_tppokr // (c) 1996 BFM/ELAM,Game Card 95-750-899, uses Adder board for feature gfx sc1actv8 // sc1armad // @@ -4009,7 +4009,7 @@ sc1wthn // Wild Thing (Eurocoin) sc1wud // What's Up Dr sc1zep // Zeppelin (Bellfruit) -@source:bfm_sc2.cpp +@source:bfm/bfm_sc2.cpp gldncrwn // 1997 gldncrwnhop // 1997 paradice // 1995 @@ -4505,7 +4505,7 @@ sltblgp1 // 1996 sltblgpo // 1996 sltblgtk // 1996 -@source:bfm_sc4.cpp +@source:bfm/bfm_sc4.cpp ad4ctl // ad4ctla // ad4film // @@ -7627,7 +7627,7 @@ sc4ziggye // sc4ziggyf // sc4ziggyg // -@source:bfm_sc5sw.cpp +@source:bfm/bfm_sc5sw.cpp sc5_3414 // sc5_3434 // sc5_3435 // @@ -9303,17 +9303,17 @@ sc5woka // sc5wotw // War Of The Wads (Mazooma) sc5wotwa // -@source:bfm_swp.cpp +@source:bfm/bfm_swp.cpp c3_ppays // The Phrase That Pays c3_rtime // Radio Times c3_telly // Telly Addicts c3_totp // Top of the Pops -@source:bfmsys83.cpp +@source:bfm/bfmsys83.cpp b83catms // b83cops // -@source:bfmsys85.cpp +@source:bfm/bfmsys85.cpp b85bdclb // b85bdclba // b85bdclbb // @@ -9349,33 +9349,33 @@ b85royal // b85scard // (c) 198? BFM b85sngam // -@source:bgt.cpp +@source:misc/bgt.cpp bg_barmy // bg_ddb // bg_max // bg_maxa // -@source:big10.cpp +@source:ascii/big10.cpp big10 // (c) 198? Unknown -@source:bigbord2.cpp +@source:xerox/bigbord2.cpp bigbord2 // -@source:bigevglf.cpp +@source:taito/bigevglf.cpp bigevglf // A67 (c) 1986 Taito America Corporation (US) bigevglfj // A67 (c) 1986 Taito Corporation (Japan) -@source:bigkarnk_ms.cpp +@source:gaelco/bigkarnk_ms.cpp bigkarnkm // -@source:bigstrkb.cpp +@source:jaleco/bigstrkb.cpp bigstrkb // bootleg on different hardware bigstrkba // alt set of 'bigstrkb' with Italian teams -@source:binbug.cpp +@source:skeleton/binbug.cpp binbug // -@source:bingo.cpp +@source:pinball/bingo.cpp brooklyn // brooklyna // cntine31 // @@ -9402,14 +9402,14 @@ topgame // topgamet // tripjok // -@source:bingoc.cpp +@source:sega/bingoc.cpp bingoc // (c) 1989 Sega -@source:bingoman.cpp +@source:misc/bingoman.cpp bingoman // bingomana // -@source:bingor.cpp +@source:misc/bingor.cpp bingor1 // (c) 2002 Unknown bingor2 // (c) 2002 Unknown bingor3 // (c) 2002 Unknown @@ -9418,10 +9418,10 @@ bingor5 // (c) 2002 Unknown bingor6 // (c) 1991 AWR Hard & Soft vip2000 // (c) Paloma-Elektronik -@source:bingowav.cpp +@source:taito/bingowav.cpp bingowav // (c) 1994 Taito -@source:bionicc.cpp +@source:capcom/bionicc.cpp bionicc // 3/1987 (c) 1987 (Euro) bionicc1 // 3/1987 (c) 1987 (US) bionicc2 // 3/1987 (c) 1987 (US) @@ -9430,43 +9430,43 @@ bioniccbl2 // bootleg topsecrt // 3/1987 (c) 1987 (Japan) topsecrt2 // 3/1987 (c) 1987 (Japan) -@source:bishi.cpp +@source:konami/bishi.cpp bishi // GX575 (c) 1996 (Japan) sbishi // GX675 (c) 1998 (Japan) sbishik // GX675 (c) 1998 (Korea) sbishika // GX675 (c) 1998 (Korea) -@source:bitel.cpp +@source:siemens/bitel.cpp feap90 // t3210 // -@source:bitgraph.cpp +@source:skeleton/bitgraph.cpp bitgrpha // bitgrphb // -@source:bk.cpp +@source:elektronika/bk.cpp bk0010 // bk001001 // bk0010fd // bk0011m // -@source:bking.cpp +@source:taito/bking.cpp bking // DM (c) 1982 Taito Corporation bking2 // AD6 (c) 1983 Taito Corporation bking3 // A24 (c) 1984 Taito Corporation -@source:blackt96.cpp +@source:dgrm/blackt96.cpp blackt96 // (c) 1996 D.G.R.M. of Korea -@source:bladestl.cpp +@source:konami/bladestl.cpp bladestl // GX797 (c) 1987 bladestle // GX797 (c) 1987 bladestll // GX797 (c) 1987 -@source:blit.cpp +@source:skeleton/blit.cpp blit -@source:blitz68k.cpp +@source:misc/blitz68k.cpp bankrob // (c) 1993 Entertainment Technology Corp. bankroba // (c) 1993 Entertainment Technology Corp. bankrobb // (c) 1993 Blitz Systems Inc. @@ -9488,7 +9488,7 @@ surpr5 // (c) 1997 Cadillac Jack steaser // (c) 1993 unknown texasrls // (c) 1998 Cadillac Jack -@source:blktiger.cpp +@source:capcom/blktiger.cpp blkdrgon // 8/1987 (c) 1987 (Japan) blkdrgonb // bootleg, hacked to say Black Tiger blktiger // 8/1987 (c) 1987 (US) @@ -9497,15 +9497,15 @@ blktigerb1 // bootleg blktigerb2 // bootleg blktigerb3 // bootleg? -@source:blktiger_ms.cpp +@source:capcom/blktiger_ms.cpp blktigerm -@source:blmbycar.cpp +@source:gaelco/blmbycar.cpp blmbycar // (c) 1994 ABM & Gecas - uses same gfx chip as powerins? blmbycaru // (c) 1994 ABM & Gecas - uses same gfx chip as powerins? watrball // (c) 1996 ABM -@source:blockade.cpp +@source:sega/blockade.cpp blasto // [1978 Gremlin] blockade // 1-4 [1977 Gremlin] comotion // 5-7 [1977 Gremlin] @@ -9514,15 +9514,15 @@ hustle // 16-21 [1977 Gremlin] mineswpr // [1977 Amutech] mineswpr4 // [1977 Amutech] -@source:blockch.cpp +@source:sunelect/blockch.cpp blockch tvgm8080 -@source:blockhl.cpp +@source:konami/blockhl.cpp blockhl // GX973 (c) 1989 quarth // GX973 (c) 1989 (Japan) -@source:blockout.cpp +@source:technos/blockout.cpp agress // TA-0029 (c) 1991 Palco agressb // TA-0029 (c) 1991 Palco blockout // TA-0029 (c) 1989 + California Dreams @@ -9530,10 +9530,10 @@ blockout2 // TA-0029 (c) 1989 + California Dreams blockout3 // TA-0029 (c) 1989 + California Dreams (Europe and Oceania) blockoutj // TA-0029 (c) 1989 + California Dreams (Japan) -@source:blocktax.cpp +@source:misc/blocktax.cpp blocktax // (c)2002 TAX / Game Revival -@source:bloodbro.cpp +@source:seibu/bloodbro.cpp bloodbro // (c) 1990 Tad bloodbroj // (c) 1990 Tad bloodbroja // (c) 1990 Tad @@ -9543,93 +9543,93 @@ skysmash // (c) 1990 Nihon System Inc. weststry // bootleg weststrya // bootleg -@source:bloodbro_ms.cpp +@source:seibu/bloodbro_ms.cpp bloodbrom // bootleg -@source:blstroid.cpp +@source:atari/blstroid.cpp blstroid // 136057 (c) 1987 blstroid2 // 136057 (c) 1987 blstroid3 // 136057 (c) 1987 blstroidg // 136057 (c) 1987 blstroidh // (proto) (c) 1987 -@source:blueprnt.cpp +@source:jaleco/blueprnt.cpp blueprnt // (c) 1982 Bally Midway (Zilec in ROM 3U, and the programmer names) blueprntj // (c) 1982 Jaleco (Zilec in ROM 3U, and the programmer names) grasspin // (c) 1983 Jaleco (Zilec / Ashby programmer names in sound rom) saturnzi // (c) 1983 Jaleco (Zilec in ROM R6, and the programmer names) unkzilec // (c) 198? Exodis / Zilec -@source:blw700i.cpp +@source:skeleton/blw700i.cpp blw700i // (c) 1995 Brother -@source:bmcbowl.cpp +@source:bmc/bmcbowl.cpp bmcbowl // (c) 1994 BMC -@source:bmcpokr.cpp +@source:bmc/bmcpokr.cpp bmcpokr // (c) 1999 BMC mjmaglmp // (c) 2000 BMC -@source:bmjr.cpp +@source:hitachi/bmjr.cpp bmjr // -@source:bml3.cpp +@source:hitachi/bml3.cpp bml3 // bml3mk2 // bml3mk5 // -@source:bnstars.cpp +@source:jaleco/bnstars.cpp bnstars1 // (c) 1997 -@source:bntyhunt.cpp +@source:misc/bntyhunt.cpp bntyhunt // (c) 200? GCTech Co., LTD -@source:bob85.cpp +@source:trainer/bob85.cpp bob85 // -@source:bogeyman.cpp +@source:technos/bogeyman.cpp bogeyman // -0204-0 (Data East part number) (c) 1985 (Arcade TV Game List - P.96, Right, 8 from top) -@source:bombjack.cpp +@source:tehkan/bombjack.cpp bombjack // (c) 1984 Tehkan bombjack2 // (c) 1984 Tehkan bombjackt // (c) 1984 Tehkan + Tecfri license -@source:boogwing.cpp +@source:dataeast/boogwing.cpp boogwing // MBD (c) 1992 (Euro, v1.5) boogwinga // MBD (c) 1992 (Asia, v1.5) boogwingu // MBD (c) 1992 (USA, v1.7) ragtime // MBD (c) 1992 (Japan, v1.5) ragtimea // MBD (c) 1992 (Japan, v1.3) -@source:boss_se70.cpp +@source:roland/boss_se70.cpp se70 // -@source:boss_sx700.cpp +@source:roland/boss_sx700.cpp gx700 // sx700 // -@source:bottom9.cpp +@source:konami/bottom9.cpp bottom9 // GX891 (c) 1989 bottom9n // GX891 (c) 1989 mstadium // GX891 (c) 1989 (Japan) -@source:bowltry.cpp +@source:atlus/bowltry.cpp bowltry // (c) 200? Atlus -@source:boxer.cpp +@source:atari/boxer.cpp boxer // ?????? prototype 1978 [6502] -@source:bpmmicro.cpp +@source:skeleton/bpmmicro.cpp bp1200 // (c) 1991 BP Microsystems -@source:br8641.cpp +@source:skeleton/br8641.cpp br8641 // -@source:braiplus.cpp +@source:homelab/braiplus.cpp braiplus // -@source:brkthru.cpp +@source:dataeast/brkthru.cpp brkthru // (c) 1986 Data East USA (US) brkthrubl // bootleg brkthruj // (c) 1986 Data East Corporation (Japan) @@ -9637,10 +9637,10 @@ brkthrut // (c) 1986 Data East Corporation (Tecfri licens darwin // (c) 1986 Data East Corporation (Japan) forcebrk // bootleg -@source:bsktball.cpp +@source:atari/bsktball.cpp bsktball // 034756-034766 1979/05 [6502] -@source:btime.cpp +@source:dataeast/btime.cpp bnj // (c) 1982 bnjm // (c) 1982 + Midway brubber // (c) 1982 @@ -9663,10 +9663,10 @@ tisland // (c) 1982 wtennis // bootleg 1982 zoar // (c) 1982 -@source:btoads.cpp +@source:rare/btoads.cpp btoads // (c) 1994 Rare -@source:bublbobl.cpp +@source:taito/bublbobl.cpp bbredux // bootleg / hack boblbobl // bootleg boblcave // hack @@ -9694,32 +9694,32 @@ tokiob // bootleg tokioo // A71 1986 tokiou // A71 1986 -@source:buggychl.cpp +@source:taito/buggychl.cpp buggychl // A22 (c) 1984 Taito Corporation buggychlt // A22 (c) 1984 Taito Corporation + Tefri license -@source:bullet.cpp +@source:wavemate/bullet.cpp wmbullet // wmbulletf // -@source:busicom.cpp +@source:skeleton/busicom.cpp busicom // -@source:buster.cpp +@source:misc/buster.cpp buster // (c) 1987 Marian Electronics Ltd. -@source:bvm.cpp +@source:sony/bvm.cpp bvm20f1e // -@source:bw12.cpp +@source:bondwell/bw12.cpp bw12 // bw14 // bw14d // Bondwell Portable Computer Model 14 (German keyboard) -@source:bw2.cpp +@source:bondwell/bw2.cpp bw2 // -@source:bwidow.cpp +@source:atari/bwidow.cpp bwidow // 136017 (c) 1982 bwidowp // (proto) (c) 1982 gravitar // 136010 (c) 1982 @@ -9731,14 +9731,14 @@ spacduel // 136006 (c) 1980 spacduel0 // 136006 (c) 1980 spacduel1 // 136006 (c) 1980 -@source:bwing.cpp +@source:dataeast/bwing.cpp bwings // (c) 1984 bwingsa // (c) 1984 bwingso // (c) 1984 zaviga // (c) zavigaj // (c) -@source:by17.cpp +@source:pinball/by17.cpp blackjck // bowarrow // bowarrowa // @@ -9752,7 +9752,7 @@ nightrdr // pwerplay // stk_sprs // -@source:by35.cpp +@source:pinball/by35.cpp bbbowlin // bigbat // blakpyra // @@ -9829,7 +9829,7 @@ xenon // xenonf // xsandos // -@source:by6803.cpp +@source:pinball/by6803.cpp atlantip // beatclck // beatclck2 // @@ -9860,7 +9860,7 @@ strngscig // trucksp2 // trucksp3 // -@source:by68701.cpp +@source:pinball/by68701.cpp eballdlxp1 // eballdlxp2 // eballdlxp3 // @@ -9868,12 +9868,12 @@ eballdlxp4 // flashgdnp1 // flashgdnp2 // -@source:byvid.cpp +@source:pinball/byvid.cpp babypac // babypac2 // granny // -@source:bzone.cpp +@source:atari/bzone.cpp bradley // ?? (c) 1980 bzone // 0364xx (c) 1980 bzonea // 0364xx (c) 1980 @@ -9881,10 +9881,10 @@ bzonec // 0364xx (c) 1980 redbaron // 036995-037007 (c) 1980 redbarona // 036995-037007 (c) 1980 -@source:c10.cpp +@source:cromemco/c10.cpp c10 // -@source:c128.cpp +@source:cbm/c128.cpp c128 // c128_de // c128_se // @@ -9898,10 +9898,10 @@ c128dcrp // c128dp // c128p // -@source:c2color.cpp +@source:skeleton/c2color.cpp c2color -@source:c64.cpp +@source:cbm/c64.cpp c64 // c64_jp // Commodore 64 (Japan) c64_se // Commodore 64 (Sweden) @@ -9921,20 +9921,20 @@ sx64p // tesa6240 // vip64 // Commodore VIP64 (SX64, PAL, Swedish) -@source:c64dtv.cpp +@source:cbm/c64dtv.cpp c64dtv // Commodore 64 Direct-to-TV -@source:c65.cpp +@source:cbm/c65.cpp c64dx // 1991 C65 / C64DX (Prototype, German PAL) c65 // 1991 C65 / C64DX (Prototype, NTSC) -@source:c80.cpp +@source:ddr/c80.cpp c80 // -@source:c900.cpp +@source:cbm/c900.cpp c900 // -@source:cabal.cpp +@source:seibu/cabal.cpp cabal // (c) 1988 Tad + Fabtek license cabala // (c) 1988 Tad + Fabtek license cabalbl // bootleg @@ -9944,18 +9944,18 @@ cabalukj // (c) 1988 Tad + Electrocoin license cabalus // (c) 1988 Tad + Fabtek license cabalus2 // (c) 1988 Tad + Fabtek license -@source:cabaret.cpp +@source:igs/cabaret.cpp cabaret // (c) 1992 AMT -@source:calchase.cpp +@source:ibmpc/calchase.cpp calchase // (c) 1999 The Game Room eggsplc // (c) 2002 The Game Room hostinv // (c) 1998 The Game Room -@source:calcune.cpp +@source:sega/calcune.cpp calcune -@source:calomega.cpp +@source:misc/calomega.cpp cas21iwc // (c) 1990 UCMC / IWC comg074 // (c) 1981 Cal Omega Inc. comg076 // (c) 1981 Cal Omega Inc. @@ -10006,28 +10006,28 @@ ssipkr24 // (c) 1988 SSI ssipkr30 // (c) 1988 SSI ssipkr40 // (c) 1990 SSI -@source:calorie.cpp +@source:sega/calorie.cpp calorie // (c) 1986 Sega calorieb // (c) 1986 Sega (but bootleg) -@source:camplynx.cpp +@source:camputers/camplynx.cpp lynx128k // lynx48k // lynx96k // -@source:candela.cpp +@source:skeleton/candela.cpp can09t // can09 // -@source:canon_s80.cpp +@source:canon/canon_s80.cpp canons80 // canonts3 // -@source:canyon.cpp +@source:atari/canyon.cpp canyon // 009493-009504 1977/10 [6502] canyonp // 009493-009504 1977/10 [6502] -@source:capbowl.cpp +@source:itech/capbowl.cpp bowlrama // (c) 1991 P & P Marketing capbowl // (c) 1988 Incredible Technologies capbowl2 // (c) 1988 Incredible Technologies @@ -10035,7 +10035,7 @@ capbowl3 // (c) 1988 Incredible Technologies capbowl4 // (c) 1989 Incredible Technologies clbowl // (c) 1989 Incredible Technologies -@source:capcom.cpp +@source:pinball/capcom.cpp abv105 // abv106 // abv106r // @@ -10054,49 +10054,49 @@ pmv112 // pmv112r // pp100 // -@source:capr1.cpp +@source:taito/capr1.cpp cspin2 // -@source:caprcyc.cpp +@source:taito/caprcyc.cpp caprcyc // -@source:cardinal.cpp +@source:skeleton/cardinal.cpp cardinal // (c) 1984 Standard Microsystems Corp. -@source:cardline.cpp +@source:misc/cardline.cpp cardline // (c) 199? Veltmeijer -@source:carjmbre.cpp +@source:omori/carjmbre.cpp carjmbre // (c) 1983 Omori Electric Co., Ltd. -@source:carpolo.cpp +@source:exidy/carpolo.cpp carpolo // (c) 1977 -@source:carrera.cpp +@source:misc/carrera.cpp bsebman // (c) 19?? BS Electronics carrera // (c) 19?? BS Electronics -@source:casio_rompack.cpp +@source:casio/casio_rompack.cpp casiorom -@source:casloopy.cpp +@source:casio/casloopy.cpp casloopy // -@source:castle.cpp +@source:misc/castle.cpp castfpt // Fortune Pot castrev // Revolution -@source:caswin.cpp +@source:aristocr/caswin.cpp caswin // (c) 1985 rcasino // (c) 1984 Dyna Electronics (D-2608208A1-2) rcasino1 // (c) 1984 Dyna Electronics (D-2608208A1-1, Larger Board) rcasinoo // (c) 1984 Dyna Electronics (D-2608208A1-1, Smaller Board) rcasino2 // (c) 1984 Dyna Electronics -@source:cat.cpp +@source:canon/cat.cpp cat // -@source:cave.cpp +@source:misc/cave.cpp agallet // (c) 1996 Banpresto / Gazelle (country is in EEPROM) agalleth // (c) 1996 Banpresto / Gazelle (country is in EEPROM) agalletj // (c) 1996 Banpresto / Gazelle (country is in EEPROM) @@ -10165,20 +10165,20 @@ tjumpman // (c) 1999 Namco uopoko // (c) 1998 Cave + Jaleco license uopokoj // (c) 1998 Cave + Jaleco license -@source:cavepc.cpp +@source:misc/cavepc.cpp deathsm2 // -@source:cb2001.cpp +@source:misc/cb2001.cpp cb2001 // (c) 2001 Dyna Electronics scherrym // (c) 2001? Dyna Electronics -@source:cball.cpp +@source:atari/cball.cpp cball // ?????? prototype 1976/?? [6800] -@source:cbasebal.cpp +@source:capcom/cbasebal.cpp cbasebal // 10/1989 (c) 1989 Capcom (Japan) (different hardware) -@source:cbm2.cpp +@source:cbm/cbm2.cpp b128 // Commodore B128 b128hp // Commodore B128HP b256 // Commodore B256 @@ -10196,21 +10196,21 @@ cbm730 // p500 // Commodore P500 (proto, a.k.a. C128-40, PET-II) p500p // -@source:cbnt2039.cpp +@source:skeleton/cbnt2039.cpp cbnt2039 // -@source:cbuster.cpp +@source:dataeast/cbuster.cpp cbuster // MAB (c) 1990 Data East Corporation (World) cbusterj // MAB (c) 1990 Data East Corporation (Japan) cbusterw // MAB (c) 1990 Data East Corporation (World) twocrude // MAB (c) 1990 Data East USA (US) twocrudea // MAB (c) 1990 Data East USA (US) -@source:cc40.cpp +@source:ti/cc40.cpp cc40 // 1983 TI CC-40 cc40p // 1983 TI CC-40+ -@source:ccastles.cpp +@source:atari/ccastles.cpp ccastles // 136022 (c) 1983 ccastles1 // 136022 (c) 1983 ccastles2 // 136022 (c) 1983 @@ -10220,14 +10220,14 @@ ccastlesg // 136022 (c) 1983 ccastlesj // 136022 (c) 1983 ccastlesp // 136022 (c) 1983 -@source:cchance.cpp +@source:taito/cchance.cpp cchance // (c)1987 Taito? -@source:cchasm.cpp +@source:cinemat/cchasm.cpp cchasm // cchasm1 // (c) 1983 Cinematronics / GCE -@source:cclimber.cpp +@source:nichibut/cclimber.cpp bagmanf // bootleg on Falcon FCK-00 (Falcon Crazy Kong) PCB bigkong // bootleg cannonb // (c) 1985 Soft @@ -10267,21 +10267,21 @@ toprollr // (c) 1983 Jaleco yamato // (c) 1983 Sega yamato2 // (c) 1983 Sega -@source:ccs2810.cpp +@source:ccs/ccs2810.cpp ccs2422 // ccs2810 // ccs300 // -@source:cd100.cpp +@source:skeleton/cd100.cpp cd100b // -@source:cd2650.cpp +@source:skeleton/cd2650.cpp cd2650 // -@source:cdc721.cpp +@source:skeleton/cdc721.cpp cdc721 // -@source:cdi.cpp +@source:misc/cdi.cpp cdi490a // cdi910 // cdibios // Base unit @@ -10301,10 +10301,10 @@ quizard4_40 // (c) TAB Austria 1997 quizard4_41 // (c) TAB Austria 1998 quizard4cz // (c) TAB Austria 1998 -@source:cdsys5.cpp +@source:skeleton/cdsys5.cpp minijook // -@source:cedar_magnet.cpp +@source:efo/cedar_magnet.cpp cedmag mag_burn mag_day @@ -10316,7 +10316,7 @@ mag_war mag_wara mag_xain -@source:centiped.cpp +@source:atari/centiped.cpp bullsdrt // (c) 1985 Shinkai caterplr // (bootleg) centipdb // (bootleg) @@ -10336,37 +10336,37 @@ millpac // Valadon multiped // hack warlords // 037153-037159 (c) 1980 -@source:ceres.cpp +@source:ceres/ceres.cpp ceres1 // Eidgenössische Technische Hochschule Zürich Ceres-1 -@source:cesclass.cpp +@source:ces/cesclass.cpp ccclass // hrclass // tsclass // -@source:cfx9850.cpp +@source:casio/cfx9850.cpp cfx9850 // Casio CFX-9850 -@source:cgang.cpp +@source:namco/cgang.cpp cgang -@source:cgc7900.cpp +@source:chromatics/cgc7900.cpp cgc7900 // -@source:cgenie.cpp +@source:eaca/cgenie.cpp cgenie // Colour Genie EG2000 cgenienz // Colour Genie EG2000 (New Zealand) -@source:chaknpop.cpp +@source:taito/chaknpop.cpp chaknpop // AO4 (c) 1983 Taito Corporation -@source:cham24.cpp +@source:nintendo/cham24.cpp cham24 // 2002 -@source:chameleonrx1.cpp +@source:misc/chameleonrx1.cpp chamrx1 // 2003 -@source:champbas.cpp +@source:alpha/champbas.cpp champbas // (c) 1983 Sega champbasj // (c) 1983 Alpha Denshi Co. champbasja // (c) 1983 Alpha Denshi Co. @@ -10383,24 +10383,24 @@ exctsccrjo // (c) 1983 Alpha Denshi Co. exctsccru // (c) 1983 Alpha Denshi Co. talbot // Volt Electronics -@source:champbwl.cpp +@source:taito/champbwl.cpp champbwl // (c)1989 Romstar. not Taito, but the same Seta video chips doraemon // Sunsoft / Epoch / Fujiko - Shogakukan - TV Asahi (prototype) -@source:chanbara.cpp +@source:dataeast/chanbara.cpp chanbara // (c) 1985 Data East -@source:chance32.cpp +@source:misc/chance32.cpp chance32 // (c) 19?? PAL Company -@source:changela.cpp +@source:taito/changela.cpp changela // ??? (c) 1983 Taito Corporation -@source:changyu.cpp +@source:misc/changyu.cpp changyu changyu2 -@source:channelf.cpp +@source:fairch/channelf.cpp channelf // Fairchild Channel F VES - 1976 channlf2 // Fairchild Channel F II - 1978 ingtelma // Ingelen Tele-Match Processor (PAL) @@ -10410,34 +10410,34 @@ luxorves // Luxor Video Entertainment System (PAL) sabavdpl // SABA Videoplay - 1977 (PAL) sabavpl2 // SABA Videoplay 2 (PAL) -@source:chaos.cpp +@source:skeleton/chaos.cpp chaos // -@source:cheekyms.cpp +@source:univers/cheekyms.cpp cheekyms // 8004 (c) [1980?] -@source:chessmate.cpp +@source:cbm/chessmate.cpp ccmk2 // Chess Champion MK II ccmk2a // chmate // -@source:chessmst.cpp +@source:veb/chessmst.cpp chessmst chessmsta -@source:chessmstdm.cpp +@source:veb/chessmstdm.cpp chessmstdm -@source:chexx.cpp +@source:misc/chexx.cpp chexx83 // 1983 ICE faceoffh // 1983 SoftLogic / Entertainment Enterprises olihockey // 1985 Inor olihockeya // 1985 Inor -@source:chicago.cpp +@source:misc/chicago.cpp dmodrbcc // (c) 1976 Chicago Coin -@source:chihiro.cpp +@source:sega/chihiro.cpp ccfboxa // 2009.03.31 Firmware Update For Compact Flash Box (Rev A) chihiro // 2002.?? Chihiro BIOS cregchg // 2003.02 Chihiro Change Region USA @@ -10481,33 +10481,33 @@ gundcb83 // 2007.01 Mobile Suit Gundam 0083 Card Builder gundcb83a // 2007.01 Mobile Suit Gundam 0083 Card Builder Check Disk (CDV-10031) gundcb83b // 2008.08 Mobile Suit Gundam 0083 Card Builder Ver.2.10 (CDV-10037B) -@source:chinagat.cpp +@source:technos/chinagat.cpp chinagat // TA-0023 (c) 1988 Taito + Romstar license (US) saiyugou // TA-0023 (c) 1988 (Japan) saiyugoub1 // bootleg saiyugoub2 // bootleg -@source:chinsan.cpp +@source:sanritsu/chinsan.cpp chinsan // (c) 1987 Sanritsu mayumi // (c) 1988 Victory L.L.C., made by Sanritsu -@source:chqflag.cpp +@source:konami/chqflag.cpp chqflag // GX717 (c) 1988 chqflagj // GX717 (c) 1988 (Japan) -@source:chsuper.cpp +@source:misc/chsuper.cpp chsuper2 // 1999, unknown chsuper3 // 1999, unknown chmpnum // 1999, unknown chmpnuma // 1999, unknown -@source:cidelsa.cpp +@source:efo/cidelsa.cpp altair // (c) 1981 Cidelsa destryer // (c) 1981 Cidelsa destryera // (c) 1981 Cidelsa draco // (c) 1981 Cidelsa -@source:cinemat.cpp +@source:cinemat/cinemat.cpp armora // (c) 1980 armorap // (c) 1980 armorar // (c) 1980 Cinematronics (Rock-ola license) @@ -10534,7 +10534,7 @@ warrior // (c) 1979 Vectorbeam wotw // (c) 1981 wotwc // (c) 1981 -@source:circus.cpp +@source:exidy/circus.cpp circuso // no copyright notice [1977?] circus // no copyright notice [1977?] crash // Exidy [1979?] @@ -10544,7 +10544,7 @@ robotbwl // no copyright notice smash // bootleg springbd // Sub-Electro bootleg of Circus -@source:circusc.cpp +@source:konami/circusc.cpp circusc // GX380 (c) 1984 circusc2 // GX380 (c) 1984 circusc3 // GX380 (c) 1984 @@ -10552,15 +10552,15 @@ circusc4 // GX380 (c) 1984 circuscc // GX380 (c) 1984 + Centuri license circusce // GX380 (c) 1984 + Centuri license -@source:cirsa820xxx.cpp +@source:cirsa/cirsa820xxx.cpp unk820501 -@source:cirsa910510.cpp +@source:cirsa/cirsa910510.cpp minimony minimonya minimonyb -@source:cischeat.cpp +@source:jaleco/cischeat.cpp armchmp2 // (c) 1992 Jaleco armchmp2o // (c) 1992 Jaleco armchmp2o2 // (c) 1992 Jaleco @@ -10575,45 +10575,45 @@ f1gpstr2 // (c) 1993 Jaleco scudhamm // (c) 1994 Jaleco wildplt // (c) 1992 Jaleco -@source:cit101.cpp +@source:citoh/cit101.cpp cit101 // (c) 1980 C. Itoh cit101e // (c) 1983 C. Itoh -@source:cit101xl.cpp +@source:citoh/cit101xl.cpp cit101xl // -@source:cit220.cpp +@source:citoh/cit220.cpp cit220p // (c) 1984 C. Itoh vp122 // -@source:cit1500.cpp +@source:skeleton/cit1500.cpp teletup // trmavia // -@source:citycon.cpp +@source:jaleco/citycon.cpp citycon // (c) 1985 Jaleco citycona // (c) 1985 Jaleco cruisin // (c) 1985 Jaleco/Kitkorp -@source:cking_master.cpp +@source:chessking/cking_master.cpp ckmaster // -@source:clayshoo.cpp +@source:alliedl/clayshoo.cpp clayshoo // [1979 Allied Leisure] -@source:clcd.cpp +@source:cbm/clcd.cpp clcd // Commodore LCD -@source:clickstart.cpp +@source:vtech/clickstart.cpp clikstrt // (c) 2007 LeapFrog Enterprises -@source:cliffhgr.cpp +@source:stern/cliffhgr.cpp cliffhgr // (c) 1983 cliffhgra // (c) 1983 cliffhgra2 // (c) 1983 goaltogo // (c) 1983 -@source:cloak.cpp +@source:atari/cloak.cpp agentx1 // 136023 (c) 1983 agentx2 // 136023 (c) 1983 agentx3 // 136023 (c) 1983 @@ -10623,39 +10623,39 @@ cloakfr // 136023 (c) 1983 cloakgr // 136023 (c) 1983 cloaksp // 136023 (c) 1983 -@source:cloud9.cpp +@source:atari/cloud9.cpp cloud9 // (proto) (c) 1983 firebeas // (proto) (c) 1983 -@source:clowndwn.cpp +@source:misc/clowndwn.cpp clowndwn // Elwood Clown Roll Down -@source:clpoker.cpp +@source:misc/clpoker.cpp clpoker // Chain Leisure -@source:clshroad.cpp +@source:nichibut/clshroad.cpp clshroad // (c) 1986 Wood Place Inc. clshroadd // (c) 1986 Wood Place Inc. (Data East license) clshroads // (c) 1986 Wood Place Inc. (Status Games license) firebatl // (c) 1984 Taito -@source:clxvme186.cpp +@source:skeleton/clxvme186.cpp clxvme186 // -@source:cm1800.cpp +@source:cccp/cm1800.cpp cm1800 // -@source:cmi.cpp +@source:fairlight/cmi.cpp cmi2x // Fairlight CMI IIx -@source:cmmb.cpp +@source:atari/cmmb.cpp cmmb162 // cmmb103 -@source:cms.cpp +@source:acorn/cms.cpp cms6502 // CMS 6502 Development System -@source:cninja.cpp +@source:dataeast/cninja.cpp cninja // MAG (c) 1991 Data East Corporation (World) cninja1 // MAG (c) 1991 Data East Corporation (World) cninjabl // bootleg @@ -10677,17 +10677,17 @@ robocop2u // MAH (c) 1991 Data East Corporation (US) robocop2ua // MAH (c) 1991 Data East Corporation (US) stoneage // bootleg -@source:cntsteer.cpp +@source:dataeast/cntsteer.cpp cntsteer // (c) 1985 Data East Corporation gekitsui // (c) 1985 Data East Corporation (Japan) zerotrgt // (c) 1985 Data East Corporation zerotrgta // (c) 1985 Data East Corporation -@source:cobra.cpp +@source:konami/cobra.cpp bujutsu // G?645 (c)1997 racjamdx // G?676 (c)1997 Japan JAA -@source:coco12.cpp +@source:trs/coco12.cpp cd6809 // Codimex CD-6809 coco // Color Computer coco2 // Color Computer 2 @@ -10705,22 +10705,22 @@ mx1600 // Dynacom MX-1600 t4426 // Terco 4426 CNC programming station trsvidtx // TRS-80 Videotex -@source:coco3.cpp +@source:trs/coco3.cpp coco3 // Color Computer 3 (NTSC) coco3dw1 // Coco 3 with HDB-DOS coco3h // Hacked Color Computer 3 (6309) coco3p // Color Computer 3 (PAL) msm3 // ILCE / SEP Micro-SEP Model 3 -@source:cocoloco.cpp +@source:misc/cocoloco.cpp cocoloco // 198?, Petaco S.A. cocolocoa // 198?, Recel S.A. cocolocob // 198?, Petaco S.A. -@source:codata.cpp +@source:skeleton/codata.cpp codata // -@source:coinmstr.cpp +@source:misc/coinmstr.cpp jpcoin // (c) 19?? Coinmaster jpcoin2 // (c) 19?? Coinmaster pokeroul // (c) 1990 Coinmaster @@ -10728,17 +10728,17 @@ quizmstr // (c) 1985 Coinmaster supnudg2 // (c) 1989 Coinmaster trailblz // (c) 1987 Coinmaster -@source:coinmvga.cpp +@source:misc/coinmvga.cpp cmkenosp // (c) 2000 Coinmaster-Gaming, Ltd. cmkenospa // (c) 2000 Coinmaster-Gaming, Ltd. cmrltv75 // (c) 2001 Coinmaster-Gaming, Ltd. colorama // (c) 2000 Coinmaster-Gaming, Ltd. coloramas // (c) 2000 Coinmaster-Gaming, Ltd. -@source:cointek.cpp +@source:misc/cointek.cpp unkct // -@source:coleco.cpp +@source:coleco/coleco.cpp coleco // ColecoVision (Original BIOS) colecop // Colecovision PAL (Italy) czz50 // Bit Corporation Chuang Zao Zhe 50 @@ -10747,7 +10747,7 @@ onyx // Microdigital ONYX (Brazilian Coleco clone / u prsarcde // Telegames Personal Arcade bit90 // Bit Corporation Bit90 -@source:combatsc.cpp +@source:konami/combatsc.cpp bootcamp // GX611 (c) 1987 bootcampa // GX611 (c) 1987 combatsc // GX611 (c) 1988 @@ -10755,10 +10755,10 @@ combatscb // bootleg combatscj // GX611 (c) 1987 (Japan) combatsct // GX611 (c) 1987 -@source:comebaby.cpp +@source:misc/comebaby.cpp comebaby // (c) 2000 ExPotato -@source:commando.cpp +@source:capcom/commando.cpp commando // 5/1985 (c) 1985 (World) commandob // bootleg commandob2 // bootleg @@ -10770,61 +10770,61 @@ mercenario // bootleg sinvasn // Europe original? sinvasnb // bootleg -@source:compc.cpp +@source:pc/compc.cpp compc10 // 1984 Commodore PC-10, PC-20 and PC-30 pc10iii // 1987 Commodore PC-10 III compc1 // 1984 Commodore PC-1 -@source:compgolf.cpp +@source:dataeast/compgolf.cpp compgolf // (c) 1985 Data East Corporation (Japan) compgolfo // (c) 1985 Data East Corporation (Japan) -@source:compis.cpp +@source:telenova/compis.cpp compis // 1985 Telenova Compis compis2 // 1985 Telenova Compis -@source:compuchess.cpp +@source:dcs/compuchess.cpp ccmk1 // Chess Champion MK I cmpchess cmpchess2 cncchess -@source:compmahj.cpp +@source:nintendo/compmahj.cpp compmahj // 1983 Nintendo Computer Mah-jong Yakuman -@source:compucolor.cpp +@source:isc/compucolor.cpp compclr2 // -@source:compucranes.cpp +@source:misc/compucranes.cpp mastcrane // (c) 199? Compumatic mastcranea // (c) 199? Compumatic -@source:comquest.cpp +@source:teamconc/comquest.cpp comquest // Comquest Plus German -@source:comx35.cpp +@source:comx/comx35.cpp comx35n // comx35p // -@source:conchess.cpp +@source:consumenta/conchess.cpp concply5 concply8 concplyv concstd -@source:concept.cpp +@source:concept/concept.cpp concept // 1982 Corvus Concept -@source:conic_cchess2.cpp +@source:conic/conic_cchess2.cpp cncchess2 -@source:conic_cchess3.cpp +@source:conic/conic_cchess3.cpp cncchess3 -@source:consola_emt.cpp +@source:skeleton/consola_emt.cpp consoemt // -@source:contra.cpp +@source:konami/contra.cpp contra // GX633 (c) 1987 contra1 // GX633 (c) 1987 contrab // bootleg @@ -10836,7 +10836,7 @@ contraj1 // GX633 (c) 1987 (Japan) gryzor // GX633 (c) 1987 gryzor1 // GX633 (c) 1987 -@source:coolpool.cpp +@source:misc/coolpool.cpp 9ballsht // (c) 1993 E-Scape EnterMedia + "marketed by Bundra Games" 9ballsht2 // (c) 1993 E-Scape EnterMedia + "marketed by Bundra Games" 9ballsht3 // (c) 1993 E-Scape EnterMedia + "marketed by Bundra Games" @@ -10846,24 +10846,24 @@ amerdart2 // (c) 1989 Ameri Corporation amerdart3 // (c) 1989 Ameri Corporation coolpool // (c) 1992 Catalina Games -@source:coolridr.cpp +@source:sega/coolridr.cpp aquastge // coolridr // 1995.04 Cool Riders -@source:cop01.cpp +@source:nichibut/cop01.cpp cop01 // (c) 1985 cop01a // (c) 1985 mightguy // (c) 1986 -@source:cops.cpp +@source:atari/cops.cpp cops // (c) 1994 copsuk // (c) 1994 (Nova/Deith Leisure) revlatns // (c) 199? -@source:copsnrob.cpp +@source:atari/copsnrob.cpp copsnrob // 005625 1976/07 [6502] -@source:corona.cpp +@source:misc/corona.cpp legrandc // (c) 198? Isermatic France S.A. luckyrlt // (c) 1990 unknown rcirulet // (c) 199? Entretenimientos GEMINIS @@ -10874,10 +10874,10 @@ winner81 // (c) 1981 Corona Co, Ltd. winner81b // (c) 1981 Corona Co, Ltd. winner82 // (c) 1982 Corona Co, Ltd. -@source:cortex.cpp +@source:skeleton/cortex.cpp cortex // -@source:cosmic.cpp +@source:univers/cosmic.cpp cosmica // 7910-AII (c) [1979] cosmica1 // 7910-A (c) [1979] cosmica22 // 7910-AII (c) [1979] @@ -10895,26 +10895,26 @@ panic3 // 8015 (c) 1980 panicger // 8015 (c) 1980 panich // 8015 (c) 1980 -@source:cosmicg.cpp +@source:univers/cosmicg.cpp cosmicg // 7907 (c) 1979 cosmicgi // bootleg (Inder) -@source:cosmicos.cpp +@source:skeleton/cosmicos.cpp cosmicos // -@source:cosmos_playc8f.cpp +@source:misc/cosmos_playc8f.cpp bgbasketb // (c) 2013 Benchmark Games bgbasketbb // (c) 2004 Benchmark Games tenstrikc // (c) 2003 Benchmark Games -@source:cowtipping.cpp +@source:misc/cowtipping.cpp cowtipp // cowtippa // -@source:cp1.cpp +@source:skeleton/cp1.cpp cp1 // -@source:cps1.cpp +@source:capcom/cps1.cpp 1941 // 27/02/1990 (c) 1990 (World) 1941j // 2/1990 (c) 1990 (Japan) 1941r1 // 2/1990 (c) 1990 (World) @@ -11139,7 +11139,7 @@ wofr1 // 02/10/1992 (c) 1992 (World) (CPS1 + QSound) wofu // 31/10/1992 (c) 1992 (USA) (CPS1 + QSound) wonder3 // 20/05/1991 (c) 1991 (Japan) -@source:cps1bl_5205.cpp +@source:capcom/cps1bl_5205.cpp captcommb2 // bootleg knightsb // bootleg knightsb3 // bootleg @@ -11154,7 +11154,7 @@ sf2mdt // bootleg sf2mdta // bootleg sf2mdtb // bootleg -@source:cps1bl_pic.cpp +@source:capcom/cps1bl_pic.cpp dinopic // bootleg dinopic2 // bootleg dinopic3 // bootleg @@ -11166,7 +11166,7 @@ slampic // bootleg slampic2 // bootleg wofpic // bootleg -@source:cps2.cpp +@source:capcom/cps2.cpp 1944 // 20/06/2000 (c) 2000 Eighting/Raizing (Euro) 1944d // 1944j // 20/06/2000 (c) 2000 Eighting/Raizing (Japan) @@ -11486,7 +11486,7 @@ xmvsfu1d // xmvsfur1 // 04/10/1996 (c) 1996 (USA) xmvsfur2 // 10/09/1996 (c) 1996 (USA) -@source:cps3.cpp +@source:capcom/cps3.cpp cps3boot // bootleg cps3boota // bootleg cps3bootao // bootleg @@ -11542,21 +11542,21 @@ sfiiiu // 04/02/1997 (c) 1997 (USA) warzard // 21/11/1996 (c) 1996 (Japan) warzardr1 // 23/10/1996 (c) 1996 (Japan) -@source:cpzodiac.cpp +@source:taito/cpzodiac.cpp cpzodiac // cpzodiacj // -@source:crazybal.cpp +@source:misc/crazybal.cpp crazybal // EGS -@source:crbaloon.cpp +@source:taito/crbaloon.cpp crbaloon // CL (c) 1980 Taito Corporation crbaloon2 // CL (c) 1980 Taito Corporation -@source:crei680.cpp +@source:trainer/crei680.cpp crei680 -@source:crgolf.cpp +@source:nasco/crgolf.cpp crgolf // (c) 1984 Nasco Japan crgolfa // (c) 1984 Nasco Japan crgolfb // (c) 1984 Nasco Japan @@ -11565,33 +11565,33 @@ crgolfc // (c) 1984 Nasco Japan crgolfhi // (c) 1984 Nasco Japan mastrglf -@source:crimfght.cpp +@source:konami/crimfght.cpp crimfght // GX821 (c) 1989 (World) crimfghtu // GX821 (c) 1989 (US) crimfghtj // GX821 (c) 1989 (Japan) -@source:crimson.cpp +@source:sgi/crimson.cpp crimson // (c) 1992 SGI -@source:cromptons.cpp +@source:misc/cromptons.cpp ffruits // -@source:crospang.cpp +@source:f32/crospang.cpp bestri // (c) F2 System bestria // crospang // (c) 1998 F2 System heuksun // (c) 1998 Oksan / F2 System pitapat -@source:crospuzl.cpp +@source:misc/crospuzl.cpp crospuzl // -@source:crshrace.cpp +@source:vsystem/crshrace.cpp crshrace // (c) 1993 Video System Co. crshrace2 // (c) 1993 Video System Co. crshrace2a // (c) 1993 Video System Co. -@source:crvision.cpp +@source:vtech/crvision.cpp crvisio2 // crvisioj // crvision // 1981 creatiVision @@ -11602,7 +11602,7 @@ rameses // vz2000 // wizzard // -@source:crystal.cpp +@source:misc/crystal.cpp crysbios // crysking // 2001 Brezzasoft donghaer // 2001 Danbi @@ -11613,12 +11613,12 @@ topbladv // 2002 Sonokong urachamu // 2002 GamToU wulybuly // -@source:airraid.cpp +@source:seibu/airraid.cpp airraid // (c) 1987 Seibu Kaihatsu cshooter // (c) 1987 JKH (bootleg) failgate // (c) 1991 Seibu Kaihatsu -@source:csplayh5.cpp +@source:nichibut/csplayh5.cpp aimode // (c) 1999 bikiniko // (c) 1999 csplayh1 // (c) 1995 @@ -11642,23 +11642,23 @@ thenanpa // (c) 1999 torarech // (c) 2000 tsuwaku // (c) 2000 -@source:cswat.cpp +@source:namco/cswat.cpp cswat // (c) 1984 -@source:ct486.cpp +@source:at/ct486.cpp ct486 // 1993? 486 with CS4031 -@source:ctk551.cpp +@source:casio/ctk551.cpp ctk551 // -@source:ctk2000.cpp +@source:casio/ctk2000.cpp ctk2100 // -@source:cubeqst.cpp +@source:misc/cubeqst.cpp cubeqst // (c) 1983 Simutrek Inc. cubeqsta // (c) 1983 Simutrek Inc. -@source:cubo.cpp +@source:amiga/cubo.cpp cndypuzl // (c) 1995 cubo // Base unit eldoralg // @@ -11672,14 +11672,14 @@ mgprem11 // (c) 1995 odeontw // odeontw2 // (c) 1999 -@source:cucaracha.cpp +@source:taito/cucaracha.cpp cucaracha // (c) 1992 Taito cucaracha2 // (c) 1992 Taito -@source:cultures.cpp +@source:nmk/cultures.cpp cultures // (c) 1994 Face -@source:cupidon.cpp +@source:misc/cupidon.cpp cashtrn // funnyfm // funnyfma // @@ -11688,7 +11688,7 @@ gangrose // tsarevna // tsarevnaa // -@source:cv1k.cpp +@source:misc/cv1k.cpp ddpdfk // (c) 2008 Cave (AMI license) - 2008/06/23 MASTER VER 1.5 ddpdfk10 // (c) 2008 Cave (AMI license) - 2008/05/16 MASTER VER deathsml // (c) 2007 Cave (AMI license) - 2007/10/09 MASTER VER @@ -11717,10 +11717,10 @@ pinkswtsb // (c) 2006 Cave (AMI license) - 2006/04/06 MAST pinkswtsx // (c) 2006 Cave (AMI license) - 2006/xx/xx MASTER VER. pinkswtssc // bootleg -@source:cvicny.cpp +@source:trainer/cvicny.cpp cvicny // -@source:cvs.cpp +@source:cvs/cvs.cpp 8ball // (c) 1982 Century 8ball1 // (c) 1982 Century cosmos // (c) 1981 Century @@ -11745,27 +11745,27 @@ spacefrt // (c) 1981 Century superbik // (c) 1983 Century wallst // (c) 1982 Century -@source:cwheel.cpp +@source:misc/cwheel.cpp cwheel // (c) 19?? Gamebar -@source:cxg_ch2001.cpp +@source:cxg/cxg_ch2001.cpp ch2001 -@source:cxg_dominator.cpp +@source:cxg/cxg_dominator.cpp scmder sdtor -@source:cxg_scptchess.cpp +@source:cxg/cxg_scptchess.cpp prtchess scptchess -@source:cxg_sphinx40.cpp +@source:cxg/cxg_sphinx40.cpp sphinx40 -@source:cxhumax.cpp +@source:skeleton/cxhumax.cpp hxhdci2k // -@source:cyberbal.cpp +@source:atari/cyberbal.cpp cyberbal // 136064 (c) 1989 cyberbal1 // 136064 (c) 1989 cyberbal2 // 136064 (c) 1989 @@ -11777,91 +11777,91 @@ cyberbalp // 136064 (c) 1989 cyberbalt // 136073 (c) 1989 cyberbalt1 // 136073 (c) 1989 -@source:cybertnk.cpp +@source:misc/cybertnk.cpp cybertnk // (c) 1990 Coreland -@source:cybiko.cpp +@source:cybiko/cybiko.cpp cybikov1 // Cybiko Wireless Intertainment System - Classic V1 cybikov2 // Cybiko Wireless Intertainment System - Classic V2 cybikoxt // Cybiko Wireless Intertainment System - Xtreme -@source:cybstorm.cpp +@source:atari/cybstorm.cpp cybstorm // (proto) (c) 1993 -@source:cyclemb.cpp +@source:taito/cyclemb.cpp cyclemb // P0 (c) 1984 Taito Corporation [+ Seta] skydest // PD0 (c) 1985 Taito Corporation -@source:cz101.cpp +@source:casio/cz101.cpp cz101 // 1984 Casio -@source:ckz80.cpp +@source:skeleton/ckz80.cpp ckz80 // -@source:d400.cpp +@source:skeleton/d400.cpp d461 // -@source:d6800.cpp +@source:skeleton/d6800.cpp d6800 // Dream 6800 -@source:d6809.cpp +@source:skeleton/d6809.cpp d6809 // -@source:d9final.cpp +@source:excelent/d9final.cpp d9final // (c) 1992 Excellent System rpanic // (c) 1992 Excellent System / Jaleco -@source:dacholer.cpp +@source:nichibut/dacholer.cpp dacholer // (c) 1983 itaten // (c) 1984 + Alice kickboy // (c) 1983 -@source:dai.cpp +@source:dai/dai.cpp dai // DAI -@source:dai3wksi.cpp +@source:sunelect/dai3wksi.cpp dai3wksi // 1979.09 Dai San Wakusei (The Third Planet) runaways // 1979.06 Run Away warp1 // 1979.12 Warp-1 warp1t // 1979.12 Warp-1 (Taito license) warp1bl // bootleg -@source:dambustr.cpp +@source:galaxian/dambustr.cpp dambustr // (c) 1981 South West Research dambustra // (c) 1981 South West Research dambustruk // (c) 1981 South West Research -@source:dangbar.cpp +@source:namco/dangbar.cpp bellybmbr // dangbar // sspanic // -@source:darius.cpp +@source:taito/darius.cpp darius // A96 (c) 1986 Taito Corporation Japan (World) dariuse // A96 (c) 1986 Taito Corporation (Japan) dariusj // A96 (c) 1986 Taito Corporation (Japan) dariuso // A96 (c) 1986 Taito Corporation (Japan) dariusu // A96 (c) 1986 Taito America Corporation (US) -@source:darkmist.cpp +@source:seibu/darkmist.cpp darkmist // (c) 1986 Taito -@source:darkseal.cpp +@source:dataeast/darkseal.cpp darkseal // MAC (c) 1990 Data East Corporation (World) darkseal1 // MAC (c) 1990 Data East Corporation (World) darksealj // MAC (c) 1990 Data East Corporation (Japan) gatedoom // MAC (c) 1990 Data East Corporation (US) gatedoom1 // MAC (c) 1990 Data East Corporation (US) -@source:daruma.cpp +@source:skeleton/daruma.cpp ds348 // Sigtron Daruma -@source:daryde.cpp +@source:misc/daryde.cpp cricket // (c) 1995 Daryde S.L. pandart // (c) 1999 Daryde S.L. kurdart // (c) 199? K7 Kursaal -@source:dassault.cpp +@source:dataeast/dassault.cpp dassault // MAJ (c) 1991 Data East Corporation (US) dassault4 // MAJ (c) 1991 Data East Corporation (US) - 4 Player only thndzone // MAJ (c) 1991 Data East Corporation (World) - Rev 1 @@ -11869,30 +11869,30 @@ thndzone4 // MAJ (c) 1991 Data East Corporation (World) - thndzonea // MAJ (c) 1991 Data East Corporation (World) thndzonej // MAJ (c) 1991 Data East Corporation (Japan) - Some MASK ROMS stamped MAL -@source:datacast.cpp +@source:skeleton/datacast.cpp datacast // -@source:datum.cpp +@source:trainer/datum.cpp datum // 1982 -@source:dblcrown.cpp +@source:excelent/dblcrown.cpp dblcrown // (c) 1994 Excellent System -@source:dblewing.cpp +@source:dataeast/dblewing.cpp dblewing // MBE (c) 1993 Mitchell dblewinga // MBE (c) 1993 Mitchell dblewingb // MBE (c) 1994 Mitchell -@source:dbox.cpp +@source:nokia/dbox.cpp dbox // (c) 1996 Nokia Multimedia -@source:dbz.cpp +@source:konami/dbz.cpp dbz // (c) 1993 Banpresto dbz2 // (c) 1994 Banpresto dbz2bl // bootleg dbza // (c) 1993 Banpresto -@source:dc_atomiswave.cpp +@source:sega/dc_atomiswave.cpp anmlbskt // 2005.01 Animal Basket (date is inside of ROM, probably earlier than release) anmlbskta // 2005.01 Animal Basket (date is inside of ROM, probably earlier than release) awbios // 2002.?? Atomiswave BIOS @@ -11929,7 +11929,7 @@ waidrive // 2005.01 WaiWai Drive xtrmhnt2 // 2006.09 Extreme Hunting 2 Tournament Edition xtrmhunt // 2004.09 Extreme Hunting -@source:dccons.cpp +@source:segacons/dccons.cpp dc // 1999 Sega Dreamcast (USA) dcdev // 1998 Sega HKT-0120 Sega Dreamcast Development Box dceu // 1999 Sega Dreamcast (Europe) @@ -11937,10 +11937,10 @@ dcjp // 1998 Sega Dreamcast (Japan) dcfish // 2000 Fish Life dctream // 200? Treamcast -@source:dcebridge.cpp +@source:homebrew/dcebridge.cpp dcebridge // generic -@source:dcheese.cpp +@source:misc/dcheese.cpp cecmatch // (c) 1993 Coastal Amusements dcheese // (c) 1993 HAR fredmem // (c) 1994 Coastal Amusements @@ -11951,25 +11951,25 @@ fredmemus // (c) 1994 Coastal Amusements fredmesp // (c) 1994 Coastal Amusements lottof2 // (c) 1993 HAR -@source:dcon.cpp +@source:seibu/dcon.cpp dcon // (c) 1992 Success. sdgndmps // (c) Banpresto / Bandai (Japan) -@source:dct11em.cpp +@source:dec/dct11em.cpp dct11em // -@source:dday.cpp +@source:olympia/dday.cpp dday // (c) 1982 Olympia ddayc // (c) 1982 Olympia + Centuri license -@source:ddayjlc.cpp +@source:jaleco/ddayjlc.cpp ddayjlc // (c) 1984 Jaleco ddayjlca // (c) 1984 Jaleco -@source:ddealer.cpp +@source:nmk/ddealer.cpp ddealer // (c) 1991 NMK -@source:ddenlovr.cpp +@source:dynax/ddenlovr.cpp akamaru // "501" (c) 1996 Dynax animaljr // "75" (c) 1993 Nakanihon/Taito (USA) animaljrj // "75" (c) 1993 Nakanihon/Taito (Japan) @@ -12020,7 +12020,7 @@ sryudens // "502" (c) 1996 Dynax / Face ultrchmp // "104" (c) 1995 Nakanihon ultrchmph // "114" (c) 1995 Nakanihon -@source:ddragon.cpp +@source:technos/ddragon.cpp darktowr // Game Room ddragon // TA-0021 (c) 1987 ddragon2 // TA-0026 (c) 1988 (World) @@ -12045,7 +12045,7 @@ toffy // (c) 1993 Midas tstrike // East Coast Coin Company (Melbourne) tstrikea // Game Room -@source:ddragon3.cpp +@source:technos/ddragon3.cpp ctribe // TA-0028 (c) 1990 (US) ctribeb // bootleg ctribeb2 // bootleg @@ -12063,16 +12063,16 @@ wwfwfestu // TA-0031 (c) 1991 (US) wwfwfestu1 // TA-0031 (c) 1991 (US) wwfwfestub // bootleg -@source:ddribble.cpp +@source:konami/ddribble.cpp ddribble // GX690 (c) 1986 ddribblep // GX690 (c) 1986 -@source:ddz.cpp +@source:misc/ddz.cpp btlfront // 2005 TJF crzclass // 200? TJF ddz // 200? -@source:de_2.cpp +@source:pinball/de_2.cpp bttf_a20 // bttf_a21 // bttf_a27 // @@ -12102,7 +12102,7 @@ tmac_g18 // torp_a16 // torp_e21 // -@source:de_3.cpp +@source:pinball/de_3.cpp aar_101 // batmanf // batmanf1 // @@ -12206,7 +12206,7 @@ wwfr_103 // wwfr_103f // wwfr_106 // -@source:deadang.cpp +@source:seibu/deadang.cpp deadang // (c) 1988 Seibu Kaihatsu ghunter // (c) 1988 Seibu Kaihatsu ghunters // (c) 1988 Seibu Kaihatsu + Segasa/Sonic license @@ -12214,10 +12214,10 @@ leadang // (c) 1988 Seibu Kaihatsu popnrun // (c) 1987 Seibu Kaihatsu + Yukai Tsukai popnruna // (c) 1987 Seibu Kaihatsu + Yukai Tsukai -@source:debut.cpp +@source:cccp/debut.cpp debutm -@source:dec0.cpp +@source:dataeast/dec0.cpp automat // bootleg baddudes // EI (c) 1988 Data East USA (US) bandit // (c) 1989 Data East USA (US) @@ -12256,7 +12256,7 @@ slyspy // FA (c) 1989 Data East USA (US) slyspy2 // FA (c) 1989 Data East USA (US) slyspy3 // FA (c) 1989 Data East USA (US) -@source:dec8.cpp +@source:dataeast/dec8.cpp breywood // (c) 1986 Data East Corporation (Japan) cobracom // (c) 1988 Data East Corporation (World/US) cobracoma // (c) 1988 Data East Corporation (World/US) @@ -12288,18 +12288,18 @@ shackled // (c) 1986 Data East USA (US) srdarwin // (c) 1987 Data East Corporation (World) srdarwinj // (c) 1987 Data East Corporation (Japan) -@source:decmate2.cpp +@source:dec/decmate2.cpp decmate2 // decmate3 // -@source:deco_ld.cpp +@source:dataeast/deco_ld.cpp begas // (c) 1983 begas1 // (c) 1983 cobra // (c) 1984 cobraa // rblaster // (c) 1985 -@source:deco_mlc.cpp +@source:dataeast/deco_mlc.cpp acchi // ??? (c) 1996 Data East Corporation (Japan) avengrgs // MCG (c) 1995 Data East Corporation (World) avengrgsj // MCG (c) 1995 Data East Corporation (Japan) @@ -12314,7 +12314,7 @@ stadhr96j // MCM (c) 1996 Data East Corporation (Japan) stadhr96j2 // MCM (c) 1996 Data East Corporation (Japan) stadhr96u // MCM (c) 1996 Data East Corporation (USA) -@source:deco156.cpp +@source:dataeast/deco156.cpp hvysmsh // MBG (c) 1993 Data East Corporation (World) hvysmsha // MBG (c) 1993 Data East Corporation (Asia) hvysmshj // MBG (c) 1993 Data East Corporation (Japan) @@ -12322,7 +12322,7 @@ wcvol95 // MBX (c) 1993 Data East wcvol95j // MBX (c) 1993 Data East wcvol95x // ? -@source:deco32.cpp +@source:dataeast/deco32.cpp captaven // MAN (c) 1991 Data East Corporation (Asia) captavena // MAN (c) 1991 Data East Corporation (Asia) captavene // MAN (c) 1991 Data East Corporation (UK) @@ -12352,7 +12352,7 @@ nslasheru // MBH (c) 1993 Data East Corporation (US) tattass // prototype (c) 1994 Data East Pinball (US) tattassa // prototype (c) 1994 Data East Pinball (Asia) -@source:decocass.cpp +@source:dataeast/decocass.cpp cadanglr // 25 1982.10 Angler Dangler castfant // 07 1981.02 Astro Fantasia cbdash // 44 1985.08 Boulder Dash @@ -12412,49 +12412,49 @@ czeroize // 37 1983.10 Zeroize decocass // decomult // -@source:decstation.cpp +@source:dec/decstation.cpp ds2100 // 1989 Digital Equipment Corporation (DECstation 2100) ds3100 // 1989 Digital Equipment Corporation (DECstation 3100) ds5k133 // 1993 Digital Equipment Corporation (DECstation 5000/133) -@source:dectalk.cpp +@source:dec/dectalk.cpp dectalk // 1983 Digital Equipment Corporation -@source:decwritr.cpp +@source:dec/decwritr.cpp la120 // 1978 Digital Equipment Corporation -@source:deniam.cpp +@source:sega/deniam.cpp croquis // (c) 1996 Deniam (Korea) croquisg // (c) 1996 Deniam (Germany) karianx // (c) 1996 Deniam logicpr2 // (c) 1997 Deniam (Japan) logicpro // (c) 1996 Deniam -@source:design.cpp +@source:skeleton/design.cpp design6 // (c) Azkoyen designe // (c) Azkoyen -@source:deshoros.cpp +@source:dataeast/deshoros.cpp destiny // (c) 1983 -@source:destroyr.cpp +@source:atari/destroyr.cpp destroyr // 030131-030136 1977/10 [6800] destroyr1 // 030131-030136 1977/10 [6800] -@source:dfruit.cpp +@source:misc/dfruit.cpp dfruit // gemcrush -@source:dfs500.cpp +@source:sony/dfs500.cpp dfs500 // 1994 Sony DFS-500 Video Mixer -@source:dg680.cpp +@source:skeleton/dg680.cpp dg680 // -@source:dgn_beta.cpp +@source:trs/dgn_beta.cpp dgnbeta // Dragon Beta -@source:dgpix.cpp +@source:misc/dgpix.cpp elfin // (c) 1999 dgPIX Entertainment Inc fmaniac3 // (c) 2002 Saero Entertainment jumpjump // (c) 1999 dgPIX Entertainment Inc @@ -12462,63 +12462,63 @@ kdynastg // (c) 1999 EZ Graphics xfiles // (c) 1999 dgPIX Entertainment Inc xfilesk // (c) 1999 dgPIX Entertainment Inc (censored for the Korean market) -@source:diablo1300.cpp +@source:skeleton/diablo1300.cpp diablo // -@source:diamondking.cpp +@source:misc/diamondking.cpp diamondking // (c) 1997 SegaSA / Sonic diamondkinp // (c) 1997 SegaSA / Sonic -@source:didact.cpp +@source:skeleton/didact.cpp md6802 // mp68a // modulab // -@source:dietgo.cpp +@source:dataeast/dietgo.cpp dietgo // MAY (c) 1993 dietgoe // MAY (c) 1993 dietgoea // MAY (c) 1993 dietgoj // MAY (c) 1993 dietgou // MAY (c) 1993 -@source:digel804.cpp +@source:skeleton/digel804.cpp digel804 // ep804 // -@source:digilog320.cpp +@source:skeleton/digilog320.cpp digilog320 // -@source:digilog400.cpp +@source:skeleton/digilog400.cpp digilog400 // -@source:digijet.cpp +@source:skeleton/digijet.cpp digijet // -@source:dim68k.cpp +@source:skeleton/dim68k.cpp dim68k // -@source:dinoking.cpp +@source:taito/dinoking.cpp dkbattle // dkkids // -@source:discoboy.cpp +@source:misc/discoboy.cpp discoboy // (c) 1993 Soft Art Co. discoboyp // (c) 1993 Soft Art Co. (Promat license?) -@source:divebomb.cpp +@source:konami/divebomb.cpp divebomb // GX840 (c) 1989 (Japan) -@source:diverboy.cpp +@source:edevices/diverboy.cpp diverboy // (c) 1992 Electronic Devices -@source:djboy.cpp +@source:kaneko/djboy.cpp djboy // (c) 1989 Kaneko (World) djboyj // (c) 1989 Kaneko (Japan, Sega license) djboyja // (c) 1989 Kaneko (Japan, Sega license) djboyu // (c) 1990 Kaneko (USA, American Sammy license) djboyua // (c) 1990 Kaneko (USA, American Sammy license) -@source:djmain.cpp +@source:konami/djmain.cpp bm1stmix // GQ753 (c) 1997 (Japan) bm2ndmix // GX853 (c) 1998 (Japan) bm2ndmxa // GX853 (c) 1998 (Japan) @@ -12546,10 +12546,10 @@ popn2 // GX831 (c) 1998 (Japan) popn3 // GX980 (c) 1999 (Japan) popnstex // GQ970 (c) 1999 (Japan) -@source:dkmb.cpp +@source:namco/dkmb.cpp dkmb -@source:dkong.cpp +@source:nintendo/dkong.cpp 8ballact // (c) 1984 Seatongrove Ltd (Magic Eletronics USA license) 8ballact2 // (c) 1984 Seatongrove Ltd (Magic Eletronics USA license) dkingjr // bootleg @@ -12598,7 +12598,7 @@ spclforc // (c) 1985 Senko Industries (Magic Eletronics I strtheat // (c) 1985 Epos Corporation strtheata // (c) 1985 Epos Corporation -@source:dlair.cpp +@source:cinemat/dlair.cpp dlair // (c) 1983 Cinematronics dlair_1 // (c) 1983 Cinematronics dlair_2 // (c) 1983 Cinematronics @@ -12616,7 +12616,7 @@ spaceacea // (c) 1983 Cinematronics spaceacea2 // (c) 1983 Cinematronics spaceaceeuro // (c) 1983 Atari -@source:dlair2.cpp +@source:cinemat/dlair2.cpp dlair2 // (c) 1991 Leland dlair2_200 // (c) 1991 Leland dlair2_211 // (c) 1991 Leland @@ -12633,31 +12633,31 @@ dlair2_319s // (c) 1991 Leland spacea91 // (c) 1991 Leland spacea91_13e // (c) 1991 Leland -@source:dm7000.cpp +@source:skeleton/dm7000.cpp dm500 // dm5620 // dm7000 // -@source:dmainevent.cpp +@source:misc/dmainevent.cpp dmainevent // (c) 1983 Destron -@source:dmax8000.cpp +@source:skeleton/dmax8000.cpp dmax8000 // -@source:dmndrby.cpp +@source:snk/dmndrby.cpp dmndrby // G4001 'DD' (c) 1986 dmndrbya // G4001 'DD' (c) 1986 -@source:dms5000.cpp +@source:dms/dms5000.cpp dms5000 // -@source:dms86.cpp +@source:dms/dms86.cpp dms86 // -@source:dmv.cpp +@source:skeleton/dmv.cpp dmv // -@source:docastle.cpp +@source:univers/docastle.cpp asoccer // 8461 (c) 1987 docastle // 8302 (c) 1983 docastle2 // 8302 (c) 1983 @@ -12675,19 +12675,19 @@ jjack // ???? (c) 1984 kickridr // ???? (c) 1984 spiero // ???? (c) 1987 -@source:dogfgt.cpp +@source:technos/dogfgt.cpp dogfgt // TA-0011 (c) 1984 dogfgtj // TA-0011 (c) 1984 dogfgtu // TA-0011 (c) 1985 Data East USA, Inc. -@source:dolphunk.cpp +@source:trainer/dolphunk.cpp dauphin // -@source:dominob.cpp +@source:misc/dominob.cpp dominob // (c) 1996 Wonwoo Systems dominobv2 // (c) 1996 Wonwoo Systems -@source:dooyong.cpp +@source:dooyong/dooyong.cpp bluehawk // (c) 1993 Dooyong bluehawkn // (c) 1993 NTC ddaydoo // (c) 1990 Dooyong @@ -12712,24 +12712,24 @@ sadari // (c) 1993 NTC superx // (c) 1994 NTC superxm // (c) 1994 Mitchell -@source:dorachan.cpp +@source:misc/dorachan.cpp dorachan // (c) 1980 Craul Denshi -@source:dotrikun.cpp +@source:sega/dotrikun.cpp dotrikun // cabinet test board dotrikun2 // cabinet test board dotriman -@source:dpb7000.cpp +@source:quantel/dpb7000.cpp dpb7000 // -@source:dps1.cpp +@source:skeleton/dps1.cpp dps1 // -@source:dpsv55.cpp +@source:sony/dpsv55.cpp dpsv55 // -@source:dragon.cpp +@source:trs/dragon.cpp d64plus // Dragon 64 + Compusense Plus addon dgnalpha // Dragon Alpha dragon200 // Dragon 200 @@ -12740,16 +12740,16 @@ tanodr64 // Tano Dragon 64 (NTSC) dragon64h // Dragon 64 with HD6309 tanodr64h // Tano Dragon 64 (NTSC) with HD6309 -@source:dragrace.cpp +@source:atari/dragrace.cpp dragrace // 008505-008521 1977/06 [6800] -@source:drdmania.cpp +@source:misc/drdmania.cpp drdmania // -@source:dreambal.cpp +@source:dataeast/dreambal.cpp dreambal // MM -@source:dreamwld.cpp +@source:misc/dreamwld.cpp baryon // (c) 1997 SemiCom baryona // (c) 1997 SemiCom cutefght // (c) 1998 SemiCom @@ -12758,53 +12758,53 @@ gaialast // (c) 1999 SemiCom rolcrush // (c) 1999 Trust rolcrusha // (c) 1999 SemiCom -@source:drgnmst.cpp +@source:unico/drgnmst.cpp drgnmst // (c) 1994 Unico drgnmst2 // (c) 1994 Unico mastfury // (c) 1996 Unico + Game-Tech -@source:dribling.cpp +@source:mr/dribling.cpp dribling // (c) 1983 Model Racing driblinga // (c) 1983 Model Racing driblingbr // bootleg driblingo // (c) 1983 Olympia -@source:drmicro.cpp +@source:sanritsu/drmicro.cpp drmicro // (c) 1983 Sanritsu -@source:drtomy.cpp +@source:playmark/drtomy.cpp drtomy // (c) 1993 no copyright message (1993 on pcb), some code taken from 'Big Karnak' -@source:drumsta.cpp +@source:novation/drumsta.cpp drumsta // -@source:drw80pkr.cpp +@source:igt/drw80pkr.cpp drw80pk2 // (c) 1983 IGT drw80pkr // (c) 1982 IGT -@source:ds90.cpp +@source:luxor/ds90.cpp x37 // -@source:dsb46.cpp +@source:skeleton/dsb46.cpp dsb46 // -@source:dual68.cpp +@source:skeleton/dual68.cpp dual68 // -@source:duet16.cpp +@source:matsushi/duet16.cpp duet16 // -@source:dunhuang.cpp +@source:igs/dunhuang.cpp dunhuang // (c) 1995 -@source:dvk_kcgd.cpp +@source:elektronika/dvk_kcgd.cpp dvk_kcgd // -@source:dvk_ksm.cpp +@source:elektronika/dvk_ksm.cpp dvk_ksm // -@source:dwarfd.cpp +@source:misc/dwarfd.cpp dwarfd // (c) 198? Electro-Sport dwarfda // (c) 198? Electro-Sport pokeresp // (c) 198? Electro-Sport @@ -12813,14 +12813,14 @@ quarterh // (c) 1983 Electro-Sport quarterha // (c) 1983 Electro-Sport quarterhb // (c) 1983 Electro-Sport -@source:dynadice.cpp +@source:misc/dynadice.cpp dynadice // ? -@source:dynamoah.cpp +@source:misc/dynamoah.cpp dynamoah // dynamoaha // -@source:dynax.cpp +@source:dynax/dynax.cpp 7jigen // "37" 7jigen no Youseitachi 1990 Dynax blktouch // (c) Yang Gi Co Ltd. cdracula // (c) 1994 Y.S.E. @@ -12871,7 +12871,7 @@ tenkaie // (c) 1991 Dynax warahana // "613" Warai no Hana Tenshi 1991 Dynax yarunara // "55" Mahjong Yarunara 1991 Dynax -@source:dynduke.cpp +@source:seibu/dynduke.cpp dbldynj // (c) 1989 Seibu Kaihatsu dbldynu // (c) 1989 Seibu Kaihatsu + Fabtek license dynduke // (c) 1989 Seibu Kaihatsu (03SEP89) @@ -12880,31 +12880,31 @@ dyndukej // (c) 1989 Seibu Kaihatsu (03SEP89 dyndukeja // (c) 1989 Seibu Kaihatsu (25JUL89) dyndukeu // (c) 1989 Seibu Kaihatsu + Fabtek license (25JUL89) -@source:e100.cpp +@source:skeleton/e100.cpp e100 // -@source:e9161.cpp +@source:ericsson/e9161.cpp e9161 // -@source:eacc.cpp +@source:skeleton/eacc.cpp eacc // -@source:easy_karaoke.cpp +@source:skeleton/easy_karaoke.cpp easykara -@source:ec184x.cpp +@source:xussrpc/ec184x.cpp ec1840 // ec1841 // ec1845 // -@source:ec65.cpp +@source:elektor/ec65.cpp ec65 // ec65k // -@source:ec7915.cpp +@source:mera/ec7915.cpp ec7915 // -@source:ecoinf1.cpp +@source:misc/ecoinf1.cpp ec_bar5 // Bar 5 (older PCB) (Electrocoin) ec_barxo // Bar X (older PCB) (Electrocoin) ec_barxoa // @@ -12915,7 +12915,7 @@ ec_barxoe // ec_casbxo // Casino Bar X (older PCB) (Electrocoin) ec_casbxoa // -@source:ecoinf2.cpp +@source:misc/ecoinf2.cpp ec_oxocg // Oxo Classic Gold (Electrocoin) ec_oxocl // Oxo Club (Electrocoin) ec_oxogb // Oxo Golden Bars (Electrocoin) @@ -12926,7 +12926,7 @@ ec_sumnc // Casino Super Multi Nudger (Concept/Electrocoi ec_sumnd // Super Multi Nudger (Concept/Electrocoin) ec_suprl // Super Reels (Electrocoin) -@source:ecoinf3.cpp +@source:misc/ecoinf3.cpp ec_laby // Labyrinth (Electrocoin) ec_labya // ec_penni // Pennies From Heaven (Electrocoin) @@ -12940,7 +12940,7 @@ ec_sphinb // ec_stair // Stairway to Heaven ec_staira // -@source:ecoinfr.cpp +@source:misc/ecoinfr.cpp ec_bar7 // Bar 7 (Concept) ec_barx // Bar X (Electrocoin) ec_barx__0 // @@ -13381,28 +13381,28 @@ ec_unk5__b // ec_unk5__c // ec_unkt // Unknown 'T' (MAB PCB) (Concept - Electrocoin) -@source:efdt.cpp +@source:misc/efdt.cpp efdt // El Fin Del Tiempo - (c) 1981 Niemer -@source:efg8080.cpp +@source:misc/efg8080.cpp blackhol foolrace -@source:egghunt.cpp +@source:capcom/egghunt.cpp egghunt // (c) 1995 Invi Image -@source:einstein.cpp +@source:tatung/einstein.cpp einst256 // einstein // -@source:elan_ep3a19a.cpp +@source:tvgames/elan_ep3a19a.cpp tvbg3a tvbg3b tvbg3c tvbg6a tvbg6b -@source:elan_eu3a14.cpp +@source:tvgames/elan_eu3a14.cpp rad_gtg rad_rsg rad_rsgp @@ -13414,7 +13414,7 @@ rad_hnt3p rad_bask rad_baskp -@source:elan_eu3a05.cpp +@source:tvgames/elan_eu3a05.cpp rad_sinv rad_tetr airblsjs @@ -13425,52 +13425,52 @@ carlecfg pvmilfin pvwwcas -@source:electra.cpp +@source:misc/electra.cpp avenger // (c) 1975 Electra flyingf // (c) 1976 Electra -@source:electron.cpp +@source:acorn/electron.cpp electron // 1983 Acorn Electron electront // 1983 Acorn Electron (Trial) btm2105 // 1985 BT Merlin M2105 electron64 // 1987 Acorn Electron (64K Master RAM Board) electronsp // 1991 Acorn Electron (Stop Press 64i) -@source:elekscmp.cpp +@source:elektor/elekscmp.cpp elekscmp // -@source:elektronmono.cpp +@source:elektron/elektronmono.cpp monomach // MK2 (c) 2004 Elektron machdrum // MK2 (c) 2007 Elektron -@source:elf.cpp +@source:netronic/elf.cpp elf2 // -@source:elwro800.cpp +@source:sinclair/elwro800.cpp elwro800 // -@source:elzet80.cpp +@source:skeleton/elzet80.cpp elzet80k // elzet80p // -@source:emax.cpp +@source:emusys/emax.cpp emax // emax2 // emaxp // -@source:embargo.cpp +@source:cinemat/embargo.cpp embargo // -@source:emma2.cpp +@source:trainer/emma2.cpp emma2 // 1979 L.J.Technical Systems -@source:emu2.cpp +@source:emusys/emu2.cpp emu2 // -@source:emu3.cpp +@source:emusys/emu3.cpp emu3 // -@source:emu68k.cpp +@source:emusys/emu68k.cpp carnaval // orbit9090 // phatt // @@ -13479,15 +13479,15 @@ proteus1 // proteusxr // vintkeys // -@source:enigma2.cpp +@source:gameplan/enigma2.cpp enigma2 // (c) 1981 Game Plan (Zilec Electronics license) enigma2a // (c) 1984 Zilec Electronics (bootleg?) enigma2b // (c) 1981 Zilec Electronics -@source:enmirage.cpp +@source:ensoniq/enmirage.cpp enmirage // 1985 Mirage Digital Multi-Sampler -@source:eolith.cpp +@source:eolith/eolith.cpp candy // (c) 1999 Eolith fort2b // (c) 2001 Eolith fort2ba // (c) 2001 Eolith @@ -13510,18 +13510,18 @@ puzzlekg // (c) 1998 Eolith raccoon // (c) 1999 Eolith stealsee // (c) 2000 Moov Generation / Eolith -@source:eolith16.cpp +@source:eolith/eolith16.cpp klondkp // (c) 1999 Eolith -@source:ep64.cpp +@source:enterprise/ep64.cpp ep128 // Enterprise 128 ep64 // Enterprise 64 phc64 // Hegener + Glaser Mephisto PHC 64 -@source:epic14e.cpp +@source:skeleton/epic14e.cpp epic14e // -@source:epos.cpp +@source:misc/epos.cpp catapult // (c) 1982 dealer // (c) 198? eeekk // (c) 1984 @@ -13535,14 +13535,14 @@ theglob2 // (c) 1983 theglob3 // (c) 1983 beastf // (c) 1984 -@source:eprom.cpp +@source:atari/eprom.cpp eprom // 136069 (c) 1989 eprom2 // 136069 (c) 1989 guts // prototype klaxp1 // prototype klaxp2 // prototype -@source:equites.cpp +@source:alpha/equites.cpp bngotime // (c) 1986 CLS? bullfgtr // (c) 1984 Alpha Denshi Co. bullfgtrs // (c) 1984 Alpha Denshi Co./Sega @@ -13556,19 +13556,19 @@ splndrbt2 // (c) 1985 Alpha Denshi Co. splndrbta // (c) 1985 Alpha Denshi Co. splndrbtb // (c) 1985 Alpha Denshi Co. -@source:eispc.cpp +@source:ericsson/eispc.cpp epc // 1984 Ericsson PC -@source:ergo201.cpp +@source:microterm/ergo201.cpp ergo201 // -@source:ertictac.cpp +@source:acorn/ertictac.cpp ertictac // (c) 1992 Sisteme ertictaca // (c) 1992 Sisteme ertictacb // (c) 1992 Sisteme poizone // (c) 1990 Sisteme -@source:esd16.cpp +@source:misc/esd16.cpp deluxe5 // (c) 2000 ESD deluxe5a // (c) 2000 ESD deluxe5b // (c) 2000 ESD @@ -13590,26 +13590,26 @@ multchmpk // (c) 1998 (Korea) swatpolc // (c) 2001 ESD tangtang // (c) 2000 ESD -@source:esh.cpp +@source:misc/esh.cpp esh // (c) 1984 Funai / Gakken esha // (c) 1984 Funai / Gakken eshb // (c) 1984 Funai / Gakken -@source:espial.cpp +@source:orca/espial.cpp espial // (c) 1983 Thunderbolt, Orca logo is hidden in title screen espialu // (c) 1983 Thunderbolt, Orca logo is hidden in title screen netwars // (c) 1983 Orca + Esco Trading Co license -@source:esprit.cpp +@source:skeleton/esprit.cpp esprit // Hazeltine Esprit esprit3 // Hazeltine Esprit III -@source:esq1.cpp +@source:ensoniq/esq1.cpp esq1 // 1986 ESQ-1 Digital Wave Synthesizer esqm // 1986 ESQ-M rack-mount ESQ-1 sq80 // 1988 SQ-80 Digital Wave Synthesizer -@source:esq5505.cpp +@source:ensoniq/esq5505.cpp eps // 1988 EPS eps16p // 1990 EPS 16 Plus sd1 // 1990 SD-1 @@ -13621,73 +13621,73 @@ vfx // 1989 VFX vfxsd // 1989 VFX-SD ks32 // 1992 KS-32 -@source:esqasr.cpp +@source:ensoniq/esqasr.cpp asr10 // 1992 ASR-10 asrx // 1997 ASR-X -@source:esqkt.cpp +@source:ensoniq/esqkt.cpp kt76 // 1996 KT-76 ts10 // ts12 // -@source:esqmr.cpp +@source:ensoniq/esqmr.cpp mr61 // 1996 MR-61 mrrack // 1996 MR-Rack -@source:esripsys.cpp +@source:misc/esripsys.cpp turbosub // (c) 1985 Entertainment Sciences turbosub6 // (c) 1985 Entertainment Sciences turbosub7 // (c) 1985 Entertainment Sciences -@source:et3400.cpp +@source:heathkit/et3400.cpp et3400 // -@source:eti660.cpp +@source:skeleton/eti660.cpp eti660 // -@source:ettrivia.cpp +@source:misc/ettrivia.cpp promutrv // (c) 1985 Enerdyne Technologies Inc promutrva // (c) 1985 Enerdyne Technologies Inc promutrvb // (c) 1985 Enerdyne Technologies Inc promutrvc // (c) 1985 Enerdyne Technologies Inc strvmstr // (c) 1986 Enerdyne Technologies Inc -@source:eurit.cpp +@source:skeleton/eurit.cpp eurit30 // -@source:eurocom2.cpp +@source:skeleton/eurocom2.cpp eurocom2 // waveterm // microtrol // -@source:europc.cpp +@source:pc/europc.cpp europc // 1988 Schneider Euro PC (CGA or Hercules) europc2 // 1989 Schneider Euro PC II euroxt // Schneider Euro XT -@source:eva.cpp +@source:chrysler/eva.cpp eva11 // eva24 // -@source:evmbug.cpp +@source:ti/evmbug.cpp evmbug // TI TMAM6095 tms9995bb // TMS9995 breadboard -@source:ews4800.cpp +@source:nec/ews4800.cpp ews4800_310 // NEC EWS4800/310 -@source:excali64.cpp +@source:skeleton/excali64.cpp excali64 // -@source:exedexes.cpp +@source:capcom/exedexes.cpp exedexes // 2/1985 (c) 1985 savgbees // 2/1985 (c) 1985 + Memetron license -@source:exelv.cpp +@source:ti/exelv.cpp exeltel // exl100 // -@source:exerion.cpp +@source:jaleco/exerion.cpp exerion // (c) 1983 Jaleco exerionb // bootleg exerionb2 // bootleg @@ -13695,7 +13695,7 @@ exerionba // bootleg (Assa / Automave) exeriont // (c) 1983 Jaleco + Taito America license irion // -@source:exidy.cpp +@source:exidy/exidy.cpp fax // (c) 1983 fax2 // (c) 1983 hardhat // (c) 1982 @@ -13725,7 +13725,7 @@ venture4 // (c) 1981 venture5a // (c) 1981 venture5b // bootleg -@source:exidy440.cpp +@source:exidy/exidy440.cpp catch22 // (c) 1985 cheyenne // (c) 1984 chiller // (c) 1986 @@ -13743,23 +13743,23 @@ whodunit8 // (c) 1988 yukon // (c) 1989 yukon1 // (c) 1989 -@source:exidyttl.cpp +@source:exidy/exidyttl.cpp attckexd // (c) 1977 Exidy attckexd2 // (c) 1977 Exidy deathrac // (c) 1976 Exidy destdrby // (c) 1976 Exidy rhunting // bootleg of deathrac -@source:exorciser.cpp +@source:motorola/exorciser.cpp exorciser // 1975 Motorola -@source:exorterm.cpp +@source:exorterm/exorterm.cpp exorterm155 // (c) 1979 Motorola -@source:exp85.cpp +@source:netronic/exp85.cpp exp85 // -@source:expro02.cpp +@source:kaneko/expro02.cpp fantasia // (c) 1994 Comad & New Japan System fantasiaa // (c) 1994 Comad & New Japan System fantasiab // (c) 1994 Comad & New Japan System @@ -13792,7 +13792,7 @@ wownfant // (c) 2002 Comad zipzap // (c) 1995 Barko Corp zipzapa // (c) 1995 Barko Corp -@source:exprraid.cpp +@source:dataeast/exprraid.cpp exprraid // (c) 1986 Data East Corporation exprraidi // (c) 1986 Data East Corporation PCB manufactured by Gecas under license exprraidu // (c) 1986 Data East USA (US) @@ -13801,10 +13801,10 @@ wexpressb1 // bootleg wexpressb2 // bootleg wexpressb3 // bootleg -@source:exterm.cpp +@source:gottlieb/exterm.cpp exterm // (c) 1989 Premier Technology - a Gottlieb game -@source:extrema.cpp +@source:misc/extrema.cpp adults // Adults Only (Ukraine) adultsa // bloto // Blits Loto (Ukraine) @@ -13834,50 +13834,50 @@ maskic // strlink // Strong Link (Ukraine) strlinka // -@source:exzisus.cpp +@source:taito/exzisus.cpp exzisus // B12 (c) 1987 Taito Corporation (Japan) exzisusa // B23 (c) 1987 Taito Corporation (Japan) exzisust // B23 (c) 1987 TAD Corp (based on Japan Conversion) -@source:ez2d.cpp +@source:misc/ez2d.cpp ez2d2m // 2001 Amuse World -@source:f1gp.cpp +@source:vsystem/f1gp.cpp f1gp // (c) 1991 Video System Co. f1gp2 // (c) 1992 Video System Co. f1gpa // (c) 1991 Video System Co. f1gpb // bootleg -@source:f-32.cpp +@source:f32/f-32.cpp mosaicf2 // (c) 1999 F2 System royalpk2 // -@source:f387x.cpp +@source:fairch/f387x.cpp f387x // (c) 1979 Fairchild -@source:facit4440.cpp +@source:skeleton/facit4440.cpp facit4440 // 1984 -@source:falco500.cpp +@source:falco/falco500.cpp falco5220e // 1987 falco500e // 1991 falco5220s // 1989 -@source:falcots.cpp +@source:falco/falcots.cpp ts1 // 1980 ts2624 // 1982 -@source:falcots28.cpp +@source:falco/falcots28.cpp ts28 // 1983 -@source:falgas_m89.cpp +@source:misc/falgas_m89.cpp cbully // (c) 1991 Falgas -@source:famibox.cpp +@source:nintendo/famibox.cpp famibox // 1986 famistat // 1986 -@source:fantland.cpp +@source:edevices/fantland.cpp borntofi // (c) International Games? borntofiv // (c) International Games (Vifico license) fantland // (c) 198? Electronic Devices Italy @@ -13886,14 +13886,14 @@ galaxygn // (c) 1989 Electronic Devices Italy galaxygnh // (c) 1990 Electronic Devices Italy (1990 year hack) wheelrun // (c) 1988? International Games -@source:fanucs15.cpp +@source:skeleton/fanucs15.cpp fanucs15 // 1990 -@source:fanucspmg.cpp +@source:skeleton/fanucspmg.cpp fanucspg // 1983 fanucspgm // 1983 -@source:fastfred.cpp +@source:galaxian/fastfred.cpp boggy84 // (c) 1984 Kaneko boggy84b // bootleg boggy84b2 // bootleg @@ -13907,20 +13907,20 @@ jumpcoasa // (c) 1983 Kaneko jumpcoast // (c) 1983 Taito redrobin // (c) 1986 Elettronolo -@source:fastinvaders.cpp +@source:misc/fastinvaders.cpp fi6845 // fi8275 // -@source:fastlane.cpp +@source:konami/fastlane.cpp fastlane // GX752 (c) 1987 -@source:fb01.cpp +@source:yamaha/fb01.cpp fb01 // 1986 FB-01 -@source:fc100.cpp +@source:skeleton/fc100.cpp fc100 // -@source:fccpu20.cpp +@source:force/fccpu20.cpp fccpu20sbc fccpu21ssbc fccpu21sbc @@ -13929,7 +13929,7 @@ fccpu21yasbc fccpu21bsbc fccpu21ybsbc -@source:fccpu30.cpp +@source:force/fccpu30.cpp fccpu30 fccpu30x fccpu30xa @@ -13943,10 +13943,10 @@ fccpu30senr fccpu30senr501 fccpu33 -@source:fcombat.cpp +@source:jaleco/fcombat.cpp fcombat // (c) 1985 Jaleco -@source:fcrash.cpp +@source:capcom/fcrash.cpp cawingb2 // bootleg cawingbl // bootleg fcrash // bootleg of Final Fight @@ -13962,70 +13962,70 @@ varthb // bootleg wofabl // bootleg wofr1bl // bootleg -@source:feversoc.cpp +@source:seibu/feversoc.cpp feversoc // (c) 2004 -@source:ffantasy_ms.cpp +@source:dataeast/ffantasy_ms.cpp drgninjam // ffantasym // -@source:fgoal.cpp +@source:taito/fgoal.cpp fgoal // TF (c) 1979 Taito Corporation fgoala // MF (c) 1979 Taito Corporation -@source:fidel_as12.cpp +@source:fidelity/fidel_as12.cpp feleg felega -@source:fidel_card.cpp +@source:fidelity/fidel_card.cpp bridgec bridgec3 bridgeca gincribc vbrc -@source:fidel_cc1.cpp +@source:fidelity/fidel_cc1.cpp cc1 // cc3 // cc10c -@source:fidel_cc10.cpp +@source:fidelity/fidel_cc10.cpp cc10 // cc10a // checkc4 // -@source:fidel_cc7.cpp +@source:fidelity/fidel_cc7.cpp backgamc // cc7 // cc7a // -@source:fidel_checkc2.cpp +@source:fidelity/fidel_checkc2.cpp checkc2 -@source:fidel_chesster.cpp +@source:fidelity/fidel_chesster.cpp chesster // chesstera // kishon // kishona // -@source:fidel_csc.cpp +@source:fidelity/fidel_csc.cpp csc // csce // cscet // reversic // super9cc // -@source:fidel_dames.cpp +@source:fidelity/fidel_dames.cpp damesc // -@source:fidel_desdis.cpp +@source:fidelity/fidel_desdis.cpp fdes2000d // fdes2100d // fdes2265 // fdes2265a // fdes2325 // -@source:fidel_eag68k.cpp +@source:fidelity/fidel_eag68k.cpp feagv10 // feagv11 // feagv2 // @@ -14042,10 +14042,10 @@ fex68km2a // fex68km3 // fex68km4 // -@source:fidel_eldorado.cpp +@source:fidelity/fidel_eldorado.cpp feldo -@source:fidel_elite.cpp +@source:fidelity/fidel_elite.cpp feas // feasbu // feasbua // @@ -14059,7 +14059,7 @@ fpres // fpresbu // fpresgla // -@source:fidel_excel.cpp +@source:fidelity/fidel_excel.cpp fdes2000 // fdes2100 // fexcel // @@ -14072,47 +14072,47 @@ fexcelpb // fexcelv // granits // RCS -@source:fidel_msc.cpp +@source:fidelity/fidel_msc.cpp miniscco -@source:fidel_phantom.cpp +@source:fidelity/fidel_phantom.cpp cphantom // fphantom // -@source:fidel_sc12.cpp +@source:fidelity/fidel_sc12.cpp fscc12 // fscc12b // -@source:fidel_sc6.cpp +@source:fidelity/fidel_sc6.cpp fscc6 // gambit miniscc -@source:fidel_sc8.cpp +@source:fidelity/fidel_sc8.cpp fscc8 // -@source:fidel_sc9.cpp +@source:fidelity/fidel_sc9.cpp fscc9 // fscc9b // fscc9c // fscc9ps // -@source:fidel_vcc.cpp +@source:fidelity/fidel_vcc.cpp uvc // vcc // -@source:fidel_vsc.cpp +@source:fidelity/fidel_vsc.cpp vsc // -@source:finalizr.cpp +@source:konami/finalizr.cpp finalizr // GX523 (c) 1985 finalizra // GX523 (c) 1985 finalizrb // bootleg -@source:fireball.cpp +@source:misc/fireball.cpp fireball // -@source:firebeat.cpp +@source:konami/firebeat.cpp bm3 // GQ972 (c) 2000 (Japan) bm36th // GCA21 (c) 2001 (Japan) bm37th // GCB07 (c) 2002 (Japan JCA) @@ -14136,50 +14136,50 @@ ppp // GQ977 (c) 2000 (Japan) ppp11 // GQ977 (c) 2000 (Japan) ppp1mp // GQA11 (c) 2000 (Japan) -@source:firefox.cpp +@source:atari/firefox.cpp firefox // 136026 (c) 1984 firefoxa // 136026 (c) 1984 -@source:firetrap.cpp +@source:dataeast/firetrap.cpp firetrap // (c) 1986 Data East USA (US) firetrapa // (c) 1986 Data East USA (US) firetrapbl // bootleg firetrapj // (c) 1986 Wood Place Inc. (Japan) -@source:firetrk.cpp +@source:atari/firetrk.cpp firetrk // 030926 1978/06 [6808] montecar // 035763-035780 1980/04 [6502] superbug // 009115-009467 1977/09 [6800] -@source:fitfight.cpp +@source:nix/fitfight.cpp bbprot // unfinished prototype fitfight // bootleg of Art of Fighting histryma // bootleg of Fighter's History histryma2 // bootleg of Fighter's History hotmindff // (c) Playmark -@source:fk1.cpp +@source:skeleton/fk1.cpp fk1 // -@source:flashbeats.cpp +@source:sega/flashbeats.cpp flsbeats // 1998 Sega -@source:flicker.cpp +@source:pinball/flicker.cpp flicker // -@source:flipjack.cpp +@source:misc/flipjack.cpp flipjack // 1983? Jackson Co., Ltd. -@source:flkatck.cpp +@source:konami/flkatck.cpp flkatck // GX669 (c) 1987 (Japan) flkatcka // GX669 (c) 1987 (Japan) mx5000 // GX669 (c) 1987 -@source:flower.cpp +@source:misc/flower.cpp flower // (c) 1986 Komax license flowerj // 834-5998 (c) 1986 Sega / Alpha license? -@source:flstory.cpp +@source:taito/flstory.cpp flstory // A45 (c) 1985 Taito Corporation flstoryj // A45 (c) 1985 Taito Corporation (Japan) onna34ro // A52 (c) 1985 Taito Corporation (Japan) @@ -14187,11 +14187,11 @@ onna34roa // A52 (c) 1985 Taito Corporation (Japan) rumba // A23 (c) 1985 Taito Corporation (Japan) victnine // A16 (c) 1985 Taito Corporation (Japan) -@source:flyball.cpp +@source:atari/flyball.cpp flyball // 005629 1976/07 [6502] flyball1 // 005629 1976/07 [6502] -@source:fm7.cpp +@source:fujitsu/fm7.cpp fm11 // 1982 FM-11 EX fm16beta // 1983 FM-16 Beta fm7 // @@ -14200,7 +14200,7 @@ fm77av // fm8 // 1981 fmnew7 // -@source:fmtowns.cpp +@source:fujitsu/fmtowns.cpp carmarty // Fujitsu FM-Towns Car Marty fmtmarty // 1993 Fujitsu FM-Towns Marty fmtmarty2 // 1993 Fujitsu FM-Towns Marty 2 @@ -14212,39 +14212,39 @@ fmtownsmx // FM-Towns II MX fmtownssj // FM-Towns II SJ fmtownsux // 1991.11 FM-Towns II UX -@source:fontwriter.cpp +@source:sharp/fontwriter.cpp fw600 // (c) Sharp fw700ger // (c) Sharp -@source:foodf.cpp +@source:atari/foodf.cpp foodf // 136020 (c) 1982 // made by Gencomp foodf1 // 136020 (c) 1982 // made by Gencomp foodf2 // 136020 (c) 1982 // made by Gencomp foodfc // 136020 (c) 1982 // made by Gencomp -@source:force68k.cpp +@source:force/force68k.cpp fccpu1 // -@source:forte2.cpp +@source:ascii/forte2.cpp pesadelo // (c) 1989 Forte II Games -@source:fortecar.cpp +@source:misc/fortecar.cpp fortecrd // (c) 1994, Fortex Ltd. fortecrde // (c) 1994, Fortex Ltd. -@source:fp1100.cpp +@source:casio/fp1100.cpp fp1100 // -@source:fp200.cpp +@source:casio/fp200.cpp fp200 // -@source:fp6000.cpp +@source:casio/fp6000.cpp fp6000 // -@source:freedom120.cpp +@source:skeleton/freedom120.cpp free120 // (c) 1993 Liberty Electronics -@source:freekick.cpp +@source:misc/freekick.cpp omega // (c) 1986 Nihon System omegaa // (c) 1986 Nihon System countrun // (c) 1988 Nihon System (+ optional Sega) NS6201-A 1988.3 @@ -14265,23 +14265,23 @@ pbillrdbl // (c) 1987 bootleg pbillrds // (c) 1987 Nihon System (Sega license?) pbillrdsa // (c) 1987 Nihon System (Sega license?) -@source:freeway.cpp +@source:misc/freeway.cpp freeway freewaya -@source:frenzyxprss.cpp +@source:misc/frenzyxprss.cpp frenzyxprss // (c) 2001 ICE / Uniana -@source:fresh.cpp +@source:misc/fresh.cpp fresh // (c) Chain Leisure -@source:fromanc2.cpp +@source:vsystem/fromanc2.cpp fromanc2 // (c) 1995 Video System Co. (Japan) fromanc2o // (c) 1995 Video System Co. (Japan) fromanc4 // (c) 1998 Video System Co. (Japan) fromancr // (c) 1995 Video System Co. (Japan) -@source:fromance.cpp +@source:vsystem/fromance.cpp daiyogen // [1990] Video System Co. (Japan) fromance // (c) 1991 Video System Co. (Japan) idolmj // [1988] (c) System Service (Japan) @@ -14291,33 +14291,33 @@ natsuiro // [1989] Video System presents (Japan) nekkyoku // [1988] Video System Co. (Japan) nmsengen // (c) 1991 Video System (Japan) -@source:fruitpc.cpp +@source:ibmpc/fruitpc.cpp fruitpc // ??? -@source:fs3216.cpp +@source:skeleton/fs3216.cpp fs3216 // -@source:ft68m.cpp +@source:skeleton/ft68m.cpp ft68m // -@source:funeball.cpp +@source:misc/funeball.cpp funeball // (c) 1997 Fun Industries Inc. -@source:fungames.cpp +@source:misc/fungames.cpp biplane // (c) 1975 Fun Games biplane4 // (c) 1976 Fun Games take5 // (c) 1975 Fun Games -@source:funkball.cpp +@source:misc/funkball.cpp funkball // (c) 1998 dgPIX Entertainment Inc -@source:funkybee.cpp +@source:orca/funkybee.cpp funkybee // (c) 1982 Orca funkybeeb // (c) 1982 Orca skylancr // (c) 1983 Orca skylancre // (c) 1983 Orca + Esco Trading Co license -@source:funkyjet.cpp +@source:dataeast/funkyjet.cpp funkyjet // MAT (c) 1992 Data East (Mitchell license) (World, Rev 1) funkyjeta // MAT (c) 1992 Data East (Mitchell license) (World) - Rev unverified funkyjeta2 // MAT (c) 1992 Data East (Mitchell license) (World) - Rev unverified - alternative demo @@ -14325,10 +14325,10 @@ funkyjetj // MAT (c) 1992 Data East (Mitchell license) (Ja sotsugyo // (c) 1995 Mitchell (Atlus license) sotsugyok // (c) 1996 Mitchell (Korea) -@source:funtech.cpp +@source:igs/funtech.cpp fts2in1 -@source:funworld.cpp +@source:funworld/funworld.cpp bigdeal // (c) 1986 Fun World bigdealb // (c) 1986 Fun World biliard // 1998 bootleg. @@ -14447,31 +14447,31 @@ fw_a7_11a // (c) 1985 Fun World fw_a0_1 // (c) 1991 Fun World jokcrdep // (c) 1991 Fun World -@source:funybubl.cpp +@source:comad/funybubl.cpp funybubl // (c) 1999 In Chang Electronic Co funybublc // (c) 1999 Comad Industries -@source:fuukifg2.cpp +@source:fuuki/fuukifg2.cpp gogomile // (c) 1995 gogomileo // (c) 1995 (Japan) pbancho // (c) 1996 (Japan) -@source:fuukifg3.cpp +@source:fuuki/fuukifg3.cpp asurabld // (c) 1998 (Japan) asurabus // (c) 2001 (USA) asurabusj // (c) 2000 (Japan) asurabusja // (c) 2000 (Japan) asurabusjr // review build -@source:fwheel.cpp +@source:sega/fwheel.cpp fwheel // -@source:g627.cpp +@source:pinball/g627.cpp rota_101 // rota_115 // rotation // -@source:gaelco.cpp +@source:gaelco/gaelco.cpp bigkarnk // (c) 1991 - Ref 901112-1 biomtoy // (c) 1995 - Ref 922804/2 - (unprotected) biomtoya // (c) 1995 - Ref 922804/2 - (unprotected) @@ -14483,7 +14483,7 @@ lastkm // (c) 1995 - Ref 922804/2 squash // (c) 1992 - Ref 922804/2 thoop // (c) 1992 - Ref 922804/1 -@source:gaelco2.cpp +@source:gaelco/gaelco2.cpp aligator // (c) 1994 - Ref 940411 aligators // (c) 1994 - Ref 940411 aligatorun // (c) 1994 - Ref 940411 (unprotected) @@ -14511,7 +14511,7 @@ touchgok // (c) 1995 - Ref 950510-1 wrally2 // (c) 1995 - Ref 950510 wrally2a // (c) 1995 - Ref 950510 -@source:gaelco3d.cpp +@source:gaelco/gaelco3d.cpp footbpow // (c) 1999 - Ref 000208 radikalb // (c) 1998 - Ref ??? radikalba // (c) 1998 - Ref ??? @@ -14522,19 +14522,19 @@ surfplnt // (c) 1997 - Ref 971223 surfplnt40 // (c) 1997 - Ref 970514 surfplnt30 // (c) 1997 - Red 970489 -@source:gaelcof3.cpp +@source:gaelco/gaelcof3.cpp autopapa // donpepito // susanita // -@source:gaelcopc.cpp +@source:gaelco/gaelcopc.cpp rriders // tokyocop // (c) 2003 (Arcade TV Game List - P.168, Right, 19 from bottom) tokyocopi // tokyocopk // tuningrc // -@source:gaiden.cpp +@source:tehkan/gaiden.cpp drgnbowl // (c) 1992 Nics drgnbowla // (c) 1992 Nics gaiden // 6215 - (c) 1988 Tecmo (US) @@ -14549,10 +14549,10 @@ tknight // (c) 1989 Tecmo wildfang // (c) 1989 Tecmo wildfangs // (c) 1989 Tecmo -@source:gal3.cpp +@source:namco/gal3.cpp gal3 // (c) 1992 (Arcade TV Game List - P.73, Right, 6 from top) -@source:galaga.cpp +@source:namco/galaga.cpp battles // bootleg battles2 // bootleg bosco // (c) 1981 @@ -14582,22 +14582,22 @@ xeviousa // 136018 (c) 1982 + Atari license xeviousb // 136018 (c) 1982 + Atari license xeviousc // 136018 (c) 1982 + Atari license -@source:galastrm.cpp +@source:taito/galastrm.cpp galastrm // C99 (c) 1992 Taito Corporation -@source:galaxi.cpp +@source:misc/galaxi.cpp galaxi // (c) 2000 BRL S.R.L. Bologna lastfour // (c) 2001 BRL S.R.L. Bologna magjoker // (c) 2000 BRL S.R.L. Bologna -@source:galaxia.cpp +@source:cvs/galaxia.cpp astrowar // (c) 1980 galaxia // (c) 1979 galaxiaa // (c) 1979 galaxiab // (c) 1979 galaxiac // (c) 1979 -@source:galaxian.cpp +@source:galaxian/galaxian.cpp 600 // GX353 (c) 1981 Konami amidar // GX337 (c) 1982 Konami amidar1 // GX337 (c) 1981 Konami @@ -14871,10 +14871,10 @@ zerotimeu // hack zigzagb // (c) 1982 LAX (bootleg) zigzagb2 // (c) 1982 LAX (bootleg) -@source:galaxian_rockclim.cpp +@source:galaxian/galaxian_rockclim.cpp rockclim // (c)1981 Taito -@source:galaxold.cpp +@source:galaxian/galaxold.cpp 4in1 // (c) 1981 Armenia / Food and Fun bullsdrtg // 1985 Senko dkongjrm // bootleg @@ -14902,23 +14902,23 @@ tazzmang2 // bootleg trvchlng // [1985] Joyland (Senko license) vpool // bootleg -@source:galaxy.cpp +@source:galaxy/galaxy.cpp galaxy // galaxyp // -@source:galeb.cpp +@source:pel/galeb.cpp galeb // -@source:galgame.cpp +@source:misc/galgame.cpp galgame // (c) 1971 Computer Recreations, Inc -@source:galgames.cpp +@source:ces/galgames.cpp galgame2 // (c) 1998 Creative Electronics & Software (CES) / Namco galgame3 // (c) 1998 Creative Electronics & Software (CES) / Atari galgame4 // (c) 1998 Creative Electronics & Software (CES) galgbios // (c) 1998 Creative Electronics & Software (CES) -@source:galivan.cpp +@source:nichibut/galivan.cpp dangar // (c) 1986 dangara // (c) 1986 dangarb // (c) 1986 @@ -14933,7 +14933,7 @@ youma2 // (c) 1986 (Japan) youmab // bootleg youmab2 // bootleg -@source:galpani2.cpp +@source:kaneko/galpani2.cpp galpani2 // (c) 1993 Kaneko galpani2e // (c) 1993 Kaneko galpani2e2 // (c) 1993 Kaneko @@ -14947,55 +14947,55 @@ galpani2t // (c) 1993 Kaneko gp2quiz // (c) 1993 Kaneko gp2se // (c) 1994 Kaneko -@source:galpani3.cpp +@source:kaneko/galpani3.cpp galpani3 // (c) 1995 Kaneko (World) galpani3hk // (c) 1995 Kaneko (Hong Kong) galpani3j // (c) 1995 Kaneko (Japan) galpani3k // (c) 1995 Kaneko (Korea) -@source:galpanic.cpp +@source:kaneko/galpanic.cpp galpanic // (c) 1990 Kaneko galpanica // (c) 1990 Kaneko galpanicb // (c) 1990 Kaneko -@source:galpanic_ms.cpp +@source:kaneko/galpanic_ms.cpp galpanicms -@source:galspnbl.cpp +@source:comad/galspnbl.cpp galspnbl // (c) 1996 Comad hotpinbl // (c) 1995 Comad & New Japan System -@source:gamate.cpp +@source:bitcorp/gamate.cpp gamate // Bit Corp Gamate -@source:gambl186.cpp +@source:misc/gambl186.cpp gambl186 // EGD gambl186a // EGD gambl186b // EGD gambl186c // EGD gambl186d // EGD -@source:gamecom.cpp +@source:tiger/gamecom.cpp gamecom // Tiger Game.com -@source:gamecube.cpp +@source:nintendo/gamecube.cpp gcjp // (c) 2001 Nintendo gcus // (c) 2001 Nintendo gceu // (c) 2002 Nintendo gcbr // (c) 2002 Nintendo -@source:gameking.cpp +@source:skeleton/gameking.cpp gamekin3 // gameking // -@source:gamemachine.cpp +@source:vtech/gamemachine.cpp gamemach // v4in1eg // -@source:gamemasters.cpp +@source:misc/gamemasters.cpp gmsshoot // (c) 1989 GameMasters -@source:gameplan.cpp +@source:gameplan/gameplan.cpp challeng // (c) 1981 Centuri kaos // (c) 1981 killcom // (c) 1980 Centuri @@ -15006,14 +15006,14 @@ megatacka // (c) 1980 Centuri piratetr // (c) 1982 potogold // (c) 1982 -@source:gamepock.cpp +@source:epoch/gamepock.cpp gamepock // Epoch Game Pocket Computer -@source:gammagic.cpp +@source:misc/gammagic.cpp 99bottles // (c) 1999 Bally Gaming Co. gammagic // (c) 1999 Bally Gaming Co. -@source:gamtor.cpp +@source:misc/gamtor.cpp ancienta // ancientaa // ancientab // @@ -15195,7 +15195,7 @@ llcharm // llcharma // megakat // -@source:gaplus.cpp +@source:namco/gaplus.cpp galaga3 // (c) 1984 galaga3a // (c) 1984 galaga3b // (c) 1984 @@ -15206,12 +15206,12 @@ gaplusa // (c) 1984 gaplusd // (c) 1984 gaplust // (c) 1984 -@source:gatron.cpp +@source:gametron/gatron.cpp bingo // Game-A-Tron? poker41 // (c) 1983 Game-A-Tron pulltabs // (c) 1983 Game-A-Tron -@source:gauntlet.cpp +@source:atari/gauntlet.cpp gaunt2 // 136043 (c) 1986 gaunt22p // 136043 (c) 1986 gaunt22p1 // 136043 (c) 1986 @@ -15241,7 +15241,7 @@ vindctr2 // 136059 (c) 1988 vindctr2r1 // 136059 (c) 1988 vindctr2r2 // 136059 (c) 1988 -@source:gb.cpp +@source:nintendo/gb.cpp gameboy // Nintendo Game Boy Handheld gamefgtr // bootleg gbcolor // Nintendo Game Boy Color Handheld @@ -15251,21 +15251,21 @@ supergb // Nintendo Super Game Boy SNES Cartridge supergb2 // mduckspa // Mega Duck / Super Quique (Spain) -@source:gba.cpp +@source:nintendo/gba.cpp gba // Nintendo Game Boy Advance Handheld robotech // Coleco -@source:gberet.cpp +@source:konami/gberet.cpp gberet // GX577 (c) 1985 gberetb // bootleg on different hardware mrgoemon // GX621 (c) 1986 (Japan) rushatck // GX577 (c) 1985 -@source:gcpinbal.cpp +@source:excelent/gcpinbal.cpp gcpinbal // (c) 1994 Excellent System pwrflip // (c) 1994 Excellent System -@source:gei.cpp +@source:misc/gei.cpp amuse // (c) 1982 Greyhound Electronics amuse1 // (c) 1982 Greyhound Electronics amuse1a // (c) 1983 Greyhound Electronics @@ -15321,27 +15321,27 @@ suprpokr // (c) 1986 Grayhound Electronics suprpokra // (c) 1986 Grayhound Electronics suprpokrb // (c) 1986 Grayhound Electronics -@source:gem_rp.cpp +@source:skeleton/gem_rp.cpp rp200 -@source:generalplus_gpl_unknown.cpp +@source:tvgames/generalplus_gpl_unknown.cpp mapacman parcade tagalaga taspinv taturtf -@source:generalplus_gpl162xx_lcdtype.cpp +@source:tvgames/generalplus_gpl162xx_lcdtype.cpp pcp8718 pcp8728 bkid218 -@source:generalplus_gpl16250_mobigo.cpp +@source:tvgames/generalplus_gpl16250_mobigo.cpp mobigo mobigos mobigo2 -@source:generalplus_gpl16250_nand.cpp +@source:tvgames/generalplus_gpl16250_nand.cpp wlsair60 // Wireless Air 60 kiugames jak_camp @@ -15362,7 +15362,7 @@ vbaby mgtfit beambox -@source:generalplus_gpl16250_rom.cpp +@source:tvgames/generalplus_gpl16250_rom.cpp smartfp // Smart Fit Park smartfps gormiti @@ -15371,7 +15371,7 @@ myac220 imgame beijuehh -@source:generalplus_gpl16250_romram.cpp +@source:tvgames/generalplus_gpl16250_romram.cpp paccon lazertag jak_s500 @@ -15383,10 +15383,10 @@ jak_totm jak_ths wrlshunt // Wireless: Hunting Video Game System -@source:generalplus_gpl16250_spi.cpp +@source:tvgames/generalplus_gpl16250_spi.cpp bkrankp -@source:generalplus_gpl16250_spi_direct.cpp +@source:tvgames/generalplus_gpl16250_spi_direct.cpp fixitflx bfdigdug bfgalaga @@ -15396,7 +15396,7 @@ bfspyhnt bftetris wiwcs -@source:generalplus_gpl32612.cpp +@source:tvgames/generalplus_gpl32612.cpp jak_swbstrik jak_tmnthp jak_dchp @@ -15405,18 +15405,18 @@ jak_prhp zippity zippityuk -@source:geneve.cpp +@source:ti/geneve.cpp geneve // 1987 Myarc Geneve 9640 genmod // 1990 Myarc / Ron G. Walters Geneve 9640 Mod -@source:geniusiq.cpp +@source:vtech/geniusiq.cpp iq128 // 1997 Genius IQ 128 (Germany) iq128_fr // 1997 Genius PC (France) iqtv512 // 1998 IQ TV512 (Germany) itunlim // 1998 IT Unlimited (UK) pcunlim // 1997 PC Unlimited (USA/Canada) -@source:geniusjr.cpp +@source:vtech/geniusjr.cpp gj4000 // Genius Junior 4000 (Germany) gj5000 // Genius Junior 5000 (Germany) gjmovie // Genius Junior Movie (Germany) @@ -15429,7 +15429,7 @@ gls // Genius Leader Select pitagjr // Pitagorin Junior scientus // Scientus (France, from C.Q.F.D) -@source:genpc.cpp +@source:pc/genpc.cpp pc // 1987 PC with CGA pcega // 1987 PC with EGA pcherc // 1987 PC with Hercules (for testing hercules) @@ -15437,30 +15437,30 @@ pcmda // 1987 PC with MDA pcvga // 198? PC-XT (VGA, MF2 Keyboard) pcv20 // 198? PC-XT with V20 CPU -@source:getaway.cpp +@source:univers/getaway.cpp getaway -@source:gfamily.cpp +@source:misc/gfamily.cpp gmfamily // -@source:ggconnie.cpp +@source:pce/ggconnie.cpp fishingm // (c) 1997 Capcom ggconnie // (c) ???? Capcom smf // (c) 1997 Capcom -@source:ghosteo.cpp +@source:eolith/ghosteo.cpp bballoon // (c) 2003 Eolith hapytour // (c) 2005 GAV Company (on Eolith's Ghost hardware) touryuu // (c) 200? Yuki Enterprise -@source:giclassic.cpp +@source:konami/giclassic.cpp giclasex giclassvr -@source:gigatron.cpp +@source:skeleton/gigatron.cpp gigatron // (c) 2018 Marcel van Kervinck -@source:gijoe.cpp +@source:konami/gijoe.cpp gijoe // GX069 (c) 1991 (World) gijoea // GX069 (c) 1991 (Asia) gijoeea // GX069 (c) 1991 (World) @@ -15468,22 +15468,22 @@ gijoej // GX069 (c) 1991 (Japan) gijoeu // GX069 (c) 1991 (US) gijoeua // GX069 (c) 1991 (US) -@source:gimix.cpp +@source:skeleton/gimix.cpp gimix // -@source:ginganin.cpp +@source:jaleco/ginganin.cpp ginganin // (c) 1987 Jaleco ginganina // (c) 1987 Jaleco -@source:gizmondo.cpp +@source:tigertel/gizmondo.cpp gizmondo // -@source:gkidabc.cpp +@source:vtech/gkidabc.cpp gkidabc // Genius KID ABC Fan (Germany) miprimlec // Mis Primeras Lecciones (Spain) gjrprofi // Genius Junior Profi (Germany) -@source:gkigt.cpp +@source:igt/gkigt.cpp gkigt4 // gkigt43 // gkigt43n // @@ -15496,26 +15496,26 @@ igtsc // ms72c // ms3 // -@source:gladiatr.cpp +@source:taito/gladiatr.cpp gcastle // QB (c) 1986 Taito Corporation (prototype?) gladiatr // QB (c) 1986 Taito America Corporation (US) greatgur // QB (c) 1986 Taito Corporation (Japan?) ogonsiro // QB (c) 1986 Taito Corporation (Japan) ppking // QO (c) 1985 Taito America Corporation (US) -@source:glass.cpp +@source:gaelco/glass.cpp glass // (c) 1993 - Ref 931021 glass10 // (c) 1993 - Ref 931021 glass10a // (c) 1993 - Ref 931021 shows "Break Edition" on a real PCB glasskr // (c) 1994 - Ref 931021 shows 1994 version, Anime girls, unprotected -@source:glcx.cpp +@source:vtech/glcx.cpp bs9009cx // 1999 BrainStation 9009 CXL (Germany) gl6600cx // 1999 Genius Leader 6600 CX (Germany) gl8008cx // 1999 Genius Leader 8008 CX (Germany) gtbmcx // 2000 Genius Tabletop Black Magic CX (Germany) -@source:globalfr.cpp +@source:misc/globalfr.cpp gl_coc // Carry On Clubbin' (Global) gl_coc29 // gl_coc29p // @@ -15539,7 +15539,7 @@ gl_wywh24 // gl_wywh24p // gl_wywhp // -@source:globalvr.cpp +@source:misc/globalvr.cpp bhead2k // Beach Head 2000 Install - 05/27/03 bhead2k2 // Beach Head 2002 Install - 05/27/03 bhead2k3 // Beach Head 2003 Desert War Install - 05/27/03 @@ -15552,19 +15552,19 @@ nfs // Need for Speed - 4 Cab Link (2 Discs) (v1.0.1 nfsgt // Need for Speed GT (Hard Drive+2 Discs) (v1.1.0 Rev C) nfsug // Need For Speed: Underground Install (2 Discs) (v1.1) -@source:gluck2.cpp +@source:misc/gluck2.cpp gluck2 // 1992 Yung Yu / CYE -@source:gm1000.cpp +@source:skeleton/gm1000.cpp gm1000 // -@source:gmaster.cpp +@source:hartung/gmaster.cpp gmaster // Hartung Gamemaster -@source:gnat10.cpp +@source:skeleton/gnat10.cpp gnat10 // GNAT System 10 -@source:gng.cpp +@source:capcom/gng.cpp diamond // (c) 1989 KH Video (NOT A CAPCOM GAME but runs on GnG hardware) gng // 9/1985 (c) 1985 gnga // 9/1985 (c) 1985 @@ -15577,27 +15577,27 @@ makaimur // 9/1985 (c) 1985 makaimurc // 9/1985 (c) 1985 makaimurg // 9/1985 (c) 1985 -@source:go2000.cpp +@source:suna/go2000.cpp go2000 // (c) 2000 SA -@source:goal92.cpp +@source:seibu/goal92.cpp goal92 // bootleg -@source:goindol.cpp +@source:suna/goindol.cpp goindol // (c) 1987 Sun a Electronics goindolj // (c) 1987 Sun a Electronics goindolu // (c) 1987 Sun a Electronics homo // bootleg -@source:goldart.cpp +@source:gaelco/goldart.cpp goldart goldartp -@source:goldngam.cpp +@source:misc/goldngam.cpp moviecrd // (c) 1998 Golden Games swisspkr // (c) 1990 Golden Games -@source:goldnpkr.cpp +@source:misc/goldnpkr.cpp adpoker // 198?, Unknown animpkr // 198?, Unknown bchancep // 198?, Unknown @@ -15743,7 +15743,7 @@ wupndownb // (c) 1998, Video Klein wupndownc // (c) 1998, Video Klein wupndownd // (c) 1998, Video Klein -@source:goldstar.cpp +@source:igs/goldstar.cpp 3cdpoker // hack? 3cdpokera // hack? aplan // bootleg (WeaShing) @@ -15917,26 +15917,26 @@ wcat3 // wcat3a // wcherry // bootleg -@source:gomoku.cpp +@source:nichibut/gomoku.cpp gomoku // (c) 1981 -@source:good.cpp +@source:misc/good.cpp good // (c) 1998 -@source:goodejan.cpp +@source:seibu/goodejan.cpp goodejan // (c) 1991 Seibu/Tecmo goodejana // (c) 1991 Seibu/Tecmo totmejan // (c) 1991 Seibu/Tecmo -@source:goori.cpp +@source:unico/goori.cpp goori // (c) 1999 Unico -@source:gotcha.cpp +@source:misc/gotcha.cpp gotcha // (c) 1997 Dongsung + "presented by Para" ppchamp // (c) 1997 Dongsung + "presented by Para" ppchampa // (c) 1997 Dongsung + "presented by Para" -@source:gottlieb.cpp +@source:gottlieb/gottlieb.cpp 3stooges // GV-113 (c) 1984 Mylstar 3stoogesa // GV-113 (c) 1984 Mylstar argusg // GV-??? (c) 1982 Gottlieb - never released @@ -15966,15 +15966,15 @@ usvsthem // GV-??? (c) 198? Mylstar vidvince // GV-??? (c) 1984 Mylstar - never released wizwarz // GV-??? (c) 1984 Mylstar - never released -@source:gotya.cpp +@source:gametron/gotya.cpp gotya // (c) 1981 Game-A-Tron thehand // (c) 1981 T.I.C. -@source:goupil.cpp +@source:skeleton/goupil.cpp goupilg1 // goupilg2 // -@source:gp_1.cpp +@source:pinball/gp_1.cpp blvelvet // camlight // chucklck // @@ -15986,7 +15986,7 @@ rio // startrip // vegasgp // -@source:gp_2.cpp +@source:pinball/gp_2.cpp agent777 // andromep // andromepa // @@ -16004,30 +16004,30 @@ sshootep // sshootr2 // suprnova // -@source:gp2x.cpp +@source:gamepark/gp2x.cpp gp2x // GP2X 2005 -@source:gp32.cpp +@source:gamepark/gp32.cpp gp32 // GP32 2001 -@source:gpworld.cpp +@source:sega/gpworld.cpp gpworld // (c) 1984 -@source:gradius3.cpp +@source:konami/gradius3.cpp gradius3 // GX945 (c) 1989 (World) gradius3a // GX945 (c) 1989 (Asia) gradius3j // GX945 (c) 1989 (Japan) gradius3js // GX945 (c) 1989 (Japan, split) -@source:grchamp.cpp +@source:taito/grchamp.cpp grchamp // GM (c) 1981 Taito Corporation grchampa // GM (c) 1981 Taito Corporation grchampb // GM (c) 1981 Taito Corporation -@source:grfd2301.cpp +@source:skeleton/grfd2301.cpp grfd2301 // -@source:gridcomp.cpp +@source:gridcomp/gridcomp.cpp grid1101 // grid1109 // grid1121 // @@ -16035,21 +16035,21 @@ grid1129 // grid1131 // grid1139 // -@source:gridlee.cpp +@source:midway/gridlee.cpp gridlee // [1983 Videa] prototype - no copyright notice -@source:groundfx.cpp +@source:taito/groundfx.cpp groundfx // D51 (c) 1992 Taito Corporation -@source:gsspade.cpp +@source:misc/gsspade.cpp gsspade // -@source:gstream.cpp +@source:promat/gstream.cpp gstream // (c) 2002, Oriental Soft Japan x2222 // (c) 2000, Oriental Soft x2222o // (c) 2000, Oriental Soft -@source:gstriker.cpp +@source:vsystem/gstriker.cpp gstriker // (c) [1993] Human gstrikera // (c) [1993] Human gstrikerj // (c) [1993] Human @@ -16059,12 +16059,12 @@ twcup94b // (c) 1994 Tecmo vgoalsoc // (c) 1994 Tecmo vgoalsoca // (c) 1994 Tecmo -@source:gsword.cpp +@source:taito/gsword.cpp gsword // AC (c) 1984 Taito Corporation gsword2 // AC (c) 1984 Taito Corporation josvolly // AA (c) 1983 Taito Corporation -@source:gticlub.cpp +@source:konami/gticlub.cpp gticlub // GX688 (c)1996 Euro EAA gticluba // GX688 (c)1996 Asia AAA gticlubj // GX688 (c)1996 Japan JAA @@ -16077,7 +16077,7 @@ slrassltj1 // GX672 (c)1997 Japan JAA (original Solar Assau thunderh // GX680 (c)1996 Euro EAA thunderhu // GX680 (c)1996 USA UAA -@source:gts1.cpp +@source:pinball/gts1.cpp astannie // buckrgrs // charlies // @@ -16100,7 +16100,7 @@ sys1test // torch // totem // -@source:gts3.cpp +@source:pinball/gts3.cpp bellring // cactjack // carhop // @@ -16118,7 +16118,7 @@ tfight // tt_game // vegas // -@source:gts3a.cpp +@source:pinball/gts3a.cpp andretti // andretti0 // barbwire // @@ -16161,7 +16161,7 @@ wcsoccer1a // wipeout // wipeout2a // -@source:gts80.cpp +@source:pinball/gts80.cpp blckhole // blckhole2 // blckhols // @@ -16188,7 +16188,7 @@ vlcno_1b // vlcno_1c // vlcno_ax // -@source:gts80a.cpp +@source:pinball/gts80a.cpp alienstr // amazonh // amazonha // @@ -16214,7 +16214,7 @@ striker // thegames // touchdn // -@source:gts80b.cpp +@source:pinball/gts80b.cpp amazonh2 // amazonh3 // amazonh3a // @@ -16287,12 +16287,12 @@ victoryp // victorypf // victorypg // -@source:guab.cpp +@source:jpm/guab.cpp crisscrs // (c) 1986 guab // (c) 1986 tenup // (c) 1988 -@source:gumbo.cpp +@source:misc/gumbo.cpp dblpoint // (c) 1995 Min Corp. dblpointd // (c) 1995 Dong Bang Electron gumbo // (c) 1994 Min Corp. @@ -16302,15 +16302,15 @@ mspuzzlea // (c) 1994 Min Corp. mspuzzleb // (c) 1994 Min Corp. mspuzzleg // (c) 1994 Min Corp. -@source:gumrally.cpp +@source:atari/gumrally.cpp gumrally // Atari Games -@source:gunbustr.cpp +@source:taito/gunbustr.cpp gunbustr // D27 (c) 1992 Taito Corporation Japan (World) gunbustrj // D27 (c) 1992 Taito Corporation (Japan) gunbustru // D27 (c) 1992 Taito America Corporation (US) -@source:gundealr.cpp +@source:dooyong/gundealr.cpp gundealr // (c) 1990 Dooyong gundealra // (c) 1990 Dooyong gundealrbl // bootleg @@ -16319,10 +16319,10 @@ wiseguy // (c) 1990 Dooyong yamyam // (c) 1990 Dooyong yamyamk // (c) 1990 Dooyong -@source:gunpey.cpp +@source:misc/gunpey.cpp gunpey // (c) 2000 Banpresto -@source:gunsmoke.cpp +@source:capcom/gunsmoke.cpp gunsmoke // 11/1985 (c) 1985 (World) gunsmokeb // gunsmokej // 11/1985 (c) 1985 (Japan) @@ -16331,30 +16331,30 @@ gunsmokeua // 11/1985 (c) 1985 (US) gunsmokeub // 11/1985 (c) 1985 (US) gunsmokeg // -@source:gyruss.cpp +@source:konami/gyruss.cpp gyruss // GX347 (c) 1983 gyrussb // bootleg or actual Taito NZ license? gyrussce // GX347 (c) 1983 + Centuri license venus // bootleg -@source:h01x.cpp +@source:h01x/h01x.cpp h01b // H-01B - TRS-80 Level II BASIC nf500a // NF500A - TRS-80 Level II BASIC h01jce // H-01 JCE - TRS-80 Level II BASIC -@source:h19.cpp +@source:heathkit/h19.cpp h19 // Heath H19 (Zenith Z-19) super19 // Super19 replacement ROMS for H19 watz19 // Watzman replacement ROMS for H19 ultra19 // ULTRA ROM replacement ROMS for H19 -@source:h8.cpp +@source:heathkit/h8.cpp h8 // -@source:h89.cpp +@source:heathkit/h89.cpp h89 // -@source:halleys.cpp +@source:taito/halleys.cpp benberob // A26 halleysc // A62 (c) 1986 Taito America Corporation + Coin It (US) halleysc87 // A62 (c) 1986 Taito Corporation (Japan) @@ -16362,20 +16362,20 @@ halleyscj // A62 (c) 1986 Taito Corporation (Japan, rev 1) halleyscja // A62 (c) 1986 Taito Corporation (Japan) halleyscjp // A62 (c) 1985 Taito Corporation (Japan, prototype) -@source:hanaawas.cpp +@source:seta/hanaawas.cpp hanaawas // (c) SetaKikaku -@source:hankin.cpp +@source:pinball/hankin.cpp empsback // fjholden // howzat // orbit1 // shark // -@source:hapyfish.cpp +@source:misc/hapyfish.cpp hapyfsh2 // bootleg -@source:harddriv.cpp +@source:atari/harddriv.cpp harddriv // 136052 (c) 1988 harddriv1 // 136052 (c) 1988 harddriv2 // 136052 (c) 1988 @@ -16432,33 +16432,33 @@ stunrune // 136070 (c) 1989 stunrunj // 136070 (c) 1989 stunrunp // (proto) (c) 1989 -@source:harriet.cpp +@source:quantel/harriet.cpp harriet // 1990 -@source:hawk.cpp +@source:husky/hawk.cpp hawk // Husky Hawk -@source:hazelgr.cpp +@source:misc/hazelgr.cpp hg_frd // Fruit Deuce -@source:hazeltin.cpp +@source:skeleton/hazeltin.cpp hazl1500 // Hazeltine 1500 (c) 1977 hazl1552 // Hazeltine 1552 (c) 1979 -@source:hazl1420.cpp +@source:skeleton/hazl1420.cpp hazl1420 // Hazeltine 1420 (c) 1979 -@source:hcastle.cpp +@source:konami/hcastle.cpp akumajou // GX768 (c) 1988 (Japan) akumajoun // GX768 (c) 1988 (Japan) hcastle // GX768 (c) 1988 hcastlee // GX768 (c) 1988 hcastlek // GX768 (c) 1988 -@source:hds200.cpp +@source:hds/hds200.cpp hds200 // (c) Human Designed Systems -@source:hec2hrp.cpp +@source:hec2hrp/hec2hrp.cpp hec2hr // hec2hrp // hec2hrx // @@ -16469,19 +16469,19 @@ hector1 // interact // victor // -@source:hektor.cpp +@source:openuni/hektor.cpp hektor // Hektor hektor2 // Hektor II hektor3 // Hektor III -@source:heromem.cpp +@source:taito/heromem.cpp heromem // E34 (c) 1997 Taito -@source:hexion.cpp +@source:konami/hexion.cpp hexion // GX122 (c) 1992 hexionb // bootleg -@source:hh_cop400.cpp +@source:handheld/hh_cop400.cpp bship82 // Milton Bradley copspa // National Semiconductor ctstein // Castle Toy @@ -16504,7 +16504,7 @@ solution // SCAT unkeinv // Gordon Barlow Design vidchal // Select Merchandise -@source:hh_cops1.cpp +@source:handheld/hh_cops1.cpp cambrp // Sinclair mbaskb // Mattel mhockey // Mattel @@ -16513,7 +16513,7 @@ msoccer // Mattel qkracerm // National Semiconductor qkspeller // National Semiconductor -@source:hh_hmcs40.cpp +@source:handheld/hh_hmcs40.cpp alnattck // Coleco bambball // Bambino bbtime // Bandai @@ -16556,11 +16556,11 @@ vinvader // VTech wantgman // Actronics / Hanzawa zackman // Bandai -@source:hh_melps4.cpp +@source:handheld/hh_melps4.cpp cfrogger // Coleco gjungler // Gakken -@source:hh_pic16.cpp +@source:handheld/hh_pic16.cpp drdunk // Kmart flash // Ideal hccbaskb // Tiger Electronics @@ -16576,7 +16576,7 @@ ttfballa // Toytronic us2pfball // US Games uspbball // US Games -@source:hh_pps41.cpp +@source:handheld/hh_pps41.cpp brainbaf // Mattel dunksunk // Kmart ftri1 // Fonas @@ -16589,7 +16589,7 @@ rdqa // Selchow & Righter scrabsen // Selchow & Righter smastmind // Invicta -@source:hh_rw5000.cpp +@source:handheld/hh_rw5000.cpp autorace // Mattel gravity // Mattel mbaseb // Mattel @@ -16602,7 +16602,7 @@ rw24k // Rockwell rw30r // Rockwell rw31r // Rockwell -@source:hh_sm510.cpp +@source:handheld/hh_sm510.cpp atakaast // Elektronika auslalom // Elektronika bassmate // Telko @@ -16752,7 +16752,7 @@ txmenpx // Tiger vespovar // Elektronika vfutbol // Elektronika -@source:hh_tms1k.cpp +@source:handheld/hh_tms1k.cpp alphie // Playskool arcmania // Milton Bradley arrball // A-One LSI @@ -16861,7 +16861,7 @@ wizatron // Texas Instruments xl25 // Vulcan zodiac // Coleco -@source:hh_ucom4.cpp +@source:handheld/hh_ucom4.cpp alnchase // Tomy astrocmd // Epoch bcclimbr // Bandai @@ -16887,16 +16887,16 @@ tmscramb // Tomy tmtennis // Tomy ufombs // Bambino -@source:hhtiger.cpp +@source:tangerin/hhtiger.cpp hhtiger // 1983 H/H Tiger -@source:hideseek.cpp +@source:misc/hideseek.cpp hideseek // -@source:higemaru.cpp +@source:capcom/higemaru.cpp higemaru // 9/1984 (c) 1984 -@source:highvdeo.cpp +@source:misc/highvdeo.cpp brasil // (c) 2000 unknown cfever1k // (c) 2000 High Video cfever40 // (c) 2000 High Video @@ -16918,7 +16918,7 @@ tour4000 // (c) 2000 High Video tour4010 // (c) 2000 High Video unksmk // -@source:hikaru.cpp +@source:sega/hikaru.cpp airtrix // 2001.02? Air Trix (Rev A) airtrixo // 2000.10 Air Trix (original) braveff // 1999.06 Syouboushi Brave Fire Fighters @@ -16929,12 +16929,12 @@ swracer // 2000.06 Star Wars: Racer Arcade sgnascar // 2000.10 Nascar Arcade (Rev A) sgnascaro // 2000.09 Nascar Arcade (original) -@source:himesiki.cpp +@source:nasco/himesiki.cpp himesiki // (c) 1989 Hi-Soft androidp // (c) 198? Nasco androidpo // (c) 198? Nasco -@source:hitme.cpp +@source:ramtek/hitme.cpp barricad // (c) 1976 Ramtek brickyrd // (c) 1976 Ramtek hitme // (c) 05/1976 Ramtek @@ -16942,18 +16942,18 @@ hitme1 // (c) 05/1976 Ramtek mirco21 // (c) 08/1976 Mirco super21 // (c) 1978 Mirco -@source:hitpoker.cpp +@source:misc/hitpoker.cpp hitpoker // (c) 1997 -@source:hk68v10.cpp +@source:heurikon/hk68v10.cpp hk68v10 // -@source:hnayayoi.cpp +@source:dynax/hnayayoi.cpp hnayayoi // "02" (c) 1987 Dyna Electronics hnfubuki // "06" (c) 1987 Dynax untoucha // "08" (c) 1987 Dynax -@source:hng64.cpp +@source:snk/hng64.cpp bbust2 // 004 1998/09/11 Beast Busters: Second Nightmare buriki // 007 1999/05/21 Buriki One fatfurwa // 006 1999/01/28 Fatal Fury: Wild Ambition / Garou Densetsu: Wild Ambition @@ -16963,13 +16963,13 @@ sams64 // 002 1997/12/19 Samurai Shodown 64 / Samurai S sams64_2 // 005 1998/10/16 Samurai Shodown: Warrior's Rage / Samurai Spirits: Asura Zanmaden xrally // 003 1998/05/13 Xtreme Rally / Off Beat Racer! -@source:hobbyplay.cpp +@source:misc/hobbyplay.cpp unkhpslt // -@source:hohnadam.cpp +@source:skeleton/hohnadam.cpp hohnadam // -@source:holeland.cpp +@source:tecfri/holeland.cpp crzrally // (c) 1985 Tecfri crzrallya // (c) 1985 Tecfri crzrallyg // (c) 1985 Gecas @@ -16977,7 +16977,7 @@ crzrallyrf // (c) 1985 Recreativos Franco holeland // (c) 1984 holeland2 // (c) 1984 -@source:homedata.cpp +@source:misc/homedata.cpp battlcry // (c) 1991 Home Data battlcryc // (c) 1989 Home Data battlcryp // (c) 1989 Home Data @@ -17000,27 +17000,27 @@ mrokumei // (c) 1988 Home Data reikaids // (c) 1988 Home Data vitaminc // (c) 1989 Home Data -@source:homelab.cpp +@source:homelab/homelab.cpp brailab4 // homelab2 // homelab3 // homelab4 // -@source:homerun.cpp +@source:jaleco/homerun.cpp dynashot // (c) 1988 Jaleco ganjaja // (c) 1990 Jaleco homerun // (c) 1988 Jaleco nhomerun // (c) 1988 Jaleco -@source:homez80.cpp +@source:homebrew/homez80.cpp homez80 // -@source:horizon.cpp +@source:northstar/horizon.cpp nshrz // nshrz2mhz // vector1 // -@source:hornet.cpp +@source:konami/hornet.cpp gradius4 // GX837 (c)1999 nbapbp // GX778 (c)1998 nbapbpa // GX778 (c)1998 @@ -17036,44 +17036,44 @@ terabrst // GX715 (c)1998 USA UEL 1998/07/17 terabrsta // GX715 (c)1998 Asia AAA 1998/02/25 thrilldbu // GE713UF (c)1998 ?AB -@source:hotblock.cpp +@source:misc/hotblock.cpp hotblock // (c) 1993 Nics? / NIX? hotblocka // (c) 1993 Nics? / NIX? hotblockb // (c) 1993 Nics? / NIX? -@source:hotchili.cpp +@source:misc/hotchili.cpp hotchili // (c) 1995 Pacific Gaming Pty Ltd. -@source:hotstuff.cpp +@source:misc/hotstuff.cpp hotstuff // -@source:houseball.cpp +@source:misc/houseball.cpp houseball // (c) 1989 Olakoa -@source:hp_ipc.cpp +@source:hp/hp_ipc.cpp hp_ipc // hp9808a -@source:hp16500.cpp +@source:hp/hp16500.cpp hp16500b // hp1650b // hp1651b // hp165ka0 // -@source:hp2100.cpp +@source:hp/hp2100.cpp hp2100 // HP 2100 and HP 1000 -@source:hp2620.cpp +@source:hp/hp2620.cpp hp2622a // -@source:hp2640.cpp +@source:hp/hp2640.cpp hp2641 // hp2645 // -@source:hp3478a.cpp +@source:skeleton/hp3478a.cpp hp3478a // -@source:hp48.cpp +@source:hp/hp48.cpp hp38g // hp39g // hp48g // HP 48G @@ -17083,24 +17083,24 @@ hp48s // HP 48S hp48sx // HP 48SX hp49g // -@source:hp49gp.cpp +@source:hp/hp49gp.cpp hp49gp // HP 49G+ -@source:hp64k.cpp +@source:hp/hp64k.cpp hp64k // -@source:hp700.cpp +@source:hp/hp700.cpp hp700_70 // hp700_92 // -@source:hp95lx.cpp +@source:hp/hp95lx.cpp hp95lx // -@source:hp9825.cpp +@source:hp/hp9825.cpp hp9825b // HP 9825B hp9825t // HP 9825T -@source:hp9845.cpp +@source:hp/hp9845.cpp hp9835a // hp9835b // hp9845a // @@ -17112,10 +17112,10 @@ hp9845b_de // hp9845c_de // hp9845t_de // -@source:hp9k.cpp +@source:hp/hp9k.cpp hp9816 // -@source:hp9k_3xx.cpp +@source:hp/hp9k_3xx.cpp hp9k310 // hp9k320 // hp9k330 // @@ -17126,62 +17126,62 @@ hp9k370 // hp9k380 // hp9k382 // -@source:hprot1.cpp +@source:skeleton/hprot1.cpp hprot1 // hprot2r6 // hprotr8a // -@source:hpz80unk.cpp +@source:skeleton/hpz80unk.cpp hpz80unk // -@source:hp80.cpp +@source:hp/hp80.cpp hp85 // hp86b // hp86b_001 // hp86b_004 // -@source:hshavoc.cpp +@source:sega/hshavoc.cpp hshavoc // (c) 1993 Data East -@source:ht6000.cpp +@source:casio/ht6000.cpp ht6000 // 1987 Casio -@source:ht68k.cpp +@source:skeleton/ht68k.cpp ht68k // -@source:huebler.cpp +@source:ddr/huebler.cpp amu880 // -@source:hunter2.cpp +@source:husky/hunter2.cpp hunter // Husky Hunter hunter2 // Husky Hunter 2 -@source:hunter16.cpp +@source:husky/hunter16.cpp hunter16 // Husky Hunter 16 hunter216 // Husky Hunter 2/16 hunter1680 // Husky Hunter 16/80 -@source:husky.cpp +@source:husky/husky.cpp husky // DVW Husky -@source:hvyunit.cpp +@source:kaneko/hvyunit.cpp hvyunit // (c) 1988 Kaneko hvyunitj // (c) 1988 Kaneko hvyunitja // (c) 1988 Kaneko hvyunitjo // (c) 1988 Kaneko hvyunitu // (c) 1988 Kaneko -@source:hx20.cpp +@source:epson/hx20.cpp ehx20 // ehx20e // ecm6032 // ecm6127 // -@source:hyhoo.cpp +@source:nichibut/hyhoo.cpp hyhoo // (c) 1987 hyhoo2 // (c) 1987 -@source:hyperspt.cpp +@source:konami/hyperspt.cpp hpolym84 // GX330 (c) 1984 hyperspt // GX330 (c) 1984 + Centuri hypersptb // bootleg @@ -17190,67 +17190,67 @@ roadf2 // GX461 (c) 1984 roadfu // GX461 (c) 1984 roadfh // hack on GX330 board -@source:hyprduel.cpp +@source:metro/hyprduel.cpp hyprduel // (c) 1993 Technosoft (Japan) hyprduel2 // (c) 1993 Technosoft (Japan) magerror // (c) 1994 Technosoft (Japan) (Arcade TV Game List - P.100, Left, 13 from Bottom) -@source:i7000.cpp +@source:skeleton/i7000.cpp i7000 // -@source:ibm3153.cpp +@source:skeleton/ibm3153.cpp ibm3153 // -@source:ibm6580.cpp +@source:ibm6580/ibm6580.cpp ibm6580 // -@source:ibmpc.cpp +@source:pc/ibmpc.cpp ibm5140 // 1985 IBM 5140 ibm5150 // 1981 IBM 5150 ibm5155 // 1982 IBM 5155 ibm5160 // 1982 IBM XT 5160 -@source:ibmpcjr.cpp +@source:pc/ibmpcjr.cpp ibmpcjr // 1984 IBM PC Jr ibmpcjx // 1985 IBM PC JX -@source:icebox.cpp +@source:skeleton/icebox.cpp icebox // Nutting Icebox -@source:icatel.cpp +@source:skeleton/icatel.cpp icatel // -@source:ice_bozopail.cpp +@source:misc/ice_bozopail.cpp ice_bozo // ICE - Bozo Pail Toss -@source:ice_hhhippos.cpp +@source:misc/ice_hhhippos.cpp hhhippos // -@source:ice_tbd.cpp +@source:misc/ice_tbd.cpp ice_tbd // ICE - Turbo Drive -@source:icecold.cpp +@source:pinball/icecold.cpp icecold // icecoldf // zekepeak // -@source:idsa.cpp +@source:pinball/idsa.cpp bsktbllp // v1 // -@source:ie15.cpp +@source:ie15/ie15.cpp ie15 // -@source:iez80.cpp +@source:skeleton/iez80.cpp iez80 // -@source:if800.cpp +@source:skeleton/if800.cpp if800 // -@source:igs_fear.cpp +@source:igs/igs_fear.cpp fearless // (c) 2006 -@source:igs_m027.cpp +@source:igs/igs_m027.cpp amazoni2 // (c) 2002 amazonia // (c) 1999 amazonkp // (c) 1999 @@ -17269,7 +17269,7 @@ sdwx // (c) 2002 slqz3 // (c) 1999 zhongguo // (c) 2000 -@source:igs_m036.cpp +@source:igs/igs_m036.cpp cjddzsp // (c) 200? cjdh2 // (c) 200? cjdh2a // (c) 200? @@ -17279,7 +17279,7 @@ igsm312 // (c) 200? lhtb // (c) 200? lhzb3in1 // (c) 200? -@source:igs009.cpp +@source:igs/igs009.cpp gp98 // (c) 1998 jingbell // (c) 1997 jingbella // (c) 1997 @@ -17287,7 +17287,7 @@ jingbellb // (c) 1997 jingbellc // (c) 1995 jingbelli // (c) 1995? -@source:igs011.cpp +@source:igs/igs011.cpp dbc // (c) 199? drgnwrld // (c) 1997 drgnwrldv10c // (c) 1995 @@ -17309,7 +17309,7 @@ vbowlj // (c) 1996 wlcc // (c) 1996 xymg // (c) 1996 -@source:igs017.cpp +@source:igs/igs017.cpp cpoker2 // (c) 2000? genius6 // (c) 1998 genius6a // (c) 1997 @@ -17331,11 +17331,11 @@ tarzana // (c) 1999 tarzanc // (c) 1999 tjsb // (c) 1997 -@source:igspc.cpp +@source:ibmpc/igspc.cpp eztouch // (c) 200? speeddrv // (c) 2004 -@source:igspoker.cpp +@source:igs/igspoker.cpp chleague // (c) 199? IGS chleagul // (c) 199? IGS chleagxa // (c) 1998 IGS @@ -17363,29 +17363,29 @@ numbr10l // (c) IGS (Board labeled Playmark Srl) pktet346 // (c) 199? IGS stellecu // (c) 1998 -@source:ikki.cpp +@source:sunelect/ikki.cpp farmer // TVG17 (c) 1985 Sun Electronics ikki // TVG17 (c) 1985 Sun Electronics (Japan) -@source:ikt5a.cpp +@source:skeleton/ikt5a.cpp ikt5a // -@source:im01.cpp +@source:elektronika/im01.cpp im01 im01t im05 -@source:imds2.cpp +@source:intel/imds2.cpp imds2 // Intellec MDS series-II -@source:imolagp.cpp +@source:misc/imolagp.cpp imolagp // (c) 198? RB Bologna imolagpo // (c) 198? RB Bologna -@source:imsai.cpp +@source:skeleton/imsai.cpp imsai // -@source:inder.cpp +@source:pinball/inder.cpp atleta // brvteam // canasta // @@ -17397,60 +17397,60 @@ mundial // pinclown // pinmoonl // -@source:inderp.cpp +@source:pinball/inderp.cpp centauri centauri2 skatebrd topaz -@source:indiana.cpp +@source:skeleton/indiana.cpp indiana // -@source:indigo.cpp +@source:sgi/indigo.cpp indigo3k // IP12: Indigo 1, R3000, 33MHz indigo4k // IP20: Indigo 1, R4400, 150MHz -@source:indy_indigo2.cpp +@source:sgi/indy_indigo2.cpp indy_4610 // IP22: Indy, R4600, 100MHz indy_4613 // IP22: Indy, R4600, 133MHz indy_5015 // IP22: Indy, R5000, 150MHz indigo2_4415 // IP24: Indigo 2, R4400, 150MHz -@source:informer_207_100.cpp +@source:informer/informer_207_100.cpp in207100 // Informer 207/100 -@source:informer_207_376.cpp +@source:informer/informer_207_376.cpp in207376 // Informer 207/376 -@source:informer_213.cpp +@source:informer/informer_213.cpp in213 // Informer 213 in213ae // Informer 213 AE -@source:innotv_innotabmax.cpp +@source:vtech/innotv_innotabmax.cpp innotv -@source:instantm.cpp +@source:capcom/instantm.cpp instantm // -@source:instruct.cpp +@source:trainer/instruct.cpp instruct // -@source:inteladv.cpp +@source:vtech/inteladv.cpp cars2lap // CARS 2 Laptop (Germany) dyndesk inteladv -@source:intellec4.cpp +@source:intel/intellec4.cpp intlc44 // intlc440 // -@source:intellec8.cpp +@source:intel/intellec8.cpp intlc8 // -@source:intellect02.cpp +@source:cccp/intellect02.cpp intel02 // -@source:interpro.cpp +@source:interpro/interpro.cpp ip2000 // Intergraph InterPro/InterServe 20x0 ip2400 // Intergraph InterPro/InterServe 24x0 ip2500 // Intergraph InterPro/InterServe 25x0 @@ -17461,10 +17461,10 @@ ip6400 // Intergraph InterPro/InterServe 64x0 ip6700 // Intergraph InterPro/InterServe 67x0 ip6800 // Intergraph InterPro/InterServe 68x0 -@source:intrscti.cpp +@source:misc/intrscti.cpp intrscti // ???? -@source:intv.cpp +@source:intv/intv.cpp intv // Mattel Intellivision - 1979 AKA INTV intv2 // Mattel Intellivision II- 1982? intvecs // 1983 - Mattel Intellivision w/ECS and IntelliVoice expansions @@ -17472,53 +17472,53 @@ intvkbd // 1981 - Mattel Intellivision Keyboard Componen intvoice // Mattel Intellivision + IntelliVoice expansion - 1982 intvsrs // Intellivision (Sears License) - 19?? -@source:inufuku.cpp +@source:vsystem/inufuku.cpp 3on3dunk // (c) 1996 Video System Co. (Japan) inufuku // (c) 1998 Video System Co. (Japan) -@source:invqix.cpp +@source:taito/invqix.cpp invqix // F34 (c) 2003 Taito Corporation -@source:ipc.cpp +@source:intel/ipc.cpp ipb // intel ipc // intel -@source:ipds.cpp +@source:intel/ipds.cpp ipds // intel -@source:iphone2g.cpp +@source:apple/iphone2g.cpp iphone2g // (c) 2007 Apple -@source:iq151.cpp +@source:zpa/iq151.cpp iq151 // -@source:iqblock.cpp +@source:igs/iqblock.cpp grndtour // (c) 1993 iqblock // (c) 1993 -@source:iqunlim.cpp +@source:vtech/iqunlim.cpp iqunlim // (c) 1995 Vtech / Integrated Systems Inc. iqunlimgr // (c) 1995 VTech / Integrated Systems Inc. -@source:iris3130.cpp +@source:sgi/iris3130.cpp iris3130 // IP2: IRIS 3xx0, 68020, 16MHz -@source:irisha.cpp +@source:mgu/irisha.cpp irisha // -@source:irobot.cpp +@source:atari/irobot.cpp irobot // 136029 (c) 1983 -@source:ironhors.cpp +@source:konami/ironhors.cpp dairesya // GX560 (c) 1986 (Japan) farwest // bootleg ironhors // GX560 (c) 1986 ironhorsh // GX560 (c) 1986 -@source:is48x.cpp +@source:skeleton/is48x.cpp is482 // -@source:isbc.cpp +@source:intel/isbc.cpp isbc286 // isbc2861 // isbc28612 // @@ -17528,35 +17528,35 @@ isbc8605 // isbc8630 // sm1810 // -@source:isbc660.cpp +@source:intel/isbc660.cpp isbc660 // Intel iSBC 660 System Chassis -@source:isbc8010.cpp +@source:intel/isbc8010.cpp isbc8010 // isbc8010a // isbc8010b // -@source:isbc8030.cpp +@source:intel/isbc8030.cpp isbc8030 // -@source:iskr103x.cpp +@source:xussrpc/iskr103x.cpp iskr1030m // iskr1031 // -@source:island.cpp +@source:misc/island.cpp isld_vortex // -@source:istellar.cpp +@source:misc/istellar.cpp istellar // (c) 1983 Funai / Gakken -@source:istrebiteli.cpp +@source:terminal/istrebiteli.cpp istreb // motogonki // -@source:itc4.cpp +@source:skeleton/itc4.cpp itc4 // -@source:iteagle.cpp +@source:itech/iteagle.cpp bbh2sp // bbh2spa // bbh2spb // @@ -17579,7 +17579,7 @@ gtfore06 // iteagle // (c) 2000 Incredible Technologies virtpool // -@source:itech32.cpp +@source:itech/itech32.cpp bloodstm // (c) 1994 Strata/Incredible Technologies bloodstm104 // (c) 1994 Strata/Incredible Technologies bloodstm110 // (c) 1994 Strata/Incredible Technologies @@ -17667,7 +17667,7 @@ wcbowldx // (c) 1999 Incredible Technologies shoottv // (c) 199? Incredible Technologies pubball // (c) 1996 Midway/Incredible Technologies -@source:itech8.cpp +@source:itech/itech8.cpp arlingtn // (c) 1991 Strata/Incredible Technologies arlingtna // (c) 1991 Strata/Incredible Technologies dynobop // (c) 1990 Grand Products/Incredible Technologies @@ -17704,7 +17704,7 @@ stratabs // (c) 1990 Strata/Incredible Technologies wfortune // (c) 1989 GameTek wfortunea // (c) 1989 GameTek -@source:itgambl2.cpp +@source:misc/itgambl2.cpp btorneo // (c) 200? unknown cmagica // (c) 200? unknown granfrat // (c) 200? unknown @@ -17728,7 +17728,7 @@ trstar2k // (c) 1999 A.M. unkh8gam // (c) 200? unknown wizard // (c) 1999 A.A. -@source:itgambl3.cpp +@source:misc/itgambl3.cpp ejollyx5 // (c) 200? Solar Games ejollyx9 // grandprx // (c) 200? 4fun @@ -17736,7 +17736,7 @@ queenotg // supjolly // (c) 200? unknown x5jokers // (c) 200? Electronic Projects -@source:itgamble.cpp +@source:misc/itgamble.cpp abacus // (c) 200? unknown bookthr // (c) 200? unknown bowlroad // (c) 2001 Nazionale Elettronica @@ -17756,16 +17756,16 @@ uforobot // (c) 2001 Nazionale Elettronica wcup // (c) 2001 Nazionale Elettronica wcup14 // (c) 2001 Nazionale Elettronica -@source:itt1700.cpp +@source:skeleton/itt1700.cpp itt1700 // -@source:itt3030.cpp +@source:skeleton/itt3030.cpp itt3030 // -@source:itt9216.cpp +@source:skeleton/itt9216.cpp itt9216 // -@source:jack.cpp +@source:cinemat/jack.cpp brix // (c) 1982 Cinematronics + Advanced Microcomputer Systems freeze // Cinematronics jack // (c) 1982 Cinematronics @@ -17784,7 +17784,7 @@ unclepoo // (c) 1983 Diatec zzyzzyxx // (c) 1982 Cinematronics + Advanced Microcomputer Systems zzyzzyxx2 // (c) 1982 Cinematronics + Advanced Microcomputer Systems -@source:jackal.cpp +@source:konami/jackal.cpp jackal // GX631 (c) 1986 (World) jackalbl // bootleg jackalj // GX631 (c) 1986 (Japan) @@ -17792,20 +17792,20 @@ jackalr // GX631 (c) 1986 (World) topgunbl // bootleg topgunr // GX631 (c) 1986 (US) -@source:jackie.cpp +@source:igs/jackie.cpp jackie // (c) 1993 IGS -@source:jackpool.cpp +@source:misc/jackpool.cpp jackpool // (c) 1997 Electronic Projects -@source:jackpot.cpp +@source:misc/jackpot.cpp jackpot jackpota -@source:jade.cpp +@source:skeleton/jade.cpp jade // -@source:jaguar.cpp +@source:atari/jaguar.cpp a51mxr3k // ?? (c) 1998 a51mxr3ka // ?? (c) 1998 area51 // 136105 (c) 1995 @@ -17828,12 +17828,12 @@ maxf_ng // ?? (c) 1996 maxforce // ?? (c) 1996 vcircle // (proto) (c) 1996 -@source:jailbrek.cpp +@source:konami/jailbrek.cpp jailbrek // GX507 (c) 1986 jailbrekb // bootleg manhatan // GX507 (c) 1986 (Japan) -@source:jalmah.cpp +@source:jaleco/jalmah.cpp daireika // (c) 1989 Jaleco/NMK kakumei // (c) 1990 kakumei2 // (c) 1992 @@ -17841,7 +17841,7 @@ mjzoomin // (c) 1990 suchiesp // (c) 1993 urashima // UPL-89052 -@source:jangou.cpp +@source:nichibut/jangou.cpp cntrygrl // (c) 1984 Royal Denshi cntrygrla // (c) 1984 fruitbun // (c) 1984 @@ -17852,22 +17852,22 @@ macha // (c) 1983 Logitec roylcrdn // (c) 1985 roylcrdna // (c) 1982 -@source:jankenmn.cpp +@source:misc/jankenmn.cpp jankenmn // (c) 1985 Sunwise -@source:jantotsu.cpp +@source:sanritsu/jantotsu.cpp jantotsu // (c) 1983 Sanritsu -@source:jazz.cpp +@source:jazz/jazz.cpp mmr4000be // MIPS Magnum R4000 (big) mmr4000le // MIPS Magnum R4000 (little) -@source:jchan.cpp +@source:kaneko/jchan.cpp jchan // (c) 1995 Kaneko jchan2 // (c) 1995 Kaneko jchana // (c) 1995 Kaneko -@source:jclub2.cpp +@source:seta/jclub2.cpp darkhors // bootleg of Jockey Club II jclub2v100 // v1.00 5 OCT. 1994 jclub2v101 // v1.01 20 FEB. 1995 @@ -17880,45 +17880,45 @@ jclub2v204 // v2.04 30 APR. 1997 jclub2v205 // v2.05 21 JUL. 1997 jclub2v220 // v2.20 14 APR. 1998 -@source:jedi.cpp +@source:atari/jedi.cpp jedi // 136030 (c) 1984 -@source:jensen.cpp +@source:dec/jensen.cpp d2k300axp // DEC 2000 Model 300 AXP d2k500axp // DEC 2000 Model 500 AXP dpcaxp150 // DECpc AXP 150 -@source:jeutel.cpp +@source:pinball/jeutel.cpp leking // olympic // -@source:joctronic.cpp +@source:pinball/joctronic.cpp bldyrolr // jpinball // (c) 1986 Joctronic punkywil // slalom03 // walkyria // -@source:jokrwild.cpp +@source:misc/jokrwild.cpp jokrwild // (c) 1988 Sigma -@source:jollyjgr.cpp +@source:taito/jollyjgr.cpp fspiderb // bootleg jollyjgr // KD (c) 1982 Taito Corporation -@source:jongkyo.cpp +@source:kiwako/jongkyo.cpp jongkyo // (c) 1985 Kiwako -@source:jonos.cpp +@source:skeleton/jonos.cpp jonos // -@source:jornada.cpp +@source:hp/jornada.cpp jorn720 // (c) 2000 Hewlett Packard -@source:joystand.cpp +@source:misc/joystand.cpp joystand // 1997 Yuvo -@source:jp.cpp +@source:pinball/jp.cpp america // aqualand // aqualanda // @@ -17934,7 +17934,7 @@ petacona // petaco2 // pimbal // -@source:jpmimpct.cpp +@source:jpm/jpmimpct.cpp buzzundr // Buzzundrum (Ace) cluedo // (c) 1995 cluedo2 // (c) 1995 @@ -17954,7 +17954,7 @@ trivialp // (c) 1996 trivialpd // (c) 1996 trivialpo // (c) 1996 -@source:jpmimpctsw.cpp +@source:jpm/jpmimpctsw.cpp j6aceclb // Ace Of Clubs (Crystal) j6aceclba // j6acehi // Aces High (Ace) @@ -18927,7 +18927,7 @@ j6wthing // Wild Thing (Empire) j6wthinga // j6wthingb // -@source:jpmmps.cpp +@source:jpm/jpmmps.cpp j2008 // zzz_unk 008 (Unk) j2adnote // Add A Note (JPM) j2adnotea // @@ -19121,7 +19121,7 @@ j2westrn // Western (JPM) j2wrb // Wild Reel Bingo (JPM) j2xxx // Triple X (Bwb) -@source:jpms80.cpp +@source:jpm/jpms80.cpp j80alad // Aladdin's Cave (PCP) j80bac // Bank A Coin (JPM) j80blbnk // Blankity Bank (PCP) @@ -19146,7 +19146,7 @@ j80wsprt // Winsprint (JPM) j80wsprt2 // Winsprint (JPM) j80wsprt3 // Winsprint (JPM) -@source:jpmsru.cpp +@source:jpm/jpmsru.cpp j_cnudgr // Cash Nudger? j_dt // Double Top (JPM) j_dud // Nudge Double Up Deluxe (JPM) @@ -19179,7 +19179,7 @@ j_sup2p // Super 2p Shuffle (MDM) j_super2 // Super 2 j_ts // Two Step (JPM) -@source:jpmsys5.cpp +@source:jpm/jpmsys5.cpp cashcade // Cashcade (JPM) monoplcl // Monopoly Classic (JPM) monoplcld // @@ -19191,7 +19191,7 @@ monopolyd // Monopoly (JPM) monopoly4 // Monopoly (JPM) monopoly3 // Monopoly (JPM) -@source:jpmsys5sw.cpp +@source:jpm/jpmsys5sw.cpp j5ar80 // Around The World In Eighty Days (JPM) j5ar80a // j5ar80b // @@ -19355,7 +19355,7 @@ j5ujb // j5wsc // Wall Street Club (JPM) j5wsca // -@source:jpmsys7.cpp +@source:jpm/jpmsys7.cpp j7bmagic // Black Magic (JPM) j7bullio // Bullionaire (Ace) j7cexprs // Cash Xpress (JPM) @@ -19369,76 +19369,76 @@ j7razzmaa // j7tubgld // Turbo Gold (JPM) j7wldwkd // Wild 'N' Wicked (JPM) -@source:jr100.cpp +@source:matsushi/jr100.cpp jr100 // jr100u // -@source:jr200.cpp +@source:matsushi/jr200.cpp jr200 // jr200u // -@source:jrpacman.cpp +@source:pacman/jrpacman.cpp jrpacman // (c) 1983 Midway jrpacmanf // speedup hack -@source:jtc.cpp +@source:ddr/jtc.cpp jtc // jtces23 // jtces40 // jtces88 // -@source:jubilee.cpp +@source:misc/jubilee.cpp jubileep // -@source:juicebox.cpp +@source:mattel/juicebox.cpp juicebox // -@source:juku.cpp +@source:skeleton/juku.cpp juku // -@source:jungleyo.cpp +@source:misc/jungleyo.cpp jungleyo -@source:junior.cpp +@source:elektor/junior.cpp junior // -@source:junior80.cpp +@source:skeleton/junior80.cpp junior80 // -@source:juno106.cpp +@source:roland/juno106.cpp juno106 // mks7 // -@source:juno6.cpp +@source:roland/juno6.cpp juno6 // -@source:junofrst.cpp +@source:konami/junofrst.cpp junofrst // GX310 (c) 1983 Konami junofrstg // GX310 (c) 1983 Konami + Gottlieb license -@source:jupace.cpp +@source:cantab/jupace.cpp jupace // Jupiter Ace -@source:jupiter.cpp +@source:wavemate/jupiter.cpp jupiter2 // jupiter3 // -@source:jvh.cpp +@source:pinball/jvh.cpp escape // formula1 // icemania // movmastr // -@source:k1003.cpp +@source:robotron/k1003.cpp k1003 // -@source:k28.cpp +@source:tiger/k28.cpp k28 // Tiger Electronics -@source:k8915.cpp +@source:robotron/k8915.cpp k8915 // -@source:kaneko16.cpp +@source:kaneko/kaneko16.cpp bakubrkr // (c) 1992 Kaneko berlwall // (c) 1991 Kaneko berlwallk // (c) 1991 Kaneko (Korea, Inter license) @@ -19474,14 +19474,14 @@ shogwarrk // (c) 1992 Kaneko shogwarru // (c) 1992 Kaneko wingforc // (c) 1993 Atlus (Japan, prototype) -@source:kangaroo.cpp +@source:sunelect/kangaroo.cpp fnkyfish // (c) 1981 Sun Electronics kangaroo // (c) 1982 Sun Electronics kangarooa // 136008 (c) 1982 Atari kangaroob // (bootleg) kangarool // (c) 1982 Sun Electronics (Loewen Automaten license) -@source:karnov.cpp +@source:dataeast/karnov.cpp chelnov // (c) 1988 Data East USA (World) chelnovj // (c) 1988 Data East Corporation (Japan) chelnovjbl // bootleg @@ -19493,36 +19493,36 @@ karnovj // (c) 1987 Data East Corporation (Japan) karnovjbl // bootleg wndrplnt // (c) 1987 Data East Corporation (Japan) -@source:kas89.cpp +@source:misc/kas89.cpp kas89 // 1989, SFC S.R.L. -@source:kawai_acr20.cpp +@source:kawai/kawai_acr20.cpp acr20 // -@source:kawai_k1.cpp +@source:kawai/kawai_k1.cpp k1 // k1m // k1r // k1rii // -@source:kawai_k4.cpp +@source:kawai/kawai_k4.cpp k4 // k4r // -@source:kawai_k5.cpp +@source:kawai/kawai_k5.cpp k5 // k5m // -@source:kawai_ksp10.cpp +@source:kawai/kawai_ksp10.cpp ksp10 // -@source:kawai_r100.cpp +@source:kawai/kawai_r100.cpp r100 // -@source:kawai_sx240.cpp +@source:kawai/kawai_sx240.cpp sx240 // -@source:kaypro.cpp +@source:kaypro/kaypro.cpp kaypro1 // Kaypro 1 kaypro10 // Kaypro 10/83 kaypro1084 // Kaypro 10/84 @@ -19539,13 +19539,13 @@ omni2 // Omni II omni4 // Omni 4 robie // Kaypro Robie -@source:kc.cpp +@source:veb/kc.cpp kc85_2 // VEB KC 85/2 kc85_3 // VEB KC 85/3 kc85_4 // VEB KC 85/4 kc85_5 // VEB KC 85/5 -@source:kchamp.cpp +@source:dataeast/kchamp.cpp karatedo // (c) 1984 Data East Corporation (Japan) karatevs // (c) 1984 Data East Corporation (Japan) kchamp // (c) 1984 Data East USA (US) @@ -19556,18 +19556,18 @@ kchampvs3 // (c) 1984 Data East USA (US) kchampvs4 // (c) 1984 Data East USA (US) karateda // bootleg (Automaticos Arfyc) -@source:kdt6.cpp +@source:kontron/kdt6.cpp psi98 // (c) 1984 Kontron -@source:kenseim.cpp +@source:capcom/kenseim.cpp kenseim // 18/04/1994 (c) 1994 Togo/Sigma (Japan) not listed on Capcom's site -@source:kickgoal.cpp +@source:tch/kickgoal.cpp actionhw // (c) 1995 kickgoal // (c) 1995 kickgoala // -@source:kikikai.cpp +@source:taito/kikikai.cpp kicknrun // A87 (c) 1986 Taito Corporation kicknrunu // A87 (c) 1986 Taito Corporation kikikai // A85 (c) 1986 Taito Corporation @@ -19575,16 +19575,16 @@ knightb // bootleg mexico86 // bootleg (Micro Research) mexico86a // bootleg -@source:kim1.cpp +@source:mos/kim1.cpp kim1 // Commodore (MOS) KIM-1 1975 -@source:kingdrby.cpp +@source:tatsumi/kingdrby.cpp cowrace // (c) 20?? hack kingdrbb // (c) 1986 hack kingdrbb2 // (c) 198? hack kingdrby // (c) 1981 Tatsumi -@source:kingobox.cpp +@source:dataeast/kingobox.cpp kingofb // (c) 1985 Wood Place Inc. kingofbj // (c) 1985 Wood Place Inc. ringking // (c) 1985 Data East USA @@ -19592,21 +19592,21 @@ ringking2 // (c) 1985 Data East USA ringking3 // (c) 1985 Data East USA ringkingw // (c) 1985 Wood Place Inc. -@source:kingpin.cpp +@source:misc/kingpin.cpp dealracl // kingpin // (c) 1983 American Communications Laboratories Inc. maxideal // (c) 1983 American Communications Laboratories Inc. -@source:kinst.cpp +@source:rare/kinst.cpp kinst // (c) 1994 Rare kinst2 // (c) 1995 Rare kinst2uk // (c) 1995 Rare -@source:kissproto.cpp +@source:pinball/kissproto.cpp kissp // kissp2 // -@source:klax.cpp +@source:atari/klax.cpp klax // 136075 (c) 1989 klax4 // 136075 (c) 1989 klax5 // 136075 (c) 1989 @@ -19617,29 +19617,29 @@ klaxd2 // 136075 (c) 1989 (Germany) klaxj3 // 136075 (c) 1989 (Japan) klaxj4 // 136075 (c) 1989 (Japan) -@source:kminus.cpp +@source:kyber/kminus.cpp kminus // 1982 Kyber Minus -@source:kncljoe.cpp +@source:seibu/kncljoe.cpp bcrusher // bootleg kncljoe // (c) 1985 Taito Corporation kncljoea // (c) 1985 Taito Corporation -@source:koftball.cpp +@source:bmc/koftball.cpp koftball // (c) 1995 BMC -@source:koikoi.cpp +@source:kiwako/koikoi.cpp koikoi // (c) 1983 Kiwako -@source:konamigq.cpp +@source:konami/konamigq.cpp cryptklr // Crypt Killer (GQ420 UAA) -@source:konamigs.cpp +@source:konami/konamigs.cpp ddrkids // 2000.?? Dance Dance Revolution Kids musclhit // 2000.11 Muscle Ranking Kinniku Banzuke Spray Hitter runpuppy // 2000.?? Run Run Puppy -@source:konamigv.cpp +@source:konami/konamigv.cpp btchamp // GV053, UAA01 hyperath // GV021, Japan 1.00 kdeadeye // GV054, UA01 @@ -19656,7 +19656,7 @@ tmoshsp // GE756, JAB tmoshspa // GE756, JAA weddingr // GX624, JAA -@source:konamigx.cpp +@source:konami/konamigx.cpp crzcross // 1994.?? GX315 (Europe) daiskiss // 1996.03 GX535 (Japan) dragoona // 1995.?? GX417 (Asia) @@ -19699,7 +19699,7 @@ winspike // 1997.?? GX705 (Europe) winspikea // 1997.?? GX705 (Asia) winspikej // 1997.07 GX705 (Japan) -@source:konamim2.cpp +@source:konami/konamim2.cpp btltryst // GX636 (c) 1998 evilngt // GX810 (c) 1998 evilngte // GX810 (c) 1998 @@ -19711,11 +19711,11 @@ totlvice // GX639 (c) 1997 totlvicj // GX639 (c) 1997 totlvicu // GX639 (c) 1997 -@source:konblands.cpp +@source:konami/konblands.cpp kbadlands // GX455 (c) 1984 kbadlandsh // GX455 (c) 1984 -@source:konendev.cpp +@source:konami/konendev.cpp konendev // Konami Endeavour BIOS aadvent // African Adventure blkrose // Black Rose Rapid Fire Grand Prix @@ -19736,13 +19736,13 @@ sultanw // Sultan W whiterus // White Russia rapfire5 // Rapid Fire 5 -@source:kongs470.cpp +@source:konami/kongs470.cpp tdbingo // -@source:konin.cpp +@source:mera/konin.cpp konin // -@source:konmedal.cpp +@source:konami/konmedal.cpp buttobi ddboy ddboya @@ -19754,10 +19754,10 @@ tsukande tsupenta tsururin -@source:konmedal020.cpp +@source:konami/konmedal020.cpp gs471 -@source:konmedal68k.cpp +@source:konami/konmedal68k.cpp crossmg2 dobouchn fruitsmg @@ -19770,51 +19770,51 @@ spcpokan unkkonmd ymcapsul -@source:quickpick5.cpp +@source:konami/quickpick5.cpp quickp5 waijockey -@source:kontest.cpp +@source:konami/kontest.cpp kontest // GX800 (c) 198? (Japan) -@source:kopunch.cpp +@source:sega/kopunch.cpp kopunch // 834-0103 (c) 1981 Sega -@source:korgds8.cpp +@source:korg/korgds8.cpp ds8 // korg707 // -@source:korgdss1.cpp +@source:korg/korgdss1.cpp dss1 // dssmsrk // -@source:korgdvp1.cpp +@source:korg/korgdvp1.cpp dvp1 // -@source:korgdw8k.cpp +@source:korg/korgdw8k.cpp dw8000 // dw8000ex // ex8000 // -@source:korgm1.cpp +@source:korg/korgm1.cpp korgm1 // korgm1ex // korgm1p1 // korgm1r // korgm1rex // -@source:korgws.cpp +@source:korg/korgws.cpp korgwsad // korgwsex // korgwssr // -@source:korgz3.cpp +@source:korg/korgz3.cpp korgz3 // -@source:kpontoon.cpp +@source:konami/kpontoon.cpp kpontoon // (c) 1993 Konami -@source:kpython.cpp +@source:konami/kpython.cpp dogstdx // (c) 2002 Konami. dogstation Deluxe kpython // (c) 2002 Konami. Python Bios pesta // (c) 2002 Konami. Pro Evolution Soccer The Arcade @@ -19822,22 +19822,22 @@ popn9 // (c) 2003 Konami. Pop'n Music 9 wswe // (c) 2002 Konami. World Soccer Winning Eleven wswe2k3 // (c) 2002 Konami. World Soccer Winning Eleven 2003 -@source:kramermc.cpp +@source:ddr/kramermc.cpp kramermc // 1987 Kramer MC -@source:krokha.cpp +@source:misc/krokha.cpp krokha // 1990 SKB Kontur, USSR -@source:kron.cpp +@source:skeleton/kron.cpp kron180 // 1995 Kron Ltd, Ukraine -@source:krz2000.cpp +@source:kurzweil/krz2000.cpp k2000 // (c) 1990 Kurzweil Music Systems -@source:ksayakyu.cpp +@source:taito/ksayakyu.cpp ksayakyu // ??? (c) 1985 Taito Corporation -@source:ksys573.cpp +@source:konami/ksys573.cpp animechmp // 2000 - Anime Champ (GCA07 VER. JAA) bassang2 // 1998 - Bass Angler 2 (GE865 VER. JAA) bassangl // 1998 - Bass Angler (GE765 VER. JAA) @@ -19986,17 +19986,17 @@ salarymc // 2000 - Salary Man Champ (G*A18 VER. JAA) stepchmp // 1999 - Step Champ (GE930 VER. JA) sys573 // -@source:ktm3.cpp +@source:synertek/ktm3.cpp ktm3 // (c) 1980 Synertek Systems Corp. -@source:kungfur.cpp +@source:namco/kungfur.cpp kungfur // (c) 1987 -@source:kurukuru.cpp +@source:misc/kurukuru.cpp kurukuru // (c) 1990 Success / Taiyo Jidoki. ppj // (c) 199? Success / Taiyo Jidoki. -@source:kyocera.cpp +@source:kyocera/kyocera.cpp kc85 // m10 // npc8300 // @@ -20006,7 +20006,7 @@ tandy102 // tandy200 // trsm100 // -@source:kyugo.cpp +@source:misc/kyugo.cpp 99lstwar // (c) 1985 Proma 99lstwara // (c) 1985 Proma 99lstwarb // bootleg @@ -20029,15 +20029,15 @@ skywolf3 // bootleg sonofphx // bootleg srdmissn // (c) 1986 Taito Corporation -@source:labtam.cpp +@source:labtam/labtam.cpp labtam // Labtam 3000 model 3006 -@source:labyrunr.cpp +@source:konami/labyrunr.cpp labyrunr // GX771 (c) 1987 (Japan) labyrunrk // GX771 (c) 1987 (Japan) tricktrp // GX771 (c) 1987 -@source:ladybug.cpp +@source:univers/ladybug.cpp cavenger // 8106 (c) 1981 dorodon // Falcon dorodon2 // Falcon @@ -20048,29 +20048,29 @@ mrsdyna // 8203 (c) 1982 Universal snapjack // ???? (c) sraider // 8203 (c) 1982 Universal -@source:ladyfrog.cpp +@source:misc/ladyfrog.cpp ladyfrog // (c) 1990 Mondial Games toucheme // touchemea // -@source:lancelot.cpp +@source:pinball/lancelot.cpp lancelot // -@source:laser3k.cpp +@source:vtech/laser3k.cpp las3000 // 1983 Laser 3000 -@source:laserbas.cpp +@source:misc/laserbas.cpp futflash // (c) 1981 HOEI (Arcade TV Game List - P.96, Right, 18 from top) laserbas // (c) 1981 Amstar/HOEI laserbasa // (c) 1981 Amstar/HOEI -@source:laserbat.cpp +@source:zaccaria/laserbat.cpp catnmous // (c) 1982 catnmousa // (c) 1982 laserbat // (c) 1981 lazarian // (c) 1981 -@source:lasso.cpp +@source:snk/lasso.cpp chameleo // (c) 1983 Jaleco lasso // 'WM' (c) 1982 photof // (c) 1984 Jaleco / Casio @@ -20079,10 +20079,10 @@ pinboa // (c) 1984 Jaleco pinbos // (c) 1985 Strike wwjgtin // (c) 1984 Jaleco / Casio -@source:lastbank.cpp +@source:excelent/lastbank.cpp lastbank // (c) 1994 Excellent System -@source:lastduel.cpp +@source:capcom/lastduel.cpp lastduel // 7/1988 (c) 1988 (US) lastduelb // bootleg lastduelj // 7/1988 (c) 1988 (Japan) @@ -20094,49 +20094,49 @@ ledstorm // 1988 (c) 1988 (US) madgear // 2/1989 (c) 1989 (US) madgearj // 2/1989 (c) 1989 (Japan) -@source:lastfght.cpp +@source:subsino/lastfght.cpp lastfght // (c) 2000 Subsino -@source:laz_aftrshok.cpp +@source:misc/laz_aftrshok.cpp aftrshok // Lazer-Tron Aftershock aftrshoka // -@source:laz_ribrac.cpp +@source:misc/laz_ribrac.cpp awetoss // Lazer-Tron Awesome Toss 'Em ribrac // Lazer-Tron Ribbit Racin -@source:lazercmd.cpp +@source:meadows/lazercmd.cpp bbonk // [1976?] lazercmd // [1976?] medlanes // [1977?] -@source:lb186.cpp +@source:ampro/lb186.cpp lb186 // Ampro Little Board/186 -@source:lbeach.cpp +@source:olympia/lbeach.cpp lbeach speedrs -@source:lbpc.cpp +@source:ampro/lbpc.cpp lbpc // Ampro Little Board/PC -@source:lc80.cpp +@source:veb/lc80.cpp lc80 // lc80a // lc80e // lc80_2 // -@source:lckydraw.cpp +@source:pinball/lckydraw.cpp lckydraw // (c) 1979 Mirco lckydrawa // (c) 1979 Mirco -@source:lcmate2.cpp +@source:vtech/lcmate2.cpp lcmate2 // -@source:ld50.cpp +@source:casio/ld50.cpp ld50 // -@source:leapfrog_iquest.cpp +@source:leapfrog/leapfrog_iquest.cpp iquest ttwistfb ttwistbq @@ -20145,34 +20145,34 @@ ttwistsp ttwistvc turboex -@source:leapfrog_leappad.cpp +@source:leapfrog/leapfrog_leappad.cpp leappad // (c) 2001 LeapFrog / Knowledge Kids Enterprises, Inc. mfleappad // (c) 2002 LeapFrog ltleappad // (c) 2005 LeapFrog -@source:leapfrog_leapster_explorer.cpp +@source:leapfrog/leapfrog_leapster_explorer.cpp leapexpr -@source:leapster.cpp +@source:leapfrog/leapster.cpp leapster // leapster2 // leapsterlmx // leapstertv // -@source:learnwin.cpp +@source:skeleton/learnwin.cpp learnwin // 1986 V-Tech learnwin2 // learnwin1 // learnwinf // spielmast // Yuvo -@source:lee1214.cpp +@source:skeleton/lee1214.cpp lee1214d // -@source:lee1220.cpp +@source:skeleton/lee1220.cpp lee1220 // -@source:legionna.cpp +@source:seibu/legionna.cpp cupsoc // (c) 1992 Seibu cupsoca // (c) 1992 Seibu cupsocb // (c) 1992 Seibu @@ -20196,7 +20196,7 @@ olysoc92 // (c) 1992 Seibu olysoc92a // (c) 1992 Seibu olysoc92b // (c) 1992 Seibu -@source:leland.cpp +@source:cinemat/leland.cpp aafb // (c) 1989 Leland aafbb // (c) 1989 Leland aafbc // (c) 1989 Leland @@ -20235,13 +20235,13 @@ indyheat // (c) 1991 Leland wsf // (c) 1990 Leland wsf3 // (c) 1990 Leland -@source:lemmings.cpp +@source:dataeast/lemmings.cpp lemmings // prototype (c) 1991 Data East USA (US) -@source:lependu.cpp +@source:misc/lependu.cpp lependu // 198? Avenir Amusement Inc. -@source:lethal.cpp +@source:konami/lethal.cpp lethalen // GX191 (c) 1992 lethaleneaa // GX191 (c) 1992 lethaleneab // GX191 (c) 1992 @@ -20252,7 +20252,7 @@ lethalenua // GX191 (c) 1992 lethalenub // GX191 (c) 1992 lethalenux // GX191 (c) 1992 -@source:lethalj.cpp +@source:misc/lethalj.cpp cclownz // (c) 1999 LAI Games cfarm // (c) 1999 LAI Games eggventr // (c) 1997 The Game Room @@ -20268,28 +20268,28 @@ lethalj // (c) 1996 The Game Room ripribit // (c) 1997 LAI Games ripribita // (c) 1997 LAI Games -@source:lft.cpp +@source:skeleton/lft.cpp lft1230 // lft1510 // -@source:lft_chiptune.cpp +@source:homebrew/lft_chiptune.cpp powernin // Power Ninja Action Challenge, by [lft] (2009) hwchiptn // The Hardware Chiptune Project, by [lft] and kryo (2007) -@source:lft_craft.cpp +@source:homebrew/lft_craft.cpp craft // Craft, by [lft] (2008) -@source:lft_phasor.cpp +@source:homebrew/lft_phasor.cpp phasor // Phasor, by [lft] (2010) -@source:lg-dvd.cpp +@source:skeleton/lg-dvd.cpp lggp40 // -@source:lgp.cpp +@source:taito/lgp.cpp lgp // (c) 1983 Taito lgpalt // (c) 1983 Taito -@source:liberate.cpp +@source:dataeast/liberate.cpp boomrang // (c) 1983 boomranga // (c) 1983 dualaslt // (c) 1984 Data East USA (US) @@ -20302,21 +20302,21 @@ prosporta // (c) 1983 yellowcbb // bootleg yellowcbj // (c) 1984 -@source:liberatr.cpp +@source:atari/liberatr.cpp liberatr // 136012 (c) 1982 liberatr2 // 136012 (c) 1982 -@source:lilith.cpp +@source:skeleton/lilith.cpp lilith // -@source:limenko.cpp +@source:misc/limenko.cpp dynabomb // (c) 2000 Limenko legendoh // (c) 2000 Limenko sb2003 // (c) 2003 Limenko sb2003a // (c) 2003 Limenko spotty // (c) 2001 Prince Co. -@source:lindbergh.cpp +@source:sega/lindbergh.cpp 2spicy // abclimax // ghostsev // @@ -20337,19 +20337,19 @@ segartv // vf5 // vtennis3 // -@source:lisa.cpp +@source:apple/lisa.cpp lisa // 1983 Apple Lisa lisa2 // 1984 Apple Lisa 2 lisa210 // 1984 Apple Lisa 2/10 macxl // 1985 Apple Macintosh XL -@source:littlerb.cpp +@source:tch/littlerb.cpp littlerb // (c) 1993 TCH -@source:lk3000.cpp +@source:skeleton/lk3000.cpp lk3000 -@source:lkage.cpp +@source:taito/lkage.cpp bygone // A53 (c) 1985 Taito Corporation - prototype ? lkage // A54 (c) 1984 Taito Corporation lkageb // bootleg @@ -20359,49 +20359,49 @@ lkageb4 // bootleg lkageo // A54 (c) 1984 Taito Corporation lkageoo // A54 (c) 1984 Taito Corporation -@source:llc1.cpp +@source:ddr/llc1.cpp llc1 // -@source:llc2.cpp +@source:ddr/llc2.cpp llc2 // -@source:lms46.cpp +@source:skeleton/lms46.cpp lms46 // -@source:lnw80.cpp +@source:trs/lnw80.cpp lnw80 // LNW Research LNW-80 -@source:lockon.cpp +@source:tatsumi/lockon.cpp lockon // (c) 1986 Tatsumi lockonc // (c) 1986 Tatsumi -@source:lola8a.cpp +@source:skeleton/lola8a.cpp lola8a // -@source:looping.cpp +@source:venture/looping.cpp looping // (c) 1982 Video Games GmbH loopingv // (c) 1982 Video Games GmbH (Venture Line license) loopingva // (c) 1982 Video Games GmbH (Venture Line license) skybump // (c) 1982 Venture Line -@source:lordgun.cpp +@source:igs/lordgun.cpp aliencha // (c) 1994 alienchac // (c) 1994 lordgun // (c) 1994 -@source:lsasquad.cpp +@source:taito/lsasquad.cpp daikaiju // A74 (c) 1986 Taito lsasquad // A64 (c) 1986 Taito Corporation / Taito America (dip switch) storming // A64 (c) 1986 Taito Corporation storminga // bootleg -@source:ltcasino.cpp +@source:misc/ltcasino.cpp ltcasin2 // (c) 1984 Digital Controls Inc ltcasin2a // (c) 1984 Digital Controls Inc ltcasino // (c) 1982 Digital Controls Inc mv4in1 // (c) 1983 Entertainment Enterprises -@source:ltd.cpp +@source:pinball/ltd.cpp alcapone // arizona // atla_ltd // @@ -20425,24 +20425,24 @@ vikngkng // zephy // zephya // -@source:luckgrln.cpp +@source:wing/luckgrln.cpp 7smash // (c) 1993 Sovic luckgrln // (c) 1991 Wing Co. Ltd -@source:lucky37.cpp +@source:wing/lucky37.cpp lucky21 // (c) 199? Wing Co. Ltd lucky21d // (c) 199? Wing Co. Ltd lucky25 // (c) 199? Wing Co. Ltd lucky37 // (c) 199? Wing Co. Ltd bingo75 // (c) 199? Wing Co. Ltd -@source:lucky74.cpp +@source:wing/lucky74.cpp excitbj // (c) 1992 Wing Co. Ltd lucky74 // (c) 1988 Wing Co. Ltd lucky74a // (c) 1988 Wing Co. Ltd lucky74b // (c) 1988 Wing Co. Ltd -@source:luckybal.cpp +@source:misc/luckybal.cpp luckybal // (c) 1999 Sielcon Games luckybala // (c) 1996 Sielcon Games luckybalb // (c) 1996 Sielcon Games @@ -20450,19 +20450,19 @@ luckybalc // (c) 1996 Sielcon Games luckybald // (c) 1996 Sielcon Games luckybale // (c) 1996 Sielcon Games -@source:luna_68k.cpp +@source:omron/luna_68k.cpp luna // Omron Luna -@source:lvcards.cpp +@source:tehkan/lvcards.cpp lvcards // (c) 1985 Tehkan lvcardsa // (c) 1985 Tehkan lvpoker // ???? - (c) 1985 Tehkan ponttehk // 6011 - (c) 1985 Tehkan -@source:lviv.cpp +@source:cccp/lviv.cpp lviv // Lviv/L'vov -@source:lwings.cpp +@source:capcom/lwings.cpp avengers // 2/1987 (c) 1987 (US) avengers2 // 2/1987 (c) 1987 (US) buraiken // 2/1987 (c) 1987 (Japan) @@ -20481,15 +20481,15 @@ trojanb // bootleg trojanj // 4/1986 (c) 1986 (Japan) trojanr // 4/1986 (c) 1986 + Romstar -@source:lwriter.cpp +@source:apple/lwriter.cpp lwriter // Apple LaserWriter lwriterplus // Apple LaserWriter Plus lwriter2nt // Apple LaserWriter II NT -@source:lynx.cpp +@source:atari/lynx.cpp lynx // Atari Lynx Handheld -@source:m10.cpp +@source:irem/m10.cpp andromed // (c) 1979 greenber // Irem headoni // Irem no copyright notice (1979 - Arcade TV Game List - P.98, Left, 7 from top) @@ -20498,7 +20498,7 @@ ipminvad1 // M10 incomplete dump skychut // Irem [1980] spacbeam // M15 no copyright notice -@source:m107.cpp +@source:irem/m107.cpp airass // (c) 1993 Irem (World) dsoccr94 // (c) 1994 Irem (Data East Corporation license) dsoccr94k // @@ -20506,38 +20506,38 @@ firebarr // (c) 1993 Irem (Japan) kftgoal // (c) 1994 Jaleco wpksoc // (c) 1995 Jaleco -@source:m14.cpp +@source:irem/m14.cpp ptrmj // M14 (c) 1979 -@source:m20.cpp +@source:olivetti/m20.cpp m20 // m40 // m44 // -@source:m24.cpp +@source:olivetti/m24.cpp m21 // Olivetti M21 Portable m24 // m240 // -@source:m3.cpp +@source:lsi/m3.cpp m3 // -@source:m5.cpp +@source:sord/m5.cpp m5 // m5p // m5p_brno // -@source:m52.cpp +@source:irem/m52.cpp alpha1v // Vision Electronics mpatrol // M52 (c) 1982 mpatrolw // M52 (c) 1982 + Williams license mranger // bootleg -@source:m57.cpp +@source:irem/m57.cpp newtangl // (c) 1983 troangel // (c) 1983 -@source:m58.cpp +@source:irem/m58.cpp 10yard // (c) 1983 10yard85 // (c) 1985 10yardj // (c) 1983 @@ -20545,7 +20545,7 @@ vs10yard // (c) 1983/1984 vs10yardj // (c) 1983/1984 vs10yardu // (c) 1983/1984 -@source:m62.cpp +@source:irem/m62.cpp battroad // (c) 1984 horizon // (c) 1985 kidniki // (c) 1986 + Data East USA license @@ -20571,25 +20571,25 @@ spelunkrj // (c) 1985 licensed from Broderbund yanchamr // (c) 1986 (Japan) youjyudn // (c) 1986 (Japan) -@source:m62_bkungfu.cpp +@source:irem/m62_bkungfu.cpp bkungfu // (c) 1987 Irem -@source:m63.cpp +@source:irem/m63.cpp atomboy // M63 (c) 1985 Irem + Memetron license atomboya // M63 (c) 1985 Irem + Memetron license fghtbskt // (c) 1984 Paradise Co. Ltd. wilytowr // M63 (c) 1984 -@source:m6805evs.cpp +@source:motorola/m6805evs.cpp m6805evs // -@source:m68705prg.cpp +@source:motorola/m68705prg.cpp 705p3prg // 705p5prg // 705r3prg // 705u3prg // -@source:m72.cpp +@source:irem/m72.cpp airduel // (c) 1990 (World) airduelu // (c) 1990 Irem America (US) airdueljm72 // (c) 1990 (Japan) @@ -20639,13 +20639,13 @@ rtypeu // (c) 1987 + Nintendo USA license (US) xmultipl // (c) 1989 (Japan) xmultiplm72 // (c) 1989 (Japan) -@source:m79152pc.cpp +@source:mera/m79152pc.cpp m79152pc // -@source:m79amb.cpp +@source:midw8080/m79amb.cpp m79amb // (c) 1977 RamTek -@source:m90.cpp +@source:irem/m90.cpp atompunk // (c) 1991 Irem America (licensed from Hudson Soft) bbmanw // (c) 1992 Irem (World) bbmanwj // (c) 1992 Irem (Japan) @@ -20665,7 +20665,7 @@ quizf1 // (c) 1992 Irem (Japan) riskchal // (c) 1993 Irem shisen2 // (c) 1993 Tamtex -@source:m92.cpp +@source:irem/m92.cpp bmaster // (c) 1991 Irem (World) crossbld // (c) 1991 Irem (Japan) dsoccr94j // (c) 1994 Irem (Japan) @@ -20706,7 +20706,7 @@ uccopsaru // (c) 1992 Irem America (US) uccopsj // (c) 1992 Irem (Japan) uccopsu // (c) 1992 Irem America (US) -@source:mac.cpp +@source:apple/mac.cpp mac2fdhd // 1988 Apple Macintosh II (FDHD) maccclas // 1993 Apple Macintosh Color Classic macclas2 // 1991 Apple Macintosh Classic II @@ -20725,17 +20725,17 @@ maclc3 // 1993 Apple Macintosh LC III maclc520 // 1993 Apple Macintosh LC 520 macse30 // 1989 Apple Macintosh SE/30 -@source:macpdm.cpp +@source:apple/macpdm.cpp pmac6100 // 1993 Apple Power Macintosh 6100 -@source:macquadra700.cpp +@source:apple/macquadra700.cpp macqd700 // 1991 Apple Macintosh Quadra 700 -@source:macprtb.cpp +@source:apple/macprtb.cpp macprtb // 1989 Apple Macintosh Portable macpb100 // 1991 Apple Macintosh PowerBook 100 -@source:macpwrbk030.cpp +@source:apple/macpwrbk030.cpp macpb140 // 1991 Apple Macintosh PowerBook 140 macpb145 // 1992 Apple Macintosh PowerBook 145 macpb145b // 1993 Apple Macintosh PowerBook 145B @@ -20745,7 +20745,7 @@ macpb180 // 1992 Apple Macintosh PowerBook 180 macpb180c // 1992 Apple Macintosh PowerBook 180c macpd210 // 1992 Apple Macintosh PowerBook Duo 210 -@source:mac128.cpp +@source:apple/mac128.cpp mac128k // 1984 Apple Macintosh mac512k // 1985 Apple Macintosh 512k mac512ke // 1986 Apple Macintosh 512ke @@ -20756,7 +20756,7 @@ macsefd // 1988 Apple Macintosh SE (FDHD) unitron // 1985 Unitron utrn1024 // 1986 Unitron 1024 -@source:macp.cpp +@source:pinball/macp.cpp glxplay // glxplay2 // kidnap // @@ -20770,14 +20770,14 @@ spcpnthr // spctrain // spctraino // -@source:macpci.cpp +@source:apple/macpci.cpp pippin // -@source:macrossp.cpp +@source:nmk/macrossp.cpp macrossp // (c) 1996 Banpresto quizmoon // (c) 1997 Banpresto -@source:macs.cpp +@source:seta/macs.cpp cultname // (c) 1995 I'Max kisekaeh // (c) 1995 I'Max kisekaem // (c) 1995 I'Max @@ -20786,15 +20786,15 @@ macsbios // yujan // (C) 1999 Yubis yuka // (c) 1999 Yubis -@source:madalien.cpp +@source:dataeast/madalien.cpp madalien // (c) 1980 madaliena // (c) 1980 madalienb // (c) 1980 -@source:madmotor.cpp +@source:dataeast/madmotor.cpp madmotor // (c) [1989] Mitchell -@source:magic10.cpp +@source:misc/magic10.cpp hotslot // (c) 1996 ABM Games magic10 // (c) 1995 A.W.P. Games magic102 // (c) 1997 ABM Games @@ -20810,7 +20810,7 @@ suprpool // (c) 1998 ABM Games lunaprk // (c) 1998 ABM Games altaten // 1999 unknown -@source:magicard.cpp +@source:misc/magicard.cpp belslots // (c) 1999 Impera bigdeal0 // (c) 2001 Impera dallaspk // 1993, unknown @@ -20833,32 +20833,32 @@ quingo // (c) 1999 Impera unkpkr_w // 1993, unknown unkte06 // (c) 199? Impera -@source:magiceyes_pollux_vr3520f.cpp +@source:tvgames/magiceyes_pollux_vr3520f.cpp didj // (c) 2008 Leapfrog -@source:magicfly.cpp +@source:misc/magicfly.cpp 7mezzo // 198? Unknown bchance // 198? Unknown magicfly // (c) 198? P&A GAMES -@source:magictg.cpp +@source:misc/magictg.cpp magictg // (c) 199? Acclaim magictga // (c) 199? Acclaim -@source:magmax.cpp +@source:nichibut/magmax.cpp magmax // (c) 1985 magmaxa // (c) 1985 -@source:magnum.cpp +@source:dulmont/magnum.cpp magnum // -@source:magreel.cpp +@source:misc/magreel.cpp magreel // -@source:magtouch.cpp +@source:misc/magtouch.cpp magtouch // (c) 1995 -@source:mainevt.cpp +@source:konami/mainevt.cpp devstors // GX890 (c) 1988 devstorsx // GX890 (c) 1988 devstorsv // GX890 (c) 1988 @@ -20869,26 +20869,26 @@ mainevt2p // GX799 (c) 1988 mainevto // GX799 (c) 1988 ringohja // GX799 (c) 1988 (Japan) -@source:mainsnk.cpp +@source:snk/mainsnk.cpp canvas // A3008 (c) 1985 mainsnk // (c) 1984 -@source:majorpkr.cpp +@source:misc/majorpkr.cpp majorpkr // (c) 1994 PAL System. majorpkra // (c) 1994 PAL System. majorpkrb // (c) 1994 PAL System. majorpkrc // (c) 1994 PAL System. luckypkr // bootleg/hack. -@source:malzak.cpp +@source:misc/malzak.cpp malzak // (c) 1980? Kitronix malzak2 // (c) 1980? Kitronix -@source:manohman.cpp +@source:adp/manohman.cpp backgamn // (c) 1990 manohman // 199?, Merkur. -@source:mappy.cpp +@source:namco/mappy.cpp digdug2 // (c) 1985 digdug2o // (c) 1985 grobda // (c) 1984 @@ -20908,10 +20908,10 @@ todruaga // (c) 1984 todruagao // (c) 1984 todruagas // (c) 1984 pcb manufactured by Sidam -@source:marblmd2.cpp +@source:atari/marblmd2.cpp marblmd2 -@source:marineb.cpp +@source:orca/marineb.cpp bcruzm12 // (c) 1983 Sigma Ent. Inc. changes // (c) 1982 Orca changesa // (c) 1982 Orca + Eastern Micro Electronics license @@ -20923,61 +20923,61 @@ marineb // (c) 1982 Orca springer // (c) 1982 Orca wanted // (c) 1984 Sigma Ent. Inc. -@source:marinedt.cpp +@source:taito/marinedt.cpp marinedt // MG (c) 1981 Taito Corporation -@source:mario.cpp +@source:nintendo/mario.cpp mario // (c) 1983 Nintendo of America marioe // (c) 1983 Nintendo of America mariof // (c) 1983 Nintendo of America marioj // (c) 1983 Nintendo masao // bootleg -@source:markham.cpp +@source:sunelect/markham.cpp markham // TVG14 (c) 1983 Sun Electronics banbam // TVG16 (c) 1984 Sun Electronics guiness // TVG15 (c) 1984 Sun Electronics pettanp // TVG16 (c) 1984 Sun Electronics (Japan) strnskil // TVG15 (c) 1984 Sun Electronics -@source:marywu.cpp +@source:misc/marywu.cpp marywu // -@source:mastboy.cpp +@source:gaelco/mastboy.cpp mastboy // (c) 1991 - No Ref on the PCB mastboya // (c) 1991 - No Ref on the PCB mastboyi // (c) 1991 - No Ref on the PCB mastboyia // (c) 1991 - No Ref on the PCB -@source:mastboyo.cpp +@source:gaelco/mastboyo.cpp mastboyo // (c) 1987 - No Ref on the PCB mastboyoa // (c) 1987 - No Ref on the PCB mastboyob mastboyoc -@source:matmania.cpp +@source:technos/matmania.cpp excthour // TA-0015 (c) 1985 + Taito license maniach // TA-0017 (c) 1986 + Taito America license maniach2 // TA-0017 (c) 1986 + Taito America license matmania // TA-0015 (c) 1985 + Taito America license -@source:matrix.cpp +@source:misc/matrix.cpp matrix // -@source:mattelchess.cpp +@source:mattel/mattelchess.cpp mchess -@source:max80.cpp +@source:trs/max80.cpp max80 -@source:maxaflex.cpp +@source:atari/maxaflex.cpp maxaflex // mf_achas // (c) 1982 Exidy / First Star Software mf_bdash // (c) 1984 Exidy / First Star Software mf_brist // (c) 1983 Exidy / First Star Software mf_flip // (c) 1983 Exidy / First Star Software -@source:maygay1bsw.cpp +@source:maygay/maygay1bsw.cpp m1albsq // Albert Square (Maygay) m1albsq1 // m1albsq1p // @@ -22069,7 +22069,7 @@ m1wotw // War Of The Worlds (Maygay) m1wotwa // m1wotwb // -@source:maygayep.cpp +@source:maygay/maygayep.cpp ep_21clb // Twenty One Club (Maygay) ep_21clba // ep_25crt // 25 Carrot Gold (Maygay) @@ -22859,7 +22859,7 @@ ep_xspotb // ep_xtra // X-tra X-tra (Maygay) ep_xtraa // -@source:maygayew.cpp +@source:maygay/maygayew.cpp mg_alad // Aladdin's Cave mg_bb // Big Break mg_ewg // Each Way Gambler @@ -22871,7 +22871,7 @@ mg_pbw // Pinball Wizard mg_risk // Risk mg_scl // Super Clue -@source:maygayv1.cpp +@source:maygay/maygayv1.cpp mv1bon // Believe It Or Not mv1cpc // Caesar's Palace Club mv1cpca // @@ -22893,21 +22893,21 @@ screenp3a // screenp4 // screenpl // Screenplay -@source:mazerbla.cpp +@source:stern/mazerbla.cpp greatgun // (c) 1983 mazerbla // (c) 1983 mazerblaa // (c) 1983 -@source:mbc020.cpp +@source:synertek/mbc020.cpp mbc020 // -@source:mbc200.cpp +@source:sanyo/mbc200.cpp mbc200 // -@source:mbc55x.cpp +@source:sanyo/mbc55x.cpp mbc55x // Sanyo MBC-550, MBC-555 -@source:mbee.cpp +@source:applied/mbee.cpp mbee // Microbee 16 Standard or Plus mbee128 // Microbee 128K standard (CP/M) mbee128p // Microbee 128K premium (CP/M) @@ -22922,26 +22922,26 @@ mbeepp // Microbee Premium Plus mbeeppc // Microbee 32 PPC85 mbeett // Microbee Teleterm -@source:mc10.cpp +@source:trs/mc10.cpp alice // Matra & Hachette Ordinateur Alice alice32 // Matra & Hachette Alice 32 alice90 // Matra & Hachette Alice 90 mc10 // MC-10 -@source:mc1000.cpp +@source:cce/mc1000.cpp mc1000 // -@source:mc1502.cpp +@source:xussrpc/mc1502.cpp mc1502 // pk88 // -@source:mc8020.cpp +@source:veb/mc8020.cpp mc8020 // MC 80.2x -@source:mc8030.cpp +@source:veb/mc8030.cpp mc8030 // MC 80.3x -@source:mcatadv.cpp +@source:misc/mcatadv.cpp catt // (c) 1993 Wintechno mcatadv // (c) 1993 Wintechno mcatadvj // (c) 1993 Wintechno @@ -22949,14 +22949,14 @@ nost // (c) 1993 Face nostj // (c) 1993 Face nostk // (c) 1993 Face -@source:mcb216.cpp +@source:cromemco/mcb216.cpp cb308 // mcb216 // -@source:mccpm.cpp +@source:skeleton/mccpm.cpp mccpm // -@source:mcr.cpp +@source:midway/mcr.cpp demoderb // (c) 1984 demoderbc // (c) 1984 domino // (c) 1982 @@ -22990,7 +22990,7 @@ twotiger // (c) 1984 twotigerc // (c) 1984 wacko // (c) 1982 -@source:mcr3.cpp +@source:midway/mcr3.cpp crater // (c) 1984 demoderm // (c) 1984 maxrpm // (c) 1986 @@ -23003,7 +23003,7 @@ spyhuntp // (c) 1983 stargrds // (c) 1987 turbotag // (c) 1985 -@source:mcr68.cpp +@source:midway/mcr68.cpp archrivl // (c) 1989 archrivla // (c) 1989 archrivlb // bootleg @@ -23018,36 +23018,36 @@ spyhunt2a // (c) 1987 trisport // (c) 1989 xenophob // (c) 1987 -@source:mdisk.cpp +@source:mupid/mdisk.cpp mdisk // (c) 198? mupid Computer Ges.m.b.H. fl100 // (c) 198? Grundig -@source:mdt60.cpp +@source:zenith/mdt60.cpp mdt60 // -@source:meadows.cpp +@source:meadows/meadows.cpp bowl3d // [1978?] deadeye // [1978?] gypsyjug // [1978?] minferno // [1978?] -@source:meadwttl.cpp +@source:meadows/meadwttl.cpp bombaway // (c) 1976 Meadows cgunship // (c) 1976 Meadows ckidzo // (c) 1976 Meadows mead4in1 // (c) 197? Meadows -@source:mechatt.cpp +@source:snk/mechatt.cpp mechatt // A8002 'MA' (c) 1989 mechattj // A8002 'MA' (c) 1989 mechattu // A8002 'MA' (c) 1989 mechattu1 // A8002 'MA' (c) 1989 -@source:mediagx.cpp +@source:atari/mediagx.cpp a51site4 // ?? (c) 1998 a51site4a // Sept.11,1998 (c) 1998 -@source:megadriv.cpp +@source:segacons/mdconsole.cpp 32x // 1994 Sega 32X (USA) 32x_mcd // 1995 Sega Mega-CD (Europe w/32X addon) 32x_mcdj // 1994 Sega Mega-CD (Japan w/32X addon) @@ -23077,7 +23077,7 @@ dcat16 // gen_nomd // 1995 Sega Genesis Nomad (USA) megajet // 1993 Sega Mega Jet (Japan) -@source:megadriv_acbl.cpp +@source:sega/megadriv_acbl.cpp aladmdb // MegaDrive-based hack barekch // MegaDrive-based hack barek2ch // MegaDrive-based hack @@ -23094,7 +23094,7 @@ ssf2mdb // MegaDrive-based hack topshoot // (c) 1995 Sun Mixing twinktmb // MegaDrive-based hack -@source:megadriv_rad.cpp +@source:segacons/megadriv_rad.cpp rad_sf2 // (c)2004 Radica rad_sf2p // (c)2004 Radica rad_gen1 // (c)2004 Radica @@ -23109,18 +23109,18 @@ msi_sf2 dgunl3227 ra145 -@source:megadriv_sunplus_hybrid.cpp +@source:segacons/megadriv_sunplus_hybrid.cpp reactmd -@source:megadriv_vt_hybrid.cpp +@source:segacons/megadriv_vt_hybrid.cpp sarc110 sarc110a -@source:megaphx.cpp +@source:misc/megaphx.cpp megaphx // (c) 1991 Dinamic / Inder hamboy // (c) 1990 Dinamic / Inder -@source:megaplay.cpp +@source:sega/megaplay.cpp megaplay // mp_bio // 06 mp_col3 // ?? @@ -23135,7 +23135,7 @@ mp_sonic // 01 mp_sor2 // 05 mp_twcup // 04 -@source:megasys1.cpp +@source:jaleco/megasys1.cpp 64street // (c) 1991 64streetj // (c) 1991 (Japan) 64streetja // (c) 1991 (Japan) @@ -23187,7 +23187,7 @@ stdragonb // bootleg tshingen // (c) 1988 (Japan) tshingena // (c) 1988 (Japan) -@source:megatech.cpp +@source:sega/megatech.cpp megatech // mt_aftrb // 10 mt_arrow // 44 @@ -23238,7 +23238,7 @@ mt_tout // 61 mt_wcsoc // 21 mt_wwar // 48 -@source:megazone.cpp +@source:konami/megazone.cpp megazone // GX319 (c) 1983 megazonea // GX319 (c) 1983 + Interlogic / Kosuka megazoneb // GX319 (c) 1983 @@ -23246,49 +23246,49 @@ megazoneh // GX319 (c) 1983 + Kosuka megazonei // GX319 (c) 1983 megazonej // GX319 (c) 1983 + Interlogic / Kosuka -@source:meijinsn.cpp +@source:alpha/meijinsn.cpp meijinsn // (c) 1986 SNK meijinsna // (c) 1986 SNK -@source:mekd1.cpp +@source:motorola/mekd1.cpp mekd1 // 1975 Motorola Evaluation Kit -@source:mekd2.cpp +@source:motorola/mekd2.cpp mekd2 // 1977 Motorola Evaluation Kit -@source:mekd3.cpp +@source:motorola/mekd3.cpp mekd3 // 1978 Motorola Evaluation Kit -@source:mekd4.cpp +@source:motorola/mekd4.cpp mekd4 // 1980 Motorola Evaluation Kit -@source:mekd5.cpp +@source:motorola/mekd5.cpp mekd5 // 1980 Motorola Evaluation Kit -@source:menghong.cpp +@source:misc/menghong.cpp crzyddz2 // 2006 Sealy menghong // 2004? Sealy -@source:mephisto_academy.cpp +@source:hegener/mephisto_academy.cpp academy academyg academyga -@source:mephisto_amsterdam.cpp +@source:hegener/mephisto_amsterdam.cpp amsterd // Amsterdam dallas16 // Dallas dallas32 // Dallas roma16 // Roma roma32 // Roma -@source:mephisto_berlin.cpp +@source:hegener/mephisto_berlin.cpp berl16 // 1992 Mephisto Berlin 68000 berl16a // 1992 Mephisto Berlin 68000 berlinp // 1994 Mephisto Berlin Pro 68020 berl16l // 1996 Mephisto Berlin 68000 London Upgrade berlinpl // 1996 Mephisto Berlin Pro London Upgrade -@source:mephisto_brikett.cpp +@source:hegener/mephisto_brikett.cpp mephisto mephisto1x mephisto2 @@ -23300,23 +23300,23 @@ mephisto3b mephisto3c mephistoj -@source:mephisto_glasgow.cpp +@source:hegener/mephisto_glasgow.cpp amsterda // Amsterdam dallas16a // Dallas glasgow // Glasgow roma16a // Roma -@source:mephisto_milano.cpp +@source:hegener/mephisto_milano.cpp milano // 1991 Mephisto Milano milanoa // 1991 Mephisto Milano nshort // 1993 Mephisto Nigel Short -@source:mephisto_mm1.cpp +@source:hegener/mephisto_mm1.cpp mm1 mm1b mmirage -@source:mephisto_mm2.cpp +@source:hegener/mephisto_mm2.cpp mm2 // Mephisto MM II mm2a // Mephisto MM II mm2b // Mephisto MM II @@ -23335,12 +23335,12 @@ mm5p rebel5 // Mephisto Rebell 5.0 rebel5a // Mephisto Rebell 5.0 -@source:mephisto_modena.cpp +@source:hegener/mephisto_modena.cpp modena // 1992 Mephisto Modena modenaa // 1992 Mephisto Modena modenab // 1992 Mephisto Modena -@source:mephisto_modular.cpp +@source:hegener/mephisto_modular.cpp alm16 // 1988 Mephisto Almeria 16 Bit alm32 // 1988 Mephisto Almeria 32 Bit port16 // 1989 Mephisto Portorose 16 Bit @@ -23357,7 +23357,7 @@ gen32l // 1996 Mephisto Genius 68030 London Upgrade lond16 // 1996 Mephisto London 16 Bit lond32 // 1996 Mephisto London 32 Bit -@source:mephisto_modular_tm.cpp +@source:hegener/mephisto_modular_tm.cpp port32t lyon32t lyon32t8 @@ -23367,32 +23367,32 @@ berl32t8p lond32t lond32t8 -@source:mephisto_mondial.cpp +@source:hegener/mephisto_mondial.cpp mondial // 1985 Mephisto Mondial -@source:mephisto_mondial2.cpp +@source:hegener/mephisto_mondial2.cpp mondial2 // 1987 Mephisto Mondial II -@source:mephisto_mondial68k.cpp +@source:hegener/mephisto_mondial68k.cpp mondl68k // 1988 Mephisto Mondial 68000XL -@source:mephisto_montec.cpp +@source:hegener/mephisto_montec.cpp montec // 1987 Mephisto Monte Carlo monteca // 1987 Mephisto Monte Carlo montec4 // 1989 Mephisto Monte Carlo IV montec4le // 1990 Mephisto Monte Carlo IV LE -@source:mephisto_polgar.cpp +@source:hegener/mephisto_polgar.cpp polgar // 1990 Mephisto Polgar polgara // 1989 Mephisto Polgar polgar10 // 1990 Mephisto Polgar 10MHz polgar101 // 1990 Mephisto Polgar 10MHz -@source:mephisto_risc.cpp +@source:hegener/mephisto_risc.cpp mrisc // 1992 Mephisto RISC 1MB mrisc2 // 1994 Mephisto RISC II -@source:mephisto_smondial.cpp +@source:hegener/mephisto_smondial.cpp mega4 // 1989 Mephisto Mega IV mega4a // 1989 Mephisto Mega IV smondial // 1986 Mephisto Super Mondial (Ver A) @@ -23400,13 +23400,13 @@ smondialab // 1986 Mephisto Super Mondial (Ver AB) smondialb // 1986 Mephisto Super Mondial (Ver B) smondial2 // 1989 Mephisto Super Mondial II -@source:mephistp.cpp +@source:pinball/mephistp.cpp mephistp // mephistp1 // mephistpn // sport2k // -@source:merit.cpp +@source:merit/merit.cpp bigappg // (c) 1986 Merit / Big Apple Games casino5 // (c) 1989 Merit casino5a // (c) 1984 Merit @@ -23458,13 +23458,13 @@ trvwzha // (c) 1985 Merit trvwzhb // (c) 1985 Merit trvwzv // (c) 1985 Merit -@source:merit3xx.cpp +@source:merit/merit3xx.cpp ma6710 // (c) 1989 Merit ma7551 // (c) 199? Merit ma7556 // (c) 199? Merit ma7558 // (c) 199? Merit -@source:meritm.cpp +@source:merit/meritm.cpp americna // (c) 1987 Merit americnaa // (c) 1987 Merit dodgecty // (c) 1988 Merit @@ -23524,38 +23524,38 @@ realbrod // (c) 1996 Merit realbroda // (c) 1995 Merit spitboss // (c) 1988 Merit -@source:merits.cpp +@source:merit/merits.cpp pubtimed2ch // (c) 1992 Merit Industries, Inc. scrpiond // (c) 1999 Merit Industries, Inc. scrpionda // (c) 1997 Merit Industries, Inc. scrpiondb // (c) 1993 Merit Industries, Inc. -@source:meritsdx.cpp +@source:merit/meritsdx.cpp scrpndx // -@source:meritum.cpp +@source:trs/meritum.cpp meritum1 // meritum2 // meritum_net // -@source:mermaid.cpp +@source:sanritsu/mermaid.cpp mermaid // (c) 1982 Rock-ola, made by Sanritsu rougien // (c) 1982 Sanritsu yachtmn // (c) 1982 [Sanritsu] Esco -@source:mes.cpp +@source:skeleton/mes.cpp mes // -@source:metalmx.cpp +@source:atari/metalmx.cpp metalmx // 136103? (c) 1994 -@source:metlclsh.cpp +@source:dataeast/metlclsh.cpp metlclsh // (c) 1985 Data East -@source:metlfrzr.cpp +@source:seibu/metlfrzr.cpp metlfrzr -@source:metro.cpp +@source:metro/metro.cpp 3kokushi // (c) 1996 Mitchell balcube // (c) 1996 bangball // (c) 1996 Banpresto / Kunihiko Tashiro+Goodhouse @@ -23604,34 +23604,34 @@ toride2j // (c) 1994 vmetal // (c) 1995 Excellent System? vmetaln // (c) 1995 Excellent System? -@source:meyc8080.cpp +@source:misc/meyc8080.cpp casbjack // (c) 1983 Meyco Games mdrawpkr // (c) 1984 Meyco Games mdrawpkra // (c) 1984 Meyco Games wldarrow // (c) 1982 Meyco Games -@source:meyc8088.cpp +@source:misc/meyc8088.cpp gldarrow // (c) 1984 Meyco Games -@source:mfabfz.cpp +@source:skeleton/mfabfz.cpp mfabfz // mfabfz85 // -@source:mg1.cpp +@source:mg1/mg1.cpp mg1 // Whitechapel Computer Works MG-1 -@source:mgames.cpp +@source:merit/mgames.cpp mgames // (c) 1981 Merit -@source:mgavegas.cpp +@source:misc/mgavegas.cpp mgavegas // mgavegas133 // mgavegas21 // -@source:mgolf.cpp +@source:atari/mgolf.cpp mgolf // ?????? prototype 1978 [6502] -@source:mhavoc.cpp +@source:atari/mhavoc.cpp alphaone // (proto) (c) 1983 alphaonea // (proto) (c) 1983 mhavoc // 136025 (c) 1983 @@ -23639,34 +23639,34 @@ mhavoc2 // 136025 (c) 1983 mhavocp // 136025 (c) 1983 mhavocrv // (hack) -@source:mice.cpp +@source:skeleton/mice.cpp mice_6502 // (c) 1981 Microtek International, Inc. mice2_z80 // (c) 1986 Microtek International, Inc. mice2_6502 // (c) 1986 Microtek International, Inc. mice2_8085 // (c) 1986 Microtek International, Inc. mice2_6809 // (c) 1986 Microtek International, Inc. -@source:miconkit.cpp +@source:snk/miconkit.cpp micon2 -@source:micral.cpp +@source:skeleton/micral.cpp micral // questarm -@source:micro20.cpp +@source:skeleton/micro20.cpp micro20 // (c) 1984 GMX -@source:micro3d.cpp +@source:misc/micro3d.cpp botss // (c) 1992 Microprose Games Inc. botss11 // (c) 1992 Microprose Games Inc. f15se // (c) 1991 Microprose Games Inc. f15se21 // (c) 1991 Microprose Games Inc. tankbatl // (c) 1992 Microprose Games Inc. -@source:microb.cpp +@source:beehive/microb.cpp dm3270 // -@source:microdar.cpp +@source:misc/microdar.cpp cfarwest // (c) 1997 Compumatic covidarts // (c) 1997 Covielsa dibifpspdp // (c) 1997 Compumatic / Bifuca @@ -23677,50 +23677,50 @@ diola827 // (c) 1997 Compumatic / Olakoa diolakoa // (c) 1997 Compumatic / Olakoa minidart // (c) 2009 Compumatic -@source:microdec.cpp +@source:morrow/microdec.cpp md2 // md3 // -@source:microkit.cpp +@source:rca/microkit.cpp microkit // -@source:microkorg.cpp +@source:korg/microkorg.cpp microkorg // -@source:micromon.cpp +@source:skeleton/micromon.cpp micromon7141 // -@source:micronic.cpp +@source:skeleton/micronic.cpp micronic // -@source:micropin.cpp +@source:pinball/micropin.cpp pentacup // pentacup2 // -@source:microtan.cpp +@source:tangerin/microtan.cpp mt65 // 1979 Microtan 65 micron // 1980 Micron spinveti // 1980 Space Invasion (ETI) mt6809 // 1984 Microtan 65 (6809 CPU) -@source:microterm_f8.cpp +@source:microterm/microterm_f8.cpp act5a // -@source:microvsn.cpp +@source:mb/microvsn.cpp microvsn // Milton Bradley -@source:midas.cpp +@source:neogeo/midas.cpp hammer // (c) 2000 Andamiro livequiz // (c) 1999 Andamiro -@source:midqslvr.cpp +@source:midway/midqslvr.cpp arctthnd // (c) 2001 Midway Games hydrthnd // (c) 1999 Midway Games offrthnd // (c) 2000 Midway Games ultarctc // (c) 2001 Midway Games ultarctcup // (c) 2001 Midway Games -@source:midtunit.cpp +@source:midway/midtunit.cpp jdreddp // (c) 1993 Midway mk // (c) 1992 Midway mk2 // (c) 1993 Midway @@ -23748,7 +23748,7 @@ nbajamte3a // (c) 1994 Midway (rev 3.0 2/26/94) nbajamte4 // (c) 1994 Midway (rev 4.0 3/03/94) nbajamten // (c) 1995 Midway -@source:midvunit.cpp +@source:midway/midvunit.cpp crusnusa // (c) 1994 Midway crusnusa11 // (c) 1994 Midway crusnusa20 // (c) 1994 Midway @@ -23773,7 +23773,7 @@ wargods // (c) 1996 Midway (HD 10/09/1996 - Dual Resolut wargodsa // (c) 1996 Midway (HD 08/15/1996) wargodsb // (c) 1996 Midway (HD 12/11/1995) -@source:midwunit.cpp +@source:midway/midwunit.cpp mk3 // (c) 1994 Midway mk3p40 // (c) 1994 Midway mk3r10 // (c) 1994 Midway @@ -23800,11 +23800,11 @@ wwfmaniab // (c) 1995 Midway wwfmaniac // (c) 1995 Midway wwfmaniap // (c) 1995 Midway -@source:midxunit.cpp +@source:midway/midxunit.cpp revx // (c) 1994 Midway revxp5 // (c) 1994 Midway -@source:midyunit.cpp +@source:midway/midyunit.cpp hiimpact // (c) 1990 Williams hiimpact1 // (c) 1990 Williams hiimpact2 // (c) 1990 Williams @@ -23860,7 +23860,7 @@ trogpa4 // (c) 1990 Midway (rev 4.00 7/27/90) trogpa5 // (c) 1990 Midway (rev PA5-PAC 8/28/90) trogpa6 // (c) 1990 Midway (rev PA6-PAC 9/09/90) -@source:midzeus.cpp +@source:midway/midzeus.cpp crusnexo // (c) 1999 Midway (v2.4) Latest offical release crusnexoa // (c) 1999 Midway (v2.0) crusnexob // (c) 1999 Midway (v1.6) @@ -23875,29 +23875,29 @@ mk4b // (c) 1997 Midway (v1.0) thegrid // (c) 2001 Midway (v1.2) Latest offical release thegrida // (c) 2001 Midway (v1.1) -@source:mightyframe.cpp +@source:skeleton/mightyframe.cpp mightyframe // Convergent -@source:mikie.cpp +@source:konami/mikie.cpp mikie // GX469 (c) 1984 mikiehs // GX469 (c) 1984 mikiej // GX469 (c) 1984 mikiek // GX469 (c) 1984 -@source:mikro80.cpp +@source:cccp/mikro80.cpp kristall2 // mikro80 // radio99 // -@source:mikromik.cpp +@source:nokia/mikromik.cpp mm1m6 // mm1m7 // -@source:mikrosha.cpp +@source:radio/mikrosha.cpp m86rk // mikrosha // -@source:mil4000.cpp +@source:misc/mil4000.cpp chewheel // (c) 200? Assogiochi Assago (Mi) mil4000 // (c) 2000 Sure Milano mil4000a // (c) 2000 Sure Milano @@ -23905,68 +23905,68 @@ mil4000b // (c) 2000 Sure Milano mil4000c // (c) 2000 Sure Milano top21 // (c) 200? Assogiochi Assago (Mi) -@source:milton6805.cpp +@source:mb/milton6805.cpp milton // 1980 Milton Bradley -@source:milwaukee.cpp +@source:skeleton/milwaukee.cpp mc1200 // -@source:mindset.cpp +@source:skeleton/mindset.cpp mindset // (c) 1984 -@source:mini2440.cpp +@source:skeleton/mini2440.cpp mini2440 // -@source:miniboy7.cpp +@source:misc/miniboy7.cpp bejpoker // (c) 1992?, Bonanza Enterprises miniboy7 // (c) 1983, Bonanza Enterprises miniboy7a // (c) 1983, Bonanza Enterprises sminiboy // (c) 1984, Bonanza Enterprises -@source:minicom.cpp +@source:ultratec/minicom.cpp mcom4_02 // minicom // -@source:miniforce.cpp +@source:force/miniforce.cpp miniforce // D26 cabinet test board -@source:miniframe.cpp +@source:skeleton/miniframe.cpp minifram -@source:miniguay.cpp +@source:cirsa/miniguay.cpp miniguay -@source:minitel_2_rpic.cpp +@source:skeleton/minitel_2_rpic.cpp minitel2 // -@source:minivadr.cpp +@source:taito/minivadr.cpp minivadr // D26 cabinet test board -@source:minivideo.cpp +@source:misc/minivideo.cpp fiches // fiches12 // -@source:mips.cpp +@source:mips/mips.cpp rc2030 // MIPS RC2030 rs2030 // MIPS RS2030 rc3230 // MIPS RC3230 rs3230 // MIPS RS3230 -@source:mirage.cpp +@source:dataeast/mirage.cpp mirage // (c) 1994 Mitchell -@source:mirax.cpp +@source:misc/mirax.cpp mirax // (c) 1985 Current Technologies miraxa // (c) 1985 Current Technologies -@source:missamer.cpp +@source:pinball/missamer.cpp missamer // (c) 1984 Sirmo -@source:missb2.cpp +@source:taito/missb2.cpp bublpong // bootleg on enhanced hardware missb2 // bootleg on enhanced hardware -@source:missbamby.cpp +@source:cirsa/missbamby.cpp basket // (c) 198? IGOA S.A. goldfrts // gwinner // (c) 1983 Reben @@ -23976,7 +23976,7 @@ msbamby // (c) 198? Automatics Pasqual multy // (c) 1987 Deta trebol // (c) 1985 Regama -@source:missile.cpp +@source:atari/missile.cpp mcombat // bootleg mcombata // bootleg mcombats // bootleg @@ -23988,7 +23988,7 @@ missilem // hack suprmatk // (c) 1980 + (c) 1981 Gencomp suprmatkd // (c) 1980 + (c) 1981 Gencomp -@source:mitchell.cpp +@source:capcom/mitchell.cpp 7toitsu // (c) 1988 Yuga bbros // (c) 1989 Capcom (US) not listed on Capcom's site block // 19/12/1991 (c) 1991 Capcom (World) (Joystick version) @@ -24027,63 +24027,63 @@ spangbl // bootleg spangbl2 // bootleg spangj // --/--/1990 (c) 1990 Mitchell (Japan) -@source:mits680b.cpp +@source:mits/mits680b.cpp mits680b // -@source:miuchiz.cpp +@source:skeleton/miuchiz.cpp miuchiz // (c) 2006 MGA Entertainment -@source:mjkjidai.cpp +@source:sanritsu/mjkjidai.cpp mjkjidai // (c) 1986 Sanritsu -@source:mjsenpu.cpp +@source:misc/mjsenpu.cpp mjsenpu -@source:mjsister.cpp +@source:toaplan/mjsister.cpp mjsister // (c) 1986 Toaplan -@source:mk1forth.cpp +@source:homebrew/mk1forth.cpp mk1forth // (c) 2003 Andrew Holme -@source:mk14.cpp +@source:trainer/mk14.cpp mk14 // -@source:mk85.cpp +@source:elektronika/mk85.cpp mk85 // -@source:mk90.cpp +@source:elektronika/mk90.cpp mk90 // -@source:mk98.cpp +@source:elektronika/mk98.cpp mk98 // -@source:mkit09.cpp +@source:multitch/mkit09.cpp mkit09 // mkit09a // -@source:ml20.cpp +@source:skeleton/ml20.cpp ml20 // -@source:mlanding.cpp +@source:taito/mlanding.cpp mlanding // B09 (c) 1987 Taito America Corporation (US) mlandingj // B09 (c) 1987 Taito Corporation (US) -@source:mmagic.cpp +@source:nintendo/mmagic.cpp mmagic // (c) 1979 Nintendo -@source:mmd1.cpp +@source:skeleton/mmd1.cpp mmd1 // -@source:mmd2.cpp +@source:skeleton/mmd2.cpp mmd2 // -@source:mmm.cpp +@source:maygay/mmm.cpp mmm_ldip // Lucky Dip -@source:mod8.cpp +@source:skeleton/mod8.cpp mod8 // -@source:model1.cpp +@source:sega/model1.cpp netmerc // ?? Info available in time ?? swa // 1994.04 Star Wars Arcade (US) swaj // 1994.04 Star Wars Arcade (Japan) @@ -24095,7 +24095,7 @@ wingwar360 // 1994.09 Wing War R360 wingwarj // 1994.06 Wing War (Japan) wingwaru // 1994.09 Wing War (US) -@source:model2.cpp +@source:sega/model2.cpp airwlkrs // 1997.?? Air Walkers bel // 1998.12 Behind Enemy Lines daytona // 1994.03 Daytona USA (Japan, Revision A) @@ -24182,7 +24182,7 @@ zeroguna // 1997.12 Zero Gunner (Export) zerogunaj // 1997.12 Zero Gunner (Japan) zerogunj // 1997.12 Zero Gunner (Japan) -@source:model3.cpp +@source:sega/model3.cpp bassdx // 1997.12 Sega Bass Fishing Deluxe (USA) dayto2pe // 1998.12 Daytone USA 2 Power Edition daytona2 // 1998.06 Daytona USA 2 @@ -24244,42 +24244,42 @@ vs299a // 1999.?? Virtual Striker 2 ver.99 (Export / US vs299j // 1999.?? Virtual Striker 2 ver.99.1 (Japan, rev B) vs2v991 // 1999.?? Virtual Striker 2 ver.99.1 (Export / USA, rev B) -@source:modellot.cpp +@source:skeleton/modellot.cpp modellot // -@source:mogura.cpp +@source:konami/mogura.cpp mogura // GX141 (c) 1991 -@source:mole.cpp +@source:misc/mole.cpp mole // (c) 1982 Yachiyo Electronics, Ltd. -@source:molecular.cpp +@source:skeleton/molecular.cpp molecula // -@source:momoko.cpp +@source:jaleco/momoko.cpp momoko // (c) 1986 Jaleco (Japanese text) momokob // bootleg momokoe // (c) 1986 Jaleco (English text) -@source:monacogp.cpp +@source:sega/monacogp.cpp monacogp // (c) 1980 Sega monacogpa // (c) 1980 Sega -@source:monkey_king_3b.cpp +@source:tvgames/monkey_king_3b.cpp rs70_648 // -@source:monon_color.cpp +@source:skeleton/monon_color.cpp mononcol // (c) 2011 M&D -@source:monty.cpp +@source:ritam/monty.cpp mmonty // Ritam monty // Ritam -@source:monzagp.cpp +@source:olympia/monzagp.cpp monzagp // (c) 1981 Olympia monzagpb // bootleg -@source:moo.cpp +@source:konami/moo.cpp bucky // GX173 (c) 1992 (World) buckyaa // GX173 (c) 1992 (Asia) buckyaab // GX173 (c) 1992 (Asia) @@ -24292,41 +24292,41 @@ moomesabl // bootleg moomesauab // GX151 (c) 1992 (US) moomesauac // GX151 (c) 1992 (US) -@source:mosaic.cpp +@source:misc/mosaic.cpp gfire2 // (c) 1992 Topis Corp mosaic // (c) 1990 Space mosaica // (c) 1990 Space + Fuuki license -@source:mouser.cpp +@source:upl/mouser.cpp mouser // UPL-83001 (c) 1983 mouserc // UPL-83001 (c) 1983 -@source:mpc3000.cpp +@source:akai/mpc3000.cpp mpc3000 -@source:mpc60.cpp +@source:akai/mpc60.cpp mpc60 -@source:mpf1.cpp +@source:multitch/mpf1.cpp mpf1 // 1979 Multitech Micro Professor 1 mpf1b // 1979 Multitech Micro Professor 1B mpf1p // -@source:mps1230.cpp +@source:cbm/mps1230.cpp mps1000 // 1986 Commodore MPS-1000 (dot matrix printer) mps1230 // 1988 Commodore MPS-1230 near-letter-quality dot matrix printer -@source:mpu12wbk.cpp +@source:misc/mpu12wbk.cpp fruitstb // 199? Webak fruitstba // 1997 Webak fruitstbb // 1997 Webak fruitstbc // 1997 Webak -@source:mpu2.cpp +@source:barcrest/mpu2.cpp m2hilite // Hi-Lights (Barcrest) (MPU2) m2svlite // Silver Lights (Barcrest) (MPU2) -@source:mpu3.cpp +@source:barcrest/mpu3.cpp m3acech // Ace Chase (Bwb) m3autort // Autoroute (Barcrest) m3bankr // Banker (Bwb) @@ -24410,7 +24410,7 @@ m3xchngg // Exchanges Galore (Barcrest) m3xchngu // Exchanges Unlimited (Barcrest) m3xchngua // -@source:mpu4unsorted.cpp +@source:barcrest/mpu4unsorted.cpp m4aao // Against All Odds (Eurotek) m4addrd // m4aliz // AlizBaz (Qps) @@ -24577,7 +24577,7 @@ m4wnud // Unknown MPU4 'W Nudge' m4zill // Zillionare's Challenge (Pure Leisure) m4zilla // -@source:mpu4avan.cpp +@source:barcrest/mpu4avan.cpp m4abeaut // m4abeaut_1 // m4abeaut_2 // @@ -25079,7 +25079,7 @@ m4trg__x // m4trg__y // m4trg__z // -@source:mpu4bwb.cpp +@source:barcrest/mpu4bwb.cpp m4abra // Abracadabra (BWB) m4abra__a // m4abra__b // @@ -25551,7 +25551,7 @@ m4xtrm // X-treme (BWB) m4xtrm__a // m4xtrm__b // -@source:mpu4concept.cpp +@source:barcrest/mpu4concept.cpp m4nudgwc // Nudge a Win (Concept) m4nudgwc__a // m4nudgwc__b // @@ -25623,7 +25623,7 @@ m4spnwnc // Spin-A-Win (Concept) m4spnwnc__a // m4spnwnc__b // -@source:mpu4crystal.cpp +@source:barcrest/mpu4crystal.cpp m4aladn // Aladdin's Cave (Crystal) m4aladna // m4aladnb // @@ -25726,7 +25726,7 @@ m4twstrd // m4tylb // Thank Your Lucky Bars (Crystal) m4tylba // -@source:mpu4empire.cpp +@source:barcrest/mpu4empire.cpp m4apachg // Apache Gold (Empire) m4apachga // m4apachgb // @@ -25809,7 +25809,7 @@ m4ttrail // Treasure Trail (Empire) m4ttraila // m4ttrailb // -@source:mpu4mdm.cpp +@source:barcrest/mpu4mdm.cpp m42punlm // 2p Unlimited (Mdm) m4bigapl // The Big Apple (Mdm) m4bigapla // @@ -25856,7 +25856,7 @@ m4themob // The Mob (Mdm) m4themoba // m4themobb // -@source:mpu4misc.cpp +@source:barcrest/mpu4misc.cpp m4bangin // Bangin' Away (Global) m4bangina // m4banginb // @@ -25995,7 +25995,7 @@ m4wwc // Wacky Weekend Club (Global) m4wwca // m4wwcb // -@source:mpu4mod2sw.cpp +@source:barcrest/mpu4mod2sw.cpp m421 // Twenty One (Barcrest) m421club // 21 Club (Barcrest) m4actbnka // @@ -26290,7 +26290,7 @@ m4wayin // Way In (Barcrest) m4wayina // m4wildms // Wild Mystery (Barcrest) -@source:mpu4mod4oki.cpp +@source:barcrest/mpu4mod4oki.cpp m4actbnk // Action Bank (Barcrest) m4actbnk__a // m4actbnk__b // @@ -29539,7 +29539,7 @@ m4wta__x // m4wta__y // m4wta__z // -@source:mpu4mod4yam.cpp +@source:barcrest/mpu4mod4yam.cpp m4acechs // Ace Chase (BWB) m4acechs__a // m4acechs__b // @@ -29998,7 +29998,7 @@ m4vivalv__y // m4vivalv__z // m4voodoo // Voodoo 1000 (Barcrest) -@source:mpu4union.cpp +@source:barcrest/mpu4union.cpp m4crzbn // Crazy Bingo m4cwalk // Cake Walk (Union) m4eezee // Eezee Fruits (Union) @@ -30032,10 +30032,10 @@ m4uniboxa // m4unique // Unique (Union) m4uniquep // -@source:mpu4dealem.cpp +@source:barcrest/mpu4dealem.cpp v4dealem // Deal 'Em -@source:mpu4plasma.cpp +@source:barcrest/mpu4plasma.cpp m4apach // Apache (Barcrest) m4bigchf // Big Chief (Barcrest) m4bigchfa // @@ -30044,7 +30044,7 @@ m4bigchfc // m4click // Clickity Click (Barcrest) m4elite // Elite (Barcrest) -@source:mpu4vid.cpp +@source:barcrest/mpu4vid.cpp v4addlad // Adders and Ladders v4addladd // v4addlad20 // @@ -30446,7 +30446,7 @@ v4wizec v4wized v4wizeo // Wize Move -@source:mpu5sw.cpp +@source:barcrest/mpu5sw.cpp m55050 // Fifty Fifty (BWB) m5aceclb // Ace Of Clubs (Empire) m5aceclba // @@ -31079,13 +31079,13 @@ m5xfact04 // m5xfact11 // m5zigzag // Zig Zag -@source:mpz80.cpp +@source:morrow/mpz80.cpp mpz80 // -@source:mquake.cpp +@source:amiga/mquake.cpp mquake // (c) 1987 -@source:mrdo.cpp +@source:univers/mrdo.cpp mrdo // 8201 (c) 1982 mrdofix // 8201 (c) 1982 + Taito license mrdot // 8201 (c) 1982 + Taito license @@ -31096,10 +31096,10 @@ mrdofabr // bootleg (Fabremar) mrdobl // bootleg yankeedo // bootleg -@source:mrflea.cpp +@source:pacific/mrflea.cpp mrflea // (c) 1982 -@source:mrgame.cpp +@source:pinball/mrgame.cpp dakar // fasttrack // macattck // @@ -31108,18 +31108,18 @@ motrshowa // motrshowb // wcup90 // -@source:mrjong.cpp +@source:kiwako/mrjong.cpp blkbustr // (c) 1983 Kiwako + ECI license crazyblk // (c) 1983 Kiwako + ECI license mrjong // (c) 1983 Kiwako -@source:ms0515.cpp +@source:skeleton/ms0515.cpp ms0515 // -@source:ms6102.cpp +@source:elektronika/ms6102.cpp ms6102 // -@source:ms32.cpp +@source:jaleco/ms32.cpp akiss // (c) 1995 - Ver 1.0 bbbxing // (c) 1994 - Ver 1.3 bnstars // (c) 1997 - Ver 1.1 @@ -31140,19 +31140,19 @@ tetrisp // (c) 1995 Jaleco / BPS - Ver 1.0 tp2m32 // (c) 1997 - Ver 1.0 wpksocv2 // (c) 1997 - Ver 1.1 -@source:ms9540.cpp +@source:skeleton/ms9540.cpp ms9540 // -@source:msbc1.cpp +@source:omnibyte/msbc1.cpp msbc1 // -@source:msisaac.cpp +@source:taito/msisaac.cpp msisaac // A34 (c) 1985 Taito Corporation -@source:mstation.cpp +@source:skeleton/mstation.cpp mstation // -@source:msx.cpp +@source:ascii/msx.cpp ax150 // ax170 // ax350 // @@ -31401,19 +31401,19 @@ yis503m // yis604 // yis60464 // -@source:mt420.cpp +@source:microterm/mt420.cpp mt420 // -@source:mt5510.cpp +@source:microterm/mt5510.cpp mt5510 // -@source:mt735.cpp +@source:skeleton/mt735.cpp mt735 // -@source:mtd1256.cpp +@source:skeleton/mtd1256.cpp mtd1256 // -@source:mtouchxl.cpp +@source:merit/mtouchxl.cpp mtouchxl // 1997 Merit Industries mtchxl5k // 1998 Merit Industries mtchxl5ko // 1998 Merit Industries @@ -31425,15 +31425,15 @@ mtchxlgld // 2000 Merit Industries mtchxlgldo // 2000 Merit Industries mtchxlti // 2002 Merit Industries -@source:mtx.cpp +@source:memotech/mtx.cpp mtx500 // 1983 Memotech MTX 500 mtx512 // 1983 Memotech MTX 512 rs128 // 1984 Memotech RS 128 -@source:mugsmash.cpp +@source:edevices/mugsmash.cpp mugsmash // (c) Electronic Devices (Italy) / 3D Games (England) -@source:multfish.cpp +@source:misc/multfish.cpp crzmon2 // (c) 2010 crzmon2_2 // (c) 2010 crzmon2_3 // (c) 2010 @@ -31672,7 +31672,7 @@ sweetl2_11 // (c) 2007 sweetl2_12 // (c) 2007 windjamr // (c) 2002 -@source:multfish_boot.cpp +@source:misc/multfish_boot.cpp czmon_7a // bootleg - Crazy Monkey czmon_7b // bootleg czmon_8a // bootleg @@ -31784,13 +31784,13 @@ sweetl2_2d // bootleg sweetla // bootleg - Sweet Life sweetlb // bootleg -@source:multi16.cpp +@source:mitsubishi/multi16.cpp multi16 // -@source:multi8.cpp +@source:mitsubishi/multi8.cpp multi8 // -@source:multigam.cpp +@source:nintendo/multigam.cpp multigam // 1992 multigm2 // 1992 multigm3 // 19?? @@ -31799,43 +31799,43 @@ multigmt // sgmt1 // 1994 supergm3 // 1996 -@source:munchmo.cpp +@source:snk/munchmo.cpp joyfulr // A2001 (c) 1983 mnchmobl // A2001 (c) 1983 + Centuri license -@source:mupid2.cpp +@source:mupid/mupid2.cpp mupid2 // (c) 1985 mupid mupid2i // (c) 1990 Infonova ptc100 // (c) 198? Grundig -@source:murogem.cpp +@source:misc/murogem.cpp lasvegas // hack murogem // ??? murogema // ??? murogemb // ??? -@source:murogmbl.cpp +@source:misc/murogmbl.cpp murogmbl // ??? slotunbl // ??? -@source:mustache.cpp +@source:seibu/mustache.cpp mustache // (c) 1987 March mustachei // (c) 1987 IG SPA -@source:mvme147.cpp +@source:motorola/mvme147.cpp mvme147 // (c) 1989 Motorola -@source:mvme162.cpp +@source:motorola/mvme162.cpp mvme162 // (c) 1993 Motorola -@source:mw18w.cpp +@source:midway/mw18w.cpp 18w // 653 (c) 1979 Midway 18w2 // 653 (c) 1979 Midway -@source:mw4pole.cpp +@source:skeleton/mw4pole.cpp mw4pole // (c) 1995 Waldorf Electronics GmbH Germany -@source:mw8080bw.cpp +@source:midw8080/mw8080bw.cpp 280zzzap // 610 [1976] blueshrk // 742 [1978] blueshrkmr // Model Racing bootleg @@ -31866,29 +31866,29 @@ spacwalk // 640 [1978] spcenctr // 645 (c) 1980 Midway tornbase // 605 [1976] -@source:mwarr.cpp +@source:edevices/mwarr.cpp mwarr // -@source:mwsub.cpp +@source:midway/mwsub.cpp submar // 760 (c) 1979 Midway -@source:mx2178.cpp +@source:skeleton/mx2178.cpp mx2178 // -@source:myb3k.cpp +@source:matsushi/myb3k.cpp myb3k // jb3000 // stepone // -@source:mycom.cpp +@source:skeleton/mycom.cpp mycom // -@source:mystston.cpp +@source:technos/mystston.cpp mystston // TA-0010 (c) 1984 myststono // TA-0010 (c) 1984 myststonoi // PCB manufactured by Itisa -@source:mystwarr.cpp +@source:konami/mystwarr.cpp dadandrn // GX170 (c) 1993 (Japan) gaiapols // GX123 (c) 1993 (Europe) gaiapolsj // GX123 (c) 1993 (Japan) @@ -31919,43 +31919,43 @@ viostormj // GX168 (c) 1993 (Japan) viostormu // GX168 (c) 1993 (US) viostormub // GX168 (c) 1993 (US) -@source:myvision.cpp +@source:skeleton/myvision.cpp myvision // -@source:mz2000.cpp +@source:sharp/mz2000.cpp mz80b // 1981 Sharp MZ80B mz2000 // 1981 Sharp MZ2000 mz2200 // 1981 Sharp MZ2200 -@source:mz2500.cpp +@source:sharp/mz2500.cpp mz2500 // 1985 Sharp MZ2500 mz2520 // 1985 Sharp MZ2520 -@source:mz3500.cpp +@source:sharp/mz3500.cpp mz3500 // 198? Sharp MZ3500 -@source:mz6500.cpp +@source:sharp/mz6500.cpp mz6500 // 198? Sharp MZ6500 -@source:mz700.cpp +@source:sharp/mz700.cpp mz1500 // 1984 Sharp MZ1500 mz700 // 1982 Sharp MZ700 mz700j // 1982 Sharp MZ700 Japan mz800 // 1984 Sharp MZ800 -@source:mz80.cpp +@source:sharp/mz80.cpp mz80a // 1982 Sharp MZ80A mz80k // 1979 Sharp MZ80K mz80kj // 1979 Sharp MZ80K -@source:mzr8105.cpp +@source:mizar/mzr8105.cpp mzr8105 // -@source:n64.cpp +@source:nintendo/n64.cpp n64 // Nintendo N64 n64dd // Nintendo N64 (64DD Attachment) -@source:n8080.cpp +@source:nintendo/n8080.cpp bandido // (c) 1980 Exidy helifire // (c) 1980 Nintendo helifirea // (c) 1980 Nintendo @@ -31969,7 +31969,7 @@ spacefevo2 // (c) 1979 Nintendo spacelnc // (c) 1979 Nintendo westgun2 // (c) 1980 Taito Corporation -@source:nakajies.cpp +@source:nakajima/nakajies.cpp dator3k // 199? Dator 3000 (Spanish) drwrt100 // 199? NTS DreamWriter T100 drwrt200 // 199? NTS DreamWriter T200 @@ -31978,14 +31978,14 @@ drwrt450 // 199? NTS DreamWriter 450 es210_es // wales210 // 199? Walther ES-210 (German) -@source:namcofl.cpp +@source:namco/namcofl.cpp finalapr // (c) 1995 finalapr1 // (c) 1995 finalaprj // (c) 1995 finalaprj1 // (c) 1995 speedrcr // (c) 1995 -@source:namcona1.cpp +@source:namco/namcona1.cpp bbbingo // (c) 1996 (Japan) bkrtmaq // (c) 1992 (Japan) cgangpzl // (c) 1992 (US) @@ -32011,7 +32011,7 @@ xday2 // (c) 1995 (Japan) zelos // (c) 1994 (Japan) zelost // (c) 1994 (Japan) -@source:namconb1.cpp +@source:namco/namconb1.cpp gslgr94j // (c) 1994 (Japan) gslgr94u // (c) 1994 gslugrsj // (c) 1993 (Japan) @@ -32033,7 +32033,7 @@ sws96 // (c) 1996 (Japan) sws97 // (c) 1997 (Japan) vshoot // (c) 1994 -@source:namcond1.cpp +@source:namco/namcond1.cpp ncv1 // (c) 1995 ncv1j // (c) 1995 (Japan) ncv1j2 // (c) 1995 (Japan) @@ -32042,7 +32042,7 @@ ncv2 // (c) 1996 ncv2j // (c) 1996 (Japan) abcheck // (c) 1996 (Japan) -@source:namcops2.cpp +@source:namco/namcops2.cpp bldyr3b // cobrata // dragchrn // @@ -32100,7 +32100,7 @@ zgundmdx // zoidiexp // zoidsinf // -@source:namcos1.cpp +@source:namco/namcos1.cpp bakutotu // (c) 1988 (Japan) berabohm // (c) 1988 (Japan, Rev C) berabohmb // (c) 1988 (Japan, Rev B) @@ -32142,7 +32142,7 @@ ws90 // (c) 1990 (Japan) youkaidk1 // (c) 1987 (Japan, old version (YD1)) youkaidk2 // (c) 1987 (Japan, new version (YD2, Rev B)) -@source:namcos10.cpp +@source:namco/namcos10.cpp chocovdr // 2002.10 Uchuu Daisakusen : Chocovader Contactee gamshara // 2002.08 Gamshara (10021 Ver.A) gamsharaj // 2002.08 Gamshara (10021 Ver.A) @@ -32168,7 +32168,7 @@ startrgn // 2002.07 Star Trigon (STT1 Ver.A) taiko6 // 2004.?? Taiko no Tatsujin 6 (Japan, TK61 Ver.A) unks10md // 200?.?? unknown Namco System 10 medal game (MTL1 SPRB0) -@source:namcos11.cpp +@source:namco/namcos11.cpp danceyes // 1996.10 Dancing Eyes (US, DC3/VER.C) danceyesj // 1996.09 Dancing Eyes (Japan, DC1/VER.A) dunkmnia // 1996.05 Dunk Mania (World, DM2/VER.C) @@ -32202,7 +32202,7 @@ xevi3dg // 1996.05 Xevious 3D/G (World, XV32/VER.B) xevi3dga // 1996.05 Xevious 3D/G (World, XV32/VER.A) xevi3dgj // 1996.05 Xevious 3D/G (Japan, XV31/VER.A) -@source:namcos12.cpp +@source:namco/namcos12.cpp aplarail // 1998.12 Attack Pla Rail (Japan, AP1/VER.A) aquarush // 2000.02 Aqua Rush (Japan, AQ1/VER.A1) ehrgeiz // 1998.?? Ehrgeiz (World, EG2/VER.A) @@ -32257,10 +32257,10 @@ tenkomorja // 1998.12 Tenkomori Shooting (Japan, TKM1/VER.A toukon3 // 1997.12 Shin Nihon Pro Wrestling Toukon Retsuden 3 Arcade Edition (Japan, TR1/VER.A) truckk // 2000.06 Truck Kyousoukyoku (Metro) (Japan, TKK2/VER.A) -@source:namcos1b.cpp +@source:namco/namcos1b.cpp tankfrceb // bootleg -@source:namcos2.cpp +@source:namco/namcos2.cpp assault // (c) 1988 assaultj // (c) 1988 (Japan) assaultp // (c) 1988 (Japan) @@ -32322,12 +32322,12 @@ sws92g // (c) 1992 (Japan) sws93 // (c) 1993 (Japan) valkyrie // (c) 1989 (Japan) -@source:namcos21.cpp +@source:namco/namcos21.cpp winrun // (c) 1988 winrun91 // (c) 1991 winrungp // (c) 1989 -@source:namcos21_c67.cpp +@source:namco/namcos21_c67.cpp aircomb // (c) 1992 (US) aircombj // (c) 1992 (Japan) cybsled // (c) 1993 (World) @@ -32336,10 +32336,10 @@ solvalou // (c) 1991 (Japan) starblad // (c) 1991 (World) starbladj // (c) 1991 (Japan) -@source:namcos21_de.cpp +@source:namco/namcos21_de.cpp driveyes // (c) 1992? -@source:namcos22.cpp +@source:namco/namcos22.cpp acedrive // (c) 1994 adillor // (c) 1997 adillorj // (c) 1997 @@ -32380,7 +32380,7 @@ victlap // (c) 1996 victlapa // (c) 1996 victlapj // (c) 1996 -@source:namcos23.cpp +@source:namco/namcos23.cpp 500gp // March 1999 aking // Angler King - March 1999 crszone // Crisis Zone - December 1999 @@ -32414,7 +32414,7 @@ timecrs2v2b // April 1998 timecrs2v4a // April 1998 timecrs2v5a // April 1998 -@source:namcos86.cpp +@source:namco/namcos86.cpp genpeitd // (c) 1986 hopmappy // (c) 1986 roishtar // (c) 1986 @@ -32427,10 +32427,10 @@ skykiddx // (c) 1986 skykiddxo // (c) 1986 wndrmomo // (c) 1987 -@source:nanos.cpp +@source:ddr/nanos.cpp nanos // -@source:naomi.cpp +@source:sega/naomi.cpp 18wheelro // 2000.01 18 Wheeler Deluxe 18wheelr // 2000.01 18 Wheeler Deluxe (Rev A) 18wheelrt // 2000.01 18 Wheeler Deluxe (Rev T) @@ -32730,12 +32730,12 @@ zombrvne // 1999.03 Zombie Revenge (Export) zombrvno // 1999.02 Zombie Revenge zunou // 2006.07 Touch de Zunou -@source:nascom1.cpp +@source:nascom/nascom1.cpp nascom1 // 1978 Nascom 1 nascom2 // 1979 Nascom 2 nascom2c // 1980 Nascom 2 (CP/M) -@source:naughtyb.cpp +@source:phoenix/naughtyb.cpp naughtyb // (c) 1982 Jaleco naughtyba // bootleg naughtybb // bootleg @@ -32750,7 +32750,7 @@ trvmstra // (c) 1985 Enerdyne Technologies Inc. trvmstrb // (c) 1985 Enerdyne Technologies Inc. trvmstrc // (c) 1985 Enerdyne Technologies Inc. -@source:nbmj8688.cpp +@source:nichibut/nbmj8688.cpp apparel // (c) 1986 Central Denshi barline // (c) 1986? bijokkog // (c) 1988 @@ -32793,7 +32793,7 @@ seiham // (c) 1987 swinggal // (c) 1987 Digital Denshi vipclub // (c) 1988 Daiichi Denshi -@source:nbmj8891.cpp +@source:nichibut/nbmj8891.cpp abunai // (c) 1989 bananadr // (c) 1989 DIGITAL SOFT chinmoku // (c) 1990 @@ -32829,11 +32829,11 @@ scandalm // (c) 1989 taiwanmb // (c) 1988 telmahjn // (c) 1988 -@source:nbmj8900.cpp +@source:nichibut/nbmj8900.cpp ohpaipee // (c) 1990 Nichibutsu togenkyo // (c) 1990 Nichibutsu -@source:nbmj8991.cpp +@source:nichibut/nbmj8991.cpp av2mj1bb // (c) 1991 MIKI SYOUJI/AV JAPAN av2mj2rg // (c) 1991 MIKI SYOUJI/AV JAPAN finalbny // (c) 1991 @@ -32854,7 +32854,7 @@ triplew2 // (c) 1990 uchuuai // (c) 1989 vanilla // (c) 1991 -@source:nbmj9195.cpp +@source:nichibut/nbmj9195.cpp bakuhatu // (c) 1991 cmehyou // (c) 1992 Nichibutsu/Kawakusu gal10ren // (c) 1993 FUJIC @@ -32887,31 +32887,31 @@ wcatcher // (c) 1993 yosimotm // (c) 1994 Nichibutsu/Yoshimoto Kougyou yosimoto // (c) 1994 Nichibutsu/Yoshimoto Kougyou -@source:nc.cpp +@source:amstrad/nc.cpp dw225 // nc100 // 1992 NC100 nc150 // 1992 NC150 nc200 // 1993 NC200 -@source:ncd68k.cpp +@source:ncd/ncd68k.cpp ncd16 // 1989 Network Computing Devices ncd17c // 1990 Network Computing Devices ncd19 // 1990 Network Computing Devices -@source:ncd88k.cpp +@source:ncd/ncd88k.cpp ncd19c // ncdmcx -@source:ncdmips.cpp +@source:ncd/ncdmips.cpp hmxpro // 1994 Network Computing Devices -@source:ncdppc.cpp +@source:ncd/ncdppc.cpp explorapro // 1995 Network Computing Devices -@source:nds.cpp +@source:nintendo/nds.cpp nds // 2004 Nintendo -@source:nemesis.cpp +@source:konami/nemesis.cpp blkpnthr // GX604 (c) 1987 (Japan) bubsys // citybomb // GX787 (c) 1987 (World) @@ -32934,7 +32934,7 @@ salamandj // GX587 (c) 1986 twinbee // GX412 (c) 1985 twinbeeb // Bubble System -@source:neogeo.cpp +@source:neogeo/neogeo.cpp neogeo // NeoGeo MV-6F ng_mv4f // NeoGeo MV-4F ng_mv2f // NeoGeo MV-2F @@ -33224,16 +33224,16 @@ zedblade // 0076 (c) 1994 NMK zintrckb // 0211 hack - this is not a genuine MVS proto, its a bootleg made from the CD version zupapa // 0070 Zupapa - released in 2001, 1994 prototype probably exists -@source:neomania.cpp +@source:misc/neomania.cpp neomania // bootleg -@source:neopcb.cpp +@source:neogeo/neopcb.cpp kf2k3pcb // 0271 (c) 2003 Playmore - JAMMA PCB ms5pcb // 0268 (c) 2003 Playmore - JAMMA PCB svcpcb // 0269 (c) 2003 Playmore / Capcom - JAMMA PCB svcpcba // 0269 (c) 2003 Playmore / Capcom - JAMMA PCB -@source:neoprint.cpp +@source:misc/neoprint.cpp 98best44 // neoprint // npcartv1 // @@ -33251,13 +33251,13 @@ npsprgv4 // npssr2 // npusagif // -@source:neptunp2.cpp +@source:cirsa/neptunp2.cpp ccorsario // (c) 2002 Cirsa / Unidesa neptunp2 // (c) 2003 Cirsa / Unidesa rockroll // (c) 1999 Cirsa / Unidesa unk960606 // (c) 2001? Cirsa / Unidesa -@source:nes.cpp +@source:nintendo/nes.cpp iq501 // Micro Genius IQ-501 iq502 // Micro Genius IQ-502 dendy // Dendy Classic (Russian import of IQ-501 famiclone) @@ -33273,7 +33273,7 @@ m82p // Nintendo M82 Display Unit PAL nes // Nintendo Entertainment System nespal // Nintendo Entertainment System PAL -@source:nes_clone.cpp +@source:nintendo/nes_clone.cpp afbm7800 dancexpt dnce2000 @@ -33285,7 +33285,7 @@ pjoypj001 vtvppong vtvsocr -@source:nes_sh6578.cpp +@source:nintendo/nes_sh6578.cpp bandgpad bandggcn cpatrolm @@ -33299,7 +33299,7 @@ vsmaxx25 vsmaxx15 dgun806 -@source:nes_vt02_vt03.cpp +@source:nintendo/nes_vt02_vt03.cpp vdogdeme vdogdemo pinkjelly @@ -33367,7 +33367,7 @@ dgun2500 ppgc200g dgun2869 -@source:nes_vt09.cpp +@source:nintendo/nes_vt09.cpp cybar120 dturbogt jl2050 @@ -33390,7 +33390,7 @@ vgpmini vgpocket vsmaxtx2 -@source:nes_vt32.cpp +@source:nintendo/nes_vt32.cpp dgun2573 dgun2573a dgunl3201 @@ -33398,7 +33398,7 @@ dgunl3202 fcpocket rminitv -@source:nes_vt369_vtunknown.cpp +@source:nintendo/nes_vt369_vtunknown.cpp 240in1ar bittboy denv150 @@ -33444,25 +33444,25 @@ tup240 unkra200 zonefusn -@source:newbrain.cpp +@source:grundy/newbrain.cpp newbrain // newbraina // newbrainmd // -@source:news.cpp +@source:misc/news.cpp news // "Virus"??? ((c) 1993 Poby in ROM VIRUS.4) newsa // "Jeansole / Poby -@source:news_38xx.cpp +@source:sony_news/news_38xx.cpp nws3860 // Sony NEWS NWS-3860 -@source:news_68k.cpp +@source:sony_news/news_68k.cpp nws1580 // Sony NEWS NWS-1580 -@source:news_r3k.cpp +@source:sony_news/news_r3k.cpp nws3260 // Sony NEWS NWS-3260 -@source:newton.cpp +@source:skeleton/newton.cpp newtnotp newtonmp spi7000 @@ -33474,7 +33474,7 @@ emate mp2000 mp2100 -@source:next.cpp +@source:next/next.cpp next // nextc // nextct // @@ -33485,35 +33485,35 @@ nextsc // nextst // nextstc // -@source:nexus3d.cpp +@source:misc/nexus3d.cpp acheart // acheartf // (c) 2006 Examu -@source:neogeocd.cpp +@source:neogeo/neogeocd.cpp neocd // NeoGeo CD neocdz // NeoGeo CDZ neocdzj // -@source:nforcepc.cpp +@source:pc/nforcepc.cpp nforcepc // -@source:ngen.cpp +@source:skeleton/ngen.cpp 386i // 199? ngen // 1983 ngenb38 // 1991 -@source:ngp.cpp +@source:snk/ngp.cpp ngp // NeoGeo Pocket ngpc // NeoGeo Pocket Color -@source:nibble.cpp +@source:misc/nibble.cpp l9nibble // unknown Nibble game. -@source:nichild.cpp +@source:nichibut/nichild.cpp ldquiz4 // (c) 1992 shabdama // (c) 1991 -@source:nightgal.cpp +@source:nichibut/nightgal.cpp ngalsumr // (c) 1985 ngtbunny // (c) 1984 nightgal // (c) 1984 @@ -33523,7 +33523,7 @@ sexygal // (c) 1985 sgaltrop // (c) 1985 sweetgal // (c) 1985 -@source:ninjakd2.cpp +@source:upl/ninjakd2.cpp arkarea // UPL-87007 (c) 1988 (Arcade TV Game List - P.67, Right, 2 from top) jt104 // hack? mnight // UPL-87007 (c) 1987 @@ -33540,24 +33540,24 @@ robokidj // UPL-88013 (c) 1988 robokidj2 // UPL-88013 (c) 1988 robokidj3 // -@source:ninjaw.cpp +@source:taito/ninjaw.cpp darius2 // C07 (c) 1989 Taito Corporation (Japan) ninjaw // B31 (c) 1987 Taito Corporation Japan (World) ninjaw1 // B31 (c) 1987 Taito Corporation Japan (World) ninjawj // B31 (c) 1987 Taito Corporation (Japan) ninjawu // B31 (c) 1987 Taito America Corporation (US) -@source:nitedrvr.cpp +@source:atari/nitedrvr.cpp nitedrvr // 006321 1976/10 [6502] -@source:niyanpai.cpp +@source:nichibut/niyanpai.cpp 4psimasy // (c) 1994 mhhonban // (c) 1994 musobana // (c) 1995 niyanpai // (c) 1996 zokumahj // (c) 199? -@source:nmg5.cpp +@source:yunsung/nmg5.cpp 7ordi // (c) 2002 Yun Sung garogun // (c) 2000 Yun Sung nmg5 // (c) 1998 Yun Sung @@ -33571,7 +33571,7 @@ searchp2 // (c) 1999 Yun Sung wondstck // (c) ???? Yun Sung wondstcka // (c) ???? Yun Sung -@source:nmk16.cpp +@source:nmk/nmk16.cpp acrobatm // UPL-91073 (c) 1991 UPL + Taito license airattck // (c) 1996 Comad airattcka // (c) 1996 Comad @@ -33660,14 +33660,14 @@ vandykeb // bootleg vandykejal // UPL-90064 (c) Jaleco vandykejal2 // UPL-90064 (c) Jaleco -@source:nmkmedal.cpp +@source:nmk/nmkmedal.cpp hpierrot // NMK trocana // NTC / NMK -@source:nightmare.cpp +@source:efo/nightmare.cpp nightmare // (c) 1982 E.F.O. -@source:nokia_3310.cpp +@source:nokia/nokia_3310.cpp noki3210 // noki3310 // noki3330 // @@ -33681,7 +33681,7 @@ noki8250 // noki8850 // noki8890 // -@source:norautp.cpp +@source:misc/norautp.cpp bjpoker // (c) M. Kramer Inc. cdrawpkr // (c) 1984, Coinmaster cgip23b // (c) 1998, CGI @@ -33723,13 +33723,13 @@ smshilo // (c) 1983 SMS Manufacturing Corp. ssjkrpkr // (c) 1982 Southern Systems & Assembly, Ltd. tpoker2 // (c) 1993 Micro Manufacturing, Inc. -@source:notechan.cpp +@source:misc/notechan.cpp notechan // (c) 1995 Banpresto -@source:notetaker.cpp +@source:skeleton/notetaker.cpp notetakr // -@source:nova2001.cpp +@source:upl/nova2001.cpp ninjakun // UPL-84003 (c) 1984 Taito Corporation nova2001 // UPL-83005 (c) 1983 nova2001h // hack? @@ -33740,27 +33740,27 @@ raiders5 // UPL-85004 (c) 1985 raiders5t // UPL-85004 (c) 1985 Taito license raiders5ta // -@source:novadesitec_fr002.cpp +@source:novadesitec/novadesitec_fr002.cpp clrmatch sportmem -@source:novadesitec_fr004.cpp +@source:novadesitec/novadesitec_fr004.cpp unkfr004 unkfr004a unkfr004b unkfr004c -@source:novadesitec_fr009.cpp +@source:novadesitec/novadesitec_fr009.cpp unkfr009 -@source:novag_cexpert.cpp +@source:novag/novag_cexpert.cpp cexpert -@source:novag_cforte.cpp +@source:novag/novag_cforte.cpp cfortea cforteb -@source:novag_const.cpp +@source:novag/novag_const.cpp const const36 const36a @@ -33768,22 +33768,22 @@ constq ssensor4 supercon -@source:novag_diablo.cpp +@source:novag/novag_diablo.cpp diablo68 diablo68a scorpio68 -@source:novag_micro.cpp +@source:novag/novag_micro.cpp nmicro -@source:novag_micro2.cpp +@source:novag/novag_micro2.cpp nmicro2 -@source:novag_savant.cpp +@source:novag/novag_savant.cpp savant // savant2 // -@source:novag_sexpert.cpp +@source:novag/novag_sexpert.cpp sexperta // sexperta1 // sexperta2 // @@ -33798,28 +33798,28 @@ sforteb // sfortec // sfortec1 // -@source:novag_snova.cpp +@source:novag/novag_snova.cpp nsnova supremo -@source:ns5652.cpp +@source:natsemi/ns5652.cpp ns5652 // -@source:ns32kdb.cpp +@source:natsemi/ns32kdb.cpp db32016 // National Semiconductor DB32016 -@source:nsg6809.cpp +@source:misc/nsg6809.cpp pitchhit // -@source:nsm.cpp +@source:pinball/nsm.cpp cosflnsm // firebird // gamesnsm // -@source:nsmpoker.cpp +@source:misc/nsmpoker.cpp nsmpoker // -@source:nss.cpp +@source:nintendo/nss.cpp nss // nss_actr // 1992 Enix nss_adam // 1992 Ocean @@ -33835,7 +33835,7 @@ nss_smw // 1991 Nintendo nss_ssoc // 1992 Human Inc. nss_sten // 199? Nintendo -@source:nwk-tr.cpp +@source:konami/nwk-tr.cpp racingj // GX676 (c)1998 racingj2 // GX888 (c)1999 (EAE) racingj2j // GX888 (c)1999 (JAE) @@ -33843,33 +33843,33 @@ thrilld // GX713 (c)1998 Japan JAE thrilldb // GX713 (c)1998 Japan JAB thrilldbe // GX713 (c)1998 Europe EAB -@source:nycaptor.cpp +@source:taito/nycaptor.cpp bronx // bootleg colt // bootleg cyclshtg // A97 (c) 1986 Taito Corporation nycaptor // A50 (c) 1985 Taito Corporation -@source:nyny.cpp +@source:sigma/nyny.cpp nyny // (c) 1980 Sigma Ent. Inc. nynyg // (c) 1980 Sigma Ent. Inc. + Gottlieb warcadia // (c) 1982 Sigma Ent. Inc. -@source:o2.cpp +@source:sgi/o2.cpp o2 // (c) 1996 SGI -@source:ob68k1a.cpp +@source:omnibyte/ob68k1a.cpp ob68k1a // -@source:octane.cpp +@source:sgi/octane.cpp octane // (c) 1997 SGI -@source:octopus.cpp +@source:lsi/octopus.cpp octopus // -@source:odyssey.cpp +@source:misc/odyssey.cpp odyssey // (c) Silicon Gaming. -@source:odyssey2.cpp +@source:magnavox/odyssey2.cpp jopac // 1983 Jopac JO7400 odyssey2 // Magnavox Odyssey 2 - 1978-1983 odyssey3 // Magnavox Odyssey 3 / Command Center (prototype) @@ -33877,15 +33877,15 @@ videopac // 1979 Videopac G7000 videopacf // 1979 Videopac C52 videopacp // 1983 Videopac Plus G7400 -@source:offtwall.cpp +@source:atari/offtwall.cpp offtwall // 136090 (c) 1991 offtwallc // 136090 (c) 1991 -@source:ohmygod.cpp +@source:atlus/ohmygod.cpp naname // (c) 1994 Atlus (Japan) ohmygod // (c) 1993 Atlus (Japan) -@source:ojankohs.cpp +@source:vsystem/ojankohs.cpp ccasino // [1987] V-System Co. (Japan) ojanko2 // [1987] V-System Co. (Japan) ojankoc // [1986] V-System Co. (Japan) @@ -33894,54 +33894,54 @@ ojankocb // [1986] V-System Co. (Japan) ojankohs // [1988] V-System Co. (Japan) ojankoy // [1986] V-System Co. (Japan) -@source:okean240.cpp +@source:cccp/okean240.cpp okean240 // okean240a // okean240t // -@source:olibochu.cpp +@source:irem/olibochu.cpp olibochu // M47 (c) 1981 + "GDI presents" -@source:olivpc1.cpp +@source:olivetti/olivpc1.cpp olivpc1 -@source:olyboss.cpp +@source:olympia/olyboss.cpp olybossb // Olympia BOSS B olybossc // Olympia BOSS C olybossd // Olympia BOSS D bossa85 // Olympia BOSS A 8085 bossb85 // Olympia BOSS B 8085 -@source:olytext.cpp +@source:olympia/olytext.cpp olytext // Olympia Olytext 20 -@source:omegrace.cpp +@source:midway/omegrace.cpp deltrace // bootleg omegrace // (c) 1981 Midway omegrace2 // (c) 1981 Midway -@source:ondra.cpp +@source:tesla/ondra.cpp ondrat // ondrav // -@source:oneshot.cpp +@source:misc/oneshot.cpp maddonna // (c) 1995 Tuning komocomo // maddonnab // (c) 1995 Tuning oneshot // no copyright notice -@source:onetwo.cpp +@source:misc/onetwo.cpp onetwo // (c) 1997 Barko onetwoe // (c) 1997 Barko -@source:onyx.cpp +@source:skeleton/onyx.cpp c5000 // 1981 c8002 // -@source:opercoin.cpp +@source:misc/opercoin.cpp multibaby // (c) 1990 oper Coin -@source:opwolf.cpp +@source:taito/opwolf.cpp opwolf // B20 (c) 1987 Taito Corporation Japan (World) opwolfa // B20 (c) 1987 Taito Corporation Japan (World) opwolfb // bootleg @@ -33950,21 +33950,21 @@ opwolfjsc // B20 (c) 1987 Taito Corporation (Japan) opwolfu // B20 (c) 1987 Taito America Corporation (US) opwolfp // prototype? -@source:orao.cpp +@source:pel/orao.cpp orao // orao103 // -@source:orbit.cpp +@source:atari/orbit.cpp orbit // 033689-033702 1978/11 [6800] -@source:oric.cpp +@source:tangerin/oric.cpp oric1 // 1983 Oric 1 orica // 1984 Oric Atmos prav8d // 1985 Pravetz 8D prav8dd // 1989 Pravetz 8D (Disk ROM) telstrat // ??? Oric Telestrat/Stratos -@source:orion.cpp +@source:radio/orion.cpp orion128 // orionide // orionidm // @@ -33973,24 +33973,24 @@ orionpro // orionz80 // orionzms // -@source:osbexec.cpp +@source:osborne/osbexec.cpp osbexec // 1982 Osborne Executive -@source:osborne1.cpp +@source:osborne/osborne1.cpp osborne1 // 1981 Osborne-1 osborne1nv // 1984 Osborne-1 (Nuevo Video) osborne1sp // 1983 Osborne-1 with SCREEN-PAC -@source:osi.cpp +@source:osi/osi.cpp c1p // c1pmf // sb2m600b // uk101 // -@source:othello.cpp +@source:misc/othello.cpp othello // (c) 1984 Success. -@source:othunder.cpp +@source:taito/othunder.cpp othunder // B67 (c) 1988 Taito Corporation Japan (World, rev 1) othunderj // B67 (c) 1988 Taito Corporation (Japan) othunderjsc // B67 (c) 1988 Taito Corporation (Japan) @@ -33998,29 +33998,29 @@ othundero // B67 (c) 1988 Taito Corporation Japan (World) othunderu // B67 (c) 1988 Taito America Corporation (US, rev 1) othunderuo // B67 (c) 1988 Taito America Corporation (US) -@source:otomedius.cpp +@source:konami/otomedius.cpp otomedius // (c) 2007 Konami -@source:overdriv.cpp +@source:konami/overdriv.cpp overdriv // GX789 (c) 1990 overdriva // GX789 (c) 1990 overdrivb // GX789 (c) 1990 -@source:p112.cpp +@source:homebrew/p112.cpp p112 // -@source:p2000t.cpp +@source:philips/p2000t.cpp p2000m // 1980 P2000M p2000t // 1980 P2000T -@source:p8k.cpp +@source:skeleton/p8k.cpp p8000 // p8000_16 // -@source:pachifev.cpp +@source:misc/pachifev.cpp pachifev // (c) 1983? -@source:pacland.cpp +@source:namco/pacland.cpp pacland // (c) 1984 paclandj // (c) 1984 paclandjo // (c) 1984 @@ -34028,7 +34028,7 @@ paclandjo2 // (c) 1984 paclandm // (c) 1984 Midway paclandm2 // (c) 1984 Bally-Midway -@source:pacman.cpp +@source:pacman/pacman.cpp 8bpm // (c) 1985 Seatongrove Ltd (Magic Eletronics USA license) abscam // hack acitya // (c) 1983 Epos Corporation @@ -34163,7 +34163,7 @@ vanvank // (c) 1983 Karateco (bootleg?) woodpeca // (c) 1981 Amenip Nova Games Ltd. woodpeck // (c) 1981 Amenip (Palcom Queen River) -@source:palm.cpp +@source:palm/palm.cpp palmiii // Palm III palmiiic // Palm IIIc palmm100 // Palm m100 @@ -34181,23 +34181,23 @@ spt1700 // Symbol SPT 1700 spt1740 // Symbol SPT 1740 visor // Palm Visor Edge -@source:palmz22.cpp +@source:palm/palmz22.cpp palmz22 // Palm Z22 -@source:pandoras.cpp +@source:konami/pandoras.cpp pandoras // GX328 (c) 1984 + Interlogic -@source:pangofun.cpp +@source:ibmpc/pangofun.cpp pangofun // (c) 1995 InfoCube -@source:panicr.cpp +@source:seibu/panicr.cpp panicr // Seibu / Taito panicrg // Seibu / TV-Tuning (Germany) -@source:paokaipc.cpp +@source:ibmpc/paokaipc.cpp gogostrk // -@source:paradise.cpp +@source:yunsung/paradise.cpp madball // (c) 1998 Yun Sung madballn // (c) 1998 Yun Sung para2dx // (c) >1994 Yun Sung @@ -34212,63 +34212,63 @@ tgtball // (c) 1995 Yun Sung tgtballn // (c) 1995 Yun Sung torus // (c) 1996 Yun Sung -@source:paranoia.cpp +@source:pce/paranoia.cpp paranoia // (c) 1990 Naxat Soft -@source:parodius.cpp +@source:konami/parodius.cpp parodius // GX955 (c) 1990 (World) parodiusa // GX955 (c) 1990 (Asia) parodiuse // GX955 (c) 1990 (World) parodiusj // GX955 (c) 1990 (Japan) -@source:partner.cpp +@source:radio/partner.cpp partner // -@source:pasha2.cpp +@source:misc/pasha2.cpp pasha2 // (c) 1998 Dong Sung zdrum // (c) 2000 PARA Enterprises -@source:paso1600.cpp +@source:toshiba/paso1600.cpp paso1600 // -@source:pasogo.cpp +@source:koei/pasogo.cpp pasogo // KOEI PasoGo -@source:pasopia.cpp +@source:toshiba/pasopia.cpp pasopia // -@source:pasopia7.cpp +@source:toshiba/pasopia7.cpp pasopia7 // pasopia7lcd // -@source:pass.cpp +@source:misc/pass.cpp pass // (c) 1992 Oksan -@source:pastelg.cpp +@source:nichibut/pastelg.cpp galds // (c) 1985 pastelg // (c) 1985 threeds // (c) 1985 threedsa // (c) 1985 -@source:patapata.cpp +@source:atlus/patapata.cpp patapata // 1993 NTC / NMK / ATLUS -@source:patinho_feio.cpp +@source:usp/patinho_feio.cpp patinho // 1972 Patinho Feio -@source:pb1000.cpp +@source:casio/pb1000.cpp ai1000 // Casio AI-1000 pb1000 // Casio PB-1000 pb2000c // Casio PB-2000C -@source:pbaction.cpp +@source:tehkan/pbaction.cpp pbaction // (c) 1985 Tehkan pbaction2 // (c) 1985 Tehkan pbaction3 // (c) 1985 Tehkan pbaction4 // (c) 1985 Tehkan pbactiont // (c) 1985 Tehkan (Tecfri license) -@source:pc.cpp +@source:pc/pc.cpp ataripc1 // Atari PC1 ataripc3 // Atari PC3 bw230 // 1985 Bondwell (CGA) @@ -34334,13 +34334,13 @@ vpcii // Victor VPC II fraking // Frael King mpu9088vf // MY-COM MPU-9088-VF SAN-MS94VO -@source:pc100.cpp +@source:nec/pc100.cpp pc100 // -@source:pc1500.cpp +@source:sharp/pc1500.cpp pc1500 // Pocket Computer 1500 -@source:pc1512.cpp +@source:amstrad/pc1512.cpp pc1512 // pc1512dd // pc1512hd10 // @@ -34350,7 +34350,7 @@ pc1640dd // pc1640hd20 // pc1640hd30 // -@source:pc2000.cpp +@source:vtech/pc2000.cpp gbs5505x // 2001 Genius BrainStation 5505X (Germany) gl2000 // 1993 Genius Leader 2000 gl2000c // 1994 Genius Leader 2000 Compact @@ -34369,10 +34369,10 @@ pc1000 // 1988 PreComputer 1000 pc2000 // 1993 PreComputer 2000 pc2000s // 1993 PreComputer 2000 (Spain) -@source:pc4.cpp +@source:vtech/pc4.cpp pc4 // -@source:pc6001.cpp +@source:nec/pc6001.cpp pc6001 // pc6001a // pc6001mk2 // @@ -34380,16 +34380,16 @@ pc6601 // pc6001mk2sr // pc6601sr // -@source:pc8001.cpp +@source:nec/pc8001.cpp pc8001 // 1979 pc8001mk2 // 1983 pc8001mk2sr // 1985 -@source:pc8401a.cpp +@source:nec/pc8401a.cpp pc8401a // roms needed pc8500 // -@source:pc8801.cpp +@source:nec/pc8801.cpp pc8801 // pc8801fa // pc8801ma // @@ -34401,15 +34401,15 @@ pc8801mk2fr // pc8801mk2mr // pc8801mk2sr // -@source:pc88va.cpp +@source:nec/pc88va.cpp pc88va // pc88va2 // -@source:pc98ha.cpp +@source:nec/pc98ha.cpp pc98lt // 1989 pc98ha // 1990 -@source:pc9801.cpp +@source:nec/pc9801.cpp pc9801bx2 // 1993 pc9801f // 1983 pc9801rs // 1989 @@ -34420,12 +34420,12 @@ pc9801vm // 1985 pc9801vm11 // 1985 pc9801vx // 1986 -@source:pc9801_epson.cpp +@source:nec/pc9801_epson.cpp pc386m // 1990 pc486se // 1993 pc486mu // 1994 -@source:pc9821.cpp +@source:nec/pc9821.cpp pc9821 // 1992 pc9821ap2 // 1993 pc9821as // 1993 @@ -34443,11 +34443,11 @@ pc9821v20 // 1998 pc9821xa16 // 1996 pc9821xs // 1994 -@source:pcat_dyn.cpp +@source:ibmpc/pcat_dyn.cpp toursol // (c) 1995 Dynamo toursol1 // (c) 1995 Dynamo -@source:pcat_nit.cpp +@source:ibmpc/pcat_nit.cpp bonanza // (c) 1993 bonanzar2 // (c) 1993 streetg // (c) 1993 @@ -34455,29 +34455,29 @@ streetg2 // (c) 1993 streetg2r5 // (c) 1993 streetgr3 // (c) 1993 -@source:pcd.cpp +@source:siemens/pcd.cpp pcd // Siemens PC-D pcx // Siemens PC-X -@source:pce.cpp +@source:nec/pce.cpp pce // PC/Engine NEC 1987-1993 sgx // SuperGrafX NEC 1989 tg16 // Turbo Grafix-16 NEC 1989-1993 -@source:pce220.cpp +@source:sharp/pce220.cpp pce220 // Pocket Computer E220 pcg815 // Pocket Computer G815 pcg850v // Pocket Computer G850V -@source:pcfx.cpp +@source:nec/pcfx.cpp pcfx // PC-FX NEC 1994 pcfxga // PC-FX NEC 199? (PC-FX on a PC ISA Card) -@source:pcipc.cpp +@source:pc/pcipc.cpp pcipc // pcipctx // -@source:pcktgal.cpp +@source:dataeast/pcktgal.cpp pcktgal // (c) 1987 Data East Corporation (Japan) pcktgal2 // (c) 1989 Data East Corporation (World?) pcktgal2j // (c) 1989 Data East Corporation (World?) @@ -34485,13 +34485,13 @@ pcktgalb // bootleg spool3 // (c) 1989 Data East Corporation (World?) spool3i // (c) 1990 Data East Corporation + I-Vics license -@source:pcm.cpp +@source:ddr/pcm.cpp pcm // PC/M Mugler -@source:pcmx2.cpp +@source:siemens/pcmx2.cpp pcmx2 // Siemens PC-MX2 -@source:pcw.cpp +@source:amstrad/pcw.cpp pcw10 // 198? PCW10 pcw8256 // 1985 PCW8256 pcw8512 // 1985 PCW8512 @@ -34499,44 +34499,44 @@ pcw9256 // 1993 PCW9256 pcw9512 // 1987 PCW9512 pcw9512p // 1991 PCW9512+ -@source:pcw16.cpp +@source:amstrad/pcw16.cpp pcw16 // 1995 PCW16 -@source:pcxt.cpp +@source:ibmpc/pcxt.cpp filetto // (c) 1990 Novamatic tetriskr // (c) 1988? bootleg -@source:pda600.cpp +@source:amstrad/pda600.cpp pda600 // -@source:pdp1.cpp +@source:pdp1/pdp1.cpp pdp1 // 1961 DEC PDP1 -@source:pdp11.cpp +@source:dec/pdp11.cpp pdp11qb // pdp11ub // pdp11ub2 // sms1000 // -@source:pdt3100.cpp +@source:skeleton/pdt3100.cpp pdt3100 // -@source:pecom.cpp +@source:einis/pecom.cpp pecom32 // pecom64 // -@source:pegasus.cpp +@source:skeleton/pegasus.cpp pegasus // pegasusm // -@source:pencil2.cpp +@source:skeleton/pencil2.cpp pencil2 // -@source:pengadvb.cpp +@source:ascii/pengadvb.cpp pengadvb // (c) 1988 Screen pengadvb2 // (c) 1988 Comet -@source:pengo.cpp +@source:pacman/pengo.cpp jrpacmbl // bootleg on Pengo HW pengo // 834-0386 (c) 1982 Sega pengo2 // 834-0386 (c) 1982 Sega @@ -34548,17 +34548,17 @@ pengo6 // 834-0386 (c) 1982 Sega pengob // bootleg penta // bootleg -@source:pensebem.cpp +@source:tectoy/pensebem.cpp pbem2017 // 2017 TecToy Pense Bem -@source:pentagon.cpp +@source:sinclair/pentagon.cpp pent1024 // pentagon // -@source:peoplepc.cpp +@source:olympia/peoplepc.cpp olypeopl // Olympia People PC -@source:peplus.cpp +@source:igt/peplus.cpp im1p1952 // (c) 1995 IGT - International Game Technology im1p19s1 // (c) 1995 IGT - International Game Technology im2p1929 // (c) 1995 IGT - International Game Technology @@ -35149,13 +35149,13 @@ pexmp022 // (c) 1997 IGT - International Game Technology pexmp026 // (c) 1997 IGT - International Game Technology pexmp030 // (c) 1997 IGT - International Game Technology -@source:perq.cpp +@source:skeleton/perq.cpp perq // -@source:pes.cpp +@source:skeleton/pes.cpp pes // -@source:pet.cpp +@source:cbm/pet.cpp cbm3008 // cbm3016 // cbm3032 // @@ -35192,7 +35192,7 @@ pet4032f // pet8032 // superpet // -@source:peyper.cpp +@source:pinball/peyper.cpp ator // ator3bmp // gamatros // @@ -35208,14 +35208,14 @@ sonstwar // sonstwr2 // wolfman // -@source:pg685.cpp +@source:siemens/pg685.cpp pg675 // pg685 // pg685oua12 // -@source:pgm.cpp +@source:igs/pgm.cpp ddp2 // (c) 2001 DoDonPachi 2 - Bee Storm ddp2100 // ddp2100c // @@ -35364,7 +35364,7 @@ theglad101 // thegladpcb // thegladpcba // -@source:pgm2.cpp +@source:igs/pgm2.cpp ddpdojt // (c) 2010 kov2nl // (c) 2008 kov2nl_301 // @@ -35387,21 +35387,21 @@ orleg2_103jp // orleg2_101jp // kof98umh // (c) 2009 -@source:pgm3.cpp +@source:igs/pgm3.cpp kov3hd kov3hd104 kov3hd103 kov3hd102 kov3hd101 -@source:phc25.cpp +@source:sanyo/phc25.cpp phc25 // phc25j // -@source:philipsbo.cpp +@source:skeleton/philipsbo.cpp pbo // (c) 1987 Philips -@source:phoenix.cpp +@source:phoenix/phoenix.cpp avefenix // bootleg (Video Game) avefenixl // bootleg (Laguna) avefenixrf // bootleg (Recreativos Franco) @@ -35445,17 +35445,17 @@ vautour // bootleg (Jeutel) vautourz // bootleg vautourza // bootleg (Jeutal) -@source:photon.cpp +@source:misc/photon.cpp phklad // phpython // phtetris // -@source:photon2.cpp +@source:misc/photon2.cpp black // brod // kok // -@source:photoply.cpp +@source:funworld/photoply.cpp photoply98sp // (c) 1998 Funworld photoply99nl // (c) 1999 Funworld photoply99sp // (c) 1999 Funworld @@ -35468,21 +35468,21 @@ photoply2k1mtnl // (c) 2001 Funworld photoply2k2be // (c) 2002 Funworld photoply2k4 // (c) 2004 Funworld -@source:photoplys.cpp +@source:funworld/photoplys.cpp photoply2k1sp // (c) 2001 Funworld -@source:photoplysx.cpp +@source:funworld/photoplysx.cpp photopsxsp // (c) 2004 Funworld photopsxusp // (c) 200? Funworld -@source:phunsy.cpp +@source:homebrew/phunsy.cpp phunsy // -@source:picno.cpp +@source:skeleton/picno.cpp picno // Konami Picno (1993) picno2 // Konami Picno 2 (1993) -@source:piggypas.cpp +@source:misc/piggypas.cpp 3lilpigs // dumpump // fidlstix // @@ -35493,29 +35493,29 @@ jackbean // piggypas // rndrndqs // -@source:pimps.cpp +@source:homebrew/pimps.cpp pimps // -@source:pinball2k.cpp +@source:midway/pinball2k.cpp rfmpb // rfmpbr2 // swe1pb // -@source:pingpong.cpp +@source:konami/pingpong.cpp cashquiz // (c) 1986 Zilec-Zenitone merlinmm // (c) 1986 Zilec-Zenitone pingpong // GX555 (c) 1985 -@source:pinkiri8.cpp +@source:wing/pinkiri8.cpp janshi // pinkiri8 // ronjan // ronjans // -@source:pipbug.cpp +@source:skeleton/pipbug.cpp pipbug // -@source:pipedrm.cpp +@source:vsystem/pipedrm.cpp hatris // (c) 1990 Video System Co. (US) hatrisj // (c) 1990 Video System Co. (Japan) pipedrm // (c) 1990 Video System Co. (World) @@ -35523,46 +35523,46 @@ pipedrmj // (c) 1990 Video System Co. (Japan) pipedrmt // (c) 1990 Video System Co. (Taiwan) pipedrmu // (c) 1990 Video System Co. (US) -@source:pipeline.cpp +@source:misc/pipeline.cpp pipeline // (c) 1990 Daehyun Electronics -@source:pirates.cpp +@source:nix/pirates.cpp genix // (c) 199? NIX pirates // (c) 1994 NIX piratesb // bootleg? -@source:piratesh.cpp +@source:konami/piratesh.cpp piratesh // (c) 1995 Konami -@source:pitnrun.cpp +@source:taito/pitnrun.cpp pitnrun // PR (c) 1984 Taito Corporation pitnruna // PR (c) 1984 Taito Corporation jumpkun // prototype -@source:pk8000.cpp +@source:cccp/pk8000.cpp hobby // pk8002 // vesta // -@source:pk8020.cpp +@source:cccp/pk8020.cpp bk8t // kontur // korvet // neiva // -@source:pkscram.cpp +@source:misc/pkscram.cpp pkscram // (c) 1993 Cosmo Electronics Corporation -@source:pktgaldx.cpp +@source:dataeast/pktgaldx.cpp pktgaldx // MAZ (c) 1992 Data East (Euro v3.00) pktgaldxa // MAZ (c) 1992 Data East (Asia v3.00) pktgaldxb // bootleg pktgaldxj // MAZ (c) 1993 Nihon System inc (Japan v3.00) -@source:plan80.cpp +@source:skeleton/plan80.cpp plan80 // -@source:play_1.cpp +@source:pinball/play_1.cpp bigtown // chance // lastlap // @@ -35571,7 +35571,7 @@ party // spcgambl // thrdwrld // -@source:play_2.cpp +@source:pinball/play_2.cpp antar // antar2 // attack // @@ -35582,7 +35582,7 @@ madrace // storm // zira // -@source:play_3.cpp +@source:pinball/play_3.cpp flashman // fldragon // fldragona // @@ -35605,10 +35605,10 @@ theraida // (c) 1984 Playmatic / EFOSA trailer // ufo_x // -@source:playcenter.cpp +@source:misc/playcenter.cpp plycntrchtr // (c) 2000 Recreativos Presas / Undergaming -@source:playch10.cpp +@source:nintendo/playch10.cpp pc_1942 // (c) 1985 Capcom pc_bball // (c) 1984 Nintendo of America pc_bfght // (c) 1984 Nintendo @@ -35667,7 +35667,7 @@ pc_wgnmn // (c) 1984 Nintendo pc_ynoid // (c) 1990 Capcom USA (Nintendo of America license) playch10 // -@source:playmark.cpp +@source:playmark/playmark.cpp bigtwin // (c) 1995 bigtwinb // (c) 1995 excelsr // (c) 1995 @@ -35681,10 +35681,10 @@ wbeachvl2 // (c) 1995 wbeachvl3 // (c) 1995 wbeachvla // (c) 1995 -@source:plsonic4.cpp +@source:misc/plsonic4.cpp plsonic4 // -@source:plus4.cpp +@source:cbm/plus4.cpp c116 // c16 // c16_hu // @@ -35695,7 +35695,7 @@ plus4 // plus4p // v364 // -@source:pluto5.cpp +@source:jpm/pluto5.cpp hb_bar7 // Bar Seven (Fairgames) hb_bar7a // hb_bigx // Big X (JPM) @@ -35792,17 +35792,17 @@ hb_ringbe // hb_ydd // Yabba-Dabba-Dough (Qps) hb_ydda // -@source:plygonet.cpp +@source:konami/plygonet.cpp plygonet // GX305 (c) 1993 polynetw // GX305 too? (c) 1993 -@source:pm68k.cpp +@source:skeleton/pm68k.cpp pm68k // -@source:pmc.cpp +@source:misc/pmc.cpp unkpmc -@source:pmd85.cpp +@source:tesla/pmd85.cpp alfa // Alfa (PMD-85.1 clone) c2717 // Consul 2717 (PMD-85.2 clone) c2717pmd // Consul 2717 with PMD-32 @@ -35813,13 +35813,13 @@ pmd852a // PMD-85.2A pmd852b // PMD-85.2B pmd853 // PMD-85.3 -@source:pmi80.cpp +@source:tesla/pmi80.cpp pmi80 // -@source:pntnpuzl.cpp +@source:misc/pntnpuzl.cpp pntnpuzl // Century? -@source:pocketc.cpp +@source:sharp/pocketc.cpp pc1245 // Pocket Computer 1245 pc1250 // Pocket Computer 1250 pc1251 // Pocket Computer 1251 @@ -35835,33 +35835,33 @@ pc1403h // Pocket Computer 1403H pc1450 // Pocket Computer 1450 trs80pc3 // Tandy TRS80 PC-3 -@source:pockchal.cpp +@source:skeleton/pockchal.cpp pockchal -@source:pockstat.cpp +@source:sony/pockstat.cpp pockstat // 1999 Sony PocketStation -@source:pofo.cpp +@source:atari/pofo.cpp pofo // -@source:poisk1.cpp +@source:xussrpc/poisk1.cpp poisk1 // -@source:pokechmp.cpp +@source:dgrm/pokechmp.cpp billlist // pokechmp // Korean hack of Pocket Gal pokechmpa // -@source:pokemini.cpp +@source:nintendo/pokemini.cpp pokemini // Nintendo Pokemon Mini -@source:poker72.cpp +@source:misc/poker72.cpp poker72 // -@source:pokerout.cpp +@source:misc/pokerout.cpp pokerout // 19??, unknown -@source:polepos.cpp +@source:namco/polepos.cpp grally // bootleg polepos // (c) 1982 polepos2 // (c) 1983 @@ -35877,7 +35877,7 @@ topracer // bootleg topracera // bootleg topracern // bootleg -@source:policetr.cpp +@source:misc/policetr.cpp policetr // (c) 1996 P&P Marketing policetr10 // (c) 1996 P&P Marketing policetr11 // (c) 1996 P&P Marketing @@ -35889,49 +35889,49 @@ sshooter11 // (c) 1998 P&P Marketing sshooter12 // (c) 1998 P&P Marketing sshooter17 // (c) 1998 P&P Marketing -@source:poly.cpp +@source:poly/poly.cpp poly1 // Poly 1 poly1e // Poly 1 (early) poly2 // Poly 2 polydev // Poly Development -@source:poly88.cpp +@source:poly88/poly88.cpp poly88 // poly8813 // -@source:poly800.cpp +@source:korg/poly800.cpp poly800 // poly800ii // poly800mdk // -@source:poly880.cpp +@source:veb/poly880.cpp poly880 // poly880s // -@source:polyplay.cpp +@source:misc/polyplay.cpp polyplay // polyplay2 // polyplay2c // -@source:polysix.cpp +@source:korg/polysix.cpp polysix // poly61 // -@source:pong.cpp +@source:atari/pong.cpp breakout // (c) 1976 Atari pong // (c) 1972 Atari pongd // (c) 1973 Atari rebound // -@source:poolshrk.cpp +@source:atari/poolshrk.cpp poolshrk // 006281 1977/06 [6800] -@source:pooyan.cpp +@source:konami/pooyan.cpp pootan // bootleg pooyan // GX320 (c) 1982 pooyans // GX320 (c) 1982 Stern -@source:popeye.cpp +@source:nintendo/popeye.cpp popeye // (c) 1982 popeyehs popeyebl // bootleg @@ -35943,30 +35943,30 @@ popeyej // popeyejo // skyskipr // (c) 1981 -@source:popobear.cpp +@source:bmc/popobear.cpp popobear // (c) 2000 BMC -@source:popper.cpp +@source:omori/popper.cpp popper // (c) 1983 Omori Electric Co., Ltd. -@source:positron.cpp +@source:positron/positron.cpp positron // 1982 Positron 9000 -@source:portrait.cpp +@source:olympia/portrait.cpp portrait // (c) 1983 Olympia portraita // (c) 1983 Olympia -@source:potgoldu.cpp +@source:misc/potgoldu.cpp potgoldu // (c) 200? U.S. Games potgoldu580 // (c) 200? U.S. Games -@source:powerbal.cpp +@source:playmark/powerbal.cpp atombjt // bootleg hotminda // (c) 1995 magicstk // (c) 1995 powerbal // (c) 1994 -@source:powerins.cpp +@source:nmk/powerins.cpp powerins // (c) 1993 Atlus (USA) powerinsa // (c) 1993 Atlus (bootleg of USA version) powerinsb // (c) 1993 Atlus (bootleg of USA version) @@ -35975,26 +35975,26 @@ powerinsj // (c) 1993 Atlus (Japan) powerinspj // prototype (Japan) powerinspu // prototype (USA) -@source:powerstack.cpp +@source:skeleton/powerstack.cpp powerstk // Motorola Powerstack II -@source:pp.cpp +@source:stm/pp.cpp pp // STM Pied Piper Communicator 1 -@source:pp01.cpp +@source:zvt/pp01.cpp pp01 // -@source:ppmast93.cpp +@source:edevices/ppmast93.cpp ppmast93 // (c) 1993 Electronic Devices S.R.L. -@source:prehisle.cpp +@source:snk/prehisle.cpp gensitou // A8003 'GT' (c) 1989 prehisle // A8003 'GT' (c) 1989 prehislek // A8003 'GT' (c) 1989 prehisleu // A8003 'GT' (c) 1989 prehisleb // bootleg -@source:prestige.cpp +@source:vtech/prestige.cpp gl6000sl // Genius Leader 6000SL (Germany) gl7007sl // Genius Leader 7007SL (Germany) glcolor // Genius Leader Color (Germany) @@ -36008,7 +36008,7 @@ snotec // Bandai Super Note Club (Japan) snotecex // Bandai Super Note Club EX (Japan) snotecu // Bandai Super Note Club U (Japan) -@source:primo.cpp +@source:microkey/primo.cpp primoa32 // Primo A-32 primoa48 // Primo A-48 primoa64 // Primo A-64 @@ -36017,10 +36017,10 @@ primob48 // Primo B-48 primob64 // Primo B-64 primoc64 // Primo C-64 -@source:pro80.cpp +@source:trainer/pro80.cpp pro80 // -@source:proconn.cpp +@source:misc/proconn.cpp pr_5xcsh // 5x Cash (Project) pr_7hvn // 777 Heaven (Project) pr_7hvna // @@ -36154,27 +36154,27 @@ pr_whlft // Wheel Of Fortune (Project) pr_wldkn // Wild Kings (Project) pr_wnstk // Winning Streak (Coinworld) -@source:prof180x.cpp +@source:conitec/prof180x.cpp prof180x // prof181x // -@source:prof80.cpp +@source:conitec/prof80.cpp prof80 // -@source:progolf.cpp +@source:dataeast/progolf.cpp progolf // (c) 1981 progolfa // (c) 1981 -@source:prophet600.cpp +@source:sequential/prophet600.cpp prpht600 // 1983 Sequential Circuits -@source:proteus.cpp +@source:poly/proteus.cpp proteus // Poly Proteus -@source:proteus3.cpp +@source:skeleton/proteus3.cpp proteus3 // -@source:ps2.cpp +@source:at/ps2.cpp i8530286 // IBM PS/2 Model 30-286 i8530h31 // IBM PS/2 8530-H31 (Model 30/286) i8535043 // IBM PS/2 8535-043 (Model 35) @@ -36184,20 +36184,20 @@ i8555081 // IBM PS/2 8550-081 (Model 55SX) i8580071 // IBM PS/2 8580-071 (Model 80) i8580111 // IBM PS/2 8580-111 (Model 80) -@source:ps2sony.cpp +@source:sony/ps2sony.cpp ps2 // Sony Playstation 2 -@source:psattack.cpp +@source:misc/psattack.cpp psattack // 2004 Uniana -@source:pse.cpp +@source:misc/pse.cpp bazooka // (c) 1976 PSE bazookabr // (c) 1977 Taito do Brasil dpatrol // (c) 1977 PSE dpatrola // (c) 1977 PSE / Telegames gametree // (c) 1978 PSE -@source:psikyo.cpp +@source:psikyo/psikyo.cpp btlkroad // (c) 1994 btlkroadk // (c) 1994 (Korea) gunbird // (c) 1994 @@ -36216,7 +36216,7 @@ sngkacea // (c) 1993 (Japan) tengai // (c) 1996 (World) tengaij // (c) 1996 (Japan) -@source:psikyo4.cpp +@source:psikyo/psikyo4.cpp hgkairak // (c) 1998 hotdebut // (c) 2000 hotgm4ev // (c) 2000 @@ -36226,7 +36226,7 @@ hotgmcki // (c) 2001 loderndf // (c) 2000 loderndfa // (c) 2000 -@source:psikyosh.cpp +@source:psikyo/psikyosh.cpp daraku // (c) 1998 dragnblz // (c) 2000 gnbarich // (c) 2001 @@ -36242,7 +36242,7 @@ soldividk // (c) 1997 (Korea) tgm2 // (c) 2000 tgm2p // (c) 2000 -@source:psion.cpp +@source:psion/psion.cpp psion1 // psioncm // psionla // @@ -36255,50 +36255,50 @@ psionp350 // psionp464 // psionxp // -@source:psion5.cpp +@source:psion/psion5.cpp psion5mx // -@source:psrockman.cpp +@source:capcom/psrockman.cpp psrockmn // -@source:psx.cpp +@source:sony/psx.cpp psa // 1995 Sony PlayStation (Asia-Pacific) pse // 1995 Sony PlayStation (Europe) psj // 1994 Sony PlayStation (Japan) psu // 1995 Sony PlayStation (USA) -@source:psychic5.cpp +@source:jaleco/psychic5.cpp bombsa // (c) 1988 Jaleco psychic5 // (c) 1987 Jaleco psychic5j // (c) 1987 Jaleco -@source:pt68k4.cpp +@source:skeleton/pt68k4.cpp pt68k2 // pt68k4 // -@source:ptcsol.cpp +@source:skeleton/ptcsol.cpp sol20 // -@source:pturn.cpp +@source:jaleco/pturn.cpp pturn // (c) 1984 Jaleco -@source:pubint_storyreader.cpp +@source:tvgames/pubint_storyreader.cpp pi_stry pi_stry2 -@source:pubtimed.cpp +@source:merit/pubtimed.cpp pubtimed // -@source:puckpkmn.cpp +@source:sega/puckpkmn.cpp jzth // puckpkmn // (c) 2000 Genie puckpkmna // (c) 2000 IBS puckpkmnb // (c) 2000 IBS -@source:pulsar.cpp +@source:skeleton/pulsar.cpp pulsarlb // -@source:punchout.cpp +@source:nintendo/punchout.cpp armwrest // (c) 1985 punchita // bootleg punchout // (c) 1984 @@ -36308,43 +36308,43 @@ spnchout // (c) 1984 spnchouta // (c) 1984 spnchoutj // (c) 1984 (Japan) -@source:pv1000.cpp +@source:casio/pv1000.cpp pv1000 // Casio PV-1000 -@source:pv2000.cpp +@source:casio/pv2000.cpp pv2000 // Casio PV-2000 -@source:pv9234.cpp +@source:skeleton/pv9234.cpp pv9234 // -@source:pve500.cpp +@source:sony/pve500.cpp pve500 // SONY PVE-500 -@source:pwp14.cpp +@source:skeleton/pwp14.cpp pwp14 // Smith Corona PWP System 14 -@source:pwrview.cpp +@source:compugraphic/pwrview.cpp pwrview // Compugraphic MCS PowerView 10 -@source:px4.cpp +@source:epson/px4.cpp px4 // 1985 Epson PX-4 px4p // 1985 Epson PX-4+ -@source:px8.cpp +@source:epson/px8.cpp px8 // -@source:pyl601.cpp +@source:cccp/pyl601.cpp pyl601 // pyl601a // -@source:pzletime.cpp +@source:edevices/pzletime.cpp pzletime // -@source:qdrmfgp.cpp +@source:konami/qdrmfgp.cpp qdrmfgp // 1994.12 GQ460 (Japan) qdrmfgp2 // 1995.09 GE557 (Japan) -@source:qix.cpp +@source:taito/qix.cpp complexx // CX (c) 1984 Taito America Corporation elecyoyo // YY (c) 1982 Taito America Corporation elecyoyo2 // YY (c) 1982 Taito America Corporation @@ -36365,7 +36365,7 @@ zookeep2 // ZA (c) 1982 Taito America Corporation zookeep3 // ZA (c) 1982 Taito America Corporation zookeepbl // bootleg -@source:ql.cpp +@source:sinclair/ql.cpp ql // 1984 Sinclair QL (UK) ql_de // 1984 Sinclair QL (Germany) ql_dk // 1984 Sinclair QL (Denmark) @@ -36377,89 +36377,89 @@ ql_se // 1984 Sinclair QL (Sweden) ql_us // 1984 Sinclair QL (USA) tonto // -@source:qtsbc.cpp +@source:skeleton/qtsbc.cpp qtsbc // -@source:quakeat.cpp +@source:ibmpc/quakeat.cpp quake // (c) 19?? Lazer-Tron / iD Software -@source:controlid.cpp +@source:skeleton/controlid.cpp cidx628 // 200? Control ID X628 -@source:quantum.cpp +@source:atari/quantum.cpp quantum // 136016 (c) 1982 // made by Gencomp quantum1 // 136016 (c) 1982 // made by Gencomp quantump // 136016 (c) 1982 // made by Gencomp -@source:quasar.cpp +@source:cvs/quasar.cpp quasar // (c) 1980 Zelco Games Italy quasara // (c) 1980 Zelco Games Italy -@source:queen.cpp +@source:ibmpc/queen.cpp queen // -@source:quizdna.cpp +@source:nmk/quizdna.cpp gakupara // (c) 1991 NMK gekiretu // (c) 1992 Face quizdna // (c) 1992 Face -@source:quizo.cpp +@source:misc/quizo.cpp quizo // (c) 1985 Seoul Coin Corp. quizoa // (c) 1985 Seoul Coin Corp. -@source:quizpani.cpp +@source:nmk/quizpani.cpp quizpani // (c) 1993 NMK -@source:quizpun2.cpp +@source:misc/quizpun2.cpp quizpun // (c) 1989 Space Computer System of Korea quizpun2 // (c) 1989 Space Computer System of Korea -@source:quizshow.cpp +@source:atari/quizshow.cpp quizshow // 005464 1976/04 [2650] -@source:qvt70.cpp +@source:qume/qvt70.cpp qvt70 // (c) 1992 Qume Corp. qvt82 // (c) 1993 Qume Corp. -@source:qvt102.cpp +@source:qume/qvt102.cpp qvt102 // (c) 1983 Qume Corp. qvt102a // (c) 1983 Qume Corp. -@source:qvt103.cpp +@source:qume/qvt103.cpp qvt103 // (c) 1983 Qume Corp. -@source:qvt190.cpp +@source:qume/qvt190.cpp qvt190 // Qume Corp. -@source:qvt201.cpp +@source:qume/qvt201.cpp qvt201 // (c) 1986 Qume Corp. -@source:qx10.cpp +@source:epson/qx10.cpp qx10 // -@source:r2dtank.cpp +@source:sigma/r2dtank.cpp r2dtank // (c) 1980 Sigma Ent. Inc. -@source:r2dx_v33.cpp +@source:seibu/r2dx_v33.cpp nzeroteam // (c) 1997 Seibu Kaihatsu nzeroteama // r2dx_v33 // (c) 1996 Seibu Kaihatsu r2dx_v33_r2 // (c) 1996 Seibu Kaihatsu zerotm2k // (c) 2000 Seibu Kaihatsu -@source:r9751.cpp +@source:rolm/r9751.cpp r9751 // ROLM 9751 phone system -@source:rabbit.cpp +@source:metro/rabbit.cpp rabbit // (c) 1997 Electronic Arts rabbita // (c) 1996 Electronic Arts rabbitj // (c) 1997 Electronic Arts rabbitjt // (c) 1996 Electronic Arts -@source:radikaldarts.cpp +@source:misc/radikaldarts.cpp radikaldrt // (c) 2011? Gaelco Darts -@source:radio86.cpp +@source:radio/radio86.cpp impuls03 // kr03 // mikron2 // @@ -36472,10 +36472,10 @@ rk7007 // rk700716 // spektr01 // -@source:radionic.cpp +@source:trs/radionic.cpp radionic // Komtek 1 -@source:raiden.cpp +@source:seibu/raiden.cpp raiden // (c) 1990 Seibu Kaihatsu raidena // (c) 1990 Seibu Kaihatsu raidenb // (c) 1990 Seibu Kaihatsu @@ -36486,10 +36486,10 @@ raidenu // (c) 1990 Seibu Kaihatsu + Fabtek license raidenua // (c) 1990 Seibu Kaihatsu + Fabtek license raidenub // (c) 1990 Seibu Kaihatsu + Fabtek license -@source:raiden_ms.cpp +@source:seibu/raiden_ms.cpp raidenm // bootleg -@source:raiden2.cpp +@source:seibu/raiden2.cpp raiden2 // (c) 1993 Seibu Kaihatsu + Fabtek license raiden2dx // (c) 1993 Seibu Kaihatsu raiden2e // (c) 1993 Seibu Kaihatsu @@ -36529,15 +36529,15 @@ zeroteamd // (c) 1993 Seibu Kaihatsu + Dreamsoft license zeroteams // (c) 1993 Seibu Kaihatsu zeroteamsr // (c) 1993 Seibu Kaihatsu -@source:rainbow.cpp +@source:dec/rainbow.cpp rainbow // 1983 DEC Rainbow 100-B rainbow100a // 1982 DEC Rainbow 100-A rainbow190 // 1985 DEC Rainbow 190 -@source:rallypnt.cpp +@source:atlus/rallypnt.cpp rallypnt2 -@source:rallyx.cpp +@source:namco/rallyx.cpp commsega // (c) 1983 Sega cottong // bootleg dngrtrck // Petaco bootleg @@ -36558,16 +36558,16 @@ savanna // Olympia (c) 1982 (Jungler bootleg) tactcian // GX335 (c) 1982 Sega tactcian2 // GX335 (c) 1981 Sega -@source:rambo.cpp +@source:ultimachine/rambo.cpp metamaq2 // Metamaquina 2 desktop 3d printer -@source:rampart.cpp +@source:atari/rampart.cpp rampart // 136082 (c) 1990 rampart2p // 136082 (c) 1990 rampart2pa // 136082 (c) 1990 rampartj // 136082 (c) 1990 (Japan) -@source:ramtek.cpp +@source:ramtek/ramtek.cpp bballrmt // (c) 1974 Ramtek cleanswp // (c) 1974 Ramtek hockyrmt // (c) 1973 Ramtek @@ -36576,7 +36576,7 @@ trivia // (c) 1976 Ramtek vollyrmt // (c) 1973 Ramtek wipeormt // (c) 1974 Ramtek -@source:rastan.cpp +@source:taito/rastan.cpp rastan // B04 (c) 1987 Taito Corporation Japan (World) rastana // B04 (c) 1987 Taito Corporation Japan (World) rastanb // B04 (c) 1987 Taito Corporation Japan (World) @@ -36588,20 +36588,20 @@ rastsagaa // B04 (c) 1987 Taito Corporation (Japan) rastsagaabl // bootleg rastsagab // B04 (c) 1987 Taito Corporation (Japan) -@source:rastersp.cpp +@source:bfm/rastersp.cpp fbcrazy // 1997 rotr // 1994 rotra // 1994 -@source:ravens.cpp +@source:homebrew/ravens.cpp ravens // ravens2 // -@source:rawthrillspc.cpp +@source:misc/rawthrillspc.cpp fnf // (c) 2004 Raw Thrills guitarheroac // (c) 2008 Raw Thrills / Activision / Konami -@source:rbisland.cpp +@source:taito/rbisland.cpp jumping // bootleg jumpinga // bootleg (Seyutu) jumpingi // bootleg (Seyutu / Imnoe) @@ -36609,32 +36609,32 @@ rbisland // B22 (c) 1987 Taito Corporation rbislando // B22 (c) 1987 Taito Corporation rbislande // B39 (c) 1988 Taito Corporation -@source:rbmk.cpp +@source:misc/rbmk.cpp magslot // (c) 2003 GMS rbmk // (c) 1998 GMS rbspm // (c) 1998 GMS sc2in1 // (c) 2001 GMS -@source:rbowlorama.cpp +@source:namco/rbowlorama.cpp rbowlorama // (c) 2008 Cosmodog / Namco -@source:rc702.cpp +@source:regnecentralen/rc702.cpp rc702 // 1979 RC702 -@source:rc759.cpp +@source:regnecentralen/rc759.cpp rc759 // 1984 RC759 -@source:rcorsair.cpp +@source:misc/rcorsair.cpp rcorsair // (c) 1984 Nakasawa -@source:rd100.cpp +@source:skeleton/rd100.cpp rd100 // -@source:re900.cpp +@source:misc/re900.cpp bs94 // (c) 1994 Entretenimientos GEMINIS re900 // (c) 1993 Entretenimientos GEMINIS -@source:realbrk.cpp +@source:dynax/realbrk.cpp dai2kaku // "522" DaiDaiKakumei (Japan) pkgnsh // "505" Pachinko Gindama Shoubu 1998 (Japan) pkgnshdx // "522" Pachinko Gindama Shoubu DX 1998 (Japan) @@ -36643,7 +36643,7 @@ realbrkj // "523" Billiard Academy Real Break 1998 (Japan realbrkk // "600" Billiard Academy Real Break 1998 (Korea) realbrko // "600" Billiard Academy Real Break 1998 (Europe) -@source:recel.cpp +@source:pinball/recel.cpp recel // r_alaska // r_blackm4 // @@ -36660,13 +36660,13 @@ r_screech // r_swash // r_torneo // -@source:redalert.cpp +@source:irem/redalert.cpp demoneye // M27 (c) 1981 panther // M27 no copyright notice redalert // M27 (c) 1981 + "GDI presents" ww3 // M27 (c) 1981 -@source:redclash.cpp +@source:univers/redclash.cpp redclash // (c) Kaneko redclasht // (c) 1981 Tehkan redclashta // (c) 1981 Tehkan @@ -36675,53 +36675,53 @@ zerohour // 8011 (c) Universal zerohoura // 8011 (c) Universal zerohouri // -@source:regence.cpp +@source:francedr/regence.cpp regence -@source:relief.cpp +@source:atari/relief.cpp relief // 136093 (c) 1992 relief2 // 136093 (c) 1992 relief3 // 136093 (c) 1992 -@source:renegade.cpp +@source:technos/renegade.cpp kuniokun // TA-0018 (c) 1986 kuniokunb // bootleg renegade // TA-0018 (c) 1986 + Taito America license renegadeb // bootleg -@source:replicator.cpp +@source:makerbot/replicator.cpp replica1 // Makerbot Replicator 1 desktop 3d printer -@source:retofinv.cpp +@source:taito/retofinv.cpp retofinv // A37 (c) 1985 Taito Corporation retofinvb // bootleg retofinvb1 // bootleg retofinvb2 // bootleg retofinvb3 // bootleg -@source:rex6000.cpp +@source:intel/rex6000.cpp ds2 // oz750 // 199? Sharp Wizard OZ-750 rex6000 // -@source:rf51w14cg.cpp +@source:misc/rf51w14cg.cpp rf51w14cg // (c) 2003 Recreativos Franco -@source:rfslots8085.cpp +@source:misc/rfslots8085.cpp unkrfslt // -@source:rfslotsmcs48.cpp +@source:misc/rfslotsmcs48.cpp ajofrin // (c) 1981 Recreativos Franco babyfrts // (c) 198? Recreativos Franco babyfrts25 // (c) 198? recreativos Franco -@source:rfslotspcpent.cpp +@source:misc/rfslotspcpent.cpp rfsantafeg // (c) 2014 Recreativos Franco -@source:rgum.cpp +@source:misc/rgum.cpp rgum // -@source:riscpc.cpp +@source:acorn/riscpc.cpp a7000 // 1995 Acorn Archimedes 7000 a7000p // 1997 Acorn Archimedes 7000+ rpc600 // @@ -36729,18 +36729,18 @@ rpc700 // sarpc // sarpc_j233 // -@source:rltennis.cpp +@source:tch/rltennis.cpp rltennis // (c) 1993 TCH rltennisa // (c) 1993 TCH -@source:rm380z.cpp +@source:rm/rm380z.cpp rm380z // rm380z34d // rm380z34e // rm480z // rm480za // -@source:rmhaihai.cpp +@source:alba/rmhaihai.cpp rmhaihai // (c) 1985 Alba rmhaihai2 // (c) 1985 Alba rmhaihib // (c) 1985 Alba @@ -36749,20 +36749,20 @@ rmhaisei // (c) 1986 Visco themj // (c) 1987 Visco themj2 // (c) 1987 Visco -@source:rmnimbus.cpp +@source:rm/rmnimbus.cpp nimbus // RM Nimbus 186 -@source:rockrage.cpp +@source:konami/rockrage.cpp rockrage // GX620 (c) 1986 (World?) rockragea // GX620 (c) 1986 (Prototype?) rockragej // GX620 (c) 1986 (Japan) -@source:rocnrope.cpp +@source:konami/rocnrope.cpp rocnrope // GX364 (c) 1983 rocnropek // GX364 (c) 1983 + Kosuka ropeman // (c) 1983 bootleg -@source:rohga.cpp +@source:dataeast/rohga.cpp darkseal2 // MAS (c) 1992 Data East Corporation (Japan) gunball // MAV (c) 1992 Data East Corporation (Japan) nitrobal // MAV (c) 1992 Data East Corporation (World) @@ -36779,120 +36779,120 @@ wizdfireu // MAS (c) 1992 Data East Corporation (US) wolffang // MAM (c) 1991 Data East Corporation (Japan) hangzo -@source:roland_cm32p.cpp +@source:roland/roland_cm32p.cpp cm32p // -@source:roland_d10.cpp +@source:roland/roland_d10.cpp d10 // d110 // -@source:roland_d50.cpp +@source:roland/roland_d50.cpp d50 // d50o // d550 // -@source:roland_jd800.cpp +@source:roland/roland_jd800.cpp jd800 // -@source:roland_jv80.cpp +@source:roland/roland_jv80.cpp jv880 // -@source:roland_jx3p.cpp +@source:roland/roland_jx3p.cpp gr700 // jx3p // mks30 // -@source:roland_jx8p.cpp +@source:roland/roland_jx8p.cpp jx10 // jx8p // jx8po // mks70 // -@source:roland_mc50.cpp +@source:roland/roland_mc50.cpp mc300 // mc50 // mc50mk2 // -@source:roland_mt32.cpp +@source:roland/roland_mt32.cpp cm32l // mt32 // -@source:roland_pr100.cpp +@source:roland/roland_pr100.cpp pr100 // pr100_201 // -@source:roland_r8.cpp +@source:roland/roland_r8.cpp r8 // r8m // r8mk2 // -@source:roland_ra30.cpp +@source:roland/roland_ra30.cpp ra30 // -@source:roland_s10.cpp +@source:roland/roland_s10.cpp mks100 // s10 // s220 // -@source:roland_s50.cpp +@source:roland/roland_s50.cpp s50 // s550 // w30 // -@source:roland_sc55.cpp +@source:roland/roland_sc55.cpp sc55 // 1991 Sound Canvas SC-55 -@source:roland_sc88.cpp +@source:roland/roland_sc88.cpp sc88vl // -@source:roland_tb303.cpp +@source:roland/roland_tb303.cpp tb303 // Roland -@source:roland_tnsc1.cpp +@source:roland/roland_tnsc1.cpp rlndtnsc1 // Roland TN-SC1 ROM cards -@source:roland_tr505.cpp +@source:roland/roland_tr505.cpp tr505 // -@source:roland_tr606.cpp +@source:roland/roland_tr606.cpp tr606 // Roland -@source:roland_tr707.cpp +@source:roland/roland_tr707.cpp tr707 // tr727 // -@source:roland_tr808.cpp +@source:roland/roland_tr808.cpp tr808 -@source:roland_tr909.cpp +@source:roland/roland_tr909.cpp tr909 // -@source:roland_u20.cpp +@source:roland/roland_u20.cpp u20 // u220 // -@source:rollerg.cpp +@source:konami/rollerg.cpp rollerg // GX999 (c) 1991 (US) rollergj // GX999 (c) 1991 (Japan) -@source:rollext.cpp +@source:gaelco/rollext.cpp rollext // (c) 1999 - Ref 991015 -@source:rollrace.cpp +@source:taito/rollrace.cpp fightrol // (c) 1983 Taito rollace // (c) 1983 Williams rollace2 // (c) 1983 Williams -@source:rotaryf.cpp +@source:midw8080/rotaryf.cpp rotaryf // -@source:ron.cpp +@source:sanritsu/ron.cpp ron2 // (c) 1981 Sanritsu -@source:roul.cpp +@source:misc/roul.cpp roul // (c) 1990 -@source:route16.cpp +@source:sunelect/route16.cpp jongpute // 1981 Alpha Denshi Co. route16 // (c) 1981 Sun Electronics route16a // (c) 1981 Tehkan/Sun + Centuri license @@ -36913,10 +36913,10 @@ stratvoxb // bootleg ttmahjng // 1981 Alpha Denshi Co. / Taito vscompmj // 1981 Nichibutsu -@source:rowamet.cpp +@source:pinball/rowamet.cpp heavymtl // -@source:royalmah.cpp +@source:dynax/royalmah.cpp cafebrk // "528" Mahjong Cafe Break (C) 1999 Nakanihon / Dynax cafedoll // "76" (c) 1993 Dynax cafepara // "001" 1999 Techno-Top @@ -36964,7 +36964,7 @@ suzume // 04? (c) 1986 Dyna Electronics tahjong // (c) 1985 Bally Pond / Nasco tontonb // "09" (c) 1987 Dynax -@source:rpunch.cpp +@source:vsystem/rpunch.cpp rabiolep // (c) 1987 V-System Co. (Japan) rpunch // (c) 1987 V-System Co. + Bally/Midway/Sente license (US) svolley // (c) 1989 V-System Co. (Japan) @@ -36972,27 +36972,27 @@ svolleybl // bootleg svolleyk // (c) 1989 V-System Co. (Korea) svolleyu // (c) 1989 V-System Co. + Data East license (US) -@source:rt1715.cpp +@source:robotron/rt1715.cpp rt1715 // rt1715lc // (latin/cyrillic) rt1715w // -@source:rtpc.cpp +@source:rtpc/rtpc.cpp rtpc010 // IBM RT PC Model 010 rtpc015 // IBM RT PC Model 015 rtpc020 // IBM RT PC Model 020 rtpc025 // IBM RT PC Model 025 rtpca25 // IBM RT PC Model A25 -@source:runaway.cpp +@source:atari/runaway.cpp qwak // (proto) (c) 1982 runaway // (proto) (c) 1982 -@source:rulechan.cpp +@source:misc/rulechan.cpp rulechan // 1992 ElectroChance rulechab // 1992 ElectroChance -@source:rungun.cpp +@source:konami/rungun.cpp rungun // GX247 (c) 1993 (World) runguna // GX247 (c) 1993 (World) rungunad // GX247 (c) 1993 (World) @@ -37005,21 +37005,21 @@ rungunud // GX247 (c) 1993 (US) slmdunkj // GX247 (c) 1993 (Japan) slmdunkjd // GX247 (c) 1993 (Japan) -@source:rvoice.cpp +@source:skeleton/rvoice.cpp rvoicepc // -@source:rx78.cpp +@source:bandai/rx78.cpp rx78 // -@source:rz1.cpp +@source:casio/rz1.cpp rz1 // 1986 Casio -@source:rzone.cpp +@source:handheld/rzone.cpp rzbatfor // rzindy500 // rztoshden // -@source:s11.cpp +@source:pinball/s11.cpp grand_l3 // grand_l4 // hs_l3 // @@ -37029,7 +37029,7 @@ rdkng_l2 // rdkng_l3 // rdkng_l4 // -@source:s11a.cpp +@source:pinball/s11a.cpp f14_l1 // f14_p3 // f14_p4 // @@ -37043,7 +37043,7 @@ pb_l3 // pb_l5 // pb_p4 // -@source:s11b.cpp +@source:pinball/s11b.cpp bcats_g4 // bcats_l2 // bcats_l5 // @@ -37105,7 +37105,7 @@ whirl_l2 // whirl_l3 // whirl_lg3 // -@source:s11c.cpp +@source:pinball/s11c.cpp bbnny_l2 // bbnny_lu // dd_l2 // @@ -37142,7 +37142,7 @@ rvrbt_l3 // rvrbt_p7 // strax_p7 // -@source:s3.cpp +@source:pinball/s3.cpp cntct_l1 // disco_l1 // httip_l1 // @@ -37151,7 +37151,7 @@ phnix_l1 // pkrno_l1 // wldcp_l1 // -@source:s4.cpp +@source:pinball/s4.cpp flash_l1 // flash_l2 // flash_t1 // @@ -37162,7 +37162,7 @@ tmwrp_t2 // trizn_l1 // trizn_t1 // -@source:s6.cpp +@source:pinball/s6.cpp algar_l1 // alpok_f6 // alpok_l2 // @@ -37181,7 +37181,7 @@ lzbal_t2 // scrpn_l1 // scrpn_t1 // -@source:s7.cpp +@source:pinball/s7.cpp barra_l1 // bk_f4 // bk_l3 // @@ -37208,13 +37208,13 @@ vrkon_l1 // wldtexas // wrlok_l3 // -@source:s8.cpp +@source:pinball/s8.cpp pfevr_l2 // pfevr_p3 // ratrc_l1 // scrzy_l1 // -@source:s9.cpp +@source:pinball/s9.cpp comet_l4 // comet_l5 // sorcr_l1 // @@ -37222,93 +37222,93 @@ sorcr_l2 // sshtl_l3 // sshtl_l7 // -@source:sacstate.cpp +@source:skeleton/sacstate.cpp sacstate // -@source:safarir.cpp +@source:phoenix/safarir.cpp safarir // (c) 1980 Shin Nihon Kikaku (SNK) + Taito license safarirj // (c) 1979 Shin Nihon Kikaku (SNK) -@source:sag.cpp +@source:entex/sag.cpp sag -@source:sage2.cpp +@source:sage/sage2.cpp sage2 -@source:saitek_ccompan.cpp +@source:saitek/saitek_ccompan.cpp ccompan -@source:saitek_chesstrv.cpp +@source:saitek/saitek_chesstrv.cpp chesstrv chesstrvi -@source:saitek_corona.cpp +@source:saitek/saitek_corona.cpp corona coronaa coronab -@source:saitek_cp2000.cpp +@source:saitek/saitek_cp2000.cpp cp2000 -@source:saitek_delta1.cpp +@source:saitek/saitek_delta1.cpp ccdelta1 -@source:saitek_exchess.cpp +@source:saitek/saitek_exchess.cpp exchess -@source:saitek_intchess.cpp +@source:saitek/saitek_intchess.cpp intchess -@source:saitek_leonardo.cpp +@source:saitek/saitek_leonardo.cpp galileo leonardo leonardoa leonardob -@source:saitek_mark5.cpp +@source:saitek/saitek_mark5.cpp ccmk5 ccmk6 -@source:saitek_minichess.cpp +@source:saitek/saitek_minichess.cpp smchess -@source:saitek_prschess.cpp +@source:saitek/saitek_prschess.cpp prschess -@source:saitek_renaissance.cpp +@source:saitek/saitek_renaissance.cpp renaissa renaissaa -@source:saitek_risc2500.cpp +@source:saitek/saitek_risc2500.cpp montreux risc2500 risc2500a -@source:saitek_schess.cpp +@source:saitek/saitek_schess.cpp schess -@source:saitek_simultano.cpp +@source:saitek/saitek_simultano.cpp cc2150 simultano simultanoa -@source:saitek_ssystem3.cpp +@source:saitek/saitek_ssystem3.cpp ssystem3 ssystem4 -@source:saitek_stratos.cpp +@source:saitek/saitek_stratos.cpp stratos stratosa tking tkinga tkingb -@source:saitek_superstar.cpp +@source:saitek/saitek_superstar.cpp sstar28k sstar36k tstar432 -@source:sam.cpp +@source:pinball/sam.cpp 24_130 // 24_140 // 24_144 // @@ -37509,42 +37509,42 @@ wpt_1400gf // wpt_1400i // wpt_1400l // -@source:samcoupe.cpp +@source:samcoupe/samcoupe.cpp samcoupe // 1989 Sam Coupe -@source:sandscrp.cpp +@source:kaneko/sandscrp.cpp sandscrp // (c) 1992 Face sandscrpa // (c) 1992 Face sandscrpb // (c) 1992 Face -@source:sangho.cpp +@source:ascii/sangho.cpp pzlestar // (c) 1991 Sang Ho Soft sexyboom // (c) 1992 Sang Ho Soft sprpuzzle // (c) 1991 Sang Ho Soft -@source:sanremmg.cpp +@source:misc/sanremmg.cpp elsygame // Elsy elsypokr // Elsy sanremmg // San Remo / Elsy -@source:sanremo.cpp +@source:misc/sanremo.cpp number1 // 1996 San Remo Games roadstar // 199? San Remo Games -@source:sansa_fuze.cpp +@source:skeleton/sansa_fuze.cpp sanfuze2 // -@source:sapi1.cpp +@source:tesla/sapi1.cpp sapi1 // sapizps2 // sapizps3 // sapizps3a // sapizps3b // -@source:sartorius.cpp +@source:skeleton/sartorius.cpp sart3733 // -@source:saturn.cpp +@source:sega/saturn.cpp hisaturn // Hitachi HiSaturn saturn // 1995 Sega Saturn (USA) saturneu // 1995 Sega Saturn (Europe) @@ -37552,7 +37552,7 @@ saturnjp // 1994 Sega Saturn (Japan) saturnkr // 1995 Samsung Saturn (Korea) vsaturn // JVC V-Saturn -@source:sauro.cpp +@source:tecfri/sauro.cpp sauro // (c) 1987 sauroa // (c) 1987 saurob // (c) 1987 @@ -37563,63 +37563,63 @@ seawolft // (c) 1987 Tecfri trckydoc // (c) 1987 trckydoca // (c) 1987 -@source:savia84.cpp +@source:trainer/savia84.cpp savia84 // -@source:savquest.cpp +@source:misc/savquest.cpp savquest // -@source:sb180.cpp +@source:skeleton/sb180.cpp sb180 // -@source:sb8085.cpp +@source:skeleton/sb8085.cpp sb8085 // -@source:sbasketb.cpp +@source:konami/sbasketb.cpp sbasketb // GX405 (c) 1984 (Version I, Encrypted) sbaskete // GX405 (c) 1984 (Version E, Encrypted) sbasketg // GX405 (c) 1984 (Version G, Encrypted) sbasketh // GX405 (c) 1984 (Version H, Unprotected) -@source:sbc6510.cpp +@source:homebrew/sbc6510.cpp sbc6510 // -@source:sbmjb.cpp +@source:taito/sbmjb.cpp sbmjb // E41 (c) 1998 Taito -@source:sbowling.cpp +@source:taito/sbowling.cpp sbowling // KB (c) 1982 Taito Corporation -@source:sbrain.cpp +@source:skeleton/sbrain.cpp sbrain // sagafox // sagafoxf80 // -@source:sbrkout.cpp +@source:atari/sbrkout.cpp sbrkout // 033453-033455 1978/09 [6502] sbrkout3 // 033442-033452 1978/09 [6502] sbrkoutc // unrealeased proto sbrkoutct // 034555-034559 proto ???? [6502] -@source:sbugger.cpp +@source:gametron/sbugger.cpp sbugger // (c) 1981 Game-A-Tron sbuggera // (c) 1981 Game-A-Tron -@source:sc2.cpp +@source:veb/sc2.cpp sc2 // sc2a // -@source:schick.cpp +@source:pacman/schick.cpp schick // Microhard -@source:schexx4gen.cpp +@source:misc/schexx4gen.cpp schexx // (c) 1996 ICE -@source:scm_500.cpp +@source:misc/scm_500.cpp scm_500 // -@source:scobra.cpp +@source:galaxian/scobra.cpp aponow // bootleg billiard // bootleg darkplnt // (c) 1982 Stern @@ -37643,23 +37643,23 @@ tazmani2 // (c) 1982 Stern tazmani3 // bootleg (Rodmar) tazmaniet // bootleg (U.R.V. BBCPE) -@source:scopus.cpp +@source:skeleton/scopus.cpp sagitta180 // 1979? -@source:scorpion.cpp +@source:sinclair/scorpion.cpp bestzx // kay1024 // profi // quorum // scorpio // -@source:scotrsht.cpp +@source:konami/scotrsht.cpp scotrsht // GX545 (c) 1985 -@source:scrablex.cpp +@source:selchow/scrablex.cpp scrablex // Selchow & Righter -@source:scramble.cpp +@source:galaxian/scramble.cpp 800fath // (c) 1981 Amenip + U.S. Billiards license 800fatha // (c) 1981 Amenip + U.S. Billiards license ad2083 // (c) 1983 Midcoin @@ -37688,20 +37688,20 @@ triplep // (c) 1982 KKI / made by Sanritsu? triplepa // (c) 1982 KKI / made by Sanritsu? troopy // bootleg -@source:scregg.cpp +@source:dataeast/scregg.cpp dommy // TA-00?? (c) 1983 (Arcade TV Game List - P.90, Left, 13 from top) eggs // TA-0002 (c) 1983 Universal USA rockduck // bootleg? 1983 Datel SAS scregg // TA-0001 (c) 1983 -@source:scv.cpp +@source:epoch/scv.cpp scv // scv_pal // -@source:scyclone.cpp +@source:taito/scyclone.cpp scyclone // (c) 1980 Taito Corporation -@source:sderby.cpp +@source:playmark/sderby.cpp croupier // (c) 1997 Playmark croupiera // (c) 1997 Playmark luckboom // @@ -37711,32 +37711,32 @@ sderbya // (c) 1996 shinygld // spacewin // -@source:sderby2.cpp +@source:sega/sderby2.cpp sderby2 // (c) 1985 -@source:sdk51.cpp +@source:intel/sdk51.cpp sdk51 // -@source:sdk80.cpp +@source:intel/sdk80.cpp sdk80 // -@source:sdk85.cpp +@source:intel/sdk85.cpp sdk85 // -@source:sdk86.cpp +@source:intel/sdk86.cpp sdk86 // -@source:seabattl.cpp +@source:zaccaria/seabattl.cpp seabattl // (c) 1980 seabattla // (c) 1980 -@source:sealy.cpp +@source:misc/sealy.cpp crzyddz // (c) 2004? Sealy -@source:sealy_fr.cpp +@source:misc/sealy_fr.cpp snowbwar // (c) 201? Sealy -@source:seattle.cpp +@source:midway/seattle.cpp biofreak // (c) 1997 Midway Games (prototype) blitz // (c) 1997 Midway Games blitz2k // (c) 1999 Midway Games @@ -37760,19 +37760,19 @@ vaportrxp // (c) 1998 Atari Games wg3dh // (c) 1996 Atari Games wg3dhfe // (c) 1996 Atari Games -@source:seattlecmp.cpp +@source:skeleton/seattlecmp.cpp scp300f // Seattle SCP-300F -@source:sega_beena.cpp +@source:segacons/sega_beena.cpp beena // -@source:sega_sawatte.cpp +@source:segacons/sega_sawatte.cpp sawatte // -@source:segaatom.cpp +@source:sega/segaatom.cpp spongbob // (c) 200? Sega -@source:segac2.cpp +@source:sega/segac2.cpp anpanman // (c) 1993 Sega bloxeedc // (c) 1989 Sega / Elorg bloxeedu // (c) 1989 Sega / Elorg @@ -37824,10 +37824,10 @@ twinsqua // (c) 1991 Sega wwmarine // (c) 1992 Sega zunkyou // (c) 1994 Sega -@source:segacoin.cpp +@source:sega/segacoin.cpp westdrm // -@source:segae.cpp +@source:sega/segae.cpp astrofl // 834-5803 (c) 1986 fantzn2 // (c) 1988 hangonjr // (c) 1985 @@ -37839,11 +37839,11 @@ slapshtr // (c) 1986 Sega tetrisse // (c) 1988 transfrm // 834-5803 (c) 1986 -@source:segafruit.cpp +@source:sega/segafruit.cpp m3001 m4001 -@source:segag80r.cpp +@source:sega/segag80r.cpp 005 // (c) 1981 astrob // (c) 1981 astrob1 // (c) 1981 @@ -37859,7 +37859,7 @@ sindbadm // 834-5244 (c) 1983 Sega spaceod // (c) 1981 spaceod2 // (c) 1981 -@source:segag80v.cpp +@source:sega/segag80v.cpp elim2 // (c) 1981 Gremlin elim2a // (c) 1981 Gremlin elim2c // (c) 1981 Gremlin @@ -37873,7 +37873,7 @@ startrek // (c) 1982 tacscan // (c) 1982 zektor // (c) 1982 -@source:segahang.cpp +@source:sega/segahang.cpp endurob2 // (c) 1985 (Beta bootleg) endurobl // (c) 1985 (Herb bootleg) enduror // (c) 1985 (Rev A, YM2151, FD1089B) @@ -37893,10 +37893,10 @@ shangonho // (c) 1987 (FD1094) sharrier // (c) 1985 sharrier1 // (c) 1985 -@source:segajw.cpp +@source:sega/segajw.cpp segajw // -@source:segald.cpp +@source:sega/segald.cpp astron // (c) 1983 astronp // (c) 1983 cobraseg // (c) ???? @@ -37904,7 +37904,7 @@ galaxyr // (c) 1983 galaxyrp // (c) 1983 sblazerp // (c) 1983 -@source:segaorun.cpp +@source:sega/segaorun.cpp outrun // Revision B outrunb // 1986 (protected beta bootleg) outrundx // Deluxe version @@ -37933,16 +37933,16 @@ toutrunj1 // 1987 (FD1094) toutrunj1d // bootleg toutrunjd // bootleg -@source:segapico.cpp +@source:segacons/segapico.cpp copera // 1993 Sega / Yamaha pico // 1994 Sega Pico (Europe) picoj // 1993 Sega Pico (Japan) picou // 1994 Sega Pico (USA) -@source:segapm.cpp +@source:segacons/segapm.cpp segapm // 1996 Sega Picture Magic (32x type hardware) -@source:segas16a.cpp +@source:sega/segas16a.cpp aceattaca // (c) 1988 (FD1094) afighter // (c) 1986 (FD1089A) afightera @@ -37985,7 +37985,7 @@ wb31d // wb35 // (c) 1988 Sega / Westone (FD1089A) wb35d // -@source:segas16b.cpp +@source:sega/segas16b.cpp aceattac // (c) 1988 (FD1094) afightere afighterf @@ -38126,12 +38126,12 @@ wrestwar1d // wrestwar2 // (c) 1989 (FD1094) wrestwar2d // -@source:segas16b_isgsm.cpp +@source:sega/segas16b_isgsm.cpp isgsm // shinfz // tetrbx // -@source:segas18.cpp +@source:sega/segas18.cpp astorm // 1990.?? Alien Storm (World, FD1094, 2 Players) astorm3 // 1990.?? Alien Storm (World, FD1094) astorm3d // @@ -38184,11 +38184,11 @@ wwallyja3p // 1992.06 Wally wo Sagase! (Japan, FD1094) wwallyjad // wwallyjd // -@source:segas18_astormbl.cpp +@source:sega/segas18_astormbl.cpp astormbl astormb2 -@source:segas24.cpp +@source:sega/segas24.cpp bnzabros // 1990.08 Bonanza Bros. (US) bnzabrosj // 1990.06 Bonanza Bros. (Japan) crkdown // 1989.?? Crack Down (World, FD1094) @@ -38217,7 +38217,7 @@ sspiritj // 1988.10 Scramble Spirits (Japan) sspirits // 1988.?? Scramble Spirits (World) sspirtfc // 1988.?? Scramble Spirits (FD1094) -@source:segas32.cpp +@source:sega/segas32.cpp alien3 // 1993.?? Aliens 3 (World) alien3u // 1993.11 Aliens 3 (US) alien3j // 1993.?? Aliens 3 (Japan) @@ -38278,13 +38278,13 @@ titlef // 1993.?? Title Fight (World) titlefj // 1993.03 Title Fight (Japan) titlefu // 1993.04 Title Fight (US) -@source:segasm1.cpp +@source:sega/segasm1.cpp tinkerbl // (c) 1990 Sega blicks // (c) 1991 Sega unkm1 // (c) 1992 Sega bingpty // (c) 1994 Sega -@source:segasp.cpp +@source:sega/segasp.cpp aminosan // 2010.?? Aminosan (satellite) bingogal // 2009.05 Bingo Galaxy (main) bingogals // 2009.05 Bingo Galaxy (satellite) @@ -38309,10 +38309,10 @@ tetgiano // tetgiant // unomedal // 2009.01 UNO the Medal -@source:segattl.cpp +@source:sega/segattl.cpp fonz // -@source:segaufo.cpp +@source:sega/segaufo.cpp newufo // newufo_nfl // newufo_sonic // @@ -38321,7 +38321,7 @@ ufo21 // ufo800 // ufomini // -@source:segaxbd.cpp +@source:sega/segaxbd.cpp abcop // 1990.?? A.B.Cop (World, FD1094) abcopd // abcopj // 1991.01 A.B.Cop (Japan, FD1094) @@ -38365,7 +38365,7 @@ thndrbld // 1988.02 Thunder Blade (US?, upright, FD1094) thndrbld1 // 1987.12 Thunder Blade (Japan, deluxe/standard) thndrbldd // -@source:segaybd.cpp +@source:sega/segaybd.cpp gforce2 // 1988.?? Galaxy Force II (World) gforce2j // 1988.07 Galaxy Force II (Japan) gforce2ja // 1988.07 Galaxy Force II (Japan) @@ -38384,12 +38384,12 @@ rchasej // 1991.09 Rail Chase (Japan) strkfgtr // 1991.06 Strike Fighter (World) strkfgtrj // 1991.06 Strike Fighter (Japan) -@source:seibucats.cpp +@source:seibu/seibucats.cpp emjjoshi // (c) 1999 Seibu Kaihatsu / CATS emjscanb // (c) 2001 Seibu Kaihatsu / CATS emjtrapz // (c) 2001 Seibu Kaihatsu / CATS -@source:seibuspi.cpp +@source:seibu/seibuspi.cpp batlball // (c) 1995 Seibu Kaihatsu (Tuning License) batlballa // (c) 1995 Seibu Kaihatsu (Metrotainment License) batlballe // (c) 1995 Seibu Kaihatsu (Metrotainment License) @@ -38450,7 +38450,7 @@ viprp1t // (c) 1995 Seibu Kaihatsu (Tuning License) viprp1u // (c) 1995 Seibu Kaihatsu (Fabtek license) viprp1ua // (c) 1995 Seibu Kaihatsu (Fabtek license) -@source:seicross.cpp +@source:nichibut/seicross.cpp friskyt // (c) 1981 friskyta // (c) 1981 friskytb // (c) 1981 @@ -38462,20 +38462,20 @@ sectrzont // (c) 1984 + Alice (on Tecfri PCB) seicross // (c) 1984 + Alice seicrossa // (c) 1984 + Alice -@source:seicupbl.cpp +@source:seibu/seicupbl.cpp cupsocsb // bootleg cupsocsb2 // bootleg cupsocsb3 // bootleg cupsocsb4 // bootleg -@source:selz80.cpp +@source:trainer/selz80.cpp dagz80 // selz80 // -@source:sengokmj.cpp +@source:seibu/sengokmj.cpp sengokmj // (c) 1991 Sigma -@source:senjyo.cpp +@source:tehkan/senjyo.cpp baluba // (c) 1986 Able Corp. megaforc // (c) 1984 Tehkan megaforcu // (c) 1985 Tehkan + Video Ware license @@ -38485,7 +38485,7 @@ starforca // (c) 1984 Tehkan starforcb // (c) 1984 Tehkan starforce // (c) 1984 Tehkan -@source:seta.cpp +@source:seta/seta.cpp arbalest // UK (c) 1989 + Jordan, Romstar or Taito license (DSW) atehate // (C) 1993 Athena blandia // (c) 1992 Allumer @@ -38558,7 +38558,7 @@ zombraid // (c) 1995 American Sammy zombraidp // (c) 1995 American Sammy zombraidpj // (c) 1995 Sammy Industries Co.,Ltd. -@source:seta2.cpp +@source:seta/seta2.cpp ablast // (c) 2000 Subsino ablastb //bootleg deerhunt // (c) 2000 Sammy USA Corporation @@ -38594,7 +38594,7 @@ wschamp // (c) 2001 Sammy USA Corporation wschampa // (c) 2001 Sammy USA Corporation wschampb // (c) 2001 Sammy USA Corporation -@source:sf.cpp +@source:capcom/sf.cpp sf // 8/1987 (c) 1987 (US) sfan // 8/1987 (c) 1987 (World) sfj // 8/1987 (c) 1987 (Japan) @@ -38604,7 +38604,7 @@ sfp // 8/1987 (c) 1987 sfua // 8/1987 (c) 1987 (US) sfw // 8/1987 (c) 1987 (World) -@source:sfbonus.cpp +@source:misc/sfbonus.cpp abnudge // (c) 2003 Amcoe - Animal Bonus Nudge abnudgeb // (c) 2003 Amcoe abnudged // (c) 2003 Amcoe @@ -38841,19 +38841,19 @@ version4v // (c) 2006 Amcoe version4v2 // (c) 2006 Amcoe version4v3 // (c) 2006 Amcoe -@source:sfcbox.cpp +@source:nintendo/sfcbox.cpp pss61 // 199? Nintendo pss62 // 199? T & E Soft / I'Max pss63 // 199? Nintendo / BPS pss64 // 199? Nintendo / Hudson Soft sfcbox // -@source:sfkick.cpp +@source:ascii/sfkick.cpp sfkick // (c) 1988 Haesung/HJ Corp sfkicka // (c) 198? Haesung spinkick // (c) 1988 Haesung/Seojin -@source:sg1000.cpp +@source:segacons/sg1000.cpp omv1000 // Tsukuda Original Othello Multivision FG-1000 omv2000 // Tsukuda Original Othello Multivision FG-2000 sc3000 // Sega SC-3000 (Japan) @@ -38862,22 +38862,22 @@ sf7000 // Sega SC-3000 w/ SF-7000 (Japan) sg1000 // Sega SG-1000 (Japan) sg1000m2 // Sega SG-1000 Mark II (Japan) -@source:sg1000a.cpp +@source:sega/sg1000a.cpp chboxing // (c) 1984 chwrestl // (c) 1985 dokidoki // (c) 1985 sderbys // (c) 1984 sderby2s // (c) 1985 -@source:sh4robot.cpp +@source:skeleton/sh4robot.cpp sh4robot // -@source:shadfrce.cpp +@source:technos/shadfrce.cpp shadfrce // TA-0032 (c) 1993 (World) shadfrcej // TA-0032 (c) 1993 (Japan) shadfrceu // TA-0032 (c) 1993 (US) -@source:shangha3.cpp +@source:sunelect/shangha3.cpp blocken // (c) 1994 KID / Visco heberpop // (c) 1994 Sunsoft / Atlus shangha3 // (c) 1993 Sunsoft @@ -38885,7 +38885,7 @@ shangha3j // (c) 1993 Sunsoft shangha3u // (c) 1993 Sunsoft shangha3up // (c) 1993 Sunsoft (US prototype from 'PCB001') -@source:shanghai.cpp +@source:sunelect/shanghai.cpp blktch2 // bootleg kothello // (c) 1990 Success. shangha2 // (c) 1989 Sunsoft (Sun Electronics) @@ -38893,7 +38893,7 @@ shangha2a // (c) 1989 Sunsoft (Sun Electronics) shanghai // (c) 1988 Sunsoft (Sun Electronics) shanghaij // (c) 1988 Sunsoft (Sun Electronics) -@source:shangkid.cpp +@source:misc/shangkid.cpp chinhero // (c) 1984 Taiyo chinhero2 // (c) 1984 Taiyo chinhero3 // (c) 1984 Taiyo @@ -38902,47 +38902,47 @@ dynamski // (c) 1984 Taiyo hiryuken // (c) 1985 Taito shangkid // (c) 1985 Taiyo + Data East license -@source:shaolins.cpp +@source:konami/shaolins.cpp kicker // GX477 (c) 1985 shaolinb // bootleg shaolins // GX477 (c) 1985 -@source:shine.cpp +@source:skeleton/shine.cpp shine // 1983 Shine/1 -@source:shisen.cpp +@source:irem/shisen.cpp matchit // (c) 1989 Tamtex shisen // (c) 1989 Tamtex sichuan2 // (c) 1989 Tamtex sichuan2a // (c) 1989 Tamtex -@source:shootout.cpp +@source:dataeast/shootout.cpp shootout // (c) 1985 Data East USA (US) shootoutb // bootleg shootoutj // (c) 1985 Data East USA (Japan) -@source:shootaway2.cpp +@source:namco/shootaway2.cpp shootaw2 // (c) 1996 Namco -@source:shougi.cpp +@source:alpha/shougi.cpp shougi // (c) 1982 (Arcade TV Game List - P.80, Left, 9 from top) shougi2 // (c) 1982 (Arcade TV Game List - P.80, Left, 10 from top) -@source:shtzone.cpp +@source:sega/shtzone.cpp shtzone // (c) 1987 -@source:sms_bootleg.cpp +@source:sega/sms_bootleg.cpp smssgame smssgamea -@source:shuuz.cpp +@source:atari/shuuz.cpp shuuz // 136083 (c) 1990 shuuz2 // 136083 (c) 1990 -@source:si5500.cpp +@source:skeleton/si5500.cpp si5500 // -@source:sidearms.cpp +@source:capcom/sidearms.cpp dyger // (c) 1989 Philko (NOT A CAPCOM GAME but runs on modified Sidearms hardware) dygera // (c) 1989 Philko (NOT A CAPCOM GAME but runs on modified Sidearms hardware) sidearms // 12/1986 (c) 1986 (World) @@ -38957,24 +38957,24 @@ turtshipko // (c) 1988 Philko (NOT A CAPCOM GAME but runs o twinfalc // (c) 1989 Philko (Poara Enterprises license) (NOT A CAPCOM GAME but runs on modified Sidearms hardware) whizz // (c) 1989 Philko (NOT A CAPCOM GAME but runs on modified Sidearms hardware) -@source:sidepckt.cpp +@source:dataeast/sidepckt.cpp sidepckt // (c) 1986 Data East Corporation sidepcktb // bootleg sidepcktj // (c) 1986 Data East Corporation -@source:sigma21.cpp +@source:sigma/sigma21.cpp sigma21 // -@source:sigmab31.cpp +@source:sigma/sigmab31.cpp cptlucky // (c) 1988 Sigma -@source:sigmab52.cpp +@source:sigma/sigmab52.cpp jwildb52 // (c) 199? Sigma jwildb52a // (c) 199? Sigma jwildb52h // (c) 199? Sigma s8waysfc // (c) 1989 Sigma -@source:sigmab98.cpp +@source:sigma/sigmab98.cpp animalc // (c) 2000 Sammy b3rinsya // b9805 (c) 1997 Sigma dashhero // b9811 (c) 1999 Sigma @@ -38992,23 +38992,23 @@ tbeastw2 // b9808 (c) 1998 Sigma / Transformer Production tdoboon // (c) 2000 Sammy ucytokyu // b9809 (c) 1997 Sigma -@source:silkroad.cpp +@source:unico/silkroad.cpp silkroad // (c) 1999 silkroada // (c) 1999 -@source:silverball.cpp +@source:misc/silverball.cpp slvrball806 // (c) 1997? TAB Austria slvrball720 // (c) 1997? TAB Austria slvrball632 // (c) 1997? TAB Austria slvrballbu409 // (c) 199? TAB Austria slvrballbu409b // (c) 199? TAB Austria -@source:silvmil.cpp +@source:f32/silvmil.cpp puzzlove // (c) 1994 Para puzzlovek // (c) 1994 Para silvmil // (c) 1995 Para -@source:simpl156.cpp +@source:dataeast/simpl156.cpp candance // MCF (c) 1996 Mitchell chainrec // MCC (c) 1994 charlien // MBR (c) 1994 Mitchell @@ -39021,7 +39021,7 @@ magdropp // MCC (c) 1995 Data East osman // MCF (c) 1996 Mitchell prtytime // MCB (c) 1995 Mitchell -@source:simple_st0016.cpp +@source:seta/simple_st0016.cpp dcrown // 199? unknown dcrowna // 199? unknown gostop // 2001 Visco @@ -39031,7 +39031,7 @@ mayjisn2 // (c) 1994 Seta nratechu // (c) 1996 Seta renju // (c) 1994 Visco -@source:simpsons.cpp +@source:konami/simpsons.cpp simpsons // GX072 (c) 1991 simpsons2p // GX072 (c) 1991 simpsons2p2 // GX072 (c) 1991 @@ -39041,60 +39041,60 @@ simpsons2pj // GX072 (c) 1991 (Japan) simpsons4pa // GX072 (c) 1991 (Asia) simpsons4pe // GX072 (c) 1991 (World) -@source:sis630.cpp +@source:ibmpc/sis630.cpp gamecst2 // MAME based bootleg, version 2.613 gamecstl // MAME based bootleg shutms11 // (c) 2000 -@source:sitcom.cpp +@source:homebrew/sitcom.cpp sitcom // sitcomtmr // -@source:sk1.cpp +@source:casio/sk1.cpp sk1 // sk2 // sk5 // sk10 // -@source:sk101bl.cpp +@source:skeleton/sk101bl.cpp sk101bl // -@source:skeetsht.cpp +@source:misc/skeetsht.cpp popshot // (c) 1991 (prototype) skeetsht // (c) 1991 -@source:skimaxx.cpp +@source:misc/skimaxx.cpp skimaxx // (c) 1996 Kyle Hodgetts/ICE -@source:skopro.cpp +@source:misc/skopro.cpp drgdance // 2008 -@source:skullxbo.cpp +@source:atari/skullxbo.cpp skullxbo // 136072 (c) 1989 skullxbo1 // 136072 (c) 1989 skullxbo2 // 136072 (c) 1989 skullxbo3 // 136072 (c) 1989 skullxbo4 // 136072 (c) 1989 -@source:skyarmy.cpp +@source:misc/skyarmy.cpp skyarmy // (c) 1982 Shoei -@source:skydiver.cpp +@source:atari/skydiver.cpp skydiver // 009787 1978/06 [6800] -@source:skyfox.cpp +@source:jaleco/skyfox.cpp exerizer // (c) 1987? Jaleco exerizerb // bootleg skyfox // (c) 1987 Jaleco + Nichibutsu USA license -@source:skykid.cpp +@source:namco/skykid.cpp drgnbstr // (c) 1984 skykid // (c) 1985 skykidd // (c) 1985 skykido // (c) 1985 skykids // (c) 1985 -@source:skylncr.cpp +@source:misc/skylncr.cpp bdream97 // Bootleg? butrfly // (c) 1995 Bordun International butrflybl // Bootleg @@ -39118,10 +39118,10 @@ sstar97 // (c) 199? Bordun International superb2k // Random Games tigerslt // Bootleg? -@source:skyraid.cpp +@source:atari/skyraid.cpp skyraid // 009709 1978/03 [6502] -@source:slapfght.cpp +@source:toaplan/slapfght.cpp alcon // A77 / TP-??? getstarb1 // GX-006 bootleg but (c) 1986 Taito Corporation getstarb2 // GX-006 bootleg but (c) 1986 Taito Corporation @@ -39141,49 +39141,49 @@ tigerhb3 // bootleg but (c) 1985 Taito Corporation tigerhb4 // bootleg but (c) 1985 Taito Corporation tigerhj // A47 (c) 1985 Taito Corporation GX-551 [not a Konami board!] -@source:slapfght_ms.cpp +@source:toaplan/slapfght_ms.cpp slapfighm -@source:slapshot.cpp +@source:taito/slapshot.cpp opwolf3 // D74 (c) 1994 Taito Corporation Japan opwolf3j // D74 (c) 1994 Taito Corporation opwolf3u // D74 (c) 1994 Taito America Corporation slapshot // D71 (c) 1994 Taito Corporation Japan (Ver 3.0 O) slapshotj // D71 (c) 1994 Taito Corporation (Ver 2.2 J) -@source:slc1.cpp +@source:homebrew/slc1.cpp slc1 // -@source:sleic.cpp +@source:pinball/sleic.cpp bikerace // bikerace2 // sleicpin // iomoon // -@source:slicer.cpp +@source:slicer/slicer.cpp slicer // 1983 Slicer Computers -@source:sliver.cpp +@source:misc/sliver.cpp sliver // (c) 1996 Hollow Corp slivera // -@source:slotcarn.cpp +@source:wing/slotcarn.cpp slotcarn // (c) 1985 Wing Co. Ltd spielbud // (c) 1985 ADP -@source:slsstars.cpp +@source:skeleton/slsstars.cpp slsstars // -@source:sm1800.cpp +@source:cccp/sm1800.cpp sm1800 // -@source:sm7238.cpp +@source:cccp/sm7238.cpp sm7238 // -@source:smc777.cpp +@source:sony/smc777.cpp smc777 // -@source:sms.cpp +@source:sega/sms.cpp gamegeaj // Sega GameGear (Japan) gamegear // Sega GameGear sg1000m3 // Sega SG-1000 Mark III (Japan) @@ -39203,10 +39203,10 @@ smspal // Sega Master System II (PAL) smspaln // Tec Toy Master System III Compact (PAL-N) smssdisp // Sega Master System Store Display Unit -@source:smotor.cpp +@source:misc/smotor.cpp smotor // (c) 19?? Duintronic -@source:smsmcorp.cpp +@source:misc/smsmcorp.cpp secondch // (c) 1985 SMS MFG CORP sureshot // (c) 1985 SMS MFG CORP smsjoker // (c) 1985 SMS MFG CORP @@ -39215,11 +39215,11 @@ sms4in1a // (c) 1984 SMS MFG CORP trvhang // (c) 1984 SMS MFG CORP trvhanga // (c) 1984 SMS MFG CORP -@source:snes.cpp +@source:nintendo/snes.cpp snes // Nintendo Super Nintendo NTSC snespal // Nintendo Super Nintendo PAL -@source:snesb.cpp +@source:nintendo/snesb.cpp denseib // bootleg denseib2 // bootleg endless // bootleg @@ -39235,13 +39235,13 @@ sblast2ba // bootleg venom // bootleg wldgunsb // bootleg -@source:snesb51.cpp +@source:nintendo/snesb51.cpp fatfurspb mk3snes snes4sl snes4sln -@source:snk.cpp +@source:snk/snk.cpp alphamis // (c) 1985 arian // (c) 1985 aso // (c) 1985 @@ -39298,7 +39298,7 @@ vangrd2 // A2005 (c) 1984 victroad // A6002 (c) 1986 worldwar // A6004 'WW' (c) 1987 -@source:snk6502.cpp +@source:snk/snk6502.cpp fantasyg // (c) 1981 SNK fantasyg2 // (c) 1981 SNK fantasyj // (c) 1981 SNK @@ -39322,7 +39322,7 @@ vanguardg // (c) 1981 SNK vanguardj // (c) 1981 SNK zarzon // (c) 1981 Taito, gameplay says SNK -@source:snk68.cpp +@source:snk/snk68.cpp ikari3 // A7007 'IK3'(c) 1989 ikari3j // A7007 'IK3'(c) 1989 ikari3k // A7007 'IK3'(c) 1989 @@ -39340,14 +39340,14 @@ streetsm1 // A7008 'S2' (c) 1989 streetsmj // A8007 'S2' (c) 1989 streetsmw // (c) 1989 -@source:snookr10.cpp +@source:funworld/snookr10.cpp apple10 // (c) 1998 Sandii' snookr10 // (c) 1998 Sandii' tenballs // 1997 unknown crystalc // 1998 JCD srl crystalca // 1998 JCD srl -@source:snowbros.cpp +@source:kaneko/snowbros.cpp 3in1semi // (c) 1998 SemiCom 3in1semia // (c) 1998 SemiCom 4in1boot // (c) 2002 KISoft (includes hacks of Semicom games + Snowbros) @@ -39386,36 +39386,36 @@ twinklea // (c) 1997 SemiCom wintbob // bootleg yutnori // (c) 199? yutnori -@source:socrates.cpp +@source:vtech/socrates.cpp iqunlimz // 1991 IQ Unlimited (Z80) profweis // 1988 (Yeno) Professor Weiss-Alles (Germany) socrates // 1988 Socrates Educational Video System (USA) socratfc // 1988 Socrates SAITOUT (French Canada) vpainter // 1991 Video Painter -@source:softbox.cpp +@source:skeleton/softbox.cpp softbox // -@source:solomon.cpp +@source:tehkan/solomon.cpp solomon // (c) 1986 Tecmo solomonj // (c) 1986 Tecmo -@source:sonson.cpp +@source:capcom/sonson.cpp sonson // 7/1984 (c) 1984 sonsonj // 7/1984 (c) 1984 (Japan) -@source:sorcerer.cpp +@source:exidy/sorcerer.cpp sorcerer // Sorcerer sorcerer2 // monitor 1.1 1979 sorcerera // Sorcerer with Dreamdisk fdc sorcererb // Sorcerer with Digitrio fdc sorcererd // Sorcerer with Micropolis fdc -@source:st2302u_bbl_rom.cpp +@source:tvgames/st2302u_bbl_rom.cpp bbl338 dphh8213 -@source:st2302u_bbl_spi.cpp +@source:tvgames/st2302u_bbl_spi.cpp bbl380 mc_cb203 rhhc152 @@ -39425,7 +39425,7 @@ dgun2953 supreme arcade10 -@source:storio.cpp +@source:vtech/storio.cpp storio // (c) 2011 V.Tech storiode // (c) 2011 V.Tech storioes // (c) 2011 V.Tech @@ -39436,16 +39436,16 @@ vreader // (c) 2011 V.Tech vreadercaen // (c) 2011 V.Tech vreadercafr // (c) 2011 V.Tech -@source:stop.cpp +@source:misc/stop.cpp stop -@source:sothello.cpp +@source:misc/sothello.cpp sothello // (c) 1986 Success / Fujiwara. -@source:solbourne.cpp +@source:skeleton/solbourne.cpp sols5e // Solbourne Series 5E computer workstation -@source:spacefb.cpp +@source:nintendo/spacefb.cpp spacebrd // bootleg spacedem // (c) 1980 Fortrek + made by Nintendo spacefb // (c) [1980?] Nintendo @@ -39456,47 +39456,47 @@ spacefbe2 // (c) [1980?] Nintendo spacefbg // 834-0031 (c) 1980 Gremlin starwarr // Potomac Mortgage -@source:spaceg.cpp +@source:omori/spaceg.cpp spaceg // (c) 19?? -@source:spartanxtec.cpp +@source:irem/spartanxtec.cpp spartanxtec -@source:spbactn.cpp +@source:tehkan/spbactn.cpp spbactn // 9002 - (c) 1991 Tecmo spbactnj // 9002 - (c) 1991 Tecmo spbactnp // prototype -@source:spc1000.cpp +@source:samsung/spc1000.cpp spc1000 // -@source:spc1500.cpp +@source:samsung/spc1500.cpp spc1500 // -@source:spcforce.cpp +@source:venture/spcforce.cpp meteor // (c) 1981 Venture Line meteors // (c) 1981 Amusement World spcforc2 // bootleg spcforce // (c) 1980 Venture Line -@source:spdamjes.cpp +@source:misc/spdamjes.cpp spdamjes // (c) 19?? T-90 S.A. -@source:spdheat.cpp +@source:taito/spdheat.cpp spdheat // A55 (c) 1985 Taito Corporation (World) spdheatj // A55 (c) 1985 Taito Corporation (Japan) -@source:spdodgeb.cpp +@source:technos/spdodgeb.cpp nkdodge // TA-0022 (c) 1987 (Japan) nkdodgeb // TA-0022 (c) 1987 (Japan) spdodgeb // TA-0022 (c) 1987 -@source:spec128.cpp +@source:sinclair/spec128.cpp hc128 // 1991 HC-128 spec128 // 1986 ZX Spectrum 128 specpls2 // 1986 ZX Spectrum +2 -@source:special.cpp +@source:special/special.cpp anakonda // erik // kharkovsky // @@ -39508,10 +39508,10 @@ specialp // specimx // unga // -@source:special_gambl.cpp +@source:misc/special_gambl.cpp dindice // -@source:specpls3.cpp +@source:sinclair/specpls3.cpp sp3e8bit // 2002 ZX Spectrum +3e 8bit IDE sp3eata // 2002 ZX Spectrum +3e ZXATASP sp3ezcf // 2002 ZX Spectrum +3e ZXCF @@ -39519,10 +39519,10 @@ specpl2a // 1987 ZX Spectrum +2a specpl3e // 2000 ZX Spectrum +3e specpls3 // 1987 ZX Spectrum +3 -@source:spectra.cpp +@source:pinball/spectra.cpp spectra // -@source:spectrum.cpp +@source:sinclair/spectrum.cpp bk08 // Orel BK-08 blitzs // 1990 Blic byte // 1990 Byte @@ -39559,25 +39559,25 @@ tk90x // 1985 TK90x Color Computer tk95 // 1986 TK95 Color Computer zvezda // 1990 Zvezda -@source:speedatk.cpp +@source:seta/speedatk.cpp speedatk // CB-0 (c) SetaKikaku -@source:speedbal.cpp +@source:tecfri/speedbal.cpp musicbal // (c) 1987 speedbal // (c) 1987 speedbala // (c) 1987 -@source:speedbsk.cpp +@source:sega/speedbsk.cpp boatrace speedbsk -@source:speedspn.cpp +@source:tch/speedspn.cpp speedspn // (c) 1994 -@source:speglsht.cpp +@source:seta/speglsht.cpp speglsht // (c) 1994 Seta -@source:spg110.cpp +@source:tvgames/spg110.cpp jak_capb // jak_spdmo // jak_spdmoa @@ -39586,17 +39586,17 @@ conyping // conyfght sstarkar -@source:spg29x.cpp +@source:tvgames/spg29x.cpp hyprscan // jak_bbh jak_bbsf zone3d -@source:spg29x_lexibook_jg7425.cpp +@source:tvgames/spg29x_lexibook_jg7425.cpp lx_jg7425 lx_aven -@source:spg2xx.cpp +@source:tvgames/spg2xx.cpp ablkickb abltenni // comil // @@ -39636,25 +39636,25 @@ vtechtvsgr // (c) 2006 VTech vtechtvssp // (c) 2006 VTech wfcentro -@source:spg2xx_digimake.cpp +@source:tvgames/spg2xx_digimake.cpp rad_digi -@source:spg2xx_dreamlife.cpp +@source:tvgames/spg2xx_dreamlife.cpp dreamlif // dsgnwrld -@source:spg2xx_ican.cpp +@source:tvgames/spg2xx_ican.cpp icanguit // icanpian // -@source:spg2xx_jakks.cpp +@source:tvgames/spg2xx_jakks.cpp jak_batm // The Batman, 2004 jak_mk jak_mpacw jak_sbjd jak_wall -@source:spg2xx_jakks_gkr.cpp +@source:tvgames/spg2xx_jakks_gkr.cpp jak_capc // jak_care // jak_dbz // @@ -39681,7 +39681,7 @@ jak_wof // jak_wwe // jak_xmenp // -@source:spg2xx_jakks_sharp.cpp +@source:tvgames/spg2xx_jakks_sharp.cpp jsc_dora jsc_gdg jsc_sdoo @@ -39689,12 +39689,12 @@ jsc_spid jsc_thom jsc_thomu -@source:spg2xx_jakks_tvtouch.cpp +@source:tvgames/spg2xx_jakks_tvtouch.cpp tvtchsw tvtchspd tvtchsb -@source:spg2xx_lexibook.cpp +@source:tvgames/spg2xx_lexibook.cpp lexizeus // Lexibook lexiseal // discpal @@ -39702,13 +39702,13 @@ vgcaplet vgcap35 vsplus -@source:spg2xx_mysprtch.cpp +@source:tvgames/spg2xx_mysprtch.cpp mysprtch mysprtcp mysptqvc mgt20in1 -@source:spg2xx_pdc.cpp +@source:tvgames/spg2xx_pdc.cpp pdc100 pdc50 pdc200 @@ -39718,13 +39718,13 @@ tmntpdc dorapdc vjpp2 -@source:spg2xx_playvision.cpp +@source:tvgames/spg2xx_playvision.cpp pvmil // -@source:spg2xx_skannerztv.cpp +@source:tvgames/spg2xx_skannerztv.cpp rad_sktv // -@source:spg2xx_senario.cpp +@source:tvgames/spg2xx_senario.cpp senmil senbbs senapren @@ -39732,12 +39732,12 @@ senpmate sencosmo senstriv -@source:spg2xx_senario_poker.cpp +@source:tvgames/spg2xx_senario_poker.cpp sentx6p // sentx6puk sentx6pd -@source:spg2xx_senca.cpp +@source:tvgames/spg2xx_senca.cpp cdlyoko dnv200fs m505neo @@ -39747,26 +39747,26 @@ mywicogt oplayer zon32bit -@source:spg2xx_shredmjr.cpp +@source:tvgames/spg2xx_shredmjr.cpp taikeegr // rockstar shredmjr // guitarst guitarstp -@source:spg2xx_smarttv.cpp +@source:tvgames/spg2xx_smarttv.cpp smartvad -@source:spg2xx_telestory.cpp +@source:tvgames/spg2xx_telestory.cpp telestry // -@source:spg2xx_tvgogo.cpp +@source:tvgames/spg2xx_tvgogo.cpp tvgogo // -@source:spg2xx_vii.cpp +@source:tvgames/spg2xx_vii.cpp vii // KenSingTon / Jungle Soft / Siatronics Vii -@source:spg2xx_wiwi.cpp +@source:tvgames/spg2xx_wiwi.cpp wiwi18 // foxsport lexifit @@ -39776,7 +39776,7 @@ guitrbus ddmsup ddmmeg12 -@source:spg2xx_zone.cpp +@source:tvgames/spg2xx_zone.cpp wirels60 // Wireless 60 zone40 // Zone 40 itvg49 @@ -39787,13 +39787,13 @@ lx_jg7410 zonemini react -@source:spiders.cpp +@source:sigma/spiders.cpp spiders // (c) 1981 Sigma Ent. Inc. spiders2 // (c) 1981 Sigma Ent. Inc. spiders3 // (c) 1981 Sigma Ent. Inc. spinner // bootleg -@source:spinb.cpp +@source:pinball/spinb.cpp bushido // bushidoa // bushidob // @@ -39804,10 +39804,10 @@ mach2a // metalman // vrnwrld // -@source:spirit76.cpp +@source:pinball/spirit76.cpp spirit76 // -@source:splash.cpp +@source:gaelco/splash.cpp funystrp // not a gaelco game but on similar hw to splash paintlad // (c) 1992 - ver 1.3 puckpepl // not a gaelco game but on similar hw to splash @@ -39818,16 +39818,16 @@ splash // (c) 1992 - Ref 922804 splash10 // (c) 1992 - Ref 922804 ringball // not a gaelco game but based on splash code -@source:splash_ms.cpp +@source:gaelco/splash_ms.cpp splashms -@source:splus.cpp +@source:igt/splus.cpp spset005 // (c) 1993 IGT - International Game Technology spset015 // (c) 1993 IGT - International Game Technology spset026 // (c) 1996 IGT - International Game Technology spss4240 // (c) 1987 IGT - International Game Technology -@source:spoker.cpp +@source:igs/spoker.cpp 3super8 // unknown spk100 // (c) 1996 IGS spk102ua // (c) 1996 IGS @@ -39841,18 +39841,18 @@ spk203us // (c) 1996 IGS spk205us // (c) 1996 IGS spk306us // (c) 1996 IGS -@source:spool99.cpp +@source:misc/spool99.cpp spool99 // (c) 1998 Electronic Projects spool99a // (c) 1998 Electronic Projects spool99b // (c) 1998 Electronic Projects spool99c // (c) 1998 Electronic Projects vcarn // (c) 1999 Electronic Projects -@source:sprcros2.cpp +@source:misc/sprcros2.cpp sprcros2 // (c) 1986 GM Shoji sprcros2a // (c) 1986 GM Shoji -@source:sprint2.cpp +@source:atari/sprint2.cpp dominos // 007305 1977/01 [6502] dominos4 // 007754-007765 ??????? [6502] sprint1 // 006443 1978/01 [6502] @@ -39860,26 +39860,26 @@ sprint2 // 005922 1976/11 [6502] sprint2a // 005922 1976/11 [6502] sprint2h // 005922 romkit -@source:sprint4.cpp +@source:atari/sprint4.cpp sprint4 // 008716 1977/12 [6502] sprint4a // 008716 1977/12 [6502] -@source:sprint8.cpp +@source:atari/sprint8.cpp sprint8 // ?????? 1977/05 [6800] sprint8a // ?????? 1977/05 [6800] -@source:spy.cpp +@source:konami/spy.cpp spy // GX857 (c) 1989 (World) spyu // GX857 (c) 1989 (US) -@source:spyhuntertec.cpp +@source:midway/spyhuntertec.cpp spyhuntsp // (c) 1985 Recreativos Franco S.A. (Bally Midway license) spyhuntpr // (c) 1985 Recreativos Franco S.A. -@source:squale.cpp +@source:skeleton/squale.cpp squale // -@source:srmp2.cpp +@source:seta/srmp2.cpp mjyuugi // (c) 1990 Visco mjyuugia // (c) 1990 Visco ponchin // (c) 1991 Visco @@ -39889,60 +39889,60 @@ srmp1 // UB or UC?? (c) 1987 srmp2 // UB or UC?? (c) 1987 srmp3 // ZA-0? (c) 1988 -@source:srmp5.cpp +@source:seta/srmp5.cpp srmp5 // (c) 199? Seta -@source:srmp6.cpp +@source:seta/srmp6.cpp srmp6 // (c) 1996 Seta (Japan) -@source:srumbler.cpp +@source:capcom/srumbler.cpp rushcrsh // 9/1986 (c) 1986 srumbler // 9/1986 (c) 1986 srumbler2 // 9/1986 (c) 1986 srumbler3 // 9/1986 (c) 1986 + Tecfri -@source:ssem.cpp +@source:mchester/ssem.cpp ssem // Manchester Small-Scale Experimental Machine, "Baby" -@source:ssfindo.cpp +@source:acorn/ssfindo.cpp ppcar // (c) 1999 Icarus ssfindo // (c) 1999 Icarus tetfight // (c) 2001 Sego -@source:sshangha.cpp +@source:dataeast/sshangha.cpp sshangha // (c) 1992 Hot-B sshanghab // bootleg sshanghaj // (c) 1992 Hot-B sshanghak // (c) 1992 Hot-B -@source:sshot.cpp +@source:mr/sshot.cpp gunchamps // (c) 1980 Model Racing (sshot.cpp) sshot // (c) 1979 Model Racing -@source:ssingles.cpp +@source:misc/ssingles.cpp atamanot // (c) 1983 Yachiyo Denki / Uni Enterprize ssingles // Yachiyo? -@source:sslam.cpp +@source:playmark/sslam.cpp powerbals // (c) 1994 sslam // (c) 1993 - hack of Namco's Super World Court sslama // ^ sslamb // ^ -@source:ssozumo.cpp +@source:technos/ssozumo.cpp ssozumo // TA-0008 (c) 1984 -@source:sspeedr.cpp +@source:midway/sspeedr.cpp sspeedr // 1979 Midway -@source:ssrj.cpp +@source:taito/ssrj.cpp ssrj // A40 (c) 1985 Taito Corporation -@source:sstrangr.cpp +@source:misc/sstrangr.cpp sstrangr // (c) 1978 Yachiyo Electronics, Ltd. sstrangr2 // (c) 1979 Yachiyo Electronics, Ltd. -@source:ssv.cpp +@source:seta/ssv.cpp cairblad // (c) 1999 Sammy drifto94 // (c) 1994 Visco dynagear // (c) 1993 Sammy @@ -39977,7 +39977,7 @@ vasara // (c) 2000 Visco vasara2 // (c) 2001 Visco vasara2a // (c) 2001 Visco -@source:st_mp100.cpp +@source:pinball/st_mp100.cpp blkshpsq // dracula // hothand // @@ -39993,7 +39993,7 @@ trident // tridento // wildfyre // -@source:st_mp200.cpp +@source:pinball/st_mp200.cpp ali // biggame // catacomp // @@ -40020,7 +40020,7 @@ st_sam4 // stargzr // viperp // -@source:st17xx.cpp +@source:saturn/st17xx.cpp st1700h // st1701 // st1702 // @@ -40032,43 +40032,43 @@ st1707 // st1708 // st1714 // -@source:stactics.cpp +@source:sega/stactics.cpp stactics // (c) 1981 Sega -@source:stadhero.cpp +@source:dataeast/stadhero.cpp stadhero // (c) 1988 Data East Corporation (Japan) -@source:starcrus.cpp +@source:ramtek/starcrus.cpp starcrus // (c) 1977 Ramtek -@source:starfire.cpp +@source:exidy/starfire.cpp fireone // (c) 1979 Exidy starfir2 // (c) 1979 Exidy starfire // Exidy [1979?] starfirea // Exidy [1979?] -@source:stargame.cpp +@source:pinball/stargame.cpp spcship // whtforce // -@source:starrider.cpp +@source:midway/starrider.cpp starridr // -@source:starshp1.cpp +@source:atari/starshp1.cpp starshp1 // 007513-007531 1977/07 [6502] starshpp // 007513-007531 1977/07 [6502] -@source:startouch.cpp +@source:misc/startouch.cpp europl01 // -@source:starwars.cpp +@source:atari/starwars.cpp esb // 136031 (c) 1985 starwars // 136021 (c) 1983 starwars1 // 136021 (c) 1983 starwarso // 136021 (c) 1983 tomcatsw // (proto) (c) 1983 -@source:statriv2.cpp +@source:misc/statriv2.cpp bbchall // (c) 1986 Status Games bigcsino // (c) 1984 Status Games cs1_spp // @@ -40107,11 +40107,11 @@ supertr3 // (c) 1986 Status Games tripdraw // (c) 1981 Status Games trivquiz // (c) 1984 Status Games -@source:stellafr.cpp +@source:adp/stellafr.cpp st_ohla // st_vulkn // -@source:stfight.cpp +@source:seibu/stfight.cpp cshootert // (c) 1987 Taito empcity // (c) 1986 Seibu Kaihatsu (bootleg?) empcityfr // (c) 1986 Seibu Kaihatsu (Norad license) @@ -40122,16 +40122,16 @@ stfight // (c) 1986 Seibu Kaihatsu (Germany) (bootleg?) stfighta // (c) 1986 Seibu Kaihatsu (bootleg?) stfightgb // (c) 1986 Seibu Kaihatsu (Germany-Benelux) -@source:stlforce.cpp +@source:edevices/stlforce.cpp stlforce // (c) 1994 Electronic Devices (Italy) / Ecogames S.L. (Spain) twinbrat // (c) 1995 twinbrata // (c) 1995 twinbratb // (c) 1995 -@source:strkzn.cpp +@source:misc/strkzn.cpp strkzn // (c) 1994 Purple Star -@source:studio2.cpp +@source:rca/studio2.cpp apollo80 // cm1200 // mpt02 // @@ -40141,10 +40141,10 @@ shmc1200 // studio2 // 1977 Studio II visicom // -@source:stuntair.cpp +@source:misc/stuntair.cpp stuntair // (c) 1983 Nuova Videotron -@source:stv.cpp +@source:sega/stv.cpp astrass // 1998.06 Astra Super Stars (Sunsoft) bakubaku // 1995.04 Bakubaku Animal batmanfr // 1996.02 Batman Forever (Acclaim) @@ -40247,19 +40247,19 @@ yattrmnp // 1998.10 Yatterman Plus znpwfv // 1997.12 Zen Nippon Pro Wrestling featuring Virtua znpwfvt // 1997.12 Zen Nippon Pro Wrestling featuring Virtua -@source:su2000.cpp +@source:misc/su2000.cpp su2000 // (c) 1993 Virtuality -@source:sub.cpp +@source:sigma/sub.cpp sub // (c) 1985 Sigma Ent. Inc. -@source:subhuntr.cpp +@source:mr/subhuntr.cpp subhuntr // 1979 Model Racing -@source:subs.cpp +@source:atari/subs.cpp subs // 033714 1979/05 [6502] -@source:subsino.cpp +@source:subsino/subsino.cpp crsbingo // (c) 1991 Subsino dinofmly // (c) 1994 Subsino dinofmlya // (c) 1995 Subsino (Tangasoft license or hack?) @@ -40285,7 +40285,7 @@ victor6 // (c) 1995 Subsino (Alpha license) victor6a // (c) 1995 Subsino (Alpha license) victor6b // (c) 1995 Subsino (Alpha license) -@source:subsino2.cpp +@source:subsino/subsino2.cpp bishjan // (c) 1999 Subsino expcard // (c) 1998 American Alpha humlan // (c) 2001 Subsino & Truemax @@ -40308,21 +40308,21 @@ treamary treacity treacity202 -@source:summit.cpp +@source:misc/summit.cpp pushover // (c)1981 Summit Coin -@source:sumt8035.cpp +@source:misc/sumt8035.cpp sm_ngacc // Nudge Accumulator sm_ultng // Ultimate Nudge -@source:sun1.cpp +@source:sun/sun1.cpp sun1 // -@source:sun2.cpp +@source:sun/sun2.cpp sun2_120 // sun2_50 // -@source:sun3.cpp +@source:sun/sun3.cpp sun3_110 // sun3_150 // sun3_260 // @@ -40330,11 +40330,11 @@ sun3_50 // sun3_60 // sun3_e // -@source:sun3x.cpp +@source:sun/sun3x.cpp sun3_80 // sun3_460 // -@source:sun4.cpp +@source:sun/sun4.cpp sun_s10 // sun_s20 // sun4_20 // @@ -40348,14 +40348,14 @@ sun4_60 // sun4_65 // sun4_75 // -@source:suna16.cpp +@source:suna/suna16.cpp bestbest // (c) 1994 SunA bssoccer // (c) 1996 SunA bssoccera // (c) 1996 SunA sunaq // (c) 1994 SunA uballoon // (c) 1996 SunA -@source:suna8.cpp +@source:suna/suna8.cpp brickzn // (c) 1992 SunA brickzn11 // (c) 1992 SunA brickznv4 // (c) 1992 SunA @@ -40379,7 +40379,7 @@ srangero // (c) 1988 srangerw // (c) 1988 SunA (WDK License) starfigh // (c) 1990 SunA -@source:supbtime.cpp +@source:dataeast/supbtime.cpp chinatwn // MAK (c) 1991 Data East Corporation (Japan) supbtime // MAE (c) 1990 Data East Corporation (World) supbtimea // MAE (c) 1990 Data East Corporation (World) @@ -40387,18 +40387,18 @@ supbtimej // MAE (c) 1990 Data East Corporation (Japan) tumblep // MAP (c) 1991 Data East Corporation (World) tumblepj // MAP (c) 1991 Data East Corporation (Japan) -@source:supdrapo.cpp +@source:stern/supdrapo.cpp supdrapo // (c) 1983 + Stern license supdrapoa // (c) 1983 + Jeutel license? supdrapob // bootleg -@source:supduck.cpp +@source:capcom/supduck.cpp supduck // (c) Comad -@source:super6.cpp +@source:adc/super6.cpp super6 // -@source:super80.cpp +@source:dicksmth/super80.cpp super80 // super80d // super80e // @@ -40406,26 +40406,26 @@ super80m // super80r // super80v // -@source:superchs.cpp +@source:taito/superchs.cpp superchs // D46 (c) 1992 Taito Corporation Japan (World) superchsj // D46 (c) 1992 Taito Corporation (Japan) superchsp // prototype superchsp2 // prototype superchsu // D46 (c) 1992 Taito America Corporation (US) -@source:supercrd.cpp +@source:misc/supercrd.cpp fruitstr // (c) 1992 Fun World supercrd // (c) 1992 Fun World -@source:superdq.cpp +@source:univers/superdq.cpp superdq // ???? (c) 1984 superdqa // ???? (c) 1984 superdqs // ???? (c) 1984 -@source:superga2.cpp +@source:misc/superga2.cpp kuzmich -@source:superqix.cpp +@source:taito/superqix.cpp hotsmash // B18 (c) 1987 Taito pbillian // (c) 1986 Taito pbillianb // bootleg @@ -40438,28 +40438,28 @@ sqixr1 // B03 1987 sqixr0 // B03 1987 sqixu // B03 1987 -@source:superslave.cpp +@source:adc/superslave.cpp superslv // -@source:supertnk.cpp +@source:misc/supertnk.cpp supertnk // (c) 1981 VIDEO GAMES GmbH, W.-GERMANY -@source:superwng.cpp +@source:wing/superwng.cpp superwng // (c) 1985 Wing Co. Ltd -@source:supracan.cpp +@source:funtech/supracan.cpp supracan // -@source:suprgolf.cpp +@source:nasco/suprgolf.cpp albatross // suprgolf // (c) 1989 Nasco suprgolfj // (c) 1989 Nasco -@source:suprloco.cpp +@source:sega/suprloco.cpp suprloco // (c) 1982 Sega suprlocoo // (c) 1982 Sega -@source:suprnova.cpp +@source:kaneko/suprnova.cpp cyvern // 1998.02 (c) 1998 Kaneko (US) cyvernj // 1998.02 (c) 1998 Kaneko (Japan) galpani4 // 1996.09 (c) 1996 Kaneko (Europe) @@ -40500,88 +40500,88 @@ vblokbrk // 1997.?? (c) 1997 Kaneko / Mediaworks (Europe) vblokbrka // 1997.?? (c) 1997 Kaneko / Mediaworks (Asia) -@source:suprridr.cpp +@source:venture/suprridr.cpp suprridr // (c) 1983 Venture Line + Taito license -@source:suprslam.cpp +@source:vsystem/suprslam.cpp suprslam // (c) 1995 Banpresto -@source:supstarf.cpp +@source:pinball/supstarf.cpp supstarf // (c) 1986 Recreativos Franco supstarfa // (c) 1986 Recreativos Franco -@source:surpratk.cpp +@source:konami/surpratk.cpp suratk // GX911 (c) 1990 (World) suratka // GX911 (c) 1990 (Asia) suratkj // GX911 (c) 1990 (Japan) -@source:sv8000.cpp +@source:bandai/sv8000.cpp sv8000 // Super Vision 8000 -@source:svi318.cpp +@source:svi/svi318.cpp svi318 // SVI-318 (PAL) svi318n // SVI-318 (NTSC) svi328 // SVI-328 (PAL) svi328n // SVI-328 (NTSC) -@source:svision.cpp +@source:svision/svision.cpp svision // Supervision Handheld svisionn // svisionp // svisions // tvlinkp // -@source:svmu.cpp +@source:segacons/svmu.cpp svmu // 1998 Sega Visual Memory Unit -@source:sweetland.cpp +@source:namco/sweetland.cpp sweetlnd // -@source:swtpc.cpp +@source:swtpc/swtpc.cpp swtpc // MPA2 MPS Swtbug rom - FLEX swtpcm // MPA2 MPC Mikbug rom -@source:swtpc09.cpp +@source:swtpc/swtpc09.cpp swtpc09 // S09, DMF2 Floppy SBUG rom - FLEX swtpc09d3 // S09, DMF3 Floppy UNIBUG U3 rom - UniFLEX U3 swtpc09i // S09, DC5 Floppy + PIA IDE SBUG rom - FLEX swtpc09u // S09, DMF2 Floppy UNIBUG rom - UniFLEX swtpc09o // S09, DC5 Floppy - OS9 -@source:swtpc8212.cpp +@source:swtpc/swtpc8212.cpp swtpc8212 // Terminal -@source:swyft.cpp +@source:skeleton/swyft.cpp swyft // -@source:sx1000.cpp +@source:casio/sx1000.cpp sx1010 // Casio SX1010 -@source:sym1.cpp +@source:synertek/sym1.cpp sym1 // Synertek SYM-1 -@source:symbolics.cpp +@source:skeleton/symbolics.cpp s3670 // -@source:synthex.cpp +@source:skeleton/synthex.cpp synthex // -@source:sys1121.cpp +@source:motorola/sys1121.cpp sys1121 // (c) 1984 Motorola -@source:sys2900.cpp +@source:skeleton/sys2900.cpp sys2900 // -@source:sys9002.cpp +@source:skeleton/sys9002.cpp sys9002 // -@source:systec.cpp +@source:skeleton/systec.cpp systec // -@source:systel1.cpp +@source:skeleton/systel1.cpp systel100 // -@source:system1.cpp +@source:sega/system1.cpp 4dwarrio // 834-5918 (c) 1985 Coreland / Sega (S1) blockgal // 834-6303 (S1) blockgalb // bootleg @@ -40670,7 +40670,7 @@ wboyu // 834-5753 (? maybe a conversion) (c) 1986 + Es wboyub // bootleg of wboyu wmatch // (c) 1984 (S1) -@source:system16.cpp +@source:sega/system16.cpp altbeastbl // altbeastbl2 // bayrouteb1 // (c) 1989 (protected) (bootleg) @@ -40697,20 +40697,20 @@ tturfbl // (c) 1989 (Datsu bootleg) wb3bbl // bootleg wb3bble // bootleg -@source:tabe22.cpp +@source:tab/tabe22.cpp tabe22 // (c) Tab Products -@source:tagteam.cpp +@source:technos/tagteam.cpp bigprowr // TA-0007 (c) 1983 tagteam // TA-0007 (c) 1983 + Data East license -@source:tail2nos.cpp +@source:vsystem/tail2nos.cpp sformula // [1989] V-System Co. (Japan) sformulaa // [1989] V-System Co. (Japan) tail2nos // [1989] V-System Co. tail2nosa // [1989] V-System Co. -@source:taito.cpp +@source:pinball/taito.cpp cavnegro // cavnegro1 // cavnegro2 // @@ -40751,7 +40751,7 @@ vortexp // zarza // zarza1 // -@source:taito_b.cpp +@source:taito/taito_b.cpp ashura // C43 (c) 1990 Taito Corporation Japan (World) ashuraj // C43 (c) 1990 Taito Corporation (Japan) ashurau // C43 (c) 1990 Taito America Corporation (US) @@ -40793,7 +40793,7 @@ viofightj // C16 (c) 1989 Taito Corporation (Japan) viofightu // C16 (c) 1989 Taito America Corporation (US) yukiwo // prototype -@source:taito_f2.cpp +@source:taito/taito_f2.cpp cameltry // 1990.?? C38 (c) 1989 Taito America Corporation (US) cameltrya // 1990.?? C38 (c) 1989 Taito America Corporation (US) cameltryau // 1990.?? C38 (c) 1989 Taito America Corporation (US) @@ -40862,7 +40862,7 @@ thundfoxu // 1990.06 C28 (c) 1990 Taito America Corporatio yesnoj // 1992.03 D20 (c) 1992 Taito Corporation (Japan) yuyugogo // 1991.03 C83 (c) 1990 Taito Corporation (Japan) -@source:taito_f3.cpp +@source:taito/taito_f3.cpp akkanvdr // 1995.07 E06 (c) 1995 Taito Corporation (Japan) arabianm // 1992.?? D29 (c) 1992 Taito Corporation Japan (World) arabianmj // 1992.09 D29 (c) 1992 Taito Corporation (Japan) @@ -40964,7 +40964,7 @@ trstaro // 1993.?? D53 (c) 1993 Taito Corporation (World trstaroj // 1993.07 D53 (c) 1993 Taito Corporation (Japan) twinqix // 1995.03 ??? (c) 1995 Taito America Corporation (US) -@source:taito_h.cpp +@source:taito/taito_h.cpp dleague // C02 (c) 1990 Taito America Corporation (US) dleaguej // C02 (c) 1990 Taito Corporation (Japan) gogold // B56 (c) 1988 Taito Corporation (Japan) @@ -40975,7 +40975,7 @@ syvalionu syvalionw tetristh // C26 (c) 1988 Sega Enterprises,Ltd. (Japan) -@source:taito_l.cpp +@source:taito/taito_l.cpp cachat // ??? (c) 1993 Taito Corporation (Japan) champwr // C01 (c) 1989 Taito Corporation Japan (World) champwrj // C01 (c) 1989 Taito Corporation (Japan) @@ -41012,10 +41012,10 @@ raimaisj // B36 (c) 1988 Taito Corporation raimaisjo // B36 (c) 1988 Taito Corporation tubeit // ??? no copyright message -@source:taito_o.cpp +@source:taito/taito_o.cpp parentj // C42 (c) 199? Taito -@source:taito_x.cpp +@source:taito/taito_x.cpp ballbros // no copyright notice daisenpu // B87 (c) 1989 Taito Corporation (Japan) gigandes // (c) 1989 East Technology @@ -41027,7 +41027,7 @@ supermanu // B61 (c) 1988 Taito Corporation twinhawk // B87 (c) 1989 Taito Corporation Japan (World) twinhawku // B87 (c) 1989 Taito America Corporation (US) -@source:taito_z.cpp +@source:taito/taito_z.cpp aquajack // B77 (c) 1990 Taito Corporation Japan (World) aquajackj // B77 (c) 1990 Taito Corporation (Japan) aquajacku // B77 (c) 1990 Taito America Corporation (US) @@ -41064,14 +41064,14 @@ spacegun // C57 (c) 1990 Taito Corporation Japan (World) spacegunj // C57 (c) 1990 Taito Corporation (Japan) spacegunu // C57 (c) 1990 Taito America Corporation (US) -@source:taitoair.cpp +@source:taito/taitoair.cpp ainferno // C45 (c) 1990 Taito Corporation Japan (World) ainfernoj // C45 (c) 1990 Taito Corporation (Japan) ainfernou // C45 (c) 1990 Taito America Corporation (US) topland // B62 (c) 1988 Taito Corporation Japan (World) toplandj // B62 (c) 1988 Taito Corporation (Japan) -@source:taitogn.cpp +@source:sony/taitogn.cpp chaoshea // 1998.10 Chaos Heat (V2.09O) chaosheaj // 1998.10 Chaos Heat (V2.08J) coh3002t // @@ -41103,7 +41103,7 @@ xiistag // 2002.07 XII Stag (V2.01J) zokuoten // 2000.12 Zoku Otenamihaiken (V2.03J) zooo // 2004.05 Zooo -@source:taitojc.cpp +@source:taito/taitojc.cpp dangcurv // 1995.?? E09 (c) 1995 Taito Corporation dangcurvj // 1995.?? E09 (c) 1995 Taito Corporation dendego // 1997.04 E35 (c) 1996 Taito Corporation (Japan) - Ver 2.3 J @@ -41123,10 +41123,10 @@ sidebs2ja // 1997.07 E38 (c) 1997 Taito Corporation (Japan sidebsja // 1996.07 E23 (c) 1996 Taito Corporation (Japan) - Ver 2.6 J sidebsjb // 1996.07 E23 (c) 1996 Taito Corporation (Japan) - Ver 2.5 J -@source:taitopjc.cpp +@source:taito/taitopjc.cpp optiger // 1998.09 E63 (c) 1998 Taito -@source:taitosj.cpp +@source:taito/taitosj.cpp alpine // RH (c) 1982 Taito Corporation alpinea // RH (c) 1982 Taito Corporation bioatack // AA8 (c) 1983 Taito Corporation + Fox Video Games license @@ -41154,7 +41154,7 @@ waterski // A03 (c) 1983 Taito Corporation wwestern // WW (c) 1982 Taito Corporation wwestern1 // WW (c) 1982 Taito Corporation -@source:taitottl.cpp +@source:taito/taitottl.cpp fisco400 // (c) 1977 Taito gunman // (c) 1977 Taito missilex // (c) 1977 Taito @@ -41163,7 +41163,7 @@ ttblock // (c) 1977 Taito ttsracec // (c) 1978 Taito zzblock // (c) 1979 Taito -@source:taitotx.cpp +@source:taito/taitotx.cpp chaosbrk // (c) 2004 Taito Corporation chasehq2 // (c) 2006 Taito Corporation goketsuj // (c) 2009 Atlus @@ -41182,7 +41182,7 @@ trbwtchs // (c) 2008 Adventure Planning Service/Studio Si usagiol // (c) 2005 Taito Corporation/Warashi wontmuch // (c) 2006 Capcom -@source:taitotz.cpp +@source:taito/taitotz.cpp batlgear // E68 (c) 1999 Taito batlgr2 // E87 (c) 2000 Taito (2.04J) batlgr2a // E87 (c) 2000 Taito (2.01J) @@ -41196,19 +41196,19 @@ raizpinj // styphp // E98 (c) 2000 Taito taitotz // -@source:taitowlf.cpp +@source:taito/taitowlf.cpp pf2012 // E59 (c) 1997 Taito -@source:talkingbb.cpp +@source:parker/talkingbb.cpp talkingbb -@source:talkingfb.cpp +@source:parker/talkingfb.cpp talkingfb -@source:tamag1.cpp +@source:bandai/tamag1.cpp tama // Bandai -@source:tandy1t.cpp +@source:pc/tandy1t.cpp t1000hx // 1987 Tandy 1000 HX (similiar to PCJr) t1000rl // 1989 Tandy 1000 RL t1000sl2 // 198? Tandy 1000 SL/2 @@ -41216,46 +41216,46 @@ t1000sx // 1987 Tandy 1000 SX (similiar to PCJr) t1000tl2 // 1989 Tandy 1000 TL/2 t1000tx // 1987 Tandy 1000 TX -@source:tandy2k.cpp +@source:trs/tandy2k.cpp tandy2k // tandy2khd // -@source:tank8.cpp +@source:atari/tank8.cpp tank8 // ?????? 1976/04 [6800] tank8a // ?????? 1976/04 [6800] tank8b // ?????? 1976/04 [6800] tank8c // ?????? 1976/04 [6800] tank8d // ?????? 1976/04 [6800] -@source:tankbatt.cpp +@source:namco/tankbatt.cpp tankbatt // (c) 1980 Namco tankbattb // bootleg -@source:tankbust.cpp +@source:valadon/tankbust.cpp tankbust // (c) 1985 -@source:taotaido.cpp +@source:vsystem/taotaido.cpp taotaido // (c) 1993 Video System Co. taotaido3 // (c) 1993 Video System Co. taotaidoa // (c) 1993 Video System Co. -@source:tapatune.cpp +@source:misc/tapatune.cpp smartoss // srockbwl // tapatune // -@source:targeth.cpp +@source:gaelco/targeth.cpp targeth // (c) 1994 - Ref 940531 targetha // (c) 1994 - Ref 940531 targeth10 // (c) 1994 - Ref 940531 -@source:tasc.cpp +@source:tasc/tasc.cpp tascr30 tascr30a tascr30b tascr30g -@source:tasman.cpp +@source:konami/tasman.cpp dragsphr // horses4c // ivorytsk // @@ -41264,7 +41264,7 @@ moneybnk // thequest // vikingt // -@source:tatsumi.cpp +@source:tatsumi/tatsumi.cpp apache3 // (c) 1988 Tatsumi apache3a // (c) 1988 Tatsumi apache3b // (c) 1988 Tatsumi + Kana Corporation license @@ -41275,41 +41275,41 @@ cyclwarra // (c) 1991 Tatsumi cyclwarrb // (c) 1991 Tatsumi roundup5 // (c) 1989 Tatsumi -@source:tattack.cpp +@source:misc/tattack.cpp tattack // (c) 198? Shonan -@source:tavernie.cpp +@source:skeleton/tavernie.cpp cpu09 // ivg09 // -@source:taxidriv.cpp +@source:misc/taxidriv.cpp taxidriv // [1984 Graphic Techno] -@source:tbowl.cpp +@source:tehkan/tbowl.cpp tbowl // 6206 - (c) 1987 Tecmo tbowla // tbowlj // 6206 - (c) 1987 Tecmo tbowlp // Suspected proto of Japanese version for US Market -@source:tceptor.cpp +@source:namco/tceptor.cpp tceptor // (c) 1986 tceptor2 // (c) 1986 -@source:tdv2324.cpp +@source:tandberg/tdv2324.cpp tdv2324 // -@source:teamjocs.cpp +@source:misc/teamjocs.cpp diaelite // -@source:tec1.cpp +@source:trainer/tec1.cpp tec1 // Talking Electronics Computer tecjmon // Talking Electronics Computer -@source:techno.cpp +@source:pinball/techno.cpp xforce // spcteam // -@source:tecmo.cpp +@source:tehkan/tecmo.cpp backfirt // bootleg [(c) 1988 Tecmo] gemini // (c) 1987 Tecmo geminib // bootleg @@ -41324,7 +41324,7 @@ silkwormp // 6217 - (c) 1988 Tecmo silkwormb // bootleg silkwormb2 // bootleg -@source:tecmo16.cpp +@source:tehkan/tecmo16.cpp fstarfrc // (c) 1992 Tecmo fstarfrcj // (c) 1992 Tecmo fstarfrcja // (c) 1992 Tecmo @@ -41333,20 +41333,20 @@ ginkun // (c) 1995 Tecmo riot // (c) 1992 NMK riotw // (c) 1992 Woong Bi -@source:tecmosys.cpp +@source:tehkan/tecmosys.cpp deroon // (c) 1996 Tecmo deroon2 // (c) 1996 Tecmo tkdensho // (c) 1996 Tecmo tkdenshoa // (c) 1996 Tecmo -@source:tecnbras.cpp +@source:skeleton/tecnbras.cpp tecnbras // -@source:tecnodar.cpp +@source:misc/tecnodar.cpp tecnodar // (c) 1991 Automatics Pasqual tecnodargr // (c) 1991 Automatics Pasqual / Recreativos G.R. -@source:tehkanwc.cpp +@source:tehkan/tehkanwc.cpp gridiron // (c) 1985 Tehkan teedoff // 6102 - (c) 1986 Tecmo tehkanwc // (c) 1985 Tehkan @@ -41355,40 +41355,40 @@ tehkanwcc // bootleg tehkanwcd // (c) 1985 Tehkan tehkanwch // (c) 1986 (hack) -@source:tek405x.cpp +@source:tektroni/tek405x.cpp tek4051 // tek4052a // -@source:tek410x.cpp +@source:tektroni/tek410x.cpp tek4107a // tek4109a // -@source:tek43xx.cpp +@source:tektroni/tek43xx.cpp tek4319 // -@source:tek440x.cpp +@source:tektroni/tek440x.cpp tek4404 // (c) 1984 Tektronix -@source:tekigw.cpp +@source:tektroni/tekigw.cpp tek4132 // Tektronix 4132 tek6130 // Tektronix 6130 -@source:tekxp33x.cpp +@source:tektroni/tekxp33x.cpp tekxp330 // -@source:teleray10.cpp +@source:skeleton/teleray10.cpp teleray10 // -@source:telex1192.cpp +@source:skeleton/telex1192.cpp telex1192 // -@source:telex274.cpp +@source:skeleton/telex274.cpp telex274 // -@source:telex277d.cpp +@source:skeleton/telex277d.cpp telex277d // Telex 1979 -@source:tempest.cpp +@source:atari/tempest.cpp tempest // 136002 (c) 1980 tempest1 // 136002 (c) 1980 tempest1r // 136002 (c) 1980 @@ -41396,20 +41396,20 @@ tempest2 // 136002 (c) 1980 tempest3 // 136002 (c) 1980 temptube // (hack) -@source:terak.cpp +@source:skeleton/terak.cpp terak // -@source:terco.cpp +@source:skeleton/terco.cpp t4490 // Terco 4490 Mill CNC Control (c) 1986 -@source:terminal.cpp +@source:skeleton/terminal.cpp 7951om // alcat258 // loewe715 // loewed // teleguide // -@source:terracre.cpp +@source:nichibut/terracre.cpp amatelas // (c) 1986 amazon // (c) 1986 amazont // (c) 1986 @@ -41422,14 +41422,14 @@ terracrea // (c) 1985 terracren // (c) 1985 terracreo // (c) 1985 -@source:test_t400.cpp +@source:homebrew/test_t400.cpp test410 // test420 // -@source:testconsole.cpp +@source:westinghouse/testconsole.cpp whousetc // -@source:tetrisp2.cpp +@source:jaleco/tetrisp2.cpp nndmseal // (c) 1997 I'Max/Jaleco nndmseala // (c) 1997 I'Max/Jaleco nndmsealb // (c) 1997 I'Max/Jaleco @@ -41448,27 +41448,27 @@ tetrisp2j // (c) 1997 Jaleco (Japan v2.2) tetrisp2ja // (c) 1997 Jaleco (Japan v2.1) vjdash // (c) 1999 Jaleco -@source:textelcomp.cpp +@source:skeleton/textelcomp.cpp a1010 // -@source:tg100.cpp +@source:yamaha/tg100.cpp tg100 // (c) 1991 -@source:tgtpanic.cpp +@source:konami/tgtpanic.cpp tgtpanic // GX601 (c) 1996 -@source:thayers.cpp +@source:misc/thayers.cpp thayers // (c) 1983 RDI Video Systems thayersa // (c) 1983 RDI Video Systems -@source:thedealr.cpp +@source:seta/thedealr.cpp thedealr // Visco Games -@source:thedeep.cpp +@source:dataeast/thedeep.cpp rundeep // (c) 1988 Cream (bootleg?) thedeep // (c) 1987 Wood Place -@source:thepit.cpp +@source:thepit/thepit.cpp desertdn // (c) 1982 Video Optics dockman // (c) 1982 Taito Corp. dockmanb // (c) 1982 Taito Corp. @@ -41496,13 +41496,13 @@ theportr // bootleg ttfitter // bootleg zaryavos // (c) 1983 Nova Games of Canada (prototype) -@source:thief.cpp +@source:pacific/thief.cpp natodef // (c) 1982 natodefa // (c) 1982 sharkatt // (c) 1980 thief // (c) 1981 -@source:thomson.cpp +@source:thomson/thomson.cpp mo5 // 1984 Thomson MO5 mo5e // 1986 Thomson MO5E (export version) mo5nr // 1986 Thomson MO5 NR @@ -41517,15 +41517,15 @@ to8d // 1987 Thomson T08D to9 // 1985 Thomson T09 to9p // 1986 Thomson T09+ -@source:thoop2.cpp +@source:gaelco/thoop2.cpp thoop2 // (c) 1994 - REF.940411 thoop2a // (c) 1994 - REF.940411 -@source:thunderj.cpp +@source:atari/thunderj.cpp thunderj // 136076 (c) 1990 thunderja // 136076 (c) 1990 -@source:thunderx.cpp +@source:konami/thunderx.cpp crazycop // GX878 (c) 1988 (Japan) gbusters // GX878 (c) 1988 gbustersa // GX878 (c) 1988 @@ -41537,14 +41537,14 @@ thunderxa // GX873 (c) 1988 thunderxb // GX873 (c) 1988 thunderxj // GX873 (c) 1988 (Japan) -@source:ti630.cpp +@source:skeleton/ti630.cpp ti630 // -@source:ti74.cpp +@source:ti/ti74.cpp ti74 // 1985 TI-74 ti95 // 1986 TI-95 -@source:ti85.cpp +@source:ti/ti85.cpp ti73 // 1998 TI-73 Explorer ti73b // 20?? TI-73 Explorer (Bootleg) ti81 // 1990 TI-81 (Z80 2 MHz) @@ -41574,24 +41574,24 @@ ti84pcev30 // 2017 TI-84 Plus Color Edition (Boot Code 5.30 ti85 // 1992 TI-85 (Z80 6 MHz) ti86 // 1997 TI-86 (Z80 6 MHz) -@source:ti89.cpp +@source:ti/ti89.cpp ti89 // 1998 TI-89 ti89t // 2004 TI-89 Titanium ti92 // 1995 TI-92 ti92p // 1999 TI-92 Plus v200 // 2002 Voyage 200 PLT -@source:ti931.cpp +@source:ti/ti931.cpp ti931 // 1983 -@source:ti99_2.cpp +@source:ti/ti99_2.cpp ti99_224 // 1983 TI 99/2 (24kb ROMs) ti99_232 // 1983 TI 99/2 (32kb ROMs) -@source:ti99_4p.cpp +@source:ti/ti99_4p.cpp ti99_4p // 1996 SNUG SGCPU (aka TI-99/4P) -@source:ti99_4x.cpp +@source:ti/ti99_4x.cpp ti99_4 // 1979 TI-99/4 ti99_4a // 1981 TI-99/4A ti99_4ae // 1981 TI-99/4A with 50Hz video @@ -41599,18 +41599,18 @@ ti99_4e // 1980 TI-99/4 with 50Hz video ti99_4ev // 1994 TI-99/4A with EVPC video card ti99_4qi // 1983 TI-99/4QI (US only) -@source:ti99_8.cpp +@source:ti/ti99_8.cpp ti99_8 // 1983 TI-99/8 ti99_8e // 1983 TI-99/8 with 50Hz video -@source:ti990_10.cpp +@source:ti/ti990_10.cpp ti990_10 // 1975 TI 990/10 -@source:ti990_4.cpp +@source:ti/ti990_4.cpp ti990_4 // 1976 TI 990/4 ti990_4v // 1976 TI 990/4 with video display terminal -@source:tiamc1.cpp +@source:terminal/tiamc1.cpp bilyard // (c) 1988 Terminal konek // (c) 1988 Terminal koroleva // (c) 1988 Terminal @@ -41618,7 +41618,7 @@ sosterm // (c) 1988 Terminal gorodki // (c) 1988 Terminal kot // (c) 1988 Terminal -@source:tickee.cpp +@source:misc/tickee.cpp ghoshunt // (c) 1995? Hanaho Games maletmad // (c) 1999 Hanaho Games, licensed to Capcom mouseatk // (c) 1996 ICE @@ -41628,7 +41628,7 @@ rapidfire // (c) 1998 Hanaho Games tickee // (c) 1994 Raster Elite tutstomb // (c) 199?? Island Design -@source:tigeroad.cpp +@source:capcom/tigeroad.cpp bballs // (c) 1991 Comad bballsa // (c) 1991 Comad f1dream // 4/1988 (c) 1988 + Romstar @@ -41643,21 +41643,21 @@ tigeroadb // bootleg tigeroadu // 11/1987 (c) 1987 + Romstar (US) toramich // 11/1987 (c) 1987 (Japan -@source:tiki100.cpp +@source:tiki/tiki100.cpp kontiki // tiki100 // -@source:tim011.cpp +@source:imp/tim011.cpp tim011 // -@source:tim100.cpp +@source:imp/tim100.cpp tim100 // -@source:timelimt.cpp +@source:thepit/timelimt.cpp progress // (c) 1984 Chuo Co. Ltd timelimt // (c) 1983 Chuo Co. Ltd -@source:timeplt.cpp +@source:konami/timeplt.cpp bikkuric // Peni Soft (NOT Konami) chkun // Peni Soft (NOT Konami) psurge // (c) 1988 unknown (NOT Konami) @@ -41667,20 +41667,20 @@ timeplt // GX393 (c) 1982 timeplta // GX393 (c) 1982 + Atari license timepltc // GX393 (c) 1982 + Centuri license -@source:timetrv.cpp +@source:sega/timetrv.cpp timetrv // (c) 1991.10 Virtual Image Productions timetrv2 // (c) 1991.10 Virtual Image Productions -@source:titan_soc.cpp +@source:tvgames/titan_soc.cpp megadri4 megadri4a -@source:timex.cpp +@source:sinclair/timex.cpp tc2048 // 198? TC2048 ts2068 // 1983 TS2068 uk2086 // 1986 UK2086 -@source:tispeak.cpp +@source:handheld/tispeak.cpp k28m2 // Tiger Electronics lantutor // snmath // @@ -41706,33 +41706,33 @@ tntellp // tntelluk // vocaid // -@source:tispellb.cpp +@source:handheld/tispellb.cpp mrchalgr // spellb // spellb79 // -@source:tk2000.cpp +@source:apple/tk2000.cpp mpf2 // Multitech MPF-II tk2000 // Microdigital TK2000 -@source:tk635.cpp +@source:skeleton/tk635.cpp tk635 // (c) 199? Termtek -@source:tk80.cpp +@source:trainer/tk80.cpp ics8080 // mikrolab // nd80z // nectk85 // tk80 // -@source:tk80bs.cpp +@source:nec/tk80bs.cpp tk80bs // -@source:tm990189.cpp +@source:ti/tm990189.cpp 990189 // 1978 TM 990/189 990189v // 1980 TM 990/189 with Color Video Board -@source:tmaster.cpp +@source:midway/tmaster.cpp tm // (c) 1996 Midway Games tm2k // (c) 1996 Midway Games tm2ka // (c) 1996 Midway Games @@ -41765,23 +41765,23 @@ tm8k // (c) 2000 Midway Games tm8k902 // (c) 2000 Midway Games tmdo // (c) 1996 Midway Games -@source:tmc1800.cpp +@source:telercas/tmc1800.cpp nano // osc1000b // tmc1800 // tmc2000 // -@source:tmc2000e.cpp +@source:telercas/tmc2000e.cpp tmc2000e // -@source:tmc600.cpp +@source:telercas/tmc600.cpp tmc600s2 // -@source:tmmjprd.cpp +@source:metro/tmmjprd.cpp tmmjprd // (c) 1997 Media / Sonnet tmpdoki // (c) 1998 Media Syouji -@source:tmnt.cpp +@source:konami/tmnt.cpp blswhstl // GX060 (c) 1991 (World) blswhstla // GX060 (c) 1991 (Asia) cuebrick // GX903 (c) 1989 @@ -41842,12 +41842,12 @@ tmntuc // GX963 (c) 1989 (US) tmntucbl // bootleg trigon // GX939 (c) 1990 (Japan) -@source:tmspoker.cpp +@source:misc/tmspoker.cpp jlasvegas // (c) 198? Jeutel jlasvegasa // (c) 198? Jeutel tmspoker // -@source:tnzs.cpp +@source:taito/tnzs.cpp arknoid2 // B08 (c) 1987 Taito Corporation Japan (World) arknoid2b // B08 (c) 1987 (bootleg) arknoid2j // B08 (c) 1987 Taito Corporation (Japan) @@ -41882,7 +41882,7 @@ tnzso // B53 (c) 1988 Taito Corporation Japan (World) tnzsoa // B53?(c) 1988 Taito Corporation Japan (World?) (unknown revision, prototype?) tnzsop // B53?(c) 1988 Taito Corporation Japan (World?) (old pcb, prototype) -@source:toaplan1.cpp +@source:toaplan/toaplan1.cpp demonwld // TP-O16 (c) 1990 Toaplan (+ Taito license when set to Japan) demonwld1 // TP-O16 (c) 1989 Toaplan + Taito license demonwld2 // TP-O16 (c) 1989 Toaplan @@ -41915,7 +41915,7 @@ zerowing // TP-O15 (c) 1989 Toaplan zerowing1 // TP-O15 (c) 1989 Toaplan zerowingw // TP-O15 (c) 1989 Williams Electronics -@source:toaplan2.cpp +@source:toaplan/toaplan2.cpp batrider // (c) 1998 Raizing/8ing batriderc // (c) 1998 Raizing/8ing batriderhk // (c) 1998 Raizing/8ing @@ -41996,7 +41996,7 @@ vfive // TP-027 (c) 1993 Toaplan (Japan) whoopee // TP-025 enmadaio // TP-031 -@source:toki.cpp +@source:seibu/toki.cpp juju // (c) 1989 Tad (Japan) jujub // bootleg jujuba // bootleg @@ -42007,23 +42007,23 @@ tokiu // (c) 1989 Tad + Fabtek license (US) tokiua // (c) 1989 Tad + Fabtek license (US) tokip -@source:toki_ms.cpp +@source:seibu/toki_ms.cpp tokims -@source:tomcat.cpp +@source:atari/tomcat.cpp tomcat // (proto) (c) 1985 -@source:tomsadvs.cpp +@source:misc/tomsadvs.cpp icecoldice // (c) ICE tomsadvs // -@source:tomy_princ.cpp +@source:tomy/tomy_princ.cpp princ // Tomy Prin-C (Japan) -@source:tonton.cpp +@source:sunelect/tonton.cpp tonton // (c) 199? Success / Taiyo Jidoki. -@source:toobin.cpp +@source:atari/toobin.cpp toobin // 136061 (c) 1988 toobin1 // 136061 (c) 1988 toobin2 // 136061 (c) 1988 @@ -42031,38 +42031,38 @@ toobin2e // 136061 (c) 1988 toobine // 136061 (c) 1988 toobing // 136061 (c) 1988 -@source:topspeed.cpp +@source:taito/topspeed.cpp fullthrl // B14 (c) 1987 Taito Corporation (Japan) topspeed // B14 (c) 1987 Taito Corporation Japan (World) topspeedu // B14 (c) 1987 Taito America Corporation (US) -@source:toratora.cpp +@source:gameplan/toratora.cpp toratora // (c) 1980 Game Plan toratorab // (c) 1980 Game Plan -@source:tosh1000.cpp +@source:pc/tosh1000.cpp tosh1000 -@source:tourtabl.cpp +@source:atari/tourtabl.cpp tourtab2 // 030170 1978/03 [6507] tourtabl // 030170 1978/03 [6507] -@source:tourvis.cpp +@source:pce/tourvis.cpp tourvis // (c) ???? Tourvision -@source:toypop.cpp +@source:namco/toypop.cpp liblrabl // (c) 1983 toypop // (c) 1986 -@source:tp84.cpp +@source:konami/tp84.cpp tp84 // GX388 (c) 1984 tp84a // GX388 (c) 1984 tp84b // GX388 (c) 1984 -@source:tr175.cpp +@source:skeleton/tr175.cpp tr175 // Relisys -@source:trackfld.cpp +@source:konami/trackfld.cpp atlantol // bootleg hyprolym // GX361 (c) 1983 hyprolymb // bootleg @@ -42078,10 +42078,10 @@ wizzquiz // (c) 1985 Konami wizzquiza // (c) 1985 Zilec-Zenitone yieartf // GX361 (c) 1985 -@source:tranz330.cpp +@source:verifone/tranz330.cpp tranz330 // (c) 1985 VeriFone -@source:travrusa.cpp +@source:irem/travrusa.cpp motorace // (c) 1983 Williams license mototour // (c) 1983 Tecfri shtrider // (c) 1984 Seibu Kaihatsu @@ -42091,10 +42091,10 @@ travrusa // (c) 1983 travrusab // (c) 1983 I.P. (bootleg) travrusab2 // -@source:tricep.cpp +@source:morrow/tricep.cpp tricep // -@source:triforce.cpp +@source:sega/triforce.cpp avalnc12 // 2004.03 The Key Of Avalon 1.20 - Summon The New Monsters (client) (Rev A) avalnc13 // 2004.06.08 The Key Of Avalon 1.30 - Chaotic Sabbat (client) (Rev C) avalns12 // 2004.03 The Key Of Avalon 1.20 - Summon The New Monsters (server) (Rev A) @@ -42140,23 +42140,23 @@ vs42k6ex // 2006.01.31 Virtua Striker 4 Ver.2006 (Export) vs4j // 2004.10 Virtua Striker 4 (Japan) (Rev E) vs4jc // 2004.09 Virtua Striker 4 (Japan) (Rev C) -@source:triplhnt.cpp +@source:atari/triplhnt.cpp triplhnt // 008422-008791 1977/04 [6800] -@source:triviaquiz.cpp +@source:misc/triviaquiz.cpp triviaqz // 1985 Intermatic Manufacturing triviaqz2 // 1985 Intermatic Manufacturing -@source:trivrus.cpp +@source:misc/trivrus.cpp trivrus // 2009 AGT. Trivia R Us -@source:trkfldch.cpp +@source:tvgames/trkfldch.cpp trkfldch // (c) 2007 Konami my1stddr // (c) 2006 Konami abl4play shtscore -@source:trs80.cpp +@source:trs/trs80.cpp eg3003 // ht108064 // Hradstechnika Szvetkezet HT-1080Z/64 ht1080z // Hradstechnika Szvetkezet HT-1080Z @@ -42166,52 +42166,52 @@ sys80p // EACA System 80 trs80 // TRS-80 Model I - Level I BASIC trs80l2 // TRS-80 Model I - Level II BASIC -@source:trs80dt1.cpp +@source:skeleton/trs80dt1.cpp trs80dt1 // TRS-80 Data Terminal 1 -@source:trs80m2.cpp +@source:trs/trs80m2.cpp trs80m16 // trs80m2 // -@source:trs80m3.cpp +@source:trs/trs80m3.cpp trs80m3 // TRS-80 Model III - Radio Shack/Tandy trs80m4 // trs80m4p // cp500 // Prologica CP500 -@source:truco.cpp +@source:misc/truco.cpp truco // (c) 198? Playtronic SRL -@source:trucocl.cpp +@source:misc/trucocl.cpp trucocl // (c) 1991 Miky SRL -@source:truesys.cpp +@source:misc/truesys.cpp unkts // -@source:trvmadns.cpp +@source:misc/trvmadns.cpp trvmadns // (c) 1985 Thunderhead Inc. trvmadnsa // (c) 1985 Thunderhead Inc. -@source:trvquest.cpp +@source:gameplan/trvquest.cpp trvquest // (c) 1984 Sunn / Techstar -@source:tryout.cpp +@source:dataeast/tryout.cpp tryout // (c) 1985 Data East Corporation (Japan) -@source:ts802.cpp +@source:televideo/ts802.cpp ts802 // ts802h // -@source:ts803.cpp +@source:televideo/ts803.cpp ts803h // -@source:ts816.cpp +@source:televideo/ts816.cpp ts816 // -@source:ts3000.cpp +@source:televideo/ts3000.cpp ts3000 // Televideo TS-3000 -@source:tsamurai.cpp +@source:taito/tsamurai.cpp alphaxz // AZ (c) 1986 Ed/Wood Place ladymstr // A49 (c) 1985 Taito ladymstr2 // A49 (c) 1985 Taito @@ -42228,28 +42228,28 @@ tsamuraih // bootleg vsgongf // (c) 1984 Kaneko yamagchi // A38 (c) 1985 Taito -@source:tsispch.cpp +@source:skeleton/tsispch.cpp prose2k // prose2ko // -@source:ttchamp.cpp +@source:misc/ttchamp.cpp ttchamp // ttchampa // -@source:tubep.cpp +@source:nichibut/tubep.cpp rjammer // (c) 1984 + Alice tubep // (c) 1984 + Fujitek tubepb // (c) 1984 + bootleg -@source:tugboat.cpp +@source:misc/tugboat.cpp berenstn // (c) 1984 Enter-Tech noahsark // (c) 1983 Enter-Tech tugboat // (c) 1982 ETM -@source:tulip1.cpp +@source:skeleton/tulip1.cpp tulip1 // (c) 1983 CompuData -@source:tumbleb.cpp +@source:dataeast/tumbleb.cpp bcstry // (c) 1997 SemiCom bcstrya // (c) 1997 SemiCom carket // @@ -42274,11 +42274,11 @@ tumblepba // wlstar // (c) 1995 Mijin wondl96 // (c) 1996 SemiCom -@source:tunhunt.cpp +@source:atari/tunhunt.cpp tunhunt // 136000 (c) 1979 tunhuntc // 136000 (c) 1981 // licensed to / distributed by Centuri -@source:turbo.cpp +@source:sega/turbo.cpp buckrog // (c) 1982 Sega buckrogn // (c) 1982 Sega buckrogn2 // (c) 1982 Sega @@ -42292,60 +42292,60 @@ turbod // (c) 1981 Sega turboe // (c) 1981 Sega zoom909 // (c) 1982 Sega -@source:turrett.cpp +@source:namco/turrett.cpp turrett // (c) 2001 licensed from Dell Electronics -@source:tutankhm.cpp +@source:konami/tutankhm.cpp tutankhm // GX350 (c) 1982 Konami tutankhms // GX350 (c) 1982 Stern -@source:tutor.cpp +@source:tomy/tutor.cpp pyuuta // 1982 Tomy Pyuuta pyuutajr // 1982 Tomy Pyuuta Jr. tutor // 1983? Tomy Tutor -@source:tv910.cpp +@source:televideo/tv910.cpp tv910 // -@source:tv912.cpp +@source:televideo/tv912.cpp tv912b // tv912c // -@source:tv924.cpp +@source:televideo/tv924.cpp tv924 // -@source:tv950.cpp +@source:televideo/tv950.cpp tv950 // -@source:tv955.cpp +@source:televideo/tv955.cpp tv955 // -@source:tv965.cpp +@source:televideo/tv965.cpp tv965 // -@source:tv990.cpp +@source:televideo/tv990.cpp tv990 // 1992? TeleVideo tv995 // 1994 TeleVideo -@source:tvboy.cpp +@source:atari/tvboy.cpp stvboy tvboyii // -@source:tvc.cpp +@source:videoton/tvc.cpp tvc64 // tvc64p // tvc64pru // -@source:tvcapcom.cpp +@source:capcom/tvcapcom.cpp tvcapcom // -@source:tvg01.cpp +@source:misc/tvg01.cpp theboat // -@source:tvgame.cpp +@source:tvgames/tvgame.cpp tvgame // 2011 -@source:twin16.cpp +@source:konami/twin16.cpp cuebrickj // GX903 (c) 1989 (Japan) darkadv // GX687 (c) 1987 devilw // GX687 (c) 1987 @@ -42361,10 +42361,10 @@ vulcan // GX785 (c) 1988 vulcana // GX785 (c) 1988 vulcanb // GX785 (c) 1988 -@source:twinbskt.cpp +@source:misc/twinbskt.cpp twinbskt // (c) 1995 Recreativos Pasqual -@source:twincobr.cpp +@source:toaplan/twincobr.cpp fnshark // bootleg fshark // B02 / TP-007 (c) 1987 Taito Corporation (World) fsharkb // bootleg @@ -42380,7 +42380,7 @@ skysharkb // bootleg twincobr // B30 / TP-011 (c) 1987 Taito Corporation (World) twincobru // B30 / TP-011 (c) 1987 Taito America Corporation + Romstar license (US) -@source:twinkle.cpp +@source:konami/twinkle.cpp bmiidx // bmiidx2 // bmiidx3 // @@ -42401,18 +42401,18 @@ bmiidxs // bmiidxsa // gq863 // -@source:twins.cpp +@source:edevices/twins.cpp spider // twins // (c) 1993 Ecogames twinsed1 // (c) 1994 Electronic Devices twinsed2 // (c) 1994 Electronic Devices -@source:tx0.cpp +@source:mit/tx0.cpp tx0_64kw // April 1956 MIT TX-0 (64kw RAM) tx0_8kwo // 1959 MIT TX-0 (8kw RAM) tx0_8kw // 1962 MIT TX-0 (8kw RAM) -@source:tx1.cpp +@source:tatsumi/tx1.cpp buggyboy // (c) 1985 Tatsumi buggyboyb // (c) 1985 Tatsumi buggyboyjr // (c) 1986 Tatsumi @@ -42420,35 +42420,35 @@ tx1 // (c) 1983 Tatsumi + Atari, Namco and Taito lic tx1jb // (c) 1983 Tatsumi tx1jc // (c) 1983 Tatsumi -@source:uapce.cpp +@source:pce/uapce.cpp aliencr // (c) 1989 Hudson Soft blazlaz // (c) 1989 Hudson Soft keith // (c) 1989 Hudson Soft paclandp // (c) 1989 Namco -@source:uchroma68.cpp +@source:motorola/uchroma68.cpp uchroma68 // 1980 Motorola evaluation board for the MC6847 -@source:uknc.cpp +@source:cccp/uknc.cpp uknc // -@source:ultraman.cpp +@source:konami/ultraman.cpp ultraman // GX910 (c) 1991 Banpresto/Bandai -@source:ultratnk.cpp +@source:atari/ultratnk.cpp ultratnk // 009801 1978/02 [6502] -@source:ultrsprt.cpp +@source:konami/ultrsprt.cpp fiveside // GX479 (c)1995 -@source:umatic.cpp +@source:sony/umatic.cpp vo5850pm // Sony U-Matic VO-5850PM -@source:umipoker.cpp +@source:misc/umipoker.cpp saiyukip // umipoker // -@source:undrfire.cpp +@source:taito/undrfire.cpp cbombers // D83 (c) 1993 Taito Corporation Japan (World) cbombersj // D83 (c) 1993 Taito Corporation (Japan) cbombersp // @@ -42456,46 +42456,46 @@ undrfire // D67 (c) 1993 Taito Corporation Japan (World) undrfirej // D67 (c) 1993 Taito Corporation (Japan) undrfireu // D67 (c) 1993 Taito America Corporation (US) -@source:unianapc.cpp +@source:unico/unianapc.cpp dhunting // (c) 2002 Game Box Entertainment hogwild // (c) 2003 Uniana -@source:unichamp.cpp +@source:unisonic/unichamp.cpp unichamp // -@source:unico.cpp +@source:unico/unico.cpp burglarx // (c) 1997 zeropnt // (c) 1998 zeropnt2 // (c) 1999 zeropnta // (c) 1998 zeropntj // (c) 1998 (Japan) -@source:unior.cpp +@source:cccp/unior.cpp unior // -@source:unistar.cpp +@source:skeleton/unistar.cpp unistar // -@source:univac.cpp +@source:unisys/univac.cpp uts10 // uts20 // -@source:unixpc.cpp +@source:att/unixpc.cpp 3b1 // 3B1 "Unix PC" -@source:unkhorse.cpp +@source:misc/unkhorse.cpp unkhorse // -@source:unkpoker.cpp +@source:misc/unkpoker.cpp unkpoker // -@source:upscope.cpp +@source:amiga/upscope.cpp upscope // (c) 1986 Grand products -@source:usbilliards.cpp +@source:misc/usbilliards.cpp sharkusb // (c) 1975 US Billiards -@source:usgames.cpp +@source:misc/usgames.cpp superten // (c) 1988 usg182 // (c) 1989 usg185 // (c) 1990 @@ -42505,32 +42505,32 @@ usg82 // (c) 1988 usg83x // (c) 1988 usgames // (c) 1992 -@source:ut88.cpp +@source:cccp/ut88.cpp ut88 // ut88mini // -@source:uzebox.cpp +@source:homebrew/uzebox.cpp uzebox // -@source:v0bowl.cpp +@source:misc/v0bowl.cpp v0bowl // -@source:v100.cpp +@source:visual/v100.cpp v100 // -@source:v102.cpp +@source:visual/v102.cpp v102 // -@source:v550.cpp +@source:visual/v550.cpp v550 // -@source:v1050.cpp +@source:visual/v1050.cpp v1050 // -@source:v6809.cpp +@source:skeleton/v6809.cpp v6809 // -@source:vamphalf.cpp +@source:misc/vamphalf.cpp aoh // (c) 2001 boonggab // (c) 2001 Taff System coolmini // (c) 1999 SemiCom @@ -42563,16 +42563,16 @@ wyvernwg // (c) 2001 Semicom / Game Vision wyvernwga // (c) 2001 Semicom / Game Vision yorijori // (c) -@source:vanguardmk1.cpp +@source:skeleton/vanguardmk1.cpp vngrdmk1 // -@source:vaportra.cpp +@source:dataeast/vaportra.cpp kuhga // MAA (c) 1989 Data East Corporation (Japan) vaportra // MAA (c) 1989 Data East Corporation (World) vaportra3 // MAA (c) 1989 Data East Corporation (World) vaportrau // MAA (c) 1989 Data East Corporation (US) -@source:vastar.cpp +@source:orca/vastar.cpp dogfightp // (c) 1983 Orca pprobe // Kyugo? vastar // (c) 1983 Sesame Japan @@ -42580,19 +42580,19 @@ vastar2 // (c) 1983 Sesame Japan vastar3 // (c) 1983 Sesame Japan vastar4 // (c) 1983 Sesame Japan -@source:vax11.cpp +@source:dec/vax11.cpp vax785 // -@source:vball.cpp +@source:technos/vball.cpp vball // TA-0025 (c) 1988 (US) vball2pj // TA-0025 (c) 1988 (Japan) vball2pjb // bootleg (of Japan set) vballb // bootleg (of US set) -@source:vboy.cpp +@source:nintendo/vboy.cpp vboy // -@source:vc4000.cpp +@source:interton/vc4000.cpp 1292apvs // 1392apvs // cx3000tc // @@ -42619,46 +42619,46 @@ vc4000 // Interton vc4000 vc6000 // vmdtbase // -@source:vcombat.cpp +@source:misc/vcombat.cpp shadfgtr // (c) 1993 DUTECH Inc. vcombat // (c) 1993 VR8 Inc. -@source:vcs80.cpp +@source:ddr/vcs80.cpp vcs80 // -@source:vd.cpp +@source:pinball/vd.cpp break86 // papillon // -@source:vd56sp.cpp +@source:skeleton/vd56sp.cpp vd56sp // -@source:vdm7932x.cpp +@source:mera/vdm7932x.cpp vdm79322 // -@source:vector06.cpp +@source:cccp/vector06.cpp krista2 // pk6128c // vec1200 // vector06 // -@source:vector4.cpp +@source:skeleton/vector4.cpp vector4 // -@source:vectrex.cpp +@source:misc/vectrex.cpp raaspec // (c) Roy Abel & Associates 1984 vectrex // General Consumer Electric Vectrex - 1982-1984 -@source:vectrix.cpp +@source:skeleton/vectrix.cpp vectrix // (c) 19?? Olympia? -@source:vega.cpp +@source:olympia/vega.cpp vega // (c) 19?? Olympia? -@source:vegaeo.cpp +@source:eolith/vegaeo.cpp crazywar // (c) 2002 Eolith -@source:vegas.cpp +@source:midway/vegas.cpp cartfury // (c) 2000 Midway Games gauntdl // (c) 1999 Midway Games gauntdl24 // (c) 1999 Midway Games @@ -42679,7 +42679,7 @@ warfaa // (c) 1999 Atari Games warfab // (c) 1999 Atari Games warfac // (c) 1999 Atari Games -@source:vendetta.cpp +@source:konami/vendetta.cpp esckids // GX975 (c) 1991 (Asia) esckidsj // GX975 (c) 1991 (Japan) vendetta // GX081 (c) 1991 (World) @@ -42694,22 +42694,22 @@ vendettar // GX081 (c) 1991 (World) vendettaz // GX081 (c) 1991 (World) vendettaun // GX081 (c) 1991 (World) -@source:vertigo.cpp +@source:exidy/vertigo.cpp topgunnr // (c) 1986 -@source:vg5k.cpp +@source:philips/vg5k.cpp vg5k // 1984 VG-5000 -@source:vic10.cpp +@source:cbm/vic10.cpp vic10 // Commodore Max Machine (Japan) -@source:vic20.cpp +@source:cbm/vic20.cpp vic1001 // Commodore VIC-1001 (Japan) vic20 // Commodore VIC 20 (NTSC) vic20_se // Commodore VIC 20 (Swedish Expanson Kit) vic20p // Commodore VIC 20 (PAL) -@source:vicdual.cpp +@source:sega/vicdual.cpp alphaho // Data East alphahob // bootleg brdrlinb // Karateco bootleg @@ -42765,25 +42765,25 @@ tranqgun // 413-428 (c) 1980 Sega verbena // wantsega // ? (c) 1982 Sega -@source:victor9k.cpp +@source:act/victor9k.cpp victor9k // -@source:victory.cpp +@source:exidy/victory.cpp victorba // (c) 1982 victory // (c) 1982 -@source:vidbrain.cpp +@source:vidbrain/vidbrain.cpp vidbrain // -@source:video21.cpp +@source:misc/video21.cpp video21 // Videogames GmbH 1980 -@source:videopin.cpp +@source:atari/videopin.cpp solarwar // 036154-036169 1979 [6502] videopin // 034253-034267 1979/02 [6502] videopina // -@source:videopkr.cpp +@source:igt/videopkr.cpp babydad // (c) 1987 Recreativos Franco babypkr // (c) 1987 Recreativos Franco blckjack // (c) 1984 InterFlip @@ -42793,7 +42793,7 @@ videocba // (c) 1987 InterFlip videodad // (c) 1987 InterFlip videopkr // (c) 1984 InterFlip -@source:videosaa.cpp +@source:misc/videosaa.cpp jokrlady // ladygum // paradar // @@ -42801,7 +42801,7 @@ scratch // toureiff // winner // -@source:vigilant.cpp +@source:irem/vigilant.cpp bowmen // (c) 1994 Ten-Level buccanrs // (c) 1989 Duintronic buccanrsa // (c) 1989 Duintronic @@ -42817,11 +42817,11 @@ vigilantd // (c) 1988 (Japan Rev D) vigilantg // (c) 1988 (US Rev G) vigilanto // (c) 1988 (US) -@source:vsmile.cpp +@source:vtech/vsmile.cpp vsmile // vsmilem // -@source:vsmileb.cpp +@source:vtech/vsmileb.cpp vsmileb // vsmilebs // vsmilebsw // @@ -42829,10 +42829,10 @@ vsmilebg // vsmilebf // vsmilebfp // -@source:vsmilepro.cpp +@source:skeleton/vsmilepro.cpp vsmilpro -@source:vindictr.cpp +@source:atari/vindictr.cpp vindictr // 136059 (c) 1988 vindictr1 // 136059 (c) 1988 vindictr2 // 136059 (c) 1988 @@ -42842,11 +42842,11 @@ vindictre3 // 136059 (c) 1988 vindictre4 // 136059 (c) 1988 vindictrg // 136059 (c) 1988 -@source:vip.cpp +@source:rca/vip.cpp vip // 1977 Cosmac VIP VP-711 vp111 // 1977 Cosmac VIP VP-111 -@source:viper.cpp +@source:konami/viper.cpp boxingm // 2001 code1d // 2000 code1da // 2000 @@ -42891,23 +42891,23 @@ wcombatk // 2002 wcombatu // 2002 xtrial // 2002 -@source:vis.cpp +@source:trs/vis.cpp vis -@source:vixen.cpp +@source:osborne/vixen.cpp vixen // -@source:vk100.cpp +@source:dec/vk100.cpp vk100 // 1980 Digital Equipment Corporation -@source:vlc.cpp +@source:misc/vlc.cpp nevada // -@source:vlc34010.cpp +@source:misc/vlc34010.cpp beezerk // vlcunk // -@source:volfied.cpp +@source:taito/volfied.cpp volfied // C04 (c) 1989 Taito Corporation Japan (World) volfiedj // C04 (c) 1989 Taito Corporation (Japan) volfiedjo // C04 (c) 1989 Taito Corporation (Japan) @@ -42915,45 +42915,45 @@ volfiedo // C04 (c) 1989 Taito Corporation Japan (World) volfiedu // C04 (c) 1989 Taito America Corporation (US) volfieduo // C04 (c) 1989 Taito America Corporation (US) -@source:votrhv.cpp +@source:votrax/votrhv.cpp hc110 // 1978 Votrax/Phonic Mirror HandiVoice HC-110 hc120 // 1978 Votrax/Phonic Mirror HandiVoice HC-120 -@source:votrpss.cpp +@source:votrax/votrpss.cpp votrpss // 1982 Votrax Personal Speech System -@source:votrtnt.cpp +@source:votrax/votrtnt.cpp votrtnt // 1980 Votrax Type-'N-Talk -@source:voyager.cpp +@source:misc/voyager.cpp voyager // (c) 2002 Team Play, Inc. voyagers // (c) 2002 Team Play, Inc. policet2 // (c) 2003 Team Play, Inc. -@source:vp101.cpp +@source:misc/vp101.cpp jnero // (c) 2004 ICE/Play Mechanix specfrce // (c) 2002 ICE/Play Mechanix specfrceo // (c) 2002 ICE/Play Mechanix rhnation // (c) 2003 ICE/Play Mechanix zoofari // (c) 2006 ICE/Play Mechanix -@source:vp415.cpp +@source:skeleton/vp415.cpp vp415 // (c) 1983 Philips -@source:vp60.cpp +@source:skeleton/vp60.cpp vp60 // -@source:vpoker.cpp +@source:misc/vpoker.cpp 5acespkr // (c) 198? vpoker // (c) 198? -@source:vroulet.cpp +@source:misc/vroulet.cpp vroulet // (c) 1989 World Game -@source:vsmjtria.cpp +@source:alba/vsmjtria.cpp vsmjtria // -@source:vsnes.cpp +@source:nintendo/vsnes.cpp balonfgt // (c) 1984 Nintendo bnglngby // (c) 1985 Nintendo licensed by Broderbund Software Inc. btlecity // (c) 1985 Namco @@ -43010,10 +43010,10 @@ vstennisb // (c) 1984 Nintendo Co., Ltd. / Nintendo of Ame vstetris // (c) 1988 Atari wrecking // (c) 1984 Nintendo -@source:vt_unknown.cpp +@source:nintendo/vt_unknown.cpp dgun2572 -@source:vt1682.cpp +@source:nintendo/vt1682.cpp 110dance dance555 exsprt48 @@ -43034,13 +43034,13 @@ xing48 zone7in1 zone7in1p -@source:vt52.cpp +@source:dec/vt52.cpp vt52 // 1975 Digital Equipment Corporation -@source:vt62.cpp +@source:dec/vt62.cpp vt62 // 1978 Digital Equipment Corporation -@source:vt100.cpp +@source:dec/vt100.cpp vt100 // 1978 Digital Equipment Corporation vt100ac // 1979 Digital Equipment Corporation vt101 // 1981 Digital Equipment Corporation @@ -43049,26 +43049,26 @@ vt105 // 1978 Digital Equipment Corporation vt131 // 1981 Digital Equipment Corporation vt180 // 1981 Digital Equipment Corporation -@source:vt220.cpp +@source:dec/vt220.cpp vt220 // 1983 Digital Equipment Corporation vt220a // 1983 Digital Equipment Corporation -@source:vt240.cpp +@source:dec/vt240.cpp mc7105 // Elektronika MC7105 vt240 // 1983 Digital Equipment Corporation -@source:vt320.cpp +@source:dec/vt320.cpp vt320 // 1987 Digital Equipment Corporation vt330 // 1987 Digital Equipment Corporation -@source:vt520.cpp +@source:dec/vt520.cpp vt420 // 1990 Digital Equipment Corporation vt520 // 1994 Digital Equipment Corporation -@source:vta2000.cpp +@source:cccp/vta2000.cpp vta2000 // -@source:vtech1.cpp +@source:vtech/vtech1.cpp fellow // 1983 Salora Fellow laser110 // 1983 Laser 110 laser200 // 1983 Laser 200 @@ -43080,47 +43080,47 @@ vz200 // 1984 Dick Smith Electronics VZ-200 vz200de // 1983 VZ-200 (Germany) vz300 // 1984 Dick Smith Electronics VZ-300 -@source:vtech2.cpp +@source:vtech/vtech2.cpp laser350 // 1984? Laser 350 laser500 // 1984? Laser 500 laser700 // 1984? Laser 700 -@source:vtech_eu3a12.cpp +@source:vtech/vtech_eu3a12.cpp vreadere -@source:vtech_innotab.cpp +@source:vtech/vtech_innotab.cpp innotab2 // (c) 2011 V.Tech -@source:vulgus.cpp +@source:capcom/vulgus.cpp mach9 // bootleg (ITISA) vulgus // 5/1984 (c) 1984 vulgusa // 5/1984 (c) 1984 vulgusj // 5/1984 (c) 1984 -@source:wacky_gator.cpp +@source:namco/wacky_gator.cpp wackygtr // Wacky Gator -@source:wallc.cpp +@source:midcoin/wallc.cpp brkblast // bootleg (Fadesa) sidampkr // unkitpkr // wallc // (c) 1984 Midcoin wallca // (c) 1984 Midcoin -@source:wangpc.cpp +@source:wang/wangpc.cpp wangpc // -@source:wardner.cpp +@source:toaplan/wardner.cpp pyros // B25 / TP-009 (c) 1987 Taito America Corporation (US) wardner // B25 / TP-009 (c) 1987 Taito Corporation Japan (World) wardnerb // bootleg wardnerj // B25 / TP-009 (c) 1987 Taito Corporation (Japan) wardnerjb // bootleg -@source:warpsped.cpp +@source:meadows/warpsped.cpp warpsped // 197? -@source:warpwarp.cpp +@source:namco/warpwarp.cpp bombbee // [1979] Namco cutieq // (c) 1979 Namco geebee // [1978] Namco @@ -43135,13 +43135,13 @@ warpwarp // (c) 1981 Namco warpwarpr // (c) 1981 [Namco] (Rock-ola license) warpwarpr2 // (c) 1981 [Namco] (Rock-ola license) -@source:warriorb.cpp +@source:taito/warriorb.cpp darius2d // C07 (c) 1989 Taito Corporation (Japan) darius2do // C07 (c) 1989 Taito Corporation (Japan) sagaia // C07 (c) 1989 Taito Corporation Japan (World) warriorb // D24 (c) 1991 Taito Corporation (Japan) -@source:wc90.cpp +@source:tehkan/wc90.cpp pac90 // bootleg twcup90 // (c) 1989 Tecmo twcup90a // (c) 1989 Tecmo @@ -43149,14 +43149,14 @@ twcup90b // (c) 1989 Tecmo twcup90c // (c) 1989 Tecmo twcup90t // (c) 1989 Tecmo -@source:wc90b.cpp +@source:tehkan/wc90b.cpp twcup90b1 // bootleg twcup90b2 // bootleg twcup90ba // bootleg twcup90bb // bootleg eurogael // bootleg -@source:wecleman.cpp +@source:konami/wecleman.cpp hotchase // GX763 (c) 1988 hotchasea // wecleman // GX602 (c) 1986 @@ -43164,12 +43164,12 @@ weclemana // GX602 (c) 1986 weclemanb // GX602?(c) 1988 weclemanc // GX602 (c) 1986 -@source:welltris.cpp +@source:vsystem/welltris.cpp quiz18k // (c) 1992 EIM (Welltris hardware) welltris // (c) 1991 Video System Co. (Japan) welltrisj // (c) 1991 Video System Co. (Japan) -@source:wgp.cpp +@source:taito/wgp.cpp wgp // C32 (c) 1989 Taito Corporation Japan (World) wgp2 // C73 (c) 1990 Taito Corporation (Japan) wgpj // C32 (c) 1989 Taito Corporation (Japan) @@ -43177,10 +43177,10 @@ wgpjoy // C32 (c) 1989 Taito Corporation (Japan) wgpjoya // C32 (c) 1989 Taito Corporation (Japan) wgpu // C32 (c) 1989 Taito America Corporation (US) -@source:wheelfir.cpp +@source:tch/wheelfir.cpp wheelfir // (c) 199? TCH -@source:whitestar.cpp +@source:pinball/whitestar.cpp apollo13 // apollo13_10 // apollo13_20 // @@ -43533,20 +43533,20 @@ xfiles20 // xfilesp // xfilespf // -@source:wicat.cpp +@source:skeleton/wicat.cpp wicat // -@source:wico.cpp +@source:pinball/wico.cpp aftor // -@source:wildfire.cpp +@source:parker/wildfire.cpp wildfire // Parker Bros -@source:wildpkr.cpp +@source:misc/wildpkr.cpp tabpkr // 199?, TAB Austira wildpkr // 199?, TAB Austria. -@source:williams.cpp +@source:midway/williams.cpp alienar // (c) 1985 Duncan Brown alienaru // (c) 1985 Duncan Brown attackf // Famare SA bootleg @@ -43602,18 +43602,18 @@ tshoot // (c) 1984 zero // bootleg zero2 // bootleg -@source:winbingo.cpp +@source:misc/winbingo.cpp wbingo06 -@source:wink.cpp +@source:midcoin/wink.cpp wink // (c) 1985 Midcoin winka // (c) 1985 Midcoin -@source:wiping.cpp +@source:nichibut/wiping.cpp rugrats // (c) 1983 wiping // (c) 1982 -@source:witch.cpp +@source:excelent/witch.cpp keirinou // (c) 1987 Excellent System pbchmp95 // (c) 1995 Veltmeijer Automaten witch // (c) 1992 Excellent System @@ -43621,7 +43621,7 @@ witchb // (c) 1992 Excellent System witchs // (c) 1992 Sega / Vic Tokai license witchstar // (c) 1994 Fovis Korea Co. Ltd. -@source:wiz.cpp +@source:seibu/wiz.cpp finger // hack kungfut // (c) 1984 Seibu Kaihatsu kungfuta // (c) 1984 Seibu Kaihatsu @@ -43633,13 +43633,13 @@ wiz // (c) 1985 Seibu Kaihatsu wizt // (c) 1985 Taito Corporation wizta // (c) 1985 Taito Corporation -@source:wizard.cpp +@source:sharp/wizard.cpp iq7000 // -@source:wmg.cpp +@source:midway/wmg.cpp wmg // Williams 6in1 Multigame, Clay Cowgill -@source:wms.cpp +@source:misc/wms.cpp btippers // (c) 2001 WMS - Big Tippers (Russian) cashcrop // (c) 2000 WMS - Cash Crop (Russian) filthyr // (c) 1997 WMS - Filthy Rich (English) @@ -43671,7 +43671,7 @@ wmsboom // (c) 1998 WMS - Boom (Russian) wmstopb // (c) 1999 WMS - Top Banana (Russian) yukongld // (c) 2000 WMS - Yukon Gold (Russian) -@source:wms_shuffle.cpp +@source:pinball/wms_shuffle.cpp alcat_l7 // arist_l1 // bstrk_l1 // @@ -43689,10 +43689,10 @@ tstrk_l1 // tts_l1 // tts_l2 // -@source:wolfpack.cpp +@source:atari/wolfpack.cpp wolfpack // ?????? prototype [6502] -@source:wpc_95.cpp +@source:pinball/wpc_95.cpp afm_10 // afm_11 // afm_113 // @@ -43760,7 +43760,7 @@ totan_13 // totan_14 // ttt_10 // -@source:wpc_an.cpp +@source:pinball/wpc_an.cpp bop_l2 // bop_l3 // bop_l4 // @@ -43782,7 +43782,7 @@ hd_l2 // hd_l3 // tfa_13 // -@source:wpc_dcs.cpp +@source:pinball/wpc_dcs.cpp afv_l4 // dm_h5 // dm_h6 // @@ -43817,7 +43817,7 @@ sttng_p8 // sttng_s7 // sttng_x7 // -@source:wpc_dot.cpp +@source:pinball/wpc_dot.cpp gi_l3 // gi_l4 // gi_l6 // @@ -43838,7 +43838,7 @@ t2_l8 // t2_p2f // tfdmd_l3 // -@source:wpc_flip1.cpp +@source:pinball/wpc_flip1.cpp taf_h4 // taf_l1 // taf_l2 // @@ -43849,7 +43849,7 @@ taf_l6 // taf_l7 // taf_p2 // -@source:wpc_flip2.cpp +@source:pinball/wpc_flip2.cpp br_l1 // br_l3 // br_l4 // @@ -43904,7 +43904,7 @@ ww_lh6 // ww_p1 // ww_p8 // -@source:wpc_s.cpp +@source:pinball/wpc_s.cpp corv_21 // corv_la1 // corv_lx1 // @@ -43971,21 +43971,21 @@ wd_11 // wd_12 // wd_12g // -@source:wrally.cpp +@source:gaelco/wrally.cpp wrally // (c) 1993 - Ref 930705 wrallya // (c) 1993 - Ref 930705 wrallyat // (c) 1993 - Ref 930217 wrallyb // (c) 1993 - Ref 930217 wrallyc // (c) 1993 -@source:wrinkles.cpp +@source:coleco/wrinkles.cpp wrinkles -@source:wswan.cpp +@source:bandai/wswan.cpp wscolor // Bandai WonderSwan Color Handheld wswan // Bandai WonderSwan Handheld -@source:wwfsstar.cpp +@source:technos/wwfsstar.cpp wwfsstar // TA-0024 (c) 1989 (Europe) wwfsstarb // TA-0024 (c) 1989 (Japan) wwfsstarj // TA-0024 (c) 1989 (Japan) @@ -43993,66 +43993,66 @@ wwfsstaru7 // TA-0024 (c) 1989 (US, newer) wwfsstaru6 // TA-0024 (c) 1989 (US) wwfsstaru4 // TA-0024 (c) 1989 (US) -@source:wxstar4000.cpp +@source:amirix/wxstar4000.cpp wxstar4k // 1990 Applied Microelectronics Research (Amirix) / The Weather Channel -@source:wy100.cpp +@source:wyse/wy100.cpp wy100 // WY-100 -@source:wy150.cpp +@source:wyse/wy150.cpp wy120 // WY-120 wy150 // WY-150 wy160 // WY-160 wy325 // WY-325 -@source:wy30p.cpp +@source:wyse/wy30p.cpp wy30p // WY-30+ -@source:wy50.cpp +@source:wyse/wy50.cpp wy50 // WY-50 wy75 // WY-75 -@source:wy55.cpp +@source:wyse/wy55.cpp wy185es // WY-185ES wy55 // WY-55 wy65 // WY-65 -@source:wy60.cpp +@source:wyse/wy60.cpp wy60 // WY-60 wy60a // WY-60 -@source:wy85.cpp +@source:wyse/wy85.cpp wy85 // WY-85 -@source:wyvernf0.cpp +@source:taito/wyvernf0.cpp wyvernf0 // A39 (c) 1985 Taito Corporation (Japan) wyvernf0a // A39 (c) 1985 Taito Corporation (Japan) -@source:x07.cpp +@source:canon/x07.cpp x07 // -@source:x1.cpp +@source:sharp/x1.cpp x1 // 1982 Sharp X1 x1turbo // 1984 Sharp X1 Turbo (Model 10) x1turbo40 // 1985 Sharp X1 Turbo (Model 40) -@source:x1twin.cpp +@source:sharp/x1twin.cpp x1twin // 1986 Sharp X1 Twin -@source:x68k.cpp +@source:sharp/x68k.cpp x68000 // Sharp X68000 (1987) x68030 // Sharp X68030 (1993) x68ksupr // Sharp X68000 Super (1990) x68kxvi // Sharp X68000 XVI (1991) -@source:xain.cpp +@source:technos/xain.cpp solrwarr // TA-0019 (c) 1986 + Taito / Memetron license xsleena // TA-0019 (c) 1986 + Taito license xsleenab // bootleg xsleenaba // bootleg xsleenaj // TA-0019 (c) 1986 -@source:xavix.cpp +@source:tvgames/xavix.cpp ddrfammt // ekara // ekaraa // @@ -44113,7 +44113,7 @@ tcarnavi // tomcpin // tomplc // -@source:xavix_2000.cpp +@source:tvgames/xavix_2000.cpp epo_ebox // epo_bowl // epo_sdb // @@ -44123,7 +44123,7 @@ ttv_mx // drgqst // ban_onep // -@source:xavix_2002.cpp +@source:tvgames/xavix_2002.cpp suprpctv udance mrangbat @@ -44141,18 +44141,18 @@ domfitch // domdance // domstepc // -@source:xavix2.cpp +@source:tvgames/xavix2.cpp ltv_naru // domfitad // dombikec // -@source:xbase09.cpp +@source:skeleton/xbase09.cpp xbase09 // -@source:xbox.cpp +@source:microsoft/xbox.cpp xbox // -@source:xerox820.cpp +@source:xerox/xerox820.cpp bigboard // mk82 // mk83 // @@ -44160,13 +44160,13 @@ x168 // x820 // x820ii // -@source:xexex.cpp +@source:konami/xexex.cpp orius // GX067 (c) 1991 (USA) xexex // GX067 (c) 1991 (World) xexexa // GX067 (c) 1991 (Asia) xexexj // GX067 (c) 1991 (Japan) -@source:xmen.cpp +@source:konami/xmen.cpp xmen // GX065 (c) 1992 (World) xmen2pa // GX065 (c) 1992 (Asia) xmen2pe // GX065 (c) 1992 (World) @@ -44181,97 +44181,97 @@ xmenja // GX065 (c) 1992 (Japan) xmenu // GX065 (c) 1992 (US) xmenua // GX065 (c) 1992 (US) -@source:xor100.cpp +@source:skeleton/xor100.cpp xor100 // -@source:xorworld.cpp +@source:gaelco/xorworld.cpp xorworld // (c) 1990 - prototype -@source:xtheball.cpp +@source:rare/xtheball.cpp xtheball // (c) 1991 Rare -@source:xtom3d.cpp +@source:misc/xtom3d.cpp xtom3d // -@source:xxmissio.cpp +@source:upl/xxmissio.cpp xxmissio // UPL-86001 [1986] -@source:xybots.cpp +@source:atari/xybots.cpp xybots // 136054 (c) 1987 xybots0 // 136054 (c) 1987 xybots1 // 136054 (c) 1987 xybotsf // 136054 (c) 1987 xybotsg // 136054 (c) 1987 -@source:xyonix.cpp +@source:misc/xyonix.cpp xyonix // [1989 Philko] -@source:y2.cpp +@source:sega/y2.cpp higurashi // (c)2009 AQ Interactive kof2002um // (c)2009 SNK Playmore / New Channel kof2002umj // (c)2009 SNK Playmore / New Channel -@source:yes.cpp +@source:philips/yes.cpp yes // -@source:yiear.cpp +@source:konami/yiear.cpp yiear // GX407 (c) 1985 yiear2 // GX407 (c) 1985 -@source:yman1x.cpp +@source:yamaha/yman1x.cpp an1x // -@source:ymdx100.cpp +@source:yamaha/ymdx100.cpp dx100 // -@source:ymdx11.cpp +@source:yamaha/ymdx11.cpp dx11 // -@source:ymmu5.cpp +@source:yamaha/ymmu5.cpp mu5 // 1994 MU-5 -@source:ymmu50.cpp +@source:yamaha/ymmu50.cpp mu50 // 1995 MU-50 -@source:ymmu80.cpp +@source:yamaha/ymmu80.cpp mu80 // 1994 MU-80 -@source:ymmu100.cpp +@source:yamaha/ymmu100.cpp mu100 // 1997 MU-100 mu100r // 1997 MU-100 Rackable version mu100b // 1998 MU-100B -@source:ympsr16.cpp +@source:yamaha/ympsr16.cpp psr16 // 1988 PSR-16 psr36 // 1988 PSR-36 pss680 // 1988 PSS-680 -@source:ympsr40.cpp +@source:yamaha/ympsr40.cpp psr40 // 1985 PSR-40 -@source:ympsr60.cpp +@source:yamaha/ympsr60.cpp psr60 // 1985 PSR-60 psr70 // 1985 PSR-70 -@source:ympsr340.cpp +@source:yamaha/ympsr340.cpp psr340 // 1999 PSR-340 -@source:ymqy70.cpp +@source:yamaha/ymqy70.cpp qy70 // 1997 QY-70 -@source:ymrx15.cpp +@source:yamaha/ymrx15.cpp rx15 // -@source:ymsy35.cpp +@source:yamaha/ymsy35.cpp sy35 // -@source:ymtx81z.cpp +@source:yamaha/ymtx81z.cpp tx81z // -@source:ymvl70.cpp +@source:yamaha/ymvl70.cpp vl70 // 1996 VL70-m -@source:yunsun16.cpp +@source:yunsung/yunsun16.cpp bombkick // (c) 1998 Yun Sung bombkicka // (c) 1998 Yun Sung magicbub // (c) Yun Sung @@ -44283,46 +44283,46 @@ shocking // (c) 1997 Yun Sung shockingk // (c) 1997 Yun Sung shockingko // (c) 1997 Yun Sung -@source:yunsung8.cpp +@source:yunsung/yunsung8.cpp cannball // (c) 1995 Yun Sung / Soft Visio cannballv // (c) 1995 Yun Sung / T&K magix // (c) 1995 Yun Sung magixb // bootleg rocktris // (c) 1994? Yun Sung -@source:yuvomz80.cpp +@source:misc/yuvomz80.cpp hexaprs // 1995 Yuvo / Yubis - Hexa President (YM2610 set) hexaprsz // 1995 Yuvo / Yubis - Hexa President (YMZ280B set) -@source:z100.cpp +@source:zenith/z100.cpp z100 // -@source:z1013.cpp +@source:robotron/z1013.cpp z1013 // z1013a2 // z1013k69 // z1013k76 // z1013s60 // -@source:z22.cpp +@source:zenith/z22.cpp z22 // -@source:z29.cpp +@source:zenith/z29.cpp z29 // -@source:z80clock.cpp +@source:homebrew/z80clock.cpp z80clock // 2020 Tom Storey -@source:z80dev.cpp +@source:homebrew/z80dev.cpp z80dev // -@source:z80ne.cpp +@source:ne/z80ne.cpp z80ne // 1980 - Z80NE z80net // 1980 - Z80NE + LX388 Video Interface z80netb // 1980 - Z80NE + LX388 Video Interface + 16Kb BASIC z80netf // 1980 - Z80NE + LX.388 Video Interface + LX.390 FD Controller -@source:z88.cpp +@source:acorn/z88.cpp z88 // Z88 (UK) z88ch // Z88 (Swiss) z88de // Z88 (German) @@ -44335,7 +44335,7 @@ z88no // Z88 (Norwegian) z88se // Z88 (Swedish) z88tr // Z88 (Turkish) -@source:z9001.cpp +@source:robotron/z9001.cpp kc85_111 // kc87_10 // kc87_11 // @@ -44343,7 +44343,7 @@ kc87_20 // kc87_21 // z9001 // -@source:zac_1.cpp +@source:pinball/zac_1.cpp ewf // firemntn // futurwld // @@ -44357,7 +44357,7 @@ stargodb // strapids // wsports // -@source:zac_2.cpp +@source:pinball/zac_2.cpp bbeltzac // bbeltzacf // bbeltzacg // @@ -44404,27 +44404,27 @@ tmachzacf // tmachzacg // zankor // -@source:zac_proto.cpp +@source:pinball/zac_proto.cpp skijump // spacecty // strike // -@source:zac2650.cpp +@source:zaccaria/zac2650.cpp dodgem // (c) 1979 sia2650 // (c) 1978 tinv2650 // (c) 1978 -@source:zaccaria.cpp +@source:zaccaria/zaccaria.cpp jackrabt // (c) 1984 jackrabt2 // (c) 1984 jackrabts // (c) 1984 monymony // (c) 1983 monymony2 // (c) 1983 -@source:zapcomputer.cpp +@source:trainer/zapcomputer.cpp zapcomp // (1981) ZAP computer - Z80 Applications Processor -@source:zaurus.cpp +@source:sharp/zaurus.cpp zsl5500 // Sharp Zaurus SL-5500 "Collie" zslc500 // Sharp Zaurus SL-C500 zsl5600 // Sharp Zaurus SL-5600 / SL-B500 "Poodle" @@ -44433,7 +44433,7 @@ zslc3000 // Sharp Zaurus SL-C3000 "Spitz" zslc750 // Sharp Zaurus SL-C750 "Shepherd" zslc760 // Sharp Zaurus SL-C760 "Husky" -@source:zaxxon.cpp +@source:sega/zaxxon.cpp congo // 605-5167 (c) 1983 (2 board stack) congoa // 605-5167 (c) 1983 (3 board stack) futspy // (c) 1984 @@ -44447,20 +44447,20 @@ zaxxon3 // (c) 1982 zaxxonb // bootleg zaxxonj // (c) 1982 -@source:zerozone.cpp +@source:comad/zerozone.cpp lvgirl94 // (c) 1994 Comad zerozone // (c) 1993 Comad -@source:zexall.cpp +@source:homebrew/zexall.cpp zexall // zexall z80 test suite with kevtris' preloader/serial interface at 0000-00ff -@source:zeebo_qualcomm_adreno130.cpp +@source:skeleton/zeebo_qualcomm_adreno130.cpp zeebo -@source:zms8085.cpp +@source:skeleton/zms8085.cpp zephyr // -@source:zn.cpp +@source:sony/zn.cpp 1on1gov // 1 on 1 Government (JAPAN) aerofgts // Aero Fighters Special (USA) aerofgtst // Aero Fighters Special (TAIWAN) @@ -44576,7 +44576,7 @@ ts2ja // Battle Arena Toshinden 2 (JAPAN 951124) ts2u // Battle Arena Toshinden 2 (USA 951124) ts2ua // Battle Arena Toshinden 2 (USA 951124) -@source:zodiack.cpp +@source:orca/zodiack.cpp bounty // (c) 1982 Orca bounty2 // (c) 1982 Orca dogfight // (c) 1983 Thunderbolt @@ -44584,15 +44584,15 @@ moguchan // (c) 1982 Orca + Eastern Commerce Inc. license percuss // (c) 1981 Orca zodiack // (c) 1983 Orca + Esco Trading Co license -@source:zorba.cpp +@source:skeleton/zorba.cpp zorba // -@source:zpinball.cpp +@source:pinball/zpinball.cpp cobrapb // comeback // eballchps // -@source:zr107.cpp +@source:konami/zr107.cpp jetwave // GX678 (c)1996 Euro EAB jetwavej // GX678 (c)1996 Japan JAB midnrun // GX476 (c)1995 Europe EAA @@ -44605,19 +44605,19 @@ windheata // GX677 (c)1996 Asia AAA windheatj // GX677 (c)1996 Japan JAA windheatu // GX677 (c)1996 USA UBC -@source:zrt80.cpp +@source:drc/zrt80.cpp zrt80 // -@source:zsbc3.cpp +@source:dms/zsbc3.cpp zsbc3 // -@source:zt8802.cpp +@source:skeleton/zt8802.cpp zt8802 // (c) 19?? Olympia? -@source:zwackery.cpp +@source:midway/zwackery.cpp zwackery // (c) 1984 -@source:zx.cpp +@source:sinclair/zx.cpp lambda // Lambda 8300 pc8300 // Your Computer - PC8300 pow3000 // Creon Enterprises - Power 3000 @@ -44629,42 +44629,42 @@ zx80 // 1980 Sinclair ZX-80 zx81 // 1981 Sinclair ZX-81 zx97 // -@source:tsconf.cpp +@source:sinclair/tsconf.cpp tsconf // ZX Evolution - TS-Configuration -@source:testpat.cpp +@source:skeleton/testpat.cpp tp1983 tp1985 -@source:palestra.cpp +@source:skeleton/palestra.cpp palestra -@source:vgmplay.cpp +@source:virtual/vgmplay.cpp vgmplay -@source:wavesynth.cpp +@source:virtual/wavesynth.cpp wavesynth -@source:ldplayer.cpp +@source:virtual/ldplayer.cpp simldv1000 // Pioneer LD-V1000 simpr8210 // Pioneer PR-8210 -@source:gsz80.cpp +@source:skeleton/gsz80.cpp gsz80 // Grant Searle's Simple Z-80 Machine -@source:gscpm.cpp +@source:skeleton/gscpm.cpp gscpm // Grant Searle's Simple CP/M Machine -@source:gs6502.cpp +@source:skeleton/gs6502.cpp gs6502 // Grant Searle's Simple 6502 Machine -@source:gs6809.cpp +@source:skeleton/gs6809.cpp gs6809 // Grant Searle's Simple 6809 Machine -@source:ultim809.cpp +@source:skeleton/ultim809.cpp ultim809 -@source:rc2014.cpp +@source:skeleton/rc2014.cpp rc2014 // RC2014 Classic rc2014bp5 // RC2014 Backplane-5 rc2014bp8 // RC2014 Backplane-8 diff --git a/src/mame/mattel/aquarius.cpp b/src/mame/mattel/aquarius.cpp index 4560bb15a7c..763f125aaee 100644 --- a/src/mame/mattel/aquarius.cpp +++ b/src/mame/mattel/aquarius.cpp @@ -24,7 +24,7 @@ X-6026 : Roll of paper for the printer ***************************************************************************/ #include "emu.h" -#include "includes/aquarius.h" +#include "aquarius.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/mattel/aquarius_v.cpp b/src/mame/mattel/aquarius_v.cpp index 2d235ac90b3..9c3fe78ac47 100644 --- a/src/mame/mattel/aquarius_v.cpp +++ b/src/mame/mattel/aquarius_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/aquarius.h" +#include "aquarius.h" static constexpr unsigned short aquarius_pens[] = diff --git a/src/mame/maygay/maygay1b.cpp b/src/mame/maygay/maygay1b.cpp index fefbad5959f..66e1286aa76 100644 --- a/src/mame/maygay/maygay1b.cpp +++ b/src/mame/maygay/maygay1b.cpp @@ -78,7 +78,7 @@ Some games require dongles for security, need to figure this out. ******************************************************************************************/ #include "emu.h" -#include "includes/maygay1b.h" +#include "maygay1b.h" #include "machine/74259.h" #include "speaker.h" diff --git a/src/mame/maygay/maygay1b.h b/src/mame/maygay/maygay1b.h index 8e2c5698f1d..b20d2fb80a8 100644 --- a/src/mame/maygay/maygay1b.h +++ b/src/mame/maygay/maygay1b.h @@ -1,27 +1,27 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_MAYGAY1B_H -#define MAME_INCLUDES_MAYGAY1B_H +#ifndef MAME_MAYGAY_MAYGAY1B_H +#define MAME_MAYGAY_MAYGAY1B_H #pragma once -#include "cpu/m6809/m6809.h" -#include "machine/i8279.h" +#include "awpvid.h" //Fruit Machines Only -#include "video/awpvid.h" //Fruit Machines Only +#include "cpu/m6809/m6809.h" +#include "cpu/mcs51/mcs51.h" #include "machine/6821pia.h" +#include "machine/i8279.h" #include "machine/mc68681.h" #include "machine/meters.h" +#include "machine/nvram.h" #include "machine/roc10937.h" // vfd #include "machine/steppers.h" // stepper motor +#include "machine/timer.h" #include "sound/ay8910.h" +#include "sound/okim6295.h" #include "sound/okim6376.h" -#include "sound/ymopl.h" -#include "machine/nvram.h" -#include "machine/timer.h" #include "sound/upd7759.h" -#include "cpu/mcs51/mcs51.h" -#include "sound/okim6295.h" +#include "sound/ymopl.h" class maygay1b_state : public driver_device @@ -147,4 +147,4 @@ private: INPUT_PORTS_EXTERN( maygay_m1 ); -#endif // MAME_INCLUDES_MAYGAY1B_H +#endif // MAME_MAYGAY_MAYGAY1B_H diff --git a/src/mame/maygay/maygay1bsw.cpp b/src/mame/maygay/maygay1bsw.cpp index 3b2a87ba198..933a54e1661 100644 --- a/src/mame/maygay/maygay1bsw.cpp +++ b/src/mame/maygay/maygay1bsw.cpp @@ -21,7 +21,7 @@ */ #include "emu.h" -#include "includes/maygay1b.h" +#include "maygay1b.h" #include "m1albsqp.lh" #include "m1apollo2.lh" diff --git a/src/mame/maygay/maygayv1.cpp b/src/mame/maygay/maygayv1.cpp index a5d562152ba..95240f3bd6b 100644 --- a/src/mame/maygay/maygayv1.cpp +++ b/src/mame/maygay/maygayv1.cpp @@ -127,7 +127,8 @@ Find lamps/reels after UPD changes. ***************************************************************************/ #include "emu.h" -#include "video/awpvid.h" + +#include "awpvid.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" diff --git a/src/mame/meadows/lazercmd.cpp b/src/mame/meadows/lazercmd.cpp index ee01c0edece..b219642508b 100644 --- a/src/mame/meadows/lazercmd.cpp +++ b/src/mame/meadows/lazercmd.cpp @@ -234,7 +234,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lazercmd.h" +#include "lazercmd.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/meadows/lazercmd_v.cpp b/src/mame/meadows/lazercmd_v.cpp index 7971c9cf3bf..ff6c8555d4f 100644 --- a/src/mame/meadows/lazercmd_v.cpp +++ b/src/mame/meadows/lazercmd_v.cpp @@ -7,7 +7,7 @@ /*************************************************************/ #include "emu.h" -#include "includes/lazercmd.h" +#include "lazercmd.h" /* scale a markers vertical position */ /* the following table shows how the markers */ diff --git a/src/mame/meadows/meadows.cpp b/src/mame/meadows/meadows.cpp index 88d3baa3f82..02fa351a546 100644 --- a/src/mame/meadows/meadows.cpp +++ b/src/mame/meadows/meadows.cpp @@ -119,7 +119,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/meadows.h" +#include "meadows.h" #include "speaker.h" diff --git a/src/mame/meadows/meadows_a.cpp b/src/mame/meadows/meadows_a.cpp index a62279cf982..4aeac4072b5 100644 --- a/src/mame/meadows/meadows_a.cpp +++ b/src/mame/meadows/meadows_a.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "cpu/s2650/s2650.h" -#include "includes/meadows.h" +#include "meadows.h" #include "sound/samples.h" diff --git a/src/mame/meadows/meadows_v.cpp b/src/mame/meadows/meadows_v.cpp index d3e01bd0d8d..ae372e4ecd4 100644 --- a/src/mame/meadows/meadows_v.cpp +++ b/src/mame/meadows/meadows_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/meadows.h" +#include "meadows.h" /* some constants to make life easier */ #define SPR_ADJUST_X -18 diff --git a/src/mame/memotech/mtx.cpp b/src/mame/memotech/mtx.cpp index 00abf7b659d..a78e8f4776e 100644 --- a/src/mame/memotech/mtx.cpp +++ b/src/mame/memotech/mtx.cpp @@ -19,7 +19,7 @@ */ #include "emu.h" -#include "includes/mtx.h" +#include "mtx.h" #include "bus/centronics/ctronics.h" #include "imagedev/cassette.h" diff --git a/src/mame/memotech/mtx_m.cpp b/src/mame/memotech/mtx_m.cpp index f4241b966f8..1de6bc7b0df 100644 --- a/src/mame/memotech/mtx_m.cpp +++ b/src/mame/memotech/mtx_m.cpp @@ -7,7 +7,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/mtx.h" +#include "mtx.h" #include "formats/imageutl.h" diff --git a/src/mame/mess.flt b/src/mame/mess.flt index 316c6427b3e..7ce64417850 100644 --- a/src/mame/mess.flt +++ b/src/mame/mess.flt @@ -1,1288 +1,1296 @@ -3do.cpp -4004clk.cpp -4dpi.cpp -68ksbc.cpp -a2600.cpp -a5105.cpp -a51xx.cpp -a7150.cpp -a7800.cpp -aa310.cpp -aaa.cpp -abc1600.cpp -abc80.cpp -abc80x.cpp -ac1.cpp -accomm.cpp -acd.cpp -aceex.cpp -aci_boris.cpp -aci_borisdpl.cpp -aci_ggm.cpp -aci_prodigy.cpp -acrnsys.cpp -acrnsys1.cpp -actions_atj2279b.cpp -acvirus.cpp -adacp150.cpp -adam.cpp -adds2020.cpp -adm11.cpp -adm23.cpp -adm31.cpp -adm36.cpp -advision.cpp -agat.cpp -aid80f.cpp -aim65.cpp -aim65_40.cpp -airbase99.cpp -akaiax80.cpp -akaivx600.cpp -alcat7100.cpp -alesis.cpp -alesis_qs.cpp -alfaskop41xx.cpp -alphajuno.cpp -alphasma.cpp -alphasma3k.cpp -alphatan.cpp -alphatpc16.cpp -alphatpx.cpp -alphatro.cpp -altair.cpp -alto1.cpp -alto2.cpp -altos2.cpp -altos486.cpp -altos5.cpp -altos8600.cpp -am1000.cpp -amico2k.cpp -amiga.cpp -ampex.cpp -ampex210.cpp -ampro.cpp -ampscarp.cpp -amstr_pc.cpp -amstrad.cpp -amust.cpp -anzterm.cpp -apc.cpp -apexc.cpp -apf.cpp -apogee.cpp -apollo.cpp -apple1.cpp -apple2.cpp -apple2e.cpp -apple2gs.cpp -apple3.cpp -applix.cpp -apricot.cpp -apricotf.cpp -apricotp.cpp -apxen.cpp -aquarius.cpp -arcadia.cpp -argo.cpp -argox.cpp -asst128.cpp -astrohome.cpp -at.cpp -atari400.cpp -atarist.cpp -atm.cpp -atom.cpp -atpci.cpp -att3b2.cpp -att4425.cpp -att610.cpp -att630.cpp -attache.cpp -aussiebyte.cpp -ave_arb.cpp -avigo.cpp -aviion88k.cpp -avrmax.cpp -ax20.cpp -b16.cpp -b2m.cpp -babbage.cpp -banctec.cpp -bandai_design_master.cpp -basf7100.cpp -basic52.cpp -basssta.cpp -bbc.cpp -bbcbc.cpp -bcs3.cpp -bebox.cpp -bert.cpp -beta.cpp -betacam.cpp -bigbord2.cpp -binbug.cpp -bitel.cpp -bitgraph.cpp -bk.cpp -blit.cpp -blw700i.cpp -bmjr.cpp -bml3.cpp -bob85.cpp -boss_se70.cpp -boss_sx700.cpp -bpmmicro.cpp -br8641.cpp -braiplus.cpp -bullet.cpp -busicom.cpp -bvm.cpp -bw12.cpp -bw2.cpp -c10.cpp -c128.cpp -c2color.cpp -c64.cpp -c64dtv.cpp -c65.cpp -c80.cpp -c900.cpp -camplynx.cpp -candela.cpp -canon_s80.cpp -cardinal.cpp -casio_rompack.cpp -casloopy.cpp -cat.cpp -cbm2.cpp -cbnt2039.cpp -cc40.cpp -ccs2810.cpp -cd100.cpp -cd2650.cpp -cdc721.cpp -cdsys5.cpp -ceres.cpp -cfx9850.cpp -cgc7900.cpp -cgenie.cpp -channelf.cpp -chaos.cpp -chessmate.cpp -chessmst.cpp -chessmstdm.cpp -cit101.cpp -cit101xl.cpp -cit1500.cpp -cit220.cpp -cking_master.cpp -ckz80.cpp -clcd.cpp -clickstart.cpp -clxvme186.cpp -cm1800.cpp -cmi.cpp -cms.cpp -coco12.cpp -coco3.cpp -codata.cpp -coleco.cpp -compc.cpp -compis.cpp -compmahj.cpp -compuchess.cpp -compucolor.cpp -comquest.cpp -comx35.cpp -concept.cpp -conchess.cpp -conic_cchess2.cpp -conic_cchess3.cpp -consola_emt.cpp -controlid.cpp -cortex.cpp -cosmicos.cpp -cp1.cpp -crei680.cpp -crimson.cpp -crvision.cpp -ct486.cpp -ctk2000.cpp -ctk551.cpp -cvicny.cpp -cxg_ch2001.cpp -cxg_dominator.cpp -cxg_scptchess.cpp -cxg_sphinx40.cpp -cxhumax.cpp -cybiko.cpp -cz101.cpp -d400.cpp -d6800.cpp -d6809.cpp -dai.cpp -daruma.cpp -datacast.cpp -datum.cpp -dbox.cpp -dccons.cpp -dcebridge.cpp -dct11em.cpp -debut.cpp -decmate2.cpp -decstation.cpp -dectalk.cpp -decwritr.cpp -design.cpp -dfs500.cpp -dg680.cpp -dgn_beta.cpp -diablo1300.cpp -didact.cpp -digel804.cpp -digijet.cpp -digilog320.cpp -digilog400.cpp -dim68k.cpp -dm7000.cpp -dmax8000.cpp -dms5000.cpp -dms86.cpp -dmv.cpp -dolphunk.cpp -dpb7000.cpp -dps1.cpp -dpsv55.cpp -dragon.cpp -drumsta.cpp -ds90.cpp -dsb46.cpp -dual68.cpp -duet16.cpp -dvk_kcgd.cpp -dvk_ksm.cpp -e100.cpp -e9161.cpp -eacc.cpp -easy_karaoke.cpp -ec184x.cpp -ec65.cpp -ec7915.cpp -einstein.cpp -eispc.cpp -elan_ep3a19a.cpp -elan_eu3a05.cpp -elan_eu3a14.cpp -electron.cpp -elekscmp.cpp -elektronmono.cpp -elf.cpp -elwro800.cpp -elzet80.cpp -emax.cpp -emma2.cpp -emu2.cpp -emu3.cpp -emu68k.cpp -enmirage.cpp -ep64.cpp -epic14e.cpp -ergo201.cpp -esprit.cpp -esq1.cpp -esq5505.cpp -esqasr.cpp -esqkt.cpp -esqmr.cpp -et3400.cpp -eti660.cpp -eurit.cpp -eurocom2.cpp -europc.cpp -eva.cpp -evmbug.cpp -ews4800.cpp -excali64.cpp -exelv.cpp -exorciser.cpp -exorterm.cpp -exp85.cpp -f387x.cpp -facit4440.cpp -falco500.cpp -falcots.cpp -falcots28.cpp -fanucs15.cpp -fanucspmg.cpp -fb01.cpp -fc100.cpp -fccpu20.cpp -fccpu30.cpp -fidel_as12.cpp -fidel_card.cpp -fidel_cc1.cpp -fidel_cc10.cpp -fidel_cc7.cpp -fidel_checkc2.cpp -fidel_chesster.cpp -fidel_csc.cpp -fidel_dames.cpp -fidel_desdis.cpp -fidel_eag68k.cpp -fidel_eldorado.cpp -fidel_elite.cpp -fidel_excel.cpp -fidel_msc.cpp -fidel_phantom.cpp -fidel_sc12.cpp -fidel_sc6.cpp -fidel_sc8.cpp -fidel_sc9.cpp -fidel_vcc.cpp -fidel_vsc.cpp -fk1.cpp -fm7.cpp -fmtowns.cpp -fontwriter.cpp -force68k.cpp -fp1100.cpp -fp200.cpp -fp6000.cpp -freedom120.cpp -fs3216.cpp -ft68m.cpp -galaxy.cpp -galeb.cpp -gamate.cpp -gamecom.cpp -gamecube.cpp -gameking.cpp -gamemachine.cpp -gamepock.cpp -gb.cpp -gba.cpp -gem_rp.cpp -generalplus_gpl16250_mobigo.cpp -generalplus_gpl16250_nand.cpp -generalplus_gpl16250_rom.cpp -generalplus_gpl16250_romram.cpp -generalplus_gpl16250_spi.cpp -generalplus_gpl16250_spi_direct.cpp -generalplus_gpl162xx_lcdtype.cpp -generalplus_gpl32612.cpp -generalplus_gpl_unknown.cpp -geneve.cpp -geniusiq.cpp -geniusjr.cpp -genpc.cpp -gigatron.cpp -gimix.cpp -gizmondo.cpp -gkidabc.cpp -glcx.cpp -gm1000.cpp -gmaster.cpp -gnat10.cpp -goupil.cpp -gp2x.cpp -gp32.cpp -grfd2301.cpp -gridcomp.cpp -gs6502.cpp -gs6809.cpp -gscpm.cpp -gsz80.cpp -h01x.cpp -h19.cpp -h8.cpp -h89.cpp -harriet.cpp -hawk.cpp -hazeltin.cpp -hazl1420.cpp -hds200.cpp -hec2hrp.cpp -hektor.cpp -hh_cop400.cpp -hh_cops1.cpp -hh_hmcs40.cpp -hh_melps4.cpp -hh_pic16.cpp -hh_pps41.cpp -hh_rw5000.cpp -hh_sm510.cpp -hh_tms1k.cpp -hh_ucom4.cpp -hhtiger.cpp -hk68v10.cpp -hohnadam.cpp -homelab.cpp -homez80.cpp -horizon.cpp -hp16500.cpp -hp2100.cpp -hp2620.cpp -hp2640.cpp -hp3478a.cpp -hp48.cpp -hp49gp.cpp -hp64k.cpp -hp700.cpp -hp80.cpp -hp95lx.cpp -hp9825.cpp -hp9845.cpp -hp9k.cpp -hp9k_3xx.cpp -hp_ipc.cpp -hprot1.cpp -hpz80unk.cpp -ht6000.cpp -ht68k.cpp -huebler.cpp -hunter16.cpp -hunter2.cpp -husky.cpp -hx20.cpp -i7000.cpp -ibm3153.cpp -ibm6580.cpp -ibmpc.cpp -ibmpcjr.cpp -icatel.cpp -icebox.cpp -ie15.cpp -iez80.cpp -if800.cpp -ikt5a.cpp -im01.cpp -imds2.cpp -imsai.cpp -indiana.cpp -indigo.cpp -indy_indigo2.cpp -informer_207_100.cpp -informer_207_376.cpp -informer_213.cpp -innotv_innotabmax.cpp -instruct.cpp -inteladv.cpp -intellec4.cpp -intellec8.cpp -intellect02.cpp -interpro.cpp -intv.cpp -ipc.cpp -ipds.cpp -iphone2g.cpp -iq151.cpp -iqunlim.cpp -iris3130.cpp -iris_power.cpp -irisha.cpp -is48x.cpp -isbc.cpp -isbc660.cpp -isbc8010.cpp -isbc8030.cpp -iskr103x.cpp -itc4.cpp -itt1700.cpp -itt3030.cpp -itt9216.cpp -jade.cpp -jazz.cpp -jensen.cpp -jonos.cpp -jornada.cpp -jr100.cpp -jr200.cpp -jtc.cpp -juicebox.cpp -juku.cpp -junior.cpp -junior80.cpp -juno106.cpp -juno6.cpp -jupace.cpp -jupiter.cpp -k1003.cpp -k28.cpp -k8915.cpp -kawai_acr20.cpp -kawai_k1.cpp -kawai_k4.cpp -kawai_k5.cpp -kawai_ksp10.cpp -kawai_r100.cpp -kawai_sx240.cpp -kaypro.cpp -kc.cpp -kdt6.cpp -kim1.cpp -kminus.cpp -konin.cpp -korgds8.cpp -korgdss1.cpp -korgdvp1.cpp -korgdw8k.cpp -korgm1.cpp -korgws.cpp -korgz3.cpp -kramermc.cpp -kron.cpp -krz2000.cpp -ktm3.cpp -kyocera.cpp -labtam.cpp -laser3k.cpp -lb186.cpp -lbpc.cpp -lc80.cpp -lcmate2.cpp -ld50.cpp -ldplayer.cpp -leapfrog_iquest.cpp -leapfrog_leappad.cpp -leapfrog_leapster_explorer.cpp -leapster.cpp -learnwin.cpp -lee1214.cpp -lee1220.cpp -lft.cpp -lft_chiptune.cpp -lft_craft.cpp -lft_phasor.cpp -lg-dvd.cpp -lilith.cpp -lisa.cpp -lk3000.cpp -llc1.cpp -llc2.cpp -lms46.cpp -lnw80.cpp -lola8a.cpp -luna_68k.cpp -lviv.cpp -lwriter.cpp -lynx.cpp -m20.cpp -m24.cpp -m3.cpp -m5.cpp -m6805evs.cpp -m68705prg.cpp -m79152pc.cpp -mac.cpp -mac128.cpp -macpci.cpp -macpdm.cpp -macprtb.cpp -macpwrbk030.cpp -macquadra700.cpp -magiceyes_pollux_vr3520f.cpp -magnum.cpp -mattelchess.cpp -max80.cpp -mbc020.cpp -mbc200.cpp -mbc55x.cpp -mbee.cpp -mc10.cpp -mc1000.cpp -mc1502.cpp -mc8020.cpp -mc8030.cpp -mcb216.cpp -mccpm.cpp -mdisk.cpp -mdt60.cpp -megadriv.cpp -megadriv_rad.cpp -megadriv_sunplus_hybrid.cpp -megadriv_vt_hybrid.cpp -mekd1.cpp -mekd2.cpp -mekd3.cpp -mekd4.cpp -mekd5.cpp -mephisto_academy.cpp -mephisto_amsterdam.cpp -mephisto_berlin.cpp -mephisto_brikett.cpp -mephisto_glasgow.cpp -mephisto_milano.cpp -mephisto_mm1.cpp -mephisto_mm2.cpp -mephisto_modena.cpp -mephisto_modular.cpp -mephisto_modular_tm.cpp -mephisto_mondial.cpp -mephisto_mondial2.cpp -mephisto_mondial68k.cpp -mephisto_montec.cpp -mephisto_polgar.cpp -mephisto_risc.cpp -mephisto_smondial.cpp -meritum.cpp -mes.cpp -mfabfz.cpp -mg1.cpp -mice.cpp -micral.cpp -micro20.cpp -microb.cpp -microdec.cpp -microkit.cpp -microkorg.cpp -micromon.cpp -micronic.cpp -microtan.cpp -microterm_f8.cpp -microvsn.cpp -mightyframe.cpp -mikro80.cpp -mikromik.cpp -mikrosha.cpp -milton6805.cpp -milwaukee.cpp -mindset.cpp -mini2440.cpp -minicom.cpp -miniforce.cpp -miniframe.cpp -minitel_2_rpic.cpp -mips.cpp -mits680b.cpp -miuchiz.cpp -mk14.cpp -mk1forth.cpp -mk85.cpp -mk90.cpp -mk98.cpp -mkit09.cpp -ml20.cpp -mmd1.cpp -mmd2.cpp -mod8.cpp -modellot.cpp -molecular.cpp -monkey_king_3b.cpp -monon_color.cpp -monty.cpp -mpc3000.cpp -mpc60.cpp -mpf1.cpp -mps1230.cpp -mpz80.cpp -ms0515.cpp -ms6102.cpp -ms9540.cpp -msbc1.cpp -mstation.cpp -msx.cpp -mt420.cpp -mt5510.cpp -mt735.cpp -mtd1256.cpp -mtx.cpp -multi16.cpp -multi8.cpp -mupid2.cpp -mvme147.cpp -mvme162.cpp -mw4pole.cpp -mx2178.cpp -myb3k.cpp -mycom.cpp -myvision.cpp -mz2000.cpp -mz2500.cpp -mz3500.cpp -mz6500.cpp -mz700.cpp -mz80.cpp -mzr8105.cpp -n64.cpp -nakajies.cpp -nanos.cpp -nascom1.cpp -nc.cpp -ncd68k.cpp -ncd88k.cpp -ncdmips.cpp -ncdppc.cpp -nds.cpp -neogeocd.cpp -nes.cpp -nes_clone.cpp -nes_sh6578.cpp -nes_vt02_vt03.cpp -nes_vt09.cpp -nes_vt32.cpp -nes_vt369_vtunknown.cpp -newbrain.cpp -news_38xx.cpp -news_68k.cpp -news_r3k.cpp -newton.cpp -next.cpp -nforcepc.cpp -ngen.cpp -ngp.cpp -nokia_3310.cpp -notetaker.cpp -novag_cexpert.cpp -novag_cforte.cpp -novag_const.cpp -novag_diablo.cpp -novag_micro.cpp -novag_micro2.cpp -novag_savant.cpp -novag_sexpert.cpp -novag_snova.cpp -ns32kdb.cpp -ns5652.cpp -o2.cpp -ob68k1a.cpp -octane.cpp -octopus.cpp -odyssey2.cpp -okean240.cpp -olivpc1.cpp -olyboss.cpp -olytext.cpp -ondra.cpp -onyx.cpp -orao.cpp -oric.cpp -orion.cpp -osbexec.cpp -osborne1.cpp -osi.cpp -p112.cpp -p2000t.cpp -p8k.cpp -palestra.cpp -palm.cpp -palmz22.cpp -partner.cpp -paso1600.cpp -pasogo.cpp -pasopia.cpp -pasopia7.cpp -patinho_feio.cpp -pb1000.cpp -pc.cpp -pc100.cpp -pc1500.cpp -pc1512.cpp -pc2000.cpp -pc4.cpp -pc6001.cpp -pc8001.cpp -pc8401a.cpp -pc8801.cpp -pc88va.cpp -pc9801.cpp -pc9801_epson.cpp -pc9821.cpp -pc98ha.cpp -pcd.cpp -pce.cpp -pce220.cpp -pcfx.cpp -pcipc.cpp -pcm.cpp -pcmx2.cpp -pcw.cpp -pcw16.cpp -pda600.cpp -pdp1.cpp -pdp11.cpp -pdt3100.cpp -pecom.cpp -pegasus.cpp -pencil2.cpp -pensebem.cpp -pentagon.cpp -peoplepc.cpp -perq.cpp -pes.cpp -pet.cpp -pg685.cpp -phc25.cpp -philipsbo.cpp -phunsy.cpp -picno.cpp -pimps.cpp -pipbug.cpp -pk8000.cpp -pk8020.cpp -plan80.cpp -plus4.cpp -pm68k.cpp -pmd85.cpp -pmi80.cpp -pockchal.cpp -pocketc.cpp -pockstat.cpp -pofo.cpp -poisk1.cpp -pokemini.cpp -poly.cpp -poly800.cpp -poly88.cpp -poly880.cpp -polysix.cpp -positron.cpp -powerstack.cpp -pp.cpp -pp01.cpp -prestige.cpp -primo.cpp -pro80.cpp -prof180x.cpp -prof80.cpp -prophet600.cpp -proteus.cpp -proteus3.cpp -ps2.cpp -ps2sony.cpp -psion.cpp -psion5.cpp -psx.cpp -pt68k4.cpp -ptcsol.cpp -pubint_storyreader.cpp -pulsar.cpp -pv1000.cpp -pv2000.cpp -pv9234.cpp -pve500.cpp -pwp14.cpp -pwrview.cpp -px4.cpp -px8.cpp -pyl601.cpp -ql.cpp -qtsbc.cpp -qvt102.cpp -qvt103.cpp -qvt190.cpp -qvt201.cpp -qvt70.cpp -qx10.cpp -r9751.cpp -radio86.cpp -radionic.cpp -rainbow.cpp -rambo.cpp -ravens.cpp -rc2014.cpp -rc702.cpp -rc759.cpp -rd100.cpp -regence.cpp -replicator.cpp -rex6000.cpp -riscpc.cpp -rm380z.cpp -rmnimbus.cpp -roland_cm32p.cpp -roland_d10.cpp -roland_d50.cpp -roland_jd800.cpp -roland_jv80.cpp -roland_jx3p.cpp -roland_jx8p.cpp -roland_mc50.cpp -roland_mt32.cpp -roland_pr100.cpp -roland_r8.cpp -roland_ra30.cpp -roland_s10.cpp -roland_s50.cpp -roland_sc55.cpp -roland_sc88.cpp -roland_tb303.cpp -roland_tnsc1.cpp -roland_tr505.cpp -roland_tr606.cpp -roland_tr707.cpp -roland_tr808.cpp -roland_tr909.cpp -roland_u20.cpp -rt1715.cpp -rtpc.cpp -rvoice.cpp -rx78.cpp -rz1.cpp -rzone.cpp -sacstate.cpp -sag.cpp -sage2.cpp -saitek_ccompan.cpp -saitek_chesstrv.cpp -saitek_corona.cpp -saitek_cp2000.cpp -saitek_delta1.cpp -saitek_exchess.cpp -saitek_intchess.cpp -saitek_leonardo.cpp -saitek_mark5.cpp -saitek_minichess.cpp -saitek_prschess.cpp -saitek_renaissance.cpp -saitek_risc2500.cpp -saitek_schess.cpp -saitek_simultano.cpp -saitek_ssystem3.cpp -saitek_stratos.cpp -saitek_superstar.cpp -samcoupe.cpp -sansa_fuze.cpp -sapi1.cpp -sartorius.cpp -saturn.cpp -savia84.cpp -sb180.cpp -sb8085.cpp -sbc6510.cpp -sbrain.cpp -sc2.cpp -scopus.cpp -scorpion.cpp -scrablex.cpp -scv.cpp -sdk51.cpp -sdk80.cpp -sdk85.cpp -sdk86.cpp -seattlecmp.cpp -sega_beena.cpp -sega_sawatte.cpp -segapico.cpp -segapm.cpp -selz80.cpp -sg1000.cpp -sh4robot.cpp -shine.cpp -si5500.cpp -sis630.cpp -sitcom.cpp -sk1.cpp -sk101bl.cpp -slc1.cpp -slicer.cpp -slsstars.cpp -sm1800.cpp -sm7238.cpp -smc777.cpp -sms.cpp -snes.cpp -socrates.cpp -softbox.cpp -solbourne.cpp -sorcerer.cpp -spc1000.cpp -spc1500.cpp -spec128.cpp -special.cpp -specpls3.cpp -spectrum.cpp -spg110.cpp -spg29x.cpp -spg29x_lexibook_jg7425.cpp -spg2xx.cpp -spg2xx_digimake.cpp -spg2xx_dreamlife.cpp -spg2xx_ican.cpp -spg2xx_jakks.cpp -spg2xx_jakks_gkr.cpp -spg2xx_jakks_sharp.cpp -spg2xx_jakks_tvtouch.cpp -spg2xx_lexibook.cpp -spg2xx_mysprtch.cpp -spg2xx_pdc.cpp -spg2xx_playvision.cpp -spg2xx_senario.cpp -spg2xx_senario_poker.cpp -spg2xx_senca.cpp -spg2xx_shredmjr.cpp -spg2xx_skannerztv.cpp -spg2xx_smarttv.cpp -spg2xx_telestory.cpp -spg2xx_tvgogo.cpp -spg2xx_vii.cpp -spg2xx_wiwi.cpp -spg2xx_zone.cpp -squale.cpp -ssem.cpp -st17xx.cpp -st2302u_bbl_rom.cpp -st2302u_bbl_spi.cpp -storio.cpp -studio2.cpp -sun1.cpp -sun2.cpp -sun3.cpp -sun3x.cpp -sun4.cpp -super6.cpp -super80.cpp -superslave.cpp -supracan.cpp -sv8000.cpp -svi318.cpp -svision.cpp -svmu.cpp -swtpc.cpp -swtpc09.cpp -swtpc8212.cpp -swyft.cpp -sx1000.cpp -sym1.cpp -symbolics.cpp -synthex.cpp -sys1121.cpp -sys2900.cpp -sys9002.cpp -systec.cpp -systel1.cpp -tabe22.cpp -talkingbb.cpp -talkingfb.cpp -tamag1.cpp -tandy1t.cpp -tandy2k.cpp -tasc.cpp -tavernie.cpp -tdv2324.cpp -tec1.cpp -tecnbras.cpp -tek405x.cpp -tek410x.cpp -tek43xx.cpp -tek440x.cpp -tekigw.cpp -tekxp33x.cpp -teleray10.cpp -telex1192.cpp -telex274.cpp -telex277d.cpp -terak.cpp -terco.cpp -terminal.cpp -test_t400.cpp -testconsole.cpp -testpat.cpp -textelcomp.cpp -tg100.cpp -thomson.cpp -ti630.cpp -ti74.cpp -ti85.cpp -ti89.cpp -ti931.cpp -ti990_10.cpp -ti990_4.cpp -ti99_2.cpp -ti99_4p.cpp -ti99_4x.cpp -ti99_8.cpp -tiki100.cpp -tim011.cpp -tim100.cpp -timex.cpp -tispeak.cpp -tispellb.cpp -titan_soc.cpp -tk2000.cpp -tk635.cpp -tk80.cpp -tk80bs.cpp -tm990189.cpp -tmc1800.cpp -tmc2000e.cpp -tmc600.cpp -tomy_princ.cpp -tosh1000.cpp -tr175.cpp -tranz330.cpp -tricep.cpp -trkfldch.cpp -trs80.cpp -trs80dt1.cpp -trs80m2.cpp -trs80m3.cpp -ts3000.cpp -ts802.cpp -ts803.cpp -ts816.cpp -tsconf.cpp -tsispch.cpp -tulip1.cpp -tutor.cpp -tv910.cpp -tv912.cpp -tv924.cpp -tv950.cpp -tv955.cpp -tv965.cpp -tv990.cpp -tvboy.cpp -tvc.cpp -tvgame.cpp -tx0.cpp -uchroma68.cpp -uknc.cpp -ultim809.cpp -umatic.cpp -unichamp.cpp -unior.cpp -unistar.cpp -univac.cpp -unixpc.cpp -ut88.cpp -uzebox.cpp -v100.cpp -v102.cpp -v1050.cpp -v550.cpp -v6809.cpp -vanguardmk1.cpp -vax11.cpp -vboy.cpp -vc4000.cpp -vcs80.cpp -vd56sp.cpp -vdm7932x.cpp -vector06.cpp -vector4.cpp -vectrex.cpp -vectrix.cpp -vg5k.cpp -vgmplay.cpp -vic10.cpp -vic20.cpp -victor9k.cpp -vidbrain.cpp -vip.cpp -vis.cpp -vixen.cpp -vk100.cpp -votrhv.cpp -votrpss.cpp -votrtnt.cpp -vp415.cpp -vp60.cpp -vsmile.cpp -vsmileb.cpp -vsmilepro.cpp -vt100.cpp -vt1682.cpp -vt220.cpp -vt240.cpp -vt320.cpp -vt52.cpp -vt520.cpp -vt62.cpp -vt_unknown.cpp -vta2000.cpp -vtech1.cpp -vtech2.cpp -vtech_eu3a12.cpp -vtech_innotab.cpp -wangpc.cpp -wavesynth.cpp -wicat.cpp -wildfire.cpp -wizard.cpp -wrinkles.cpp -wswan.cpp -wxstar4000.cpp -wy100.cpp -wy150.cpp -wy30p.cpp -wy50.cpp -wy55.cpp -wy60.cpp -wy85.cpp -x07.cpp -x1.cpp -x1twin.cpp -x68k.cpp -xavix.cpp -xavix2.cpp -xavix_2000.cpp -xavix_2002.cpp -xbase09.cpp -xbox.cpp -xerox820.cpp -xor100.cpp -yes.cpp -yman1x.cpp -ymdx100.cpp -ymdx11.cpp -ymmu100.cpp -ymmu5.cpp -ymmu50.cpp -ymmu80.cpp -ympsr16.cpp -ympsr340.cpp -ympsr40.cpp -ympsr60.cpp -ymqy70.cpp -ymrx15.cpp -ymsy35.cpp -ymtx81z.cpp -ymvl70.cpp -z100.cpp -z1013.cpp -z22.cpp -z29.cpp -z80clock.cpp -z80dev.cpp -z80ne.cpp -z88.cpp -z9001.cpp -zapcomputer.cpp -zaurus.cpp -zeebo_qualcomm_adreno130.cpp -zexall.cpp -zms8085.cpp -zorba.cpp -zrt80.cpp -zsbc3.cpp -zt8802.cpp -zx.cpp +access/acvirus.cpp +aci/aci_boris.cpp +aci/aci_borisdpl.cpp +aci/aci_ggm.cpp +aci/aci_prodigy.cpp +acorn/aa310.cpp +acorn/accomm.cpp +acorn/acrnsys.cpp +acorn/acrnsys1.cpp +acorn/atom.cpp +acorn/bbc.cpp +acorn/cms.cpp +acorn/electron.cpp +acorn/riscpc.cpp +acorn/z88.cpp +act/apricot.cpp +act/apricotf.cpp +act/apricotp.cpp +act/apxen.cpp +act/victor9k.cpp +adc/super6.cpp +adc/superslave.cpp +agat/agat.cpp +akai/akaiax80.cpp +akai/akaivx600.cpp +akai/mpc3000.cpp +akai/mpc60.cpp +alesis/alesis.cpp +altos/altos2.cpp +altos/altos486.cpp +altos/altos5.cpp +altos/altos8600.cpp +amiga/amiga.cpp +amirix/wxstar4000.cpp +ampro/ampro.cpp +ampro/lb186.cpp +ampro/lbpc.cpp +amstrad/amstr_pc.cpp +amstrad/amstrad.cpp +amstrad/nc.cpp +amstrad/pc1512.cpp +amstrad/pcw.cpp +amstrad/pcw16.cpp +amstrad/pda600.cpp +apf/apf.cpp +apollo/apollo.cpp +apple/apple1.cpp +apple/apple2.cpp +apple/apple2e.cpp +apple/apple2gs.cpp +apple/apple3.cpp +apple/iphone2g.cpp +apple/lisa.cpp +apple/lwriter.cpp +apple/mac.cpp +apple/mac128.cpp +apple/macpci.cpp +apple/macpdm.cpp +apple/macprtb.cpp +apple/macpwrbk030.cpp +apple/macquadra700.cpp +apple/tk2000.cpp +applied/mbee.cpp +arcadia/arcadia.cpp +ascii/msx.cpp +at/at.cpp +at/atpci.cpp +at/ct486.cpp +at/ps2.cpp +atari/a2600.cpp +atari/a7800.cpp +atari/atari400.cpp +atari/atarist.cpp +atari/lynx.cpp +atari/pofo.cpp +atari/tvboy.cpp +att/att3b2.cpp +att/att4425.cpp +att/att610.cpp +att/att630.cpp +att/unixpc.cpp +ave/ave_arb.cpp +aviion/aviion88k.cpp +banctec/banctec.cpp +bandai/bandai_design_master.cpp +bandai/rx78.cpp +bandai/sv8000.cpp +bandai/tamag1.cpp +bandai/wswan.cpp +be/bebox.cpp +beehive/microb.cpp +bitcorp/gamate.cpp +bnpo/b2m.cpp +bondwell/bw12.cpp +bondwell/bw2.cpp +booth/apexc.cpp +camputers/camplynx.cpp +canon/canon_s80.cpp +canon/cat.cpp +canon/x07.cpp +cantab/jupace.cpp +casio/casio_rompack.cpp +casio/casloopy.cpp +casio/cfx9850.cpp +casio/ctk2000.cpp +casio/ctk551.cpp +casio/cz101.cpp +casio/fp1100.cpp +casio/fp200.cpp +casio/fp6000.cpp +casio/ht6000.cpp +casio/ld50.cpp +casio/pb1000.cpp +casio/pv1000.cpp +casio/pv2000.cpp +casio/rz1.cpp +casio/sk1.cpp +casio/sx1000.cpp +cbm/c128.cpp +cbm/c64.cpp +cbm/c64dtv.cpp +cbm/c65.cpp +cbm/c900.cpp +cbm/cbm2.cpp +cbm/chessmate.cpp +cbm/clcd.cpp +cbm/mps1230.cpp +cbm/pet.cpp +cbm/plus4.cpp +cbm/vic10.cpp +cbm/vic20.cpp +cccp/argo.cpp +cccp/cm1800.cpp +cccp/debut.cpp +cccp/intellect02.cpp +cccp/lviv.cpp +cccp/mikro80.cpp +cccp/okean240.cpp +cccp/pk8000.cpp +cccp/pk8020.cpp +cccp/pyl601.cpp +cccp/sm1800.cpp +cccp/sm7238.cpp +cccp/uknc.cpp +cccp/unior.cpp +cccp/ut88.cpp +cccp/vector06.cpp +cccp/vta2000.cpp +cce/mc1000.cpp +ccs/ccs2810.cpp +ceres/ceres.cpp +chessking/cking_master.cpp +chromatics/cgc7900.cpp +chrysler/eva.cpp +citoh/cit101.cpp +citoh/cit101xl.cpp +citoh/cit220.cpp +coleco/adam.cpp +coleco/coleco.cpp +coleco/wrinkles.cpp +compugraphic/pwrview.cpp +comx/comx35.cpp +concept/concept.cpp +conic/conic_cchess2.cpp +conic/conic_cchess3.cpp +conitec/prof180x.cpp +conitec/prof80.cpp +consumenta/conchess.cpp +cromemco/c10.cpp +cromemco/mcb216.cpp +cxg/cxg_ch2001.cpp +cxg/cxg_dominator.cpp +cxg/cxg_scptchess.cpp +cxg/cxg_sphinx40.cpp +cybiko/cybiko.cpp +dai/dai.cpp +dcs/compuchess.cpp +ddr/ac1.cpp +ddr/bcs3.cpp +ddr/c80.cpp +ddr/huebler.cpp +ddr/jtc.cpp +ddr/kramermc.cpp +ddr/llc1.cpp +ddr/llc2.cpp +ddr/nanos.cpp +ddr/pcm.cpp +ddr/vcs80.cpp +dec/dct11em.cpp +dec/decmate2.cpp +dec/decstation.cpp +dec/dectalk.cpp +dec/decwritr.cpp +dec/jensen.cpp +dec/pdp11.cpp +dec/rainbow.cpp +dec/vax11.cpp +dec/vk100.cpp +dec/vt100.cpp +dec/vt220.cpp +dec/vt240.cpp +dec/vt320.cpp +dec/vt52.cpp +dec/vt520.cpp +dec/vt62.cpp +dicksmth/super80.cpp +dms/dms5000.cpp +dms/dms86.cpp +dms/zsbc3.cpp +drc/zrt80.cpp +dulmont/magnum.cpp +eaca/cgenie.cpp +einis/pecom.cpp +elektor/avrmax.cpp +elektor/ec65.cpp +elektor/elekscmp.cpp +elektor/junior.cpp +elektron/elektronmono.cpp +elektronika/bk.cpp +elektronika/dvk_kcgd.cpp +elektronika/dvk_ksm.cpp +elektronika/im01.cpp +elektronika/mk85.cpp +elektronika/mk90.cpp +elektronika/mk98.cpp +elektronika/ms6102.cpp +emusys/emax.cpp +emusys/emu2.cpp +emusys/emu3.cpp +emusys/emu68k.cpp +ensoniq/enmirage.cpp +ensoniq/esq1.cpp +ensoniq/esq5505.cpp +ensoniq/esqasr.cpp +ensoniq/esqkt.cpp +ensoniq/esqmr.cpp +enterprise/ep64.cpp +entex/advision.cpp +entex/sag.cpp +epoch/gamepock.cpp +epoch/scv.cpp +epson/hx20.cpp +epson/px4.cpp +epson/px8.cpp +epson/qx10.cpp +ericsson/e9161.cpp +ericsson/eispc.cpp +exidy/sorcerer.cpp +exorterm/exorterm.cpp +fairch/channelf.cpp +fairch/f387x.cpp +fairlight/cmi.cpp +falco/falco500.cpp +falco/falcots.cpp +falco/falcots28.cpp +fidelity/fidel_as12.cpp +fidelity/fidel_card.cpp +fidelity/fidel_cc1.cpp +fidelity/fidel_cc10.cpp +fidelity/fidel_cc7.cpp +fidelity/fidel_checkc2.cpp +fidelity/fidel_chesster.cpp +fidelity/fidel_csc.cpp +fidelity/fidel_dames.cpp +fidelity/fidel_desdis.cpp +fidelity/fidel_eag68k.cpp +fidelity/fidel_eldorado.cpp +fidelity/fidel_elite.cpp +fidelity/fidel_excel.cpp +fidelity/fidel_msc.cpp +fidelity/fidel_phantom.cpp +fidelity/fidel_sc12.cpp +fidelity/fidel_sc6.cpp +fidelity/fidel_sc8.cpp +fidelity/fidel_sc9.cpp +fidelity/fidel_vcc.cpp +fidelity/fidel_vsc.cpp +force/fccpu20.cpp +force/fccpu30.cpp +force/force68k.cpp +force/miniforce.cpp +francedr/regence.cpp +fujitsu/fm7.cpp +fujitsu/fmtowns.cpp +funtech/supracan.cpp +galaxy/galaxy.cpp +gamepark/gp2x.cpp +gamepark/gp32.cpp +gridcomp/gridcomp.cpp +grundy/newbrain.cpp +h01x/h01x.cpp +handheld/hh_cop400.cpp +handheld/hh_cops1.cpp +handheld/hh_hmcs40.cpp +handheld/hh_melps4.cpp +handheld/hh_pic16.cpp +handheld/hh_pps41.cpp +handheld/hh_rw5000.cpp +handheld/hh_sm510.cpp +handheld/hh_tms1k.cpp +handheld/hh_ucom4.cpp +handheld/rzone.cpp +handheld/tispeak.cpp +handheld/tispellb.cpp +hartung/gmaster.cpp +hds/hds200.cpp +heathkit/et3400.cpp +heathkit/h19.cpp +heathkit/h8.cpp +heathkit/h89.cpp +hec2hrp/hec2hrp.cpp +hegener/mephisto_academy.cpp +hegener/mephisto_amsterdam.cpp +hegener/mephisto_berlin.cpp +hegener/mephisto_brikett.cpp +hegener/mephisto_glasgow.cpp +hegener/mephisto_milano.cpp +hegener/mephisto_mm1.cpp +hegener/mephisto_mm2.cpp +hegener/mephisto_modena.cpp +hegener/mephisto_modular.cpp +hegener/mephisto_modular_tm.cpp +hegener/mephisto_mondial.cpp +hegener/mephisto_mondial2.cpp +hegener/mephisto_mondial68k.cpp +hegener/mephisto_montec.cpp +hegener/mephisto_polgar.cpp +hegener/mephisto_risc.cpp +hegener/mephisto_smondial.cpp +heurikon/hk68v10.cpp +hitachi/b16.cpp +hitachi/bmjr.cpp +hitachi/bml3.cpp +homebrew/4004clk.cpp +homebrew/68ksbc.cpp +homebrew/dcebridge.cpp +homebrew/homez80.cpp +homebrew/lft_chiptune.cpp +homebrew/lft_craft.cpp +homebrew/lft_phasor.cpp +homebrew/mk1forth.cpp +homebrew/p112.cpp +homebrew/phunsy.cpp +homebrew/pimps.cpp +homebrew/ravens.cpp +homebrew/sbc6510.cpp +homebrew/sitcom.cpp +homebrew/slc1.cpp +homebrew/test_t400.cpp +homebrew/uzebox.cpp +homebrew/z80clock.cpp +homebrew/z80dev.cpp +homebrew/zexall.cpp +homelab/braiplus.cpp +homelab/homelab.cpp +hp/hp16500.cpp +hp/hp2100.cpp +hp/hp2620.cpp +hp/hp2640.cpp +hp/hp48.cpp +hp/hp49gp.cpp +hp/hp64k.cpp +hp/hp700.cpp +hp/hp80.cpp +hp/hp95lx.cpp +hp/hp9825.cpp +hp/hp9845.cpp +hp/hp9k.cpp +hp/hp9k_3xx.cpp +hp/hp_ipc.cpp +hp/jornada.cpp +husky/hawk.cpp +husky/hunter16.cpp +husky/hunter2.cpp +husky/husky.cpp +ibm6580/ibm6580.cpp +ibmpc/sis630.cpp +ie15/ie15.cpp +imp/tim011.cpp +imp/tim100.cpp +informer/informer_207_100.cpp +informer/informer_207_376.cpp +informer/informer_213.cpp +intel/basic52.cpp +intel/imds2.cpp +intel/intellec4.cpp +intel/intellec8.cpp +intel/ipc.cpp +intel/ipds.cpp +intel/isbc.cpp +intel/isbc660.cpp +intel/isbc8010.cpp +intel/isbc8030.cpp +intel/rex6000.cpp +intel/sdk51.cpp +intel/sdk80.cpp +intel/sdk85.cpp +intel/sdk86.cpp +interpro/interpro.cpp +interton/vc4000.cpp +intv/intv.cpp +isc/compucolor.cpp +jazz/jazz.cpp +kawai/kawai_acr20.cpp +kawai/kawai_k1.cpp +kawai/kawai_k4.cpp +kawai/kawai_k5.cpp +kawai/kawai_ksp10.cpp +kawai/kawai_r100.cpp +kawai/kawai_sx240.cpp +kaypro/kaypro.cpp +koei/pasogo.cpp +kontron/kdt6.cpp +korg/korgds8.cpp +korg/korgdss1.cpp +korg/korgdvp1.cpp +korg/korgdw8k.cpp +korg/korgm1.cpp +korg/korgws.cpp +korg/korgz3.cpp +korg/microkorg.cpp +korg/poly800.cpp +korg/polysix.cpp +kurzweil/krz2000.cpp +kyber/kminus.cpp +kyocera/kyocera.cpp +labtam/labtam.cpp +leapfrog/leapfrog_iquest.cpp +leapfrog/leapfrog_leappad.cpp +leapfrog/leapfrog_leapster_explorer.cpp +leapfrog/leapster.cpp +learsiegler/adm11.cpp +learsiegler/adm23.cpp +learsiegler/adm31.cpp +learsiegler/adm36.cpp +lsi/m3.cpp +lsi/octopus.cpp +luxor/abc1600.cpp +luxor/abc80.cpp +luxor/abc80x.cpp +luxor/ds90.cpp +magnavox/odyssey2.cpp +makerbot/replicator.cpp +matsushi/duet16.cpp +matsushi/jr100.cpp +matsushi/jr200.cpp +matsushi/myb3k.cpp +mattel/aquarius.cpp +mattel/juicebox.cpp +mattel/mattelchess.cpp +mb/microvsn.cpp +mb/milton6805.cpp +mchester/ssem.cpp +memotech/mtx.cpp +mera/ec7915.cpp +mera/konin.cpp +mera/m79152pc.cpp +mera/vdm7932x.cpp +mg1/mg1.cpp +mgu/irisha.cpp +microkey/primo.cpp +microsoft/xbox.cpp +microterm/ergo201.cpp +microterm/microterm_f8.cpp +microterm/mt420.cpp +microterm/mt5510.cpp +midway/astrohome.cpp +mips/mips.cpp +misc/3do.cpp +misc/vectrex.cpp +mit/tx0.cpp +mits/altair.cpp +mits/mits680b.cpp +mitsubishi/multi16.cpp +mitsubishi/multi8.cpp +mizar/mzr8105.cpp +morrow/microdec.cpp +morrow/mpz80.cpp +morrow/tricep.cpp +mos/kim1.cpp +motorola/exorciser.cpp +motorola/m6805evs.cpp +motorola/m68705prg.cpp +motorola/mekd1.cpp +motorola/mekd2.cpp +motorola/mekd3.cpp +motorola/mekd4.cpp +motorola/mekd5.cpp +motorola/mvme147.cpp +motorola/mvme162.cpp +motorola/sys1121.cpp +motorola/uchroma68.cpp +multitch/mkit09.cpp +multitch/mpf1.cpp +mupid/mdisk.cpp +mupid/mupid2.cpp +nakajima/nakajies.cpp +nascom/nascom1.cpp +natsemi/ns32kdb.cpp +natsemi/ns5652.cpp +ncd/ncd68k.cpp +ncd/ncd88k.cpp +ncd/ncdmips.cpp +ncd/ncdppc.cpp +ne/z80ne.cpp +nec/apc.cpp +nec/ews4800.cpp +nec/pc100.cpp +nec/pc6001.cpp +nec/pc8001.cpp +nec/pc8401a.cpp +nec/pc8801.cpp +nec/pc88va.cpp +nec/pc9801.cpp +nec/pc9801_epson.cpp +nec/pc9821.cpp +nec/pc98ha.cpp +nec/pce.cpp +nec/pcfx.cpp +nec/tk80bs.cpp +neogeo/neogeocd.cpp +netronic/elf.cpp +netronic/exp85.cpp +next/next.cpp +nintendo/compmahj.cpp +nintendo/gamecube.cpp +nintendo/gb.cpp +nintendo/gba.cpp +nintendo/n64.cpp +nintendo/nds.cpp +nintendo/nes.cpp +nintendo/nes_clone.cpp +nintendo/nes_sh6578.cpp +nintendo/nes_vt02_vt03.cpp +nintendo/nes_vt09.cpp +nintendo/nes_vt32.cpp +nintendo/nes_vt369_vtunknown.cpp +nintendo/pokemini.cpp +nintendo/snes.cpp +nintendo/vboy.cpp +nintendo/vt1682.cpp +nintendo/vt_unknown.cpp +nokia/dbox.cpp +nokia/mikromik.cpp +nokia/nokia_3310.cpp +northstar/horizon.cpp +novag/novag_cexpert.cpp +novag/novag_cforte.cpp +novag/novag_const.cpp +novag/novag_diablo.cpp +novag/novag_micro.cpp +novag/novag_micro2.cpp +novag/novag_savant.cpp +novag/novag_sexpert.cpp +novag/novag_snova.cpp +novation/basssta.cpp +novation/drumsta.cpp +olivetti/m20.cpp +olivetti/m24.cpp +olivetti/olivpc1.cpp +olympia/olyboss.cpp +olympia/olytext.cpp +olympia/peoplepc.cpp +omnibyte/msbc1.cpp +omnibyte/ob68k1a.cpp +omron/luna_68k.cpp +openuni/hektor.cpp +osborne/osbexec.cpp +osborne/osborne1.cpp +osborne/vixen.cpp +osi/osi.cpp +palm/palm.cpp +palm/palmz22.cpp +parker/talkingbb.cpp +parker/talkingfb.cpp +parker/wildfire.cpp +pc/asst128.cpp +pc/compc.cpp +pc/europc.cpp +pc/genpc.cpp +pc/ibmpc.cpp +pc/ibmpcjr.cpp +pc/nforcepc.cpp +pc/pc.cpp +pc/pcipc.cpp +pc/tandy1t.cpp +pc/tosh1000.cpp +pdp1/pdp1.cpp +pel/galeb.cpp +pel/orao.cpp +philips/p2000t.cpp +philips/vg5k.cpp +philips/yes.cpp +pitronic/beta.cpp +poly/poly.cpp +poly/proteus.cpp +poly88/poly88.cpp +positron/positron.cpp +psion/psion.cpp +psion/psion5.cpp +quantel/dpb7000.cpp +quantel/harriet.cpp +qume/qvt102.cpp +qume/qvt103.cpp +qume/qvt190.cpp +qume/qvt201.cpp +qume/qvt70.cpp +radio/apogee.cpp +radio/mikrosha.cpp +radio/orion.cpp +radio/partner.cpp +radio/radio86.cpp +rca/microkit.cpp +rca/studio2.cpp +rca/vip.cpp +regnecentralen/rc702.cpp +regnecentralen/rc759.cpp +ritam/monty.cpp +rm/rm380z.cpp +rm/rmnimbus.cpp +robotron/a5105.cpp +robotron/a51xx.cpp +robotron/a7150.cpp +robotron/k1003.cpp +robotron/k8915.cpp +robotron/rt1715.cpp +robotron/z1013.cpp +robotron/z9001.cpp +rockwell/aim65.cpp +rockwell/aim65_40.cpp +roland/alphajuno.cpp +roland/boss_se70.cpp +roland/boss_sx700.cpp +roland/juno106.cpp +roland/juno6.cpp +roland/roland_cm32p.cpp +roland/roland_d10.cpp +roland/roland_d50.cpp +roland/roland_jd800.cpp +roland/roland_jv80.cpp +roland/roland_jx3p.cpp +roland/roland_jx8p.cpp +roland/roland_mc50.cpp +roland/roland_mt32.cpp +roland/roland_pr100.cpp +roland/roland_r8.cpp +roland/roland_ra30.cpp +roland/roland_s10.cpp +roland/roland_s50.cpp +roland/roland_sc55.cpp +roland/roland_sc88.cpp +roland/roland_tb303.cpp +roland/roland_tnsc1.cpp +roland/roland_tr505.cpp +roland/roland_tr606.cpp +roland/roland_tr707.cpp +roland/roland_tr808.cpp +roland/roland_tr909.cpp +roland/roland_u20.cpp +rolm/r9751.cpp +rtpc/rtpc.cpp +sage/sage2.cpp +saitek/saitek_ccompan.cpp +saitek/saitek_chesstrv.cpp +saitek/saitek_corona.cpp +saitek/saitek_cp2000.cpp +saitek/saitek_delta1.cpp +saitek/saitek_exchess.cpp +saitek/saitek_intchess.cpp +saitek/saitek_leonardo.cpp +saitek/saitek_mark5.cpp +saitek/saitek_minichess.cpp +saitek/saitek_prschess.cpp +saitek/saitek_renaissance.cpp +saitek/saitek_risc2500.cpp +saitek/saitek_schess.cpp +saitek/saitek_simultano.cpp +saitek/saitek_ssystem3.cpp +saitek/saitek_stratos.cpp +saitek/saitek_superstar.cpp +samcoupe/samcoupe.cpp +samsung/spc1000.cpp +samsung/spc1500.cpp +sanyo/mbc200.cpp +sanyo/mbc55x.cpp +sanyo/phc25.cpp +saturn/st17xx.cpp +sega/saturn.cpp +sega/sms.cpp +segacons/dccons.cpp +segacons/mdconsole.cpp +segacons/megadriv_rad.cpp +segacons/megadriv_sunplus_hybrid.cpp +segacons/megadriv_vt_hybrid.cpp +segacons/sega_beena.cpp +segacons/sega_sawatte.cpp +segacons/segapico.cpp +segacons/segapm.cpp +segacons/sg1000.cpp +segacons/svmu.cpp +selchow/scrablex.cpp +sequential/prophet600.cpp +sgi/4dpi.cpp +sgi/crimson.cpp +sgi/indigo.cpp +sgi/indy_indigo2.cpp +sgi/iris3130.cpp +sgi/iris_power.cpp +sgi/o2.cpp +sgi/octane.cpp +sharp/fontwriter.cpp +sharp/mz2000.cpp +sharp/mz2500.cpp +sharp/mz3500.cpp +sharp/mz6500.cpp +sharp/mz700.cpp +sharp/mz80.cpp +sharp/pc1500.cpp +sharp/pce220.cpp +sharp/pocketc.cpp +sharp/wizard.cpp +sharp/x1.cpp +sharp/x1twin.cpp +sharp/x68k.cpp +sharp/zaurus.cpp +siemens/bitel.cpp +siemens/pcd.cpp +siemens/pcmx2.cpp +siemens/pg685.cpp +sinclair/atm.cpp +sinclair/elwro800.cpp +sinclair/pentagon.cpp +sinclair/ql.cpp +sinclair/scorpion.cpp +sinclair/spec128.cpp +sinclair/specpls3.cpp +sinclair/spectrum.cpp +sinclair/timex.cpp +sinclair/tsconf.cpp +sinclair/zx.cpp +skeleton/aaa.cpp +skeleton/acd.cpp +skeleton/aceex.cpp +skeleton/adacp150.cpp +skeleton/adds2020.cpp +skeleton/aid80f.cpp +skeleton/airbase99.cpp +skeleton/alcat7100.cpp +skeleton/alesis_qs.cpp +skeleton/alfaskop41xx.cpp +skeleton/alphasma.cpp +skeleton/alphasma3k.cpp +skeleton/am1000.cpp +skeleton/ampex.cpp +skeleton/ampex210.cpp +skeleton/ampscarp.cpp +skeleton/amust.cpp +skeleton/anzterm.cpp +skeleton/applix.cpp +skeleton/argox.cpp +skeleton/attache.cpp +skeleton/aussiebyte.cpp +skeleton/ax20.cpp +skeleton/basf7100.cpp +skeleton/bert.cpp +skeleton/binbug.cpp +skeleton/bitgraph.cpp +skeleton/blit.cpp +skeleton/blw700i.cpp +skeleton/bpmmicro.cpp +skeleton/br8641.cpp +skeleton/busicom.cpp +skeleton/c2color.cpp +skeleton/candela.cpp +skeleton/cardinal.cpp +skeleton/cbnt2039.cpp +skeleton/cd100.cpp +skeleton/cd2650.cpp +skeleton/cdc721.cpp +skeleton/cdsys5.cpp +skeleton/chaos.cpp +skeleton/cit1500.cpp +skeleton/ckz80.cpp +skeleton/clxvme186.cpp +skeleton/codata.cpp +skeleton/consola_emt.cpp +skeleton/controlid.cpp +skeleton/cortex.cpp +skeleton/cosmicos.cpp +skeleton/cp1.cpp +skeleton/cxhumax.cpp +skeleton/d400.cpp +skeleton/d6800.cpp +skeleton/d6809.cpp +skeleton/daruma.cpp +skeleton/datacast.cpp +skeleton/design.cpp +skeleton/dg680.cpp +skeleton/diablo1300.cpp +skeleton/didact.cpp +skeleton/digel804.cpp +skeleton/digijet.cpp +skeleton/digilog320.cpp +skeleton/digilog400.cpp +skeleton/dim68k.cpp +skeleton/dm7000.cpp +skeleton/dmax8000.cpp +skeleton/dmv.cpp +skeleton/dps1.cpp +skeleton/dsb46.cpp +skeleton/dual68.cpp +skeleton/e100.cpp +skeleton/eacc.cpp +skeleton/easy_karaoke.cpp +skeleton/elzet80.cpp +skeleton/epic14e.cpp +skeleton/esprit.cpp +skeleton/eti660.cpp +skeleton/eurit.cpp +skeleton/eurocom2.cpp +skeleton/excali64.cpp +skeleton/facit4440.cpp +skeleton/fanucs15.cpp +skeleton/fanucspmg.cpp +skeleton/fc100.cpp +skeleton/fk1.cpp +skeleton/freedom120.cpp +skeleton/fs3216.cpp +skeleton/ft68m.cpp +skeleton/gameking.cpp +skeleton/gem_rp.cpp +skeleton/gigatron.cpp +skeleton/gimix.cpp +skeleton/gm1000.cpp +skeleton/gnat10.cpp +skeleton/goupil.cpp +skeleton/grfd2301.cpp +skeleton/gs6502.cpp +skeleton/gs6809.cpp +skeleton/gscpm.cpp +skeleton/gsz80.cpp +skeleton/hazeltin.cpp +skeleton/hazl1420.cpp +skeleton/hohnadam.cpp +skeleton/hp3478a.cpp +skeleton/hprot1.cpp +skeleton/hpz80unk.cpp +skeleton/ht68k.cpp +skeleton/i7000.cpp +skeleton/ibm3153.cpp +skeleton/icatel.cpp +skeleton/icebox.cpp +skeleton/iez80.cpp +skeleton/if800.cpp +skeleton/ikt5a.cpp +skeleton/imsai.cpp +skeleton/indiana.cpp +skeleton/is48x.cpp +skeleton/itc4.cpp +skeleton/itt1700.cpp +skeleton/itt3030.cpp +skeleton/itt9216.cpp +skeleton/jade.cpp +skeleton/jonos.cpp +skeleton/juku.cpp +skeleton/junior80.cpp +skeleton/kron.cpp +skeleton/learnwin.cpp +skeleton/lee1214.cpp +skeleton/lee1220.cpp +skeleton/lft.cpp +skeleton/lg-dvd.cpp +skeleton/lilith.cpp +skeleton/lk3000.cpp +skeleton/lms46.cpp +skeleton/lola8a.cpp +skeleton/mccpm.cpp +skeleton/mes.cpp +skeleton/mfabfz.cpp +skeleton/mice.cpp +skeleton/micral.cpp +skeleton/micro20.cpp +skeleton/micromon.cpp +skeleton/micronic.cpp +skeleton/mightyframe.cpp +skeleton/milwaukee.cpp +skeleton/mindset.cpp +skeleton/mini2440.cpp +skeleton/miniframe.cpp +skeleton/minitel_2_rpic.cpp +skeleton/miuchiz.cpp +skeleton/ml20.cpp +skeleton/mmd1.cpp +skeleton/mmd2.cpp +skeleton/mod8.cpp +skeleton/modellot.cpp +skeleton/molecular.cpp +skeleton/monon_color.cpp +skeleton/ms0515.cpp +skeleton/ms9540.cpp +skeleton/mstation.cpp +skeleton/mt735.cpp +skeleton/mtd1256.cpp +skeleton/mw4pole.cpp +skeleton/mx2178.cpp +skeleton/mycom.cpp +skeleton/myvision.cpp +skeleton/newton.cpp +skeleton/ngen.cpp +skeleton/notetaker.cpp +skeleton/onyx.cpp +skeleton/p8k.cpp +skeleton/palestra.cpp +skeleton/pdt3100.cpp +skeleton/pegasus.cpp +skeleton/pencil2.cpp +skeleton/perq.cpp +skeleton/pes.cpp +skeleton/philipsbo.cpp +skeleton/picno.cpp +skeleton/pipbug.cpp +skeleton/plan80.cpp +skeleton/pm68k.cpp +skeleton/pockchal.cpp +skeleton/powerstack.cpp +skeleton/proteus3.cpp +skeleton/pt68k4.cpp +skeleton/ptcsol.cpp +skeleton/pulsar.cpp +skeleton/pv9234.cpp +skeleton/pwp14.cpp +skeleton/qtsbc.cpp +skeleton/rc2014.cpp +skeleton/rd100.cpp +skeleton/rvoice.cpp +skeleton/sacstate.cpp +skeleton/sansa_fuze.cpp +skeleton/sartorius.cpp +skeleton/sb180.cpp +skeleton/sb8085.cpp +skeleton/sbrain.cpp +skeleton/scopus.cpp +skeleton/seattlecmp.cpp +skeleton/sh4robot.cpp +skeleton/shine.cpp +skeleton/si5500.cpp +skeleton/sk101bl.cpp +skeleton/slsstars.cpp +skeleton/softbox.cpp +skeleton/solbourne.cpp +skeleton/squale.cpp +skeleton/swyft.cpp +skeleton/symbolics.cpp +skeleton/synthex.cpp +skeleton/sys2900.cpp +skeleton/sys9002.cpp +skeleton/systec.cpp +skeleton/systel1.cpp +skeleton/tavernie.cpp +skeleton/tecnbras.cpp +skeleton/teleray10.cpp +skeleton/telex1192.cpp +skeleton/telex274.cpp +skeleton/telex277d.cpp +skeleton/terak.cpp +skeleton/terco.cpp +skeleton/terminal.cpp +skeleton/testpat.cpp +skeleton/textelcomp.cpp +skeleton/ti630.cpp +skeleton/tk635.cpp +skeleton/tr175.cpp +skeleton/trs80dt1.cpp +skeleton/tsispch.cpp +skeleton/tulip1.cpp +skeleton/ultim809.cpp +skeleton/unistar.cpp +skeleton/v6809.cpp +skeleton/vanguardmk1.cpp +skeleton/vd56sp.cpp +skeleton/vector4.cpp +skeleton/vectrix.cpp +skeleton/vp415.cpp +skeleton/vp60.cpp +skeleton/vsmilepro.cpp +skeleton/wicat.cpp +skeleton/xbase09.cpp +skeleton/xor100.cpp +skeleton/zeebo_qualcomm_adreno130.cpp +skeleton/zms8085.cpp +skeleton/zorba.cpp +skeleton/zt8802.cpp +slicer/slicer.cpp +snk/ngp.cpp +sony/betacam.cpp +sony/bvm.cpp +sony/dfs500.cpp +sony/dpsv55.cpp +sony/pockstat.cpp +sony/ps2sony.cpp +sony/psx.cpp +sony/pve500.cpp +sony/smc777.cpp +sony/umatic.cpp +sony_news/news_38xx.cpp +sony_news/news_68k.cpp +sony_news/news_r3k.cpp +sord/m5.cpp +special/special.cpp +stm/pp.cpp +sun/sun1.cpp +sun/sun2.cpp +sun/sun3.cpp +sun/sun3x.cpp +sun/sun4.cpp +svi/svi318.cpp +svision/svision.cpp +swtpc/swtpc.cpp +swtpc/swtpc09.cpp +swtpc/swtpc8212.cpp +synertek/ktm3.cpp +synertek/mbc020.cpp +synertek/sym1.cpp +ta/alphatpc16.cpp +ta/alphatpx.cpp +ta/alphatro.cpp +tab/tabe22.cpp +tandberg/tdv2324.cpp +tangerin/alphatan.cpp +tangerin/hhtiger.cpp +tangerin/microtan.cpp +tangerin/oric.cpp +tasc/tasc.cpp +tatung/einstein.cpp +teamconc/comquest.cpp +tectoy/pensebem.cpp +tektroni/tek405x.cpp +tektroni/tek410x.cpp +tektroni/tek43xx.cpp +tektroni/tek440x.cpp +tektroni/tekigw.cpp +tektroni/tekxp33x.cpp +telenova/compis.cpp +telercas/tmc1800.cpp +telercas/tmc2000e.cpp +telercas/tmc600.cpp +televideo/ts3000.cpp +televideo/ts802.cpp +televideo/ts803.cpp +televideo/ts816.cpp +televideo/tv910.cpp +televideo/tv912.cpp +televideo/tv924.cpp +televideo/tv950.cpp +televideo/tv955.cpp +televideo/tv965.cpp +televideo/tv990.cpp +tesla/ondra.cpp +tesla/pmd85.cpp +tesla/pmi80.cpp +tesla/sapi1.cpp +thomson/thomson.cpp +ti/avigo.cpp +ti/cc40.cpp +ti/evmbug.cpp +ti/exelv.cpp +ti/geneve.cpp +ti/ti74.cpp +ti/ti85.cpp +ti/ti89.cpp +ti/ti931.cpp +ti/ti990_10.cpp +ti/ti990_4.cpp +ti/ti99_2.cpp +ti/ti99_4p.cpp +ti/ti99_4x.cpp +ti/ti99_8.cpp +ti/tm990189.cpp +tiger/gamecom.cpp +tiger/k28.cpp +tigertel/gizmondo.cpp +tiki/tiki100.cpp +tomy/tomy_princ.cpp +tomy/tutor.cpp +toshiba/paso1600.cpp +toshiba/pasopia.cpp +toshiba/pasopia7.cpp +trainer/amico2k.cpp +trainer/babbage.cpp +trainer/bob85.cpp +trainer/crei680.cpp +trainer/cvicny.cpp +trainer/datum.cpp +trainer/dolphunk.cpp +trainer/emma2.cpp +trainer/instruct.cpp +trainer/mk14.cpp +trainer/pro80.cpp +trainer/savia84.cpp +trainer/selz80.cpp +trainer/tec1.cpp +trainer/tk80.cpp +trainer/zapcomputer.cpp +trs/coco12.cpp +trs/coco3.cpp +trs/dgn_beta.cpp +trs/dragon.cpp +trs/lnw80.cpp +trs/max80.cpp +trs/mc10.cpp +trs/meritum.cpp +trs/radionic.cpp +trs/tandy2k.cpp +trs/trs80.cpp +trs/trs80m2.cpp +trs/trs80m3.cpp +trs/vis.cpp +tvgames/actions_atj2279b.cpp +tvgames/elan_ep3a19a.cpp +tvgames/elan_eu3a05.cpp +tvgames/elan_eu3a14.cpp +tvgames/generalplus_gpl16250_mobigo.cpp +tvgames/generalplus_gpl16250_nand.cpp +tvgames/generalplus_gpl16250_rom.cpp +tvgames/generalplus_gpl16250_romram.cpp +tvgames/generalplus_gpl16250_spi.cpp +tvgames/generalplus_gpl16250_spi_direct.cpp +tvgames/generalplus_gpl162xx_lcdtype.cpp +tvgames/generalplus_gpl32612.cpp +tvgames/generalplus_gpl_unknown.cpp +tvgames/magiceyes_pollux_vr3520f.cpp +tvgames/monkey_king_3b.cpp +tvgames/pubint_storyreader.cpp +tvgames/spg110.cpp +tvgames/spg29x.cpp +tvgames/spg29x_lexibook_jg7425.cpp +tvgames/spg2xx.cpp +tvgames/spg2xx_digimake.cpp +tvgames/spg2xx_dreamlife.cpp +tvgames/spg2xx_ican.cpp +tvgames/spg2xx_jakks.cpp +tvgames/spg2xx_jakks_gkr.cpp +tvgames/spg2xx_jakks_sharp.cpp +tvgames/spg2xx_jakks_tvtouch.cpp +tvgames/spg2xx_lexibook.cpp +tvgames/spg2xx_mysprtch.cpp +tvgames/spg2xx_pdc.cpp +tvgames/spg2xx_playvision.cpp +tvgames/spg2xx_senario.cpp +tvgames/spg2xx_senario_poker.cpp +tvgames/spg2xx_senca.cpp +tvgames/spg2xx_shredmjr.cpp +tvgames/spg2xx_skannerztv.cpp +tvgames/spg2xx_smarttv.cpp +tvgames/spg2xx_telestory.cpp +tvgames/spg2xx_tvgogo.cpp +tvgames/spg2xx_vii.cpp +tvgames/spg2xx_wiwi.cpp +tvgames/spg2xx_zone.cpp +tvgames/st2302u_bbl_rom.cpp +tvgames/st2302u_bbl_spi.cpp +tvgames/titan_soc.cpp +tvgames/trkfldch.cpp +tvgames/tvgame.cpp +tvgames/xavix.cpp +tvgames/xavix2.cpp +tvgames/xavix_2000.cpp +tvgames/xavix_2002.cpp +ultimachine/rambo.cpp +ultratec/minicom.cpp +unicard/bbcbc.cpp +unisonic/unichamp.cpp +unisys/univac.cpp +usp/patinho_feio.cpp +veb/chessmst.cpp +veb/chessmstdm.cpp +veb/kc.cpp +veb/lc80.cpp +veb/mc8020.cpp +veb/mc8030.cpp +veb/poly880.cpp +veb/sc2.cpp +verifone/tranz330.cpp +vidbrain/vidbrain.cpp +videoton/tvc.cpp +virtual/ldplayer.cpp +virtual/vgmplay.cpp +virtual/wavesynth.cpp +visual/v100.cpp +visual/v102.cpp +visual/v1050.cpp +visual/v550.cpp +votrax/votrhv.cpp +votrax/votrpss.cpp +votrax/votrtnt.cpp +vtech/clickstart.cpp +vtech/crvision.cpp +vtech/gamemachine.cpp +vtech/geniusiq.cpp +vtech/geniusjr.cpp +vtech/gkidabc.cpp +vtech/glcx.cpp +vtech/innotv_innotabmax.cpp +vtech/inteladv.cpp +vtech/iqunlim.cpp +vtech/laser3k.cpp +vtech/lcmate2.cpp +vtech/pc2000.cpp +vtech/pc4.cpp +vtech/prestige.cpp +vtech/socrates.cpp +vtech/storio.cpp +vtech/vsmile.cpp +vtech/vsmileb.cpp +vtech/vtech1.cpp +vtech/vtech2.cpp +vtech/vtech_eu3a12.cpp +vtech/vtech_innotab.cpp +wang/wangpc.cpp +wavemate/bullet.cpp +wavemate/jupiter.cpp +westinghouse/testconsole.cpp +wyse/wy100.cpp +wyse/wy150.cpp +wyse/wy30p.cpp +wyse/wy50.cpp +wyse/wy55.cpp +wyse/wy60.cpp +wyse/wy85.cpp +xerox/alto1.cpp +xerox/alto2.cpp +xerox/bigbord2.cpp +xerox/xerox820.cpp +xussrpc/ec184x.cpp +xussrpc/iskr103x.cpp +xussrpc/mc1502.cpp +xussrpc/poisk1.cpp +yamaha/fb01.cpp +yamaha/tg100.cpp +yamaha/yman1x.cpp +yamaha/ymdx100.cpp +yamaha/ymdx11.cpp +yamaha/ymmu100.cpp +yamaha/ymmu5.cpp +yamaha/ymmu50.cpp +yamaha/ymmu80.cpp +yamaha/ympsr16.cpp +yamaha/ympsr340.cpp +yamaha/ympsr40.cpp +yamaha/ympsr60.cpp +yamaha/ymqy70.cpp +yamaha/ymrx15.cpp +yamaha/ymsy35.cpp +yamaha/ymtx81z.cpp +yamaha/ymvl70.cpp +zenith/mdt60.cpp +zenith/z100.cpp +zenith/z22.cpp +zenith/z29.cpp +zpa/iq151.cpp +zvt/pp01.cpp + //exceptions + to add - to remove from imported list -//3do.cpp + +//misc/3do.cpp -3dobios -orbatak -alg3do -md23do -sht3do -//cps1.cpp + +//capcom/cps1.cpp +wofch +sfzch +sfach +sfzbch -//cdi.cpp + +//misc/cdi.cpp +cdimono1 +cdimono2 +cdi910 +cdi490a -//jaguar.cpp + +//atari/jaguar.cpp +jaguar +jaguarcd -//neogeo.cpp + +//neogeo/neogeo.cpp +aes + //sis630 -gamecst2 -gamecstl -//vectrex.cpp + +//misc/vectrex.cpp -raaspec diff --git a/src/mame/messshared/crt.cpp b/src/mame/messshared/crt.cpp deleted file mode 100644 index d8ee79d1bde..00000000000 --- a/src/mame/messshared/crt.cpp +++ /dev/null @@ -1,181 +0,0 @@ -// license:GPL-2.0+ -// copyright-holders:Raphael Nabet -/* - video/crt.c - - CRT video emulation for TX-0 and PDP-1. - - -Theory of operation: - - What makes such CRT devices so odd is that there is no video processor, no - scan logic, no refresh logic. The beam position and intensity is - controlled by the program completely: in order to draw an object, the - program must direct the beam to each point of the object, and in order to - refresh it, the program must redraw the object periodically. - - Since the refresh rates are highly variable (completely controlled by the - program), I need to simulate CRT remanence: the intensity of each pixel on - display decreases regularly. In order to keep this efficient, I keep a - list of non-black pixels, and only process these pixels on each refresh. - In order to improve efficiency further, I keep a distinct list for each - line of the display: I have found that it improves drawing speed slightly - (probably because it improves the cache hit rate). - - - Raphael Nabet 2002-2004 - Based on earlier work by Chris Salomon -*/ - -#include "emu.h" -#include "video/crt.h" - - -// special value that tells that the node is not in list -enum -{ - intensity_pixel_not_in_list = -1 -}; - - -// device type definition -DEFINE_DEVICE_TYPE(CRT, crt_device, "crt", "CRT Video") - -//************************************************************************** -// LIVE DEVICE -//************************************************************************** - -//------------------------------------------------- -// crt_device - constructor -//------------------------------------------------- - -crt_device::crt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, CRT, tag, owner, clock), - m_list(nullptr), - m_list_head(nullptr), - m_decay_counter(0), - m_num_intensity_levels(0), - m_window_offset_x(0), - m_window_offset_y(0), - m_window_width(0), - m_window_height(0) -{ -} - - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void crt_device::device_start() -{ - /* alloc the arrays */ - m_list = std::make_unique(m_window_width * m_window_height); - m_list_head = std::make_unique(m_window_height); - - /* fill with black and set up list as empty */ - for (int i = 0; i < (m_window_width * m_window_height); i++) - m_list[i].intensity = intensity_pixel_not_in_list; - - for (int i = 0; i < m_window_height; i++) - m_list_head[i] = -1; - - m_decay_counter = 0; -} - - -// -// crt_plot -// -// schedule a pixel to be plotted -// -void crt_device::plot(int x, int y) -{ - crt_point *node; - int list_index; - - /* compute pixel coordinates */ - if (x<0) x=0; - if (y<0) y=0; - if ((x>(m_window_width-1)) || ((y>m_window_height-1))) - return; - y = (m_window_height-1) - y; - - /* find entry in list */ - list_index = x + y*m_window_width; - - node = &m_list[list_index]; - - if (node->intensity == intensity_pixel_not_in_list) - { /* insert node in list if it is not in it */ - node->next = m_list_head[y]; - m_list_head[y] = list_index; - } - /* set intensity */ - node->intensity = m_num_intensity_levels; -} - - -// -// crt_eof -// -// keep track of time -// -void crt_device::eof() -{ - m_decay_counter++; -} - - -// -// crt_update -// -// update the bitmap -// -void crt_device::update(bitmap_ind16 &bitmap) -{ - //if (m_decay_counter) - { - /* some time has elapsed: let's update the screen */ - for (int y=0; yintensity == m_num_intensity_levels) - /* new pixel: set to max intensity */ - node->intensity = m_num_intensity_levels-1; - else - { - /* otherwise, apply intensity decay */ - node->intensity -= m_decay_counter; - if (node->intensity < 0) - node->intensity = 0; - } - - /* draw pixel on screen */ - //plot_pixel(bitmap, x, y+m_window_offset_y, node->intensity); - line[x] = node->intensity; - - if (node->intensity != 0) - p_i = i; /* current node will be next iteration's previous node */ - else - { /* delete current node */ - node->intensity = intensity_pixel_not_in_list; - if (p_i != -1) - m_list[p_i].next = node->next; - else - m_list_head[y] = node->next; - } - } - } - - m_decay_counter = 0; - } -} diff --git a/src/mame/messshared/crt.h b/src/mame/messshared/crt.h deleted file mode 100644 index bf4c94fd0d5..00000000000 --- a/src/mame/messshared/crt.h +++ /dev/null @@ -1,76 +0,0 @@ -// license:GPL-2.0+ -// copyright-holders:Raphael Nabet -/************************************************************************* - - video/crt.h - - CRT video emulation for TX-0 and PDP-1 - -*************************************************************************/ - -#ifndef MAME_VIDEO_CRT_H -#define MAME_VIDEO_CRT_H - -#pragma once - - -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - -// ======================> crt_device - -class crt_device : public device_t -{ -public: - crt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - void set_num_levels(int levels) { m_num_intensity_levels = levels; } - void set_offsets(int x_offset, int y_offset) - { - m_window_offset_x = x_offset; - m_window_offset_y = y_offset; - } - void set_size(int width, int height) - { - m_window_width = width; - m_window_height = height; - } - - void plot(int x, int y); - void eof(); - void update(bitmap_ind16 &bitmap); - -protected: - // device-level overrides - virtual void device_start() override; - -private: - struct crt_point - { - crt_point() { } - - int intensity = 0; /* current intensity of the pixel */ - /* a node is not in the list when (intensity == -1) */ - int next = 0; /* index of next pixel in list */ - }; - - std::unique_ptr m_list; /* array of (crt_window_width*crt_window_height) point */ - std::unique_ptr m_list_head; /* head of the list of lit pixels (index in the array) */ - /* keep a separate list for each display line (makes the video code slightly faster) */ - - int m_decay_counter; /* incremented each frame (tells for how many frames the CRT has decayed between two screen refresh) */ - - /* CRT window */ - int m_num_intensity_levels; - int m_window_offset_x; - int m_window_offset_y; - int m_window_width; - int m_window_height; -}; - -DECLARE_DEVICE_TYPE(CRT, crt_device) - - - -#endif // MAME_VIDEO_CRT_H diff --git a/src/mame/messshared/mega32x.cpp b/src/mame/messshared/mega32x.cpp index bf741a87502..fdbf96179d6 100644 --- a/src/mame/messshared/mega32x.cpp +++ b/src/mame/messshared/mega32x.cpp @@ -189,7 +189,7 @@ GFX check (these don't explicitly fails): */ #include "emu.h" -#include "machine/mega32x.h" +#include "mega32x.h" #include "machine/timer.h" diff --git a/src/mame/messshared/megacdcd.cpp b/src/mame/messshared/megacdcd.cpp index 5f1a07bbc86..22759b96a3a 100644 --- a/src/mame/messshared/megacdcd.cpp +++ b/src/mame/messshared/megacdcd.cpp @@ -8,7 +8,7 @@ #include "emu.h" -#include "machine/megacdcd.h" +#include "megacdcd.h" #define READ_MAIN (0x0200) #define READ_SUB (0x0300) diff --git a/src/mame/messshared/mitcrt.cpp b/src/mame/messshared/mitcrt.cpp new file mode 100644 index 00000000000..30037934a4c --- /dev/null +++ b/src/mame/messshared/mitcrt.cpp @@ -0,0 +1,181 @@ +// license:GPL-2.0+ +// copyright-holders:Raphael Nabet +/* + video/crt.c + + CRT video emulation for TX-0 and PDP-1. + + +Theory of operation: + + What makes such CRT devices so odd is that there is no video processor, no + scan logic, no refresh logic. The beam position and intensity is + controlled by the program completely: in order to draw an object, the + program must direct the beam to each point of the object, and in order to + refresh it, the program must redraw the object periodically. + + Since the refresh rates are highly variable (completely controlled by the + program), I need to simulate CRT remanence: the intensity of each pixel on + display decreases regularly. In order to keep this efficient, I keep a + list of non-black pixels, and only process these pixels on each refresh. + In order to improve efficiency further, I keep a distinct list for each + line of the display: I have found that it improves drawing speed slightly + (probably because it improves the cache hit rate). + + + Raphael Nabet 2002-2004 + Based on earlier work by Chris Salomon +*/ + +#include "emu.h" +#include "mitcrt.h" + + +// special value that tells that the node is not in list +enum +{ + intensity_pixel_not_in_list = -1 +}; + + +// device type definition +DEFINE_DEVICE_TYPE(CRT, crt_device, "crt", "CRT Video") + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// crt_device - constructor +//------------------------------------------------- + +crt_device::crt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, CRT, tag, owner, clock), + m_list(nullptr), + m_list_head(nullptr), + m_decay_counter(0), + m_num_intensity_levels(0), + m_window_offset_x(0), + m_window_offset_y(0), + m_window_width(0), + m_window_height(0) +{ +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void crt_device::device_start() +{ + /* alloc the arrays */ + m_list = std::make_unique(m_window_width * m_window_height); + m_list_head = std::make_unique(m_window_height); + + /* fill with black and set up list as empty */ + for (int i = 0; i < (m_window_width * m_window_height); i++) + m_list[i].intensity = intensity_pixel_not_in_list; + + for (int i = 0; i < m_window_height; i++) + m_list_head[i] = -1; + + m_decay_counter = 0; +} + + +// +// crt_plot +// +// schedule a pixel to be plotted +// +void crt_device::plot(int x, int y) +{ + crt_point *node; + int list_index; + + /* compute pixel coordinates */ + if (x<0) x=0; + if (y<0) y=0; + if ((x>(m_window_width-1)) || ((y>m_window_height-1))) + return; + y = (m_window_height-1) - y; + + /* find entry in list */ + list_index = x + y*m_window_width; + + node = &m_list[list_index]; + + if (node->intensity == intensity_pixel_not_in_list) + { /* insert node in list if it is not in it */ + node->next = m_list_head[y]; + m_list_head[y] = list_index; + } + /* set intensity */ + node->intensity = m_num_intensity_levels; +} + + +// +// crt_eof +// +// keep track of time +// +void crt_device::eof() +{ + m_decay_counter++; +} + + +// +// crt_update +// +// update the bitmap +// +void crt_device::update(bitmap_ind16 &bitmap) +{ + //if (m_decay_counter) + { + /* some time has elapsed: let's update the screen */ + for (int y=0; yintensity == m_num_intensity_levels) + /* new pixel: set to max intensity */ + node->intensity = m_num_intensity_levels-1; + else + { + /* otherwise, apply intensity decay */ + node->intensity -= m_decay_counter; + if (node->intensity < 0) + node->intensity = 0; + } + + /* draw pixel on screen */ + //plot_pixel(bitmap, x, y+m_window_offset_y, node->intensity); + line[x] = node->intensity; + + if (node->intensity != 0) + p_i = i; /* current node will be next iteration's previous node */ + else + { /* delete current node */ + node->intensity = intensity_pixel_not_in_list; + if (p_i != -1) + m_list[p_i].next = node->next; + else + m_list_head[y] = node->next; + } + } + } + + m_decay_counter = 0; + } +} diff --git a/src/mame/messshared/mitcrt.h b/src/mame/messshared/mitcrt.h new file mode 100644 index 00000000000..bf4c94fd0d5 --- /dev/null +++ b/src/mame/messshared/mitcrt.h @@ -0,0 +1,76 @@ +// license:GPL-2.0+ +// copyright-holders:Raphael Nabet +/************************************************************************* + + video/crt.h + + CRT video emulation for TX-0 and PDP-1 + +*************************************************************************/ + +#ifndef MAME_VIDEO_CRT_H +#define MAME_VIDEO_CRT_H + +#pragma once + + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +// ======================> crt_device + +class crt_device : public device_t +{ +public: + crt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + void set_num_levels(int levels) { m_num_intensity_levels = levels; } + void set_offsets(int x_offset, int y_offset) + { + m_window_offset_x = x_offset; + m_window_offset_y = y_offset; + } + void set_size(int width, int height) + { + m_window_width = width; + m_window_height = height; + } + + void plot(int x, int y); + void eof(); + void update(bitmap_ind16 &bitmap); + +protected: + // device-level overrides + virtual void device_start() override; + +private: + struct crt_point + { + crt_point() { } + + int intensity = 0; /* current intensity of the pixel */ + /* a node is not in the list when (intensity == -1) */ + int next = 0; /* index of next pixel in list */ + }; + + std::unique_ptr m_list; /* array of (crt_window_width*crt_window_height) point */ + std::unique_ptr m_list_head; /* head of the list of lit pixels (index in the array) */ + /* keep a separate list for each display line (makes the video code slightly faster) */ + + int m_decay_counter; /* incremented each frame (tells for how many frames the CRT has decayed between two screen refresh) */ + + /* CRT window */ + int m_num_intensity_levels; + int m_window_offset_x; + int m_window_offset_y; + int m_window_width; + int m_window_height; +}; + +DECLARE_DEVICE_TYPE(CRT, crt_device) + + + +#endif // MAME_VIDEO_CRT_H diff --git a/src/mame/messshared/vboy_a.cpp b/src/mame/messshared/vboy_a.cpp deleted file mode 100644 index cbbac32c88a..00000000000 --- a/src/mame/messshared/vboy_a.cpp +++ /dev/null @@ -1,501 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:R. Belmont -/* - vboy.c - Virtual Boy audio emulation - - By Richard Bannister and Gil Pedersen. - MAME device adaptation by R. Belmont -*/ - -#include "emu.h" -#include "vboy.h" - -// device type definition -DEFINE_DEVICE_TYPE(VBOYSND, vboysnd_device, "vboysnd", "Virtual Boy Audio") - -//#define LAME_COMPILER_BUG - -#define SxINT 0x00 -#define SxLRV 0x04 -#define SxFQL 0x08 -#define SxFQH 0x0c -#define SxEV0 0x10 -#define SxEV1 0x14 -#define SxRAM 0x18 - -#define SxINTb 0x400+SxINT -#define SxLRVb 0x400+SxLRV -#define SxFQLb 0x400+SxFQL -#define SxFQHb 0x400+SxFQH -#define SxEV0b 0x400+SxEV0 -#define SxEV1b 0x400+SxEV1 -#define SxRAMb 0x400+SxRAM - -#define S5SWP 0x51c -#define SST0P 0x580 - -static const uint16_t outTbl[64][32] = { - { 0x0000, 0xffe0, 0xffc0, 0xffa0, 0xff80, 0xff60, 0xff40, 0xff20, 0xff00, 0xfee0, 0xfec0, 0xfea0, 0xfe80, 0xfe60, 0xfe40, 0xfe20, - 0xfe00, 0xfde0, 0xfdc0, 0xfda0, 0xfd80, 0xfd60, 0xfd40, 0xfd20, 0xfd00, 0xfce0, 0xfcc0, 0xfca0, 0xfc80, 0xfc60, 0xfc40, 0xfc20}, - { 0x0000, 0xffe1, 0xffc2, 0xffa3, 0xff84, 0xff65, 0xff46, 0xff27, 0xff08, 0xfee9, 0xfeca, 0xfeab, 0xfe8c, 0xfe6d, 0xfe4e, 0xfe2f, - 0xfe10, 0xfdf1, 0xfdd2, 0xfdb3, 0xfd94, 0xfd75, 0xfd56, 0xfd37, 0xfd18, 0xfcf9, 0xfcda, 0xfcbb, 0xfc9c, 0xfc7d, 0xfc5e, 0xfc3f}, - { 0x0000, 0xffe2, 0xffc4, 0xffa6, 0xff88, 0xff6a, 0xff4c, 0xff2e, 0xff10, 0xfef2, 0xfed4, 0xfeb6, 0xfe98, 0xfe7a, 0xfe5c, 0xfe3e, - 0xfe20, 0xfe02, 0xfde4, 0xfdc6, 0xfda8, 0xfd8a, 0xfd6c, 0xfd4e, 0xfd30, 0xfd12, 0xfcf4, 0xfcd6, 0xfcb8, 0xfc9a, 0xfc7c, 0xfc5e}, - { 0x0000, 0xffe3, 0xffc6, 0xffa9, 0xff8c, 0xff6f, 0xff52, 0xff35, 0xff18, 0xfefb, 0xfede, 0xfec1, 0xfea4, 0xfe87, 0xfe6a, 0xfe4d, - 0xfe30, 0xfe13, 0xfdf6, 0xfdd9, 0xfdbc, 0xfd9f, 0xfd82, 0xfd65, 0xfd48, 0xfd2b, 0xfd0e, 0xfcf1, 0xfcd4, 0xfcb7, 0xfc9a, 0xfc7d}, - { 0x0000, 0xffe4, 0xffc8, 0xffac, 0xff90, 0xff74, 0xff58, 0xff3c, 0xff20, 0xff04, 0xfee8, 0xfecc, 0xfeb0, 0xfe94, 0xfe78, 0xfe5c, - 0xfe40, 0xfe24, 0xfe08, 0xfdec, 0xfdd0, 0xfdb4, 0xfd98, 0xfd7c, 0xfd60, 0xfd44, 0xfd28, 0xfd0c, 0xfcf0, 0xfcd4, 0xfcb8, 0xfc9c}, - { 0x0000, 0xffe5, 0xffca, 0xffaf, 0xff94, 0xff79, 0xff5e, 0xff43, 0xff28, 0xff0d, 0xfef2, 0xfed7, 0xfebc, 0xfea1, 0xfe86, 0xfe6b, - 0xfe50, 0xfe35, 0xfe1a, 0xfdff, 0xfde4, 0xfdc9, 0xfdae, 0xfd93, 0xfd78, 0xfd5d, 0xfd42, 0xfd27, 0xfd0c, 0xfcf1, 0xfcd6, 0xfcbb}, - { 0x0000, 0xffe6, 0xffcc, 0xffb2, 0xff98, 0xff7e, 0xff64, 0xff4a, 0xff30, 0xff16, 0xfefc, 0xfee2, 0xfec8, 0xfeae, 0xfe94, 0xfe7a, - 0xfe60, 0xfe46, 0xfe2c, 0xfe12, 0xfdf8, 0xfdde, 0xfdc4, 0xfdaa, 0xfd90, 0xfd76, 0xfd5c, 0xfd42, 0xfd28, 0xfd0e, 0xfcf4, 0xfcda}, - { 0x0000, 0xffe7, 0xffce, 0xffb5, 0xff9c, 0xff83, 0xff6a, 0xff51, 0xff38, 0xff1f, 0xff06, 0xfeed, 0xfed4, 0xfebb, 0xfea2, 0xfe89, - 0xfe70, 0xfe57, 0xfe3e, 0xfe25, 0xfe0c, 0xfdf3, 0xfdda, 0xfdc1, 0xfda8, 0xfd8f, 0xfd76, 0xfd5d, 0xfd44, 0xfd2b, 0xfd12, 0xfcf9}, - { 0x0000, 0xffe8, 0xffd0, 0xffb8, 0xffa0, 0xff88, 0xff70, 0xff58, 0xff40, 0xff28, 0xff10, 0xfef8, 0xfee0, 0xfec8, 0xfeb0, 0xfe98, - 0xfe80, 0xfe68, 0xfe50, 0xfe38, 0xfe20, 0xfe08, 0xfdf0, 0xfdd8, 0xfdc0, 0xfda8, 0xfd90, 0xfd78, 0xfd60, 0xfd48, 0xfd30, 0xfd18}, - { 0x0000, 0xffe9, 0xffd2, 0xffbb, 0xffa4, 0xff8d, 0xff76, 0xff5f, 0xff48, 0xff31, 0xff1a, 0xff03, 0xfeec, 0xfed5, 0xfebe, 0xfea7, - 0xfe90, 0xfe79, 0xfe62, 0xfe4b, 0xfe34, 0xfe1d, 0xfe06, 0xfdef, 0xfdd8, 0xfdc1, 0xfdaa, 0xfd93, 0xfd7c, 0xfd65, 0xfd4e, 0xfd37}, - { 0x0000, 0xffea, 0xffd4, 0xffbe, 0xffa8, 0xff92, 0xff7c, 0xff66, 0xff50, 0xff3a, 0xff24, 0xff0e, 0xfef8, 0xfee2, 0xfecc, 0xfeb6, - 0xfea0, 0xfe8a, 0xfe74, 0xfe5e, 0xfe48, 0xfe32, 0xfe1c, 0xfe06, 0xfdf0, 0xfdda, 0xfdc4, 0xfdae, 0xfd98, 0xfd82, 0xfd6c, 0xfd56}, - { 0x0000, 0xffeb, 0xffd6, 0xffc1, 0xffac, 0xff97, 0xff82, 0xff6d, 0xff58, 0xff43, 0xff2e, 0xff19, 0xff04, 0xfeef, 0xfeda, 0xfec5, - 0xfeb0, 0xfe9b, 0xfe86, 0xfe71, 0xfe5c, 0xfe47, 0xfe32, 0xfe1d, 0xfe08, 0xfdf3, 0xfdde, 0xfdc9, 0xfdb4, 0xfd9f, 0xfd8a, 0xfd75}, - { 0x0000, 0xffec, 0xffd8, 0xffc4, 0xffb0, 0xff9c, 0xff88, 0xff74, 0xff60, 0xff4c, 0xff38, 0xff24, 0xff10, 0xfefc, 0xfee8, 0xfed4, - 0xfec0, 0xfeac, 0xfe98, 0xfe84, 0xfe70, 0xfe5c, 0xfe48, 0xfe34, 0xfe20, 0xfe0c, 0xfdf8, 0xfde4, 0xfdd0, 0xfdbc, 0xfda8, 0xfd94}, - { 0x0000, 0xffed, 0xffda, 0xffc7, 0xffb4, 0xffa1, 0xff8e, 0xff7b, 0xff68, 0xff55, 0xff42, 0xff2f, 0xff1c, 0xff09, 0xfef6, 0xfee3, - 0xfed0, 0xfebd, 0xfeaa, 0xfe97, 0xfe84, 0xfe71, 0xfe5e, 0xfe4b, 0xfe38, 0xfe25, 0xfe12, 0xfdff, 0xfdec, 0xfdd9, 0xfdc6, 0xfdb3}, - { 0x0000, 0xffee, 0xffdc, 0xffca, 0xffb8, 0xffa6, 0xff94, 0xff82, 0xff70, 0xff5e, 0xff4c, 0xff3a, 0xff28, 0xff16, 0xff04, 0xfef2, - 0xfee0, 0xfece, 0xfebc, 0xfeaa, 0xfe98, 0xfe86, 0xfe74, 0xfe62, 0xfe50, 0xfe3e, 0xfe2c, 0xfe1a, 0xfe08, 0xfdf6, 0xfde4, 0xfdd2}, - { 0x0000, 0xffef, 0xffde, 0xffcd, 0xffbc, 0xffab, 0xff9a, 0xff89, 0xff78, 0xff67, 0xff56, 0xff45, 0xff34, 0xff23, 0xff12, 0xff01, - 0xfef0, 0xfedf, 0xfece, 0xfebd, 0xfeac, 0xfe9b, 0xfe8a, 0xfe79, 0xfe68, 0xfe57, 0xfe46, 0xfe35, 0xfe24, 0xfe13, 0xfe02, 0xfdf1}, - { 0x0000, 0xfff0, 0xffe0, 0xffd0, 0xffc0, 0xffb0, 0xffa0, 0xff90, 0xff80, 0xff70, 0xff60, 0xff50, 0xff40, 0xff30, 0xff20, 0xff10, - 0xff00, 0xfef0, 0xfee0, 0xfed0, 0xfec0, 0xfeb0, 0xfea0, 0xfe90, 0xfe80, 0xfe70, 0xfe60, 0xfe50, 0xfe40, 0xfe30, 0xfe20, 0xfe10}, - { 0x0000, 0xfff1, 0xffe2, 0xffd3, 0xffc4, 0xffb5, 0xffa6, 0xff97, 0xff88, 0xff79, 0xff6a, 0xff5b, 0xff4c, 0xff3d, 0xff2e, 0xff1f, - 0xff10, 0xff01, 0xfef2, 0xfee3, 0xfed4, 0xfec5, 0xfeb6, 0xfea7, 0xfe98, 0xfe89, 0xfe7a, 0xfe6b, 0xfe5c, 0xfe4d, 0xfe3e, 0xfe2f}, - { 0x0000, 0xfff2, 0xffe4, 0xffd6, 0xffc8, 0xffba, 0xffac, 0xff9e, 0xff90, 0xff82, 0xff74, 0xff66, 0xff58, 0xff4a, 0xff3c, 0xff2e, - 0xff20, 0xff12, 0xff04, 0xfef6, 0xfee8, 0xfeda, 0xfecc, 0xfebe, 0xfeb0, 0xfea2, 0xfe94, 0xfe86, 0xfe78, 0xfe6a, 0xfe5c, 0xfe4e}, - { 0x0000, 0xfff3, 0xffe6, 0xffd9, 0xffcc, 0xffbf, 0xffb2, 0xffa5, 0xff98, 0xff8b, 0xff7e, 0xff71, 0xff64, 0xff57, 0xff4a, 0xff3d, - 0xff30, 0xff23, 0xff16, 0xff09, 0xfefc, 0xfeef, 0xfee2, 0xfed5, 0xfec8, 0xfebb, 0xfeae, 0xfea1, 0xfe94, 0xfe87, 0xfe7a, 0xfe6d}, - { 0x0000, 0xfff4, 0xffe8, 0xffdc, 0xffd0, 0xffc4, 0xffb8, 0xffac, 0xffa0, 0xff94, 0xff88, 0xff7c, 0xff70, 0xff64, 0xff58, 0xff4c, - 0xff40, 0xff34, 0xff28, 0xff1c, 0xff10, 0xff04, 0xfef8, 0xfeec, 0xfee0, 0xfed4, 0xfec8, 0xfebc, 0xfeb0, 0xfea4, 0xfe98, 0xfe8c}, - { 0x0000, 0xfff5, 0xffea, 0xffdf, 0xffd4, 0xffc9, 0xffbe, 0xffb3, 0xffa8, 0xff9d, 0xff92, 0xff87, 0xff7c, 0xff71, 0xff66, 0xff5b, - 0xff50, 0xff45, 0xff3a, 0xff2f, 0xff24, 0xff19, 0xff0e, 0xff03, 0xfef8, 0xfeed, 0xfee2, 0xfed7, 0xfecc, 0xfec1, 0xfeb6, 0xfeab}, - { 0x0000, 0xfff6, 0xffec, 0xffe2, 0xffd8, 0xffce, 0xffc4, 0xffba, 0xffb0, 0xffa6, 0xff9c, 0xff92, 0xff88, 0xff7e, 0xff74, 0xff6a, - 0xff60, 0xff56, 0xff4c, 0xff42, 0xff38, 0xff2e, 0xff24, 0xff1a, 0xff10, 0xff06, 0xfefc, 0xfef2, 0xfee8, 0xfede, 0xfed4, 0xfeca}, - { 0x0000, 0xfff7, 0xffee, 0xffe5, 0xffdc, 0xffd3, 0xffca, 0xffc1, 0xffb8, 0xffaf, 0xffa6, 0xff9d, 0xff94, 0xff8b, 0xff82, 0xff79, - 0xff70, 0xff67, 0xff5e, 0xff55, 0xff4c, 0xff43, 0xff3a, 0xff31, 0xff28, 0xff1f, 0xff16, 0xff0d, 0xff04, 0xfefb, 0xfef2, 0xfee9}, - { 0x0000, 0xfff8, 0xfff0, 0xffe8, 0xffe0, 0xffd8, 0xffd0, 0xffc8, 0xffc0, 0xffb8, 0xffb0, 0xffa8, 0xffa0, 0xff98, 0xff90, 0xff88, - 0xff80, 0xff78, 0xff70, 0xff68, 0xff60, 0xff58, 0xff50, 0xff48, 0xff40, 0xff38, 0xff30, 0xff28, 0xff20, 0xff18, 0xff10, 0xff08}, - { 0x0000, 0xfff9, 0xfff2, 0xffeb, 0xffe4, 0xffdd, 0xffd6, 0xffcf, 0xffc8, 0xffc1, 0xffba, 0xffb3, 0xffac, 0xffa5, 0xff9e, 0xff97, - 0xff90, 0xff89, 0xff82, 0xff7b, 0xff74, 0xff6d, 0xff66, 0xff5f, 0xff58, 0xff51, 0xff4a, 0xff43, 0xff3c, 0xff35, 0xff2e, 0xff27}, - { 0x0000, 0xfffa, 0xfff4, 0xffee, 0xffe8, 0xffe2, 0xffdc, 0xffd6, 0xffd0, 0xffca, 0xffc4, 0xffbe, 0xffb8, 0xffb2, 0xffac, 0xffa6, - 0xffa0, 0xff9a, 0xff94, 0xff8e, 0xff88, 0xff82, 0xff7c, 0xff76, 0xff70, 0xff6a, 0xff64, 0xff5e, 0xff58, 0xff52, 0xff4c, 0xff46}, - { 0x0000, 0xfffb, 0xfff6, 0xfff1, 0xffec, 0xffe7, 0xffe2, 0xffdd, 0xffd8, 0xffd3, 0xffce, 0xffc9, 0xffc4, 0xffbf, 0xffba, 0xffb5, - 0xffb0, 0xffab, 0xffa6, 0xffa1, 0xff9c, 0xff97, 0xff92, 0xff8d, 0xff88, 0xff83, 0xff7e, 0xff79, 0xff74, 0xff6f, 0xff6a, 0xff65}, - { 0x0000, 0xfffc, 0xfff8, 0xfff4, 0xfff0, 0xffec, 0xffe8, 0xffe4, 0xffe0, 0xffdc, 0xffd8, 0xffd4, 0xffd0, 0xffcc, 0xffc8, 0xffc4, - 0xffc0, 0xffbc, 0xffb8, 0xffb4, 0xffb0, 0xffac, 0xffa8, 0xffa4, 0xffa0, 0xff9c, 0xff98, 0xff94, 0xff90, 0xff8c, 0xff88, 0xff84}, - { 0x0000, 0xfffd, 0xfffa, 0xfff7, 0xfff4, 0xfff1, 0xffee, 0xffeb, 0xffe8, 0xffe5, 0xffe2, 0xffdf, 0xffdc, 0xffd9, 0xffd6, 0xffd3, - 0xffd0, 0xffcd, 0xffca, 0xffc7, 0xffc4, 0xffc1, 0xffbe, 0xffbb, 0xffb8, 0xffb5, 0xffb2, 0xffaf, 0xffac, 0xffa9, 0xffa6, 0xffa3}, - { 0x0000, 0xfffe, 0xfffc, 0xfffa, 0xfff8, 0xfff6, 0xfff4, 0xfff2, 0xfff0, 0xffee, 0xffec, 0xffea, 0xffe8, 0xffe6, 0xffe4, 0xffe2, - 0xffe0, 0xffde, 0xffdc, 0xffda, 0xffd8, 0xffd6, 0xffd4, 0xffd2, 0xffd0, 0xffce, 0xffcc, 0xffca, 0xffc8, 0xffc6, 0xffc4, 0xffc2}, - { 0x0000, 0xffff, 0xfffe, 0xfffd, 0xfffc, 0xfffb, 0xfffa, 0xfff9, 0xfff8, 0xfff7, 0xfff6, 0xfff5, 0xfff4, 0xfff3, 0xfff2, 0xfff1, - 0xfff0, 0xffef, 0xffee, 0xffed, 0xffec, 0xffeb, 0xffea, 0xffe9, 0xffe8, 0xffe7, 0xffe6, 0xffe5, 0xffe4, 0xffe3, 0xffe2, 0xffe1}, - { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}, - { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f}, - { 0x0000, 0x0002, 0x0004, 0x0006, 0x0008, 0x000a, 0x000c, 0x000e, 0x0010, 0x0012, 0x0014, 0x0016, 0x0018, 0x001a, 0x001c, 0x001e, - 0x0020, 0x0022, 0x0024, 0x0026, 0x0028, 0x002a, 0x002c, 0x002e, 0x0030, 0x0032, 0x0034, 0x0036, 0x0038, 0x003a, 0x003c, 0x003e}, - { 0x0000, 0x0003, 0x0006, 0x0009, 0x000c, 0x000f, 0x0012, 0x0015, 0x0018, 0x001b, 0x001e, 0x0021, 0x0024, 0x0027, 0x002a, 0x002d, - 0x0030, 0x0033, 0x0036, 0x0039, 0x003c, 0x003f, 0x0042, 0x0045, 0x0048, 0x004b, 0x004e, 0x0051, 0x0054, 0x0057, 0x005a, 0x005d}, - { 0x0000, 0x0004, 0x0008, 0x000c, 0x0010, 0x0014, 0x0018, 0x001c, 0x0020, 0x0024, 0x0028, 0x002c, 0x0030, 0x0034, 0x0038, 0x003c, - 0x0040, 0x0044, 0x0048, 0x004c, 0x0050, 0x0054, 0x0058, 0x005c, 0x0060, 0x0064, 0x0068, 0x006c, 0x0070, 0x0074, 0x0078, 0x007c}, - { 0x0000, 0x0005, 0x000a, 0x000f, 0x0014, 0x0019, 0x001e, 0x0023, 0x0028, 0x002d, 0x0032, 0x0037, 0x003c, 0x0041, 0x0046, 0x004b, - 0x0050, 0x0055, 0x005a, 0x005f, 0x0064, 0x0069, 0x006e, 0x0073, 0x0078, 0x007d, 0x0082, 0x0087, 0x008c, 0x0091, 0x0096, 0x009b}, - { 0x0000, 0x0006, 0x000c, 0x0012, 0x0018, 0x001e, 0x0024, 0x002a, 0x0030, 0x0036, 0x003c, 0x0042, 0x0048, 0x004e, 0x0054, 0x005a, - 0x0060, 0x0066, 0x006c, 0x0072, 0x0078, 0x007e, 0x0084, 0x008a, 0x0090, 0x0096, 0x009c, 0x00a2, 0x00a8, 0x00ae, 0x00b4, 0x00ba}, - { 0x0000, 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x002a, 0x0031, 0x0038, 0x003f, 0x0046, 0x004d, 0x0054, 0x005b, 0x0062, 0x0069, - 0x0070, 0x0077, 0x007e, 0x0085, 0x008c, 0x0093, 0x009a, 0x00a1, 0x00a8, 0x00af, 0x00b6, 0x00bd, 0x00c4, 0x00cb, 0x00d2, 0x00d9}, - { 0x0000, 0x0008, 0x0010, 0x0018, 0x0020, 0x0028, 0x0030, 0x0038, 0x0040, 0x0048, 0x0050, 0x0058, 0x0060, 0x0068, 0x0070, 0x0078, - 0x0080, 0x0088, 0x0090, 0x0098, 0x00a0, 0x00a8, 0x00b0, 0x00b8, 0x00c0, 0x00c8, 0x00d0, 0x00d8, 0x00e0, 0x00e8, 0x00f0, 0x00f8}, - { 0x0000, 0x0009, 0x0012, 0x001b, 0x0024, 0x002d, 0x0036, 0x003f, 0x0048, 0x0051, 0x005a, 0x0063, 0x006c, 0x0075, 0x007e, 0x0087, - 0x0090, 0x0099, 0x00a2, 0x00ab, 0x00b4, 0x00bd, 0x00c6, 0x00cf, 0x00d8, 0x00e1, 0x00ea, 0x00f3, 0x00fc, 0x0105, 0x010e, 0x0117}, - { 0x0000, 0x000a, 0x0014, 0x001e, 0x0028, 0x0032, 0x003c, 0x0046, 0x0050, 0x005a, 0x0064, 0x006e, 0x0078, 0x0082, 0x008c, 0x0096, - 0x00a0, 0x00aa, 0x00b4, 0x00be, 0x00c8, 0x00d2, 0x00dc, 0x00e6, 0x00f0, 0x00fa, 0x0104, 0x010e, 0x0118, 0x0122, 0x012c, 0x0136}, - { 0x0000, 0x000b, 0x0016, 0x0021, 0x002c, 0x0037, 0x0042, 0x004d, 0x0058, 0x0063, 0x006e, 0x0079, 0x0084, 0x008f, 0x009a, 0x00a5, - 0x00b0, 0x00bb, 0x00c6, 0x00d1, 0x00dc, 0x00e7, 0x00f2, 0x00fd, 0x0108, 0x0113, 0x011e, 0x0129, 0x0134, 0x013f, 0x014a, 0x0155}, - { 0x0000, 0x000c, 0x0018, 0x0024, 0x0030, 0x003c, 0x0048, 0x0054, 0x0060, 0x006c, 0x0078, 0x0084, 0x0090, 0x009c, 0x00a8, 0x00b4, - 0x00c0, 0x00cc, 0x00d8, 0x00e4, 0x00f0, 0x00fc, 0x0108, 0x0114, 0x0120, 0x012c, 0x0138, 0x0144, 0x0150, 0x015c, 0x0168, 0x0174}, - { 0x0000, 0x000d, 0x001a, 0x0027, 0x0034, 0x0041, 0x004e, 0x005b, 0x0068, 0x0075, 0x0082, 0x008f, 0x009c, 0x00a9, 0x00b6, 0x00c3, - 0x00d0, 0x00dd, 0x00ea, 0x00f7, 0x0104, 0x0111, 0x011e, 0x012b, 0x0138, 0x0145, 0x0152, 0x015f, 0x016c, 0x0179, 0x0186, 0x0193}, - { 0x0000, 0x000e, 0x001c, 0x002a, 0x0038, 0x0046, 0x0054, 0x0062, 0x0070, 0x007e, 0x008c, 0x009a, 0x00a8, 0x00b6, 0x00c4, 0x00d2, - 0x00e0, 0x00ee, 0x00fc, 0x010a, 0x0118, 0x0126, 0x0134, 0x0142, 0x0150, 0x015e, 0x016c, 0x017a, 0x0188, 0x0196, 0x01a4, 0x01b2}, - { 0x0000, 0x000f, 0x001e, 0x002d, 0x003c, 0x004b, 0x005a, 0x0069, 0x0078, 0x0087, 0x0096, 0x00a5, 0x00b4, 0x00c3, 0x00d2, 0x00e1, - 0x00f0, 0x00ff, 0x010e, 0x011d, 0x012c, 0x013b, 0x014a, 0x0159, 0x0168, 0x0177, 0x0186, 0x0195, 0x01a4, 0x01b3, 0x01c2, 0x01d1}, - { 0x0000, 0x0010, 0x0020, 0x0030, 0x0040, 0x0050, 0x0060, 0x0070, 0x0080, 0x0090, 0x00a0, 0x00b0, 0x00c0, 0x00d0, 0x00e0, 0x00f0, - 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, 0x0180, 0x0190, 0x01a0, 0x01b0, 0x01c0, 0x01d0, 0x01e0, 0x01f0}, - { 0x0000, 0x0011, 0x0022, 0x0033, 0x0044, 0x0055, 0x0066, 0x0077, 0x0088, 0x0099, 0x00aa, 0x00bb, 0x00cc, 0x00dd, 0x00ee, 0x00ff, - 0x0110, 0x0121, 0x0132, 0x0143, 0x0154, 0x0165, 0x0176, 0x0187, 0x0198, 0x01a9, 0x01ba, 0x01cb, 0x01dc, 0x01ed, 0x01fe, 0x020f}, - { 0x0000, 0x0012, 0x0024, 0x0036, 0x0048, 0x005a, 0x006c, 0x007e, 0x0090, 0x00a2, 0x00b4, 0x00c6, 0x00d8, 0x00ea, 0x00fc, 0x010e, - 0x0120, 0x0132, 0x0144, 0x0156, 0x0168, 0x017a, 0x018c, 0x019e, 0x01b0, 0x01c2, 0x01d4, 0x01e6, 0x01f8, 0x020a, 0x021c, 0x022e}, - { 0x0000, 0x0013, 0x0026, 0x0039, 0x004c, 0x005f, 0x0072, 0x0085, 0x0098, 0x00ab, 0x00be, 0x00d1, 0x00e4, 0x00f7, 0x010a, 0x011d, - 0x0130, 0x0143, 0x0156, 0x0169, 0x017c, 0x018f, 0x01a2, 0x01b5, 0x01c8, 0x01db, 0x01ee, 0x0201, 0x0214, 0x0227, 0x023a, 0x024d}, - { 0x0000, 0x0014, 0x0028, 0x003c, 0x0050, 0x0064, 0x0078, 0x008c, 0x00a0, 0x00b4, 0x00c8, 0x00dc, 0x00f0, 0x0104, 0x0118, 0x012c, - 0x0140, 0x0154, 0x0168, 0x017c, 0x0190, 0x01a4, 0x01b8, 0x01cc, 0x01e0, 0x01f4, 0x0208, 0x021c, 0x0230, 0x0244, 0x0258, 0x026c}, - { 0x0000, 0x0015, 0x002a, 0x003f, 0x0054, 0x0069, 0x007e, 0x0093, 0x00a8, 0x00bd, 0x00d2, 0x00e7, 0x00fc, 0x0111, 0x0126, 0x013b, - 0x0150, 0x0165, 0x017a, 0x018f, 0x01a4, 0x01b9, 0x01ce, 0x01e3, 0x01f8, 0x020d, 0x0222, 0x0237, 0x024c, 0x0261, 0x0276, 0x028b}, - { 0x0000, 0x0016, 0x002c, 0x0042, 0x0058, 0x006e, 0x0084, 0x009a, 0x00b0, 0x00c6, 0x00dc, 0x00f2, 0x0108, 0x011e, 0x0134, 0x014a, - 0x0160, 0x0176, 0x018c, 0x01a2, 0x01b8, 0x01ce, 0x01e4, 0x01fa, 0x0210, 0x0226, 0x023c, 0x0252, 0x0268, 0x027e, 0x0294, 0x02aa}, - { 0x0000, 0x0017, 0x002e, 0x0045, 0x005c, 0x0073, 0x008a, 0x00a1, 0x00b8, 0x00cf, 0x00e6, 0x00fd, 0x0114, 0x012b, 0x0142, 0x0159, - 0x0170, 0x0187, 0x019e, 0x01b5, 0x01cc, 0x01e3, 0x01fa, 0x0211, 0x0228, 0x023f, 0x0256, 0x026d, 0x0284, 0x029b, 0x02b2, 0x02c9}, - { 0x0000, 0x0018, 0x0030, 0x0048, 0x0060, 0x0078, 0x0090, 0x00a8, 0x00c0, 0x00d8, 0x00f0, 0x0108, 0x0120, 0x0138, 0x0150, 0x0168, - 0x0180, 0x0198, 0x01b0, 0x01c8, 0x01e0, 0x01f8, 0x0210, 0x0228, 0x0240, 0x0258, 0x0270, 0x0288, 0x02a0, 0x02b8, 0x02d0, 0x02e8}, - { 0x0000, 0x0019, 0x0032, 0x004b, 0x0064, 0x007d, 0x0096, 0x00af, 0x00c8, 0x00e1, 0x00fa, 0x0113, 0x012c, 0x0145, 0x015e, 0x0177, - 0x0190, 0x01a9, 0x01c2, 0x01db, 0x01f4, 0x020d, 0x0226, 0x023f, 0x0258, 0x0271, 0x028a, 0x02a3, 0x02bc, 0x02d5, 0x02ee, 0x0307}, - { 0x0000, 0x001a, 0x0034, 0x004e, 0x0068, 0x0082, 0x009c, 0x00b6, 0x00d0, 0x00ea, 0x0104, 0x011e, 0x0138, 0x0152, 0x016c, 0x0186, - 0x01a0, 0x01ba, 0x01d4, 0x01ee, 0x0208, 0x0222, 0x023c, 0x0256, 0x0270, 0x028a, 0x02a4, 0x02be, 0x02d8, 0x02f2, 0x030c, 0x0326}, - { 0x0000, 0x001b, 0x0036, 0x0051, 0x006c, 0x0087, 0x00a2, 0x00bd, 0x00d8, 0x00f3, 0x010e, 0x0129, 0x0144, 0x015f, 0x017a, 0x0195, - 0x01b0, 0x01cb, 0x01e6, 0x0201, 0x021c, 0x0237, 0x0252, 0x026d, 0x0288, 0x02a3, 0x02be, 0x02d9, 0x02f4, 0x030f, 0x032a, 0x0345}, - { 0x0000, 0x001c, 0x0038, 0x0054, 0x0070, 0x008c, 0x00a8, 0x00c4, 0x00e0, 0x00fc, 0x0118, 0x0134, 0x0150, 0x016c, 0x0188, 0x01a4, - 0x01c0, 0x01dc, 0x01f8, 0x0214, 0x0230, 0x024c, 0x0268, 0x0284, 0x02a0, 0x02bc, 0x02d8, 0x02f4, 0x0310, 0x032c, 0x0348, 0x0364}, - { 0x0000, 0x001d, 0x003a, 0x0057, 0x0074, 0x0091, 0x00ae, 0x00cb, 0x00e8, 0x0105, 0x0122, 0x013f, 0x015c, 0x0179, 0x0196, 0x01b3, - 0x01d0, 0x01ed, 0x020a, 0x0227, 0x0244, 0x0261, 0x027e, 0x029b, 0x02b8, 0x02d5, 0x02f2, 0x030f, 0x032c, 0x0349, 0x0366, 0x0383}, - { 0x0000, 0x001e, 0x003c, 0x005a, 0x0078, 0x0096, 0x00b4, 0x00d2, 0x00f0, 0x010e, 0x012c, 0x014a, 0x0168, 0x0186, 0x01a4, 0x01c2, - 0x01e0, 0x01fe, 0x021c, 0x023a, 0x0258, 0x0276, 0x0294, 0x02b2, 0x02d0, 0x02ee, 0x030c, 0x032a, 0x0348, 0x0366, 0x0384, 0x03a2}, - { 0x0000, 0x001f, 0x003e, 0x005d, 0x007c, 0x009b, 0x00ba, 0x00d9, 0x00f8, 0x0117, 0x0136, 0x0155, 0x0174, 0x0193, 0x01b2, 0x01d1, - 0x01f0, 0x020f, 0x022e, 0x024d, 0x026c, 0x028b, 0x02aa, 0x02c9, 0x02e8, 0x0307, 0x0326, 0x0345, 0x0364, 0x0383, 0x03a2, 0x03c1} -}; - -static const int8_t outLvlTbl[16][16] = { - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2}, - { 0, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4}, - { 0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6}, - { 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8}, - { 0, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 9, 9, 10}, - { 0, 1, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11, 12}, - { 0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 8, 10, 11, 12, 13, 14}, - { 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}, - { 0, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17}, - { 0, 2, 3, 4, 6, 7, 8, 9, 11, 12, 13, 14, 16, 17, 18, 19}, - { 0, 2, 3, 5, 6, 7, 9, 10, 12, 13, 14, 16, 17, 18, 20, 21}, - { 0, 2, 4, 5, 7, 8, 10, 11, 13, 14, 16, 17, 19, 20, 22, 23}, - { 0, 2, 4, 5, 7, 9, 10, 12, 14, 15, 17, 18, 20, 22, 23, 25}, - { 0, 2, 4, 6, 8, 9, 11, 13, 15, 16, 18, 20, 22, 23, 25, 27}, - { 0, 2, 4, 6, 8, 10, 12, 14, 16, 17, 19, 21, 23, 25, 27, 29} -}; - -static inline uint8_t mgetb(uint8_t *ptr) { return *ptr; } -static inline void mputb(uint8_t *ptr, int8_t data) { *ptr = data; } - -//************************************************************************** -// LIVE DEVICE -//************************************************************************** - -//------------------------------------------------- -// vboysnd_device - constructor -//------------------------------------------------- - -vboysnd_device::vboysnd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, VBOYSND, tag, owner, clock) - , device_sound_interface(mconfig, *this) -{ -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void vboysnd_device::device_start() -{ - uint32_t rate = clock() / 120; - // create the stream - m_stream = stream_alloc(0, 2, rate); - - m_timer = timer_alloc(FUNC(vboysnd_device::delayed_stream_update), this); - m_timer->adjust(attotime::zero, 0, rate ? attotime::from_hz(rate / 4) : attotime::never); - - for (int i=0; i<2048; i++) - waveFreq2LenTbl[i] = ((2048 - i) * 32) / 120; - for (int i=0; i<32; i++) - waveTimer2LenTbl[i] = (i+1) * 120; - for (int i=0; i<8; i++) - waveEnv2LenTbl[i] = (i + 1) * 4 * 120; - - for (int i = 0; i < 5; i++) - memset(&snd_channel[i], 0, sizeof(s_snd_channel)); - - memset(m_aram, 0, 0x600); -} - - -//------------------------------------------------- -// device_clock_changed -//------------------------------------------------- - -void vboysnd_device::device_clock_changed() -{ - uint32_t rate = clock() / 120; - m_stream->set_sample_rate(rate); - - m_timer->adjust(attotime::zero, 0, rate ? attotime::from_hz(rate / 4) : attotime::never); -} - - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void vboysnd_device::device_reset() -{ - m_stream->update(); - - int i; - - for (i=0; i<4; i++) - snd_channel[i].playing = false; -} - -//------------------------------------------------- -// delayed_stream_update -//------------------------------------------------- - -TIMER_CALLBACK_MEMBER(vboysnd_device::delayed_stream_update) -{ - m_stream->update(); -} - -//------------------------------------------------- -// sound_stream_update - handle update requests for -// our sound stream -//------------------------------------------------- - -void vboysnd_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) -{ - int len, i, j, channel; - - auto &outL = outputs[0]; - auto &outR = outputs[1]; - - len = outL.samples(); - -// if (mgetb(m_aram+SST0P) & 0x1) // Sound Stop Reg -// goto end; - - for (channel=0; channel<5; channel++) - { - float size; - int k = 0, waveAddr; - - i = channel * 0x40; - snd_channel[channel].sample_len = waveFreq2LenTbl[((mgetb(m_aram+SxFQHb+i) & 0x7) << 8) | mgetb(m_aram+SxFQLb+i)]; - waveAddr = (mgetb(m_aram + SxRAMb + i) & 0x3) << 7; - - size = (float)snd_channel[channel].sample_len / 32.0f; - for (j=0; j<32;) - { - int8_t byte = mgetb(m_aram + waveAddr + (j++ << 2)) & 0x3f; -// int8_t nbyte = mgetb(m_aram + waveAddr + (j << 2)) & 0x3f; - int end = (int)(((float)j)*size); - float val, add; - - val = (float)byte; - add = /*(nbyte-byte)/(end-k)*/ 0.0; // no interpolation - - for (; kplaying) - continue; - - outLeft = outLvlTbl[channel->volLeft][channel->envelope]; - outRight = outLvlTbl[channel->volRight][channel->envelope]; -// env1 = ((uint8_t)mgetb(m_aram+SxEV1b+i*0x40)); - if (channel->env1 & 0x01) - { - channel->env_time++; - -// env0 = ((uint8_t)mgetb(m_aram+SxEV0b+i*0x40)); - if (channel->env_time >= channel->env_steptime /*waveEnv2LenTbl[env0 & 0x7]*/) - { - // it's time for a step - channel->env_time = 0; - if (channel->env0 & 0x08) - { - // step up - channel->envelope++; - if (channel->envelope >= 0xf) - { - if (channel->env1 & 0x02) channel->envelope = channel->env0 >> 4; - else { channel->env1 &= ~0x01; channel->envelope = 0xf; } - } - } - else - { - // step down - channel->envelope--; - if (channel->envelope <= 0) - { - if (channel->env1 & 0x02) channel->envelope = channel->env0 >> 4; - else { channel->env1 &= ~0x01; channel->envelope = 0x0; } - } - } - } - } - - outTblPtr = (int16_t *) outTbl[channel->sample[channel->offset]]; - if (outLeft) note_left += outTblPtr[outLeft ]; - if (outRight) note_right += outTblPtr[outRight]; - channel->offset++; - - if (channel->offset >= channel->sample_len) - channel->offset = 0; - - if (channel->time > 0) - { - channel->time--; - if (channel->time <= 0) - channel->playing = false; - } - } - - - // scale to 16 bits - note_left = (note_left << 5) | ((note_left >> 6) & 0x1f); - note_right = (note_right << 5) | ((note_right >> 6) & 0x1f); - - outL.put_int_clamp(j, (int16_t)note_left, 32768); - outR.put_int_clamp(j, (int16_t)note_right, 32768); - } -} - -//------------------------------------------------- -// read - read from the chip's registers and internal RAM -//------------------------------------------------- - -uint8_t vboysnd_device::read(offs_t offset) -{ - m_stream->update(); - return m_aram[offset]; -} - -//------------------------------------------------- -// write - write to the chip's registers and internal RAM -//------------------------------------------------- - -void vboysnd_device::write(offs_t offset, uint8_t data) -{ - int freq, i; -// int waveAddr; - int volReg, intervalReg; - int channel, ouroffs; - - mputb((uint8_t *)m_aram+offset, data); - if (offset < 0x400) - return; - - channel = (offset-0x400) >> 6; - ouroffs = offset & 0x3f; - - ///process_sound(cpu.vcount); - - if (channel == 6 && ouroffs == 0) - { - if (mgetb(m_aram+SST0P) & 0x1) - for (i=0; i<4; i++) - snd_channel[i].playing = 0; - return; - } - - // Extract frequencies and build the wave for the first 4 sound sources - i = channel * 0x40; - switch (ouroffs) - { - case SxLRV: - if (channel < 5) - { - volReg = mgetb(m_aram + SxLRVb + i); // 6-4-4 - L/R output level setting - if (snd_channel[channel].playing) - { - snd_channel[channel].volLeft = ((uint8_t)volReg) >> 4; - snd_channel[channel].volRight = ((uint8_t)volReg) & 0xf; - break; - } - } - [[fallthrough]]; // FIXME: really? - case SxINT: - if (channel < 5) - { - uint8_t env0, env1; - // find out if the sound is playing - intervalReg = mgetb(m_aram + SxINTb + i); // 6-4-6 - Sound Interval - volReg = mgetb(m_aram + SxLRVb + i); // 6-4-4 - L/R output level setting - - if (((intervalReg & 0x80) == 0) || (volReg == 0)) - { - snd_channel[channel].playing = false; - return; - } - snd_channel[channel].playing = true; - - // 6-4-1 - Waveform address comes from SxRAM. -// waveAddr = (mgetb(m_aram + SxRAMb + i) & 0x3) << 7; - - // 6-4-15 - Frequency comes from here - freq = ((mgetb(m_aram+SxFQHb+i) & 0x7) << 8) | mgetb(m_aram+SxFQLb+i); - - env0 = mgetb(m_aram+SxEV0b+i); env1 = mgetb(m_aram+SxEV1b+i); - snd_channel[channel].env0 = env0; - snd_channel[channel].env1 = env1; - snd_channel[channel].volLeft = ((uint8_t)volReg) >> 4; - snd_channel[channel].volRight = ((uint8_t)volReg) & 0xf; - snd_channel[channel].env_steptime = (env1 & 0x1) ? waveEnv2LenTbl[env0 & 0x7] : 0; - snd_channel[channel].sample_len = waveFreq2LenTbl[freq]; - - snd_channel[channel].offset = 0; - snd_channel[channel].time = (intervalReg & 0x20) ? waveTimer2LenTbl[intervalReg & 0x1f] : 0; - snd_channel[channel].envelope = ((uint8_t)mgetb(m_aram+SxEV0b+i)) >> 4; - snd_channel[channel].env_time = 0; - } - else - { - intervalReg = mgetb(m_aram + SxINTb + i); // 6-4-6 - Sound Interval - volReg = mgetb(m_aram + SxLRVb + i); // 6-4-4 - L/R output level setting - - if (((intervalReg & 0x80) == 0) || (volReg == 0)) - { -// snd_channel[channel].playing = false; - return; - } -// Debugger(); // uses white noise -// snd_channel[channel].playing = true; - } - break; - - case SxEV0: - if (channel < 5) - if (snd_channel[channel].playing) - snd_channel[channel].envelope = ((uint8_t)mgetb(m_aram+SxEV0b+i)) >> 4; - break; - } -} diff --git a/src/mame/messshared/vboy_a.h b/src/mame/messshared/vboy_a.h deleted file mode 100644 index 11f8dbc44b8..00000000000 --- a/src/mame/messshared/vboy_a.h +++ /dev/null @@ -1,92 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:R. Belmont -/* - vboy.h - Virtual Boy audio emulation - - By Richard Bannister and Gil Pedersen. - MAME device adaptation by R. Belmont -*/ -#ifndef MAME_AUDIO_VBOY_H -#define MAME_AUDIO_VBOY_H - -#pragma once - - -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - -// ======================> vboysnd_device - -class vboysnd_device : public device_t, public device_sound_interface -{ -public: - // construction/destruction - vboysnd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 5'000'000); - - uint8_t read(offs_t offset); - void write(offs_t offset, uint8_t data); - - sound_stream *m_stream = nullptr; - -protected: - static constexpr unsigned CHANNELS = 4; - - struct s_snd_channel { - int8_t playing = 0; // the sound is playing - - // state when sound was enabled - uint32_t env_steptime = 0; // Envelope step time - uint8_t env0 = 0; // Envelope data - uint8_t env1 = 0; // Envelope data - uint8_t volLeft = 0; // Left output volume - uint8_t volRight = 0; // Right output volume - uint8_t sample[580]{}; // sample to play - int sample_len = 0; // length of sample - - // values that change, as the sample is played - int offset = 0; // current offset in sample - int time = 0; // the duration that this sample is to be played - uint8_t envelope = 0; // Current envelope level (604) - int env_time = 0; // The duration between envelope decay/grow (608) - }; - - struct s_regchan { - int32_t sINT; - int32_t sLRV; - int32_t sFQL; - int32_t sFQH; - int32_t sEV0; - int32_t sEV1; - int32_t sRAM; - }; - - struct s_sreg { - // Sound registers structure - s_regchan c[4]; - }; - - // device-level overrides - virtual void device_start() override; - virtual void device_clock_changed() override; - virtual void device_reset() override; - - virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; - - TIMER_CALLBACK_MEMBER(delayed_stream_update); - - s_snd_channel snd_channel[5]; - - uint16_t waveFreq2LenTbl[2048]; - uint16_t waveTimer2LenTbl[32]; - uint16_t waveEnv2LenTbl[8]; - - emu_timer *m_timer = nullptr; - - uint8_t m_aram[0x600]; -}; - -// device type definition -DECLARE_DEVICE_TYPE(VBOYSND, vboysnd_device) - -#endif //MAME_AUDIO_VBOY_H diff --git a/src/mame/messshared/vboysound.cpp b/src/mame/messshared/vboysound.cpp new file mode 100644 index 00000000000..5cb56eddabf --- /dev/null +++ b/src/mame/messshared/vboysound.cpp @@ -0,0 +1,501 @@ +// license:BSD-3-Clause +// copyright-holders:R. Belmont +/* + vboy.c - Virtual Boy audio emulation + + By Richard Bannister and Gil Pedersen. + MAME device adaptation by R. Belmont +*/ + +#include "emu.h" +#include "vboysound.h" + +// device type definition +DEFINE_DEVICE_TYPE(VBOYSND, vboysnd_device, "vboysnd", "Virtual Boy Audio") + +//#define LAME_COMPILER_BUG + +#define SxINT 0x00 +#define SxLRV 0x04 +#define SxFQL 0x08 +#define SxFQH 0x0c +#define SxEV0 0x10 +#define SxEV1 0x14 +#define SxRAM 0x18 + +#define SxINTb 0x400+SxINT +#define SxLRVb 0x400+SxLRV +#define SxFQLb 0x400+SxFQL +#define SxFQHb 0x400+SxFQH +#define SxEV0b 0x400+SxEV0 +#define SxEV1b 0x400+SxEV1 +#define SxRAMb 0x400+SxRAM + +#define S5SWP 0x51c +#define SST0P 0x580 + +static const uint16_t outTbl[64][32] = { + { 0x0000, 0xffe0, 0xffc0, 0xffa0, 0xff80, 0xff60, 0xff40, 0xff20, 0xff00, 0xfee0, 0xfec0, 0xfea0, 0xfe80, 0xfe60, 0xfe40, 0xfe20, + 0xfe00, 0xfde0, 0xfdc0, 0xfda0, 0xfd80, 0xfd60, 0xfd40, 0xfd20, 0xfd00, 0xfce0, 0xfcc0, 0xfca0, 0xfc80, 0xfc60, 0xfc40, 0xfc20}, + { 0x0000, 0xffe1, 0xffc2, 0xffa3, 0xff84, 0xff65, 0xff46, 0xff27, 0xff08, 0xfee9, 0xfeca, 0xfeab, 0xfe8c, 0xfe6d, 0xfe4e, 0xfe2f, + 0xfe10, 0xfdf1, 0xfdd2, 0xfdb3, 0xfd94, 0xfd75, 0xfd56, 0xfd37, 0xfd18, 0xfcf9, 0xfcda, 0xfcbb, 0xfc9c, 0xfc7d, 0xfc5e, 0xfc3f}, + { 0x0000, 0xffe2, 0xffc4, 0xffa6, 0xff88, 0xff6a, 0xff4c, 0xff2e, 0xff10, 0xfef2, 0xfed4, 0xfeb6, 0xfe98, 0xfe7a, 0xfe5c, 0xfe3e, + 0xfe20, 0xfe02, 0xfde4, 0xfdc6, 0xfda8, 0xfd8a, 0xfd6c, 0xfd4e, 0xfd30, 0xfd12, 0xfcf4, 0xfcd6, 0xfcb8, 0xfc9a, 0xfc7c, 0xfc5e}, + { 0x0000, 0xffe3, 0xffc6, 0xffa9, 0xff8c, 0xff6f, 0xff52, 0xff35, 0xff18, 0xfefb, 0xfede, 0xfec1, 0xfea4, 0xfe87, 0xfe6a, 0xfe4d, + 0xfe30, 0xfe13, 0xfdf6, 0xfdd9, 0xfdbc, 0xfd9f, 0xfd82, 0xfd65, 0xfd48, 0xfd2b, 0xfd0e, 0xfcf1, 0xfcd4, 0xfcb7, 0xfc9a, 0xfc7d}, + { 0x0000, 0xffe4, 0xffc8, 0xffac, 0xff90, 0xff74, 0xff58, 0xff3c, 0xff20, 0xff04, 0xfee8, 0xfecc, 0xfeb0, 0xfe94, 0xfe78, 0xfe5c, + 0xfe40, 0xfe24, 0xfe08, 0xfdec, 0xfdd0, 0xfdb4, 0xfd98, 0xfd7c, 0xfd60, 0xfd44, 0xfd28, 0xfd0c, 0xfcf0, 0xfcd4, 0xfcb8, 0xfc9c}, + { 0x0000, 0xffe5, 0xffca, 0xffaf, 0xff94, 0xff79, 0xff5e, 0xff43, 0xff28, 0xff0d, 0xfef2, 0xfed7, 0xfebc, 0xfea1, 0xfe86, 0xfe6b, + 0xfe50, 0xfe35, 0xfe1a, 0xfdff, 0xfde4, 0xfdc9, 0xfdae, 0xfd93, 0xfd78, 0xfd5d, 0xfd42, 0xfd27, 0xfd0c, 0xfcf1, 0xfcd6, 0xfcbb}, + { 0x0000, 0xffe6, 0xffcc, 0xffb2, 0xff98, 0xff7e, 0xff64, 0xff4a, 0xff30, 0xff16, 0xfefc, 0xfee2, 0xfec8, 0xfeae, 0xfe94, 0xfe7a, + 0xfe60, 0xfe46, 0xfe2c, 0xfe12, 0xfdf8, 0xfdde, 0xfdc4, 0xfdaa, 0xfd90, 0xfd76, 0xfd5c, 0xfd42, 0xfd28, 0xfd0e, 0xfcf4, 0xfcda}, + { 0x0000, 0xffe7, 0xffce, 0xffb5, 0xff9c, 0xff83, 0xff6a, 0xff51, 0xff38, 0xff1f, 0xff06, 0xfeed, 0xfed4, 0xfebb, 0xfea2, 0xfe89, + 0xfe70, 0xfe57, 0xfe3e, 0xfe25, 0xfe0c, 0xfdf3, 0xfdda, 0xfdc1, 0xfda8, 0xfd8f, 0xfd76, 0xfd5d, 0xfd44, 0xfd2b, 0xfd12, 0xfcf9}, + { 0x0000, 0xffe8, 0xffd0, 0xffb8, 0xffa0, 0xff88, 0xff70, 0xff58, 0xff40, 0xff28, 0xff10, 0xfef8, 0xfee0, 0xfec8, 0xfeb0, 0xfe98, + 0xfe80, 0xfe68, 0xfe50, 0xfe38, 0xfe20, 0xfe08, 0xfdf0, 0xfdd8, 0xfdc0, 0xfda8, 0xfd90, 0xfd78, 0xfd60, 0xfd48, 0xfd30, 0xfd18}, + { 0x0000, 0xffe9, 0xffd2, 0xffbb, 0xffa4, 0xff8d, 0xff76, 0xff5f, 0xff48, 0xff31, 0xff1a, 0xff03, 0xfeec, 0xfed5, 0xfebe, 0xfea7, + 0xfe90, 0xfe79, 0xfe62, 0xfe4b, 0xfe34, 0xfe1d, 0xfe06, 0xfdef, 0xfdd8, 0xfdc1, 0xfdaa, 0xfd93, 0xfd7c, 0xfd65, 0xfd4e, 0xfd37}, + { 0x0000, 0xffea, 0xffd4, 0xffbe, 0xffa8, 0xff92, 0xff7c, 0xff66, 0xff50, 0xff3a, 0xff24, 0xff0e, 0xfef8, 0xfee2, 0xfecc, 0xfeb6, + 0xfea0, 0xfe8a, 0xfe74, 0xfe5e, 0xfe48, 0xfe32, 0xfe1c, 0xfe06, 0xfdf0, 0xfdda, 0xfdc4, 0xfdae, 0xfd98, 0xfd82, 0xfd6c, 0xfd56}, + { 0x0000, 0xffeb, 0xffd6, 0xffc1, 0xffac, 0xff97, 0xff82, 0xff6d, 0xff58, 0xff43, 0xff2e, 0xff19, 0xff04, 0xfeef, 0xfeda, 0xfec5, + 0xfeb0, 0xfe9b, 0xfe86, 0xfe71, 0xfe5c, 0xfe47, 0xfe32, 0xfe1d, 0xfe08, 0xfdf3, 0xfdde, 0xfdc9, 0xfdb4, 0xfd9f, 0xfd8a, 0xfd75}, + { 0x0000, 0xffec, 0xffd8, 0xffc4, 0xffb0, 0xff9c, 0xff88, 0xff74, 0xff60, 0xff4c, 0xff38, 0xff24, 0xff10, 0xfefc, 0xfee8, 0xfed4, + 0xfec0, 0xfeac, 0xfe98, 0xfe84, 0xfe70, 0xfe5c, 0xfe48, 0xfe34, 0xfe20, 0xfe0c, 0xfdf8, 0xfde4, 0xfdd0, 0xfdbc, 0xfda8, 0xfd94}, + { 0x0000, 0xffed, 0xffda, 0xffc7, 0xffb4, 0xffa1, 0xff8e, 0xff7b, 0xff68, 0xff55, 0xff42, 0xff2f, 0xff1c, 0xff09, 0xfef6, 0xfee3, + 0xfed0, 0xfebd, 0xfeaa, 0xfe97, 0xfe84, 0xfe71, 0xfe5e, 0xfe4b, 0xfe38, 0xfe25, 0xfe12, 0xfdff, 0xfdec, 0xfdd9, 0xfdc6, 0xfdb3}, + { 0x0000, 0xffee, 0xffdc, 0xffca, 0xffb8, 0xffa6, 0xff94, 0xff82, 0xff70, 0xff5e, 0xff4c, 0xff3a, 0xff28, 0xff16, 0xff04, 0xfef2, + 0xfee0, 0xfece, 0xfebc, 0xfeaa, 0xfe98, 0xfe86, 0xfe74, 0xfe62, 0xfe50, 0xfe3e, 0xfe2c, 0xfe1a, 0xfe08, 0xfdf6, 0xfde4, 0xfdd2}, + { 0x0000, 0xffef, 0xffde, 0xffcd, 0xffbc, 0xffab, 0xff9a, 0xff89, 0xff78, 0xff67, 0xff56, 0xff45, 0xff34, 0xff23, 0xff12, 0xff01, + 0xfef0, 0xfedf, 0xfece, 0xfebd, 0xfeac, 0xfe9b, 0xfe8a, 0xfe79, 0xfe68, 0xfe57, 0xfe46, 0xfe35, 0xfe24, 0xfe13, 0xfe02, 0xfdf1}, + { 0x0000, 0xfff0, 0xffe0, 0xffd0, 0xffc0, 0xffb0, 0xffa0, 0xff90, 0xff80, 0xff70, 0xff60, 0xff50, 0xff40, 0xff30, 0xff20, 0xff10, + 0xff00, 0xfef0, 0xfee0, 0xfed0, 0xfec0, 0xfeb0, 0xfea0, 0xfe90, 0xfe80, 0xfe70, 0xfe60, 0xfe50, 0xfe40, 0xfe30, 0xfe20, 0xfe10}, + { 0x0000, 0xfff1, 0xffe2, 0xffd3, 0xffc4, 0xffb5, 0xffa6, 0xff97, 0xff88, 0xff79, 0xff6a, 0xff5b, 0xff4c, 0xff3d, 0xff2e, 0xff1f, + 0xff10, 0xff01, 0xfef2, 0xfee3, 0xfed4, 0xfec5, 0xfeb6, 0xfea7, 0xfe98, 0xfe89, 0xfe7a, 0xfe6b, 0xfe5c, 0xfe4d, 0xfe3e, 0xfe2f}, + { 0x0000, 0xfff2, 0xffe4, 0xffd6, 0xffc8, 0xffba, 0xffac, 0xff9e, 0xff90, 0xff82, 0xff74, 0xff66, 0xff58, 0xff4a, 0xff3c, 0xff2e, + 0xff20, 0xff12, 0xff04, 0xfef6, 0xfee8, 0xfeda, 0xfecc, 0xfebe, 0xfeb0, 0xfea2, 0xfe94, 0xfe86, 0xfe78, 0xfe6a, 0xfe5c, 0xfe4e}, + { 0x0000, 0xfff3, 0xffe6, 0xffd9, 0xffcc, 0xffbf, 0xffb2, 0xffa5, 0xff98, 0xff8b, 0xff7e, 0xff71, 0xff64, 0xff57, 0xff4a, 0xff3d, + 0xff30, 0xff23, 0xff16, 0xff09, 0xfefc, 0xfeef, 0xfee2, 0xfed5, 0xfec8, 0xfebb, 0xfeae, 0xfea1, 0xfe94, 0xfe87, 0xfe7a, 0xfe6d}, + { 0x0000, 0xfff4, 0xffe8, 0xffdc, 0xffd0, 0xffc4, 0xffb8, 0xffac, 0xffa0, 0xff94, 0xff88, 0xff7c, 0xff70, 0xff64, 0xff58, 0xff4c, + 0xff40, 0xff34, 0xff28, 0xff1c, 0xff10, 0xff04, 0xfef8, 0xfeec, 0xfee0, 0xfed4, 0xfec8, 0xfebc, 0xfeb0, 0xfea4, 0xfe98, 0xfe8c}, + { 0x0000, 0xfff5, 0xffea, 0xffdf, 0xffd4, 0xffc9, 0xffbe, 0xffb3, 0xffa8, 0xff9d, 0xff92, 0xff87, 0xff7c, 0xff71, 0xff66, 0xff5b, + 0xff50, 0xff45, 0xff3a, 0xff2f, 0xff24, 0xff19, 0xff0e, 0xff03, 0xfef8, 0xfeed, 0xfee2, 0xfed7, 0xfecc, 0xfec1, 0xfeb6, 0xfeab}, + { 0x0000, 0xfff6, 0xffec, 0xffe2, 0xffd8, 0xffce, 0xffc4, 0xffba, 0xffb0, 0xffa6, 0xff9c, 0xff92, 0xff88, 0xff7e, 0xff74, 0xff6a, + 0xff60, 0xff56, 0xff4c, 0xff42, 0xff38, 0xff2e, 0xff24, 0xff1a, 0xff10, 0xff06, 0xfefc, 0xfef2, 0xfee8, 0xfede, 0xfed4, 0xfeca}, + { 0x0000, 0xfff7, 0xffee, 0xffe5, 0xffdc, 0xffd3, 0xffca, 0xffc1, 0xffb8, 0xffaf, 0xffa6, 0xff9d, 0xff94, 0xff8b, 0xff82, 0xff79, + 0xff70, 0xff67, 0xff5e, 0xff55, 0xff4c, 0xff43, 0xff3a, 0xff31, 0xff28, 0xff1f, 0xff16, 0xff0d, 0xff04, 0xfefb, 0xfef2, 0xfee9}, + { 0x0000, 0xfff8, 0xfff0, 0xffe8, 0xffe0, 0xffd8, 0xffd0, 0xffc8, 0xffc0, 0xffb8, 0xffb0, 0xffa8, 0xffa0, 0xff98, 0xff90, 0xff88, + 0xff80, 0xff78, 0xff70, 0xff68, 0xff60, 0xff58, 0xff50, 0xff48, 0xff40, 0xff38, 0xff30, 0xff28, 0xff20, 0xff18, 0xff10, 0xff08}, + { 0x0000, 0xfff9, 0xfff2, 0xffeb, 0xffe4, 0xffdd, 0xffd6, 0xffcf, 0xffc8, 0xffc1, 0xffba, 0xffb3, 0xffac, 0xffa5, 0xff9e, 0xff97, + 0xff90, 0xff89, 0xff82, 0xff7b, 0xff74, 0xff6d, 0xff66, 0xff5f, 0xff58, 0xff51, 0xff4a, 0xff43, 0xff3c, 0xff35, 0xff2e, 0xff27}, + { 0x0000, 0xfffa, 0xfff4, 0xffee, 0xffe8, 0xffe2, 0xffdc, 0xffd6, 0xffd0, 0xffca, 0xffc4, 0xffbe, 0xffb8, 0xffb2, 0xffac, 0xffa6, + 0xffa0, 0xff9a, 0xff94, 0xff8e, 0xff88, 0xff82, 0xff7c, 0xff76, 0xff70, 0xff6a, 0xff64, 0xff5e, 0xff58, 0xff52, 0xff4c, 0xff46}, + { 0x0000, 0xfffb, 0xfff6, 0xfff1, 0xffec, 0xffe7, 0xffe2, 0xffdd, 0xffd8, 0xffd3, 0xffce, 0xffc9, 0xffc4, 0xffbf, 0xffba, 0xffb5, + 0xffb0, 0xffab, 0xffa6, 0xffa1, 0xff9c, 0xff97, 0xff92, 0xff8d, 0xff88, 0xff83, 0xff7e, 0xff79, 0xff74, 0xff6f, 0xff6a, 0xff65}, + { 0x0000, 0xfffc, 0xfff8, 0xfff4, 0xfff0, 0xffec, 0xffe8, 0xffe4, 0xffe0, 0xffdc, 0xffd8, 0xffd4, 0xffd0, 0xffcc, 0xffc8, 0xffc4, + 0xffc0, 0xffbc, 0xffb8, 0xffb4, 0xffb0, 0xffac, 0xffa8, 0xffa4, 0xffa0, 0xff9c, 0xff98, 0xff94, 0xff90, 0xff8c, 0xff88, 0xff84}, + { 0x0000, 0xfffd, 0xfffa, 0xfff7, 0xfff4, 0xfff1, 0xffee, 0xffeb, 0xffe8, 0xffe5, 0xffe2, 0xffdf, 0xffdc, 0xffd9, 0xffd6, 0xffd3, + 0xffd0, 0xffcd, 0xffca, 0xffc7, 0xffc4, 0xffc1, 0xffbe, 0xffbb, 0xffb8, 0xffb5, 0xffb2, 0xffaf, 0xffac, 0xffa9, 0xffa6, 0xffa3}, + { 0x0000, 0xfffe, 0xfffc, 0xfffa, 0xfff8, 0xfff6, 0xfff4, 0xfff2, 0xfff0, 0xffee, 0xffec, 0xffea, 0xffe8, 0xffe6, 0xffe4, 0xffe2, + 0xffe0, 0xffde, 0xffdc, 0xffda, 0xffd8, 0xffd6, 0xffd4, 0xffd2, 0xffd0, 0xffce, 0xffcc, 0xffca, 0xffc8, 0xffc6, 0xffc4, 0xffc2}, + { 0x0000, 0xffff, 0xfffe, 0xfffd, 0xfffc, 0xfffb, 0xfffa, 0xfff9, 0xfff8, 0xfff7, 0xfff6, 0xfff5, 0xfff4, 0xfff3, 0xfff2, 0xfff1, + 0xfff0, 0xffef, 0xffee, 0xffed, 0xffec, 0xffeb, 0xffea, 0xffe9, 0xffe8, 0xffe7, 0xffe6, 0xffe5, 0xffe4, 0xffe3, 0xffe2, 0xffe1}, + { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000}, + { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f}, + { 0x0000, 0x0002, 0x0004, 0x0006, 0x0008, 0x000a, 0x000c, 0x000e, 0x0010, 0x0012, 0x0014, 0x0016, 0x0018, 0x001a, 0x001c, 0x001e, + 0x0020, 0x0022, 0x0024, 0x0026, 0x0028, 0x002a, 0x002c, 0x002e, 0x0030, 0x0032, 0x0034, 0x0036, 0x0038, 0x003a, 0x003c, 0x003e}, + { 0x0000, 0x0003, 0x0006, 0x0009, 0x000c, 0x000f, 0x0012, 0x0015, 0x0018, 0x001b, 0x001e, 0x0021, 0x0024, 0x0027, 0x002a, 0x002d, + 0x0030, 0x0033, 0x0036, 0x0039, 0x003c, 0x003f, 0x0042, 0x0045, 0x0048, 0x004b, 0x004e, 0x0051, 0x0054, 0x0057, 0x005a, 0x005d}, + { 0x0000, 0x0004, 0x0008, 0x000c, 0x0010, 0x0014, 0x0018, 0x001c, 0x0020, 0x0024, 0x0028, 0x002c, 0x0030, 0x0034, 0x0038, 0x003c, + 0x0040, 0x0044, 0x0048, 0x004c, 0x0050, 0x0054, 0x0058, 0x005c, 0x0060, 0x0064, 0x0068, 0x006c, 0x0070, 0x0074, 0x0078, 0x007c}, + { 0x0000, 0x0005, 0x000a, 0x000f, 0x0014, 0x0019, 0x001e, 0x0023, 0x0028, 0x002d, 0x0032, 0x0037, 0x003c, 0x0041, 0x0046, 0x004b, + 0x0050, 0x0055, 0x005a, 0x005f, 0x0064, 0x0069, 0x006e, 0x0073, 0x0078, 0x007d, 0x0082, 0x0087, 0x008c, 0x0091, 0x0096, 0x009b}, + { 0x0000, 0x0006, 0x000c, 0x0012, 0x0018, 0x001e, 0x0024, 0x002a, 0x0030, 0x0036, 0x003c, 0x0042, 0x0048, 0x004e, 0x0054, 0x005a, + 0x0060, 0x0066, 0x006c, 0x0072, 0x0078, 0x007e, 0x0084, 0x008a, 0x0090, 0x0096, 0x009c, 0x00a2, 0x00a8, 0x00ae, 0x00b4, 0x00ba}, + { 0x0000, 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x002a, 0x0031, 0x0038, 0x003f, 0x0046, 0x004d, 0x0054, 0x005b, 0x0062, 0x0069, + 0x0070, 0x0077, 0x007e, 0x0085, 0x008c, 0x0093, 0x009a, 0x00a1, 0x00a8, 0x00af, 0x00b6, 0x00bd, 0x00c4, 0x00cb, 0x00d2, 0x00d9}, + { 0x0000, 0x0008, 0x0010, 0x0018, 0x0020, 0x0028, 0x0030, 0x0038, 0x0040, 0x0048, 0x0050, 0x0058, 0x0060, 0x0068, 0x0070, 0x0078, + 0x0080, 0x0088, 0x0090, 0x0098, 0x00a0, 0x00a8, 0x00b0, 0x00b8, 0x00c0, 0x00c8, 0x00d0, 0x00d8, 0x00e0, 0x00e8, 0x00f0, 0x00f8}, + { 0x0000, 0x0009, 0x0012, 0x001b, 0x0024, 0x002d, 0x0036, 0x003f, 0x0048, 0x0051, 0x005a, 0x0063, 0x006c, 0x0075, 0x007e, 0x0087, + 0x0090, 0x0099, 0x00a2, 0x00ab, 0x00b4, 0x00bd, 0x00c6, 0x00cf, 0x00d8, 0x00e1, 0x00ea, 0x00f3, 0x00fc, 0x0105, 0x010e, 0x0117}, + { 0x0000, 0x000a, 0x0014, 0x001e, 0x0028, 0x0032, 0x003c, 0x0046, 0x0050, 0x005a, 0x0064, 0x006e, 0x0078, 0x0082, 0x008c, 0x0096, + 0x00a0, 0x00aa, 0x00b4, 0x00be, 0x00c8, 0x00d2, 0x00dc, 0x00e6, 0x00f0, 0x00fa, 0x0104, 0x010e, 0x0118, 0x0122, 0x012c, 0x0136}, + { 0x0000, 0x000b, 0x0016, 0x0021, 0x002c, 0x0037, 0x0042, 0x004d, 0x0058, 0x0063, 0x006e, 0x0079, 0x0084, 0x008f, 0x009a, 0x00a5, + 0x00b0, 0x00bb, 0x00c6, 0x00d1, 0x00dc, 0x00e7, 0x00f2, 0x00fd, 0x0108, 0x0113, 0x011e, 0x0129, 0x0134, 0x013f, 0x014a, 0x0155}, + { 0x0000, 0x000c, 0x0018, 0x0024, 0x0030, 0x003c, 0x0048, 0x0054, 0x0060, 0x006c, 0x0078, 0x0084, 0x0090, 0x009c, 0x00a8, 0x00b4, + 0x00c0, 0x00cc, 0x00d8, 0x00e4, 0x00f0, 0x00fc, 0x0108, 0x0114, 0x0120, 0x012c, 0x0138, 0x0144, 0x0150, 0x015c, 0x0168, 0x0174}, + { 0x0000, 0x000d, 0x001a, 0x0027, 0x0034, 0x0041, 0x004e, 0x005b, 0x0068, 0x0075, 0x0082, 0x008f, 0x009c, 0x00a9, 0x00b6, 0x00c3, + 0x00d0, 0x00dd, 0x00ea, 0x00f7, 0x0104, 0x0111, 0x011e, 0x012b, 0x0138, 0x0145, 0x0152, 0x015f, 0x016c, 0x0179, 0x0186, 0x0193}, + { 0x0000, 0x000e, 0x001c, 0x002a, 0x0038, 0x0046, 0x0054, 0x0062, 0x0070, 0x007e, 0x008c, 0x009a, 0x00a8, 0x00b6, 0x00c4, 0x00d2, + 0x00e0, 0x00ee, 0x00fc, 0x010a, 0x0118, 0x0126, 0x0134, 0x0142, 0x0150, 0x015e, 0x016c, 0x017a, 0x0188, 0x0196, 0x01a4, 0x01b2}, + { 0x0000, 0x000f, 0x001e, 0x002d, 0x003c, 0x004b, 0x005a, 0x0069, 0x0078, 0x0087, 0x0096, 0x00a5, 0x00b4, 0x00c3, 0x00d2, 0x00e1, + 0x00f0, 0x00ff, 0x010e, 0x011d, 0x012c, 0x013b, 0x014a, 0x0159, 0x0168, 0x0177, 0x0186, 0x0195, 0x01a4, 0x01b3, 0x01c2, 0x01d1}, + { 0x0000, 0x0010, 0x0020, 0x0030, 0x0040, 0x0050, 0x0060, 0x0070, 0x0080, 0x0090, 0x00a0, 0x00b0, 0x00c0, 0x00d0, 0x00e0, 0x00f0, + 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, 0x0180, 0x0190, 0x01a0, 0x01b0, 0x01c0, 0x01d0, 0x01e0, 0x01f0}, + { 0x0000, 0x0011, 0x0022, 0x0033, 0x0044, 0x0055, 0x0066, 0x0077, 0x0088, 0x0099, 0x00aa, 0x00bb, 0x00cc, 0x00dd, 0x00ee, 0x00ff, + 0x0110, 0x0121, 0x0132, 0x0143, 0x0154, 0x0165, 0x0176, 0x0187, 0x0198, 0x01a9, 0x01ba, 0x01cb, 0x01dc, 0x01ed, 0x01fe, 0x020f}, + { 0x0000, 0x0012, 0x0024, 0x0036, 0x0048, 0x005a, 0x006c, 0x007e, 0x0090, 0x00a2, 0x00b4, 0x00c6, 0x00d8, 0x00ea, 0x00fc, 0x010e, + 0x0120, 0x0132, 0x0144, 0x0156, 0x0168, 0x017a, 0x018c, 0x019e, 0x01b0, 0x01c2, 0x01d4, 0x01e6, 0x01f8, 0x020a, 0x021c, 0x022e}, + { 0x0000, 0x0013, 0x0026, 0x0039, 0x004c, 0x005f, 0x0072, 0x0085, 0x0098, 0x00ab, 0x00be, 0x00d1, 0x00e4, 0x00f7, 0x010a, 0x011d, + 0x0130, 0x0143, 0x0156, 0x0169, 0x017c, 0x018f, 0x01a2, 0x01b5, 0x01c8, 0x01db, 0x01ee, 0x0201, 0x0214, 0x0227, 0x023a, 0x024d}, + { 0x0000, 0x0014, 0x0028, 0x003c, 0x0050, 0x0064, 0x0078, 0x008c, 0x00a0, 0x00b4, 0x00c8, 0x00dc, 0x00f0, 0x0104, 0x0118, 0x012c, + 0x0140, 0x0154, 0x0168, 0x017c, 0x0190, 0x01a4, 0x01b8, 0x01cc, 0x01e0, 0x01f4, 0x0208, 0x021c, 0x0230, 0x0244, 0x0258, 0x026c}, + { 0x0000, 0x0015, 0x002a, 0x003f, 0x0054, 0x0069, 0x007e, 0x0093, 0x00a8, 0x00bd, 0x00d2, 0x00e7, 0x00fc, 0x0111, 0x0126, 0x013b, + 0x0150, 0x0165, 0x017a, 0x018f, 0x01a4, 0x01b9, 0x01ce, 0x01e3, 0x01f8, 0x020d, 0x0222, 0x0237, 0x024c, 0x0261, 0x0276, 0x028b}, + { 0x0000, 0x0016, 0x002c, 0x0042, 0x0058, 0x006e, 0x0084, 0x009a, 0x00b0, 0x00c6, 0x00dc, 0x00f2, 0x0108, 0x011e, 0x0134, 0x014a, + 0x0160, 0x0176, 0x018c, 0x01a2, 0x01b8, 0x01ce, 0x01e4, 0x01fa, 0x0210, 0x0226, 0x023c, 0x0252, 0x0268, 0x027e, 0x0294, 0x02aa}, + { 0x0000, 0x0017, 0x002e, 0x0045, 0x005c, 0x0073, 0x008a, 0x00a1, 0x00b8, 0x00cf, 0x00e6, 0x00fd, 0x0114, 0x012b, 0x0142, 0x0159, + 0x0170, 0x0187, 0x019e, 0x01b5, 0x01cc, 0x01e3, 0x01fa, 0x0211, 0x0228, 0x023f, 0x0256, 0x026d, 0x0284, 0x029b, 0x02b2, 0x02c9}, + { 0x0000, 0x0018, 0x0030, 0x0048, 0x0060, 0x0078, 0x0090, 0x00a8, 0x00c0, 0x00d8, 0x00f0, 0x0108, 0x0120, 0x0138, 0x0150, 0x0168, + 0x0180, 0x0198, 0x01b0, 0x01c8, 0x01e0, 0x01f8, 0x0210, 0x0228, 0x0240, 0x0258, 0x0270, 0x0288, 0x02a0, 0x02b8, 0x02d0, 0x02e8}, + { 0x0000, 0x0019, 0x0032, 0x004b, 0x0064, 0x007d, 0x0096, 0x00af, 0x00c8, 0x00e1, 0x00fa, 0x0113, 0x012c, 0x0145, 0x015e, 0x0177, + 0x0190, 0x01a9, 0x01c2, 0x01db, 0x01f4, 0x020d, 0x0226, 0x023f, 0x0258, 0x0271, 0x028a, 0x02a3, 0x02bc, 0x02d5, 0x02ee, 0x0307}, + { 0x0000, 0x001a, 0x0034, 0x004e, 0x0068, 0x0082, 0x009c, 0x00b6, 0x00d0, 0x00ea, 0x0104, 0x011e, 0x0138, 0x0152, 0x016c, 0x0186, + 0x01a0, 0x01ba, 0x01d4, 0x01ee, 0x0208, 0x0222, 0x023c, 0x0256, 0x0270, 0x028a, 0x02a4, 0x02be, 0x02d8, 0x02f2, 0x030c, 0x0326}, + { 0x0000, 0x001b, 0x0036, 0x0051, 0x006c, 0x0087, 0x00a2, 0x00bd, 0x00d8, 0x00f3, 0x010e, 0x0129, 0x0144, 0x015f, 0x017a, 0x0195, + 0x01b0, 0x01cb, 0x01e6, 0x0201, 0x021c, 0x0237, 0x0252, 0x026d, 0x0288, 0x02a3, 0x02be, 0x02d9, 0x02f4, 0x030f, 0x032a, 0x0345}, + { 0x0000, 0x001c, 0x0038, 0x0054, 0x0070, 0x008c, 0x00a8, 0x00c4, 0x00e0, 0x00fc, 0x0118, 0x0134, 0x0150, 0x016c, 0x0188, 0x01a4, + 0x01c0, 0x01dc, 0x01f8, 0x0214, 0x0230, 0x024c, 0x0268, 0x0284, 0x02a0, 0x02bc, 0x02d8, 0x02f4, 0x0310, 0x032c, 0x0348, 0x0364}, + { 0x0000, 0x001d, 0x003a, 0x0057, 0x0074, 0x0091, 0x00ae, 0x00cb, 0x00e8, 0x0105, 0x0122, 0x013f, 0x015c, 0x0179, 0x0196, 0x01b3, + 0x01d0, 0x01ed, 0x020a, 0x0227, 0x0244, 0x0261, 0x027e, 0x029b, 0x02b8, 0x02d5, 0x02f2, 0x030f, 0x032c, 0x0349, 0x0366, 0x0383}, + { 0x0000, 0x001e, 0x003c, 0x005a, 0x0078, 0x0096, 0x00b4, 0x00d2, 0x00f0, 0x010e, 0x012c, 0x014a, 0x0168, 0x0186, 0x01a4, 0x01c2, + 0x01e0, 0x01fe, 0x021c, 0x023a, 0x0258, 0x0276, 0x0294, 0x02b2, 0x02d0, 0x02ee, 0x030c, 0x032a, 0x0348, 0x0366, 0x0384, 0x03a2}, + { 0x0000, 0x001f, 0x003e, 0x005d, 0x007c, 0x009b, 0x00ba, 0x00d9, 0x00f8, 0x0117, 0x0136, 0x0155, 0x0174, 0x0193, 0x01b2, 0x01d1, + 0x01f0, 0x020f, 0x022e, 0x024d, 0x026c, 0x028b, 0x02aa, 0x02c9, 0x02e8, 0x0307, 0x0326, 0x0345, 0x0364, 0x0383, 0x03a2, 0x03c1} +}; + +static const int8_t outLvlTbl[16][16] = { + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2}, + { 0, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4}, + { 0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6}, + { 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8}, + { 0, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 9, 9, 10}, + { 0, 1, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11, 12}, + { 0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 8, 10, 11, 12, 13, 14}, + { 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}, + { 0, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17}, + { 0, 2, 3, 4, 6, 7, 8, 9, 11, 12, 13, 14, 16, 17, 18, 19}, + { 0, 2, 3, 5, 6, 7, 9, 10, 12, 13, 14, 16, 17, 18, 20, 21}, + { 0, 2, 4, 5, 7, 8, 10, 11, 13, 14, 16, 17, 19, 20, 22, 23}, + { 0, 2, 4, 5, 7, 9, 10, 12, 14, 15, 17, 18, 20, 22, 23, 25}, + { 0, 2, 4, 6, 8, 9, 11, 13, 15, 16, 18, 20, 22, 23, 25, 27}, + { 0, 2, 4, 6, 8, 10, 12, 14, 16, 17, 19, 21, 23, 25, 27, 29} +}; + +static inline uint8_t mgetb(uint8_t *ptr) { return *ptr; } +static inline void mputb(uint8_t *ptr, int8_t data) { *ptr = data; } + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// vboysnd_device - constructor +//------------------------------------------------- + +vboysnd_device::vboysnd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, VBOYSND, tag, owner, clock) + , device_sound_interface(mconfig, *this) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void vboysnd_device::device_start() +{ + uint32_t rate = clock() / 120; + // create the stream + m_stream = stream_alloc(0, 2, rate); + + m_timer = timer_alloc(FUNC(vboysnd_device::delayed_stream_update), this); + m_timer->adjust(attotime::zero, 0, rate ? attotime::from_hz(rate / 4) : attotime::never); + + for (int i=0; i<2048; i++) + waveFreq2LenTbl[i] = ((2048 - i) * 32) / 120; + for (int i=0; i<32; i++) + waveTimer2LenTbl[i] = (i+1) * 120; + for (int i=0; i<8; i++) + waveEnv2LenTbl[i] = (i + 1) * 4 * 120; + + for (int i = 0; i < 5; i++) + memset(&snd_channel[i], 0, sizeof(s_snd_channel)); + + memset(m_aram, 0, 0x600); +} + + +//------------------------------------------------- +// device_clock_changed +//------------------------------------------------- + +void vboysnd_device::device_clock_changed() +{ + uint32_t rate = clock() / 120; + m_stream->set_sample_rate(rate); + + m_timer->adjust(attotime::zero, 0, rate ? attotime::from_hz(rate / 4) : attotime::never); +} + + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void vboysnd_device::device_reset() +{ + m_stream->update(); + + int i; + + for (i=0; i<4; i++) + snd_channel[i].playing = false; +} + +//------------------------------------------------- +// delayed_stream_update +//------------------------------------------------- + +TIMER_CALLBACK_MEMBER(vboysnd_device::delayed_stream_update) +{ + m_stream->update(); +} + +//------------------------------------------------- +// sound_stream_update - handle update requests for +// our sound stream +//------------------------------------------------- + +void vboysnd_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) +{ + int len, i, j, channel; + + auto &outL = outputs[0]; + auto &outR = outputs[1]; + + len = outL.samples(); + +// if (mgetb(m_aram+SST0P) & 0x1) // Sound Stop Reg +// goto end; + + for (channel=0; channel<5; channel++) + { + float size; + int k = 0, waveAddr; + + i = channel * 0x40; + snd_channel[channel].sample_len = waveFreq2LenTbl[((mgetb(m_aram+SxFQHb+i) & 0x7) << 8) | mgetb(m_aram+SxFQLb+i)]; + waveAddr = (mgetb(m_aram + SxRAMb + i) & 0x3) << 7; + + size = (float)snd_channel[channel].sample_len / 32.0f; + for (j=0; j<32;) + { + int8_t byte = mgetb(m_aram + waveAddr + (j++ << 2)) & 0x3f; +// int8_t nbyte = mgetb(m_aram + waveAddr + (j << 2)) & 0x3f; + int end = (int)(((float)j)*size); + float val, add; + + val = (float)byte; + add = /*(nbyte-byte)/(end-k)*/ 0.0; // no interpolation + + for (; kplaying) + continue; + + outLeft = outLvlTbl[channel->volLeft][channel->envelope]; + outRight = outLvlTbl[channel->volRight][channel->envelope]; +// env1 = ((uint8_t)mgetb(m_aram+SxEV1b+i*0x40)); + if (channel->env1 & 0x01) + { + channel->env_time++; + +// env0 = ((uint8_t)mgetb(m_aram+SxEV0b+i*0x40)); + if (channel->env_time >= channel->env_steptime /*waveEnv2LenTbl[env0 & 0x7]*/) + { + // it's time for a step + channel->env_time = 0; + if (channel->env0 & 0x08) + { + // step up + channel->envelope++; + if (channel->envelope >= 0xf) + { + if (channel->env1 & 0x02) channel->envelope = channel->env0 >> 4; + else { channel->env1 &= ~0x01; channel->envelope = 0xf; } + } + } + else + { + // step down + channel->envelope--; + if (channel->envelope <= 0) + { + if (channel->env1 & 0x02) channel->envelope = channel->env0 >> 4; + else { channel->env1 &= ~0x01; channel->envelope = 0x0; } + } + } + } + } + + outTblPtr = (int16_t *) outTbl[channel->sample[channel->offset]]; + if (outLeft) note_left += outTblPtr[outLeft ]; + if (outRight) note_right += outTblPtr[outRight]; + channel->offset++; + + if (channel->offset >= channel->sample_len) + channel->offset = 0; + + if (channel->time > 0) + { + channel->time--; + if (channel->time <= 0) + channel->playing = false; + } + } + + + // scale to 16 bits + note_left = (note_left << 5) | ((note_left >> 6) & 0x1f); + note_right = (note_right << 5) | ((note_right >> 6) & 0x1f); + + outL.put_int_clamp(j, (int16_t)note_left, 32768); + outR.put_int_clamp(j, (int16_t)note_right, 32768); + } +} + +//------------------------------------------------- +// read - read from the chip's registers and internal RAM +//------------------------------------------------- + +uint8_t vboysnd_device::read(offs_t offset) +{ + m_stream->update(); + return m_aram[offset]; +} + +//------------------------------------------------- +// write - write to the chip's registers and internal RAM +//------------------------------------------------- + +void vboysnd_device::write(offs_t offset, uint8_t data) +{ + int freq, i; +// int waveAddr; + int volReg, intervalReg; + int channel, ouroffs; + + mputb((uint8_t *)m_aram+offset, data); + if (offset < 0x400) + return; + + channel = (offset-0x400) >> 6; + ouroffs = offset & 0x3f; + + ///process_sound(cpu.vcount); + + if (channel == 6 && ouroffs == 0) + { + if (mgetb(m_aram+SST0P) & 0x1) + for (i=0; i<4; i++) + snd_channel[i].playing = 0; + return; + } + + // Extract frequencies and build the wave for the first 4 sound sources + i = channel * 0x40; + switch (ouroffs) + { + case SxLRV: + if (channel < 5) + { + volReg = mgetb(m_aram + SxLRVb + i); // 6-4-4 - L/R output level setting + if (snd_channel[channel].playing) + { + snd_channel[channel].volLeft = ((uint8_t)volReg) >> 4; + snd_channel[channel].volRight = ((uint8_t)volReg) & 0xf; + break; + } + } + [[fallthrough]]; // FIXME: really? + case SxINT: + if (channel < 5) + { + uint8_t env0, env1; + // find out if the sound is playing + intervalReg = mgetb(m_aram + SxINTb + i); // 6-4-6 - Sound Interval + volReg = mgetb(m_aram + SxLRVb + i); // 6-4-4 - L/R output level setting + + if (((intervalReg & 0x80) == 0) || (volReg == 0)) + { + snd_channel[channel].playing = false; + return; + } + snd_channel[channel].playing = true; + + // 6-4-1 - Waveform address comes from SxRAM. +// waveAddr = (mgetb(m_aram + SxRAMb + i) & 0x3) << 7; + + // 6-4-15 - Frequency comes from here + freq = ((mgetb(m_aram+SxFQHb+i) & 0x7) << 8) | mgetb(m_aram+SxFQLb+i); + + env0 = mgetb(m_aram+SxEV0b+i); env1 = mgetb(m_aram+SxEV1b+i); + snd_channel[channel].env0 = env0; + snd_channel[channel].env1 = env1; + snd_channel[channel].volLeft = ((uint8_t)volReg) >> 4; + snd_channel[channel].volRight = ((uint8_t)volReg) & 0xf; + snd_channel[channel].env_steptime = (env1 & 0x1) ? waveEnv2LenTbl[env0 & 0x7] : 0; + snd_channel[channel].sample_len = waveFreq2LenTbl[freq]; + + snd_channel[channel].offset = 0; + snd_channel[channel].time = (intervalReg & 0x20) ? waveTimer2LenTbl[intervalReg & 0x1f] : 0; + snd_channel[channel].envelope = ((uint8_t)mgetb(m_aram+SxEV0b+i)) >> 4; + snd_channel[channel].env_time = 0; + } + else + { + intervalReg = mgetb(m_aram + SxINTb + i); // 6-4-6 - Sound Interval + volReg = mgetb(m_aram + SxLRVb + i); // 6-4-4 - L/R output level setting + + if (((intervalReg & 0x80) == 0) || (volReg == 0)) + { +// snd_channel[channel].playing = false; + return; + } +// Debugger(); // uses white noise +// snd_channel[channel].playing = true; + } + break; + + case SxEV0: + if (channel < 5) + if (snd_channel[channel].playing) + snd_channel[channel].envelope = ((uint8_t)mgetb(m_aram+SxEV0b+i)) >> 4; + break; + } +} diff --git a/src/mame/messshared/vboysound.h b/src/mame/messshared/vboysound.h new file mode 100644 index 00000000000..11f8dbc44b8 --- /dev/null +++ b/src/mame/messshared/vboysound.h @@ -0,0 +1,92 @@ +// license:BSD-3-Clause +// copyright-holders:R. Belmont +/* + vboy.h - Virtual Boy audio emulation + + By Richard Bannister and Gil Pedersen. + MAME device adaptation by R. Belmont +*/ +#ifndef MAME_AUDIO_VBOY_H +#define MAME_AUDIO_VBOY_H + +#pragma once + + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +// ======================> vboysnd_device + +class vboysnd_device : public device_t, public device_sound_interface +{ +public: + // construction/destruction + vboysnd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 5'000'000); + + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + + sound_stream *m_stream = nullptr; + +protected: + static constexpr unsigned CHANNELS = 4; + + struct s_snd_channel { + int8_t playing = 0; // the sound is playing + + // state when sound was enabled + uint32_t env_steptime = 0; // Envelope step time + uint8_t env0 = 0; // Envelope data + uint8_t env1 = 0; // Envelope data + uint8_t volLeft = 0; // Left output volume + uint8_t volRight = 0; // Right output volume + uint8_t sample[580]{}; // sample to play + int sample_len = 0; // length of sample + + // values that change, as the sample is played + int offset = 0; // current offset in sample + int time = 0; // the duration that this sample is to be played + uint8_t envelope = 0; // Current envelope level (604) + int env_time = 0; // The duration between envelope decay/grow (608) + }; + + struct s_regchan { + int32_t sINT; + int32_t sLRV; + int32_t sFQL; + int32_t sFQH; + int32_t sEV0; + int32_t sEV1; + int32_t sRAM; + }; + + struct s_sreg { + // Sound registers structure + s_regchan c[4]; + }; + + // device-level overrides + virtual void device_start() override; + virtual void device_clock_changed() override; + virtual void device_reset() override; + + virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; + + TIMER_CALLBACK_MEMBER(delayed_stream_update); + + s_snd_channel snd_channel[5]; + + uint16_t waveFreq2LenTbl[2048]; + uint16_t waveTimer2LenTbl[32]; + uint16_t waveEnv2LenTbl[8]; + + emu_timer *m_timer = nullptr; + + uint8_t m_aram[0x600]; +}; + +// device type definition +DECLARE_DEVICE_TYPE(VBOYSND, vboysnd_device) + +#endif //MAME_AUDIO_VBOY_H diff --git a/src/mame/messshared/vt100_kbd.cpp b/src/mame/messshared/vt100_kbd.cpp index 7b0b7c7a2c4..70d5fb7cb4d 100644 --- a/src/mame/messshared/vt100_kbd.cpp +++ b/src/mame/messshared/vt100_kbd.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/vt100_kbd.h" +#include "vt100_kbd.h" #include "logmacro.h" diff --git a/src/mame/messshared/wswan_a.cpp b/src/mame/messshared/wswan_a.cpp deleted file mode 100644 index 85c7e1766bc..00000000000 --- a/src/mame/messshared/wswan_a.cpp +++ /dev/null @@ -1,387 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Wilbert Pol -/************************************************************************************** - - Wonderswan sound emulation - - Wilbert Pol - - Sound emulation is preliminary and not complete - - -The noise taps and behavior are the same as the Virtual Boy. - -**************************************************************************************/ - -#include "emu.h" -#include "wswan.h" - - -// device type definition -DEFINE_DEVICE_TYPE(WSWAN_SND, wswan_sound_device, "wswan_sound", "WonderSwan Custom Sound") - - -//************************************************************************** -// LIVE DEVICE -//************************************************************************** - -//------------------------------------------------- -// wswan_sound_device - constructor -//------------------------------------------------- - -wswan_sound_device::wswan_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, WSWAN_SND, tag, owner, clock), - device_sound_interface(mconfig, *this), - device_rom_interface(mconfig, *this), - m_channel(nullptr), - m_sweep_step(0), - m_sweep_time(0), - m_sweep_count(0), - m_noise_type(0), - m_noise_reset(0), - m_noise_enable(0), - m_noise_output(0), - m_sample_address(0), - m_audio2_voice(0), - m_audio3_sweep(0), - m_audio4_noise(0), - m_mono(0), - m_output_volume(0), - m_external_stereo(0), - m_external_speaker(0), - m_noise_shift(0), - m_master_volume(0) -{ -} - -static constexpr int clk_div = 64; - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void wswan_sound_device::device_start() -{ - m_channel = stream_alloc(0, 2, clock() / clk_div); - - save_item(NAME(m_sweep_step)); - save_item(NAME(m_sweep_time)); - save_item(NAME(m_sweep_count)); - save_item(NAME(m_noise_type)); - save_item(NAME(m_noise_reset)); - save_item(NAME(m_noise_enable)); - save_item(NAME(m_sample_address)); - save_item(NAME(m_audio2_voice)); - save_item(NAME(m_audio3_sweep)); - save_item(NAME(m_audio4_noise)); - save_item(NAME(m_mono)); - save_item(NAME(m_output_volume)); - save_item(NAME(m_external_stereo)); - save_item(NAME(m_external_speaker)); - save_item(NAME(m_noise_shift)); - save_item(NAME(m_master_volume)); - save_item(NAME(m_system_volume)); - save_item(STRUCT_MEMBER(m_audio, freq)); - save_item(STRUCT_MEMBER(m_audio, period)); - save_item(STRUCT_MEMBER(m_audio, pos)); - save_item(STRUCT_MEMBER(m_audio, vol_left)); - save_item(STRUCT_MEMBER(m_audio, vol_right)); - save_item(STRUCT_MEMBER(m_audio, on)); - save_item(STRUCT_MEMBER(m_audio, offset)); - save_item(STRUCT_MEMBER(m_audio, signal)); -} - -void wswan_sound_device::device_clock_changed() -{ - m_channel->set_sample_rate(clock() / clk_div); -} - -void wswan_sound_device::rom_bank_updated() -{ - m_channel->update(); -} - -//------------------------------------------------- -// device_reset -//------------------------------------------------- - -void wswan_sound_device::device_reset() -{ - for (int i = 0; i < 4; i++) - { - m_audio[i].on = 0; - m_audio[i].signal = 0; - m_audio[i].offset = 0; - m_audio[i].pos = 0; - } - m_noise_output = 0; -} - -int wswan_sound_device::fetch_sample(int channel, int offset) -{ - u16 w = read_word(m_sample_address + ((channel & 3) << 4) + ((offset >> 1) & 0x0e)); - - return (w >> ((offset & 0x03) * 4)) & 0x0f; -} - -//------------------------------------------------- -// sound_stream_update - handle a stream update -//------------------------------------------------- - -void wswan_sound_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) -{ - auto &outputl = outputs[0]; - auto &outputr = outputs[1]; - for (int sampindex = 0; sampindex < outputl.samples(); sampindex++) - { - s32 left = 0, right = 0; - - if (m_audio[0].on) - { - s32 sample = m_audio[0].signal; - m_audio[0].pos += clk_div; - if (m_audio[0].pos >= m_audio[0].period) - { - m_audio[0].pos -= m_audio[0].period; - m_audio[0].signal = fetch_sample(0, m_audio[0].offset++); - } - left += m_audio[0].vol_left * sample; - right += m_audio[0].vol_right * sample; - } - - if (m_audio[1].on) - { - if (m_audio2_voice) - { - u8 voice_data = (m_audio[1].vol_left << 4) | m_audio[1].vol_right; - left += voice_data * (m_master_volume & 0x0f); - right += voice_data * (m_master_volume & 0x0f); - } - else - { - s32 sample = m_audio[1].signal; - m_audio[1].pos += clk_div; - if (m_audio[1].pos >= m_audio[1].period) - { - m_audio[1].pos -= m_audio[1].period; - m_audio[1].signal = fetch_sample(1, m_audio[1].offset++); - } - left += m_audio[1].vol_left * sample; - right += m_audio[1].vol_right * sample; - } - } - - if (m_audio[2].on) - { - s32 sample = m_audio[2].signal; - m_audio[2].pos += clk_div; - if (m_audio[2].pos >= m_audio[2].period) - { - m_audio[2].pos -= m_audio[2].period; - m_audio[2].signal = fetch_sample(2, m_audio[2].offset++); - } - if (m_audio3_sweep && m_sweep_time) - { - m_sweep_count += clk_div; - if (m_sweep_count >= m_sweep_time) - { - m_sweep_count -= m_sweep_time; - m_audio[2].freq += m_sweep_step; - m_audio[2].freq &= 0x7ff; - m_audio[2].period = 2048 - m_audio[2].freq; - } - } - left += m_audio[2].vol_left * sample; - right += m_audio[2].vol_right * sample; - } - - if (m_audio[3].on) - { - s32 sample = m_audio[3].signal; - m_audio[3].pos += clk_div; - if (m_audio[3].pos >= m_audio[3].period) - { - if (m_audio4_noise) - m_audio[3].signal = m_noise_output ? 0xf : 0; - else - m_audio[3].signal = fetch_sample(3, m_audio[3].offset++); - - m_audio[3].pos -= m_audio[3].period; - - if (m_noise_reset) - { - m_noise_reset = 0; - m_noise_shift = 0; - m_noise_output = 0; - } - - if (m_noise_enable) - { - static int shift_bit[] = { 14, 10, 13, 4, 8, 6, 9, 11 }; - - m_noise_output = (1 ^ (m_noise_shift >> 7) ^ (m_noise_shift >> shift_bit[m_noise_type])) & 1; - m_noise_shift = m_noise_shift << 1 | m_noise_output; - } - } - left += m_audio[3].vol_left * sample; - right += m_audio[3].vol_right * sample; - } - - outputl.put_int(sampindex, left, 32768 >> 5); - outputr.put_int(sampindex, right, 32768 >> 5); - } -} - - -u16 wswan_sound_device::port_r(offs_t offset, u16 mem_mask) -{ - m_channel->update(); - switch (offset) { - case 0x80 / 2: - case 0x82 / 2: - case 0x84 / 2: - case 0x86 / 2: - return m_audio[offset & 0x03].freq; - case 0x88 / 2: - return (m_audio[0].vol_left << 4) | m_audio[0].vol_right | - (m_audio[1].vol_left << 12) | (m_audio[1].vol_right << 8); - case 0x8a / 2: - return (m_audio[2].vol_left << 4) | m_audio[2].vol_right | - (m_audio[3].vol_left << 12) | (m_audio[3].vol_right << 8); - case 0x8c / 2: - return m_sweep_step | (((m_sweep_time / 8192) - 1) << 8); - case 0x8e / 2: - return m_noise_type | (m_noise_reset ? 0x08 : 0x00) | (m_noise_enable ? 0x10 : 0x00) | - ((m_sample_address << 2) & 0xff00); - case 0x90 / 2: - return (m_audio[0].on ? 0x01 : 0x00) | - (m_audio[1].on ? 0x02 : 0x00) | - (m_audio[2].on ? 0x04 : 0x00) | - (m_audio[3].on ? 0x08 : 0x00) | - (m_audio2_voice ? 0x20 : 0x00) | - (m_audio3_sweep ? 0x40 : 0x00) | - (m_audio4_noise ? 0x80 : 0x00) | - (m_mono ? 0x0100 : 0x00) | (m_output_volume << 9) | - (m_external_stereo ? 0x0800 : 0x00) | - (m_external_speaker ? 0x00 : 0x00); // TODO 0x80 is set when external speaker is connected - case 0x92 / 2: - return m_noise_shift; - case 0x94 / 2: - return m_master_volume; - case 0x9e / 2: - return m_system_volume; - } - return 0; -} - -void wswan_sound_device::port_w(offs_t offset, u16 data, u16 mem_mask) -{ - m_channel->update(); - - switch (offset) - { - case 0x80 / 2: // Audio 1 freq - case 0x82 / 2: // Audio 2 freq - case 0x84 / 2: // Audio 3 freq - case 0x86 / 2: // Audio 4 freq - COMBINE_DATA(&m_audio[offset & 0x03].freq); - m_audio[offset & 0x03].freq &= 0x7ff; - m_audio[offset & 0x03].period = 2048 - m_audio[offset & 0x03].freq; - break; - - case 0x88 / 2: - // Audio 1 volume - if (ACCESSING_BITS_0_7) - { - m_audio[0].vol_left = (data >> 4) & 0x0f; - m_audio[0].vol_right = data & 0x0f; - } - // Audio 2 volume - if (ACCESSING_BITS_8_15) - { - m_audio[1].vol_left = (data >> 12) & 0x0f; - m_audio[1].vol_right = (data >> 8) & 0x0f; - } - break; - - case 0x8a / 2: - // Audio 3 volume - if (ACCESSING_BITS_0_7) - { - m_audio[2].vol_left = (data >> 4) & 0x0f; - m_audio[2].vol_right = data & 0x0f; - } - // Audio 4 volume - if (ACCESSING_BITS_8_15) - { - m_audio[3].vol_left = (data >> 12) & 0x0f; - m_audio[3].vol_right = (data >> 8) & 0x0f; - } - break; - - case 0x8c / 2: - // Sweep step - if (ACCESSING_BITS_0_7) - { - m_sweep_step = (int8_t)(data & 0xff); - } - // Sweep time - if (ACCESSING_BITS_8_15) - { - m_sweep_time = 8192 * ((data >> 8) + 1); - } - break; - - case 0x8e / 2: - // Noise control - if (ACCESSING_BITS_0_7) - { - m_noise_type = data & 0x07; - m_noise_reset = BIT(data, 3); - m_noise_enable = BIT(data, 4); - } - // Sample location - if (ACCESSING_BITS_8_15) - { - m_sample_address = (data & 0xff00) >> 2; - } - break; - - case 0x90 / 2: - // Audio control - if (ACCESSING_BITS_0_7) - { - m_audio[0].on = BIT(data, 0); - m_audio[1].on = BIT(data, 1); - m_audio[2].on = BIT(data, 2); - m_audio[3].on = BIT(data, 3); - m_audio2_voice = BIT(data, 5); - m_audio3_sweep = BIT(data, 6); - m_audio4_noise = BIT(data, 7); - } - // Audio output - if (ACCESSING_BITS_8_15) - { - m_mono = BIT(data, 8); - m_output_volume = ((data >> 9) & 0x03); - m_external_stereo = BIT(data, 11); - m_external_speaker = 1; - } - break; - - case 0x92 / 2: // Noise counter shift register - COMBINE_DATA(&m_noise_shift); - m_noise_shift &= 0x7fff; - break; - - case 0x94 / 2: // Master volume - if (ACCESSING_BITS_0_7) - m_master_volume = data & 0xff; - break; - - case 0x9e / 2: // WSC volume setting (0, 1, 2, 3) (TODO) - if (ACCESSING_BITS_0_7) - m_system_volume = data & 0x03; - break; - } -} diff --git a/src/mame/messshared/wswan_a.h b/src/mame/messshared/wswan_a.h deleted file mode 100644 index 43906b5d090..00000000000 --- a/src/mame/messshared/wswan_a.h +++ /dev/null @@ -1,86 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Wilbert Pol -#ifndef MAME_AUDIO_WSWAN_H -#define MAME_AUDIO_WSWAN_H - -#pragma once - -#include "dirom.h" - -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - -// ======================> wswan_sound_device - -class wswan_sound_device : public device_t, - public device_sound_interface, - public device_rom_interface<14,1> -{ -public: - wswan_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - - void port_w(offs_t offset, u16 data, u16 mem_mask); - u16 port_r(offs_t offset, u16 mem_mask); - -protected: - struct CHAN - { - CHAN() : - freq(0), - period(0), - pos(0), - vol_left(0), - vol_right(0), - on(0), - offset(0), - signal(0) { } - - u16 freq; - u16 period; - u32 pos; - u8 vol_left; - u8 vol_right; - u8 on; - u8 offset; - u8 signal; - }; - - // device-level overrides - virtual void device_start() override; - virtual void device_clock_changed() override; - virtual void device_reset() override; - - virtual void rom_bank_updated() override; - - // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; - -private: - int fetch_sample(int channel, int offset); - - sound_stream *m_channel; - CHAN m_audio[4]; - s8 m_sweep_step; - u32 m_sweep_time; - u32 m_sweep_count; - u8 m_noise_type; - u8 m_noise_reset; - u8 m_noise_enable; - u8 m_noise_output; - u16 m_sample_address; - u8 m_audio2_voice; - u8 m_audio3_sweep; - u8 m_audio4_noise; - u8 m_mono; - u8 m_output_volume; - u8 m_external_stereo; - u8 m_external_speaker; - u16 m_noise_shift; - u8 m_master_volume; - u8 m_system_volume = 0; -}; - -DECLARE_DEVICE_TYPE(WSWAN_SND, wswan_sound_device) - -#endif // MAME_AUDIO_WSWAN_H diff --git a/src/mame/messshared/wswansound.cpp b/src/mame/messshared/wswansound.cpp new file mode 100644 index 00000000000..773bfda4948 --- /dev/null +++ b/src/mame/messshared/wswansound.cpp @@ -0,0 +1,387 @@ +// license:BSD-3-Clause +// copyright-holders:Wilbert Pol +/************************************************************************************** + + Wonderswan sound emulation + + Wilbert Pol + + Sound emulation is preliminary and not complete + + +The noise taps and behavior are the same as the Virtual Boy. + +**************************************************************************************/ + +#include "emu.h" +#include "wswansound.h" + + +// device type definition +DEFINE_DEVICE_TYPE(WSWAN_SND, wswan_sound_device, "wswan_sound", "WonderSwan Custom Sound") + + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// wswan_sound_device - constructor +//------------------------------------------------- + +wswan_sound_device::wswan_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, WSWAN_SND, tag, owner, clock), + device_sound_interface(mconfig, *this), + device_rom_interface(mconfig, *this), + m_channel(nullptr), + m_sweep_step(0), + m_sweep_time(0), + m_sweep_count(0), + m_noise_type(0), + m_noise_reset(0), + m_noise_enable(0), + m_noise_output(0), + m_sample_address(0), + m_audio2_voice(0), + m_audio3_sweep(0), + m_audio4_noise(0), + m_mono(0), + m_output_volume(0), + m_external_stereo(0), + m_external_speaker(0), + m_noise_shift(0), + m_master_volume(0) +{ +} + +static constexpr int clk_div = 64; + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void wswan_sound_device::device_start() +{ + m_channel = stream_alloc(0, 2, clock() / clk_div); + + save_item(NAME(m_sweep_step)); + save_item(NAME(m_sweep_time)); + save_item(NAME(m_sweep_count)); + save_item(NAME(m_noise_type)); + save_item(NAME(m_noise_reset)); + save_item(NAME(m_noise_enable)); + save_item(NAME(m_sample_address)); + save_item(NAME(m_audio2_voice)); + save_item(NAME(m_audio3_sweep)); + save_item(NAME(m_audio4_noise)); + save_item(NAME(m_mono)); + save_item(NAME(m_output_volume)); + save_item(NAME(m_external_stereo)); + save_item(NAME(m_external_speaker)); + save_item(NAME(m_noise_shift)); + save_item(NAME(m_master_volume)); + save_item(NAME(m_system_volume)); + save_item(STRUCT_MEMBER(m_audio, freq)); + save_item(STRUCT_MEMBER(m_audio, period)); + save_item(STRUCT_MEMBER(m_audio, pos)); + save_item(STRUCT_MEMBER(m_audio, vol_left)); + save_item(STRUCT_MEMBER(m_audio, vol_right)); + save_item(STRUCT_MEMBER(m_audio, on)); + save_item(STRUCT_MEMBER(m_audio, offset)); + save_item(STRUCT_MEMBER(m_audio, signal)); +} + +void wswan_sound_device::device_clock_changed() +{ + m_channel->set_sample_rate(clock() / clk_div); +} + +void wswan_sound_device::rom_bank_updated() +{ + m_channel->update(); +} + +//------------------------------------------------- +// device_reset +//------------------------------------------------- + +void wswan_sound_device::device_reset() +{ + for (int i = 0; i < 4; i++) + { + m_audio[i].on = 0; + m_audio[i].signal = 0; + m_audio[i].offset = 0; + m_audio[i].pos = 0; + } + m_noise_output = 0; +} + +int wswan_sound_device::fetch_sample(int channel, int offset) +{ + u16 w = read_word(m_sample_address + ((channel & 3) << 4) + ((offset >> 1) & 0x0e)); + + return (w >> ((offset & 0x03) * 4)) & 0x0f; +} + +//------------------------------------------------- +// sound_stream_update - handle a stream update +//------------------------------------------------- + +void wswan_sound_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) +{ + auto &outputl = outputs[0]; + auto &outputr = outputs[1]; + for (int sampindex = 0; sampindex < outputl.samples(); sampindex++) + { + s32 left = 0, right = 0; + + if (m_audio[0].on) + { + s32 sample = m_audio[0].signal; + m_audio[0].pos += clk_div; + if (m_audio[0].pos >= m_audio[0].period) + { + m_audio[0].pos -= m_audio[0].period; + m_audio[0].signal = fetch_sample(0, m_audio[0].offset++); + } + left += m_audio[0].vol_left * sample; + right += m_audio[0].vol_right * sample; + } + + if (m_audio[1].on) + { + if (m_audio2_voice) + { + u8 voice_data = (m_audio[1].vol_left << 4) | m_audio[1].vol_right; + left += voice_data * (m_master_volume & 0x0f); + right += voice_data * (m_master_volume & 0x0f); + } + else + { + s32 sample = m_audio[1].signal; + m_audio[1].pos += clk_div; + if (m_audio[1].pos >= m_audio[1].period) + { + m_audio[1].pos -= m_audio[1].period; + m_audio[1].signal = fetch_sample(1, m_audio[1].offset++); + } + left += m_audio[1].vol_left * sample; + right += m_audio[1].vol_right * sample; + } + } + + if (m_audio[2].on) + { + s32 sample = m_audio[2].signal; + m_audio[2].pos += clk_div; + if (m_audio[2].pos >= m_audio[2].period) + { + m_audio[2].pos -= m_audio[2].period; + m_audio[2].signal = fetch_sample(2, m_audio[2].offset++); + } + if (m_audio3_sweep && m_sweep_time) + { + m_sweep_count += clk_div; + if (m_sweep_count >= m_sweep_time) + { + m_sweep_count -= m_sweep_time; + m_audio[2].freq += m_sweep_step; + m_audio[2].freq &= 0x7ff; + m_audio[2].period = 2048 - m_audio[2].freq; + } + } + left += m_audio[2].vol_left * sample; + right += m_audio[2].vol_right * sample; + } + + if (m_audio[3].on) + { + s32 sample = m_audio[3].signal; + m_audio[3].pos += clk_div; + if (m_audio[3].pos >= m_audio[3].period) + { + if (m_audio4_noise) + m_audio[3].signal = m_noise_output ? 0xf : 0; + else + m_audio[3].signal = fetch_sample(3, m_audio[3].offset++); + + m_audio[3].pos -= m_audio[3].period; + + if (m_noise_reset) + { + m_noise_reset = 0; + m_noise_shift = 0; + m_noise_output = 0; + } + + if (m_noise_enable) + { + static int shift_bit[] = { 14, 10, 13, 4, 8, 6, 9, 11 }; + + m_noise_output = (1 ^ (m_noise_shift >> 7) ^ (m_noise_shift >> shift_bit[m_noise_type])) & 1; + m_noise_shift = m_noise_shift << 1 | m_noise_output; + } + } + left += m_audio[3].vol_left * sample; + right += m_audio[3].vol_right * sample; + } + + outputl.put_int(sampindex, left, 32768 >> 5); + outputr.put_int(sampindex, right, 32768 >> 5); + } +} + + +u16 wswan_sound_device::port_r(offs_t offset, u16 mem_mask) +{ + m_channel->update(); + switch (offset) { + case 0x80 / 2: + case 0x82 / 2: + case 0x84 / 2: + case 0x86 / 2: + return m_audio[offset & 0x03].freq; + case 0x88 / 2: + return (m_audio[0].vol_left << 4) | m_audio[0].vol_right | + (m_audio[1].vol_left << 12) | (m_audio[1].vol_right << 8); + case 0x8a / 2: + return (m_audio[2].vol_left << 4) | m_audio[2].vol_right | + (m_audio[3].vol_left << 12) | (m_audio[3].vol_right << 8); + case 0x8c / 2: + return m_sweep_step | (((m_sweep_time / 8192) - 1) << 8); + case 0x8e / 2: + return m_noise_type | (m_noise_reset ? 0x08 : 0x00) | (m_noise_enable ? 0x10 : 0x00) | + ((m_sample_address << 2) & 0xff00); + case 0x90 / 2: + return (m_audio[0].on ? 0x01 : 0x00) | + (m_audio[1].on ? 0x02 : 0x00) | + (m_audio[2].on ? 0x04 : 0x00) | + (m_audio[3].on ? 0x08 : 0x00) | + (m_audio2_voice ? 0x20 : 0x00) | + (m_audio3_sweep ? 0x40 : 0x00) | + (m_audio4_noise ? 0x80 : 0x00) | + (m_mono ? 0x0100 : 0x00) | (m_output_volume << 9) | + (m_external_stereo ? 0x0800 : 0x00) | + (m_external_speaker ? 0x00 : 0x00); // TODO 0x80 is set when external speaker is connected + case 0x92 / 2: + return m_noise_shift; + case 0x94 / 2: + return m_master_volume; + case 0x9e / 2: + return m_system_volume; + } + return 0; +} + +void wswan_sound_device::port_w(offs_t offset, u16 data, u16 mem_mask) +{ + m_channel->update(); + + switch (offset) + { + case 0x80 / 2: // Audio 1 freq + case 0x82 / 2: // Audio 2 freq + case 0x84 / 2: // Audio 3 freq + case 0x86 / 2: // Audio 4 freq + COMBINE_DATA(&m_audio[offset & 0x03].freq); + m_audio[offset & 0x03].freq &= 0x7ff; + m_audio[offset & 0x03].period = 2048 - m_audio[offset & 0x03].freq; + break; + + case 0x88 / 2: + // Audio 1 volume + if (ACCESSING_BITS_0_7) + { + m_audio[0].vol_left = (data >> 4) & 0x0f; + m_audio[0].vol_right = data & 0x0f; + } + // Audio 2 volume + if (ACCESSING_BITS_8_15) + { + m_audio[1].vol_left = (data >> 12) & 0x0f; + m_audio[1].vol_right = (data >> 8) & 0x0f; + } + break; + + case 0x8a / 2: + // Audio 3 volume + if (ACCESSING_BITS_0_7) + { + m_audio[2].vol_left = (data >> 4) & 0x0f; + m_audio[2].vol_right = data & 0x0f; + } + // Audio 4 volume + if (ACCESSING_BITS_8_15) + { + m_audio[3].vol_left = (data >> 12) & 0x0f; + m_audio[3].vol_right = (data >> 8) & 0x0f; + } + break; + + case 0x8c / 2: + // Sweep step + if (ACCESSING_BITS_0_7) + { + m_sweep_step = (int8_t)(data & 0xff); + } + // Sweep time + if (ACCESSING_BITS_8_15) + { + m_sweep_time = 8192 * ((data >> 8) + 1); + } + break; + + case 0x8e / 2: + // Noise control + if (ACCESSING_BITS_0_7) + { + m_noise_type = data & 0x07; + m_noise_reset = BIT(data, 3); + m_noise_enable = BIT(data, 4); + } + // Sample location + if (ACCESSING_BITS_8_15) + { + m_sample_address = (data & 0xff00) >> 2; + } + break; + + case 0x90 / 2: + // Audio control + if (ACCESSING_BITS_0_7) + { + m_audio[0].on = BIT(data, 0); + m_audio[1].on = BIT(data, 1); + m_audio[2].on = BIT(data, 2); + m_audio[3].on = BIT(data, 3); + m_audio2_voice = BIT(data, 5); + m_audio3_sweep = BIT(data, 6); + m_audio4_noise = BIT(data, 7); + } + // Audio output + if (ACCESSING_BITS_8_15) + { + m_mono = BIT(data, 8); + m_output_volume = ((data >> 9) & 0x03); + m_external_stereo = BIT(data, 11); + m_external_speaker = 1; + } + break; + + case 0x92 / 2: // Noise counter shift register + COMBINE_DATA(&m_noise_shift); + m_noise_shift &= 0x7fff; + break; + + case 0x94 / 2: // Master volume + if (ACCESSING_BITS_0_7) + m_master_volume = data & 0xff; + break; + + case 0x9e / 2: // WSC volume setting (0, 1, 2, 3) (TODO) + if (ACCESSING_BITS_0_7) + m_system_volume = data & 0x03; + break; + } +} diff --git a/src/mame/messshared/wswansound.h b/src/mame/messshared/wswansound.h new file mode 100644 index 00000000000..43906b5d090 --- /dev/null +++ b/src/mame/messshared/wswansound.h @@ -0,0 +1,86 @@ +// license:BSD-3-Clause +// copyright-holders:Wilbert Pol +#ifndef MAME_AUDIO_WSWAN_H +#define MAME_AUDIO_WSWAN_H + +#pragma once + +#include "dirom.h" + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +// ======================> wswan_sound_device + +class wswan_sound_device : public device_t, + public device_sound_interface, + public device_rom_interface<14,1> +{ +public: + wswan_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + + void port_w(offs_t offset, u16 data, u16 mem_mask); + u16 port_r(offs_t offset, u16 mem_mask); + +protected: + struct CHAN + { + CHAN() : + freq(0), + period(0), + pos(0), + vol_left(0), + vol_right(0), + on(0), + offset(0), + signal(0) { } + + u16 freq; + u16 period; + u32 pos; + u8 vol_left; + u8 vol_right; + u8 on; + u8 offset; + u8 signal; + }; + + // device-level overrides + virtual void device_start() override; + virtual void device_clock_changed() override; + virtual void device_reset() override; + + virtual void rom_bank_updated() override; + + // sound stream update overrides + virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; + +private: + int fetch_sample(int channel, int offset); + + sound_stream *m_channel; + CHAN m_audio[4]; + s8 m_sweep_step; + u32 m_sweep_time; + u32 m_sweep_count; + u8 m_noise_type; + u8 m_noise_reset; + u8 m_noise_enable; + u8 m_noise_output; + u16 m_sample_address; + u8 m_audio2_voice; + u8 m_audio3_sweep; + u8 m_audio4_noise; + u8 m_mono; + u8 m_output_volume; + u8 m_external_stereo; + u8 m_external_speaker; + u16 m_noise_shift; + u8 m_master_volume; + u8 m_system_volume = 0; +}; + +DECLARE_DEVICE_TYPE(WSWAN_SND, wswan_sound_device) + +#endif // MAME_AUDIO_WSWAN_H diff --git a/src/mame/messshared/z80bin.cpp b/src/mame/messshared/z80bin.cpp index ac6c2290e12..c76f256e7f2 100644 --- a/src/mame/messshared/z80bin.cpp +++ b/src/mame/messshared/z80bin.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Robbbert #include "emu.h" -#include "machine/z80bin.h" +#include "z80bin.h" /*------------------------------------------------- z80bin_load_file - load a z80bin file into diff --git a/src/mame/metro/metro.cpp b/src/mame/metro/metro.cpp index 8ca1da5ee47..cd632a8ea6e 100644 --- a/src/mame/metro/metro.cpp +++ b/src/mame/metro/metro.cpp @@ -94,7 +94,7 @@ driver modified by Hau ***************************************************************************/ #include "emu.h" -#include "includes/metro.h" +#include "metro.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/metro/metro.h b/src/mame/metro/metro.h index dff6f0fe5c4..069e43772a0 100644 --- a/src/mame/metro/metro.h +++ b/src/mame/metro/metro.h @@ -5,19 +5,21 @@ Metro Games *************************************************************************/ -#ifndef MAME_INCLUDES_METRO_H -#define MAME_INCLUDES_METRO_H +#ifndef MAME_METRO_METRO_H +#define MAME_METRO_METRO_H #pragma once +#include "k053936.h" + +#include "machine/eepromser.h" +#include "machine/gen_latch.h" +#include "machine/timer.h" #include "sound/es8712.h" #include "sound/okim6295.h" #include "sound/ymopm.h" -#include "video/k053936.h" #include "video/imagetek_i4100.h" -#include "machine/eepromser.h" -#include "machine/gen_latch.h" -#include "machine/timer.h" + #include "screen.h" #include "tilemap.h" @@ -226,4 +228,4 @@ private: bool m_ext_irq_enable = false; }; -#endif // MAME_INCLUDES_METRO_H +#endif // MAME_METRO_METRO_H diff --git a/src/mame/metro/metro_v.cpp b/src/mame/metro/metro_v.cpp index 72efe876ffb..595a3c119ae 100644 --- a/src/mame/metro/metro_v.cpp +++ b/src/mame/metro/metro_v.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/metro.h" +#include "metro.h" TILE_GET_INFO_MEMBER(metro_state::k053936_get_tile_info) { diff --git a/src/mame/microkey/primo.cpp b/src/mame/microkey/primo.cpp index 0bdd213fb82..95bfcc12fe0 100644 --- a/src/mame/microkey/primo.cpp +++ b/src/mame/microkey/primo.cpp @@ -111,7 +111,7 @@ ToDO: *******************************************************************************/ #include "emu.h" -#include "includes/primo.h" +#include "primo.h" #include "cpu/z80/z80.h" #include "emupal.h" diff --git a/src/mame/microkey/primo_m.cpp b/src/mame/microkey/primo_m.cpp index 59b74aa8161..908aec94374 100644 --- a/src/mame/microkey/primo_m.cpp +++ b/src/mame/microkey/primo_m.cpp @@ -13,7 +13,7 @@ /* Core includes */ #include "emu.h" -#include "includes/primo.h" +#include "primo.h" /* Components */ #include "cpu/z80/z80.h" diff --git a/src/mame/microsoft/xbox.cpp b/src/mame/microsoft/xbox.cpp index e7782b0227d..e1b5c952832 100644 --- a/src/mame/microsoft/xbox.cpp +++ b/src/mame/microsoft/xbox.cpp @@ -10,8 +10,8 @@ #include "emu.h" #include "machine/pci.h" #include "machine/idectrl.h" -#include "machine/xbox_pci.h" -#include "machine/xbox.h" +#include "xbox_pci.h" +#include "xbox.h" #include "cpu/i386/i386.h" #include "bus/ata/atapicdr.h" diff --git a/src/mame/midw8080/8080bw.cpp b/src/mame/midw8080/8080bw.cpp index 0622bba342a..19c355d9833 100644 --- a/src/mame/midw8080/8080bw.cpp +++ b/src/mame/midw8080/8080bw.cpp @@ -198,7 +198,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/8080bw.h" +#include "8080bw.h" #include "cpu/m6800/m6800.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/midw8080/8080bw.h b/src/mame/midw8080/8080bw.h index f399bf0cf85..b78a2a6660a 100644 --- a/src/mame/midw8080/8080bw.h +++ b/src/mame/midw8080/8080bw.h @@ -11,8 +11,8 @@ #pragma once -#include "audio/8080bw.h" -#include "includes/mw8080bw.h" +#include "8080bw_a.h" +#include "mw8080bw.h" #include "machine/eepromser.h" #include "machine/timer.h" diff --git a/src/mame/midw8080/8080bw_a.cpp b/src/mame/midw8080/8080bw_a.cpp index 06fe3588266..c636c9cafa5 100644 --- a/src/mame/midw8080/8080bw_a.cpp +++ b/src/mame/midw8080/8080bw_a.cpp @@ -4,7 +4,7 @@ /* 8080bw.c *******************************************/ #include "emu.h" -#include "includes/8080bw.h" +#include "8080bw.h" #include "sound/samples.h" #include "sound/discrete.h" diff --git a/src/mame/midw8080/8080bw_v.cpp b/src/mame/midw8080/8080bw_v.cpp index 5fa841197ac..6d8b831db30 100644 --- a/src/mame/midw8080/8080bw_v.cpp +++ b/src/mame/midw8080/8080bw_v.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/8080bw.h" +#include "8080bw.h" MACHINE_START_MEMBER(_8080bw_state,extra_8080bw_vh) diff --git a/src/mame/midw8080/m79amb.cpp b/src/mame/midw8080/m79amb.cpp index e1d0d309522..de72e28d049 100644 --- a/src/mame/midw8080/m79amb.cpp +++ b/src/mame/midw8080/m79amb.cpp @@ -57,7 +57,7 @@ and two large (paddles pretending to be) guns. */ #include "emu.h" -#include "includes/m79amb.h" +#include "m79amb.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/midw8080/m79amb_a.cpp b/src/mame/midw8080/m79amb_a.cpp index c0cd1aa1863..ff9f169f6c5 100644 --- a/src/mame/midw8080/m79amb_a.cpp +++ b/src/mame/midw8080/m79amb_a.cpp @@ -6,7 +6,7 @@ ************************************************************************/ #include "emu.h" -#include "includes/m79amb.h" +#include "m79amb.h" #include "sound/discrete.h" #define TIME_OF_9602(r, c) (0.34 * (r) * (c) * (1.0 + 1.0 / (r))) diff --git a/src/mame/midw8080/mw8080bw.cpp b/src/mame/midw8080/mw8080bw.cpp index 2415ba8f4aa..b72d6f2ad8a 100644 --- a/src/mame/midw8080/mw8080bw.cpp +++ b/src/mame/midw8080/mw8080bw.cpp @@ -151,7 +151,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/mw8080bw.h" +#include "mw8080bw.h" #include "cpu/i8085/i8085.h" #include "machine/rescap.h" diff --git a/src/mame/midw8080/mw8080bw.h b/src/mame/midw8080/mw8080bw.h index a96e61de592..91de08037c5 100644 --- a/src/mame/midw8080/mw8080bw.h +++ b/src/mame/midw8080/mw8080bw.h @@ -11,7 +11,7 @@ #pragma once -#include "audio/mw8080bw.h" +#include "mw8080bw_a.h" #include "machine/mb14241.h" #include "machine/timer.h" diff --git a/src/mame/midw8080/mw8080bw_a.cpp b/src/mame/midw8080/mw8080bw_a.cpp index 1b3722156c6..5760efbf8a7 100644 --- a/src/mame/midw8080/mw8080bw_a.cpp +++ b/src/mame/midw8080/mw8080bw_a.cpp @@ -8,11 +8,11 @@ ****************************************************************************/ #include "emu.h" -#include "audio/mw8080bw.h" -#include "audio/nl_gunfight.h" -#include "audio/nl_280zzzap.h" +#include "mw8080bw_a.h" +#include "nl_gunfight.h" +#include "nl_280zzzap.h" -#include "includes/mw8080bw.h" +#include "mw8080bw.h" #include "speaker.h" diff --git a/src/mame/midw8080/mw8080bw_v.cpp b/src/mame/midw8080/mw8080bw_v.cpp index 1dfe3c5e72c..e626d4bef04 100644 --- a/src/mame/midw8080/mw8080bw_v.cpp +++ b/src/mame/midw8080/mw8080bw_v.cpp @@ -8,7 +8,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/mw8080bw.h" +#include "mw8080bw.h" uint32_t mw8080bw_state::screen_update_mw8080bw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/midway/astrocde.cpp b/src/mame/midway/astrocde.cpp index 788fc60f349..2aa3ad1f421 100644 --- a/src/mame/midway/astrocde.cpp +++ b/src/mame/midway/astrocde.cpp @@ -114,7 +114,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/astrocde.h" +#include "astrocde.h" #include "machine/z80daisy.h" #include "machine/z80ctc.h" diff --git a/src/mame/midway/astrocde_v.cpp b/src/mame/midway/astrocde_v.cpp index 2d8d5def8ec..ae538d3edd8 100644 --- a/src/mame/midway/astrocde_v.cpp +++ b/src/mame/midway/astrocde_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/astrocde.h" +#include "astrocde.h" #include "cpu/z80/z80.h" #include "sound/astrocde.h" diff --git a/src/mame/midway/astrohome.cpp b/src/mame/midway/astrohome.cpp new file mode 100644 index 00000000000..6cdaa14064b --- /dev/null +++ b/src/mame/midway/astrohome.cpp @@ -0,0 +1,294 @@ +// license:BSD-3-Clause +// copyright-holders:Nicola Salmoria, Mike Coates, Frank Palazzolo, Aaron Giles, Dirk Best +/**************************************************************************** + + Bally Astrocade consumer hardware + +****************************************************************************/ + +#include "emu.h" +#include "astrocde.h" + +#include "cpu/z80/z80.h" +#include "machine/ram.h" +#include "sound/astrocde.h" + +#include "bus/astrocde/slot.h" +#include "bus/astrocde/rom.h" +#include "bus/astrocde/exp.h" +#include "bus/astrocde/ram.h" +#include "bus/astrocde/ctrl.h" +#include "bus/astrocde/accessory.h" + +#include "softlist_dev.h" +#include "speaker.h" + + +namespace { + +class astrocde_home_state : public astrocde_state +{ +public: + astrocde_home_state(const machine_config &mconfig, device_type type, const char *tag) + : astrocde_state(mconfig, type, tag) + , m_cart(*this, "cartslot") + , m_exp(*this, "exp") + , m_ctrl(*this, "ctrl%u", 1U) + , m_accessory(*this, "accessory") + , m_keypad(*this, "KEYPAD%u", 0U) + { } + + void astrocde(machine_config &config); + + void init_astrocde(); + +protected: + virtual void machine_start() override; + +private: + uint8_t inputs_r(offs_t offset); + + void astrocade_io(address_map &map); + void astrocade_mem(address_map &map); + + required_device m_cart; + required_device m_exp; + required_device_array m_ctrl; + required_device m_accessory; + required_ioport_array<4> m_keypad; +}; + +/********************************************************************************* + * + * Memory maps + * + * $0000 to $1FFF: 8K on-board ROM (could be one of three available BIOS dumps) + * $2000 to $3FFF: 8K cartridge ROM + * $4000 to $4FFF: 4K screen RAM + * $5000 to $FFFF: 44K address space not available in standard machine. With a + * sufficiently large RAM expansion, all of this RAM can be added, and accessed + * by an extended BASIC program. Bally and Astrocade BASIC can access from + * $5000 to $7FFF if available. + * + *********************************************************************************/ + +void astrocde_home_state::astrocade_mem(address_map &map) +{ + map(0x0000, 0x0fff).rom().w(FUNC(astrocde_home_state::astrocade_funcgen_w)); + map(0x1000, 0x3fff).rom(); /* Star Fortress writes in here?? */ + map(0x4000, 0x4fff).ram().share("videoram"); /* ASG */ + //map(0x5000, 0xffff).rw("exp", FUNC(astrocade_exp_device::read), FUNC(astrocade_exp_device::write)); +} + + +void astrocde_home_state::astrocade_io(address_map &map) +{ + map(0x00, 0x0f).select(0xff00).rw(FUNC(astrocde_state::video_register_r), FUNC(astrocde_state::video_register_w)); + map(0x10, 0x1f).select(0xff00).r("astrocade1", FUNC(astrocade_io_device::read)); + map(0x10, 0x18).select(0xff00).w("astrocade1", FUNC(astrocade_io_device::write)); + map(0x19, 0x19).mirror(0xff00).w(FUNC(astrocde_state::expand_register_w)); +} + +/************************************* + * + * Input ports + * + * + * The Astrocade has ports for four hand controllers. Each controller has a + * knob on top that can be simultaneously pushed as an eight-way joystick and + * twisted as a paddle, in addition to a trigger button. The knob can twist + * through about 270 degrees, registering 256 unique positions. It does not + * autocenter. When selecting options on the menu, twisting the knob to the + * right gives lower numbers, and twisting to the left gives larger numbers. + * Paddle games like Clowns have more intuitive behavior -- twisting to the + * right moves the character right. + * + * There is a 24-key keypad on the system itself (6 rows, 4 columns). It is + * labeled for the built-in calculator, but overlays were released for other + * programs, the most popular being the BASIC cartridges, which allowed a + * large number of inputs by making the bottom row shift buttons. The labels + * below first list the calculator key, then the BASIC keys in the order of no + * shift, GREEN shift, RED shift, BLUE shift, WORDS shift. + * + *************************************/ + +uint8_t astrocde_home_state::inputs_r(offs_t offset) +{ + if (BIT(offset, 2)) + return m_keypad[offset & 3]->read(); + else + return m_ctrl[offset & 3]->read_handle(); +} + +static INPUT_PORTS_START( astrocde ) + PORT_START("KEYPAD0") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("% \xC3\xB7 [ ] LIST") PORT_CODE(KEYCODE_O) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("/ x J K L NEXT") PORT_CODE(KEYCODE_SLASH_PAD) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("x - V W X IF") PORT_CODE(KEYCODE_ASTERISK) + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("- + & @ * GOTO") PORT_CODE(KEYCODE_MINUS_PAD) + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("+ = # % : PRINT") PORT_CODE(KEYCODE_PLUS_PAD) + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("= WORDS Shift") PORT_CODE(KEYCODE_ENTER_PAD) + PORT_BIT(0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) + + PORT_START("KEYPAD1") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("\xE2\x86\x93 HALT RUN") PORT_CODE(KEYCODE_PGDN) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CH 9 G H I STEP") PORT_CODE(KEYCODE_H) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("9 6 S T U RND") PORT_CODE(KEYCODE_9) + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("6 3 \xE2\x86\x91 . \xE2\x86\x93 BOX") PORT_CODE(KEYCODE_6) + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("3 ERASE ( ; )") PORT_CODE(KEYCODE_3) + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME(". BLUE Shift") PORT_CODE(KEYCODE_STOP) + PORT_BIT(0xc0, IP_ACTIVE_HIGH, IPT_UNUSED) + + PORT_START("KEYPAD2") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("\xE2\x86\x91 PAUSE / \\") PORT_CODE(KEYCODE_PGUP) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("MS 8 D E F TO") PORT_CODE(KEYCODE_S) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("8 5 P Q R RETN") PORT_CODE(KEYCODE_8) + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("5 2 \xE2\x86\x90 ' \xE2\x86\x92 LINE") PORT_CODE(KEYCODE_5) + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("2 0 < \" > INPUT") PORT_CODE(KEYCODE_2) + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("0 RED Shift") PORT_CODE(KEYCODE_0) + PORT_BIT(0xc0, IP_ACTIVE_HIGH, IPT_UNUSED) + + PORT_START("KEYPAD3") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("C GO +10") PORT_CODE(KEYCODE_C) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("MR 7 A B C FOR") PORT_CODE(KEYCODE_R) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("7 4 M N O GOSB") PORT_CODE(KEYCODE_7) + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("4 1 Y Z ! CLEAR") PORT_CODE(KEYCODE_4) + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("1 SPACE $ , ?") PORT_CODE(KEYCODE_1) + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CE GREEN Shift") PORT_CODE(KEYCODE_E) + PORT_BIT(0xc0, IP_ACTIVE_HIGH, IPT_UNUSED) +INPUT_PORTS_END + + +/************************************* + * + * Machine drivers + * + *************************************/ + +static void astrocade_cart(device_slot_interface &device) +{ + device.option_add_internal("rom", ASTROCADE_ROM_STD); + device.option_add_internal("rom_256k", ASTROCADE_ROM_256K); + device.option_add_internal("rom_512k", ASTROCADE_ROM_512K); + device.option_add_internal("rom_cass", ASTROCADE_ROM_CASS); +} + +static void astrocade_exp(device_slot_interface &device) +{ + device.option_add("blue_ram_4k", ASTROCADE_BLUERAM_4K); + device.option_add("blue_ram_16k", ASTROCADE_BLUERAM_16K); + device.option_add("blue_ram_32k", ASTROCADE_BLUERAM_32K); + device.option_add("viper_sys1", ASTROCADE_VIPER_SYS1); + device.option_add("lil_white_ram", ASTROCADE_WHITERAM); + device.option_add("rl64_ram", ASTROCADE_RL64RAM); +} + + +void astrocde_home_state::astrocde(machine_config &config) +{ + /* basic machine hardware */ + Z80(config, m_maincpu, ASTROCADE_CLOCK/4); /* 1.789 MHz */ + m_maincpu->set_addrmap(AS_PROGRAM, &astrocde_home_state::astrocade_mem); + m_maincpu->set_addrmap(AS_IO, &astrocde_home_state::astrocade_io); + + config.set_perfect_quantum(m_maincpu); + + /* video hardware */ + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(ASTROCADE_CLOCK, 455, 0, 352, 262, 0, 240); + m_screen->set_screen_update(FUNC(astrocde_state::screen_update_astrocde)); + m_screen->set_palette(m_palette); + + PALETTE(config, "palette", FUNC(astrocde_home_state::astrocade_palette), 512); + + /* control ports */ + for (uint32_t port = 0; port < 4; port++) + { + ASTROCADE_CTRL_PORT(config, m_ctrl[port], astrocade_controllers, port == 0 ? "joy" : nullptr); + m_ctrl[port]->ltpen_handler().set(FUNC(astrocde_home_state::lightpen_trigger_w)); + } + + /* sound hardware */ + SPEAKER(config, "mono").front_center(); + ASTROCADE_IO(config, m_astrocade_sound1, ASTROCADE_CLOCK/4); + m_astrocade_sound1->si_cb().set(FUNC(astrocde_home_state::inputs_r)); + m_astrocade_sound1->pot_cb<0>().set(m_ctrl[0], FUNC(astrocade_ctrl_port_device::read_knob)); + m_astrocade_sound1->pot_cb<1>().set(m_ctrl[1], FUNC(astrocade_ctrl_port_device::read_knob)); + m_astrocade_sound1->pot_cb<2>().set(m_ctrl[2], FUNC(astrocade_ctrl_port_device::read_knob)); + m_astrocade_sound1->pot_cb<3>().set(m_ctrl[3], FUNC(astrocade_ctrl_port_device::read_knob)); + m_astrocade_sound1->add_route(ALL_OUTPUTS, "mono", 1.0); + + /* expansion port */ + ASTROCADE_EXP_SLOT(config, m_exp, astrocade_exp, nullptr); + + /* cartridge */ + ASTROCADE_CART_SLOT(config, m_cart, astrocade_cart, nullptr); + + /* cartridge */ + ASTROCADE_ACCESSORY_PORT(config, m_accessory, m_screen, astrocade_accessories, nullptr); + m_accessory->ltpen_handler().set(FUNC(astrocde_home_state::lightpen_trigger_w)); + + /* Software lists */ + SOFTWARE_LIST(config, "cart_list").set_original("astrocde"); +} + + +/************************************* + * + * ROM definitions + * + *************************************/ + +ROM_START( astrocde ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "astro.bin", 0x0000, 0x2000, CRC(ebc77f3a) SHA1(b902c941997c9d150a560435bf517c6a28137ecc) ) +ROM_END + +ROM_START( astrocdl ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "ballyhlc.bin", 0x0000, 0x2000, CRC(d7c517ba) SHA1(6b2bef5d970e54ed204549f58ba6d197a8bfd3cc) ) +ROM_END + +ROM_START( astrocdw ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "bioswhit.bin", 0x0000, 0x2000, CRC(6eb53e79) SHA1(d84341feec1a0a0e8aa6151b649bc3cf6ef69fbf) ) +ROM_END + +/************************************* + * + * Driver initialization + * + *************************************/ + +void astrocde_home_state::init_astrocde() +{ + m_video_config = AC_SOUND_PRESENT; +} + +void astrocde_home_state::machine_start() +{ + if (m_cart->exists()) + m_maincpu->space(AS_PROGRAM).install_read_handler(0x2000, 0x3fff, read8sm_delegate(*m_cart, FUNC(astrocade_cart_slot_device::read_rom))); + + // if no RAM is mounted and the handlers are installed, the system starts with garbage on screen and a RESET is necessary + // thus, install RAM only if an expansion is mounted + if (m_exp->get_card_mounted()) + { + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x5000, 0xffff, read8sm_delegate(*m_exp, FUNC(astrocade_exp_device::read)), write8sm_delegate(*m_exp, FUNC(astrocade_exp_device::write))); + m_maincpu->space(AS_IO).install_readwrite_handler(0x0080, 0x00ff, 0x0000, 0x0000, 0xff00, read8sm_delegate(*m_exp, FUNC(astrocade_exp_device::read_io)), write8sm_delegate(*m_exp, FUNC(astrocade_exp_device::write_io))); + } +} + +} // Anonymous namespace + + +/************************************* + * + * Driver definitions + * + *************************************/ + +/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ +CONS( 1978, astrocde, 0, 0, astrocde, astrocde, astrocde_home_state, init_astrocde, "Bally Manufacturing", "Bally Professional Arcade", MACHINE_SUPPORTS_SAVE ) +CONS( 1977, astrocdl, astrocde, 0, astrocde, astrocde, astrocde_home_state, init_astrocde, "Bally Manufacturing", "Bally Home Library Computer", MACHINE_SUPPORTS_SAVE ) +CONS( 1977, astrocdw, astrocde, 0, astrocde, astrocde, astrocde_home_state, init_astrocde, "Bally Manufacturing", "Bally Computer System", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/midway/atlantis.cpp b/src/mame/midway/atlantis.cpp index 02df73d300d..d6540a46df7 100644 --- a/src/mame/midway/atlantis.cpp +++ b/src/mame/midway/atlantis.cpp @@ -38,20 +38,24 @@ ***************************************************************************/ #include "emu.h" -#include "cpu/mips/mips3.h" + +#include "midwayic.h" + +#include "dcs.h" + +#include "bus/rs232/rs232.h" #include "cpu/adsp2100/adsp2100.h" +#include "cpu/mips/mips3.h" #include "machine/idectrl.h" -#include "machine/midwayic.h" #include "machine/ins8250.h" -#include "bus/rs232/rs232.h" -#include "machine/terminal.h" -#include "audio/dcs.h" +#include "machine/pci-ide.h" #include "machine/pci.h" -#include "machine/vrc4373.h" #include "machine/pci9050.h" -#include "machine/pci-ide.h" -#include "video/zeus2.h" +#include "machine/terminal.h" #include "machine/timekpr.h" +#include "machine/vrc4373.h" +#include "video/zeus2.h" + #include "emupal.h" diff --git a/src/mame/midway/balsente.cpp b/src/mame/midway/balsente.cpp index ad7cde19856..9361297e8fc 100644 --- a/src/mame/midway/balsente.cpp +++ b/src/mame/midway/balsente.cpp @@ -206,14 +206,14 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" -#include "includes/balsente.h" +#include "balsente.h" #include "cpu/z80/z80.h" #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "audio/sente6vb.h" +#include "sente6vb.h" #include "machine/6821pia.h" #include "machine/z80ctc.h" #include "sound/ay8910.h" diff --git a/src/mame/midway/balsente_m.cpp b/src/mame/midway/balsente_m.cpp index 6889918cd42..dfbd7a6c407 100644 --- a/src/mame/midway/balsente_m.cpp +++ b/src/mame/midway/balsente_m.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "cpu/m6809/m6809.h" -#include "includes/balsente.h" +#include "balsente.h" /************************************* diff --git a/src/mame/midway/balsente_v.cpp b/src/mame/midway/balsente_v.cpp index 7a7b14823b2..17175e8c5e5 100644 --- a/src/mame/midway/balsente_v.cpp +++ b/src/mame/midway/balsente_v.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/balsente.h" +#include "balsente.h" /************************************* diff --git a/src/mame/midway/gridlee.cpp b/src/mame/midway/gridlee.cpp index c064a7fb669..fd2a9f9ffbe 100644 --- a/src/mame/midway/gridlee.cpp +++ b/src/mame/midway/gridlee.cpp @@ -80,7 +80,7 @@ #include "emu.h" -#include "includes/gridlee.h" +#include "gridlee.h" #include "cpu/m6809/m6809.h" #include "sound/samples.h" diff --git a/src/mame/midway/gridlee_a.cpp b/src/mame/midway/gridlee_a.cpp index 2f6904c4efc..e9f38afd7d4 100644 --- a/src/mame/midway/gridlee_a.cpp +++ b/src/mame/midway/gridlee_a.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/gridlee.h" +#include "gridlee.h" // device type definition diff --git a/src/mame/midway/gridlee_v.cpp b/src/mame/midway/gridlee_v.cpp index b5e4cf5320a..9768a48c232 100644 --- a/src/mame/midway/gridlee_v.cpp +++ b/src/mame/midway/gridlee_v.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gridlee.h" +#include "gridlee.h" /************************************* diff --git a/src/mame/midway/mcr.cpp b/src/mame/midway/mcr.cpp index ee8f5b157e6..90fbd581086 100644 --- a/src/mame/midway/mcr.cpp +++ b/src/mame/midway/mcr.cpp @@ -284,7 +284,7 @@ #include "emu.h" -#include "includes/mcr.h" +#include "mcr.h" #include "machine/nvram.h" #include "screen.h" diff --git a/src/mame/midway/mcr.h b/src/mame/midway/mcr.h index 9321894109d..dc04ac59ffd 100644 --- a/src/mame/midway/mcr.h +++ b/src/mame/midway/mcr.h @@ -5,11 +5,16 @@ Midway MCR system **************************************************************************/ -#ifndef MAME_INCLUDES_MCR_H -#define MAME_INCLUDES_MCR_H +#ifndef MAME_MIDWAY_MCR_H +#define MAME_MIDWAY_MCR_H #pragma once +#include "csd.h" +#include "midway.h" + +#include "ballysound.h" + #include "cpu/z80/z80.h" #include "machine/z80daisy.h" #include "machine/timer.h" @@ -17,13 +22,12 @@ #include "machine/z80pio.h" #include "machine/z80sio.h" #include "machine/watchdog.h" -#include "audio/bally.h" -#include "audio/midway.h" -#include "audio/csd.h" #include "sound/samples.h" + #include "emupal.h" #include "tilemap.h" + /* constants */ #define MAIN_OSC_MCR_I XTAL(19'968'000) @@ -232,4 +236,4 @@ extern const z80_daisy_config mcr_ipu_daisy_chain[]; extern const gfx_layout mcr_bg_layout; extern const gfx_layout mcr_sprite_layout; -#endif // MAME_INCLUDES_MCR_H +#endif // MAME_MIDWAY_MCR_H diff --git a/src/mame/midway/mcr3.cpp b/src/mame/midway/mcr3.cpp index a155914d3f9..69ac0e6f319 100644 --- a/src/mame/midway/mcr3.cpp +++ b/src/mame/midway/mcr3.cpp @@ -104,7 +104,7 @@ #include "emu.h" -#include "includes/mcr3.h" +#include "mcr3.h" #include "machine/nvram.h" diff --git a/src/mame/midway/mcr3.h b/src/mame/midway/mcr3.h index 911cd5f6c3a..37a15cfef38 100644 --- a/src/mame/midway/mcr3.h +++ b/src/mame/midway/mcr3.h @@ -10,7 +10,7 @@ #pragma once -#include "includes/mcr.h" +#include "mcr.h" #include "machine/74259.h" #include "machine/adc0844.h" diff --git a/src/mame/midway/mcr3_v.cpp b/src/mame/midway/mcr3_v.cpp index d520c229af3..8d551d652f2 100644 --- a/src/mame/midway/mcr3_v.cpp +++ b/src/mame/midway/mcr3_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mcr3.h" +#include "mcr3.h" diff --git a/src/mame/midway/mcr68.cpp b/src/mame/midway/mcr68.cpp index e41936d4019..11c615adfd4 100644 --- a/src/mame/midway/mcr68.cpp +++ b/src/mame/midway/mcr68.cpp @@ -58,7 +58,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mcr68.h" +#include "mcr68.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" diff --git a/src/mame/midway/mcr68.h b/src/mame/midway/mcr68.h index 03ebedf9f78..feed19e2924 100644 --- a/src/mame/midway/mcr68.h +++ b/src/mame/midway/mcr68.h @@ -5,17 +5,20 @@ Midway MCR-68k system ***************************************************************************/ -#ifndef MAME_INCLUDES_MCR68_H -#define MAME_INCLUDES_MCR68_H +#ifndef MAME_MIDWAY_MCR68_H +#define MAME_MIDWAY_MCR68_H #pragma once -#include "machine/timer.h" -#include "machine/watchdog.h" -#include "audio/midway.h" -#include "audio/s11c_bg.h" +#include "midway.h" + +#include "s11c_bg.h" + #include "machine/6840ptm.h" #include "machine/adc0844.h" +#include "machine/timer.h" +#include "machine/watchdog.h" + #include "screen.h" #include "tilemap.h" @@ -109,4 +112,4 @@ private: void trisport_map(address_map &map); }; -#endif // MAME_INCLUDES_MCR68_H +#endif // MAME_MIDWAY_MCR68_H diff --git a/src/mame/midway/mcr68_m.cpp b/src/mame/midway/mcr68_m.cpp index c8578c5a1ba..658bf65dc5b 100644 --- a/src/mame/midway/mcr68_m.cpp +++ b/src/mame/midway/mcr68_m.cpp @@ -7,8 +7,8 @@ ***************************************************************************/ #include "emu.h" -#include "audio/midway.h" -#include "includes/mcr68.h" +#include "midway.h" +#include "mcr68.h" #define VERBOSE 0 diff --git a/src/mame/midway/mcr68_v.cpp b/src/mame/midway/mcr68_v.cpp index 74c658ae340..d495876bca2 100644 --- a/src/mame/midway/mcr68_v.cpp +++ b/src/mame/midway/mcr68_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mcr68.h" +#include "mcr68.h" #define LOW_BYTE(x) ((x) & 0xff) diff --git a/src/mame/midway/mcr_m.cpp b/src/mame/midway/mcr_m.cpp index 61e99cbe5d3..8f6e221d263 100644 --- a/src/mame/midway/mcr_m.cpp +++ b/src/mame/midway/mcr_m.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mcr.h" +#include "mcr.h" #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) diff --git a/src/mame/midway/mcr_v.cpp b/src/mame/midway/mcr_v.cpp index ee0aa745b42..bb4710ffc00 100644 --- a/src/mame/midway/mcr_v.cpp +++ b/src/mame/midway/mcr_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mcr.h" +#include "mcr.h" #include "screen.h" diff --git a/src/mame/midway/midqslvr.cpp b/src/mame/midway/midqslvr.cpp index 8c1a08e2a0a..c36ede52222 100644 --- a/src/mame/midway/midqslvr.cpp +++ b/src/mame/midway/midqslvr.cpp @@ -247,9 +247,11 @@ Notes: #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "machine/lpci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" #include "machine/idectrl.h" #include "video/pc_vga.h" diff --git a/src/mame/midway/midtunit.cpp b/src/mame/midway/midtunit.cpp index 731f2bad927..0240f940271 100644 --- a/src/mame/midway/midtunit.cpp +++ b/src/mame/midway/midtunit.cpp @@ -23,7 +23,7 @@ #include "emu.h" -#include "includes/midtunit.h" +#include "midtunit.h" #include "cpu/adsp2100/adsp2100.h" #include "machine/nvram.h" diff --git a/src/mame/midway/midtunit.h b/src/mame/midway/midtunit.h index f0288aa19ae..38c1c26de67 100644 --- a/src/mame/midway/midtunit.h +++ b/src/mame/midway/midtunit.h @@ -6,16 +6,18 @@ Driver for Midway T-unit games. **************************************************************************/ -#ifndef MAME_INCLUDES_MIDTUNIT_H -#define MAME_INCLUDES_MIDTUNIT_H +#ifndef MAME_MIDWAY_MIDTUNIT_H +#define MAME_MIDWAY_MIDTUNIT_H #pragma once -#include "audio/dcs.h" -#include "audio/williams.h" -#include "video/midtunit.h" +#include "midtunit_v.h" + +#include "dcs.h" +#include "williamssound.h" #include "cpu/tms34010/tms34010.h" + #include "emupal.h" @@ -105,4 +107,4 @@ private: void main_map(address_map &map); }; -#endif // MAME_INCLUDES_MIDTUNIT_H +#endif // MAME_MIDWAY_MIDTUNIT_H diff --git a/src/mame/midway/midtunit_m.cpp b/src/mame/midway/midtunit_m.cpp index e5b8b436521..1360d9515c5 100644 --- a/src/mame/midway/midtunit_m.cpp +++ b/src/mame/midway/midtunit_m.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "cpu/tms34010/tms34010.h" #include "cpu/m6809/m6809.h" -#include "includes/midtunit.h" +#include "midtunit.h" /* constant definitions */ diff --git a/src/mame/midway/midtunit_v.cpp b/src/mame/midway/midtunit_v.cpp index 7d777751e48..952b9452894 100644 --- a/src/mame/midway/midtunit_v.cpp +++ b/src/mame/midway/midtunit_v.cpp @@ -8,8 +8,8 @@ **************************************************************************/ #include "emu.h" -#include "midtunit.h" -#include "midtunit.ipp" +#include "midtunit_v.h" +#include "midtunit_v.ipp" #include "screen.h" #include "midtview.ipp" diff --git a/src/mame/midway/midvunit.cpp b/src/mame/midway/midvunit.cpp index 535895f573b..026ea07bcb2 100644 --- a/src/mame/midway/midvunit.cpp +++ b/src/mame/midway/midvunit.cpp @@ -23,11 +23,13 @@ **************************************************************************/ #include "emu.h" + +#include "midvunit.h" + #include "cpu/tms32031/tms32031.h" #include "cpu/adsp2100/adsp2100.h" -#include "audio/dcs.h" #include "machine/nvram.h" -#include "includes/midvunit.h" + #include "crusnusa.lh" diff --git a/src/mame/midway/midvunit.h b/src/mame/midway/midvunit.h index c39c7a422e9..49b9191ff4a 100644 --- a/src/mame/midway/midvunit.h +++ b/src/mame/midway/midvunit.h @@ -5,14 +5,21 @@ Driver for Midway V-Unit games **************************************************************************/ +#ifndef MAME_MIDWAY_MIDVUNIT_H +#define MAME_MIDWAY_MIDVUNIT_H + +#pragma once + +#include "midwayic.h" + +#include "dcs.h" -#include "audio/dcs.h" #include "bus/ata/ataintf.h" #include "machine/adc0844.h" -#include "machine/midwayic.h" #include "machine/timer.h" #include "machine/watchdog.h" #include "video/poly.h" + #include "emupal.h" #include "screen.h" @@ -195,3 +202,5 @@ private: void midvplus_map(address_map &map); void midvunit_map(address_map &map); }; + +#endif // MAME_MIDWAY_MIDVUNIT_H diff --git a/src/mame/midway/midvunit_v.cpp b/src/mame/midway/midvunit_v.cpp index 7e7b486290b..a8dda86a057 100644 --- a/src/mame/midway/midvunit_v.cpp +++ b/src/mame/midway/midvunit_v.cpp @@ -7,10 +7,12 @@ **************************************************************************/ #include "emu.h" -#include "cpu/tms34010/tms34010.h" +#include "midvunit.h" + +#include "williamssound.h" + #include "cpu/adsp2100/adsp2100.h" -#include "audio/williams.h" -#include "includes/midvunit.h" +#include "cpu/tms34010/tms34010.h" #define WATCH_RENDER (0) @@ -26,8 +28,10 @@ midvunit_renderer::midvunit_renderer(midvunit_state &state) - : poly_manager(state.machine()), - m_state(state) { } + : poly_manager(state.machine()) + , m_state(state) +{ +} /************************************* diff --git a/src/mame/midway/midway.cpp b/src/mame/midway/midway.cpp index 077ab7f03da..87f0f3cf16d 100644 --- a/src/mame/midway/midway.cpp +++ b/src/mame/midway/midway.cpp @@ -18,9 +18,10 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mcr.h" -#include "audio/midway.h" -#include "audio/williams.h" +#include "mcr.h" +#include "midway.h" + +#include "williamssound.h" #include diff --git a/src/mame/midway/midwayic.h b/src/mame/midway/midwayic.h index 6e5deaf4a4b..499bfa9c72b 100644 --- a/src/mame/midway/midwayic.h +++ b/src/mame/midway/midwayic.h @@ -5,16 +5,18 @@ Emulation of various Midway ICs ***************************************************************************/ -#ifndef MAME_MACHINE_MIDWAY_IC_H -#define MAME_MACHINE_MIDWAY_IC_H +#ifndef MAME_MIDWAY_MIDWAY_IC_H +#define MAME_MIDWAY_MIDWAY_IC_H #pragma once -#include "audio/cage.h" -#include "audio/dcs.h" +#include "cage.h" +#include "dcs.h" + #include "cpu/pic16c5x/pic16c5x.h" + /* 1st generation Midway serial PIC - simulation*/ class midway_serial_pic_device : public device_t @@ -246,4 +248,4 @@ enum MIDWAY_IOASIC_HYPRDRIV }; -#endif // MAME_MACHINE_MIDWAY_IC_H +#endif // MAME_MIDWAY_MIDWAY_IC_H diff --git a/src/mame/midway/midwunit.cpp b/src/mame/midway/midwunit.cpp index 89a1167f433..1ee3008b542 100644 --- a/src/mame/midway/midwunit.cpp +++ b/src/mame/midway/midwunit.cpp @@ -94,12 +94,12 @@ Notes: #include "emu.h" -#include "includes/midwunit.h" -#include "audio/dcs.h" +#include "midwunit.h" #include "cpu/tms34010/tms34010.h" #include "cpu/adsp2100/adsp2100.h" #include "machine/nvram.h" + #include "screen.h" diff --git a/src/mame/midway/midwunit.h b/src/mame/midway/midwunit.h index 8b77fdafef7..9b1e2b986e2 100644 --- a/src/mame/midway/midwunit.h +++ b/src/mame/midway/midwunit.h @@ -5,15 +5,18 @@ Driver for Midway Wolf-unit games. **************************************************************************/ -#ifndef MAME_INCLUDES_MIDWUNIT_H -#define MAME_INCLUDES_MIDWUNIT_H +#ifndef MAME_MIDWAY_MIDWUNIT_H +#define MAME_MIDWAY_MIDWUNIT_H #pragma once -#include "audio/dcs.h" +#include "midwayic.h" +#include "midtunit_v.h" + +#include "dcs.h" + #include "cpu/tms34010/tms34010.h" -#include "machine/midwayic.h" -#include "video/midtunit.h" + #include "emupal.h" class midwunit_state : public driver_device @@ -88,4 +91,4 @@ private: uint16_t *m_umk3_palette = nullptr; }; -#endif // MAME_INCLUDES_MIDWUNIT_H +#endif // MAME_MIDWAY_MIDWUNIT_H diff --git a/src/mame/midway/midwunit_m.cpp b/src/mame/midway/midwunit_m.cpp index 0bf37f9293d..3fe58effd7a 100644 --- a/src/mame/midway/midwunit_m.cpp +++ b/src/mame/midway/midwunit_m.cpp @@ -7,7 +7,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/midwunit.h" +#include "midwunit.h" #define LOG_UNKNOWN (1 << 0) #define LOG_CMOS (1 << 1) diff --git a/src/mame/midway/midxunit.cpp b/src/mame/midway/midxunit.cpp index bdab0ac428e..26b7b13b73b 100644 --- a/src/mame/midway/midxunit.cpp +++ b/src/mame/midway/midxunit.cpp @@ -110,8 +110,7 @@ ________________________________________________________________ **************************************************************************/ #include "emu.h" -#include "includes/midxunit.h" -#include "audio/dcs.h" +#include "midxunit.h" #include "cpu/adsp2100/adsp2100.h" #include "cpu/tms34010/tms34010.h" diff --git a/src/mame/midway/midxunit.h b/src/mame/midway/midxunit.h index 8a13621ec6d..1b7e159841d 100644 --- a/src/mame/midway/midxunit.h +++ b/src/mame/midway/midxunit.h @@ -5,16 +5,19 @@ Driver for Midway X-unit games. **************************************************************************/ -#ifndef MAME_INCLUDES_MIDXUNIT_H -#define MAME_INCLUDES_MIDXUNIT_H +#ifndef MAME_MIDWAY_MIDXUNIT_H +#define MAME_MIDWAY_MIDXUNIT_H #pragma once -#include "audio/dcs.h" +#include "midtunit_v.h" + +#include "dcs.h" + #include "cpu/tms34010/tms34010.h" #include "cpu/pic16c5x/pic16c5x.h" #include "machine/nvram.h" -#include "video/midtunit.h" + #include "emupal.h" @@ -81,4 +84,4 @@ private: uint8_t m_pic_status = 0; }; -#endif // MAME_INCLUDES_MIDXUNIT_H +#endif // MAME_MIDWAY_MIDXUNIT_H diff --git a/src/mame/midway/midxunit_m.cpp b/src/mame/midway/midxunit_m.cpp index de2c0b9b18f..945ac450f27 100644 --- a/src/mame/midway/midxunit_m.cpp +++ b/src/mame/midway/midxunit_m.cpp @@ -7,7 +7,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/midxunit.h" +#include "midxunit.h" #define LOG_IO (1 << 0) #define LOG_UART (1 << 1) diff --git a/src/mame/midway/midyunit.cpp b/src/mame/midway/midyunit.cpp index 99b83d6bfa0..a81eb819cdf 100644 --- a/src/mame/midway/midyunit.cpp +++ b/src/mame/midway/midyunit.cpp @@ -118,7 +118,7 @@ Notes: **************************************************************************/ #include "emu.h" -#include "includes/midyunit.h" +#include "midyunit.h" #include "cpu/z80/z80.h" #include "screen.h" diff --git a/src/mame/midway/midyunit.h b/src/mame/midway/midyunit.h index 0ab28e54537..1ac721eaac1 100644 --- a/src/mame/midway/midyunit.h +++ b/src/mame/midway/midyunit.h @@ -11,7 +11,7 @@ #pragma once -#include "audio/williams.h" +#include "williamssound.h" #include "cpu/tms34010/tms34010.h" #include "machine/adc0844.h" diff --git a/src/mame/midway/midyunit_m.cpp b/src/mame/midway/midyunit_m.cpp index 0b0f6893474..67eb8a13fb5 100644 --- a/src/mame/midway/midyunit_m.cpp +++ b/src/mame/midway/midyunit_m.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "cpu/m6809/m6809.h" -#include "includes/midyunit.h" +#include "midyunit.h" /* constant definitions */ diff --git a/src/mame/midway/midyunit_v.cpp b/src/mame/midway/midyunit_v.cpp index 21a4cf02e29..761b8c7cd4c 100644 --- a/src/mame/midway/midyunit_v.cpp +++ b/src/mame/midway/midyunit_v.cpp @@ -8,7 +8,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/midyunit.h" +#include "midyunit.h" #include "screen.h" diff --git a/src/mame/midway/midzeus.cpp b/src/mame/midway/midzeus.cpp index 63713b1b982..565db539802 100644 --- a/src/mame/midway/midzeus.cpp +++ b/src/mame/midway/midzeus.cpp @@ -27,17 +27,18 @@ The Grid v1.2 10/18/2000 **************************************************************************/ #include "emu.h" -#include "audio/dcs.h" + +#include "midzeus.h" + +#include "dcs.h" #include "cpu/tms32031/tms32031.h" #include "cpu/adsp2100/adsp2100.h" #include "cpu/pic16c5x/pic16c5x.h" - -#include "includes/midzeus.h" - #include "machine/ibm21s850.h" #include "machine/nvram.h" #include "machine/tsb12lv01a.h" +#include "video/zeus2.h" #include "crusnexo.lh" @@ -54,7 +55,6 @@ The Grid v1.2 10/18/2000 /************************************************************************* Driver for Midway Zeus2 games **************************************************************************/ -#include "video/zeus2.h" class midzeus2_state : public midzeus_state { diff --git a/src/mame/midway/midzeus.h b/src/mame/midway/midzeus.h index ba0ec636c29..f0090d7a077 100644 --- a/src/mame/midway/midzeus.h +++ b/src/mame/midway/midzeus.h @@ -11,7 +11,7 @@ #include "machine/timekpr.h" #include "emupal.h" #include "screen.h" -#include "machine/midwayic.h" +#include "midwayic.h" #include "video/poly.h" /************************************* diff --git a/src/mame/midway/midzeus_v.cpp b/src/mame/midway/midzeus_v.cpp index 074e9ee6705..d9e488a4857 100644 --- a/src/mame/midway/midzeus_v.cpp +++ b/src/mame/midway/midzeus_v.cpp @@ -7,7 +7,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/midzeus.h" +#include "midzeus.h" #include "video/rgbutil.h" diff --git a/src/mame/midway/omegrace.cpp b/src/mame/midway/omegrace.cpp index 9c1a71d42e8..4304d05e26c 100644 --- a/src/mame/midway/omegrace.cpp +++ b/src/mame/midway/omegrace.cpp @@ -216,13 +216,16 @@ ***************************************************************************/ #include "emu.h" + +#include "avgdvg.h" + #include "cpu/z80/z80.h" -#include "video/vector.h" -#include "video/avgdvg.h" -#include "sound/ay8910.h" #include "machine/gen_latch.h" #include "machine/nvram.h" #include "machine/watchdog.h" +#include "sound/ay8910.h" +#include "video/vector.h" + #include "screen.h" #include "speaker.h" diff --git a/src/mame/midway/pinball2k.cpp b/src/mame/midway/pinball2k.cpp index bfc18c1c424..8309ae69b1f 100644 --- a/src/mame/midway/pinball2k.cpp +++ b/src/mame/midway/pinball2k.cpp @@ -31,12 +31,15 @@ TODO: ****************************************************************************************************************/ #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "machine/idectrl.h" #include "machine/lpci.h" #include "machine/pckeybrd.h" -#include "machine/pcshare.h" #include "video/ramdac.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/midway/seattle.cpp b/src/mame/midway/seattle.cpp index d569eeaefbb..781deb7c553 100644 --- a/src/mame/midway/seattle.cpp +++ b/src/mame/midway/seattle.cpp @@ -186,9 +186,10 @@ #include "emu.h" -#include "audio/cage.h" -#include "audio/dcs.h" -#include "machine/midwayic.h" +#include "midwayic.h" + +#include "cage.h" +#include "dcs.h" #include "bus/ata/idehd.h" #include "cpu/adsp2100/adsp2100.h" diff --git a/src/mame/midway/sente6vb.cpp b/src/mame/midway/sente6vb.cpp index de06af02feb..dab50609128 100644 --- a/src/mame/midway/sente6vb.cpp +++ b/src/mame/midway/sente6vb.cpp @@ -56,7 +56,7 @@ #include "emu.h" #include "sound/mm5837.h" -#include "audio/sente6vb.h" +#include "sente6vb.h" #include "cpu/z80/z80.h" #include "machine/clock.h" #include "speaker.h" diff --git a/src/mame/midway/sspeedr.cpp b/src/mame/midway/sspeedr.cpp index e55e4f5ef15..219e20b2918 100644 --- a/src/mame/midway/sspeedr.cpp +++ b/src/mame/midway/sspeedr.cpp @@ -10,8 +10,8 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/sspeedr.h" -#include "audio/nl_sspeedr.h" +#include "sspeedr.h" +#include "nl_sspeedr.h" #include "speaker.h" #include "cpu/z80/z80.h" diff --git a/src/mame/midway/sspeedr_v.cpp b/src/mame/midway/sspeedr_v.cpp index 95849c78231..2d8da66c0c5 100644 --- a/src/mame/midway/sspeedr_v.cpp +++ b/src/mame/midway/sspeedr_v.cpp @@ -7,7 +7,7 @@ Taito Super Speed Race video emulation ***************************************************************************/ #include "emu.h" -#include "includes/sspeedr.h" +#include "sspeedr.h" void sspeedr_state::driver_horz_w(uint8_t data) diff --git a/src/mame/midway/vegas.cpp b/src/mame/midway/vegas.cpp index 95d3f512194..02052176ef1 100644 --- a/src/mame/midway/vegas.cpp +++ b/src/mame/midway/vegas.cpp @@ -273,8 +273,9 @@ #include "emu.h" -#include "audio/dcs.h" -#include "machine/midwayic.h" +#include "midwayic.h" + +#include "dcs.h" #include "bus/ata/idehd.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/midway/williams.cpp b/src/mame/midway/williams.cpp index e3d2021c973..09248956f49 100644 --- a/src/mame/midway/williams.cpp +++ b/src/mame/midway/williams.cpp @@ -492,7 +492,7 @@ Reference videos: https://www.youtube.com/watch?v=R5OeC6Wc_yI ***************************************************************************/ #include "emu.h" -#include "includes/williams.h" +#include "williams.h" #include "machine/input_merger.h" #include "machine/nvram.h" diff --git a/src/mame/midway/williams.h b/src/mame/midway/williams.h index 49baf3602ea..baa556a346b 100644 --- a/src/mame/midway/williams.h +++ b/src/mame/midway/williams.h @@ -5,13 +5,14 @@ Driver for early Williams games **************************************************************************/ -#ifndef MAME_INCLUDES_WILLIAMS_H -#define MAME_INCLUDES_WILLIAMS_H +#ifndef MAME_MIDWAY_WILLIAMS_H +#define MAME_MIDWAY_WILLIAMS_H #pragma once -#include "audio/williams.h" -#include "audio/s11c_bg.h" +#include "s11c_bg.h" +#include "williamssound.h" + #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" @@ -21,6 +22,7 @@ #include "machine/timer.h" #include "machine/watchdog.h" #include "sound/hc55516.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" @@ -507,4 +509,4 @@ private: #define WILLIAMS_TILEMAP_TSHOOT 1 /* IC79 is a 74LS157 selector jumpered to be enabled */ #define WILLIAMS_TILEMAP_JOUST2 2 /* IC79 is a 74LS157 selector jumpered to be disabled */ -#endif // MAME_INCLUDES_WILLIAMS_H +#endif // MAME_MIDWAY_WILLIAMS_H diff --git a/src/mame/midway/williams_m.cpp b/src/mame/midway/williams_m.cpp index de7b50cbdac..ad19ffeeb1c 100644 --- a/src/mame/midway/williams_m.cpp +++ b/src/mame/midway/williams_m.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/williams.h" +#include "williams.h" /************************************* diff --git a/src/mame/midway/williams_v.cpp b/src/mame/midway/williams_v.cpp index 8a7d4155153..4bc0f2781a5 100644 --- a/src/mame/midway/williams_v.cpp +++ b/src/mame/midway/williams_v.cpp @@ -150,7 +150,7 @@ The full silkscreen markings of SC2 (under the "Special Chip 2" sticker, if it i #include "emu.h" #include "video/resnet.h" -#include "includes/williams.h" +#include "williams.h" /************************************* * diff --git a/src/mame/midway/wmg.cpp b/src/mame/midway/wmg.cpp index 27cfde08d78..3a08d4a25cb 100644 --- a/src/mame/midway/wmg.cpp +++ b/src/mame/midway/wmg.cpp @@ -69,7 +69,7 @@ of save-state is also needed. ***********************************************************************************************************/ #include "emu.h" -#include "includes/williams.h" +#include "williams.h" #include "cpu/m6800/m6800.h" #include "machine/input_merger.h" diff --git a/src/mame/midway/zwackery.cpp b/src/mame/midway/zwackery.cpp index fb1420e43fd..ec194c18532 100644 --- a/src/mame/midway/zwackery.cpp +++ b/src/mame/midway/zwackery.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/csd.h" +#include "csd.h" #include "cpu/m68000/m68000.h" #include "machine/6821pia.h" diff --git a/src/mame/mips/mips.cpp b/src/mame/mips/mips.cpp index 4c6eb0023c5..99fb749196b 100644 --- a/src/mame/mips/mips.cpp +++ b/src/mame/mips/mips.cpp @@ -219,7 +219,7 @@ // i/o devices (rx3230) #include "machine/timekpr.h" #include "machine/ncr5390.h" -#include "machine/mips_rambo.h" +#include "mips_rambo.h" // busses and connectors #include "machine/nscsi_bus.h" diff --git a/src/mame/misc/3do.cpp b/src/mame/misc/3do.cpp index e621c2a9bde..595f4c8a336 100644 --- a/src/mame/misc/3do.cpp +++ b/src/mame/misc/3do.cpp @@ -94,7 +94,7 @@ Part list of Goldstar 3DO Interactive Multiplayer ***************************************************************************/ #include "emu.h" -#include "includes/3do.h" +#include "3do.h" #include "cpu/arm/arm.h" #include "cpu/arm7/arm7.h" diff --git a/src/mame/misc/3do_m.cpp b/src/mame/misc/3do_m.cpp index 3572ac49861..8a09ad65e63 100644 --- a/src/mame/misc/3do_m.cpp +++ b/src/mame/misc/3do_m.cpp @@ -60,7 +60,7 @@ Expansion bus stuff: */ #include "emu.h" -#include "includes/3do.h" +#include "3do.h" #include "cpu/arm7/arm7core.h" diff --git a/src/mame/misc/aces1.cpp b/src/mame/misc/aces1.cpp index 1d2742bf760..8a53834bf40 100644 --- a/src/mame/misc/aces1.cpp +++ b/src/mame/misc/aces1.cpp @@ -28,14 +28,15 @@ JPM style Reel MCU? Certainly reel data seems to be muxed together in a weird wa */ - #include "emu.h" -#include "video/awpvid.h" + +#include "awpvid.h" #include "cpu/z80/z80.h" -#include "sound/ay8910.h" #include "machine/i8255.h" #include "machine/steppers.h" +#include "sound/ay8910.h" + #include "speaker.h" #include "aces1.lh" diff --git a/src/mame/misc/acesp.cpp b/src/mame/misc/acesp.cpp index 9ad8f15365b..8bf5efec72c 100644 --- a/src/mame/misc/acesp.cpp +++ b/src/mame/misc/acesp.cpp @@ -28,7 +28,7 @@ #include "machine/6821pia.h" #include "machine/timer.h" -#include "machine/ace_sp_reelctrl.h" +#include "ace_sp_reelctrl.h" #include "ace_sp_dmd.lh" diff --git a/src/mame/misc/ampoker2.cpp b/src/mame/misc/ampoker2.cpp index 349f6f95ad7..6afde70773d 100644 --- a/src/mame/misc/ampoker2.cpp +++ b/src/mame/misc/ampoker2.cpp @@ -401,7 +401,7 @@ *********************************************************************************/ #include "emu.h" -#include "includes/ampoker2.h" +#include "ampoker2.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" diff --git a/src/mame/misc/ampoker2_v.cpp b/src/mame/misc/ampoker2_v.cpp index 01c27166f82..aaa39ba32fb 100644 --- a/src/mame/misc/ampoker2_v.cpp +++ b/src/mame/misc/ampoker2_v.cpp @@ -70,7 +70,7 @@ #include "emu.h" -#include "includes/ampoker2.h" +#include "ampoker2.h" #include "video/resnet.h" diff --git a/src/mame/misc/apple2_v.cpp b/src/mame/misc/apple2_v.cpp deleted file mode 100644 index b5ed4281205..00000000000 --- a/src/mame/misc/apple2_v.cpp +++ /dev/null @@ -1,1643 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:R. Belmont -/*************************************************************************** - - video/apple2.cpp - -***************************************************************************/ - -#include "emu.h" -#include "machine/ram.h" -#include "video/apple2.h" -#include "screen.h" - -/***************************************************************************/ - - -#define BLACK 0 -#define DKRED 1 -#define DKBLUE 2 -#define PURPLE 3 -#define DKGREEN 4 -#define DKGRAY 5 -#define BLUE 6 -#define LTBLUE 7 -#define BROWN 8 -#define ORANGE 9 -#define GRAY 10 -#define PINK 11 -#define GREEN 12 -#define YELLOW 13 -#define AQUA 14 -#define WHITE 15 - -DEFINE_DEVICE_TYPE(APPLE2_VIDEO, a2_video_device, "a2video", "Apple II video") - -//------------------------------------------------- -// a2_video_device - constructor -//------------------------------------------------- - -a2_video_device::a2_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, APPLE2_VIDEO, tag, owner, clock) - , device_palette_interface(mconfig, *this) - , device_video_interface(mconfig, *this) -{ -} - -void a2_video_device::device_start() -{ - static const uint8_t hires_artifact_color_table[] = - { - BLACK, PURPLE, GREEN, WHITE, - BLACK, BLUE, ORANGE, WHITE - }; - static const uint8_t dhires_artifact_color_table[] = - { - BLACK, DKGREEN, BROWN, GREEN, - DKRED, DKGRAY, ORANGE, YELLOW, - DKBLUE, BLUE, GRAY, AQUA, - PURPLE, LTBLUE, PINK, WHITE - }; - - // generate hi-res artifact data - int i, j; - uint16_t c; - - /* 2^3 dependent pixels * 2 color sets * 2 offsets */ - m_hires_artifact_map = std::make_unique(8 * 2 * 2); - - /* build hires artifact map */ - for (i = 0; i < 8; i++) - { - for (j = 0; j < 2; j++) - { - if (i & 0x02) - { - if ((i & 0x05) != 0) - c = 3; - else - c = j ? 2 : 1; - } - else - { - if ((i & 0x05) == 0x05) - c = j ? 1 : 2; - else - c = 0; - } - m_hires_artifact_map[ 0 + j*8 + i] = hires_artifact_color_table[(c + 0) % 8]; - m_hires_artifact_map[16 + j*8 + i] = hires_artifact_color_table[(c + 4) % 8]; - } - } - - /* 2^4 dependent pixels */ - m_dhires_artifact_map = std::make_unique(16); - - /* build double hires artifact map */ - for (i = 0; i < 16; i++) - { - m_dhires_artifact_map[i] = dhires_artifact_color_table[i]; - } - - // initialise for device_palette_interface - init_palette(); - - save_item(NAME(m_page2)); - save_item(NAME(m_flash)); - save_item(NAME(m_mix)); - save_item(NAME(m_graphics)); - save_item(NAME(m_hires)); - save_item(NAME(m_dhires)); - save_item(NAME(m_80col)); - save_item(NAME(m_altcharset)); - save_item(NAME(m_an2)); - save_item(NAME(m_80store)); - save_item(NAME(m_monohgr)); - save_item(NAME(m_GSfg)); - save_item(NAME(m_GSbg)); - save_item(NAME(m_GSborder)); - save_item(NAME(m_newvideo)); - save_item(NAME(m_monochrome)); - save_item(NAME(m_rgbmode)); - save_item(NAME(m_shr_palette)); -} - -void a2_video_device::device_reset() -{ - m_page2 = false; - m_graphics = false; - m_hires = false; - m_80col = false; - m_altcharset = false; - m_dhires = false; - m_flash = false; - m_mix = false; - m_sysconfig = 0; - m_an2 = false; - m_80store = false; - m_monohgr = false; - m_newvideo = 0x01; - m_rgbmode = 3; // default to color DHGR - m_monochrome = 0; // TODO: never set, but if left uninitialized could cause the emulation to start in monochrome by accident. Default to color for now -} - -WRITE_LINE_MEMBER(a2_video_device::txt_w) -{ - if (m_graphics == state) // avoid flickering from II+ refresh polling - { - // select graphics or text mode - screen().update_now(); - m_graphics = !state; - } -} - -WRITE_LINE_MEMBER(a2_video_device::mix_w) -{ - // select mixed mode or nomix - screen().update_now(); - m_mix = state; -} - -WRITE_LINE_MEMBER(a2_video_device::scr_w) -{ - // select primary or secondary page - if (!m_80col) - screen().update_now(); - m_page2 = state; -} - -WRITE_LINE_MEMBER(a2_video_device::res_w) -{ - // select lo-res or hi-res - screen().update_now(); - m_hires = state; -} - -WRITE_LINE_MEMBER(a2_video_device::dhires_w) -{ - // select double hi-res - screen().update_now(); - - // RGB cards shift in a mode bit on the rising edge - if ((m_dhires) && (state)) - { - m_rgbmode = (m_rgbmode << 1) & 3; - m_rgbmode |= m_80col ? 1 : 0; - } - - m_dhires = !state; -} - -WRITE_LINE_MEMBER(a2_video_device::an2_w) -{ - m_an2 = state; -} - -template -void a2_video_device::plot_text_character(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg) -{ - if (iie) // IIe/IIc/IIgs - { - if (!m_altcharset) - { - if ((code >= 0x40) && (code <= 0x7f)) - { - code &= 0x3f; - - if (m_flash) - { - using std::swap; - swap(fg, bg); - } - } - } - else - { - if ((code >= 0x60) && (code <= 0x7f)) - { - code |= 0x80; // map to lowercase normal - using std::swap; // and flip the color - std::swap(fg, bg); - } - } - } - else // original II and II Plus - { - if ((code >= 0x40) && (code <= 0x7f)) - { - if (m_flash) - { - using std::swap; - swap(fg, bg); - } - } - else if (code < 0x40) // inverse: flip FG and BG - { - using std::swap; - swap(fg, bg); - } - } - - /* look up the character data */ - u8 const *const chardata = &m_char_ptr[(code * 8)]; - - for (int y = 0; y < 8; y++) - { - for (int x = 0; x < 7; x++) - { - u16 color; - // flip and invert are template parameters, so the compiler will boil this down appropriately - if (flip) - { - if (invert) - { - color = (chardata[y] & (1 << (6 - x))) ? fg : bg; - } - else - { - color = (chardata[y] & (1 << (6 - x))) ? bg : fg; - } - } - else - { - if (invert) - { - color = (chardata[y] & (1 << x)) ? fg : bg; - } - else - { - color = (chardata[y] & (1 << x)) ? bg : fg; - } - } - - for (int i = 0; i < xscale; i++) - { - bitmap.pix(ypos + y, xpos + (x * xscale) + i) = color; - } - } - } -} - -void a2_video_device::plot_text_character_jplus(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg) -{ - if ((code >= 0x40) && (code <= 0x7f)) - { - code &= 0x3f; - if (m_flash) - { - using std::swap; - swap(fg, bg); - } - } - else if (code < 0x40) // inverse: flip FG and BG - { - using std::swap; - swap(fg, bg); - } - - if (m_an2) - { - code |= 0x80; - } - - /* look up the character data */ - uint8_t const *const chardata = &m_char_ptr[(code * 8)]; - - for (int y = 0; y < 8; y++) - { - for (int x = 0; x < 7; x++) - { - uint16_t const color = (chardata[y] & (1 << (6-x))) ? fg : bg; - - for (int i = 0; i < xscale; i++) - { - bitmap.pix(ypos + y, xpos + (x * xscale) + i) = color; - } - } - } -} - -void a2_video_device::plot_text_character_ultr(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg) -{ - if ((code >= 0x40) && (code <= 0x7f)) - { - if (m_flash) - { - using std::swap; - swap(fg, bg); - } - } - - /* look up the character data */ - uint8_t const *const chardata = &m_char_ptr[(code * 8)]; - - for (int y = 0; y < 8; y++) - { - for (int x = 1; x < 8; x++) - { - uint16_t const color = (chardata[y] & (1 << x)) ? fg : bg; - - for (int i = 0; i < xscale; i++) - { - bitmap.pix(ypos + y, xpos + ((x-1) * xscale) + i) = color; - } - } - } -} - -void a2_video_device::plot_text_characterGS(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg) -{ - if (!m_altcharset) - { - if ((code >= 0x40) && (code <= 0x7f)) - { - code &= 0x3f; - - if (m_flash) - { - using std::swap; - swap(fg, bg); - } - } - } - else - { - code |= 0x100; - } - - /* look up the character data */ - uint8_t const *const chardata = &m_char_ptr[(code * 8)]; - - for (int y = 0; y < 8; y++) - { - for (int x = 0; x < 7; x++) - { - uint16_t const color = (chardata[y] & (1 << x)) ? bg : fg; - - for (int i = 0; i < xscale; i++) - { - bitmap.pix(ypos + y, xpos + (x * xscale) + i) = color; - } - } - } -} - -void a2_video_device::lores_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) -{ - uint32_t const start_address = m_80store ? 0x400 : m_page2 ? 0x0800 : 0x0400; - int fg = 0; - - switch (m_sysconfig & 0x03) - { - case 0: case 4: fg = WHITE; break; - case 1: fg = WHITE; break; - case 2: fg = GREEN; break; - case 3: fg = ORANGE; break; - } - - /* perform adjustments */ - beginrow = (std::max)(beginrow, cliprect.top()); - endrow = (std::min)(endrow, cliprect.bottom()); - const int startrow = (beginrow / 8) * 8; - const int stoprow = ((endrow / 8) + 1) * 8; - const int startcol = (cliprect.left() / 14); - const int stopcol = ((cliprect.right() / 14) + 1); - - //printf("GR: row %d startcol %d stopcol %d left %d right %d\n", beginrow, startcol, stopcol, cliprect.left(), cliprect.right()); - - if (!(m_sysconfig & 0x03)) // color - { - for (int row = startrow; row <= stoprow; row += 8) - { - for (int col = startcol; col < stopcol; col++) - { - /* calculate adderss */ - uint32_t const address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); - - /* perform the lookup */ - uint8_t const code = m_ram_ptr[address]; - - /* and now draw */ - for (int y = 0; y < 4; y++) - { - if (((row + y) >= beginrow) && ((row + y) <= endrow)) - { - for (int x = 0; x < 14; x++) - { - bitmap.pix(row + y, col * 14 + x) = (code >> 0) & 0x0F; - } - } - } - for (int y = 4; y < 8; y++) - { - if (((row + y) >= beginrow) && ((row + y) <= endrow)) - { - for (int x = 0; x < 14; x++) - { - bitmap.pix(row + y, col * 14 + x) = (code >> 4) & 0x0F; - } - } - } - } - } - } - else - { - for (int row = startrow; row <= stoprow; row += 8) - { - for (int col = startcol; col < stopcol; col++) - { - uint8_t bits; - - /* calculate adderss */ - uint32_t const address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); - - /* perform the lookup */ - uint8_t const code = m_ram_ptr[address]; - - bits = (code >> 0) & 0x0F; - /* and now draw */ - for (int y = 0; y < 4; y++) - { - if (((row + y) >= beginrow) && ((row + y) <= endrow)) - { - for (int x = 0; x < 14; x++) - { - if (col & 1) - { - bitmap.pix(row + y, col * 14 + x) = bits & (1 << ((x+2) % 4)) ? fg : 0; - } - else - { - bitmap.pix(row + y, col * 14 + x) = bits & (1 << (x % 4)) ? fg : 0; - } - } - } - } - - bits = (code >> 4) & 0x0F; - for (int y = 4; y < 8; y++) - { - if (((row + y) >= beginrow) && ((row + y) <= endrow)) - { - for (int x = 0; x < 14; x++) - { - if (col & 1) - { - bitmap.pix(row + y, col * 14 + x) = bits & (1 << ((x+2) % 4)) ? fg : 0; - } - else - { - bitmap.pix(row + y, col * 14 + x) = bits & (1 << (x % 4)) ? fg : 0; - } - } - } - } - } - } - } -} - -void a2_video_device::dlores_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) -{ - uint32_t const start_address = m_page2 ? 0x0800 : 0x0400; - static const int aux_colors[16] = { 0, 2, 4, 6, 8, 0xa, 0xc, 0xe, 1, 3, 5, 7, 9, 0xb, 0xd, 0xf }; - int fg = 0; - - switch (m_sysconfig & 0x03) - { - case 0: case 4: fg = WHITE; break; - case 1: fg = WHITE; break; - case 2: fg = GREEN; break; - case 3: fg = ORANGE; break; - } - - /* perform adjustments */ - beginrow = (std::max)(beginrow, cliprect.top() - (cliprect.top() % 8)); - endrow = (std::min)(endrow, cliprect.bottom() - (cliprect.bottom() % 8) + 7); - - const int startrow = (beginrow / 8) * 8; - const int stoprow = ((endrow / 8) + 1) * 8; - const int startcol = (cliprect.left() / 14); - const int stopcol = ((cliprect.right() / 14) + 1); - - if (!(m_sysconfig & 0x03)) - { - for (int row = startrow; row <= stoprow; row += 8) - { - for (int col = startcol; col < stopcol; col++) - { - /* calculate adderss */ - uint32_t const address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); - - /* perform the lookup */ - uint8_t const code = m_ram_ptr[address]; - uint8_t const auxcode = m_aux_ptr[address]; - - /* and now draw */ - for (int y = 0; y < 4; y++) - { - if (((row + y) >= beginrow) && ((row + y) <= endrow)) - { - uint16_t *vram = &bitmap.pix(row + y, (col * 14)); - - *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; - *vram++ = (code >> 0) & 0x0F; - *vram++ = (code >> 0) & 0x0F; - *vram++ = (code >> 0) & 0x0F; - *vram++ = (code >> 0) & 0x0F; - *vram++ = (code >> 0) & 0x0F; - *vram++ = (code >> 0) & 0x0F; - *vram++ = (code >> 0) & 0x0F; - } - } - for (int y = 4; y < 8; y++) - { - if (((row + y) >= beginrow) && ((row + y) <= endrow)) - { - uint16_t *vram = &bitmap.pix(row + y, (col * 14)); - - *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; - *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; - *vram++ = (code >> 4) & 0x0F; - *vram++ = (code >> 4) & 0x0F; - *vram++ = (code >> 4) & 0x0F; - *vram++ = (code >> 4) & 0x0F; - *vram++ = (code >> 4) & 0x0F; - *vram++ = (code >> 4) & 0x0F; - *vram++ = (code >> 4) & 0x0F; - } - } - } - } - } - else - { - for (int row = startrow; row < stoprow; row += 8) - { - for (int col = 0; col < 40; col++) - { - uint8_t bits, abits; - - /* calculate adderss */ - uint32_t const address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); - - /* perform the lookup */ - uint8_t const code = m_ram_ptr[address]; - uint8_t const auxcode = m_aux_ptr[address]; - - bits = (code >> 0) & 0x0F; - abits = (auxcode >> 0) & 0x0F; - - /* and now draw */ - for (int y = 0; y < 4; y++) - { - if (((row + y) >= beginrow) && ((row + y) <= endrow)) - { - uint16_t *vram = &bitmap.pix(row + y, (col * 14)); - - if (col & 1) - { - *vram++ = abits & (1 << 2) ? fg : 0; - *vram++ = abits & (1 << 3) ? fg : 0; - *vram++ = abits & (1 << 0) ? fg : 0; - *vram++ = abits & (1 << 1) ? fg : 0; - *vram++ = abits & (1 << 2) ? fg : 0; - *vram++ = abits & (1 << 3) ? fg : 0; - *vram++ = abits & (1 << 0) ? fg : 0; - *vram++ = bits & (1 << 1) ? fg : 0; - *vram++ = bits & (1 << 2) ? fg : 0; - *vram++ = bits & (1 << 3) ? fg : 0; - *vram++ = bits & (1 << 0) ? fg : 0; - *vram++ = bits & (1 << 1) ? fg : 0; - *vram++ = bits & (1 << 2) ? fg : 0; - *vram++ = bits & (1 << 3) ? fg : 0; - } - else - { - *vram++ = abits & (1 << 0) ? fg : 0; - *vram++ = abits & (1 << 1) ? fg : 0; - *vram++ = abits & (1 << 2) ? fg : 0; - *vram++ = abits & (1 << 3) ? fg : 0; - *vram++ = abits & (1 << 0) ? fg : 0; - *vram++ = abits & (1 << 1) ? fg : 0; - *vram++ = abits & (1 << 2) ? fg : 0; - *vram++ = bits & (1 << 0) ? fg : 0; - *vram++ = bits & (1 << 1) ? fg : 0; - *vram++ = bits & (1 << 2) ? fg : 0; - *vram++ = bits & (1 << 3) ? fg : 0; - *vram++ = bits & (1 << 0) ? fg : 0; - *vram++ = bits & (1 << 1) ? fg : 0; - *vram++ = bits & (1 << 2) ? fg : 0; - } - } - } - - bits = (code >> 4) & 0x0F; - abits = (auxcode >> 4) & 0x0F; - - for (int y = 4; y < 8; y++) - { - if (((row + y) >= beginrow) && ((row + y) <= endrow)) - { - uint16_t *vram = &bitmap.pix(row + y, (col * 14)); - - if (col & 1) - { - *vram++ = abits & (1 << 2) ? fg : 0; - *vram++ = abits & (1 << 3) ? fg : 0; - *vram++ = abits & (1 << 0) ? fg : 0; - *vram++ = abits & (1 << 1) ? fg : 0; - *vram++ = abits & (1 << 2) ? fg : 0; - *vram++ = abits & (1 << 3) ? fg : 0; - *vram++ = abits & (1 << 0) ? fg : 0; - *vram++ = bits & (1 << 1) ? fg : 0; - *vram++ = bits & (1 << 2) ? fg : 0; - *vram++ = bits & (1 << 3) ? fg : 0; - *vram++ = bits & (1 << 0) ? fg : 0; - *vram++ = bits & (1 << 1) ? fg : 0; - *vram++ = bits & (1 << 2) ? fg : 0; - *vram++ = bits & (1 << 3) ? fg : 0; - } - else - { - *vram++ = abits & (1 << 0) ? fg : 0; - *vram++ = abits & (1 << 1) ? fg : 0; - *vram++ = abits & (1 << 2) ? fg : 0; - *vram++ = abits & (1 << 3) ? fg : 0; - *vram++ = abits & (1 << 0) ? fg : 0; - *vram++ = abits & (1 << 1) ? fg : 0; - *vram++ = abits & (1 << 2) ? fg : 0; - *vram++ = bits & (1 << 0) ? fg : 0; - *vram++ = bits & (1 << 1) ? fg : 0; - *vram++ = bits & (1 << 2) ? fg : 0; - *vram++ = bits & (1 << 3) ? fg : 0; - *vram++ = bits & (1 << 0) ? fg : 0; - *vram++ = bits & (1 << 1) ? fg : 0; - *vram++ = bits & (1 << 2) ? fg : 0; - } - } - } - } - } - } -} - -template -void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) -{ - uint8_t const *const aux_page = m_aux_ptr ? m_aux_ptr : m_ram_ptr; - - uint32_t const start_address = m_page2 ? 0x800 : 0x400; - - beginrow = (std::max)(beginrow, cliprect.top() - (cliprect.top() % 8)); - endrow = (std::min)(endrow, cliprect.bottom() - (cliprect.bottom() % 8) + 7); - - const int startrow = (beginrow / 8) * 8; - const int stoprow = ((endrow / 8) + 1) * 8; - const int startcol = (cliprect.left() / 14); - const int stopcol = ((cliprect.right() / 14) + 1); - - // printf("TXT: row %d startcol %d stopcol %d left %d right %d\n", beginrow, startcol, stopcol, cliprect.left(), cliprect.right()); - - int fg = 0; - int bg = 0; - switch (m_sysconfig & 0x03) - { - case 0: - case 4: - fg = WHITE; - break; - case 1: - fg = WHITE; - break; - case 2: - fg = GREEN; - break; - case 3: - fg = ORANGE; - break; - } - - for (int row = startrow; row < stoprow; row += 8) - { - if ((iie) && (m_80col)) - { - for (int col = startcol; col < stopcol; col++) - { - /* calculate address */ - uint32_t const address = start_address + ((((row / 8) & 0x07) << 7) | (((row / 8) & 0x18) * 5 + col)); - - plot_text_character(bitmap, col * 14, row, 1, aux_page[address], - fg, bg); - plot_text_character(bitmap, col * 14 + 7, row, 1, m_ram_ptr[address], - fg, bg); - } - } - else - { - for (int col = startcol; col < stopcol; col++) - { - /* calculate address */ - uint32_t const address = start_address + ((((row / 8) & 0x07) << 7) | (((row / 8) & 0x18) * 5 + col)); - if (((m_sysconfig & 7) == 4) && (m_dhires)) - { - u8 tmp = aux_page[address]; - fg = tmp >> 4; - bg = tmp & 0xf; - } - - plot_text_character(bitmap, col * 14, row, 2, m_ram_ptr[address], fg, bg); - } - } - } -} - -template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); -template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); -template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); -template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); -template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); -template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); -template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); -template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - -void a2_video_device::text_update_jplus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) -{ - int row, col; - uint32_t start_address = m_page2 ? 0x800 : 0x400; - uint32_t address; - int fg = 0; - int bg = 0; - - beginrow = (std::max)(beginrow, cliprect.top() - (cliprect.top() % 8)); - endrow = (std::min)(endrow, cliprect.bottom() - (cliprect.bottom() % 8) + 7); - - const int startrow = (beginrow / 8) * 8; - const int stoprow = ((endrow / 8) + 1) * 8; - - switch (m_sysconfig & 0x03) - { - case 0: fg = WHITE; break; - case 1: fg = WHITE; break; - case 2: fg = GREEN; break; - case 3: fg = ORANGE; break; - } - - for (row = startrow; row <= stoprow; row += 8) - { - for (col = 0; col < 40; col++) - { - /* calculate address */ - address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); - plot_text_character_jplus(bitmap, col * 14, row, 2, m_ram_ptr[address], fg, bg); - } - } -} - -void a2_video_device::text_update_ultr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) -{ - int row, col; - uint32_t start_address = m_page2 ? 0x800 : 0x400; - uint32_t address; - int fg = 0; - int bg = 0; - - beginrow = (std::max)(beginrow, cliprect.top() - (cliprect.top() % 8)); - endrow = (std::min)(endrow, cliprect.bottom() - (cliprect.bottom() % 8) + 7); - - const int startrow = (beginrow / 8) * 8; - const int stoprow = ((endrow / 8) + 1) * 8; - - switch (m_sysconfig & 0x03) - { - case 0: fg = WHITE; break; - case 1: fg = WHITE; break; - case 2: fg = GREEN; break; - case 3: fg = ORANGE; break; - } - - for (row = startrow; row <= stoprow; row += 8) - { - for (col = 0; col < 40; col++) - { - /* calculate address */ - address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); - plot_text_character_ultr(bitmap, col * 14, row, 2, m_ram_ptr[address], fg, bg); - } - } -} - -void a2_video_device::hgr_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) -{ - int mon_type = m_sysconfig & 0x03; - - /* sanity checks */ - if (beginrow < cliprect.top()) - beginrow = cliprect.top(); - if (endrow > cliprect.bottom()) - endrow = cliprect.bottom(); - if (endrow < beginrow) - return; - - uint8_t const *const vram = &m_ram_ptr[(m_page2 ? 0x4000 : 0x2000)]; - uint8_t vram_row[42]; - vram_row[0] = 0; - vram_row[41] = 0; - - for (int row = beginrow; row <= endrow; row++) - { - for (int col = 0; col < 40; col++) - { - int const offset = ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)) | ((row & 7) << 10); - vram_row[1+col] = vram[offset]; - } - - uint16_t *p = &bitmap.pix(row); - - for (int col = 0; col < 40; col++) - { - uint32_t w = (((uint32_t) vram_row[col+0] & 0x7f) << 0) - | (((uint32_t) vram_row[col+1] & 0x7f) << 7) - | (((uint32_t) vram_row[col+2] & 0x7f) << 14); - - // verified on h/w: setting dhires w/o 80col emulates a rev. 0 Apple ][ with no orange/blue - uint16_t const *artifact_map_ptr; - if (m_dhires) - { - artifact_map_ptr = m_hires_artifact_map.get(); - } - else - { - artifact_map_ptr = &m_hires_artifact_map[((vram_row[col + 1] & 0x80) >> 7) * 16]; - } - - // CEC mono HGR mode - if ((m_monohgr) && (mon_type == 0)) - { - mon_type = 1; - } - - // IIgs $C021 monochrome HGR - if (m_monochrome & 0x80) - { - mon_type = 1; - } - - switch (mon_type) - { - case 0: - for (int b = 0; b < 7; b++) - { - if ((((col*14) + b) >= cliprect.left()) && (((col*14) + b) <= cliprect.right())) - { - uint16_t const v = artifact_map_ptr[((w >> (b + 7-1)) & 0x07) | (((b ^ col) & 0x01) << 3)]; - *(p++) = v; - *(p++) = v; - } - else - { - p++; - p++; - } - } - break; - - case 1: - w >>= 7; - if (vram_row[col+1] & 0x80) - { - p++; - } - for (int b = 0; b < 7; b++) - { - uint16_t const v = (w & 1); - w >>= 1; - if ((((col*14) + b) >= cliprect.left()) && (((col*14) + b) <= cliprect.right())) - { - *(p++) = v ? WHITE : BLACK; - *(p++) = v ? WHITE : BLACK; - } - else - { - p++; - p++; - } - } - if (vram_row[col+1] & 0x80) - { - p--; - } - break; - - case 2: - w >>= 7; - if (vram_row[col+1] & 0x80) - { - p++; - } - for (int b = 0; b < 7; b++) - { - uint16_t const v = (w & 1); - w >>= 1; - if ((((col*14) + b) >= cliprect.left()) && (((col*14) + b) <= cliprect.right())) - { - *(p++) = v ? GREEN : BLACK; - *(p++) = v ? GREEN : BLACK; - } - else - { - p++; - p++; - } - } - if (vram_row[col+1] & 0x80) - { - p--; - } - break; - - case 3: - w >>= 7; - if (vram_row[col+1] & 0x80) - { - p++; - } - for (int b = 0; b < 7; b++) - { - uint16_t const v = (w & 1); - w >>= 1; - if ((((col*14) + b) >= cliprect.left()) && (((col*14) + b) <= cliprect.right())) - { - *(p++) = v ? ORANGE : BLACK; - *(p++) = v ? ORANGE : BLACK; - } - else - { - p++; - p++; - } - } - if (vram_row[col+1] & 0x80) - { - p--; - } - break; - - } - } - } -} - -// similar to regular A2 except page 2 is at $A000 -void a2_video_device::hgr_update_tk2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) -{ - int const mon_type = m_sysconfig & 0x03; - - /* sanity checks */ - if (beginrow < cliprect.top()) - beginrow = cliprect.top(); - if (endrow > cliprect.bottom()) - endrow = cliprect.bottom(); - if (endrow < beginrow) - return; - - uint8_t const *const vram = &m_ram_ptr[(m_page2 ? 0xa000 : 0x2000)]; - - uint8_t vram_row[42]; - vram_row[0] = 0; - vram_row[41] = 0; - - for (int row = beginrow; row <= endrow; row++) - { - for (int col = 0; col < 40; col++) - { - int const offset = ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)) | ((row & 7) << 10); - vram_row[1+col] = vram[offset]; - } - - uint16_t *p = &bitmap.pix(row); - - for (int col = 0; col < 40; col++) - { - uint32_t w = (((uint32_t) vram_row[col+0] & 0x7f) << 0) - | (((uint32_t) vram_row[col+1] & 0x7f) << 7) - | (((uint32_t) vram_row[col+2] & 0x7f) << 14); - - uint16_t const *artifact_map_ptr; - switch (mon_type) - { - case 0: - artifact_map_ptr = &m_hires_artifact_map[((vram_row[col+1] & 0x80) >> 7) * 16]; - for (int b = 0; b < 7; b++) - { - uint16_t const v = artifact_map_ptr[((w >> (b + 7-1)) & 0x07) | (((b ^ col) & 0x01) << 3)]; - *(p++) = v; - *(p++) = v; - } - break; - - case 1: - w >>= 7; - if (vram_row[col] & 0x80) - { - p--; - } - for (int b = 0; b < 7; b++) - { - uint16_t const v = (w & 1); - w >>= 1; - *(p++) = v ? WHITE : BLACK; - *(p++) = v ? WHITE : BLACK; - } - if (vram_row[col] & 0x80) - { - p++; - } - break; - - case 2: - w >>= 7; - if (vram_row[col] & 0x80) - { - p--; - } - for (int b = 0; b < 7; b++) - { - uint16_t const v = (w & 1); - w >>= 1; - *(p++) = v ? GREEN : BLACK; - *(p++) = v ? GREEN : BLACK; - } - if (vram_row[col] & 0x80) - { - p++; - } - break; - - case 3: - w >>= 7; - if (vram_row[col] & 0x80) - { - p--; - } - for (int b = 0; b < 7; b++) - { - uint16_t const v = (w & 1); - w >>= 1; - *(p++) = v ? ORANGE : BLACK; - *(p++) = v ? ORANGE : BLACK; - } - if (vram_row[col] & 0x80) - { - p++; - } - break; - } - } - } -} - -void a2_video_device::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) -{ - uint16_t v; - int const page = m_page2 ? 0x4000 : 0x2000; - int mon_type = m_sysconfig & 0x03; - bool const bIsRGB = ((m_sysconfig & 7) == 4); - bool const bIsRGBMixed = ((bIsRGB) && (m_rgbmode == 1)); - - // IIgs force-monochrome-DHR setting - if (m_newvideo & 0x20) - { - mon_type = 1; - } - - // IIe RGB card monochrome DHR - if ((bIsRGB) && (m_rgbmode == 0)) - { - mon_type = 1; - } - - /* sanity checks */ - if (beginrow < cliprect.top()) - beginrow = cliprect.top(); - if (endrow > cliprect.bottom()) - endrow = cliprect.bottom(); - if (endrow < beginrow) - return; - - uint8_t const *const vram = &m_ram_ptr[page]; - uint8_t const *const vaux = (m_aux_ptr ? m_aux_ptr : vram) + page; - - uint8_t vram_row[82]; - vram_row[0] = 0; - vram_row[81] = 0; - - for (int row = beginrow; row <= endrow; row++) - { - for (int col = 0; col < 40; col++) - { - int const offset = ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)) | ((row & 7) << 10); - vram_row[1+(col*2)+0] = vaux[offset]; - vram_row[1+(col*2)+1] = vram[offset]; - } - - uint16_t *p = &bitmap.pix(row); - - // RGB DHR 160-wide mode - if ((bIsRGB) && (m_rgbmode == 2)) - { - mon_type = 4; - } - - for (int col = 0; col < 80; col++) - { - uint32_t w = (((uint32_t) vram_row[col+0] & 0x7f) << 0) - | (((uint32_t) vram_row[col+1] & 0x7f) << 7) - | (((uint32_t) vram_row[col+2] & 0x7f) << 14); - - /* - DHGR pixel layout: - column & 3 = 0 1 2 3 - nBBBAAAA nDDCCCCB nFEEEEDD nGGGGFFF - - n is don't care on the stock hardware's NTSC output. - - On RGB cards, in mixed mode (DHGR with special mode value == 1), n - controls if a pixel quad starting in that byte is color or monochrome. - Pixel quads A&B are controlled by n in byte 0, C&D by n in byte 1, - E&F by n in byte 2, and G by n in byte 3. - */ - - switch (mon_type) - { - case 0: - // every 3rd column, the first pixel quad is controlled by the previous - // byte's MSB, because we always draw 2 quads per column. - if ((bIsRGBMixed) && ((col & 3) == 3)) - { - uint32_t tw = (w >> 6); - - if (!(vram_row[col-1] & 0x80)) - { - for (int b = 0; b < 4; b++) - { - v = (tw & 1); - tw >>= 1; - *(p++) = v ? WHITE : BLACK; - } - } - else - { - for (int b = 0; b < 4; b++) - { - v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F]; - *(p++) = v; - } - } - - if (!(vram_row[col] & 0x80)) - { - for (int b = 4; b < 7; b++) - { - v = (tw & 1); - tw >>= 1; - *(p++) = v ? WHITE : BLACK; - } - } - else - { - for (int b = 4; b < 7; b++) - { - v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F]; - *(p++) = v; - } - } - } - else - { - if ((bIsRGBMixed) && !(vram_row[col] & 0x80)) - { - uint32_t tw = (w >> 6); - for (int b = 0; b < 7; b++) - { - v = (tw & 1); - tw >>= 1; - *(p++) = v ? WHITE : BLACK; - } - } - else - { - for (int b = 0; b < 7; b++) - { - v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F]; - *(p++) = v; - } - } - } - break; - - case 1: - w >>= 6; - for (int b = 0; b < 7; b++) - { - v = (w & 1); - w >>= 1; - *(p++) = v ? WHITE : BLACK; - } - break; - - case 2: - w >>= 6; - for (int b = 0; b < 7; b++) - { - v = (w & 1); - w >>= 1; - *(p++) = v ? GREEN : BLACK; - } - break; - - case 3: - w >>= 6; - for (int b = 0; b < 7; b++) - { - v = (w & 1); - w >>= 1; - *(p++) = v ? ORANGE : BLACK; - } - break; - - // RGB 160-wide mode (which has a much simpler VRAM layout) - case 4: - if (col == 0) - { - // Center the 480-wide image in the 560-wide display. - // Aspect ratio won't be perfect, but it's in range. - for (int b = 0; b < 40; b++) - { - *(p++) = BLACK; - } - } - v = vram_row[col]; - *(p++) = v & 0xf; - *(p++) = v & 0xf; - *(p++) = v & 0xf; - v >>= 4; - *(p++) = v & 0xf; - *(p++) = v & 0xf; - *(p++) = v & 0xf; - break; - } - } - - if (mon_type == 4) - { - for (int b = 0; b < 40; b++) - { - *(p++) = BLACK; - } - } - } -} - -/* - Latest Apple II NTSC palette from "Apple II Video Display Theory" - https://docs.google.com/spreadsheets/d/1rKR6A_bVniSCtIP_rrv8QLWJdj4h6jEU1jJj0AebWwg/ -*/ -static const rgb_t apple2_palette[] = -{ - rgb_t::black(), - rgb_t(0xa7, 0x0b, 0x40), /* Dark Red */ - rgb_t(0x40, 0x1c, 0xf7), /* Dark Blue */ - rgb_t(0xe6, 0x28, 0xff), /* Purple */ - rgb_t(0x00, 0x74, 0x40), /* Dark Green */ - rgb_t(0x80, 0x80, 0x80), /* Dark Gray */ - rgb_t(0x19, 0x90, 0xff), /* Medium Blue */ - rgb_t(0xbf, 0x9c, 0xff), /* Light Blue */ - rgb_t(0x40, 0x63, 0x00), /* Brown */ - rgb_t(0xe6, 0x6f, 0x00), /* Orange */ - rgb_t(0x80, 0x80, 0x80), /* Light Grey */ - rgb_t(0xff, 0x8b, 0xbf), /* Pink */ - rgb_t(0x19, 0xd7, 0x00), /* Light Green */ - rgb_t(0xbf, 0xe3, 0x08), /* Yellow */ - rgb_t(0x58, 0xf4, 0xbf), /* Aquamarine */ - rgb_t(0xff, 0xff, 0xff) /* White */ -}; - -void a2_video_device::init_palette() -{ - for (int i = 0; i < std::size(apple2_palette); i++) - set_pen_color(i, apple2_palette[i]); -} - -uint32_t a2_video_device::palette_entries() const -{ - return std::size(apple2_palette); -} - -uint32_t a2_video_device::screen_update_GS(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ - int const beamy = cliprect.top(); - - if (m_newvideo & 0x80) - { - // in top or bottom border? - if ((beamy < BORDER_TOP) || (beamy >= 200+BORDER_TOP)) - { - // don't draw past the bottom border - if (beamy >= 231+BORDER_TOP) - { - return 0; - } - - uint32_t *const scanline = &bitmap.pix(beamy); - for (int col = 0; col < BORDER_LEFT+BORDER_RIGHT+640; col++) - { - scanline[col] = m_GSborder_colors[m_GSborder]; - } - } - else // regular screen area - { - int const shrline = beamy - BORDER_TOP; - - uint8_t scb; - if (shrline & 1) - { - scb = m_aux_ptr[0x9e80 + (shrline >> 1)]; - } - else - { - scb = m_aux_ptr[0x5e80 + (shrline >> 1)]; - } - int const palette = ((scb & 0x0f) << 4); - - uint8_t const *const vram = &m_aux_ptr[0x2000 + (shrline * 80)]; - uint8_t const *const vram2 = &m_aux_ptr[0x6000 + (shrline * 80)]; - - uint32_t *const scanline = &bitmap.pix(beamy); - - // draw left and right borders - for (int col = 0; col < BORDER_LEFT; col++) - { - scanline[col] = m_GSborder_colors[m_GSborder]; - scanline[col+BORDER_LEFT+640] = m_GSborder_colors[m_GSborder]; - } - - if (scb & 0x80) // 640 mode - { - for (int col = 0; col < 80; col++) - { - uint8_t b = vram[col]; - scanline[col * 8 + 0 + BORDER_LEFT] = m_shr_palette[palette + 0 + ((b >> 6) & 0x03)]; - scanline[col * 8 + 1 + BORDER_LEFT] = m_shr_palette[palette + 4 + ((b >> 4) & 0x03)]; - scanline[col * 8 + 2 + BORDER_LEFT] = m_shr_palette[palette + 8 + ((b >> 2) & 0x03)]; - scanline[col * 8 + 3 + BORDER_LEFT] = m_shr_palette[palette + 12 + ((b >> 0) & 0x03)]; - - b = vram2[col]; - scanline[col * 8 + 4 + BORDER_LEFT] = m_shr_palette[palette + 0 + ((b >> 6) & 0x03)]; - scanline[col * 8 + 5 + BORDER_LEFT] = m_shr_palette[palette + 4 + ((b >> 4) & 0x03)]; - scanline[col * 8 + 6 + BORDER_LEFT] = m_shr_palette[palette + 8 + ((b >> 2) & 0x03)]; - scanline[col * 8 + 7 + BORDER_LEFT] = m_shr_palette[palette + 12 + ((b >> 0) & 0x03)]; - } - } - else // 320 mode - { - // the low 5 bits of the SCB determine the initial fillmode color - // for the scanline (hardware testing by John Brooks) - static const uint32_t fillmode_init[32] = - { - 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, - }; - - uint32_t last_pixel = fillmode_init[scb & 0x1f]; - for (int col = 0; col < 80; col++) - { - uint8_t b; - uint32_t pixel; - - b = vram[col]; - pixel = (b >> 4) & 0x0f; - - if ((scb & 0x20) && !pixel) - pixel = last_pixel; - else - last_pixel = pixel; - pixel += palette; - scanline[col * 8 + 0 + BORDER_LEFT] = m_shr_palette[pixel]; - scanline[col * 8 + 1 + BORDER_LEFT] = m_shr_palette[pixel]; - - pixel = (b >> 0) & 0x0f; - - if ((scb & 0x20) && !pixel) - pixel = last_pixel; - else - last_pixel = pixel; - pixel += palette; - scanline[col * 8 + 2 + BORDER_LEFT] = m_shr_palette[pixel]; - scanline[col * 8 + 3 + BORDER_LEFT] = m_shr_palette[pixel]; - - b = vram2[col]; - pixel = (b >> 4) & 0x0f; - - if ((scb & 0x20) && !pixel) - pixel = last_pixel; - else - last_pixel = pixel; - pixel += palette; - scanline[col * 8 + 4 + BORDER_LEFT] = m_shr_palette[pixel]; - scanline[col * 8 + 5 + BORDER_LEFT] = m_shr_palette[pixel]; - - pixel = (b >> 0) & 0x0f; - - if ((scb & 0x20) && !pixel) - pixel = last_pixel; - else - last_pixel = pixel; - pixel += palette; - scanline[col * 8 + 6 + BORDER_LEFT] = m_shr_palette[pixel]; - scanline[col * 8 + 7 + BORDER_LEFT] = m_shr_palette[pixel]; - } - } - } - } - else - { - if (beamy >= BORDER_TOP) - { - rectangle const new_cliprect(0, 559, cliprect.top() - BORDER_TOP, cliprect.bottom() - BORDER_TOP); - screen_update_GS_8bit(screen, *m_8bit_graphics, new_cliprect); - } - - if ((beamy < (BORDER_TOP+4)) || (beamy >= (192+4+BORDER_TOP))) - { - if (beamy >= (231+BORDER_TOP)) - { - return 0; - } - - uint32_t *const scanline = &bitmap.pix(beamy); - for (int col = 0; col < BORDER_LEFT+BORDER_RIGHT+640; col++) - { - scanline[col] = m_GSborder_colors[m_GSborder]; - } - } - else - { - uint32_t *const scanline = &bitmap.pix(beamy); - - // draw left and right borders - for (int col = 0; col < BORDER_LEFT + 40; col++) - { - scanline[col] = m_GSborder_colors[m_GSborder]; - scanline[col+BORDER_LEFT+600] = m_GSborder_colors[m_GSborder]; - } - - uint16_t *a2pixel = &m_8bit_graphics->pix(beamy-(BORDER_TOP+4)); - for (int x = 0; x < 560; x++) - { - scanline[40 + BORDER_LEFT + x] = m_GSborder_colors[*a2pixel++]; - } - } - } - return 0; -} - -uint32_t a2_video_device::screen_update_GS_8bit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - bool old_page2 = m_page2; - - if (cliprect.bottom() > 191) - { - return 0; - } - - // don't display page2 if 80store is set (we just saved the previous value, don't worry) - if (m_80store) - { - m_page2 = false; - } - - // always update the flash timer here so it's smooth regardless of mode switches - m_flash = ((machine().time() * 4).seconds() & 1) ? true : false; - - if (m_graphics) - { - if (m_hires) - { - if (m_mix) - { - if ((m_dhires) && (m_80col)) - { - dhgr_update(screen, bitmap, cliprect, 0, 159); - } - else - { - hgr_update(screen, bitmap, cliprect, 0, 159); - } - text_updateGS(screen, bitmap, cliprect, 160, 191); - } - else - { - if ((m_dhires) && (m_80col)) - { - dhgr_update(screen, bitmap, cliprect, cliprect.top(), cliprect.bottom()); - } - else - { - hgr_update(screen, bitmap, cliprect, cliprect.top(), cliprect.bottom()); - } - } - } - else // lo-res - { - if (m_mix) - { - if ((m_dhires) && (m_80col)) - { - dlores_update(screen, bitmap, cliprect, 0, 159); - } - else - { - lores_update(screen, bitmap, cliprect, 0, 159); - } - - text_updateGS(screen, bitmap, cliprect, 160, 191); - } - else - { - if ((m_dhires) && (m_80col)) - { - dlores_update(screen, bitmap, cliprect, cliprect.top(), cliprect.bottom()); - } - else - { - lores_update(screen, bitmap, cliprect, cliprect.top(), cliprect.bottom()); - } - } - } - } - else - { - text_updateGS(screen, bitmap, cliprect, cliprect.top(), cliprect.bottom()); - } - - m_page2 = old_page2; - - return 0; -} - -void a2_video_device::text_updateGS(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) -{ - uint8_t const *const aux_page = m_aux_ptr ? m_aux_ptr : m_ram_ptr; - - uint32_t const start_address = m_page2 ? 0x800 : 0x400; - - beginrow = (std::max)(beginrow, cliprect.top() - (cliprect.top() % 8)); - endrow = (std::min)(endrow, cliprect.bottom() - (cliprect.bottom() % 8) + 7); - - const int startrow = (beginrow / 8) * 8; - const int stoprow = ((endrow / 8) + 1) * 8; - const int startcol = (cliprect.left() / 14); - const int stopcol = ((cliprect.right() / 14) + 1); - - //printf("TXT: row %d startcol %d stopcol %d left %d right %d\n", beginrow, startcol, stopcol, cliprect.left(), cliprect.right()); - - for (int row = startrow; row < stoprow; row += 8) - { - if (m_80col) - { - for (int col = startcol; col < stopcol; col++) - { - /* calculate address */ - uint32_t const address = start_address + ((((row / 8) & 0x07) << 7) | (((row / 8) & 0x18) * 5 + col)); - - plot_text_characterGS(bitmap, col * 14, row, 1, aux_page[address], - m_GSfg, m_GSbg); - plot_text_characterGS(bitmap, col * 14 + 7, row, 1, m_ram_ptr[address], - m_GSfg, m_GSbg); - } - } - else - { - for (int col = startcol; col < stopcol; col++) - { - /* calculate address */ - uint32_t const address = start_address + ((((row / 8) & 0x07) << 7) | (((row / 8) & 0x18) * 5 + col)); - - plot_text_characterGS(bitmap, col * 14, row, 2, m_ram_ptr[address], m_GSfg, m_GSbg); - } - } - } -} diff --git a/src/mame/misc/apple2_v.h b/src/mame/misc/apple2_v.h deleted file mode 100644 index 4cb63c68865..00000000000 --- a/src/mame/misc/apple2_v.h +++ /dev/null @@ -1,86 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:R. Belmont -/********************************************************************* - - video/apple2.h - Video handling for Apple II and IIgs - -*********************************************************************/ - -#ifndef MAME_VIDEO_APPLE2_H -#define MAME_VIDEO_APPLE2_H - -#include "emupal.h" - -#define BORDER_LEFT (32) -#define BORDER_RIGHT (32) -#define BORDER_TOP (16) // (plus bottom) - -class a2_video_device : public device_t, public device_palette_interface, public device_video_interface -{ -public: - // construction/destruction - a2_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - bool m_page2 = false; - bool m_flash = false; - bool m_mix = false; - bool m_graphics = false; - bool m_hires = false; - bool m_dhires = false; - bool m_80col = false; - bool m_altcharset = false; - bool m_an2 = false; - bool m_80store = false; - bool m_monohgr = false; - u8 m_GSfg = 0, m_GSbg = 0, m_GSborder = 0, m_newvideo = 0, m_monochrome = 0, m_rgbmode = 0; - u32 m_GSborder_colors[16]{}, m_shr_palette[256]{}; - std::unique_ptr m_8bit_graphics; - std::unique_ptr m_hires_artifact_map; - std::unique_ptr m_dhires_artifact_map; - - uint8_t *m_ram_ptr = nullptr, *m_aux_ptr = nullptr, *m_char_ptr = nullptr; - int m_char_size = 0; - - int m_sysconfig = 0; - - DECLARE_WRITE_LINE_MEMBER(txt_w); - DECLARE_WRITE_LINE_MEMBER(mix_w); - DECLARE_WRITE_LINE_MEMBER(scr_w); - DECLARE_WRITE_LINE_MEMBER(res_w); - DECLARE_WRITE_LINE_MEMBER(dhires_w); - DECLARE_WRITE_LINE_MEMBER(an2_w); - - template - void text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - - void text_update_ultr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - void text_update_jplus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - void text_updateGS(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - void lores_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - void dlores_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - void hgr_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - void hgr_update_tk2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - void dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); - - uint32_t screen_update_GS(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - uint32_t screen_update_GS_8bit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - -protected: - virtual void device_reset() override; - virtual void device_start() override; - - virtual uint32_t palette_entries() const override; - void init_palette(); - -private: - template - void plot_text_character(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); - void plot_text_character_ultr(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); - void plot_text_character_jplus(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); - void plot_text_characterGS(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); -}; - -// device type definition -DECLARE_DEVICE_TYPE(APPLE2_VIDEO, a2_video_device) - -#endif // MAME_VIDEO_APPLE2_H diff --git a/src/mame/misc/apple2common.cpp b/src/mame/misc/apple2common.cpp deleted file mode 100644 index 317f4061cc6..00000000000 --- a/src/mame/misc/apple2common.cpp +++ /dev/null @@ -1,893 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:R. Belmont -/********************************************************************* - - apple2common.cpp - - Apple II stuff shared between apple2/apple2e/apple2gs. - -*********************************************************************/ - -#include "emu.h" -#include "emuopts.h" - -#include "apple2common.h" - -// device type definition -DEFINE_DEVICE_TYPE(APPLE2_COMMON, apple2_common_device, "apple2com", "Apple II Common Components") - -//------------------------------------------------- -// apple2_common_device - constructor -//------------------------------------------------- - -apple2_common_device::apple2_common_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, APPLE2_COMMON, tag, owner, clock), - m_GScpu(*this, finder_base::DUMMY_TAG) -{ -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void apple2_common_device::device_start() -{ - // precalculate joystick time constants - m_x_calibration = attotime::from_nsec(10800).as_double(); - m_y_calibration = attotime::from_nsec(10800).as_double(); - m_joystick_x1_time = m_joystick_x2_time = m_joystick_y1_time = m_joystick_y2_time = 0.0; -} - -//------------------------------------------------- -// device_validity_check - device-specific validation -//------------------------------------------------- -void apple2_common_device::device_validity_check(validity_checker &valid) const -{ - if ((m_GScpu.finder_tag() != finder_base::DUMMY_TAG) && !m_GScpu) - { - osd_printf_error("IIgs CPU configured but not found.\n"); - } -} - -struct dasm_data -{ - u16 addr; - const char *name; -}; - -struct dasm_data32 -{ - u32 addr; - const char *name; -}; - -static const struct dasm_data p8_calls[] = -{ - { 0x40, "ALLOC_INTERRUPT" }, { 0x41, "DEALLOC_INTERRUPT" }, - { 0x65, "QUIT" }, { 0x80, "READ_BLOCK" }, { 0x81, "WRITE_BLOCK" }, { 0x82, "GET_TIME" }, - { 0x99, "ATINIT" }, { 0xc0, "CREATE" }, { 0xc1, "DESTROY" }, { 0xc2, "RENAME" }, { 0xc3, "SET_FILE_INFO" }, - { 0xc4, "GET_FILE_INFO" }, { 0xc5, "ONLINE" }, { 0xc6, "SET_PREFIX" }, { 0xc7, "GET_PREFIX" }, { 0xc8, "OPEN" }, - { 0xc9, "NEWLINE" }, { 0xca, "READ" }, { 0xcb, "WRITE" }, { 0xcc, "CLOSE" }, { 0xcd, "FLUSH" }, { 0xce, "SET_MARK" }, - { 0xcf, "GET_MARK" }, { 0xd0, "SET_EOF" }, { 0xd1, "GET_EOF" }, { 0xd2, "SET_BUF" }, { 0xd3, "GET_BUF" }, - - { 0xffff, "" } -}; - -static const struct dasm_data a2_stuff[] = -{ - { 0x0020, "WNDLFT" }, { 0x0021, "WNDWDTH" }, { 0x0022, "WNDTOP" }, { 0x0023, "WNDBTM" }, - { 0x0024, "CH" }, { 0x0025, "CV" }, { 0x0026, "GBASL" }, { 0x0027, "GBASH" }, - { 0x0028, "BASL" }, { 0x0029, "BASH" }, { 0x002b, "BOOTSLOT" }, { 0x002c, "H2" }, - { 0x002d, "V2" }, { 0x002e, "MASK" }, { 0x0030, "COLOR" }, { 0x0031, "MODE" }, - { 0x0032, "INVFLG" }, { 0x0033, "PROMPT" }, { 0x0036, "CSWL" }, { 0x0037, "CSWH" }, - { 0x0038, "KSWL" }, { 0x0039, "KSWH" }, { 0x0045, "ACC" }, { 0x0046, "XREG" }, - { 0x0047, "YREG" }, { 0x0048, "STATUS" }, { 0x004E, "RNDL" }, { 0x004F, "RNDH" }, - { 0x0067, "TXTTAB" }, { 0x0069, "VARTAB" }, { 0x006b, "ARYTAB" }, { 0x6d, "STREND" }, - { 0x006f, "FRETOP" }, { 0x0071, "FRESPC" }, { 0x0073, "MEMSIZ" }, { 0x0075, "CURLIN" }, - { 0x0077, "OLDLIN" }, { 0x0079, "OLDTEXT" }, { 0x007b, "DATLIN" }, { 0x007d, "DATPTR" }, - { 0x007f, "INPTR" }, { 0x0081, "VARNAM" }, { 0x0083, "VARPNT" }, { 0x0085, "FORPNT" }, - { 0x009A, "EXPON" }, { 0x009C, "EXPSGN" }, { 0x009d, "FAC" }, { 0x00A2, "FAC.SIGN" }, - { 0x00a5, "ARG" }, { 0x00AA, "ARG.SIGN" }, { 0x00af, "PRGEND" }, { 0x00B8, "TXTPTR" }, - { 0x00C9, "RNDSEED" }, { 0x00D6, "LOCK" }, { 0x00D8, "ERRFLG" }, { 0x00DA, "ERRLIN" }, - { 0x00DE, "ERRNUM" }, { 0x00E4, "HGR.COLOR" }, { 0x00E6, "HGR.PAGE" }, { 0x00F1, "SPEEDZ" }, - - { 0xc000, "KBD / 80STOREOFF" }, { 0xc001, "80STOREON" }, { 0xc002, "RDMAINRAM" }, {0xc003, "RDCARDRAM" }, {0xc004, "WRMAINRAM" }, - { 0xc005, "WRCARDRAM" }, { 0xc006, "SETSLOTCXROM" }, { 0xc007, "SETINTCXROM" }, { 0xc008, "SETSTDZP" }, - { 0xc009, "SETALTZP "}, { 0xc00a, "SETINTC3ROM" }, { 0xc00b, "SETSLOTC3ROM" }, { 0xc00c, "CLR80VID" }, - { 0xc00d, "SET80VID" }, { 0xc00e, "CLRALTCHAR" }, { 0xc00f, "SETALTCHAR" }, { 0xc010, "KBDSTRB" }, - { 0xc011, "RDLCBNK2" }, { 0xc012, "RDLCRAM" }, { 0xc013, "RDRAMRD" }, { 0xc014, "RDRAMWRT" }, - { 0xc015, "RDCXROM" }, { 0xc016, "RDALTZP" }, { 0xc017, "RDC3ROM" }, { 0xc018, "RD80STORE" }, - { 0xc019, "RDVBL" }, { 0xc01a, "RDTEXT" }, { 0xc01b, "RDMIXED" }, { 0xc01c, "RDPAGE2" }, - { 0xc01d, "RDHIRES" }, { 0xc01e, "RDALTCHAR" }, { 0xc01f, "RD80VID" }, { 0xc020, "TAPEOUT" }, - { 0xc021, "MONOCOLOR" }, { 0xc022, "TBCOLOR" }, { 0xc023, "VGCINT" }, { 0xc024, "MOUSEDATA" }, - { 0xc025, "KEYMODREG" }, { 0xc026, "DATAREG" }, { 0xc027, "KMSTATUS" }, { 0xc028, "ROMBANK" }, - { 0xc029, "NEWVIDEO"}, { 0xc02b, "LANGSEL" }, { 0xc02c, "CHARROM" }, { 0xc02d, "SLOTROMSEL" }, - { 0xc02e, "VERTCNT" }, { 0xc02f, "HORIZCNT" }, { 0xc030, "SPKR" }, { 0xc031, "DISKREG" }, - { 0xc032, "SCANINT" }, { 0xc033, "CLOCKDATA" }, { 0xc034, "CLOCKCTL" }, { 0xc035, "SHADOW" }, - { 0xc036, "FPIREG/CYAREG" }, { 0xc037, "BMAREG" }, { 0xc038, "SCCBREG" }, { 0xc039, "SCCAREG" }, - { 0xc03a, "SCCBDATA" }, { 0xc03b, "SCCADATA" }, { 0xc03c, "SOUNDCTL" }, { 0xc03d, "SOUNDDATA" }, - { 0xc03e, "SOUNDADRL" }, { 0xc03f, "SOUNDADRH" }, { 0xc040, "STROBE/RDXYMSK" }, { 0xc041, "RDVBLMSK" }, - { 0xc042, "RDX0EDGE" }, { 0xc043, "RDY0EDGE" }, { 0xc044, "MMDELTAX" }, { 0xc045, "MMDELTAY" }, - { 0xc046, "DIAGTYPE" }, { 0xc047, "CLRVBLINT" }, { 0xc048, "CLRXYINT" }, { 0xc04f, "EMUBYTE" }, - { 0xc050, "TXTCLR" }, { 0xc051, "TXTSET" }, - { 0xc052, "MIXCLR" }, { 0xc053, "MIXSET" }, { 0xc054, "TXTPAGE1" }, { 0xc055, "TXTPAGE2" }, - { 0xc056, "LORES" }, { 0xc057, "HIRES" }, { 0xc058, "CLRAN0" }, { 0xc059, "SETAN0" }, - { 0xc05a, "CLRAN1" }, { 0xc05b, "SETAN1" }, { 0xc05c, "CLRAN2" }, { 0xc05d, "SETAN2" }, - { 0xc05e, "DHIRESON" }, { 0xc05f, "DHIRESOFF" }, { 0xc060, "TAPEIN" }, { 0xc061, "RDBTN0" }, - { 0xc062, "BUTN1" }, { 0xc063, "RD63" }, { 0xc064, "PADDL0" }, { 0xc065, "PADDL1" }, - { 0xc066, "PADDL2" }, { 0xc067, "PADDL3" }, { 0xc068, "STATEREG" }, { 0xc070, "PTRIG" }, { 0xc073, "BANKSEL" }, - { 0xc07e, "IOUDISON" }, { 0xc07f, "IOUDISOFF" }, { 0xc081, "ROMIN" }, { 0xc083, "LCBANK2" }, - { 0xc085, "ROMIN" }, { 0xc087, "LCBANK2" }, { 0xcfff, "DISCC8ROM" }, - - { 0xF800, "F8ROM:PLOT" }, { 0xF80E, "F8ROM:PLOT1" } , { 0xF819, "F8ROM:HLINE" }, { 0xF828, "F8ROM:VLINE" }, - { 0xF832, "F8ROM:CLRSCR" }, { 0xF836, "F8ROM:CLRTOP" }, { 0xF838, "F8ROM:CLRSC2" }, { 0xF847, "F8ROM:GBASCALC" }, - { 0xF856, "F8ROM:GBCALC" }, { 0xF85F, "F8ROM:NXTCOL" }, { 0xF864, "F8ROM:SETCOL" }, { 0xF871, "F8ROM:SCRN" }, - { 0xF882, "F8ROM:INSDS1" }, { 0xF88E, "F8ROM:INSDS2" }, { 0xF8A5, "F8ROM:ERR" }, { 0xF8A9, "F8ROM:GETFMT" }, - { 0xF8D0, "F8ROM:INSTDSP" }, { 0xF940, "F8ROM:PRNTYX" }, { 0xF941, "F8ROM:PRNTAX" }, { 0xF944, "F8ROM:PRNTX" }, - { 0xF948, "F8ROM:PRBLNK" }, { 0xF94A, "F8ROM:PRBL2" }, { 0xF84C, "F8ROM:PRBL3" }, { 0xF953, "F8ROM:PCADJ" }, - { 0xF854, "F8ROM:PCADJ2" }, { 0xF856, "F8ROM:PCADJ3" }, { 0xF85C, "F8ROM:PCADJ4" }, { 0xF962, "F8ROM:FMT1" }, - { 0xF9A6, "F8ROM:FMT2" }, { 0xF9B4, "F8ROM:CHAR1" }, { 0xF9BA, "F8ROM:CHAR2" }, { 0xF9C0, "F8ROM:MNEML" }, - { 0xFA00, "F8ROM:MNEMR" }, { 0xFA40, "F8ROM:OLDIRQ" }, { 0xFA4C, "F8ROM:BREAK" }, { 0xFA59, "F8ROM:OLDBRK" }, - { 0xFA62, "F8ROM:RESET" }, { 0xFAA6, "F8ROM:PWRUP" }, { 0xFABA, "F8ROM:SLOOP" }, { 0xFAD7, "F8ROM:REGDSP" }, - { 0xFADA, "F8ROM:RGDSP1" }, { 0xFAE4, "F8ROM:RDSP1" }, { 0xFB19, "F8ROM:RTBL" }, { 0xFB1E, "F8ROM:PREAD" }, - { 0xFB21, "F8ROM:PREAD4" }, { 0xFB25, "F8ROM:PREAD2" }, { 0xFB2F, "F8ROM:INIT" }, { 0xFB39, "F8ROM:SETTXT" }, - { 0xFB40, "F8ROM:SETGR" }, { 0xFB4B, "F8ROM:SETWND" }, { 0xFB51, "F8ROM:SETWND2" }, { 0xFB5B, "F8ROM:TABV" }, - { 0xFB60, "F8ROM:APPLEII" }, { 0xFB6F, "F8ROM:SETPWRC" }, { 0xFB78, "F8ROM:VIDWAIT" }, { 0xFB88, "F8ROM:KBDWAIT" }, - { 0xFBB3, "F8ROM:VERSION" }, { 0xFBBF, "F8ROM:ZIDBYTE2" }, { 0xFBC0, "F8ROM:ZIDBYTE" }, { 0xFBC1, "F8ROM:BASCALC" }, - { 0xFBD0, "F8ROM:BSCLC2" }, { 0xFBDD, "F8ROM:BELL1" }, { 0xFBE2, "F8ROM:BELL1.2" }, { 0xFBE4, "F8ROM:BELL2" }, - { 0xFBF0, "F8ROM:STORADV" }, { 0xFBF4, "F8ROM:ADVANCE" }, { 0xFBFD, "F8ROM:VIDOUT" }, { 0xFC10, "F8ROM:BS" }, - { 0xFC1A, "F8ROM:UP" }, { 0xFC22, "F8ROM:VTAB" }, { 0xFC24, "F8ROM:VTABZ" }, { 0xFC42, "F8ROM:CLREOP" }, - { 0xFC46, "F8ROM:CLEOP1" }, { 0xFC58, "F8ROM:HOME" }, { 0xFC62, "F8ROM:CR" }, { 0xFC66, "F8ROM:LF" }, - { 0xFC70, "F8ROM:SCROLL" }, { 0xFC95, "F8ROM:SCRL3" }, { 0xFC9C, "F8ROM:CLREOL" }, { 0xFC9E, "F8ROM:CLREOLZ" }, - { 0xFCA8, "F8ROM:WAIT" }, { 0xFCB4, "F8ROM:NXTA4" }, { 0xFCBA, "F8ROM:NXTA1" }, { 0xFCC9, "F8ROM:HEADR" }, - { 0xFCEC, "F8ROM:RDBYTE" }, { 0xFCEE, "F8ROM:RDBYT2" }, { 0xFCFA, "F8ROM:RD2BIT" }, { 0xFD0C, "F8ROM:RDKEY" }, - { 0xFD18, "F8ROM:RDKEY1" }, { 0xFD1B, "F8ROM:KEYIN" }, { 0xFD2F, "F8ROM:ESC" }, { 0xFD35, "F8ROM:RDCHAR" }, - { 0xFD3D, "F8ROM:NOTCR" }, { 0xFD62, "F8ROM:CANCEL" }, { 0xFD67, "F8ROM:GETLNZ" }, { 0xFD6A, "F8ROM:GETLN" }, - { 0xFD6C, "F8ROM:GETLN0" }, { 0xFD6F, "F8ROM:GETLN1" }, { 0xFD8B, "F8ROM:CROUT1" }, { 0xFD8E, "F8ROM:CROUT" }, - { 0xFD92, "F8ROM:PRA1" }, { 0xFDA3, "F8ROM:XAM8" }, { 0xFDDA, "F8ROM:PRBYTE" }, { 0xFDE3, "F8ROM:PRHEX" }, - { 0xFDE5, "F8ROM:PRHEXZ" }, { 0xFDED, "F8ROM:COUT" }, { 0xFDF0, "F8ROM:COUT1" }, { 0xFDF6, "F8ROM:COUTZ" }, - { 0xFE18, "F8ROM:SETMODE" }, { 0xFE1F, "F8ROM:IDROUTINE" }, { 0xFE20, "F8ROM:LT" }, { 0xFE22, "F8ROM:LT2" }, - { 0xFE2C, "F8ROM:MOVE" }, { 0xFE36, "F8ROM:VFY" }, { 0xFE5E, "F8ROM:LIST" }, { 0xFE63, "F8ROM:LIST2" }, - { 0xFE75, "F8ROM:A1PC" }, { 0xFE80, "F8ROM:SETINV" }, { 0xFE84, "F8ROM:SETNORM" }, { 0xFE89, "F8ROM:SETKBD" }, - { 0xFE8B, "F8ROM:INPORT" }, { 0xFE8D, "F8ROM:INPRT" }, { 0xFE93, "F8ROM:SETVID" }, { 0xFE95, "F8ROM:OUTPORT" }, - { 0xFE97, "F8ROM:OUTPRT" }, { 0xFEB0, "F8ROM:XBASIC" }, { 0xFEB3, "F8ROM:BASCONT" }, { 0xFEB6, "F8ROM:GO" }, - { 0xFECA, "F8ROM:USR" }, { 0xFECD, "F8ROM:WRITE" }, { 0xFEFD, "F8ROM:READ" }, { 0xFF2D, "F8ROM:PRERR" }, - { 0xFF3A, "F8ROM:BELL" }, { 0xFF3F, "F8ROM:RESTORE" }, { 0xFF4A, "F8ROM:SAVE" }, { 0xFF58, "F8ROM:IORTS" }, - { 0xFF59, "F8ROM:OLDRST" }, { 0xFF65, "F8ROM:MON" }, { 0xFF69, "F8ROM:MONZ" }, { 0xFF6C, "F8ROM:MONZ2" }, - { 0xFF70, "F8ROM:MONZ4" }, { 0xFF8A, "F8ROM:DIG" }, { 0xFFA7, "F8ROM:GETNUM" }, { 0xFFAD, "F8ROM:NXTCHR" }, - { 0xFFBE, "F8ROM:TOSUB" }, { 0xFFC7, "F8ROM:ZMODE" }, { 0xFFCC, "F8ROM:CHRTBL" }, { 0xFFE3, "F8ROM:SUBTBL" }, - - { 0xffff, "" } -}; - -static const struct dasm_data gs_tools[] = -{ - { 0x0101, "TLBootInit()" }, { 0x0201, "TLStartUp()" }, { 0x0301, "TLShutDown()" }, { 0x0401, "TLVersion():Vers" }, { 0x0501, "TLReset()" }, - { 0x0601, "TLStatus():ActFlg" }, { 0x0901, "GetTSPtr(SysFlg,TS#):@FPT" }, { 0x0A01, "SetTSPtr(SysFlg,TS#,@FPT)" }, { 0x0B01, "GetFuncPtr(SysFlg,Func):@Func" }, - { 0x0C01, "GetWAP(SysFlg,TS#):@WAP" }, { 0x0D01, "SetWAP(SysFlg,TS#,@WAP)" }, { 0x0E01, "LoadTools(@ToolTable)" }, { 0x0F01, "LoadOneTool(TS#,MinVers)" }, - { 0x1001, "UnloadOneTool(TS#)" }, { 0x1101, "TLMountVolume(X,Y,@L1,@L2,@B1,@B2):Btn#" }, { 0x1201, "TLTextMountVolume(@L1,@L2,@B1,@B2):Btn#" }, - { 0x1301, "SaveTextState():StateH" }, { 0x1401, "RestoreTextState(StateH)" }, { 0x1501, "MessageCenter(Action,Type,MsgH)" }, { 0x1601, "SetDefaultTPT()" }, - { 0x1701, "MessageByName(CreateF,@inpRec):Created,Type" }, { 0x1801, "StartUpTools(MemID,ssDesc,ssRef/4):ssRef/4" }, { 0x1901, "ShutDownTools(ssDesc,ssRef/4)" }, - { 0x1A01, "GetMsgHandle(Flags,MsgRef/4):H" }, { 0x1B01, "AcceptRequests(@NameStr,UserID,@ReqProc)" }, { 0x1C01, "SendRequest(ReqCode,How,Target/4,@In,@Out)" }, - { 0x0102, "MMBootInit()" }, { 0x0202, "MMStartUp():MemID" }, { 0x0302, "MMShutDown(MemID)" }, { 0x0402, "MMVersion():Vers" }, { 0x0502, "MMReset()" }, - { 0x0602, "MMStatus():ActFlg" }, { 0x0902, "NewHandle(Size/4,MemID,Attr,@loc):H" }, { 0x0A02, "ReAllocHandle(Size/4,MemID,Attr,@loc,H)" }, { 0x0B02, "RestoreHandle(H)" }, - { 0x0C02, "AddToOOMQueue(@header)" }, { 0x0D02, "RemoveFromOOMQueue(@header)" }, { 0x1002, "DisposeHandle(H)" }, { 0x1102, "DisposeAll(MemID)" }, - { 0x1202, "PurgeHandle(H)" }, { 0x1302, "PurgeAll(MemID)" }, { 0x1802, "GetHandleSize(H):Size/4" }, { 0x1902, "SetHandleSize(Size/4,H)" }, { 0x1A02, "FindHandle(@byte):H" }, - { 0x1B02, "FreeMem():FreeBytes/4" }, { 0x1C02, "MaxBlock():Size/4" }, { 0x1D02, "TotalMem():Size/4" }, { 0x1E02, "CheckHandle(H)" }, { 0x1F02, "CompactMem()" }, - { 0x2002, "HLock(H)" }, { 0x2102, "HLockAll(MemID)" }, { 0x2202, "HUnlock(H)" }, { 0x2302, "HUnlockAll(MemID)" }, { 0x2402, "SetPurge(PrgLvl,H)" }, - { 0x2502, "SetPurgeAll(PrgLvl,MemID)" }, { 0x2802, "PtrToHand(@Src,DestH,Count/4)" }, { 0x2902, "HandToPtr(SrcH,@Dest,Count/4)" }, { 0x2A02, "HandToHand(SrcH,DestH,Count/4)" }, - { 0x2B02, "BlockMove(@Source,@Dest,Count/4)" }, { 0x2F02, "RealFreeMem():Size/4" }, { 0x3002, "SetHandleID(newMemID,theH):oldMemID" }, { 0x0103, "MTBootInit()" }, - { 0x0203, "MTStartUp()" }, { 0x0303, "MTShutDown()" }, { 0x0403, "MTVersion():Vers" }, { 0x0503, "MTReset()" }, { 0x0603, "MTStatus():ActFlg" }, - { 0x0903, "WriteBRam(@Buff)" }, { 0x0A03, "ReadBRam(@Buff)" }, { 0x0B03, "WriteBParam(Data,Parm#)" }, { 0x0C03, "ReadBParam(Parm#):Data" }, { 0x0D03, "ReadTimeHex():WkDay,Mn&Dy,Yr&Hr,Mn&Sec" }, - { 0x0E03, "WriteTimeHex(Mn&Dy,Yr&Hr,Mn&Sec)" }, { 0x0F03, "ReadAsciiTime(@Buff)" }, { 0x1003, "SetVector(Vec#,@x)" }, { 0x1103, "GetVector(Vec#):@x" }, - { 0x1203, "SetHeartBeat(@Task)" }, { 0x1303, "DelHeartBeat(@Task)" }, { 0x1403, "ClrHeartBeat()" }, { 0x1503, "SysFailMgr(Code,@Msg)" }, { 0x1603, "GetAddr(Ref#):@Parm" }, - { 0x1703, "ReadMouse():X,Y,Stat&Mode" }, { 0x1803, "InitMouse(Slot)" }, { 0x1903, "SetMouse(Mode)" }, { 0x1A03, "HomeMouse()" }, { 0x1B03, "ClearMouse()" }, - { 0x1C03, "ClampMouse(Xmn,Xmx,Ymn,Ymx)" }, { 0x1D03, "GetMouseClamp():Xmn,Xmx,Ymn,Ymx" }, { 0x1E03, "PosMouse(X,Y)" }, { 0x1F03, "ServeMouse():IntStat" }, - { 0x2003, "GetNewID(Kind):MemID" }, { 0x2103, "DeleteID(MemID)" }, { 0x2203, "StatusID(MemID)" }, { 0x2303, "IntSource(Ref#)" }, { 0x2403, "FWEntry(A,X,Y,Address):P,A,X,Y" }, - { 0x2503, "GetTick():Ticks/4" }, { 0x2603, "PackBytes(@StartPtr,@Sz,@OutBf,OutSz):Size" }, { 0x2703, "UnPackBytes(@Buff,BfSz,@StartPtr,@Sz):Size" }, - { 0x2803, "Munger(@Dst,@DstL,@t,tL,@Rpl,RplL,@Pad):N" }, { 0x2903, "GetIRQEnable():IntStat" }, { 0x2A03, "SetAbsClamp(Xmn,Xmx,Ymn,Ymx)" }, - { 0x2B03, "GetAbsClamp():Xmn,Xmx,Ymn,Ymx" }, { 0x2C03, "SysBeep()" }, { 0x2E03, "AddToQueue(@newTask,@queueHeader)" }, { 0x2F03, "DeleteFromQueue(@task,@queueHeader)" }, - { 0x3003, "SetInterruptState(@stateRec,NumBytes)" }, { 0x3103, "GetInterruptState(@stateRec,NumBytes)" }, { 0x3203, "GetIntStateRecSize():Size" }, - { 0x3303, "ReadMouse2():xPos,yPos,StatMode" }, { 0x3403, "GetCodeResConverter():@proc" }, { 0x3503, "GetROMResource(?,?/4):???H" }, - { 0x3603, "ReleaseROMResource(?,?/4)" }, { 0x3703, "ConvSeconds(convVerb,Secs/4,@Date):SecondsOut/4" }, { 0x3803, "SysBeep2(beepKind)" }, - { 0x3903, "VersionString(flags,Version/4,@Buffer)" }, { 0x3A03, "WaitUntil(WaitFromTime,DelayTime):NewTime" }, { 0x3B03, "StringToText(flags,@String,StrLen,@Buffer):ResFlags,PrntLen" }, - { 0x3C03, "ShowBootInfo(@String,@Icon)" }, { 0x3D03, "ScanDevices():DevNum" }, { 0x3E03, "AlertMessage(@Table,MsgNum,@Subs):Button" }, { 0x3F03, "DoSysPrefs(bitsToClear,bitsToSet):SysPrefs" }, - { 0x0104, "QDBootInit()" }, { 0x0204, "QDStartUp(DirPg,MastSCB,MaxWid,MemID)" }, { 0x0304, "QDShutDown()" }, { 0x0404, "QDVersion():Vers" }, { 0x0504, "QDReset()" }, - { 0x0604, "QDStatus():ActFlg" }, { 0x0904, "GetAddress(what):@Table" }, { 0x0A04, "GrafOn()" }, { 0x0B04, "GrafOff()" }, { 0x0C04, "GetStandardSCB():SCB" }, - { 0x0D04, "InitColorTable(@Table)" }, { 0x0E04, "SetColorTable(Tab#,@SrcTab)" }, { 0x0F04, "GetColorTable(Tab#,@DestTbl)" }, { 0x1004, "SetColorEntry(Tab#,Ent#,NewCol)" }, - { 0x1104, "GetColorEntry(Tab#,Ent#):Color" }, { 0x1204, "SetSCB(Line#,SCB)" }, { 0x1304, "GetSCB(Line#):SCB" }, { 0x1404, "SetAllSCBs(SCB)" }, { 0x1504, "ClearScreen(Color)" }, - { 0x1604, "SetMasterSCB(SCB)" }, { 0x1704, "GetMasterSCB():SCB" }, { 0x1804, "OpenPort(@Port)" }, { 0x1904, "InitPort(@Port)" }, { 0x1A04, "ClosePort(@Port)" }, - { 0x1B04, "SetPort(@Port)" }, { 0x1C04, "GetPort():@Port" }, { 0x1D04, "SetPortLoc(@LocInfo)" }, { 0x1E04, "GetPortLoc(@LocInfo)" }, { 0x1F04, "SetPortRect(@Rect)" }, - { 0x2004, "GetPortRect(@Rect)" }, { 0x2104, "SetPortSize(w,h)" }, { 0x2204, "MovePortTo(h,v)" }, { 0x2304, "SetOrigin(h,v)" }, { 0x2404, "SetClip(RgnH)" }, - { 0x2504, "GetClip(RgnH)" }, { 0x2604, "ClipRect(@Rect)" }, { 0x2704, "HidePen()" }, { 0x2804, "ShowPen()" }, { 0x2904, "GetPen(@Pt)" }, { 0x2A04, "SetPenState(@PenSt)" }, - { 0x2B04, "GetPenState(@PenSt)" }, { 0x2C04, "SetPenSize(w,h)" }, { 0x2D04, "GetPenSize(@Pt)" }, { 0x2E04, "SetPenMode(Mode)" }, { 0x2F04, "GetPenMode():Mode" }, { 0x3004, "SetPenPat(@Patt)" }, - { 0x3104, "GetPenPat(@Patt)" }, { 0x3204, "SetPenMask(@Mask)" }, { 0x3304, "GetPenMask(@Mask)" }, { 0x3404, "SetBackPat(@Patt)" }, { 0x3504, "GetBackPat(@Patt)" }, - { 0x3604, "PenNormal()" }, { 0x3704, "SetSolidPenPat(Color)" }, { 0x3804, "SetSolidBackPat(Color)" }, { 0x3904, "SolidPattern(Color,@Patt)" }, { 0x3A04, "MoveTo(h,v)" }, - { 0x3B04, "Move(dh,dv)" }, { 0x3C04, "LineTo(h,v)" }, { 0x3D04, "Line(dh,dv)" }, { 0x3E04, "SetPicSave(Val/4)" }, { 0x3F04, "GetPicSave():Val/4" },{ 0x4004, "SetRgnSave(Val/4)" }, - { 0x4104, "GetRgnSave():Val/4" }, { 0x4204, "SetPolySave(Val/4)" }, { 0x4304, "GetPolySave():Val/4" }, { 0x4404, "SetGrafProcs(@GrafProcs)" },{ 0x4504, "GetGrafProcs():@GrafProcs" }, - { 0x4604, "SetUserField(Val/4)" }, { 0x4704, "GetUserField():Val/4" }, { 0x4804, "SetSysField(Val/4)" }, { 0x4904, "GetSysField():Val/4" }, { 0x4A04, "SetRect(@Rect,left,top,right,bot)" }, - { 0x4B04, "OffsetRect(@Rect,dh,dv)" }, { 0x4C04, "InsetRect(@Rect,dh,dv)" }, { 0x4D04, "SectRect(@R1,@R2,@DstR):nonEmptyF" }, { 0x4E04, "UnionRect(@Rect1,@Rect2,@UnionRect)" }, - { 0x4F04, "PtInRect(@Pt,@Rect):Flag" }, { 0x5004, "Pt2Rect(@Pt1,@Pt2,@Rect)" }, { 0x5104, "EqualRect(@Rect1,@Rect2):Flag" }, { 0x5204, "NotEmptyRect(@Rect):Flag" }, - { 0x5304, "FrameRect(@Rect)" }, { 0x5404, "PaintRect(@Rect)" }, { 0x5504, "EraseRect(@Rect)" }, { 0x5604, "InvertRect(@Rect)" }, { 0x5704, "FillRect(@Rect,@Patt)" }, - { 0x5804, "FrameOval(@Rect)" }, { 0x5904, "PaintOval(@Rect)" }, { 0x5A04, "EraseOval(@Rect)" }, { 0x5B04, "InvertOval(@Rect)" }, { 0x5C04, "FillOval(@Rect,@Patt)" }, - { 0x5D04, "FrameRRect(@Rect,OvalW,OvalHt)" }, { 0x5E04, "PaintRRect(@Rect,OvalW,OvalHt)" }, { 0x5F04, "EraseRRect(@Rect,OvalW,OvalHt)" }, { 0x6004, "InvertRRect(@Rect,OvalW,OvalHt)" }, - { 0x6104, "FillRRect(@Rect,OvalW,OvalHt,@Patt)" }, { 0x6204, "FrameArc(@Rect,Ang1,ArcAng)" }, { 0x6304, "PaintArc(@Rect,Ang1,ArcAng)" }, { 0x6404, "EraseArc(@Rect,Ang1,ArcAng)" }, - { 0x6504, "InvertArc(@Rect,Ang1,ArcAng)" }, { 0x6604, "FillArc(@Rect,Ang1,ArcAng,@Patt)" }, { 0x6704, "NewRgn():RgnH" }, { 0x6804, "DisposeRgn(RgnH)" }, - { 0x6904, "CopyRgn(SrcRgnH,DestRgnH)" }, { 0x6A04, "SetEmptyRgn(RgnH)" }, { 0x6B04, "SetRectRgn(RgnH,left,top,right,bot)" }, { 0x6C04, "RectRgn(RgnH,@Rect)" }, - { 0x6D04, "OpenRgn()" }, { 0x6E04, "CloseRgn(RgnH)" }, { 0x6F04, "OffsetRgn(RgnH,dh,dv)" }, { 0x7004, "InsetRgn(RgnH,dh,dv)" }, { 0x7104, "SectRgn(Rgn1H,Rgn2H,DstRgnH)" }, - { 0x7204, "UnionRgn(Rgn1H,Rgn2H,UnionRgnH)" }, { 0x7304, "DiffRgn(Rgn1H,Rgn2H,DstRgnH)" }, { 0x7404, "XorRgn(Rgn1H,Rgn2H,DstRgnH)" }, { 0x7504, "PtInRgn(@Pt,RgnH):Flag" }, - { 0x7604, "RectInRgn(@Rect,RgnH):Flag" }, { 0x7704, "EqualRgn(Rgn1H,Rgn2H):Flag" }, { 0x7804, "EmptyRgn(RgnH):Flag" }, { 0x7904, "FrameRgn(RgnH)" }, - { 0x7A04, "PaintRgn(RgnH)" }, { 0x7B04, "EraseRgn(RgnH)" }, { 0x7C04, "InvertRgn(RgnH)" }, { 0x7D04, "FillRgn(RgnH,@Patt)" }, { 0x7E04, "ScrollRect(@Rect,dh,dv,UpdtRgnH)" }, - { 0x7F04, "PaintPixels(@ppParms)" }, { 0x8004, "AddPt(@SrcPt,@DestPt)" }, { 0x8104, "SubPt(@SrcPt,@DstPt)" }, { 0x8204, "SetPt(@Pt,h,v)" }, { 0x8304, "EqualPt(@Pt1,@Pt2):Flag" }, - { 0x8404, "LocalToGlobal(@Pt)" }, { 0x8504, "GlobalToLocal(@Pt)" }, { 0x8604, "Random():N" }, { 0x8704, "SetRandSeed(Seed/4)" }, { 0x8804, "GetPixel(Hor,Vert):Pixel" }, - { 0x8904, "ScalePt(@Pt,@SrcRect,@DstRect)" }, { 0x8A04, "MapPt(@Pt,@SrcRect,@DstRect)" }, { 0x8B04, "MapRect(@Rect,@SrcRect,@DstRect)" }, { 0x8C04, "MapRgn(MapRgnH,@SrcRect,@DstRect)" }, - { 0x8D04, "SetStdProcs(@StdProcRec)" }, { 0x8E04, "SetCursor(@Curs)" }, { 0x8F04, "GetCursorAdr():@Curs" }, { 0x9004, "HideCursor()" }, { 0x9104, "ShowCursor()" }, - { 0x9204, "ObscureCursor()" }, { 0x9304, "SetMouseLoc ???" }, { 0x9404, "SetFont(FontH)" }, { 0x9504, "GetFont():FontH" }, { 0x9604, "GetFontInfo(@InfoRec)" }, - { 0x9704, "GetFontGlobals(@FGRec)" }, { 0x9804, "SetFontFlags(Flags)" }, { 0x9904, "GetFontFlags():Flags" }, { 0x9A04, "SetTextFace(TextF)" }, { 0x9B04, "GetTextFace():TextF" }, - { 0x9C04, "SetTextMode(TextM)" }, { 0x9D04, "GetTextMode():TextM" }, { 0x9E04, "SetSpaceExtra(SpEx/4f)" }, { 0x9F04, "GetSpaceExtra():SpEx/4f" }, { 0xA004, "SetForeColor(Color)" }, - { 0xA104, "GetForeColor():Color" }, { 0xA204, "SetBackColor(BackCol)" }, { 0xA304, "GetBackColor():BackCol" }, { 0xA404, "DrawChar(Char)" }, { 0xA504, "DrawString(@Str)" }, - { 0xA604, "DrawCString(@cStr)" }, { 0xA704, "DrawText(@Text,Len)" }, { 0xA804, "CharWidth(Char):Width" }, { 0xA904, "StringWidth(@Str):Width" }, { 0xAA04, "CStringWidth(@cStr):Width" }, - { 0xAB04, "TextWidth(@Text,Len):Width" }, { 0xAC04, "CharBounds(Char,@Rect)" }, { 0xAD04, "StringBounds(@Str,@Rect)" }, { 0xAE04, "CStringBounds(@cStr,@Rect)" }, - { 0xAF04, "TextBounds(@Text,Len,@Rect)" }, { 0xB004, "SetArcRot(ArcRot)" }, { 0xB104, "GetArcRot():ArcRot" }, { 0xB204, "SetSysFont(FontH)" }, { 0xB304, "GetSysFont():FontH" }, - { 0xB404, "SetVisRgn(RgnH)" }, { 0xB504, "GetVisRgn(RgnH)" }, { 0xB604, "SetIntUse(Flag)" }, { 0xB704, "OpenPicture(@FrameRect):PicH" }, { 0xB804, "PicComment(Kind,DataSz,DataH)" }, - { 0xB904, "ClosePicture()" }, { 0xBA04, "DrawPicture(PicH,@DstRect)" }, { 0xBB04, "KillPicture(PicH)" }, { 0xBC04, "FramePoly(PolyH)" }, { 0xBD04, "PaintPoly(PolyH)" }, - { 0xBE04, "ErasePoly(PolyH)" }, { 0xBF04, "InvertPoly(PolyH)" }, { 0xC004, "FillPoly(PolyH,@Patt)" }, { 0xC104, "OpenPoly():PolyH" }, { 0xC204, "ClosePoly()" }, - { 0xC304, "KillPoly(PolyH)" }, { 0xC404, "OffsetPoly(PolyH,dh,dv)" }, { 0xC504, "MapPoly(PolyH,@SrcRect,@DstRect)" }, { 0xC604, "SetClipHandle(RgnH)" }, - { 0xC704, "GetClipHandle():RgnH" }, { 0xC804, "SetVisHandle(RgnH)" }, { 0xC904, "GetVisHandle():RgnH" }, { 0xCA04, "InitCursor()" }, { 0xCB04, "SetBufDims(MaxW,MaxFontHt,MaxFBRext)" }, - { 0xCC04, "ForceBufDims(MaxW,MaxFontHt,MaxFBRext)" }, { 0xCD04, "SaveBufDims(@SizeInfo)" }, { 0xCE04, "RestoreBufDims(@SizeInfo)" }, { 0xCF04, "GetFGSize():FGSize" }, - { 0xD004, "SetFontID(FontID/4)" }, { 0xD104, "GetFontID():FontID/4" }, { 0xD204, "SetTextSize(TextSz)" }, { 0xD304, "GetTextSize():TextSz" }, { 0xD404, "SetCharExtra(ChEx/4f)" }, - { 0xD504, "GetCharExtra():ChEx/4f" }, { 0xD604, "PPToPort(@SrcLoc,@SrcRect,X,Y,Mode)" }, { 0xD704, "InflateTextBuffer(NewW,NewHt)" }, { 0xD804, "GetRomFont(@Rec)" }, - { 0xD904, "GetFontLore(@Rec,RecSize):Size" }, { 0xDA04, "Get640Colors():@PattTable" }, { 0xDB04, "Set640Color(color)" }, { 0x0105, "DeskBootInit()" }, - { 0x0205, "DeskStartUp()" }, { 0x0305, "DeskShutDown()" }, { 0x0405, "DeskVersion():Vers" }, { 0x0505, "DeskReset()" }, { 0x0605, "DeskStatus():ActFlg" }, - { 0x0905, "SaveScrn()" }, { 0x0A05, "RestScrn()" }, { 0x0B05, "SaveAll()" }, { 0x0C05, "RestAll()" }, { 0x0E05, "InstallNDA(ndaH)" }, { 0x0F05, "InstallCDA(cdaH)" }, - { 0x1105, "ChooseCDA()" }, { 0x1305, "SetDAStrPtr(AltDispH,@StrTbl)" }, { 0x1405, "GetDAStrPtr():@StrTbl" }, { 0x1505, "OpenNDA(ItemID):Ref#" }, { 0x1605, "CloseNDA(Ref#)" }, - { 0x1705, "SystemClick(@EvRec,@Wind,fwRes)" }, { 0x1805, "SystemEdit(eType):Flag" }, { 0x1905, "SystemTask()" }, { 0x1A05, "SystemEvent(Mods,Where/4,When/4,Msg/4,What):F" }, - { 0x1B05, "GetNumNDAs():N" }, { 0x1C05, "CloseNDAbyWinPtr(@Wind)" }, { 0x1D05, "CloseAllNDAs()" }, { 0x1E05, "FixAppleMenu(MenuID)" }, { 0x1F05, "AddToRunQ(@taskHeader)" }, - { 0x2005, "RemoveFromRunQ(@taskHeader)" }, { 0x2105, "RemoveCDA(cdaH)" }, { 0x2205, "RemoveNDA(ndaH)" }, { 0x2305, "GetDeskAccInfo(flags,daRef/4,BufSize,@Buffer)" }, - { 0x2405, "CallDeskAcc(flags,daRef/4,Action,Data/4):Result" }, { 0x2505, "GetDeskGlobal(selector):Value/4" }, { 0x0106, "EMBootInit()" }, { 0x0206, "EMStartUp(DirPg,qSz,Xmn,Xmx,Ymn,Ymx,MemID)" }, - { 0x0306, "EMShutDown()" }, { 0x0406, "EMVersion():Vers" }, { 0x0506, "EMReset()" }, { 0x0606, "EMStatus():ActFlg" }, { 0x0906, "DoWindows():DirPg" },{ 0x0A06, "GetNextEvent(evMask,@EvRec):Flag" }, - { 0x0B06, "EventAvail(evMask,@EvRec):Flag" }, { 0x0C06, "GetMouse(@Pt)" }, { 0x0D06, "Button(Btn#):DownFlg" }, { 0x0E06, "StillDown(Btn#):Flag" }, - { 0x0F06, "WaitMouseUp(Btn#):Flag" }, { 0x1006, "TickCount():Ticks/4" }, { 0x1106, "GetDblTime():Ticks/4" }, { 0x1206, "GetCaretTime():Ticks/4" }, - { 0x1306, "SetSwitch()" }, { 0x1406, "PostEvent(code,Msg/4):Flag" }, { 0x1506, "FlushEvents(evMask,StopMask):F" }, { 0x1606, "GetOSEvent(evMask,@EvRec):Flag" }, - { 0x1706, "OSEventAvail(evMask,@EvRec):Flag" }, { 0x1806, "SetEventMask(evMask)" }, { 0x1906, "FakeMouse(ChFlg,Mods,X,Y,BtnStat)" }, { 0x1A06, "SetAutoKeyLimit(NewLimit)" }, - { 0x1B06, "GetKeyTranslation():kTransID" }, { 0x1C06, "SetKeyTranslation(kTransID)" }, { 0x0107, "SchBootInit()" }, { 0x0207, "SchStartUp()" }, { 0x0307, "SchShutDown()" }, - { 0x0407, "SchVersion():Vers" }, { 0x0507, "SchReset()" }, { 0x0607, "SchStatus():ActFlg" }, { 0x0907, "SchAddTask(@Task):Flag" }, { 0x0A07, "SchFlush()" }, - { 0x0108, "SoundBootInit()" }, { 0x0208, "SoundStartUp(DirPg)" }, { 0x0308, "SoundShutDown()" }, { 0x0408, "SoundVersion():Vers" }, { 0x0508, "SoundReset()" }, - { 0x0608, "SoundToolStatus():ActFlg" }, { 0x0908, "WriteRamBlock(@Src,DOCStart,Count)" }, { 0x0A08, "ReadRamBlock(@Dest,DOCStart,Count)" }, { 0x0B08, "GetTableAddress():@JumpTbl" }, - { 0x0C08, "GetSoundVolume(Gen#):Vol" }, { 0x0D08, "SetSoundVolume(Vol,Gen#)" }, { 0x0E08, "FFStartSound(GenN&mode,@Parms)" }, { 0x0F08, "FFStopSound(GenMask)" }, - { 0x1008, "FFSoundStatus():ActFlg" }, { 0x1108, "FFGeneratorStatus(Gen#):Stat" }, { 0x1208, "SetSoundMIRQV(@IntHandler)" }, { 0x1308, "SetUserSoundIRQV(@NewIRQ):@OldIRQ" }, - { 0x1408, "FFSoundDoneStatus(Gen#):Stat" }, { 0x1508, "FFSetUpSound(ChannelGen,@Parms)" }, { 0x1608, "FFStartPlaying(GenWord)" }, { 0x1708, "SetDocReg(@DocRegParms)" }, - { 0x1808, "ReadDocReg(@DocRegParms)" }, { 0x0109, "ADBBootInit()" }, { 0x0209, "ADBStartUp()" }, { 0x0309, "ADBShutDown()" }, { 0x0409, "ADBVersion():Vers" }, - { 0x0509, "ADBReset()" }, { 0x0609, "ADBStatus():ActFlg" }, { 0x0909, "SendInfo(NumB,@Data,Cmd)" }, { 0x0A09, "ReadKeyMicroData(NumB,@Data,Cmd)" }, { 0x0B09, "ReadKeyMicroMemory(@DataOut,@DataIn,Cmd)" }, - { 0x0C09, "[resynch--don't call]" }, { 0x0D09, "AsyncADBReceive(@CompVec,Cmd)" }, { 0x0E09, "SyncADBReceive(InputWrd,@CompVec,Cmd)" }, { 0x0F09, "AbsOn()" }, - { 0x1009, "AbsOff()" }, { 0x1109, "RdAbs():Flag" }, { 0x1209, "SetAbsScale(@DataOut)" }, { 0x1309, "GetAbsScale(@DataIn)" }, { 0x1409, "SRQPoll(@CompVec,ADBreg)" }, - { 0x1509, "SRQRemove(ADBreg)" }, { 0x1609, "ClearSRQTable()" }, { 0xFF09, "[OBSOLETE: Use 09FF]" }, { 0x010A, "SANEBootInit()" }, { 0x020A, "SANEStartUp(DirPg)" }, - { 0x030A, "SANEShutDown()" }, { 0x040A, "SANEVersion():Vers" }, { 0x050A, "SANEReset()" }, { 0x060A, "SANEStatus():ActFlg" }, { 0x090A, "FPNum (...)" }, - { 0x0A0A, "DecStrNum (...)" }, { 0x0B0A, "ElemNum (...)" }, { 0xFF0A, "[OBSOLETE: USE $0AFF]" }, { 0x010B, "IMBootInit()" }, { 0x020B, "IMStartUp()" }, - { 0x030B, "IMShutDown()" }, { 0x040B, "IMVersion():Vers" }, { 0x050B, "IMReset()" }, { 0x060B, "IMStatus():ActFlg" }, { 0x090B, "Multiply(A,B):Prod/4" }, - { 0x0A0B, "SDivide(Num,Den):Rem,Quot" }, { 0x0B0B, "UDivide(Num,Den):Rem,Quot" }, { 0x0C0B, "LongMul(A/4,B/4):Prod/8" }, { 0x0D0B, "LongDivide(Num/4,Denom/4):Rem/4,Quot/4" }, - { 0x0E0B, "FixRatio(Numer,Denom):fxRatio/4" }, { 0x0F0B, "FixMul(fx1/4,fx2/4):fxProd/4" }, { 0x100B, "FracMul(fr1/4,fr2/4):frRes/4" }, { 0x110B, "FixDiv(Quot/4,Divisor/4):fxRes/4" }, - { 0x120B, "FracDiv(Quot/4,Divisor/4):frRes/4" }, { 0x130B, "FixRound(fxVal/4):Int" }, { 0x140B, "FracSqrt(frVal/4):frRes/4" }, { 0x150B, "FracCos(fxAngle/4):frRes/4" }, - { 0x160B, "FracSin(fxAngle/4):frRes/4" }, { 0x170B, "FixATan2(In1/4,In2/4):fxArcTan/4" }, { 0x180B, "HiWord(Long/4):Int" }, { 0x190B, "LoWord(Long/4):Int" }, - { 0x1A0B, "Long2Fix(Long/4):fxRes/4" }, { 0x1B0B, "Fix2Long(Fix/4):Long/4" }, { 0x1C0B, "Fix2Frac(fxVal/4):Frac/4" }, { 0x1D0B, "Frac2Fix(frVal/4):fxRes/4" }, - { 0x1E0B, "Fix2X(Fix/4,@Extended)" }, { 0x1F0B, "Frac2X(frVal/4,@Extended)" }, { 0x200B, "X2Fix(@Extended):fxRes/4" }, { 0x210B, "X2Frac(@Extended):frRes/4" }, - { 0x220B, "Int2Hex(Int,@Str,Len)" }, { 0x230B, "Long2Hex(Long/4,@Str,Len)" }, { 0x240B, "Hex2Int(@Str,Len):Int" }, { 0x250B, "Hex2Long(@Str,Len):Long/4" }, - { 0x260B, "Int2Dec(Int,@Str,Len,SgnFlg)" }, { 0x270B, "Long2Dec(Long/4,@Str,Len,SgnFlg)" }, { 0x280B, "Dec2Int(@Str,Len,SgnFlg):Int" }, { 0x290B, "Dec2Long(@Str,Len,SgnFlg):Long/4" }, - { 0x2A0B, "HexIt(Int):Hex/4" }, { 0x010C, "TextBootInit()" }, { 0x020C, "TextStartUp()" }, { 0x030C, "TextShutDown()" }, { 0x040C, "TextVersion():Vers" }, - { 0x050C, "TextReset()" }, { 0x060C, "TextStatus():ActFlg" }, { 0x090C, "SetInGlobals(ANDmsk,ORmsk)" }, { 0x0A0C, "SetOutGlobals(ANDmsk,ORmsk)" }, - { 0x0B0C, "SetErrGlobals(ANDmsk,ORmsk)" }, { 0x0C0C, "GetInGlobals():ANDmsk,ORmsk" }, { 0x0D0C, "GetOutGlobals():ANDmsk,ORmsk" }, { 0x0E0C, "GetErrGlobals():ANDmsk,ORmsk" }, - { 0x0F0C, "SetInputDevice(Type,@drvr|Slot/4)" }, { 0x100C, "SetOutputDevice(Type,@drvr|Slot/4)" }, { 0x110C, "SetErrorDevice(Type,@drvr|Slot/4)" }, { 0x120C, "GetInputDevice():Type,@drvr|Slot/4" }, - { 0x130C, "GetOutputDevice():Type,@drvr|Slot/4" }, { 0x140C, "GetErrorDevice():Type,@drvr|Slot/4" },{ 0x150C, "InitTextDev(dev)" }, { 0x160C, "CtlTextDev(dev,code)" }, - { 0x170C, "StatusTextDev(dev,request)" }, { 0x180C, "WriteChar(Char)" }, { 0x190C, "ErrWriteChar(Char)" }, { 0x1A0C, "WriteLine(@Str)" }, { 0x1B0C, "ErrWriteLine(@Str)" }, - { 0x1C0C, "WriteString(@Str)" }, { 0x1D0C, "ErrWriteString(@Str)" }, { 0x1E0C, "TextWriteBlock(@Text,Offset,Len)" }, { 0x1F0C, "ErrWriteBlock(@Text,Offset,Len)" },{ 0x200C, "WriteCString(@cStr)" }, - { 0x210C, "ErrWriteCString(@cStr)" }, { 0x220C, "ReadChar(EchoFlg):Char" }, { 0x230C, "TextReadBlock(@Buff,Offset,Size,EchoFlg)" }, { 0x240C, "ReadLine(@Buff,Max,EOLch,EchoFlg):Count" }, - { 0x010E, "WindBootInit()" }, { 0x020E, "WindStartUp(MemID)" }, { 0x030E, "WindShutDown()" }, { 0x040E, "WindVersion():Vers" }, { 0x050E, "WindReset()" },{ 0x060E, "WindStatus():ActFlg" }, - { 0x090E, "NewWindow(@Parms):@Wind" }, { 0x0A0E, "CheckUpdate(@EvRec):Flag" }, { 0x0B0E, "CloseWindow(@Wind)" }, { 0x0C0E, "Desktop(Oper,param/4):result/4" }, - { 0x0D0E, "SetWTitle(@Title,@Wind)" }, { 0x0E0E, "GetWTitle(@Wind):@Title" }, { 0x0F0E, "SetFrameColor(@NewColTbl,@Wind)" }, { 0x100E, "GetFrameColor(@Table,@Wind)" }, - { 0x110E, "SelectWindow(@Wind)" }, { 0x120E, "HideWindow(@Wind)" }, { 0x130E, "ShowWindow(@Wind)" }, { 0x140E, "SendBehind(@BehindWho,@Wind)" }, - { 0x150E, "FrontWindow():@Wind" }, { 0x160E, "SetInfoDraw(@Proc,@Wind)" }, { 0x170E, "FindWindow(@WindVar,X,Y):Where" }, { 0x180E, "TrackGoAway(X,Y,@Wind):Flag" }, - { 0x190E, "MoveWindow(X,Y,@Wind)" }, { 0x1A0E, "DragWindow(Grid,X,Y,Grace,@bRect,@Wind)" }, { 0x1B0E, "GrowWindow(mnW,mnH,X,Y,@Wind):nSize/4" }, - { 0x1C0E, "SizeWindow(w,h,@Wind)" }, { 0x1D0E, "TaskMaster(evMask,@TaskRec):Code" }, { 0x1E0E, "BeginUpdate(@Wind)" }, { 0x1F0E, "EndUpdate(@Wind)" }, - { 0x200E, "GetWMgrPort():@Port" }, { 0x210E, "PinRect(X,Y,@Rect):Point/4" }, { 0x220E, "HiliteWindow(Flag,@Wind)" }, { 0x230E, "ShowHide(Flag,@Wind)" }, - { 0x240E, "BringToFront(@Wind)" }, { 0x250E, "WindNewRes()" }, { 0x260E, "TrackZoom(X,Y,@Wind):Flag" }, { 0x270E, "ZoomWindow(@Wind)" }, { 0x280E, "SetWRefCon(Refcon/4,@Wind)" }, - { 0x290E, "GetWRefCon(@Wind):Refcon/4" }, { 0x2A0E, "GetNextWindow(@Wind):@Wind" }, { 0x2B0E, "GetWKind(@Wind):Flag" }, { 0x2C0E, "GetWFrame(@Wind):Frame" }, - { 0x2D0E, "SetWFrame(Frame,@Wind)" }, { 0x2E0E, "GetStructRgn(@Wind):StructRgnH" }, { 0x2F0E, "GetContentRgn(@Wind):ContRgnH" }, { 0x300E, "GetUpdateRgn(@Wind):UpdateRgnH" }, - { 0x310E, "GetDefProc(@Wind):@Proc" }, { 0x320E, "SetDefProc(@Proc,@Wind)" }, { 0x330E, "GetWControls(@Wind):CtrlH" }, { 0x340E, "SetOriginMask(Mask,@Wind)" }, - { 0x350E, "GetInfoRefCon(@Wind):Refcon/4" }, { 0x360E, "SetInfoRefCon(Val/4,@Wind)" }, { 0x370E, "GetZoomRect(@Wind):@zRect" }, { 0x380E, "SetZoomRect(@zRect,@Wind)" }, - { 0x390E, "RefreshDesktop(@Rect)" }, { 0x3A0E, "InvalRect(@Rect)" }, { 0x3B0E, "InvalRgn(RgnH)" }, { 0x3C0E, "ValidRect(@Rect)" }, { 0x3D0E, "ValidRgn(RgnH)" }, - { 0x3E0E, "GetContentOrigin(@Wind):Origin/4" }, { 0x3F0E, "SetContentOrigin(X,Y,@Wind)" }, { 0x400E, "GetDataSize(@Wind):DataSize/4" }, { 0x410E, "SetDataSize(w,h,@Wind)" }, - { 0x420E, "GetMaxGrow(@Wind):MaxGrow/4" }, { 0x430E, "SetMaxGrow(maxWidth,maxHeight,@Wind)" }, { 0x440E, "GetScroll(@Wind):Scroll/4" }, { 0x450E, "SetScroll(h,v,@Wind)" }, - { 0x460E, "GetPage(@Wind):Page/4" }, { 0x470E, "SetPage(h,v,@Wind)" }, { 0x480E, "GetContentDraw(@Wind):@Proc" }, { 0x490E, "SetContentDraw(@Proc,@Wind)" }, - { 0x4A0E, "GetInfoDraw(@Wind):@Proc" }, { 0x4B0E, "SetSysWindow(@Wind)" }, { 0x4C0E, "GetSysWFlag(@Wind):Flag" }, { 0x4D0E, "StartDrawing(@Wind)" }, - { 0x4E0E, "SetWindowIcons(NewFontH):OldFontH" }, { 0x4F0E, "GetRectInfo(@InfoRect,@Wind)" }, { 0x500E, "StartInfoDrawing(@iRect,@Wind)" }, { 0x510E, "EndInfoDrawing()" }, - { 0x520E, "GetFirstWindow():@Wind" }, { 0x530E, "WindDragRect(@a,@P,X,Y,@R,@lR,@sR,F):M/4" }, { 0x540E, "Private01():@func [GetDragRectPtr]" }, - { 0x550E, "DrawInfoBar(@Wind)" }, { 0x560E, "WindowGlobal(Flags):Flags" }, { 0x570E, "SetContentOrigin2(ScrollFlag,X,Y,@Wind)" }, { 0x580E, "GetWindowMgrGlobals():@Globals" }, - { 0x590E, "AlertWindow(AlertDesc,@SubArray,AlertRef/4):Btn" }, { 0x5A0E, "StartFrameDrawing(@Wind)" }, { 0x5B0E, "EndFrameDrawing()" }, { 0x5C0E, "ResizeWindow(hidden,@ContRect,@Wind)" }, - { 0x5D0E, "TaskMasterContent" }, { 0x5E0E, "TaskMasterKey" }, { 0x5F0E, "TaskMasterDA(evMask,@bigTaskRec):taskCode" }, { 0x600E, "CompileText(subType,@subs,@text,size):H" }, - { 0x610E, "NewWindow2(@T,RC/4,@draw,@def,pDesc,pRef/4,rType):@W" }, { 0x620E, "ErrorWindow(subType,@subs,ErrNum):Button" }, - { 0x630E, "GetAuxWindInfo(@Wind):@Info" }, { 0x640E, "DoModalWindow(@Event,@Update,@EvHook,@Beep,Flags):Result/4" }, { 0x650E, "MWGetCtlPart():Part" }, - { 0x660E, "MWSetMenuProc(@NewMenuProc):@OldMenuProc" }, { 0x670E, "MWStdDrawProc()" }, { 0x680E, "MWSetUpEditMenu()" }, { 0x690E, "FindCursorCtl(@CtrlH,x,y,@Wind):PartCode" }, - { 0x6A0E, "ResizeInfoBar(flags,newHeight,@Wind)" }, { 0x6B0E, "HandleDiskInsert(flags,devNum):resFlags,resDevNum" }, { 0x6C0E, "UpdateWindow(flags,@Wind)" }, - { 0x010F, "MenuBootInit()" }, { 0x020F, "MenuStartUp(MemID,DirPg)" }, { 0x030F, "MenuShutDown()" }, { 0x040F, "MenuVersion():Vers" }, { 0x050F, "MenuReset()" }, - { 0x060F, "MenuStatus():ActFlg" }, { 0x090F, "MenuKey(@TaskRec,BarH)" }, { 0x0A0F, "GetMenuBar():BarH" }, { 0x0B0F, "MenuRefresh(@RedrawProc)" }, { 0x0C0F, "FlashMenuBar()" }, - { 0x0D0F, "InsertMenu(MenuH,AfterWhat)" }, { 0x0E0F, "DeleteMenu(MenuID)" }, { 0x0F0F, "InsertMItem(@Item,AfterItem,MenuID)" }, { 0x100F, "DeleteMItem(ItemID)" }, - { 0x110F, "GetSysBar():BarH" }, { 0x120F, "SetSysBar(BarH)" }, { 0x130F, "FixMenuBar():Height" }, { 0x140F, "CountMItems(MenuID):N" }, { 0x150F, "NewMenuBar(@Wind):BarH" }, - { 0x160F, "GetMHandle(MenuID):MenuH" }, { 0x170F, "SetBarColors(BarCol,InvCol,OutCol)" }, { 0x180F, "GetBarColors():Colors/4" }, { 0x190F, "SetMTitleStart(hStart)" }, - { 0x1A0F, "GetMTitleStart():hStart" }, { 0x1B0F, "GetMenuMgrPort():@Port" }, { 0x1C0F, "CalcMenuSize(w,h,MenuID)" }, { 0x1D0F, "SetMTitleWidth(w,MenuID)" }, - { 0x1E0F, "GetMTitleWidth(MenuID):TitleWidth" }, { 0x1F0F, "SetMenuFlag(Flags,MenuID)" }, { 0x200F, "GetMenuFlag(MenuID):Flags" },{ 0x210F, "SetMenuTitle(@Title,MenuID)" }, - { 0x220F, "GetMenuTitle(MenuID):@Title" }, { 0x230F, "MenuGlobal(Flags):Flags" }, { 0x240F, "SetMItem(@Str,ItemID)" }, { 0x250F, "GetMItem(ItemID):@ItemName" }, - { 0x260F, "SetMItemFlag(Flags,ItemID)" }, { 0x270F, "GetMItemFlag(ItemID):Flag" }, { 0x280F, "SetMItemBlink(Count)" }, { 0x290F, "MenuNewRes()" }, - { 0x2A0F, "DrawMenuBar()" }, { 0x2B0F, "MenuSelect(@TaskRec,BarH)" }, { 0x2C0F, "HiliteMenu(Flag,MenuID)" }, { 0x2D0F, "NewMenu(@MenuStr):MenuH" }, { 0x2E0F, "DisposeMenu(MenuH)" }, - { 0x2F0F, "InitPalette()" }, { 0x300F, "EnableMItem(ItemID)" }, { 0x310F, "DisableMItem(ItemID)" }, { 0x320F, "CheckMItem(Flag,ItemID)" }, { 0x330F, "SetMItemMark(MarkCh,ItemID)" }, - { 0x340F, "GetMItemMark(ItemID):MarkChar" }, { 0x350F, "SetMItemStyle(TextStyle,ItemID)" }, { 0x360F, "GetMItemStyle(ItemID):TextStyle" }, { 0x370F, "SetMenuID(New,Old)" }, - { 0x380F, "SetMItemID(New,Old)" }, { 0x390F, "SetMenuBar(BarH)" }, { 0x3A0F, "SetMItemName(@Str,ItemID)" }, { 0x3B0F, "GetPopUpDefProc():@proc" }, - { 0x3C0F, "PopUpMenuSelect(SelID,left,top,flag,MenuH):id" }, { 0x3D0F, "[DrawPopUp(SelID,Flag,right,bottom,left,top,MenuH)]" }, { 0x3E0F, "NewMenu2(RefDesc,Ref/4):MenuH" }, - { 0x3F0F, "InsertMItem2(RefDesc,Ref/4,After,MenuID)" }, { 0x400F, "SetMenuTitle2(RefDesc,TitleRef/4,MenuID)" }, { 0x410F, "SetMItem2(RefDesc,Ref/4,Item)" }, - { 0x420F, "SetMItemName2(RefDesc,Ref/4,Item)" }, { 0x430F, "NewMenuBar2(RefDesc,Ref/4,@Wind):BarH" }, { 0x450F, "HideMenuBar()" }, { 0x460F, "ShowMenuBar()" }, - { 0x470F, "SetMItemIcon(IconDesc,IconRef/4,ItemID)" }, { 0x480F, "GetMItemIcon(ItemID):IconRef/4" }, { 0x490F, "SetMItemStruct(Desc,StructRef/4,ItemID)" }, - { 0x4A0F, "GetMItemStruct(ItemID):ItemStruct/4" }, { 0x4B0F, "RemoveMItemStruct(ItemID)" }, { 0x4C0F, "GetMItemFlag2(ItemID):ItemFlag2" }, { 0x4D0F, "SetMItemFlag2(newValue,ItemID)" }, - { 0x4F0F, "GetMItemBlink():Count" }, { 0x500F, "InsertPathMItems(flags,@Path,devnum,MenuID,AfterID,StartID,@Results)" }, { 0x0110, "CtlBootInit()" }, - { 0x0210, "CtlStartUp(MemID,DirPg)" }, { 0x0310, "CtlShutDown()" }, { 0x0410, "CtlVersion():Vers" }, { 0x0510, "CtlReset()" }, { 0x0610, "CtlStatus():ActFlg" }, - { 0x0910, "NewControl(@W,@R,@T,F,V,P1,P2,@p,r/4,@C):cH" }, { 0x0A10, "DisposeControl(CtrlH)" }, { 0x0B10, "KillControls(@Wind)" }, { 0x0C10, "SetCtlTitle(@Title,CtrlH)" }, - { 0x0D10, "GetCtlTitle(CtrlH):@Title" }, { 0x0E10, "HideControl(CtrlH)" }, { 0x0F10, "ShowControl(CtrlH)" }, { 0x1010, "DrawControls(@Wind)" },{ 0x1110, "HiliteControl(Flag,CtrlH)" }, - { 0x1210, "CtlNewRes()" }, { 0x1310, "FindControl(@CtrlHVar,X,Y,@Wind):Part" }, { 0x1410, "TestControl(X,Y,CtrlH):Part" }, { 0x1510, "TrackControl(X,Y,@ActProc,CtrlH):Part" }, - { 0x1610, "MoveControl(X,Y,CtrlH)" }, { 0x1710, "DragControl(X,Y,@LimR,@slR,Axis,CtrlH)" }, { 0x1810, "SetCtlIcons(FontH):OldFontH" }, { 0x1910, "SetCtlValue(Val,CtrlH)" }, - { 0x1A10, "GetCtlValue(CtrlH):Val" }, { 0x1B10, "SetCtlParams(P2,P1,CtrlH)" }, { 0x1C10, "GetCtlParams(CtrlH):P1,P2" }, { 0x1D10, "DragRect(@acPr,@P,X,Y,@drR,@l,@slR,F):M/4" }, - { 0x1E10, "GrowSize():Size/4" }, { 0x1F10, "GetCtlDpage():DirPg" }, { 0x2010, "SetCtlAction(@ActProc,CtrlH)" }, { 0x2110, "GetCtlAction(CtrlH):Action/4" }, { 0x2210, "SetCtlRefCon(Refcon/4,CtrlH)" }, - { 0x2310, "GetCtlRefCon(CtrlH):Refcon/4" }, { 0x2410, "EraseControl(CtrlH)" }, { 0x2510, "DrawOneCtl(CtrlH)" }, { 0x2610, "FindTargetCtl():CtrlH" }, - { 0x2710, "MakeNextCtlTarget():CtrlH" }, { 0x2810, "MakeThisCtlTarget(CtrlH)" }, { 0x2910, "SendEventToCtl(TgtOnly,@Wind,@eTask):Accepted" }, { 0x2A10, "GetCtlID(CtrlH):CtlID/4" }, - { 0x2B10, "SetCtlID(CtlID/4,CtrlH)" }, { 0x2C10, "CallCtlDefProc(CtrlH,Msg,Param/4):Result/4" }, { 0x2D10, "NotifyCtls(Mask,Msg,Param/4,@Wind)" }, - { 0x2E10, "GetCtlMoreFlags(CtrlH):Flags" }, { 0x2F10, "SetCtlMoreFlags(Flags,CtrlH)" }, { 0x3010, "GetCtlHandleFromID(@Wind,CtlID/4):CtrlH" }, { 0x3110, "NewControl2(@Wind,InKind,InRef/4):CtrlH" }, - { 0x3210, "CMLoadResource(rType,rID/4):resH" }, { 0x3310, "CMReleaseResource(rType,rID/4)" }, { 0x3410, "SetCtlParamPtr(@SubArray)" }, { 0x3510, "GetCtlParamPtr():@SubArray" }, - { 0x3710, "InvalCtls(@Wind)" }, { 0x3810, "[reserved]" }, { 0x3910, "FindRadioButton(@Wind,FamilyNum):WhichRadio" }, { 0x3A10, "SetLETextByID(@Wind,leID/4,@PString)" }, - { 0x3B10, "GetLETextByID(@Wind,leID/4,@PString)" }, { 0x3C10, "SetCtlValueByID(Value,@Wind,CtlID/4)" }, { 0x3D10, "GetCtlValueByID(@Wind,CtlID/4):Value" },{ 0x3E10, "InvalOneCtlByID(@Wind,CtlID/4)" }, - { 0x3F10, "HiliteCtlByID(Hilite,@Wind,CtlID/4)" }, { 0x0111, "LoaderBootInit()" }, { 0x0211, "LoaderStartUp()" }, { 0x0311, "LoaderShutDown()" }, - { 0x0411, "LoaderVersion():Vers" }, { 0x0511, "LoaderReset()" }, { 0x0611, "LoaderStatus():ActFlg" }, { 0x0911, "InitialLoad(MemID,@path,F):dpsSz,dps,@l,MemID" }, - { 0x0A11, "Restart(MemID):dpsSz,dps,@loc,MemID" }, { 0x0B11, "LoadSegNum(MemID,file#,seg#):@loc" }, { 0x0C11, "UnloadSegNum(MemID,file#,seg#)" }, { 0x0D11, "LoadSegName(MemID,@path,@segn):@loc,MemID,file#,sg#" }, - { 0x0E11, "UnloadSeg(@loc):seg#,file#,MemID" }, { 0x0F11, "GetLoadSegInfo(MemID,file#,seg#,@buff)" }, { 0x1011, "GetUserID(@Pathname):MemID" }, { 0x1111, "LGetPathname(MemID,file#):@path" }, - { 0x1211, "UserShutDown(MemID,qFlag):MemID" }, { 0x1311, "RenamePathname(@path1,@path2)" }, { 0x2011, "InitialLoad2(MemID,@in,F,Type):dpsSz,dps,@l,MemID" }, - { 0x2111, "GetUserID2(@path):MemID" }, { 0x2211, "LGetPathname2(MemID,file#):@path" }, { 0x0112, "QDAuxBootInit()" }, { 0x0212, "QDAuxStartUp()" }, - { 0x0312, "QDAuxShutDown()" }, { 0x0412, "QDAuxVersion():Vers" }, { 0x0512, "QDAuxReset()" }, { 0x0612, "QDAuxStatus():ActFlg" }, { 0x0912, "CopyPixels(@sLoc,@dLoc,@sRect,@dRct,M,MskH)" }, - { 0x0A12, "WaitCursor()" }, { 0x0B12, "DrawIcon(@Icon,Mode,X,Y)" }, { 0x0C12, "SpecialRect(@Rect,FrameColor,FillColor)" }, { 0x0D12, "SeedFill(@sLoc,@sR,@dLoc,@dR,X,Y,Mode,@Patt,@Leak)" }, - { 0x0E12, "CalcMask(@sLoc,@sR,@dLoc,@dR,Mode,@Patt,@Leak)" }, { 0x0F12, "GetSysIcon(flags,value,aux/4):@Icon" }, { 0x1012, "PixelMap2Rgn(@srcLoc,bitsPerPix,colorMask):RgnH" }, - { 0x1312, "IBeamCursor()" }, { 0x1412, "WhooshRect(flags/4,@smallRect,@bigRect)" }, { 0x1512, "DrawStringWidth(Flags,Ref/4,Width)" }, { 0x1612, "UseColorTable(tableNum,@Table,Flags):ColorInfoH" }, - { 0x1712, "RestoreColorTable(ColorInfoH,Flags)" }, { 0x0113, "PMBootInit()" }, { 0x0213, "PMStartUp(MemID,DirPg)" }, { 0x0313, "PMShutDown()" }, - { 0x0413, "PMVersion():Vers" }, { 0x0513, "PMReset()" }, { 0x0613, "PMStatus():ActFlg" }, { 0x0913, "PrDefault(PrRecH)" }, { 0x0A13, "PrValidate(PrRecH):Flag" }, - { 0x0B13, "PrStlDialog(PrRecH):Flag" }, { 0x0C13, "PrJobDialog(PrRecH):Flag" }, { 0x0D13, "PrPixelMap(@LocInfo,@SrcRect,colorFlag)" }, { 0x0E13, "PrOpenDoc(PrRecH,@Port):@Port" }, - { 0x0F13, "PrCloseDoc(@Port)" }, { 0x1013, "PrOpenPage(@Port,@Frame)" }, { 0x1113, "PrClosePage(@Port)" }, { 0x1213, "PrPicFile(PrRecH,@Port,@StatRec)" },{ 0x1313, "PrControl [obsolete]" }, - { 0x1413, "PrError():Error" }, { 0x1513, "PrSetError(Error)" }, { 0x1613, "PrChoosePrinter():DrvFlag" }, { 0x1813, "PrGetPrinterSpecs():Type,Characteristics" }, - { 0x1913, "PrDevPrChanged(@PrinterName)" }, { 0x1A13, "PrDevStartup(@PrinterName,@ZoneName)" }, { 0x1B13, "PrDevShutDown()" }, { 0x1C13, "PrDevOpen(@compProc,Reserved/4)" }, - { 0x1D13, "PrDevRead(@buffer,reqCount):xferCount" }, { 0x1E13, "PrDevWrite(@compProc,@buff,bufLen)" }, { 0x1F13, "PrDevClose()" }, { 0x2013, "PrDevStatus(@statBuff)" }, - { 0x2113, "PrDevAsyncRead(@compPr,bufLen,@buff):xferCount" }, { 0x2213, "PrDevWriteBackground(@compProc,bufLen,@buff)" }, { 0x2313, "PrDriverVer():Vers" }, - { 0x2413, "PrPortVer():Vers" }, { 0x2513, "PrGetZoneName():@ZoneName" }, { 0x2813, "PrGetPrinterDvrName():@Name" }, { 0x2913, "PrGetPortDvrName():@Name" }, - { 0x2A13, "PrGetUserName():@Name" }, { 0x2B13, "PrGetNetworkName():@Name" }, { 0x3013, "PrDevIsItSafe():safeFlag" }, { 0x3113, "GetZoneList [obsolete?]" }, - { 0x3213, "GetMyZone [obsolete?]" }, { 0x3313, "GetPrinterList [obsolete?]" }, { 0x3413, "PMUnloadDriver(whichDriver)" }, { 0x3513, "PMLoadDriver(whichDriver)" }, - { 0x3613, "PrGetDocName():@pStr" }, { 0x3713, "PrSetDocName(@pStr)" }, { 0x3813, "PrGetPgOrientation(PrRecH):Orientation" }, { 0x0114, "LEBootInit()" }, - { 0x0214, "LEStartUp(MemID,DirPg)" }, { 0x0314, "LEShutDown()" }, { 0x0414, "LEVersion():Vers" }, { 0x0514, "LEReset()" }, { 0x0614, "LEStatus():ActFlg" }, - { 0x0914, "LENew(@DstRect,@ViewRect,MaxL):leH" }, { 0x0A14, "LEDispose(leH)" }, { 0x0B14, "LESetText(@Text,Len,leH)" }, { 0x0C14, "LEIdle(leH)" }, - { 0x0D14, "LEClick(@EvRec,leH)" }, { 0x0E14, "LESetSelect(Start,End,leH)" }, { 0x0F14, "LEActivate(leH)" }, { 0x1014, "LEDeactivate(leH)" }, { 0x1114, "LEKey(Key,Mods,leH)" }, - { 0x1214, "LECut(leH)" }, { 0x1314, "LECopy(leH)" }, { 0x1414, "LEPaste(leH)" }, { 0x1514, "LEDelete(leH)" },{ 0x1614, "LEInsert(@Text,Len,leH)" }, - { 0x1714, "LEUpdate(leH)" }, { 0x1814, "LETextBox(@Text,Len,@Rect,Just)" }, { 0x1914, "LEFromScrap()" }, { 0x1A14, "LEToScrap()" }, { 0x1B14, "LEScrapHandle():ScrapH" }, - { 0x1C14, "LEGetScrapLen():Len" }, { 0x1D14, "LESetScrapLen(NewL)" }, { 0x1E14, "LESetHilite(@HiliteProc,leH)" }, { 0x1F14, "LESetCaret(@CaretProc,leH)" }, - { 0x2014, "LETextBox2(@Text,Len,@Rect,Just)" }, { 0x2114, "LESetJust(Just,leH)" }, { 0x2214, "LEGetTextHand(leH):TextH" }, { 0x2314, "LEGetTextLen(leH):TxtLen" }, - { 0x2414, "GetLEDefProc():@proc" }, { 0x2514, "LEClassifyKey(@Event):Flag" }, { 0x0115, "DialogBootInit()" }, { 0x0215, "DialogStartUp(MemID)" }, { 0x0315, "DialogShutDown()" }, - { 0x0415, "DialogVersion():Vers" }, { 0x0515, "DialogReset()" }, { 0x0615, "DialogStatus():ActFlg" }, { 0x0915, "ErrorSound(@SoundProc)" }, { 0x0A15, "NewModalDialog(@bR,vis,refcon/4):@Dlog" }, - { 0x0B15, "NewModelessDialog(@R,@T,@b,fr,rf/4,@zR):@D" }, { 0x0C15, "CloseDialog(@Dlog)" }, { 0x0D15, "NewDItem(@Dlog,dItem,@R,ty,Des/4,V,F,@Col)" }, - { 0x0E15, "RemoveDItem(@Dlog,dItem)" }, { 0x0F15, "ModalDialog(@FilterProc):Hit" }, { 0x1015, "IsDialogEvent(@EvRec):Flag" },{ 0x1115, "DialogSelect(@EvRec,@Dlog,@Hit):Flag" }, - { 0x1215, "DlgCut(@Dlog)" }, { 0x1315, "DlgCopy(@Dlog)" }, { 0x1415, "DlgPaste(@Dlog)" }, { 0x1515, "DlgDelete(@Dlog)" }, { 0x1615, "DrawDialog(@Dlog)" }, - { 0x1715, "Alert(@AlertTmpl,@FiltProc):Hit" }, { 0x1815, "StopAlert(@AlertTmpl,@FiltProc):Hit" }, { 0x1915, "NoteAlert(@AlertTmpl,@FiltProc):Hit" }, - { 0x1A15, "CautionAlert(@AlertTmpl,@FiltProc):Hit" }, { 0x1B15, "ParamText(@P0,@P1,@P2,@P3)" }, { 0x1C15, "SetDAFont(FontH)" }, { 0x1E15, "GetControlDItem(@Dlog,dItem):CtrlH" }, - { 0x1F15, "GetIText(@Dlog,dItem,@Str)" }, { 0x2015, "SetIText(@Dlog,dItem,@Str)" }, { 0x2115, "SelectIText(@Dlog,dItem,start,end)" }, { 0x2215, "HideDItem(@Dlog,dItem)" }, - { 0x2315, "ShowDItem(@Dlog,dItem)" }, { 0x2415, "FindDItem(@Dlog,Point/4):Hit" }, { 0x2515, "UpdateDialog(@Dlog,UpdtRgnH)" }, { 0x2615, "GetDItemType(@Dlog,dItem):type" }, - { 0x2715, "SetDItemType(type,@Dlog,dItem)" }, { 0x2815, "GetDItemBox(@Dlog,dItem,@Rect)" }, { 0x2915, "SetDItemBox(@Dlog,dItem,@Rect)" }, - { 0x2A15, "GetFirstDItem(@Dlog):dItem" }, { 0x2B15, "GetNextDItem(@Dlog,dItem):dItem" }, { 0x2C15, "ModalDialog2(@FilterProc):HitInfo/4" },{ 0x2E15, "GetDItemValue(@Dlog,dItem):Val" }, - { 0x2F15, "SetDItemValue(val,@Dlog,dItem)" }, { 0x3215, "GetNewModalDialog(@DlogTmpl):@Dlog" }, { 0x3315, "GetNewDItem(@Dlog,@ItemTmpl)" },{ 0x3415, "GetAlertStage():Stage" }, - { 0x3515, "ResetAlertStage()" }, { 0x3615, "DefaultFilter(@Dlog,@EvRec,@Hit):Flag" }, { 0x3715, "GetDefButton(@Dlog):dItem" }, { 0x3815, "SetDefButton(BtnID,@Dlog)" }, - { 0x3915, "DisableDItem(@Dlog,dItem)" }, { 0x3A15, "EnableDItem(@Dlog,dItem)" }, { 0x0116, "ScrapBootInit()" }, { 0x0216, "ScrapStartUp()" }, { 0x0316, "ScrapShutDown()" }, - { 0x0416, "ScrapVersion():Vers" }, { 0x0516, "ScrapReset()" }, { 0x0616, "ScrapStatus():ActFlg" }, { 0x0916, "UnloadScrap()" }, { 0x0A16, "LoadScrap()" }, - { 0x0B16, "ZeroScrap()" }, { 0x0C16, "PutScrap(Count/4,Type,@Src)" }, { 0x0D16, "GetScrap(DestH,Type)" }, { 0x0E16, "GetScrapHandle(Type):ScrapH" }, - { 0x0F16, "GetScrapSize(Type):Size/4" },{ 0x1016, "GetScrapPath():@Pathname" }, { 0x1116, "SetScrapPath(@Pathname)" }, { 0x1216, "GetScrapCount():Count" }, - { 0x1316, "GetScrapState():State" }, { 0x1416, "GetIndScrap(Index,@buffer)" }, { 0x1516, "ShowClipboard(flags,@rect):@Wind" }, { 0x0117, "SFBootInit()" }, - { 0x0217, "SFStartUp(MemID,DirPg)" }, { 0x0317, "SFShutDown()" }, { 0x0417, "SFVersion():Vers" }, { 0x0517, "SFReset()" },{ 0x0617, "SFStatus():ActFlg" }, - { 0x0917, "SFGetFile(X,Y,@Prmpt,@FPrc,@tL,@Reply)" }, { 0x0A17, "SFPutFile(X,Y,@Prompt,@DfltName,mxL,@Reply)" },{ 0x0B17, "SFPGetFile(X,Y,@P,@FPrc,@tL,@dTmp,@dHk,@Rp)" }, - { 0x0C17, "SFPPutFile(X,Y,@P,@Df,mxL,@dTmpl,@dHk,@Rply)" }, { 0x0D17, "SFAllCaps(Flag)" },{ 0x0E17, "SFGetFile2(X,Y,prDesc,prRef/4,@fProc,@tList,@rep)" }, - { 0x0F17, "SFPutFile2(X,Y,prDesc,prRef/4,nmDesc,nmRef/4,@rep)" }, { 0x1017, "SFPGetFile2(X,Y,@draw,prD,prRf/4,@fP,@tL,@d,@hk,@rep)" }, { 0x1117, "SFPPutFile2(X,Y,@draw,prD,prRf/4,nmD,nmRf/4,@d,@hk,@rep)" }, - { 0x1217, "SFShowInvisible(InvisState):OldState" }, { 0x1317, "SFReScan(@filterProc,@typeList)" }, { 0x1417, "SFMultiGet2(X,Y,prDesc,prRef/4,@fP,@tL,@rep)" }, - { 0x1517, "SFPMultiGet2(X,Y,@draw,prD,prRf/4,@fP,@tL,@d,@hk,@rep)" }, { 0x0119, "NSBootInit()" }, { 0x0219, "NSStartUp(Rate,@UpdProc)" }, { 0x0319, "NSShutDown()" }, - { 0x0419, "NSVersion():Vers" }, { 0x0519, "NSReset()" }, { 0x0619, "NSStatus():ActFlg" }, { 0x0919, "AllocGen(Priority):Gen#" }, { 0x0A19, "DeallocGen(Gen#)" }, - { 0x0B19, "NoteOn(Gen#,Semitone,Vol,@Instr)" }, { 0x0C19, "NoteOff(Gen#,Semitone)" }, { 0x0D19, "AllNotesOff()" }, { 0x0E19, "NSSetUpdateRate(NewRate):OldRate" }, - { 0x0F19, "NSSetUserUpdateRtn(@New):@Old" }, { 0x011A, "SeqBootInit()" }, { 0x021A, "SeqStartUp(DirPg,Mode,Rate,Incr)" }, { 0x031A, "SeqShutDown()" }, - { 0x041A, "SeqVersion():Vers" }, { 0x051A, "SeqReset()" }, { 0x061A, "SeqStatus():ActFlg" }, { 0x091A, "SetIncr(Increment)" }, { 0x0A1A, "ClearIncr():OldIncr" }, - { 0x0B1A, "GetTimer():Tick" }, { 0x0C1A, "GetLoc():Phrase,Patt,Level" }, { 0x0D1A, "SeqAllNotesOff()" }, { 0x0E1A, "SetTrkInfo(Priority,InstIndex,TrkNum)" }, - { 0x0F1A, "StartSeq(@ErrRtn,@CompRtn,SeqH)" }, { 0x101A, "StepSeq()" }, { 0x111A, "StopSeq(NextFlag)" }, { 0x121A, "SetInstTable(TableH)" }, { 0x131A, "StartInts()" }, - { 0x141A, "StopInts()" }, { 0x151A, "StartSeqRel(@errHndlr,@CompRtn,SeqH)" }, { 0x011B, "FMBootInit()" }, { 0x021B, "FMStartUp(MemID,DirPg)" }, { 0x031B, "FMShutDown()" }, - { 0x041B, "FMVersion():Vers" }, { 0x051B, "FMReset()" }, { 0x061B, "FMStatus():ActFlg" }, { 0x091B, "CountFamilies(FamSpecs):Count" }, { 0x0A1B, "FindFamily(Specs,Pos,@Name):FamNum" }, - { 0x0B1B, "GetFamInfo(FamNum,@Name):FamStats" }, { 0x0C1B, "GetFamNum(@Name):FamNum" }, { 0x0D1B, "AddFamily(FamNum,@Name)" }, { 0x0E1B, "InstallFont(ID/4,Scale)" }, - { 0x0F1B, "SetPurgeStat(FontID/4,PrgStat)" }, { 0x101B, "CountFonts(ID/4,Specs):N" }, { 0x111B, "FindFontStats(ID/4,Specs,Pos,@FStatRec)" }, { 0x121B, "LoadFont(ID/4,Specs,Pos,@FStatRec)" }, - { 0x131B, "LoadSysFont()" }, { 0x141B, "AddFontVar(FontH,NewSpecs)" }, { 0x151B, "FixFontMenu(MenuID,StartID,FamSpecs)" }, { 0x161B, "ChooseFont(CurrID/4,Famspecs):NewID/4" }, - { 0x171B, "ItemID2FamNum(ItemID):FamNum" }, { 0x181B, "FMSetSysFont(FontID/4)" }, { 0x191B, "FMGetSysFID():SysID/4" }, { 0x1A1B, "FMGetCurFID():CurID/4" }, - { 0x1B1B, "FamNum2ItemID(FamNum):ItemID" }, { 0x1C1B, "InstallWithStats(ID/4,Scale,@ResultRec)" }, { 0x011C, "ListBootInit()" }, { 0x021C, "ListStartUp()" }, { 0x031C, "ListShutDown()" }, - { 0x041C, "ListVersion():Vers" }, { 0x051C, "ListReset()" }, { 0x061C, "ListStatus():ActFlg" }, { 0x091C, "CreateList(@Wind,@ListRec):CtrlH" }, { 0x0A1C, "SortList(@CompareProc,@ListRec)" }, - { 0x0B1C, "NextMember(@Member,@ListRec):@NxtMemVal" }, { 0x0C1C, "DrawMember(@Member,@ListRec)" }, { 0x0D1C, "SelectMember(@Member,@ListRec)" }, { 0x0E1C, "GetListDefProc():@Proc" }, - { 0x0F1C, "ResetMember(@ListRec):NxtMemVal/4" }, { 0x101C, "NewList(@Member,@ListRec)" }, { 0x111C, "DrawMember2(itemNum,CtrlH)" }, { 0x121C, "NextMember2(itemNum,CtrlH):itemNum" }, - { 0x131C, "ResetMember2(CtrlH):itemNum" }, { 0x141C, "SelectMember2(itemNum,CtrlH)" }, { 0x151C, "SortList2(@CompareProc,CtrlH)" }, { 0x161C, "NewList2(@draw,start,ref/4,refKind,size,CtrlH)" }, - { 0x171C, "ListKey(flags,@EventRec,CtrlH)" }, { 0x181C, "CompareStrings(flags,@String1,@String2):Order" }, { 0x011D, "ACEBootInit()" }, { 0x021D, "ACEStartUp(DirPg)" }, - { 0x031D, "ACEShutDown()" }, { 0x041D, "ACEVersion():Vers" }, { 0x051D, "ACEReset()" }, { 0x061D, "ACEStatus():ActFlg" }, { 0x071D, "ACEInfo(Code):Value/4" }, - { 0x091D, "ACECompress(SrcH,SrcOff/4,DestH,DestOff/4,Blks,Method)" }, { 0x0A1D, "ACEExpand(SrcH,SrcOff/4,DestH,DestOff/4,Blks,Method)" }, { 0x0B1D, "ACECompBegin()" }, - { 0x0C1D, "ACEExpBegin()" }, { 0x0D1D, "GetACEExpState(@Buffer)" }, { 0x0E1D, "SetACEExpState(@Buffer)" }, { 0x011E, "ResourceBootInit()" }, { 0x021E, "ResourceStartUp(MemID)" }, - { 0x031E, "ResourceShutDown()" }, { 0x041E, "ResourceVersion():Vers" }, { 0x051E, "ResourceReset()" }, { 0x061E, "ResourceStatus():ActFlag" }, { 0x091E, "CreateResourceFile(aux/4,fType,Access,@n)" }, - { 0x0A1E, "OpenResourceFile(reqAcc,@mapAddr,@n):fileID" }, { 0x0B1E, "CloseResourceFile(fileID)" }, { 0x0C1E, "AddResource(H,Attr,rType,rID/4)" }, { 0x0D1E, "UpdateResourcefile(fileID)" }, - { 0x0E1E, "LoadResource(rType,rID/4):H" }, { 0x0F1E, "RemoveResource(rType,rID/4)" }, { 0x101E, "MarkResourceChange(changeFlag,rType,rID/4)" }, { 0x111E, "SetCurResourceFile(fileID)" }, - { 0x121E, "GetCurResourceFile():fileID" }, { 0x131E, "SetCurResourceApp(MemID)" }, { 0x141E, "GetCurResourceApp():MemID" }, { 0x151E, "HomeResourceFile(rType,rID/4):fileID" }, - { 0x161E, "WriteResource(rType,rID/4)" }, { 0x171E, "ReleaseResource(PurgeLevel,rType,rID/4)" }, { 0x181E, "DetachResource(rType,rID/4)" }, { 0x191E, "UniqueResourceID(IDrange,rType):rID/4" }, - { 0x1A1E, "SetResourceID(newID/4,rType,oldID/4)" }, { 0x1B1E, "GetResourceAttr(rType,rID/4):Attr" }, { 0x1C1E, "SetResourceAttr(rAttr,rType,rID/4)" }, { 0x1D1E, "GetResourceSize(rType,rID/4):Size/4" }, - { 0x1E1E, "MatchResourceHandle(@buffer,H)" }, { 0x1F1E, "GetOpenFileRefNum(fileID):RefNum" }, { 0x201E, "CountTypes():Num" }, { 0x211E, "GetIndType(tIndex):rType" }, - { 0x221E, "CountResources(rType):Num/4" }, { 0x231E, "GetIndResource(rType,rIndex/4):rID/4" }, { 0x241E, "SetResourceLoad(Flag):oldFlag" }, { 0x251E, "SetResourceFileDepth(Depth):oldDepth" }, - { 0x261E, "GetMapHandle(fileID):MapH" }, { 0x271E, "LoadAbsResource(@loc,MaxSize/4,rType,rID/4):Size/4" }, { 0x281E, "ResourceConverter(@proc,rType,logFlags)" }, - { 0x291E, "LoadResource2(flag,@AttrBuff,rType,rID/4):H" }, { 0x2A1E, "RMFindNamedResource(rType,@name,@fileID):rID/4" },{ 0x2B1E, "RMGetResourceName(rType,rID/4,@nameBuffer)" }, - { 0x2C1E, "RMLoadNamedResource(rType,@name):H" }, { 0x2D1E, "RMSetResourceName(rType,rID/4,@name)" }, { 0x2E1E, "OpenResourceFileByID(reqAcc,userID):oldResApp" }, - { 0x2F1E, "CompactResourceFile(flags,fileID)" }, { 0x0120, "MidiBootInit()" }, { 0x0220, "MidiStartUp(MemID,DirPg)" }, { 0x0320, "MidiShutDown()" }, - { 0x0420, "MidiVersion():Vers" }, { 0x0520, "MidiReset()" }, { 0x0620, "MidiStatus():ActFlg" }, { 0x0920, "MidiControl(Function,Argument/4)" }, { 0x0A20, "MidiDevice(Function,@DriverInfo)" }, - { 0x0B20, "MidiClock(Function,Argument/4)" }, { 0x0C20, "MidiInfo(Function):Info/4" }, { 0x0D20, "MidiReadPacket(@buff,size):Count" }, { 0x0E20, "MidiWritePacket(@buff):Count" }, - { 0x0121, "VDBootInit()" }, { 0x0221, "VDStartUp()" }, { 0x0321, "VDShutDown()" }, { 0x0421, "VDVersion():Vers" }, { 0x0521, "VDReset()" }, { 0x0621, "VDStatus():ActFlg" }, - { 0x0921, "VDInStatus(Selector):Status" }, { 0x0A21, "VDInSetStd(InStandard)" }, { 0x0B21, "VDInGetStd():InStandard" }, { 0x0C21, "VDInConvAdj(Selector,AdjFunction)" }, - { 0x0D21, "VDKeyControl(Selector,KeyerCtrlVal)" }, { 0x0E21, "VDKeyStatus(Selector):KeyerStatus" }, { 0x0F21, "VDKeySetKCol(Red,Green,Blue)" }, { 0x1021, "VDKeyGetKRCol():RedValue" }, - { 0x1121, "VDKeyGetKGCol():GreenValue" }, { 0x1221, "VDKeyGetKBCol():BlueValue" }, { 0x1321, "VDKeySetKDiss(KDissolve)" }, { 0x1421, "VDKeyGetKDiss():KDissolve" }, - { 0x1521, "VDKeySetNKDiss(NKDissolve)" }, { 0x1621, "VDKeyGetNKDiss():NKDissolve" }, { 0x1721, "VDOutSetStd(OutStandard)" }, { 0x1821, "VDOutGetStd():OutStandard" }, - { 0x1921, "VDOutControl(Selector,Value)" }, { 0x1A21, "VDOutStatus(Selector):OutStatus" }, { 0x1B21, "VDGetFeatures(Feature):Info" }, { 0x1C21, "VDInControl(Selector,Value)" }, - { 0x1D21, "VDGGControl(Selector,Value)" }, { 0x1E21, "VDGGStatus(Selector):Value" }, { 0x0122, "TEBootInit()" }, { 0x0222, "TEStartUp(MemID,DirPg)" }, - { 0x0322, "TEShutDown()" }, { 0x0422, "TEVersion():Vers" }, { 0x0522, "TEReset()" }, { 0x0622, "TEStatus():ActFlg" }, { 0x0922, "TENew(@parms):teH" }, - { 0x0A22, "TEKill(teH)" }, { 0x0B22, "TESetText(tDesc,tRef/4,Len/4,stDesc,stRef/4,teH)" }, { 0x0C22, "TEGetText(bDesc,bRef/4,bLen/4,stDesc,stRef/4,teH):L/4" }, - { 0x0D22, "TEGetTextInfo(@infoRec,parmCount,teH)" }, { 0x0E22, "TEIdle(teH)" }, { 0x0F22, "TEActivate(teH)" }, { 0x1022, "TEDeactivate(teH)" }, { 0x1122, "TEClick(@eventRec,teH)" }, - { 0x1222, "TEUpdate(teH)" }, { 0x1322, "TEPaintText(@Port,startLn/4,@R,Flags,teH):NextLn/4" }, { 0x1422, "TEKey(@eventRec,teH)" }, { 0x1522, "[not supported]" }, - { 0x1622, "TECut(teH)" }, { 0x1722, "TECopy(teH)" }, { 0x1822, "TEPaste(teH)" }, { 0x1922, "TEClear(teH)" }, { 0x1A22, "TEInsert(tDesc,tRef/4,tLen/4,stDesc,stRef/4,teH)" },{ 0x1B22, "TEReplace(tDesc,tRef/4,tLen/4,stDesc,stRef/4,teH)" }, - { 0x1C22, "TEGetSelection(@selStart,@selEnd,teH)" }, { 0x1D22, "TESetSelection(selStart/4,selEnd/4,teH)" }, { 0x1E22, "TEGetSelectionStyle(@stRec,stH,teH):comFlag" }, { 0x1F22, "TEStyleChange(flags,@stRec,teH)" }, - { 0x2022, "TEOffsetToPoint(offset/4,@vertPos,@horPos,teH)" }, { 0x2122, "TEPointToOffset(vertPos/4,horPos/4,teH):textOffset/4" }, { 0x2222, "TEGetDefProc():@defProc" }, - { 0x2322, "TEGetRuler(rulerDesc,rulerRef/4,teH)" }, { 0x2422, "TESetRuler(rulerDesc,rulerRef/4,teH)" }, { 0x2522, "TEScroll(scrDesc,vertAmt/4,horAmt/4,teH):Offset/4" }, - { 0x2622, "TEGetInternalProc():@proc" }, { 0x2722, "TEGetLastError(clearFlag,teH):lastError" }, { 0x2822, "TECompactRecord(teH)" }, { 0x0123, "MSBootInit()" }, - { 0x0223, "MSStartUp()" }, { 0x0323, "MSShutDown()" }, { 0x0423, "MSVersion():Vers" }, { 0x0523, "MSReset()" }, { 0x0623, "MSStatus():ActFlg" },{ 0x0923, "SetBasicChannel(Channel)" }, - { 0x0A23, "SetMIDIMode(Mode)" }, { 0x0B23, "PlayNote(Channel,NoteNum,KeyVel)" }, { 0x0C23, "StopNote(Channel,NoteNum)" }, { 0x0D23, "KillAllNotes()" }, - { 0x0E23, "SetRecTrack(TrackNum)" }, { 0x0F23, "SetPlayTrack(TrackNum,State)" }, { 0x1023, "TrackToChannel(TrackNum,ChannelNum)" }, { 0x1123, "Locate(TimeStamp/4,@SeqBuff):@SeqItem" }, - { 0x1223, "SetVelComp(VelocityOffset)" }, { 0x1323, "SetMIDIPort(EnabInput,EnabOutput)" }, { 0x1423, "SetInstrument(@InstRec,InstNum)" }, { 0x1523, "SeqPlayer(@SeqPlayerRec)" }, - { 0x1623, "SetTempo(Tempo)" }, { 0x1723, "SetCallBack(@CallBackRec)" }, { 0x1823, "SysExOut(@Msg,Delay,@MonRoutine)" }, { 0x1923, "SetBeat(BeatDuration)" }, - { 0x1A23, "MIDIMessage(Dest,nBytes,Message,Byte1,Byte2)" }, { 0x1B23, "LocateEnd(@seqBuffer):@End" }, { 0x1C23, "Merge(@Buffer1,@Buffer2)" }, { 0x1D23, "DeleteTrack(TrackNum,@Seq)" }, - { 0x1E23, "SetMetro(Volume,Freq,@Wave)" }, { 0x1F23, "GetMSData():Reserved/4,@DirPage" }, { 0x2023, "ConvertToTime(TkPerBt,BtPerMsr,BeatNum,MsrNum):Ticks/4" }, { 0x2123, "ConvertToMeasure(TkPerBt,BtPerMsr,Ticks/4):Ticks,Beat,Msr" }, - { 0x2223, "MSSuspend()" }, { 0x2323, "MSResume()" }, { 0x2423, "SetTuningTable(@Table)" }, { 0x2523, "GetTuningTable(@Buffer)" }, { 0x2623, "SetTrackOut(TrackNum,PathVal)" }, - { 0x2723, "InitMIDIDriver(Slot,Internal,UserID,@Driver)" }, { 0x2823, "RemoveMIDIDriver()" }, { 0x0125, "AnimBootInit()" }, { 0x0225, "AnimStartUp(MemID,DPage,ModeFlag,@PatchTbl)" }, - { 0x0325, "AnimShutDown()" }, { 0x0425, "AnimVersion():Vers" }, { 0x0525, "AnimReset()" }, { 0x0625, "AnimStatus():Status" }, - { 0x0725, "CleanExit() "}, { 0x0825, "AnimIdleDebug()" }, { 0x0925, "StartScene(Mode, @Rect)" }, { 0x0A25, "StopScene()" }, { 0x0B25, "StartFrameTimer(Interval)" }, - { 0x0C25, "StopFrameTimer()" }, { 0x0D25, "SetBackGndPort()" }, { 0x0E25, "RefreshBackCall()" }, { 0x0F25, "StartCharCall(PassX, PassY, PassMaxP/PassFlag, PassMinP/PassDir, LPassChar)" }, - { 0x1025, "MoveCharCall(PassIter, PassDY/PassIter, PassDX/PassFlag, LPassChar)" }, { 0x1125, "GetCharRecPtr(CharNum):CharRecPtr" }, - { 0x1225, "KillCharCall(CharNum)" }, { 0x1325, "LoadActor(@ActorPtr, CharNum)" }, { 0x1425, "SetCharScript(@theScript, CharNum)" }, { 0x1525, "RunAnimScripts()" }, - { 0x1625, "FillAddressTbl(@TablePtr)" }, { 0x1725, "CreateReblitCode(@RectPtr, GenFlags)" }, { 0x1825, "StartTockTask(thePtr, theData, theID, theCount)" }, { 0x1925, "FireTockTask()" }, - { 0x0126, "MCBootInit()" }, { 0x0226, "MCStartUp(MemID)" }, { 0x0326, "MCShutDown()" }, { 0x0426, "MCVersion():Vers" }, { 0x0526, "MCReset()" }, { 0x0626, "MCStatus():ActFlg" }, - { 0x0926, "MCGetErrorMsg(mcErrorNo,@PStringBuff)" }, { 0x0A26, "MCLoadDriver(mcChannelNo)" }, { 0x0B26, "MCUnLoadDriver(mcChannelNo)" }, { 0x0C26, "MCTimeToBin(mcTimeValue/4):result/4" }, - { 0x0D26, "MCBinToTime(mcBinVal/4):result/4" }, { 0x0E26, "MCGetTrackTitle(mcDiskID/4,mcTrackNo,@PStringBuff)" }, - { 0x0F26, "MCSetTrackTitle(mcDiskID/4,TrackNum,@title)" }, { 0x1026, "MCGetProgram(mcDiskID/4,@resultBuff)" }, { 0x1126, "MCSetProgram(mcDiskID/4,@mcProg)" }, - { 0x1226, "MCGetDiscTitle(mcDiskID/4,@PStringBuff)" }, { 0x1326, "MCSetDiscTitle(mcDiskID/4,@title)" }, { 0x1426, "MCDStartUp(mcChannelNo,@portName,userID)" }, - { 0x1526, "MCDShutDown(mcChannelNo)" }, { 0x1626, "MCGetFeatures(mcChannelNo,mcFeatSel):result/4" }, { 0x1726, "MCPlay(mcChannelNo)" }, { 0x1826, "MCPause(mcChannelNo)" }, - { 0x1926, "MCSendRawData(mcChannelNo,@mcNative)" }, { 0x1A26, "MCGetStatus(mcChannelNo,mcStatusSel):result" }, { 0x1B26, "MCControl(mcChannelNo,ctlCommand)" }, - { 0x1C26, "MCScan(mcChannelNo,mcDirection)" }, { 0x1D26, "MCGetSpeeds(mcChannelNo,@PStringBuff)" }, { 0x1E26, "MCSpeed(mcChannelNo,mcFPS)" }, - { 0x1F26, "MCStopAt(mcChannelNo,mcUnitType,mcStopLoc/4)" }, { 0x2026, "MCJog(mcChannelNo,mcUnitType,mcNJog/4,mcJogRepeat)" }, { 0x2126, "MCSearchTo(mcChannelNo,mcUnitType,searchLoc/4)" }, - { 0x2226, "MCSearchDone(mcChannelNo):result" }, { 0x2326, "MCSearchWait(mcChannelNo)" }, { 0x2426, "MCGetPosition(mcChannelNo,mcUnitType):result/4" },{ 0x2526, "MCSetAudio(mcChannelNo,mcAudioCtl)" }, - { 0x2626, "MCGetTimes(mcChannelNo,mctimesSel):result/4" }, { 0x2726, "MCGetDiscTOC(mcChannelNo,mcTrackNo):result/4" }, { 0x2826, "MCGetDiscID(mcChannelNo):result/4" }, - { 0x2926, "MCGetNoTracks(mcChannelNo):result" }, { 0x2A26, "MCRecord(mcChannelNo)" }, { 0x2B26, "MCStop(mcChannelNo)" }, { 0x2C26, "MCWaitRawData(mcChannelNo,@result,tickWait,termMask)" }, - { 0x2D26, "MCGetName(mcChannelNo,@PStringBuff)" }, { 0x2E26, "MCSetVolume(mcChannelNo,mcLeftVol,mcRightVol)" }, { 0x0136, "TCPIPBootInit()" }, { 0x0236, "TCPIPStartUp()" }, - { 0x0336, "TCPIPShutDown()" }, { 0x0436, "TCPIPVersion():Vers" }, { 0x0536, "TCPIPReset()" }, { 0x0636, "TCPIPStatus():ActFlg" }, { 0x0836, "TCPIPLongVersion():rVersion/4" }, - { 0x0936, "TCPIPGetConnectStatus():connectedFlag" }, { 0x0A36, "TCPIPGetErrorTable():@errTablePtr" },{ 0x0B36, "TCPIPGetReconnectStatus():reconnectFlag" },{ 0x0C36, "TCPIPReconnect(@displayPtr)" }, - { 0x0D36, "TCPIPConvertIPToHex(@cvtRecPtr,@ddippstring)" }, { 0x0E36, "TCPIPConvertIPToASCII(ipaddress/4,@ddpstring,flags):strlen" }, { 0x0F36, "TCPIPGetMyIPAddress():ipaddress/4" }, - { 0x1036, "TCPIPGetConnectMethod():method" }, { 0x1136, "TCPIPSetConnectMethod(method)" }, { 0x1236, "TCPIPConnect(@displayPtr)" }, { 0x1336, "TCPIPDisconnect(forceflag,@displayPtr)" }, - { 0x1436, "TCPIPGetMTU():mtu" }, { 0x1536, "TCPIPValidateIPCString(@cstringPtr):validFlag" }, { 0x1636, "TCPIPGetConnectData(userid,method):H" }, { 0x1736, "TCPIPSetConnectData(method,H)" }, - { 0x1836, "TCPIPGetDisconnectData(userid,method):H" }, { 0x1936, "TCPIPSetDisconnectData(method,H)" }, { 0x1A36, "TCPIPLoadPreferences()" }, { 0x1B36, "TCPIPSavePreferences()" }, - { 0x1C36, "TCPIPGetDNS(@DNSRecPtr)" }, { 0x1D36, "TCPIPSetDNS(@DNSRecPtr)" }, { 0x1E36, "TCPIPGetTuningTable(@tunePtr)" }, { 0x1F36, "TCPIPSetTuningTable(@tunePtr)" }, - { 0x2036, "TCPIPCancelDNR(@dnrBufferPtr)" }, { 0x2136, "TCPIPDNRNameToIP(@nameptr,@dnrBufferPtr)" }, { 0x2236, "TCPIPPoll()" }, { 0x2336, "TCPIPLogin(userid,destip/4,destport,defaultTOS,defaultTTL):ipid" }, - { 0x2436, "TCPIPLogout(ipid)" }, { 0x2536, "TCPIPSendICMP(ipid,@messagePtr,messageLen)" }, { 0x2636, "TCPIPSendUDP(ipid,@udpPtr,udpLen)" }, { 0x2736, "TCPIPGetDatagramCount(ipid,protocol):dgmCount" }, - { 0x2836, "TCPIPGetNextDatagram(ipid,protocol,flags):H" }, { 0x2936, "TCPIPGetLoginCount():loginCount" }, { 0x2A36, "TCPIPSendICMPEcho(ipid,seqNum)" }, - { 0x2B36, "TCPIPReceiveICMPEcho(ipid):seqNum" }, { 0x2C36, "TCPIPOpenTCP(ipid):tcpError" }, { 0x2D36, "TCPIPWriteTCP(ipid,@dataPtr,dataLength/4,pushFlag,urgentFlag):tcpError" }, - { 0x2E36, "TCPIPReadTCP(ipid,buffType,buffData/4,buffLen/4,@rrBuffPtr):tcpError" }, { 0x2F36, "TCPIPCloseTCP(ipid):tcpError" }, { 0x3036, "TCPIPAbortTCP(ipid):tcpError" }, - { 0x3136, "TCPIPStatusTCP(ipid,@srBuffPtr):tcpError" }, { 0x3236, "TCPIPGetSourcePort(ipid):sourcePort" }, { 0x3336, "TCPIPGetTOS(ipid):TOS" }, { 0x3436, "TCPIPSetTOS(ipid,TOS)" }, - { 0x3536, "TCPIPGetTTL(ipid):TTL" }, { 0x3636, "TCPIPSetTTL(ipid,TTL)" }, { 0x3736, "TCPIPSetSourcePort(ipid,sourcePort)" }, { 0x3836, "TCPIPSetMyIPAddress(ipaddress/4)" }, - { 0x3936, "TCPIPGetDP():dp" }, { 0x3A36, "TCPIPGetDebugHex():debugFlag" }, { 0x3B36, "TCPIPDebugHex(debugFlag)" }, { 0x3C36, "TCPIPGetDebugTCP():debugFlag" }, - { 0x3D36, "TCPIPDebugTCP(debugFlag)" }, { 0x3E36, "TCPIPGetUserRecord(ipid):userRecEntry/4" }, { 0x3F36, "TCPIPConvertIPCToHex(@cvtRecPtr,@ddipcstring)" }, - { 0x4036, "TCPIPSendIPDatagram(@datagramPtr)" }, { 0x4136, "TCPIPConvertIPToClass(ipaddress/4):class" }, { 0x4236, "TCPIPGetConnectMsgFlag():conMsgFlag" }, - { 0x4336, "TCPIPSetConnectMsgFlag(conMsgFlag)" }, { 0x4436, "TCPIPGetUsername(@unBuffPtr)" }, { 0x4536, "TCPIPSetUsername(@usernamePtr)" }, { 0x4636, "TCPIPGetPassword(@pwBuffPtr)" }, - { 0x4736, "TCPIPSetPassword(@passwordPtr)" }, { 0x4836, "TCPIPValidateIPString(@pstringPtr):validFlag" }, { 0x4936, "TCPIPGetUserStatistic(ipid,statisticNum):statistic/4" },{ 0x4A36, "TCPIPGetLinkVariables():@variablesPtr" }, - { 0x4B36, "TCPIPEditLinkConfig(connectHandle/4,disconnectHandle/4)" }, { 0x4C36, "TCPIPGetModuleNames():@moduleListPtr" }, { 0x4D36, "TCPIPRebuildModuleList()" }, - { 0x4E36, "TCPIPListenTCP(ipid):tcpError" }, { 0x4F36, "TCPIPAcceptTCP(ipid,reserved):newipid" }, { 0x5036, "TCPIPSetNewDestination(ipid,destip/4,destport)" },{ 0x5136, "TCPIPGetHostName(@hnBuffPtr)" }, - { 0x5236, "TCPIPSetHostName(@hostNamePtr)" }, { 0x5336, "TCPIPStatusUDP(ipid,@udpVarsPtr)" }, { 0x5436, "TCPIPGetLinkLayer(@linkInfoBlkPtr)" }, { 0x5536, "TCPIPPtrToPtr(@from,@to,len/4)" }, - { 0x5636, "TCPIPPtrToPtrNeg(@fromend,@toend,len/4)" },{ 0x5736, "TCPIPGetAuthMessage(userid):authMsgHandle/4" }, - { 0x5836, "TCPIPConvertIPToCASCII(ipaddress/4,@ddcstring,flags):strlen" },{ 0x5936, "TCPIPMangleDomainName(flags,@dnPstringPtr):port" }, - { 0x5A36, "TCPIPGetAliveFlag():aliveFlag" },{ 0x5B36, "TCPIPSetAliveFlag(aliveFlag)" },{ 0x5C36, "TCPIPGetAliveMinutes():aliveMinutes" }, - { 0x5D36, "TCPIPSetAliveMinutes(aliveMinutes)" },{ 0x5E36, "TCPIPReadLineTCP(ipid,@delimitStrPtr,buffType,buffData/4,buffLen/4,@rrBuffPtr):tcpError" }, - { 0x5F36, "TCPIPGetBootConnectFlag():bootConnectFlag" }, { 0x6036, "TCPIPSetBootConnectFlag(bootConnectFlag)" }, { 0x6136, "TCPIPSetUDPDispatch(ipid,dispatchFlag)" }, - { 0x6236, "TCPIPGetDestination(ipid,@destRecPtr)" }, { 0x6336, "TCPIPGetUserEventTrigger(triggerNumber,ipid):triggerProcPtr/4" }, { 0x6436, "TCPIPSetUserEventTrigger(triggerNumber,ipid,@triggerProcPtr)" }, - { 0x6536, "TCPIPGetSysEventTrigger(triggerNumber):triggerProcPtr/4" }, { 0x6636, "TCPIPSetSysEventTrigger(triggerNumber,@triggerProcPtr)" }, { 0x6736, "TCPIPGetDNRTimeouts(@dnrTimeoutsBuffPtr)" }, - { 0x6836, "TCPIPSetDNRTimeouts(@dnrTimeoutsBuffPtr)" }, - - { 0xffff, "" } -}; - -static const struct dasm_data gsos_calls[] = -{ - { 0x0001, "CREATE" }, { 0x0002, "DESTROY" }, { 0x0004, "CHANGE_PATH" }, { 0x0005, "SET_FILE_INFO" }, - { 0x0006, "GET_FILE_INFO" }, { 0x0008, "VOLUME" }, { 0x0009, "SET_PREFIX" }, { 0x000A, "GET_PREFIX" }, - { 0x000B, "CLEAR_BACKUP_BIT" }, { 0x0010, "OPEN" }, { 0x0011, "NEWLINE" }, { 0x0012, "READ" }, - { 0x0013, "WRITE" }, { 0x0014, "CLOSE" }, { 0x0015, "FLUSH" }, { 0x0016, "SET_MARK" }, - { 0x0017, "GET_MARK" }, { 0x0018, "SET_EOF" }, { 0x0019, "GET_EOF" }, { 0x001A, "SET_LEVEL" }, - { 0x001B, "GET_LEVEL" }, { 0x001C, "GET_DIR_ENTRY" }, { 0x0020, "GET_DEV_NUM" }, { 0x0021, "GET_LAST_DEV" }, - { 0x0022, "READ_BLOCK" }, { 0x0023, "WRITE_BLOCK" }, { 0x0024, "FORMAT" }, { 0x0025, "ERASE_DISK" }, - { 0x0027, "GET_NAME" }, { 0x0028, "GET_BOOT_VOL" }, { 0x0029, "QUIT" }, { 0x002A, "GET_VERSION" }, - { 0x002C, "D_INFO" }, { 0x0031, "ALLOC_INTERRUPT" }, { 0x0032, "DEALLOC_INTERRUPT" }, { 0x2001, "CreateGS" }, - { 0x2002, "DestroyGS" }, { 0x2003, "OSShutdownGS" }, { 0x2004, "ChangePathGS" }, { 0x2005, "SetFileInfoGS" }, - { 0x2006, "GetFileInfoGS" }, { 0x2007, "JudgeNameGS" }, { 0x2008, "VolumeGS" }, { 0x2009, "SetPrefixGS" }, - { 0x200A, "GetPrefixGS" }, { 0x200B, "ClearBackupGS" }, { 0x200C, "SetSysPrefsGS" }, { 0x200D, "NullGS" }, - { 0x200E, "ExpandPathGS" }, { 0x200F, "GetSysPrefsGS" }, { 0x2010, "OpenGS" }, { 0x2011, "NewLineGS" }, - { 0x2012, "ReadGS" }, { 0x2013, "WriteGS" }, { 0x2014, "CloseGS" }, { 0x2015, "FlushGS" }, - { 0x2016, "SetMarkGS" }, { 0x2017, "GetMarkGS" }, { 0x2018, "SetEOFGS" }, { 0x2019, "GetEOFGS" }, - { 0x201A, "SetLevelGS" }, { 0x201B, "GetLevelGS" }, { 0x201C, "GetDirEntryGS" }, { 0x201D, "BeginSessionGS" }, - { 0x201E, "EndSessionGS" }, { 0x201F, "SessionStatusGS" }, { 0x2020, "GetDevNumberGS" }, { 0x2024, "FormatGS" }, - { 0x2025, "EraseDiskGS" }, { 0x2026, "ResetCacheGS" }, { 0x2027, "GetNameGS" }, { 0x2028, "GetBootvolGS" }, - { 0x2029, "QuitGS" }, { 0x202A, "GetVersionGS" }, { 0x202B, "GetFSTInfoGS" }, { 0x202C, "DInfoGS" }, - { 0x202D, "DStatusGS" }, { 0x202E, "DControlGS" }, { 0x202F, "DReadGS" }, { 0x2030, "DWriteGS" }, - { 0x2031, "BindIntGS" }, { 0x2032, "UnbindIntGS" }, { 0x2033, "FSTSpecificGS" }, { 0x2034, "AddNotifyProcGS" }, - { 0x2035, "DelNotifyProcGS" }, { 0x2036, "DRenameGS" }, { 0x2037, "GetStdRefNumGS" }, { 0x2038, "GetRefNumGS" }, - { 0x2039, "GetRefInfoGS" }, { 0x203A, "SetStdRefNumGS" }, - - { 0xffff, "" } -}; - -static const struct dasm_data32 gs_vectors[] = -{ - { 0xE10000, "System Tool dispatcher" }, { 0xE10004, "System Tool dispatcher, glue entry" }, { 0xE10008, "User Tool dispatcher" }, { 0xE1000C, "User Tool dispatcher, glue entry" }, - { 0xE10010, "Interrupt mgr" }, { 0xE10014, "COP mgr" }, { 0xE10018, "Abort mgr" }, { 0xE1001C, "System Death mgr" }, { 0xE10020, "AppleTalk interrupt" }, - { 0xE10024, "Serial interrupt" }, { 0xE10028, "Scanline interrupt" }, { 0xE1002C, "Sound interrupt" }, { 0xE10030, "VertBlank interrupt" }, { 0xE10034, "Mouse interrupt" }, - { 0xE10038, "1/4 sec interrupt" }, { 0xE1003C, "Keyboard interrupt" }, { 0xE10040, "ADB Response byte int" }, { 0xE10044, "ADB SRQ int" }, { 0xE10048, "Desk Acc mgr" }, - { 0xE1004C, "FlushBuffer handler" }, { 0xE10050, "KbdMicro interrupt" }, { 0xE10054, "1 sec interrupt" }, { 0xE10058, "External VGC int" }, { 0xE1005C, "other interrupt" }, - { 0xE10060, "Cursor update" }, { 0xE10064, "IncBusy" }, { 0xE10068, "DecBusy" }, { 0xE1006C, "Bell vector" }, { 0xE10070, "Break vector" }, { 0xE10074, "Trace vector" }, - { 0xE10078, "Step vector" }, { 0xE1007C, "[install ROMdisk]" }, { 0xE10080, "ToWriteBram" }, { 0xE10084, "ToReadBram" }, { 0xE10088, "ToWriteTime" }, - { 0xE1008C, "ToReadTime" }, { 0xE10090, "ToCtrlPanel" }, { 0xE10094, "ToBramSetup" }, { 0xE10098, "ToPrintMsg8" }, { 0xE1009C, "ToPrintMsg16" }, { 0xE100A0, "Native Ctrl-Y" }, - { 0xE100A4, "ToAltDispCDA" }, { 0xE100A8, "ProDOS 16 [inline parms]" }, { 0xE100AC, "OS vector" }, { 0xE100B0, "GS/OS(@parms,call) [stack parms]" }, - { 0xE100B4, "OS_P8_Switch" }, { 0xE100B8, "OS_Public_Flags" }, { 0xE100BC, "OS_KIND (byte: 0=P8,1=P16)" }, { 0xE100BD, "OS_BOOT (byte)" }, { 0xE100BE, "OS_BUSY (bit 15=busy)" }, - { 0xE100C0, "MsgPtr" }, { 0xe10135, "CURSOR" }, { 0xe10136, "NXTCUR" }, - { 0xE10180, "ToBusyStrip" }, { 0xE10184, "ToStrip" }, { 0xe10198, "MDISPATCH" }, { 0xe1019c, "MAINSIDEPATCH" }, - { 0xE101B2, "MidiInputPoll" }, { 0xE10200, "Memory Mover" }, { 0xE10204, "Set System Speed" }, - { 0xE10208, "Slot Arbiter" }, { 0xE10220, "HyperCard IIgs callback" }, { 0xE10224, "WordForRTL" }, { 0xE11004, "ATLK: BASIC" }, { 0xE11008, "ATLK: Pascal" }, - { 0xE1100C, "ATLK: RamGoComp" }, { 0xE11010, "ATLK: SoftReset" }, { 0xE11014, "ATLK: RamDispatch" }, { 0xE11018, "ATLK: RamForbid" }, { 0xE1101C, "ATLK: RamPermit" }, - { 0xE11020, "ATLK: ProEntry" }, { 0xE11022, "ATLK: ProDOS" }, { 0xE11026, "ATLK: SerStatus" }, { 0xE1102A, "ATLK: SerWrite" }, { 0xE1102E, "ATLK: SerRead" }, - { 0xE1103A, "ATLK: InitFileHook" }, { 0xE1103E, "ATLK: PFI Vector" }, { 0xE1D600, "ATLK: CmdTable" }, { 0xE1DA00, "ATLK: TickCount" }, - { 0xE01D00, "BRegSave" }, { 0xE01D02, "IntStatus" }, { 0xE01D03, "SVStateReg" }, { 0xE01D04, "80ColSave" }, { 0xE01D05, "LoXClampSave" }, - { 0xE01D07, "LoYClampSave" }, { 0xE01D09, "HiXClampSave" }, { 0xE01D0B, "HiYClampSave" }, { 0xE01D0D, "OutGlobals" }, { 0xE01D14, "Want40" }, - { 0xE01D16, "CursorSave" }, { 0xE01D18, "NEWVIDSave" }, { 0xE01D1A, "TXTSave" }, { 0xE01D1B, "MIXSave" }, { 0xE01D1C, "PAGE2Save" }, - { 0xE01D1D, "HIRESSave" }, { 0xE01D1E, "ALTCHARSave" }, { 0xE01D1F, "VID80Save" }, { 0xE01D20, "Int1AY" }, { 0xE01D2D, "Int1BY" }, - { 0xE01D39, "Int2AY" }, { 0xE01D4C, "Int2BY" }, { 0xE01D61, "MOUSVBLSave" }, { 0xE01D63, "DirPgSave" }, { 0xE01D65, "C3ROMSave" }, - { 0xE01D66, "Save4080" }, { 0xE01D67, "NumInts" }, { 0xE01D68, "MMode" }, { 0xE01D6A, "MyMSLOT" }, { 0xE01D6C, "Slot" }, - { 0xE01D6E, "EntryCount" }, { 0xE01D70, "BottomLine" }, { 0xE01D72, "HPos" }, { 0xE01D74, "VPos" }, { 0xE01D76, "CurScreenLoc" }, - { 0xE01D7C, "NumDAs" }, { 0xE01D7E, "LeftBorder" }, { 0xE01D80, "FirstMenuItem" }, { 0xE01D82, "IDNum" }, { 0xE01D84, "CDATabHndl" }, - { 0xE01D88, "RoomLeft" }, { 0xE01D8A, "KeyInput" }, { 0xE01D8C, "EvntRec" }, { 0xE01D8E, "Message" }, { 0xE01D92, "When" }, - { 0xE01D96, "Where" }, { 0xE01D9A, "Mods" }, { 0xE01D9C, "StackSave" }, { 0xE01D9E, "OldOutGlobals" }, { 0xE01DA2, "OldOutDevice" }, - { 0xE01DA8, "CDataBPtr" }, { 0xE01DAC, "DAStrPtr" }, { 0xE01DB0, "CurCDA" }, { 0xE01DB2, "OldOutHook" }, { 0xE01DB4, "OldInDev" }, - { 0xE01DBA, "OldInGlob" }, { 0xE01DBE, "RealDeskStat" }, { 0xE01DC0, "Next" }, { 0xE01DDE, "SchActive" }, { 0xE01DDF, "TaskQueue" }, - { 0xE01DDF, "FirstTask" }, { 0xE01DE3, "SecondTask" }, { 0xE01DED, "Scheduler" }, { 0xE01DEF, "Offset" }, { 0xE01DFF, "Lastbyte" }, - { 0xE01E04, "QD:StdText" }, { 0xE01E08, "QD:StdLine" }, { 0xE01E0C, "QD:StdRect" }, { 0xE01E10, "QD:StdRRect" }, { 0xE01E14, "QD:StdOval" }, { 0xE01E18, "QD:StdArc" }, { 0xE01E1C, "QD:StdPoly" }, - { 0xE01E20, "QD:StdRgn" }, { 0xE01E24, "QD:StdPixels" }, { 0xE01E28, "QD:StdComment" }, { 0xE01E2C, "QD:StdTxMeas" }, { 0xE01E30, "QD:StdTxBnds" }, { 0xE01E34, "QD:StdGetPic" }, - { 0xE01E38, "QD:StdPutPic" }, { 0xE01E98, "QD:ShieldCursor" }, { 0xE01E9C, "QD:UnShieldCursor" }, - { 0x010100, "MNEMSTKPTR" }, { 0x010101, "ALEMSTKPTR" }, { 0x01FC00, "SysSrv:DEV_DISPATCHER" }, { 0x01FC04, "SysSrv:CACHE_FIND_BLK" }, { 0x01FC08, "SysSrv:CACHE_ADD_BLK" }, - { 0x01FC0C, "SysSrv:CACHE_INIT" }, { 0x01FC10, "SysSrv:CACHE_SHUTDN" }, { 0x01FC14, "SysSrv:CACHE_DEL_BLK" }, { 0x01FC18, "SysSrv:CACHE_DEL_VOL" }, - { 0x01FC1C, "SysSrv:ALLOC_SEG" }, { 0x01FC20, "SysSrv:RELEASE_SEG" }, { 0x01FC24, "SysSrv:ALLOC_VCR" }, { 0x01FC28, "SysSrv:RELEASE_VCR" }, - { 0x01FC2C, "SysSrv:ALLOC_FCR" }, { 0x01FC30, "SysSrv:RELEASE_FCR" }, { 0x01FC34, "SysSrv:SWAP_OUT" }, { 0x01FC38, "SysSrv:DEREF" }, - { 0x01FC3C, "SysSrv:GET_SYS_GBUF" }, { 0x01FC40, "SysSrv:SYS_EXIT" }, { 0x01FC44, "SysSrv:SYS_DEATH" }, { 0x01FC48, "SysSrv:FIND_VCR" }, - { 0x01FC4C, "SysSrv:FIND_FCR" }, { 0x01FC50, "SysSrv:SET_SYS_SPEED" }, { 0x01FC54, "SysSrv:CACHE_FLSH_DEF" }, { 0x01FC58, "SysSrv:RENAME_VCR" }, - { 0x01FC5C, "SysSrv:RENAME_FCR" }, { 0x01FC60, "SysSrv:GET_VCR" }, { 0x01FC64, "SysSrv:GET_FCR" }, { 0x01FC68, "SysSrv:LOCK_MEM" }, - { 0x01FC6C, "SysSrv:UNLOCK_MEM" }, { 0x01FC70, "SysSrv:MOVE_INFO" }, { 0x01FC74, "SysSrv:CVT_0TO1" }, { 0x01FC78, "SysSrv:CVT_1TO0" }, - { 0x01FC7C, "SysSrv:REPLACE80" }, { 0x01FC80, "SysSrv:TO_B0_CORE" }, { 0x01FC84, "SysSrv:G_DISPATCH" }, { 0x01FC88, "SysSrv:SIGNAL" }, - { 0x01FC8C, "SysSrv:GET_SYS_BUFF" }, { 0x01FC90, "SysSrv:SET_DISK_SW" }, { 0x01FC94, "SysSrv:REPORT_ERROR" }, { 0x01FC98, "SysSrv:MOUNT_MESSAGE" }, - { 0x01FC9C, "SysSrv:FULL_ERROR" }, { 0x01FCA0, "SysSrv:RESERVED_07" }, { 0x01FCA4, "SysSrv:SUP_DRVR_DISP" }, { 0x01FCA8, "SysSrv:INSTALL_DRIVER" }, - { 0x01FCAC, "SysSrv:S_GET_BOOT_PFX" }, { 0x01FCB0, "SysSrv:S_SET_BOOT_PFX" }, { 0x01FCB4, "SysSrv:LOW_ALLOCATE" }, - { 0x01FCB8, "SysSrv:GET_STACKED_ID" }, { 0x01FCBC, "SysSrv:DYN_SLOT_ARBITER" }, { 0x01FCC0, "SysSrv:PARSE_PATH" }, - { 0x01FCC4, "SysSrv:OS_EVENT" }, { 0x01FCC8, "SysSrv:INSERT_DRIVER" }, { 0x01FCCC, "SysSrv:(device manager?)" }, - { 0x01FCD0, "SysSrv:Old Device Dispatcher" }, { 0x01FCD4, "SysSrv:INIT_PARSE_PATH" }, { 0x01FCD8, "SysSrv:UNBIND_INT_VEC" }, - { 0x01FCDC, "SysSrv:DO_INSERT_SCAN" }, { 0x01FCE0, "SysSrv:TOOLBOX_MSG" }, - - { 0xffff, "" } -}; - -offs_t apple2_common_device::com_2byte_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname) -{ - int item = 0; - - if (m_GScpu) - { - if (m_GScpu->g65816_get_reg(g65816_device::G65816_D) != 0) - { - return 0; - } - } - - u16 operand = (u16)opcodes.r8(pc+1); - while ((a2_stuff[item].addr & 0xff00) == 0) - { - if (a2_stuff[item].addr == operand) - { - stream << opname << " <" << a2_stuff[item].name; - return 2 | util::disasm_interface::SUPPORTED; - } - item++; - } - - return 0; -} - -offs_t apple2_common_device::com_3byte_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname) -{ - int item = 0; - u16 operand = opcodes.r16(pc+1); - - // check for GS-specific stores with the databank set - if (m_GScpu) - { - u32 bank = m_GScpu->g65816_get_reg(g65816_device::G65816_DB) << 16; - bank |= operand; - - int item = 0; - while (gs_vectors[item].addr != 0xffff) - { - if (gs_vectors[item].addr == bank) - { - stream << opname << " " << gs_vectors[item].name; - return 3 | util::disasm_interface::SUPPORTED; - } - item++; - } - - // if we failed the GS stuff and the DB isn't a special bank, don't match the classic A2 switches. - bank >>= 16; - bank &= 0xff; - if ((bank != 0) && (bank != 1) && (bank != 0xe0) && (bank != 0xe1)) - { - return 0; - } - } - - while (a2_stuff[item].addr != 0xffff) - { - if (a2_stuff[item].addr == operand) - { - stream << opname << " " << a2_stuff[item].name; - return 3 | util::disasm_interface::SUPPORTED; - } - item++; - } - - return 0; -} - -offs_t apple2_common_device::com_long_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname) -{ - int item = 0; - u32 operand = opcodes.r32(pc) >> 8; - while (gs_vectors[item].addr != 0xffff) - { - if (gs_vectors[item].addr == operand) - { - stream << opname << " >" << gs_vectors[item].name; - return 4 | util::disasm_interface::SUPPORTED; - } - item++; - } - - return 0; -} - -offs_t apple2_common_device::dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms) -{ - u8 opcode; - unsigned result = 0; - - opcode = opcodes.r8(pc); - - switch (opcode) - { - case 0x0d: // ORA - return com_3byte_op(stream, pc, opcodes, "ora"); - - case 0xad: // LDA - return com_3byte_op(stream, pc, opcodes, "lda"); - - case 0x8d: // STA - return com_3byte_op(stream, pc, opcodes, "sta"); - - case 0x2c: // BIT - return com_3byte_op(stream, pc, opcodes, "bit"); - - case 0x9c: // STZ - return com_3byte_op(stream, pc, opcodes, "stz"); - - case 0x20: // JSR - { - u16 operand = opcodes.r16(pc + 1); - if (operand == 0xbf00) - { - u8 p8call = opcodes.r8(pc + 3); - u16 p8params = opcodes.r16(pc + 4); - int item = 0; - - while (p8_calls[item].addr != 0xffff) - { - if (p8_calls[item].addr == p8call) - { - util::stream_format(stream, "jsr ProDOS 8: %s ($%04x)", p8_calls[item].name, p8params); - return 6 | util::disasm_interface::SUPPORTED | util::disasm_interface::STEP_OVER; - } - item++; - } - } - else - { - offs_t rv = com_3byte_op(stream, pc, opcodes, "jsr"); - - if (rv > 0) - { - rv |= util::disasm_interface::STEP_OVER; - } - return rv; - } - } - break; - - case 0x4c: // JMP - return com_3byte_op(stream, pc, opcodes, "jmp"); - - case 0x84: // STY ZP - return com_2byte_op(stream, pc, opcodes, "sty"); - - case 0x85: // STA ZP - return com_2byte_op(stream, pc, opcodes, "sta"); - - case 0xa4: // LDY ZP - return com_2byte_op(stream, pc, opcodes, "ldy"); - - case 0xa5: // LDA ZP - return com_2byte_op(stream, pc, opcodes, "lda"); - - case 0x65: // ADC ZP - return com_2byte_op(stream, pc, opcodes, "adc"); - - case 0xc5: // CMP ZP - return com_2byte_op(stream, pc, opcodes, "cmp"); - - case 0xc6: // DEC ZP - return com_2byte_op(stream, pc, opcodes, "dec"); - - case 0xe6: // INC ZP - return com_2byte_op(stream, pc, opcodes, "inc"); - - default: - break; - } - - return result; -} - -offs_t apple2_common_device::dasm_override_GS(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms) -{ - u8 opcode; - unsigned result = 0; - - assert(m_GScpu); // ensure the IIgs CPU was configured if we're using this with a IIgs - - opcode = opcodes.r8(pc); - - switch (opcode) - { - case 0x0c: // TSB - return com_3byte_op(stream, pc, opcodes, "tsb"); - - case 0xa2: // LDX - if (opcodes.r32(pc + 3) == 0xe1000022) // JSL E10000 - { - u16 toolcall = opcodes.r16(pc + 1); - int item = 0; - while (gs_tools[item].addr != 0xffff) - { - if (gs_tools[item].addr == toolcall) - { - util::stream_format(stream, "_%s (%04x)", gs_tools[item].name, toolcall); - return 7 | util::disasm_interface::SUPPORTED | util::disasm_interface::STEP_OVER; - } - item++; - } - } - break; - - case 0x22: // JSL - { - u32 operand = opcodes.r32(pc) >> 8; - if (operand == 0xe100a8) - { - u16 call = opcodes.r8(pc + 4); - u32 params = opcodes.r16(pc + 6) & 0xffffff; - int item = 0; - - while (gsos_calls[item].addr != 0xffff) - { - if (gsos_calls[item].addr == call) - { - util::stream_format(stream, "_%s %06x", gsos_calls[item].name, params); - return 10 | util::disasm_interface::SUPPORTED | util::disasm_interface::STEP_OVER; - } - item++; - } - } - offs_t rv = com_long_op(stream, pc, opcodes, "jsl"); - - if (rv > 0) - return rv | util::disasm_interface::STEP_OVER; - - // jsl to inline debug name? - if (opcodes.r8(operand) == 0x82 && opcodes.r16(operand + 3) == 0x7771) - { - int n = opcodes.r8(operand + 5); - std::string name; - for (int i = 0; i < n; ++i) - name.push_back(opcodes.r8(operand + 6 + i)); - - util::stream_format(stream, "jsl %s (%06x)", name.c_str(), operand); - return 4 | util::disasm_interface::SUPPORTED | util::disasm_interface::STEP_OVER; - } - } - break; - case 0x5c: // JML - return com_long_op(stream, pc, opcodes, "jml"); - - case 0x8f: // STA long - return com_long_op(stream, pc, opcodes, "sta"); - - case 0xaf: // LDA long - return com_long_op(stream, pc, opcodes, "lda"); - - // on IIgs, this is more likely to refer to some non-Monitor direct page, so don't do these that way - // (we need a m_maincpu so we can check the D register for a smarter version of this) - case 0x84: // STY ZP - case 0x85: // STA ZP - case 0xa4: // LDY ZP - case 0xa5: // LDA ZP - case 0x65: // ADC ZP - case 0xc5: // CMP ZP - case 0xc6: // DEC ZP - case 0xe6: // INC ZP - return dasm_override(stream, pc, opcodes, params); - - - case 0x82: // BRL - if (opcodes.r16(pc + 3) == 0x7771) - { - // inline debug name format: - // 82 xx xx brl past name - // 71 77 signature - // nn xx xx xxx pascal string - // pastname - s16 operand = opcodes.r16(pc + 1); - int n = opcodes.r8(pc + 5); - if (operand >= n) - { - std::string name; - for (int i = 0; i < n; ++i) - name.push_back(opcodes.r8(pc + 6 + i)); - - stream << name; - return (operand + 3) | util::disasm_interface::SUPPORTED; - } - } - break; - - default: - break; - } - - if (!result) - { - return dasm_override(stream, pc, opcodes, params); - } - - return result; -} diff --git a/src/mame/misc/apple2common.h b/src/mame/misc/apple2common.h deleted file mode 100644 index ba179a30ad9..00000000000 --- a/src/mame/misc/apple2common.h +++ /dev/null @@ -1,54 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:R. Belmont -/********************************************************************* - - apple2common.h - - Apple II stuff shared between apple2/apple2e/apple2gs. - -*********************************************************************/ -#ifndef MAME_MACHINE_APPLE2_COMMON_H -#define MAME_MACHINE_APPLE2_COMMON_H - -#pragma once - -#include "cpu/g65816/g65816.h" - -// ======================> apple2_common_device - -class apple2_common_device : public device_t -{ -public: - // construction/destruction - apple2_common_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - template void set_GS_cputag(T &&tag) { m_GScpu.set_tag(std::forward(tag)); } - - offs_t dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); - offs_t dasm_override_GS(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); - -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_validity_check(validity_checker &valid) const override; - -private: - optional_device m_GScpu; - - double m_x_calibration = 0, m_y_calibration = 0; - double m_joystick_x1_time = 0; - double m_joystick_y1_time = 0; - double m_joystick_x2_time = 0; - double m_joystick_y2_time = 0; - - offs_t com_2byte_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname); - offs_t com_3byte_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname); - offs_t com_long_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname); -}; - - -// device type definition -DECLARE_DEVICE_TYPE(APPLE2_COMMON, apple2_common_device) - - -#endif // MAME_MACHINE_APPLE2_COMMON_H diff --git a/src/mame/misc/artmagic.cpp b/src/mame/misc/artmagic.cpp index 1d1e3639b79..575980ad06c 100644 --- a/src/mame/misc/artmagic.cpp +++ b/src/mame/misc/artmagic.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/artmagic.h" +#include "artmagic.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" diff --git a/src/mame/misc/artmagic_v.cpp b/src/mame/misc/artmagic_v.cpp index 6f3364ef29b..f68a5a57120 100644 --- a/src/mame/misc/artmagic_v.cpp +++ b/src/mame/misc/artmagic_v.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "cpu/tms34010/tms34010.h" #include "video/tlc34076.h" -#include "includes/artmagic.h" +#include "artmagic.h" #define INSTANT_BLIT 1 diff --git a/src/mame/misc/aztarac.cpp b/src/mame/misc/aztarac.cpp index 49c038a60f2..4a866326650 100644 --- a/src/mame/misc/aztarac.cpp +++ b/src/mame/misc/aztarac.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/aztarac.h" +#include "aztarac.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/misc/aztarac_a.cpp b/src/mame/misc/aztarac_a.cpp index 4297509c8a7..95b490788e8 100644 --- a/src/mame/misc/aztarac_a.cpp +++ b/src/mame/misc/aztarac_a.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "includes/aztarac.h" +#include "aztarac.h" uint16_t aztarac_state::sound_r() diff --git a/src/mame/misc/aztarac_v.cpp b/src/mame/misc/aztarac_v.cpp index ed2176115b3..0500f82aa71 100644 --- a/src/mame/misc/aztarac_v.cpp +++ b/src/mame/misc/aztarac_v.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/aztarac.h" +#include "aztarac.h" #define AVECTOR(x, y, color, intensity) \ m_vector->add_point (m_xcenter + ((x) << 16), m_ycenter - ((y) << 16), color, intensity) diff --git a/src/mame/misc/calomega.cpp b/src/mame/misc/calomega.cpp index 4c86e7f9c96..c62546de6a3 100644 --- a/src/mame/misc/calomega.cpp +++ b/src/mame/misc/calomega.cpp @@ -723,7 +723,7 @@ ***********************************************************************************/ #include "emu.h" -#include "includes/calomega.h" +#include "calomega.h" #include "kenokb.lh" diff --git a/src/mame/misc/calomega_v.cpp b/src/mame/misc/calomega_v.cpp index b5a1c3a9e78..512fa82f18e 100644 --- a/src/mame/misc/calomega_v.cpp +++ b/src/mame/misc/calomega_v.cpp @@ -17,7 +17,7 @@ #include "emu.h" -#include "includes/calomega.h" +#include "calomega.h" void calomega_state::calomega_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/misc/cave.cpp b/src/mame/misc/cave.cpp index 3bed3f529f2..f496d97672c 100644 --- a/src/mame/misc/cave.cpp +++ b/src/mame/misc/cave.cpp @@ -85,17 +85,20 @@ Versions known to exist but not dumped: ***************************************************************************/ #include "emu.h" -#include "includes/cave.h" +#include "cave.h" + +#include "nmk112.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "machine/nmk112.h" #include "machine/nvram.h" #include "machine/watchdog.h" #include "sound/ymopm.h" #include "sound/ymopn.h" #include "sound/ymz280b.h" + #include "speaker.h" + #include #include "ppsatan.lh" diff --git a/src/mame/misc/cave.h b/src/mame/misc/cave.h index 46d9f015797..47c4fa128ab 100644 --- a/src/mame/misc/cave.h +++ b/src/mame/misc/cave.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_CAVE_H -#define MAME_INCLUDES_CAVE_H +#ifndef MAME_MISC_CAVE_H +#define MAME_MISC_CAVE_H #pragma once @@ -11,11 +11,13 @@ ***************************************************************************/ +#include "tmap038.h" + #include "machine/eepromser.h" #include "machine/gen_latch.h" #include "machine/timer.h" #include "sound/okim6295.h" -#include "video/tmap038.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" @@ -361,4 +363,4 @@ private: void uopoko_map(address_map &map); }; -#endif // MAME_INCLUDES_CAVE_H +#endif // MAME_MISC_CAVE_H diff --git a/src/mame/misc/cave_v.cpp b/src/mame/misc/cave_v.cpp index ebf07786ae0..84a4e796691 100644 --- a/src/mame/misc/cave_v.cpp +++ b/src/mame/misc/cave_v.cpp @@ -48,7 +48,7 @@ Note: if MAME_DEBUG is defined, pressing: #include "emu.h" #include "crsshair.h" -#include "includes/cave.h" +#include "cave.h" #define CAVE_SPRITETYPE_ZBUF 0x01 diff --git a/src/mame/misc/cdi.cpp b/src/mame/misc/cdi.cpp index 2243e31af76..88114bf707a 100644 --- a/src/mame/misc/cdi.cpp +++ b/src/mame/misc/cdi.cpp @@ -48,7 +48,7 @@ TODO: *******************************************************************************/ #include "emu.h" -#include "includes/cdi.h" +#include "cdi.h" #include "cpu/m6805/m6805.h" #include "imagedev/chd_cd.h" diff --git a/src/mame/misc/cdi.h b/src/mame/misc/cdi.h index 0a2e81aa442..e38fc077534 100644 --- a/src/mame/misc/cdi.h +++ b/src/mame/misc/cdi.h @@ -5,10 +5,10 @@ #define MAME_INCLUDES_CDI_H #include "machine/scc68070.h" -#include "machine/cdislavehle.h" -#include "machine/cdicdic.h" +#include "cdislavehle.h" +#include "cdicdic.h" #include "sound/dmadac.h" -#include "video/mcd212.h" +#include "mcd212.h" #include "cpu/mcs51/mcs51.h" #include "cpu/m6805/m68hc05.h" #include "screen.h" diff --git a/src/mame/misc/cdicdic.cpp b/src/mame/misc/cdicdic.cpp index 95b181e1475..91cc05d28a6 100644 --- a/src/mame/misc/cdicdic.cpp +++ b/src/mame/misc/cdicdic.cpp @@ -22,7 +22,7 @@ TODO: *******************************************************************************/ #include "emu.h" -#include "machine/cdicdic.h" +#include "cdicdic.h" #include "cdrom.h" #include "romload.h" diff --git a/src/mame/misc/cdislavehle.cpp b/src/mame/misc/cdislavehle.cpp index 21812cc85f5..33d4705087d 100644 --- a/src/mame/misc/cdislavehle.cpp +++ b/src/mame/misc/cdislavehle.cpp @@ -16,7 +16,7 @@ TODO: *******************************************************************************/ #include "emu.h" -#include "machine/cdislavehle.h" +#include "cdislavehle.h" #include diff --git a/src/mame/misc/cocoloco.cpp b/src/mame/misc/cocoloco.cpp index bde17c72606..f549e0f9cb2 100644 --- a/src/mame/misc/cocoloco.cpp +++ b/src/mame/misc/cocoloco.cpp @@ -185,7 +185,7 @@ #include "emupal.h" #include "screen.h" #include "speaker.h" -#include "audio/nl_cocoloco.h" +#include "nl_cocoloco.h" #define MASTER_CLOCK XTAL(20'000'000) // confirmed diff --git a/src/mame/misc/comebaby.cpp b/src/mame/misc/comebaby.cpp index da1e49c37a9..5b9bea39355 100644 --- a/src/mame/misc/comebaby.cpp +++ b/src/mame/misc/comebaby.cpp @@ -183,8 +183,11 @@ Nearly everything. #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" -#include "machine/pcshare.h" + #include "emupal.h" #include "screen.h" diff --git a/src/mame/misc/coolpool.cpp b/src/mame/misc/coolpool.cpp index 511ed975311..ae18ae08e16 100644 --- a/src/mame/misc/coolpool.cpp +++ b/src/mame/misc/coolpool.cpp @@ -29,7 +29,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/coolpool.h" +#include "coolpool.h" #include "cpu/tms32010/tms32010.h" #include "cpu/tms32025/tms32025.h" diff --git a/src/mame/misc/dcheese.cpp b/src/mame/misc/dcheese.cpp index eab2aaddf15..c3e9661446d 100644 --- a/src/mame/misc/dcheese.cpp +++ b/src/mame/misc/dcheese.cpp @@ -31,7 +31,7 @@ #include "emu.h" -#include "includes/dcheese.h" +#include "dcheese.h" #include "cpu/m68000/m68000.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/misc/dcheese_v.cpp b/src/mame/misc/dcheese_v.cpp index d61e8dec27d..bbcfe4825a2 100644 --- a/src/mame/misc/dcheese_v.cpp +++ b/src/mame/misc/dcheese_v.cpp @@ -7,7 +7,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/dcheese.h" +#include "dcheese.h" #include diff --git a/src/mame/misc/ecoinf2.cpp b/src/mame/misc/ecoinf2.cpp index 4b7f78040ce..87978623ab9 100644 --- a/src/mame/misc/ecoinf2.cpp +++ b/src/mame/misc/ecoinf2.cpp @@ -11,13 +11,18 @@ #include "emu.h" + +#include "awpvid.h" // drawing reels + #include "cpu/z180/z180.h" #include "machine/i8255.h" #include "machine/steppers.h" // stepper motor #include "machine/meters.h" -#include "video/awpvid.h" // drawing reels + #include "ecoinf2.lh" +namespace { + class ecoinf2_state : public driver_device { public: @@ -227,6 +232,7 @@ private: void ecoinf2_state::ox_port5c_out_w(uint8_t data) { // Watchdog? + logerror("%s: port 5c write %02x\n", machine().describe_context(), data); } void ecoinf2_state::oxo_memmap(address_map &map) @@ -248,7 +254,7 @@ void ecoinf2_state::oxo_portmap(address_map &map) // map(0x54, 0x57).rw("ic25_dips", FUNC(i8255_device::read), FUNC(i8255_device::write)); // is this an 8255, or a mirrored byte read? -// map(0x5c, 0x5c).w(FUNC(ecoinf2_state::ox_port5c_out_w)); + map(0x5c, 0x5c).w(FUNC(ecoinf2_state::ox_port5c_out_w)); } @@ -784,6 +790,9 @@ ROM_START( ec_sumnc ) ROM_LOAD( "smncscst", 0x0000, 0x010000, CRC(1147531a) SHA1(c303187452afdcb79e0f182d26d2c27693f69d76) ) ROM_END +} // anonymous namespace + + // OXO wh type (Phoenix?) (watchdog on port 5c?) GAME( 19??, ec_oxocg, 0, ecoinf2_oxo, ecoinf2, ecoinf2_state, empty_init, ROT0, "Electrocoin", "Oxo Classic Gold (Electrocoin) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL) GAME( 19??, ec_oxocl, 0, ecoinf2_oxo, ecoinf2, ecoinf2_state, empty_init, ROT0, "Electrocoin", "Oxo Club (Electrocoin) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL) diff --git a/src/mame/misc/ecoinf3.cpp b/src/mame/misc/ecoinf3.cpp index 16934bcac99..399de71eb8d 100644 --- a/src/mame/misc/ecoinf3.cpp +++ b/src/mame/misc/ecoinf3.cpp @@ -14,11 +14,13 @@ #include "emu.h" +#include "awpvid.h" // drawing reels + #include "cpu/z180/z180.h" #include "machine/i8255.h" #include "machine/steppers.h" // stepper motor #include "sound/sn76496.h" -#include "video/awpvid.h" // drawing reels + #include "speaker.h" #include "ecoinf3.lh" diff --git a/src/mame/misc/ecoinfr.cpp b/src/mame/misc/ecoinfr.cpp index 667824d27e2..72dd16155a4 100644 --- a/src/mame/misc/ecoinfr.cpp +++ b/src/mame/misc/ecoinfr.cpp @@ -39,12 +39,15 @@ #include "emu.h" + +#include "awpvid.h" // drawing reels + #include "cpu/z80/z80.h" #include "machine/i8251.h" +#include "machine/steppers.h" // stepper motor #include "machine/timer.h" + #include "ecoinfr.lh" -#include "machine/steppers.h" // stepper motor -#include "video/awpvid.h" // drawing reels #define UPD8251_TAG "upd8251" diff --git a/src/mame/misc/efdt.cpp b/src/mame/misc/efdt.cpp index 2a4c772dd97..a3d1278ba90 100644 --- a/src/mame/misc/efdt.cpp +++ b/src/mame/misc/efdt.cpp @@ -158,7 +158,7 @@ **********************************************************************************/ #include "emu.h" -#include "includes/efdt.h" +#include "efdt.h" #include "cpu/z80/z80.h" #include "cpu/m6800/m6800.h" diff --git a/src/mame/misc/esd16.cpp b/src/mame/misc/esd16.cpp index f9cbac6723b..9b09892acd7 100644 --- a/src/mame/misc/esd16.cpp +++ b/src/mame/misc/esd16.cpp @@ -66,7 +66,7 @@ ToDo: ***************************************************************************/ #include "emu.h" -#include "includes/esd16.h" +#include "esd16.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/misc/esd16.h b/src/mame/misc/esd16.h index fe10743bdec..c40a4d585b3 100644 --- a/src/mame/misc/esd16.h +++ b/src/mame/misc/esd16.h @@ -5,16 +5,19 @@ ESD 16 Bit Games ***************************************************************************/ -#ifndef MAME_INCLUDES_ESD16_H -#define MAME_INCLUDES_ESD16_H +#ifndef MAME_MISC_ESD16_H +#define MAME_MISC_ESD16_H #pragma once +#include "decospr.h" + #include "machine/eepromser.h" #include "machine/gen_latch.h" -#include "video/decospr.h" + #include "tilemap.h" + class esd16_state : public driver_device { public: @@ -105,4 +108,4 @@ private: void vram_area(address_map &map, u32 base); }; -#endif // MAME_INCLUDES_ESD16_H +#endif // MAME_MISC_ESD16_H diff --git a/src/mame/misc/esd16_v.cpp b/src/mame/misc/esd16_v.cpp index 77db92df0eb..3ef7fb3992d 100644 --- a/src/mame/misc/esd16_v.cpp +++ b/src/mame/misc/esd16_v.cpp @@ -36,7 +36,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "emu.h" -#include "includes/esd16.h" +#include "esd16.h" #include "screen.h" diff --git a/src/mame/misc/esripsys.cpp b/src/mame/misc/esripsys.cpp index 06d014b2cff..fd81f5addce 100644 --- a/src/mame/misc/esripsys.cpp +++ b/src/mame/misc/esripsys.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/esripsys.h" +#include "esripsys.h" #include "cpu/esrip/esrip.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/misc/esripsys_v.cpp b/src/mame/misc/esripsys_v.cpp index 65091fff251..82f7e2af4ac 100644 --- a/src/mame/misc/esripsys_v.cpp +++ b/src/mame/misc/esripsys_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cpu/m6809/m6809.h" -#include "includes/esripsys.h" +#include "esripsys.h" INTERRUPT_GEN_MEMBER(esripsys_state::esripsys_vblank_irq) diff --git a/src/mame/misc/flower.cpp b/src/mame/misc/flower.cpp index f12c7b1a12c..40b4c454bdd 100644 --- a/src/mame/misc/flower.cpp +++ b/src/mame/misc/flower.cpp @@ -86,7 +86,7 @@ CHIP # POSITION TYPE #include "emu.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "audio/flower.h" +#include "flower_a.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/misc/flower_a.cpp b/src/mame/misc/flower_a.cpp index 01b298cdf60..563abf22f11 100644 --- a/src/mame/misc/flower_a.cpp +++ b/src/mame/misc/flower_a.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include "emu.h" -#include "flower.h" +#include "flower_a.h" //************************************************************************** diff --git a/src/mame/misc/freekick.cpp b/src/mame/misc/freekick.cpp index af5a575eb73..03aea922dfd 100644 --- a/src/mame/misc/freekick.cpp +++ b/src/mame/misc/freekick.cpp @@ -107,12 +107,14 @@ TODO: */ #include "emu.h" -#include "includes/freekick.h" +#include "freekick.h" + +#include "mc8123.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" -#include "machine/mc8123.h" #include "sound/sn76496.h" + #include "screen.h" #include "speaker.h" diff --git a/src/mame/misc/freekick_v.cpp b/src/mame/misc/freekick_v.cpp index 92471b21f76..1e5a4e6cc0b 100644 --- a/src/mame/misc/freekick_v.cpp +++ b/src/mame/misc/freekick_v.cpp @@ -3,7 +3,7 @@ /* Free Kick Video Hardware */ #include "emu.h" -#include "includes/freekick.h" +#include "freekick.h" TILE_GET_INFO_MEMBER(freekick_state::get_freek_tile_info) diff --git a/src/mame/misc/funkball.cpp b/src/mame/misc/funkball.cpp index cc1dc0b6d01..7cc0fc200e6 100644 --- a/src/mame/misc/funkball.cpp +++ b/src/mame/misc/funkball.cpp @@ -70,6 +70,9 @@ Notes: #include "emu.h" + +#include "pcshare.h" + #include "bus/rs232/rs232.h" #include "cpu/i386/i386.h" #include "machine/bankdev.h" @@ -78,13 +81,15 @@ Notes: #include "machine/intelfsh.h" #include "machine/lpci.h" #include "machine/pckeybrd.h" -#include "machine/pcshare.h" -#include "video/voodoo.h" #include "sound/ks0164.h" +#include "video/voodoo.h" + #include "screen.h" #include "speaker.h" +namespace { + class funkball_state : public pcat_base_state { public: @@ -808,5 +813,7 @@ ROM_START( funkball ) ROM_LOAD16_WORD_SWAP( "flash.u30",0x000000, 0x400000, CRC(1d46717a) SHA1(acfbd0a2ccf4d717779733c4a9c639296c3bbe0e) ) ROM_END +} // anonymous namespace + GAME(1998, funkball, 0, funkball, funkball, funkball_state, empty_init, ROT0, "dgPIX Entertainment Inc.", "Funky Ball", MACHINE_NOT_WORKING) diff --git a/src/mame/misc/gammagic.cpp b/src/mame/misc/gammagic.cpp index a9f15baccb7..5048b79f26c 100644 --- a/src/mame/misc/gammagic.cpp +++ b/src/mame/misc/gammagic.cpp @@ -48,12 +48,16 @@ Additional CD-ROM games: "99 Bottles of Beer" **************************************************************************************************/ #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "machine/pci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" #include "video/pc_vga.h" +namespace { + class gammagic_state : public pcat_base_state { public: @@ -162,6 +166,8 @@ ROM_START( 99bottles ) DISK_IMAGE_READONLY( "99bottles", 0, BAD_DUMP SHA1(0b874178c8dd3cfc451deb53dc7936dc4ad5a04f)) ROM_END +} // anonymous namespace + /*************************************************************************** diff --git a/src/mame/misc/gotcha.cpp b/src/mame/misc/gotcha.cpp index 25bf4c24d70..93b3a68ac6a 100644 --- a/src/mame/misc/gotcha.cpp +++ b/src/mame/misc/gotcha.cpp @@ -58,7 +58,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/gotcha.h" +#include "gotcha.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/misc/gotcha.h b/src/mame/misc/gotcha.h index eae18644e79..2833ce3cefc 100644 --- a/src/mame/misc/gotcha.h +++ b/src/mame/misc/gotcha.h @@ -5,13 +5,14 @@ Gotcha *************************************************************************/ -#ifndef MAME_INCLUDES_GOTCHA_H -#define MAME_INCLUDES_GOTCHA_H +#ifndef MAME_MISC_GOTCHA_H +#define MAME_MISC_GOTCHA_H #pragma once +#include "decospr.h" + #include "sound/okim6295.h" -#include "video/decospr.h" #include "tilemap.h" class gotcha_state : public driver_device @@ -82,4 +83,4 @@ private: output_finder<3> m_lamp_s; }; -#endif // MAME_INCLUDES_GOTCHA_H +#endif // MAME_MISC_GOTCHA_H diff --git a/src/mame/misc/gotcha_v.cpp b/src/mame/misc/gotcha_v.cpp index fad60f4d0d9..b78878f7c20 100644 --- a/src/mame/misc/gotcha_v.cpp +++ b/src/mame/misc/gotcha_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/gotcha.h" +#include "gotcha.h" /*************************************************************************** diff --git a/src/mame/misc/gumbo.cpp b/src/mame/misc/gumbo.cpp index a81397336cb..5d41bba219c 100644 --- a/src/mame/misc/gumbo.cpp +++ b/src/mame/misc/gumbo.cpp @@ -44,7 +44,7 @@ PCB Layout */ #include "emu.h" -#include "includes/gumbo.h" +#include "gumbo.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" diff --git a/src/mame/misc/gumbo_v.cpp b/src/mame/misc/gumbo_v.cpp index 51100ce9068..c85b3c410ea 100644 --- a/src/mame/misc/gumbo_v.cpp +++ b/src/mame/misc/gumbo_v.cpp @@ -3,7 +3,7 @@ /* Gumbo video */ #include "emu.h" -#include "includes/gumbo.h" +#include "gumbo.h" void gumbo_state::gumbo_bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) diff --git a/src/mame/misc/homedata.cpp b/src/mame/misc/homedata.cpp index d83337e63f0..1da074c5c08 100644 --- a/src/mame/misc/homedata.cpp +++ b/src/mame/misc/homedata.cpp @@ -233,7 +233,7 @@ Custom: GX61A01 ***************************************************************************/ #include "emu.h" -#include "includes/homedata.h" +#include "homedata.h" #include "cpu/m6809/m6809.h" #include "cpu/upd7810/upd7810.h" diff --git a/src/mame/misc/homedata_v.cpp b/src/mame/misc/homedata_v.cpp index 309ec2c53da..72688e5ae5b 100644 --- a/src/mame/misc/homedata_v.cpp +++ b/src/mame/misc/homedata_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino, Nicola Salmoria #include "emu.h" -#include "includes/homedata.h" +#include "homedata.h" #include "cpu/m6809/m6809.h" #include "screen.h" diff --git a/src/mame/misc/hotchili.cpp b/src/mame/misc/hotchili.cpp index edcf39766d0..72e3bb03f81 100644 --- a/src/mame/misc/hotchili.cpp +++ b/src/mame/misc/hotchili.cpp @@ -152,11 +152,14 @@ ***************************************************************************************/ #include "emu.h" + +#include "seta001.h" + #include "cpu/z80/z80.h" #include "sound/ay8910.h" -#include "video/seta001.h" #include "machine/nvram.h" #include "machine/ram.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" @@ -164,6 +167,9 @@ #include "hotchili.lh" + +namespace { + #define MAIN_CLOCK XTAL(8'000'000) @@ -198,9 +204,6 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void hc_palette(palette_device &palette) const; - void seta001_ctrl_write(offs_t offs, uint8_t data); - uint8_t seta001_ctrl_read(offs_t offs); - //external ram void extram_w(offs_t offset, uint8_t data); uint8_t extram_r(offs_t offset); @@ -237,20 +240,6 @@ private: * Video Hardware * *********************************************/ -void hotchili_state::seta001_ctrl_write(offs_t offs, uint8_t data) -{ - offs = (offs & 0x0c) >> 2; - m_seta001->spritectrl_w8(offs, data); - logerror("m_seta001_offs_w:%x: data:%x\n", offs, data); -} - -uint8_t hotchili_state::seta001_ctrl_read(offs_t offs) -{ - offs = (offs & 0x0c) >> 2; - logerror("m_seta001_offs_r:%x:\n", offs); - return m_seta001->spritectrl_r8(offs); -} - void hotchili_state::hc_palette(palette_device &palette) const { uint8_t const *const color_prom = memregion("proms")->base(); @@ -630,6 +619,8 @@ void hotchili_state::init_hc() ROM[0x1c5b] = 0x84; // Avoids meter error } +} // anonymous namespace + /********************************************* * Game Drivers * diff --git a/src/mame/misc/inder_sb.cpp b/src/mame/misc/inder_sb.cpp index 792d2a21f70..33de7c663ac 100644 --- a/src/mame/misc/inder_sb.cpp +++ b/src/mame/misc/inder_sb.cpp @@ -4,7 +4,7 @@ #include "emu.h" -#include "machine/inder_sb.h" +#include "inder_sb.h" #include "speaker.h" diff --git a/src/mame/misc/kyugo.cpp b/src/mame/misc/kyugo.cpp index 8d3202455db..a2b4fbd5959 100644 --- a/src/mame/misc/kyugo.cpp +++ b/src/mame/misc/kyugo.cpp @@ -124,7 +124,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/kyugo.h" +#include "kyugo.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/misc/kyugo_v.cpp b/src/mame/misc/kyugo_v.cpp index 78c76539f98..b52b0bfb453 100644 --- a/src/mame/misc/kyugo_v.cpp +++ b/src/mame/misc/kyugo_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/kyugo.h" +#include "kyugo.h" /*************************************************************************** diff --git a/src/mame/misc/ladyfrog.cpp b/src/mame/misc/ladyfrog.cpp index b7afba6d1a6..d8feeb4b3ca 100644 --- a/src/mame/misc/ladyfrog.cpp +++ b/src/mame/misc/ladyfrog.cpp @@ -52,7 +52,7 @@ Notes: */ #include "emu.h" -#include "includes/ladyfrog.h" +#include "ladyfrog.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/misc/ladyfrog_v.cpp b/src/mame/misc/ladyfrog_v.cpp index 46951466ff8..11f9a5924b0 100644 --- a/src/mame/misc/ladyfrog_v.cpp +++ b/src/mame/misc/ladyfrog_v.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ladyfrog.h" +#include "ladyfrog.h" void ladyfrog_state::ladyfrog_spriteram_w(offs_t offset, uint8_t data) diff --git a/src/mame/misc/lethalj.cpp b/src/mame/misc/lethalj.cpp index ab069eb3be3..ee732f83c9b 100644 --- a/src/mame/misc/lethalj.cpp +++ b/src/mame/misc/lethalj.cpp @@ -178,7 +178,7 @@ Pin #11(+) | | R | ***************************************************************************/ #include "emu.h" -#include "includes/lethalj.h" +#include "lethalj.h" #include "sound/okim6295.h" #include "emupal.h" diff --git a/src/mame/misc/lethalj_v.cpp b/src/mame/misc/lethalj_v.cpp index 0b201eb89e9..d3363b2456c 100644 --- a/src/mame/misc/lethalj_v.cpp +++ b/src/mame/misc/lethalj_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lethalj.h" +#include "lethalj.h" #define BLITTER_SOURCE_WIDTH 1024 diff --git a/src/mame/misc/magtouch.cpp b/src/mame/misc/magtouch.cpp index e336bc22e7a..b27750ed40e 100644 --- a/src/mame/misc/magtouch.cpp +++ b/src/mame/misc/magtouch.cpp @@ -74,10 +74,12 @@ video card */ #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "machine/pic8259.h" #include "machine/mc146818.h" -#include "machine/pcshare.h" #include "machine/ins8250.h" #include "machine/microtch.h" #include "machine/nvram.h" @@ -85,6 +87,8 @@ video card #include "bus/isa/isa.h" #include "bus/isa/sblaster.h" +namespace { + class magtouch_state : public pcat_base_state { public: @@ -268,4 +272,6 @@ ROM_START(magtouch) ROM_FILL(0x511ba, 1, 0xeb) // skip csum ROM_END +} // anonymous namespace + GAME( 1995, magtouch, 0, magtouch, magtouch, magtouch_state, empty_init, ROT0, "Micro Manufacturing", "Magical Touch", MACHINE_UNEMULATED_PROTECTION ) diff --git a/src/mame/misc/malzak.cpp b/src/mame/misc/malzak.cpp index 89d77d050a0..cf2dab1dfd7 100644 --- a/src/mame/misc/malzak.cpp +++ b/src/mame/misc/malzak.cpp @@ -70,7 +70,7 @@ */ #include "emu.h" -#include "includes/malzak.h" +#include "malzak.h" #include "machine/nvram.h" #include "sound/sn76477.h" diff --git a/src/mame/misc/malzak_v.cpp b/src/mame/misc/malzak_v.cpp index 7a52f0b607c..3e8736d171b 100644 --- a/src/mame/misc/malzak_v.cpp +++ b/src/mame/misc/malzak_v.cpp @@ -15,7 +15,7 @@ #include "emu.h" -#include "includes/malzak.h" +#include "malzak.h" void malzak_state::palette_init(palette_device &palette) const { diff --git a/src/mame/misc/mcatadv.cpp b/src/mame/misc/mcatadv.cpp index c052e40d867..62e659900ef 100644 --- a/src/mame/misc/mcatadv.cpp +++ b/src/mame/misc/mcatadv.cpp @@ -138,7 +138,7 @@ Stephh's notes (based on the games M68000 code and some tests) : ******************************************************************************/ #include "emu.h" -#include "includes/mcatadv.h" +#include "mcatadv.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/misc/mcatadv.h b/src/mame/misc/mcatadv.h index 3b3867e7c31..53963fb3a40 100644 --- a/src/mame/misc/mcatadv.h +++ b/src/mame/misc/mcatadv.h @@ -1,12 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Paul Priest, David Haywood -#ifndef MAME_INCLUDES_MCATADV_H -#define MAME_INCLUDES_MCATADV_H +#ifndef MAME_MISC_MCATADV_H +#define MAME_MISC_MCATADV_H #pragma once +#include "tmap038.h" + #include "machine/watchdog.h" -#include "video/tmap038.h" + #include "emupal.h" #include "tilemap.h" @@ -67,4 +69,4 @@ private: void nost_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_MCATADV_H +#endif // MAME_MISC_MCATADV_H diff --git a/src/mame/misc/mcatadv_v.cpp b/src/mame/misc/mcatadv_v.cpp index 56d20dde833..532d9b177fd 100644 --- a/src/mame/misc/mcatadv_v.cpp +++ b/src/mame/misc/mcatadv_v.cpp @@ -11,7 +11,7 @@ ToDo: Fix Sprites & Rowscroll/Select for Cocktail */ #include "emu.h" -#include "includes/mcatadv.h" +#include "mcatadv.h" #include "screen.h" #include diff --git a/src/mame/misc/mcd212.cpp b/src/mame/misc/mcd212.cpp index 128c3398b1d..3aa73d199b0 100644 --- a/src/mame/misc/mcd212.cpp +++ b/src/mame/misc/mcd212.cpp @@ -22,7 +22,7 @@ TODO: *******************************************************************************/ #include "emu.h" -#include "video/mcd212.h" +#include "mcd212.h" #include "screen.h" #define LOG_UNKNOWNS (1U << 1) diff --git a/src/mame/misc/megaphx.cpp b/src/mame/misc/megaphx.cpp index 47d13d93154..4570f22a31a 100644 --- a/src/mame/misc/megaphx.cpp +++ b/src/mame/misc/megaphx.cpp @@ -78,8 +78,8 @@ #include "cpu/pic16c5x/pic16c5x.h" #include "machine/74166.h" #include "machine/i8255.h" -#include "machine/inder_sb.h" -#include "machine/inder_vid.h" +#include "inder_sb.h" +#include "inder_vid.h" diff --git a/src/mame/misc/micro3d.cpp b/src/mame/misc/micro3d.cpp index 658dff5b85d..fed0a54691d 100644 --- a/src/mame/misc/micro3d.cpp +++ b/src/mame/misc/micro3d.cpp @@ -24,8 +24,8 @@ ****************************************************************************/ #include "emu.h" -#include "includes/micro3d.h" -#include "audio/micro3d.h" +#include "micro3d.h" +#include "micro3d_a.h" #include "cpu/am29000/am29000.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" diff --git a/src/mame/misc/micro3d_a.cpp b/src/mame/misc/micro3d_a.cpp index 5f38bdad788..e21e588935a 100644 --- a/src/mame/misc/micro3d_a.cpp +++ b/src/mame/misc/micro3d_a.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/micro3d.h" +#include "micro3d_a.h" #define MM5837_CLOCK 100000 diff --git a/src/mame/misc/micro3d_m.cpp b/src/mame/misc/micro3d_m.cpp index a5103f2135b..0ab3acf42c1 100644 --- a/src/mame/misc/micro3d_m.cpp +++ b/src/mame/misc/micro3d_m.cpp @@ -7,8 +7,8 @@ ****************************************************************************/ #include "emu.h" -#include "includes/micro3d.h" -#include "audio/micro3d.h" +#include "micro3d.h" +#include "micro3d_a.h" #include "cpu/m68000/m68000.h" #include "cpu/tms34010/tms34010.h" diff --git a/src/mame/misc/micro3d_v.cpp b/src/mame/misc/micro3d_v.cpp index 75f92bf901a..da7ecea4b54 100644 --- a/src/mame/misc/micro3d_v.cpp +++ b/src/mame/misc/micro3d_v.cpp @@ -11,8 +11,8 @@ ****************************************************************************/ #include "emu.h" -#include "includes/micro3d.h" -#include "audio/micro3d.h" +#include "micro3d.h" +#include "micro3d_a.h" #include "cpu/am29000/am29000.h" diff --git a/src/mame/misc/mosaic.cpp b/src/mame/misc/mosaic.cpp index c3ed3a9b75e..7f4bef1575a 100644 --- a/src/mame/misc/mosaic.cpp +++ b/src/mame/misc/mosaic.cpp @@ -42,7 +42,7 @@ NOTE: PIC16C5x protection chip at 5A (UC02 as silkscreened on PCB) ***************************************************************************/ #include "emu.h" -#include "includes/mosaic.h" +#include "mosaic.h" #include "cpu/pic16c5x/pic16c5x.h" #include "cpu/z180/z180.h" diff --git a/src/mame/misc/mosaic_v.cpp b/src/mame/misc/mosaic_v.cpp index bfa5368858c..c1a6808b489 100644 --- a/src/mame/misc/mosaic_v.cpp +++ b/src/mame/misc/mosaic_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mosaic.h" +#include "mosaic.h" /*************************************************************************** diff --git a/src/mame/misc/multfish.cpp b/src/mame/misc/multfish.cpp index f41fc4c3df7..cfd02f43889 100644 --- a/src/mame/misc/multfish.cpp +++ b/src/mame/misc/multfish.cpp @@ -182,7 +182,7 @@ below are simply made to the banking address to run on other boards. */ #include "emu.h" -#include "includes/multfish.h" +#include "multfish.h" #include "speaker.h" diff --git a/src/mame/misc/multfish_boot.cpp b/src/mame/misc/multfish_boot.cpp index 28eaa3b1373..4efedfcdfd9 100644 --- a/src/mame/misc/multfish_boot.cpp +++ b/src/mame/misc/multfish_boot.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" -#include "includes/multfish.h" +#include "multfish.h" /*************************************************************************************************************************************************************/ diff --git a/src/mame/misc/news.cpp b/src/mame/misc/news.cpp index 51984c20aa1..0e6ac5cb6bb 100644 --- a/src/mame/misc/news.cpp +++ b/src/mame/misc/news.cpp @@ -16,7 +16,7 @@ driver by David Haywood */ #include "emu.h" -#include "includes/news.h" +#include "news.h" #include "cpu/z80/z80.h" #include "sound/okim6295.h" diff --git a/src/mame/misc/news_v.cpp b/src/mame/misc/news_v.cpp index ce8fc45ca6d..a3c31b75cd1 100644 --- a/src/mame/misc/news_v.cpp +++ b/src/mame/misc/news_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood #include "emu.h" -#include "includes/news.h" +#include "news.h" /*************************************************************************** diff --git a/src/mame/misc/norautp.cpp b/src/mame/misc/norautp.cpp index 4e578ad0de9..1f0d339fd9a 100644 --- a/src/mame/misc/norautp.cpp +++ b/src/mame/misc/norautp.cpp @@ -546,7 +546,7 @@ *******************************************************************************/ #include "emu.h" -#include "includes/norautp.h" +#include "norautp.h" #include "cpu/i8085/i8085.h" #include "cpu/z80/z80.h" diff --git a/src/mame/misc/norautp_a.cpp b/src/mame/misc/norautp_a.cpp index b0a6af312f2..c614c75c311 100644 --- a/src/mame/misc/norautp_a.cpp +++ b/src/mame/misc/norautp_a.cpp @@ -6,7 +6,7 @@ ************************************************************************/ #include "emu.h" -#include "includes/norautp.h" +#include "norautp.h" /* Discrete Sound Input Nodes */ diff --git a/src/mame/misc/oneshot.cpp b/src/mame/misc/oneshot.cpp index 02ad3f745eb..14415bad832 100644 --- a/src/mame/misc/oneshot.cpp +++ b/src/mame/misc/oneshot.cpp @@ -126,7 +126,7 @@ Clock measurements: */ #include "emu.h" -#include "includes/oneshot.h" +#include "oneshot.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/misc/oneshot_v.cpp b/src/mame/misc/oneshot_v.cpp index df08b6923a6..6958e07dcf5 100644 --- a/src/mame/misc/oneshot_v.cpp +++ b/src/mame/misc/oneshot_v.cpp @@ -3,7 +3,7 @@ /* One Shot One Kill Video Hardware */ #include "emu.h" -#include "includes/oneshot.h" +#include "oneshot.h" /* bg tilemap */ diff --git a/src/mame/misc/pass.cpp b/src/mame/misc/pass.cpp index cafd800bd62..c684be5c962 100644 --- a/src/mame/misc/pass.cpp +++ b/src/mame/misc/pass.cpp @@ -102,7 +102,7 @@ */ #include "emu.h" -#include "includes/pass.h" +#include "pass.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/misc/pass_v.cpp b/src/mame/misc/pass_v.cpp index 9748c4099e6..4b6a8ef613f 100644 --- a/src/mame/misc/pass_v.cpp +++ b/src/mame/misc/pass_v.cpp @@ -3,7 +3,7 @@ /* video/pass.c - see drivers/pass.c for more info */ #include "emu.h" -#include "includes/pass.h" +#include "pass.h" /* background tilemap stuff */ diff --git a/src/mame/misc/photon.cpp b/src/mame/misc/photon.cpp index 8cdadc82d45..dbb4eccfe11 100644 --- a/src/mame/misc/photon.cpp +++ b/src/mame/misc/photon.cpp @@ -18,7 +18,8 @@ */ #include "emu.h" -#include "video/pk8000.h" + +#include "pk8000_v.h" #include "cpu/i8085/i8085.h" #include "machine/i8255.h" diff --git a/src/mame/misc/policetr.cpp b/src/mame/misc/policetr.cpp index c36c1dc1fcd..e452715b5ca 100644 --- a/src/mame/misc/policetr.cpp +++ b/src/mame/misc/policetr.cpp @@ -96,7 +96,7 @@ PC5380-9651 5380-JY3306A 5380-N1045503A ***************************************************************************/ #include "emu.h" -#include "includes/policetr.h" +#include "policetr.h" /* constants */ diff --git a/src/mame/misc/policetr_v.cpp b/src/mame/misc/policetr_v.cpp index 1b0ff34ee5d..f10f4829f65 100644 --- a/src/mame/misc/policetr_v.cpp +++ b/src/mame/misc/policetr_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cpu/mips/mips1.h" -#include "includes/policetr.h" +#include "policetr.h" /************************************* diff --git a/src/mame/misc/polyplay.cpp b/src/mame/misc/polyplay.cpp index e1fa2775038..da20f5911c8 100644 --- a/src/mame/misc/polyplay.cpp +++ b/src/mame/misc/polyplay.cpp @@ -127,7 +127,7 @@ playing the automaton. Bits 0-2 of PORTB control the organ. ***************************************************************************/ #include "emu.h" -#include "includes/polyplay.h" +#include "polyplay.h" #include "machine/z80daisy.h" diff --git a/src/mame/misc/polyplay_a.cpp b/src/mame/misc/polyplay_a.cpp index 87e881c2509..6fa266d3cb4 100644 --- a/src/mame/misc/polyplay_a.cpp +++ b/src/mame/misc/polyplay_a.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/polyplay.h" +#include "polyplay.h" WRITE_LINE_MEMBER(polyplay_state::ctc_zc0_w) { diff --git a/src/mame/misc/polyplay_v.cpp b/src/mame/misc/polyplay_v.cpp index 4a69bde51bc..19a5a77f664 100644 --- a/src/mame/misc/polyplay_v.cpp +++ b/src/mame/misc/polyplay_v.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/polyplay.h" +#include "polyplay.h" void polyplay_state::polyplay_palette(palette_device &palette) const { diff --git a/src/mame/misc/proconn.cpp b/src/mame/misc/proconn.cpp index 824cf773a85..c8716f13d67 100644 --- a/src/mame/misc/proconn.cpp +++ b/src/mame/misc/proconn.cpp @@ -26,6 +26,8 @@ #include "emu.h" +#include "awpvid.h" + #include "cpu/z80/z80.h" #include "machine/meters.h" #include "machine/roc10937.h" @@ -33,7 +35,6 @@ #include "machine/z80sio.h" #include "machine/z80pio.h" #include "sound/ay8910.h" -#include "video/awpvid.h" #include "speaker.h" diff --git a/src/mame/misc/savquest.cpp b/src/mame/misc/savquest.cpp index 9beca9ee75f..322db20263d 100644 --- a/src/mame/misc/savquest.cpp +++ b/src/mame/misc/savquest.cpp @@ -67,17 +67,18 @@ ***************************************************************************/ - #include "emu.h" + +#include "pcshare.h" + +#include "bus/isa/sblaster.h" #include "cpu/i386/i386.h" +#include "machine/ds128x.h" +#include "machine/idectrl.h" #include "machine/lpci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" -#include "machine/idectrl.h" #include "video/pc_vga.h" #include "video/voodoo_2.h" -#include "machine/ds128x.h" -#include "bus/isa/sblaster.h" namespace { diff --git a/src/mame/misc/shangkid.cpp b/src/mame/misc/shangkid.cpp index 491a7e05988..b22c9736696 100644 --- a/src/mame/misc/shangkid.cpp +++ b/src/mame/misc/shangkid.cpp @@ -52,7 +52,7 @@ Games by Nihon Game/Culture Brain: */ #include "emu.h" -#include "includes/shangkid.h" +#include "shangkid.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/misc/shangkid_v.cpp b/src/mame/misc/shangkid_v.cpp index f498a58cc1f..5abb5d668dd 100644 --- a/src/mame/misc/shangkid_v.cpp +++ b/src/mame/misc/shangkid_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Phil Stroffolino #include "emu.h" -#include "includes/shangkid.h" +#include "shangkid.h" TILE_GET_INFO_MEMBER(chinhero_state::get_bg_tile_info) diff --git a/src/mame/misc/special_a.cpp b/src/mame/misc/special_a.cpp deleted file mode 100644 index 40442b2cfb2..00000000000 --- a/src/mame/misc/special_a.cpp +++ /dev/null @@ -1,85 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Miodrag Milanovic -/*************************************************************************** - - audio/special.cpp - - Functions to emulate sound hardware of Specialist MX - ( based on code of DAI interface ) - -****************************************************************************/ - -#include "emu.h" -#include "special.h" - - -// device type definition -DEFINE_DEVICE_TYPE(SPECIMX_SND, specimx_sound_device, "specimx_sound", "Specialist MX Custom Sound") - - -//************************************************************************** -// LIVE DEVICE -//************************************************************************** - -//------------------------------------------------- -// specimx_sound_device - constructor -//------------------------------------------------- - -specimx_sound_device::specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, SPECIMX_SND, tag, owner, clock) - , device_sound_interface(mconfig, *this) - , m_mixer_channel(nullptr) - , m_specimx_input{ 0, 0, 0 } -{ -} - - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void specimx_sound_device::device_start() -{ - m_specimx_input[0] = m_specimx_input[1] = m_specimx_input[2] = 0; - m_mixer_channel = stream_alloc(0, 1, machine().sample_rate()); -} - - -//------------------------------------------------- -// sound_stream_update - handle a stream update -//------------------------------------------------- - -void specimx_sound_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) -{ - auto &sample_left = outputs[0]; - - stream_buffer::sample_t channel_0_signal = m_specimx_input[0] ? 0.1 : -0.1; - stream_buffer::sample_t channel_1_signal = m_specimx_input[1] ? 0.1 : -0.1; - stream_buffer::sample_t channel_2_signal = m_specimx_input[2] ? 0.1 : -0.1; - stream_buffer::sample_t sum = channel_0_signal + channel_1_signal + channel_2_signal; - - sample_left.fill(sum); -} - - -//------------------------------------------------- -// PIT callbacks -//------------------------------------------------- - -WRITE_LINE_MEMBER(specimx_sound_device::set_input_ch0) -{ - m_mixer_channel->update(); - m_specimx_input[0] = state; -} - -WRITE_LINE_MEMBER(specimx_sound_device::set_input_ch1) -{ - m_mixer_channel->update(); - m_specimx_input[1] = state; -} - -WRITE_LINE_MEMBER(specimx_sound_device::set_input_ch2) -{ - m_mixer_channel->update(); - m_specimx_input[2] = state; -} diff --git a/src/mame/misc/special_a.h b/src/mame/misc/special_a.h deleted file mode 100644 index 51dca82f12f..00000000000 --- a/src/mame/misc/special_a.h +++ /dev/null @@ -1,38 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Miodrag Milanovic -/***************************************************************************** - * - * audio/specimx.h - * - ****************************************************************************/ - -#ifndef MAME_AUDIO_SPECIAL_H -#define MAME_AUDIO_SPECIAL_H - -#pragma once - - -class specimx_sound_device : public device_t, public device_sound_interface -{ -public: - specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - DECLARE_WRITE_LINE_MEMBER(set_input_ch0); - DECLARE_WRITE_LINE_MEMBER(set_input_ch1); - DECLARE_WRITE_LINE_MEMBER(set_input_ch2); - -protected: - // device-level overrides - virtual void device_start() override; - - // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; - -private: - sound_stream *m_mixer_channel; - int m_specimx_input[3]; -}; - -DECLARE_DEVICE_TYPE(SPECIMX_SND, specimx_sound_device) - -#endif // MAME_AUDIO_SPECIAL_H diff --git a/src/mame/misc/special_gambl.cpp b/src/mame/misc/special_gambl.cpp index 48406e1cd61..488b253a54a 100644 --- a/src/mame/misc/special_gambl.cpp +++ b/src/mame/misc/special_gambl.cpp @@ -26,8 +26,9 @@ */ #include "emu.h" +#include "specialsound.h" + #include "cpu/z80/z80.h" -#include "audio/special.h" #include "machine/i8255.h" #include "machine/pit8253.h" #include "machine/nvram.h" @@ -36,6 +37,8 @@ #include "screen.h" #include "speaker.h" +namespace { + class dinaris_state : public driver_device { public: @@ -279,4 +282,6 @@ ROM_START(dindice) ROM_LOAD( "27256.bin", 0x0000, 0x8000, CRC(511f8ba8) SHA1(e75a2cab80ac6b08a19d1adb8ba9bb321aa5e7a8)) ROM_END +} // anonymous namespace + GAME( 199?, dindice, 0, dice, dice, dinaris_state, empty_init, ROT0, "Dinaris", "Dice game", MACHINE_SUPPORTS_SAVE|MACHINE_IMPERFECT_COLORS) diff --git a/src/mame/misc/su2000.cpp b/src/mame/misc/su2000.cpp index 5357ee03810..5a1829bb141 100644 --- a/src/mame/misc/su2000.cpp +++ b/src/mame/misc/su2000.cpp @@ -47,13 +47,18 @@ #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "cpu/tms32031/tms32031.h" -#include "machine/pcshare.h" +#include "machine/ds128x.h" #include "machine/idectrl.h" -#include "video/pc_vga.h" #include "machine/pckeybrd.h" -#include "machine/ds128x.h" +#include "video/pc_vga.h" + + +namespace { /************************************* * @@ -278,7 +283,9 @@ ROM_START( su2000 ) ROM_LOAD("wi02p014.u82", 0x00000, 0x00892, CRC(845e4d48) SHA1(6aaeabad0e86fe480773b4b51ca4f7c1c8935993) ) ROM_LOAD("wi02p015.u74", 0x00000, 0x00892, CRC(a10d1876) SHA1(4091fa0a3abb2baeabcc6b250342cf29829af21a) ) ROM_LOAD("wi02p016.u52", 0x00000, 0x00892, CRC(d84b58c2) SHA1(087b5a56ddb6bef6b1bc93b9a8e0d23de27aa399) ) - ROM_END +ROM_END + +} // anonymous namespace /************************************* diff --git a/src/mame/misc/superga2.cpp b/src/mame/misc/superga2.cpp index e9496b57b2b..a64c35f3015 100644 --- a/src/mame/misc/superga2.cpp +++ b/src/mame/misc/superga2.cpp @@ -18,12 +18,13 @@ ************************************************************************/ #include "emu.h" -#include "video/apple2.h" + +#include "apple2common.h" +#include "apple2video.h" #include "cpu/m6502/m6502.h" #include "machine/74259.h" -#include "machine/apple2common.h" #include "machine/ram.h" #include "machine/timer.h" @@ -33,6 +34,8 @@ #include "speaker.h" +namespace { + #define A2_CPU_TAG "maincpu" #define A2_VIDEO_TAG "a2video" @@ -251,5 +254,8 @@ ROM_START(kuzmich) ROM_LOAD("ke.bin", 0x0000, 0x8000, CRC(102d246b) SHA1(492dcdf0cc31190a97057a69010e2c9c23b6e59d)) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT, COMPANY FULLNAME GAME( 199?, kuzmich, 0, superga2, superga2, superga2_state, empty_init, ROT0, "Nippel", "Kuzmich-Egorych", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/truco.cpp b/src/mame/misc/truco.cpp index bce2b81be4e..9d47320cec8 100644 --- a/src/mame/misc/truco.cpp +++ b/src/mame/misc/truco.cpp @@ -194,7 +194,7 @@ #include "emu.h" -#include "includes/truco.h" +#include "truco.h" #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" diff --git a/src/mame/misc/truco_v.cpp b/src/mame/misc/truco_v.cpp index ac2019b3914..09d28e55940 100644 --- a/src/mame/misc/truco_v.cpp +++ b/src/mame/misc/truco_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/truco.h" +#include "truco.h" void truco_state::truco_palette(palette_device &palette) const { diff --git a/src/mame/misc/trucocl.cpp b/src/mame/misc/trucocl.cpp index fec9b43b7d0..cef9666705d 100644 --- a/src/mame/misc/trucocl.cpp +++ b/src/mame/misc/trucocl.cpp @@ -35,7 +35,7 @@ Daughterboard: Custom made, plugged in the 2 roms and Z80 mainboard sockets. ***************************************************************************/ #include "emu.h" -#include "includes/trucocl.h" +#include "trucocl.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/misc/trucocl_v.cpp b/src/mame/misc/trucocl_v.cpp index d61d25133de..6b08145c213 100644 --- a/src/mame/misc/trucocl_v.cpp +++ b/src/mame/misc/trucocl_v.cpp @@ -35,7 +35,7 @@ Daughterboard: Custom made, plugged in the 2 roms and Z80 mainboard sockets. ***************************************************************************/ #include "emu.h" -#include "includes/trucocl.h" +#include "trucocl.h" void trucocl_state::trucocl_palette(palette_device &palette) const diff --git a/src/mame/misc/vectrex.cpp b/src/mame/misc/vectrex.cpp index 58023960a86..a70688cced0 100644 --- a/src/mame/misc/vectrex.cpp +++ b/src/mame/misc/vectrex.cpp @@ -11,7 +11,7 @@ Bruce Tomlin (hardware info) *****************************************************************/ #include "emu.h" -#include "includes/vectrex.h" +#include "vectrex.h" #include "cpu/m6809/m6809.h" #include "machine/6522via.h" diff --git a/src/mame/misc/vectrex_m.cpp b/src/mame/misc/vectrex_m.cpp index e37b90339a4..46206429a72 100644 --- a/src/mame/misc/vectrex_m.cpp +++ b/src/mame/misc/vectrex_m.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mathis Rosenhauer #include "emu.h" -#include "includes/vectrex.h" +#include "vectrex.h" #include "cpu/m6809/m6809.h" #include "sound/ay8910.h" diff --git a/src/mame/misc/vectrex_v.cpp b/src/mame/misc/vectrex_v.cpp index 37c929102d1..c4dab8f31ba 100644 --- a/src/mame/misc/vectrex_v.cpp +++ b/src/mame/misc/vectrex_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Mathis Rosenhauer #include #include "emu.h" -#include "includes/vectrex.h" +#include "vectrex.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/misc/voyager.cpp b/src/mame/misc/voyager.cpp index 8d9d7dfccbe..7bf5b880d51 100644 --- a/src/mame/misc/voyager.cpp +++ b/src/mame/misc/voyager.cpp @@ -25,12 +25,13 @@ TODO: VIA KT133a chipset support, GeForce 2MX video support, lots of things ;-) #include "emu.h" +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "machine/idectrl.h" #include "machine/lpci.h" #include "machine/nvram.h" #include "machine/pckeybrd.h" -#include "machine/pcshare.h" #include "video/pc_vga.h" #include "bus/isa/trident.h" @@ -39,6 +40,8 @@ TODO: VIA KT133a chipset support, GeForce 2MX video support, lots of things ;-) #include "speaker.h" +namespace { + class voyager_state : public pcat_base_state { public: @@ -555,6 +558,8 @@ ROM_START( policet2 ) DISK_IMAGE_READONLY( "pt2", 0, SHA1(11d29548c685f12bc9bc1db7791957cd5e62db10)) ROM_END +} // anonymous namespace + GAME( 2002, voyager, 0, voyager, voyager, voyager_state, init_voyager, ROT0, "Team Play/Game Refuge/Monaco Entertainment", "Star Trek: Voyager", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) GAME( 2002, voyagers, voyager, voyager, voyager, voyager_state, init_voyager, ROT0, "Team Play/Game Refuge/Monaco Entertainment", "Star Trek: Voyager (stand-up version 1.002)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) GAME( 2003, policet2, 0, voyager, voyager, voyager_state, init_voyager, ROT0, "Team Play/Phantom Entertainment", "Police Trainer 2", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) diff --git a/src/mame/misc/xtom3d.cpp b/src/mame/misc/xtom3d.cpp index 4c12934d4fe..ad59221db67 100644 --- a/src/mame/misc/xtom3d.cpp +++ b/src/mame/misc/xtom3d.cpp @@ -41,9 +41,11 @@ MX29F1610MC 16M FlashROM (x7) #include "emu.h" + +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "machine/lpci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" #include "machine/idectrl.h" #include "video/pc_vga.h" diff --git a/src/mame/mit/tx0.cpp b/src/mame/mit/tx0.cpp index c03f40c4f1f..89362ffbea7 100644 --- a/src/mame/mit/tx0.cpp +++ b/src/mame/mit/tx0.cpp @@ -7,12 +7,11 @@ */ #include "emu.h" -#include "includes/tx0.h" +#include "tx0.h" #include "imagedev/magtape.h" #include "imagedev/papertape.h" -#include "video/crt.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/mit/tx0.h b/src/mame/mit/tx0.h index f98598cf71e..0470efbd874 100644 --- a/src/mame/mit/tx0.h +++ b/src/mame/mit/tx0.h @@ -5,13 +5,14 @@ * includes/tx0.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_TX0_H -#define MAME_INCLUDES_TX0_H +#ifndef MAME_MIT_TX0_H +#define MAME_MIT_TX0_H #pragma once +#include "mitcrt.h" + #include "cpu/tx0/tx0.h" -#include "video/crt.h" #include "emupal.h" @@ -338,4 +339,4 @@ enum }; -#endif // MAME_INCLUDES_TX0_H +#endif // MAME_MIT_TX0_H diff --git a/src/mame/mit/tx0_v.cpp b/src/mame/mit/tx0_v.cpp index 22538caa367..8c7f7924625 100644 --- a/src/mame/mit/tx0_v.cpp +++ b/src/mame/mit/tx0_v.cpp @@ -7,9 +7,7 @@ */ #include "emu.h" -#include "includes/tx0.h" - -#include "video/crt.h" +#include "tx0.h" #include diff --git a/src/mame/morrow/mpz80.cpp b/src/mame/morrow/mpz80.cpp index 4c75c5eedff..0c1f5f15098 100644 --- a/src/mame/morrow/mpz80.cpp +++ b/src/mame/morrow/mpz80.cpp @@ -42,7 +42,7 @@ */ #include "emu.h" -#include "includes/mpz80.h" +#include "mpz80.h" #include "softlist_dev.h" //************************************************************************** diff --git a/src/mame/mr/dribling.cpp b/src/mame/mr/dribling.cpp index 7d202abd1fc..98db54deef3 100644 --- a/src/mame/mr/dribling.cpp +++ b/src/mame/mr/dribling.cpp @@ -34,7 +34,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dribling.h" +#include "dribling.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" diff --git a/src/mame/mr/dribling_v.cpp b/src/mame/mr/dribling_v.cpp index 510dccb5c5e..1f6977af69e 100644 --- a/src/mame/mr/dribling_v.cpp +++ b/src/mame/mr/dribling_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dribling.h" +#include "dribling.h" /************************************* diff --git a/src/mame/multitch/mpf1.cpp b/src/mame/multitch/mpf1.cpp index 974d612709c..4c689a84eab 100644 --- a/src/mame/multitch/mpf1.cpp +++ b/src/mame/multitch/mpf1.cpp @@ -49,7 +49,7 @@ */ #include "emu.h" -#include "includes/mpf1.h" +#include "mpf1.h" #include "speaker.h" #include "mpf1.lh" diff --git a/src/mame/namco/20pacgal.cpp b/src/mame/namco/20pacgal.cpp index 8203065bce4..5c0e5a8f4e2 100644 --- a/src/mame/namco/20pacgal.cpp +++ b/src/mame/namco/20pacgal.cpp @@ -84,7 +84,7 @@ Graphics: CY37256P160-83AC x 2 (Ultra37000 CPLD family - 160 pin TQFP, 256 Macro ***************************************************************************/ #include "emu.h" -#include "includes/20pacgal.h" +#include "20pacgal.h" #include "machine/eepromser.h" #include "machine/watchdog.h" diff --git a/src/mame/namco/20pacgal_v.cpp b/src/mame/namco/20pacgal_v.cpp index 56324388ea6..1d1a37c9d04 100644 --- a/src/mame/namco/20pacgal_v.cpp +++ b/src/mame/namco/20pacgal_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/20pacgal.h" +#include "20pacgal.h" #include "screen.h" diff --git a/src/mame/namco/baraduke.cpp b/src/mame/namco/baraduke.cpp index a675a62f03f..3f534f1059d 100644 --- a/src/mame/namco/baraduke.cpp +++ b/src/mame/namco/baraduke.cpp @@ -108,7 +108,7 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" -#include "includes/baraduke.h" +#include "baraduke.h" #include "cpu/m6809/m6809.h" #include "machine/watchdog.h" diff --git a/src/mame/namco/baraduke_v.cpp b/src/mame/namco/baraduke_v.cpp index 1dcd91ee06a..1c44d376f8c 100644 --- a/src/mame/namco/baraduke_v.cpp +++ b/src/mame/namco/baraduke_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia #include "emu.h" -#include "includes/baraduke.h" +#include "baraduke.h" /*************************************************************************** diff --git a/src/mame/namco/bosco.cpp b/src/mame/namco/bosco.cpp index 04f064f7f33..68de092e4ae 100644 --- a/src/mame/namco/bosco.cpp +++ b/src/mame/namco/bosco.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/galaga.h" -#include "includes/bosco.h" +#include "galaga.h" +#include "bosco.h" void bosco_state::bosco_palette(palette_device &palette) const diff --git a/src/mame/namco/c117.cpp b/src/mame/namco/c117.cpp index 32904271278..87621321507 100644 --- a/src/mame/namco/c117.cpp +++ b/src/mame/namco/c117.cpp @@ -23,7 +23,7 @@ two 6809s and as the reset generator for the entire system. #include "emu.h" #include "cpu/m6809/m6809.h" -#include "machine/c117.h" +#include "c117.h" DEFINE_DEVICE_TYPE(NAMCO_C117, namco_c117_device, "namco_c117", "Namco C117 MMU") diff --git a/src/mame/namco/cswat.cpp b/src/mame/namco/cswat.cpp index 2a4d6506a14..8ff78126339 100644 --- a/src/mame/namco/cswat.cpp +++ b/src/mame/namco/cswat.cpp @@ -22,7 +22,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "audio/namco52.h" +#include "namco52.h" #include "cpu/m6809/m6809.h" #include "cpu/mb88xx/mb88xx.h" diff --git a/src/mame/namco/digdug.cpp b/src/mame/namco/digdug.cpp index deebb52e94a..c88bfeb617f 100644 --- a/src/mame/namco/digdug.cpp +++ b/src/mame/namco/digdug.cpp @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/galaga.h" -#include "includes/digdug.h" +#include "galaga.h" +#include "digdug.h" /*************************************************************************** diff --git a/src/mame/namco/gal3.cpp b/src/mame/namco/gal3.cpp index 21ef2b0b360..b39a8cdb619 100644 --- a/src/mame/namco/gal3.cpp +++ b/src/mame/namco/gal3.cpp @@ -134,9 +134,9 @@ better notes (complete chip lists) for each board still needed #include "sound/c140.h" #include "layout/generic.h" #include "speaker.h" -#include "video/namco_c355spr.h" -#include "machine/namcos21_dsp_c67.h" -#include "video/namcos21_3d.h" +#include "namco_c355spr.h" +#include "namcos21_dsp_c67.h" +#include "namcos21_3d.h" #include "emupal.h" class gal3_state : public driver_device diff --git a/src/mame/namco/galaga.cpp b/src/mame/namco/galaga.cpp index 34a41ba656b..6612c6a8ce5 100644 --- a/src/mame/namco/galaga.cpp +++ b/src/mame/namco/galaga.cpp @@ -690,19 +690,19 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/bosco.h" -#include "includes/digdug.h" -#include "includes/galaga.h" -#include "includes/xevious.h" -#include "audio/namco52.h" -#include "audio/namco54.h" +#include "bosco.h" +#include "digdug.h" +#include "galaga.h" +#include "xevious.h" +#include "namco52.h" +#include "namco54.h" #include "cpu/mb88xx/mb88xx.h" #include "cpu/z80/z80.h" -#include "machine/namco06.h" -#include "machine/namco50.h" -#include "machine/namco51.h" -#include "machine/namco53.h" +#include "namco06.h" +#include "namco50.h" +#include "namco51.h" +#include "namco53.h" #include "machine/rescap.h" #include "machine/watchdog.h" #include "sound/samples.h" diff --git a/src/mame/namco/galaga.h b/src/mame/namco/galaga.h index 6e9c357ac8a..52fda94e5df 100644 --- a/src/mame/namco/galaga.h +++ b/src/mame/namco/galaga.h @@ -5,7 +5,7 @@ #pragma once -#include "video/starfield_05xx.h" +#include "starfield_05xx.h" #include "machine/74259.h" #include "sound/discrete.h" #include "sound/namco.h" diff --git a/src/mame/namco/galaga_a.cpp b/src/mame/namco/galaga_a.cpp index 03bd0d4e3ac..d649ad41b32 100644 --- a/src/mame/namco/galaga_a.cpp +++ b/src/mame/namco/galaga_a.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "namco52.h" #include "namco54.h" -#include "includes/galaga.h" +#include "galaga.h" /************************************* diff --git a/src/mame/namco/galaga_v.cpp b/src/mame/namco/galaga_v.cpp index ac5a946a1c9..160ce88c880 100644 --- a/src/mame/namco/galaga_v.cpp +++ b/src/mame/namco/galaga_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/galaga.h" +#include "galaga.h" #define LOG_DEBUG (1 << 0U) #define LOG_ALL (LOG_DEBUG) diff --git a/src/mame/namco/gaplus.cpp b/src/mame/namco/gaplus.cpp index cc765545f43..4648c02d0a4 100644 --- a/src/mame/namco/gaplus.cpp +++ b/src/mame/namco/gaplus.cpp @@ -152,10 +152,10 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/gaplus.h" +#include "gaplus.h" #include "cpu/m6809/m6809.h" -#include "machine/namco62.h" +#include "namco62.h" #include "machine/watchdog.h" #include "sound/samples.h" #include "speaker.h" diff --git a/src/mame/namco/gaplus.h b/src/mame/namco/gaplus.h index 14978b4e861..7d31c3f9fb0 100644 --- a/src/mame/namco/gaplus.h +++ b/src/mame/namco/gaplus.h @@ -7,7 +7,7 @@ #include "sound/namco.h" #include "sound/samples.h" -#include "machine/namcoio.h" +#include "namcoio.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/namco/gaplus_m.cpp b/src/mame/namco/gaplus_m.cpp index be17a8dbfbd..a7fb22b2d0f 100644 --- a/src/mame/namco/gaplus_m.cpp +++ b/src/mame/namco/gaplus_m.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "sound/samples.h" -#include "includes/gaplus.h" +#include "gaplus.h" /************************************************************************************ diff --git a/src/mame/namco/gaplus_v.cpp b/src/mame/namco/gaplus_v.cpp index ff72474ac4e..44aafc8eda7 100644 --- a/src/mame/namco/gaplus_v.cpp +++ b/src/mame/namco/gaplus_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gaplus.h" +#include "gaplus.h" /*************************************************************************** diff --git a/src/mame/namco/geebee.cpp b/src/mame/namco/geebee.cpp index 1c6c77c070e..6a259eb7354 100644 --- a/src/mame/namco/geebee.cpp +++ b/src/mame/namco/geebee.cpp @@ -10,7 +10,7 @@ ****************************************************************************/ #include "emu.h" -#include "audio/geebee.h" +#include "geebee.h" DEFINE_DEVICE_TYPE(GEEBEE_SOUND, geebee_sound_device, "geebee_sound", "Gee Bee Custom Sound") diff --git a/src/mame/namco/mappy.cpp b/src/mame/namco/mappy.cpp index 7e42d607eca..c3348f495a3 100644 --- a/src/mame/namco/mappy.cpp +++ b/src/mame/namco/mappy.cpp @@ -550,7 +550,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/mappy.h" +#include "mappy.h" #include "cpu/m6809/m6809.h" #include "machine/74157.h" diff --git a/src/mame/namco/mappy.h b/src/mame/namco/mappy.h index 5d659b39a9e..1b4dfeb278a 100644 --- a/src/mame/namco/mappy.h +++ b/src/mame/namco/mappy.h @@ -5,7 +5,7 @@ #pragma once -#include "machine/namcoio.h" +#include "namcoio.h" #include "sound/namco.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/namco/mappy_v.cpp b/src/mame/namco/mappy_v.cpp index 744ba14f4d2..a2aeeb42e40 100644 --- a/src/mame/namco/mappy_v.cpp +++ b/src/mame/namco/mappy_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Nicola Salmoria #include "emu.h" #include "video/resnet.h" -#include "includes/mappy.h" +#include "mappy.h" /*************************************************************************** diff --git a/src/mame/namco/namco06.cpp b/src/mame/namco/namco06.cpp index a64e5c45e7d..9f37fafa94a 100644 --- a/src/mame/namco/namco06.cpp +++ b/src/mame/namco/namco06.cpp @@ -93,7 +93,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/namco06.h" +#include "namco06.h" #define VERBOSE 0 #include "logmacro.h" diff --git a/src/mame/namco/namco62.cpp b/src/mame/namco/namco62.cpp index 732eec1be1e..8a7fc1e88ed 100644 --- a/src/mame/namco/namco62.cpp +++ b/src/mame/namco/namco62.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/namco62.h" +#include "namco62.h" #define VERBOSE 0 #include "logmacro.h" diff --git a/src/mame/namco/namco65.cpp b/src/mame/namco/namco65.cpp index 4b9d124c03d..725e6741473 100644 --- a/src/mame/namco/namco65.cpp +++ b/src/mame/namco/namco65.cpp @@ -9,7 +9,7 @@ some of this can likely be moved into the actual MCU core too */ #include "emu.h" -#include "machine/namco65.h" +#include "namco65.h" DEFINE_DEVICE_TYPE(NAMCOC65, namcoc65_device, "namcoc65", "Namco C65 I/O") diff --git a/src/mame/namco/namco68.cpp b/src/mame/namco/namco68.cpp index 033577b144d..c345638c2d6 100644 --- a/src/mame/namco/namco68.cpp +++ b/src/mame/namco/namco68.cpp @@ -9,7 +9,7 @@ output support */ #include "emu.h" -#include "machine/namco68.h" +#include "namco68.h" DEFINE_DEVICE_TYPE(NAMCOC68, namcoc68_device, "namcoc68", "Namco C68 I/O") diff --git a/src/mame/namco/namco_c116.cpp b/src/mame/namco/namco_c116.cpp index 5965823ae0d..4702e137f60 100644 --- a/src/mame/namco/namco_c116.cpp +++ b/src/mame/namco/namco_c116.cpp @@ -66,7 +66,7 @@ i960 CPU, needs to write its clip and raster values byteswapped. */ #include "emu.h" -#include "video/namco_c116.h" +#include "namco_c116.h" #include diff --git a/src/mame/namco/namco_c355spr.cpp b/src/mame/namco/namco_c355spr.cpp deleted file mode 100644 index ea2780abaf9..00000000000 --- a/src/mame/namco/namco_c355spr.cpp +++ /dev/null @@ -1,802 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood, Phil Stroffolino, Bryan McPhail - -/* - Namco 186/187 Zooming Sprites - Namco C355 Zooming sprites - - used by - namcofl.cpp (all games) - namconb1.cpp (all games) - gal3.cpp (all games) - namcos21.cpp (Driver's Eyes, Solvalou, Starblade, Air Combat, Cyber Sled) (everything except Winning Run series) - namcos2.cpp (Steel Gunner, Steel Gunner 2, Lucky & Wild, Suzuka 8 Hours, Suzuka 8 Hours 2) - deco32.cpp (Dragon Gun, Lock 'n' Loaded) - - earlier titles use the 186/187 pair (eg. Steel Gunner, Dragon Gun) while later boards appear to implement the - same functionality in a single C355 custom (NB1 hardware, Final Lap R etc.) It is not known if there are any - differences in capability. - - TODO: verify which boards use which chips - - - dragongun does a masking trick on the dragon during the attract intro, it should not be visible but rather - cause the fire to be invisible in the shape of the dragon - dragongun 'waterfall' prior to one of the bosses also needs correct priority - - - relative to the start of the sprite area these offets are typically used - it is not clear if this is implemented in a single RAM chip, or multiple on some boards - - * 0x00000 sprite attr (page0) (solvalou service mode) - * 0x02000 sprite list (page0) (solvalou service mode) - * - * 0x02400 window attributes - * 0x04000 format - * 0x08000 tile - * 0x10000 sprite attr (page1) - * 0x14000 sprite list (page1) - - TODO: solvalou service mode wants lists / attributes at 0x02000/2 & 0x00000/2 - Drawing this is what causes the bad tile in vshoot - - Do any games need 2 lists at the same time or should 1 list be configurable? - - It seems unlikely there are really 2 lists - - Maybe the list written by solvalou's service mode is where data gets copied for - rendering by the sprite DMA trigger, but solvalou is choosing to write it there - directly rather than trigger the DMA? - -*/ - -#include "emu.h" -#include "namco_c355spr.h" - -#include - -DEFINE_DEVICE_TYPE(NAMCO_C355SPR, namco_c355spr_device, "namco_c355spr", "Namco 186/187 or C355 (Sprites)") - -namco_c355spr_device::namco_c355spr_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) : - device_t(mconfig, type, tag, owner, clock), - device_gfx_interface(mconfig, *this, nullptr), - device_video_interface(mconfig, *this), - m_pri_cb(*this, DEVICE_SELF, FUNC(namco_c355spr_device::default_priority)), - m_read_spritetile(*this, DEVICE_SELF, FUNC(namco_c355spr_device::read_spritetile)), - m_read_spriteformat(*this, DEVICE_SELF, FUNC(namco_c355spr_device::read_spriteformat)), - m_read_spritetable(*this, DEVICE_SELF, FUNC(namco_c355spr_device::read_spritetable)), - m_read_cliptable(*this, DEVICE_SELF, FUNC(namco_c355spr_device::read_cliptable)), - m_read_spritelist(*this, DEVICE_SELF, FUNC(namco_c355spr_device::read_spritelist)), - m_palxor(0), - m_buffer(0), - m_external_prifill(false), - m_gfx_region(*this, DEVICE_SELF), - m_colbase(0), - m_colors(16), - m_granularity(256), - m_draw_2_lists(true), - m_device_allocates_spriteram_and_bitmaps(true) -{ - std::fill(std::begin(m_position), std::end(m_position), 0); - std::fill(std::begin(m_scrolloffs), std::end(m_scrolloffs), 0); - for (int i = 0; i < 2; i++) - m_spriteram[i] = nullptr; -} - -namco_c355spr_device::namco_c355spr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : - namco_c355spr_device(mconfig, NAMCO_C355SPR, tag, owner, clock) -{ -} - -/**************************************************************************************/ - -template -void namco_c355spr_device::zdrawgfxzoom( - BitmapClass *dest_bmp, const rectangle &clip, gfx_element *gfx, - u32 code, u32 color, bool flipx, bool flipy, int hpos, int vpos, - int hsize, int vsize, u8 prival, - - bitmap_ind8 *pri_buffer, - int sprite_screen_width, int sprite_screen_height, - bitmap_ind8 *pri_bitmap) -{ - if (!hsize || !vsize) return; - if (!gfx) return; - - const u32 pal = gfx->colorbase() + gfx->granularity() * (color % gfx->colors()); - const pen_t *palpen = &gfx->palette().pen(pal); - - const u8 *source_base = gfx->get_data(code % gfx->elements()); - if (sprite_screen_width && sprite_screen_height) - { - /* compute sprite increment per screen pixel */ - int dx = (gfx->width() << 16) / sprite_screen_width; - int dy = (gfx->height() << 16) / sprite_screen_height; - - int ex = hpos + sprite_screen_width; - int ey = vpos + sprite_screen_height; - - int x_index_base; - int y_index; - - if (flipx) - { - x_index_base = (sprite_screen_width - 1) * dx; - dx = -dx; - } - else - { - x_index_base = 0; - } - - if (flipy) - { - y_index = (sprite_screen_height - 1) * dy; - dy = -dy; - } - else - { - y_index = 0; - } - - if (hpos < clip.min_x) - { /* clip left */ - int pixels = clip.min_x - hpos; - hpos += pixels; - x_index_base += pixels * dx; - } - if (vpos < clip.min_y) - { /* clip top */ - int pixels = clip.min_y - vpos; - vpos += pixels; - y_index += pixels * dy; - } - if (ex > clip.max_x + 1) - { /* clip right */ - int pixels = ex - clip.max_x - 1; - ex -= pixels; - } - if (ey > clip.max_y + 1) - { /* clip bottom */ - int pixels = ey - clip.max_y - 1; - ey -= pixels; - } - - if (ex > hpos) - { /* skip if inner loop doesn't draw anything */ - for (int y = vpos; y < ey; y++) - { - u8 const *const source = source_base + (y_index >> 16) * gfx->rowbytes(); - auto *const dest = &dest_bmp->pix(y); - int x_index = x_index_base; - u8 *pri = nullptr; - - if (dest_bmp->bpp() == 32) - pri = &pri_bitmap->pix(y); - - for (int x = hpos; x < ex; x++) - { - if (dest_bmp->bpp() == 16) - { - const u8 c = source[x_index >> 16]; - if (c != 0xff) - { - dest[x] = ((prival & 0xf) << 12) | ((pal + c) & 0xfff); - } - x_index += dx; - } - else if (dest_bmp->bpp() == 32) - { - int c = source[x_index >> 16]; - if (c != 15) - { - if (prival >= pri[x]) - { - dest[x] = palpen[c]; - dest[x] |= 0xff000000; - } - else // sprites can have a 'masking' effect on other sprites - { - dest[x] = 0x00000000; - } - } - - x_index += dx; - } - } - y_index += dy; - } - } - } -} - -void namco_c355spr_device::copybitmap(bitmap_ind16 &dest_bmp, const rectangle &clip, u8 pri) -{ - if (m_palxor) - { - for (int y = clip.min_y; y <= clip.max_y; y++) - { - u16 *const src = &m_renderbitmap.pix(y); - u16 *const dest = &dest_bmp.pix(y); - for (int x = clip.min_x; x <= clip.max_x; x++) - { - if (src[x] != 0xffff) - { - u8 srcpri = (src[x] >> 12) & 0xf; - u16 c = src[x] & 0xfff; - if (srcpri == pri) - { - if ((c & 0xff) != 0xff) - { - switch (c & 0xff) - { - case 0: - dest[x] = 0x4000|(dest[x] & 0x1fff); - break; - case 1: - dest[x] = 0x6000|(dest[x] & 0x1fff); - break; - default: - dest[x] = gfx(0)->colorbase() + c; - break; - } - } - } - } - } - } - } - else - { - for (int y = clip.min_y; y <= clip.max_y; y++) - { - u16 *const src = &m_renderbitmap.pix(y); - u16 *const dest = &dest_bmp.pix(y); - for (int x = clip.min_x; x <= clip.max_x; x++) - { - if (src[x] != 0xffff) - { - u8 srcpri = (src[x] >> 12) & 0xf; - u16 c = src[x] & 0xfff; - if (srcpri == pri) - { - if ((c & 0xff) != 0xff) - { - if (c == 0xffe) - { - dest[x] |= 0x800; - } - else - { - dest[x] = gfx(0)->colorbase() + c; - } - } - } - } - } - } - } -} - -void namco_c355spr_device::copybitmap(bitmap_rgb32 &dest_bmp, const rectangle &clip, u8 pri) -{ - device_palette_interface &palette = gfx(0)->palette(); - const pen_t *pal = &palette.pen(gfx(0)->colorbase()); - if (m_palxor) - { - for (int y = clip.min_y; y <= clip.max_y; y++) - { - u16 *const src = &m_renderbitmap.pix(y); - u16 *const srcrender = &m_screenbitmap.pix(y); - u32 *const dest = &dest_bmp.pix(y); - for (int x = clip.min_x; x <= clip.max_x; x++) - { - if (src[x] != 0xffff) - { - u8 srcpri = (src[x] >> 12) & 0xf; - u16 c = src[x] & 0xfff; - if (srcpri == pri) - { - if ((c & 0xff) != 0xff) - { - switch (c & 0xff) - { - case 0: - srcrender[x] = 0x4000|(srcrender[x] & 0x1fff); - break; - case 1: - srcrender[x] = 0x6000|(srcrender[x] & 0x1fff); - break; - default: - srcrender[x] = c; - break; - } - dest[x] = pal[srcrender[x]]; - } - } - } - else if (srcrender[x] != 0xffff) - dest[x] = pal[srcrender[x]]; - } - } - } - else - { - for (int y = clip.min_y; y <= clip.max_y; y++) - { - u16 *const src = &m_renderbitmap.pix(y); - u16 *const srcrender = &m_screenbitmap.pix(y); - u32 *const dest = &dest_bmp.pix(y); - for (int x = clip.min_x; x <= clip.max_x; x++) - { - if (src[x] != 0xffff) - { - u8 srcpri = (src[x] >> 12) & 0xf; - u16 c = src[x] & 0xfff; - if (srcpri == pri) - { - if ((c & 0xff) != 0xff) - { - if (c == 0xffe) - { - srcrender[x] |= 0x800; - } - else - { - srcrender[x] = c; - } - dest[x] = pal[srcrender[x]]; - } - } - } - else if (srcrender[x] != 0xffff) - dest[x] = pal[srcrender[x]]; - } - } - } -} - -void namco_c355spr_device::device_start() -{ - m_pri_cb.resolve(); - - gfx_layout obj_layout = - { - 16,16, - 0, - 8, /* bits per pixel */ - { STEP8(0,1) }, - { STEP16(0,8) }, - { STEP16(0,8*16) }, - 16*16*8 - }; - obj_layout.total = m_gfx_region->bytes() / (16*16*8 / 8); - - std::fill(std::begin(m_position), std::end(m_position), 0x0000); - - for (int i = 0; i < 2; i++) - { - m_spritelist[i] = std::make_unique(0x100); - m_sprite_end[i] = m_spritelist[i].get(); - } - - if (m_device_allocates_spriteram_and_bitmaps) - { - for (int i = 0; i < 2; i++) - { - m_spriteram[i] = std::make_unique(0x20000 / 2); - std::fill_n(m_spriteram[i].get(), 0x20000 / 2, 0); - save_pointer(NAME(m_spriteram[i]), 0x20000 / 2, i); - } - - screen().register_screen_bitmap(m_renderbitmap); - screen().register_screen_bitmap(m_screenbitmap); - } - - set_gfx(0, std::make_unique(&palette(), obj_layout, m_gfx_region->base(), 0, m_colors, m_colbase)); - gfx(0)->set_granularity(m_granularity); - - m_read_spritetile.resolve(); - m_read_spriteformat.resolve(); - m_read_spritetable.resolve(); - m_read_cliptable.resolve(); - m_read_spritelist.resolve(); - - save_item(NAME(m_position)); - -} - -void namco_c355spr_device::device_stop() -{ - for (auto &spritelist : m_spritelist) - spritelist.reset(); - for (auto &spriteram : m_spriteram) - spriteram.reset(); - - device_t::device_stop(); -} - -/**************************************************************************************/ - -void namco_c355spr_device::position_w(offs_t offset, u16 data, u16 mem_mask) -{ - COMBINE_DATA(&m_position[offset]); -} - -u16 namco_c355spr_device::position_r(offs_t offset) -{ - return m_position[offset]; -} - -/**************************************************************************************************************/ - -template -void namco_c355spr_device::draw_sprites(BitmapClass &bitmap, const rectangle &cliprect, int pri) -{ - if (pri == 0) - { - if (!m_external_prifill) - { - if (m_buffer == 0) // not buffered sprites - build_sprite_list_and_render_sprites(cliprect); - } - } - copybitmap(bitmap, cliprect, pri); -} - -void namco_c355spr_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri) -{ - draw_sprites(bitmap, cliprect, pri); -} - -void namco_c355spr_device::draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int pri) -{ - draw_sprites( bitmap, cliprect, pri); -} - -void namco_c355spr_device::spriteram_w(offs_t offset, u16 data, u16 mem_mask) -{ - COMBINE_DATA(&m_spriteram[0][offset]); -} - -u16 namco_c355spr_device::spriteram_r(offs_t offset) -{ - return m_spriteram[0][offset]; -} - -WRITE_LINE_MEMBER(namco_c355spr_device::vblank) -{ - if (state) - { - if (m_buffer > 0) - build_sprite_list_and_render_sprites(screen().visible_area()); - - if (m_buffer > 1) - std::copy_n(m_spriteram[0].get(), 0x20000/2, m_spriteram[1].get()); - } -} - -/******************************************************************************/ - -u16 namco_c355spr_device::read_spriteformat(int entry, u8 attr) -{ - u16 *spriteram16 = &m_spriteram[std::max(0, m_buffer - 1)][0]; - const u16 *spriteformat = &spriteram16[0x4000 / 2]; - return spriteformat[(entry << 2) + attr]; -} - -u16 namco_c355spr_device::read_spritetile(int entry) -{ - u16 *spriteram16 = &m_spriteram[std::max(0, m_buffer - 1)][0]; - const u16 *spritetile = &spriteram16[0x8000 / 2]; - return spritetile[entry]; -} - -u16 namco_c355spr_device::read_spritetable(int entry, u8 attr, int whichlist) -{ - u16 *ram; - int buffer = std::max(0, m_buffer - 1); - if (whichlist == 0) - ram = &m_spriteram[buffer][0x00000 / 2]; - else - ram = &m_spriteram[buffer][0x10000 / 2]; - - return ram[(entry << 3) + attr]; -} - -u16 namco_c355spr_device::read_cliptable(int entry, u8 attr) -{ - u16 *spriteram16 = &m_spriteram[std::max(0, m_buffer - 1)][0]; - const u16 *ram = &spriteram16[0x2400 / 2]; - return ram[(entry << 2) + attr]; -} - -u16 namco_c355spr_device::read_spritelist(int entry, int whichlist) -{ - u16 *ram; - int buffer = std::max(0, m_buffer - 1); - if (whichlist == 0) - ram = &m_spriteram[buffer][0x02000 / 2]; - else - ram = &m_spriteram[buffer][0x14000 / 2]; - - return ram[entry]; -} - - -int namco_c355spr_device::default_code2tile(int code) -{ - return code; -} - -void namco_c355spr_device::build_sprite_list(int no) -{ - /* draw the sprites */ - c355_sprite *sprite_ptr = m_spritelist[no].get(); - for (int i = 0; i < 256; i++) - { - sprite_ptr->disable = false; - const u16 which = m_read_spritelist(i, no); - get_single_sprite(which & 0xff, sprite_ptr, no); - sprite_ptr++; - if (which & 0x100) break; - } - m_sprite_end[no] = sprite_ptr; -} - -void namco_c355spr_device::build_sprite_list_and_render_sprites(const rectangle cliprect) -{ - if (m_draw_2_lists) - build_sprite_list(0); - - build_sprite_list(1); - - render_sprites(cliprect, nullptr, m_renderbitmap, 0); -} - -template -void namco_c355spr_device::render_sprites(const rectangle cliprect, bitmap_ind8 *pri_bitmap, BitmapClass &temp_bitmap, int alt_precision) -{ - temp_bitmap.fill(0xffff, cliprect); - for (int no = 0; no < 2; no++) - { - int i = 0; - c355_sprite *sprite_ptr = m_spritelist[no].get(); - - while (sprite_ptr != m_sprite_end[no]) - { - if (sprite_ptr->disable == false) - { - rectangle clip = sprite_ptr->clip; - clip &= cliprect; - for (int ind = 0; ind < sprite_ptr->size; ind++) - { - if ((sprite_ptr->tile[ind] & 0x8000) == 0) - { - int sprite_screen_height; - int sprite_screen_width; - - if (alt_precision) - { - sprite_screen_width = ((sprite_ptr->x[ind] + (sprite_ptr->zoomx[ind] << 4)) >> 16) - (sprite_ptr->x[ind] >> 16); - sprite_screen_height = ((sprite_ptr->y[ind] + (sprite_ptr->zoomy[ind] << 4)) >> 16) - (sprite_ptr->y[ind] >> 16); - } - else - { - sprite_screen_height = (sprite_ptr->zoomy[ind] * 16 + 0x8000) >> 16; - sprite_screen_width = (sprite_ptr->zoomx[ind] * 16 + 0x8000) >> 16; - } - - zdrawgfxzoom( - &temp_bitmap, - clip, - gfx(0), - m_code2tile(sprite_ptr->tile[ind]) + sprite_ptr->offset, - sprite_ptr->color, - sprite_ptr->flipx, sprite_ptr->flipy, - sprite_ptr->x[ind] >> 16, sprite_ptr->y[ind] >> 16, - sprite_ptr->zoomx[ind], sprite_ptr->zoomy[ind], sprite_ptr->pri, - nullptr, - sprite_screen_width, sprite_screen_height, - pri_bitmap); - } - } - } - i++; - sprite_ptr++; - } - } -} - -void namco_c355spr_device::copybitmap(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &pri_bitmap, bitmap_rgb32 &temp_bitmap) -{ - for (int y = cliprect.top(); y <= cliprect.bottom(); y++) - { - u32 const *const src = &temp_bitmap.pix(y); - u32 *const dst = &bitmap.pix(y); - - for (int x = cliprect.left(); x <= cliprect.right(); x++) - { - u32 const srcpix = src[x]; - - if ((srcpix & 0xff000000) == 0xff000000) - { - dst[x] = srcpix & 0x00ffffff; - } - } - } -} - -void namco_c355spr_device::draw_dg(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &pri_bitmap, bitmap_rgb32 &temp_bitmap) -{ - build_sprite_list(0); - - render_sprites(cliprect, &pri_bitmap, temp_bitmap, 1); - - copybitmap(screen, bitmap, cliprect, pri_bitmap, temp_bitmap); -} - -void namco_c355spr_device::get_single_sprite(u16 which, c355_sprite *sprite_ptr, int no) -{ - /** - * ----xxxx-------- window select - * --------xxxx---- priority - * ------------xxxx palette select - */ - const u16 palette = m_read_spritetable(which, 6, no); - - int priority = m_pri_cb(palette); - - if (priority == -1) - { - sprite_ptr->disable = true; - return; - } - - sprite_ptr->pri = priority; - - const u16 spriteformatram_offset = m_read_spritetable(which, 0, no) & 0x7ff; /* LINKNO 0x000..0x7ff for format table entries - finalapr code masks with 0x3ff, but vshoot requires 0x7ff */ - sprite_ptr->offset = m_read_spritetable(which, 1, no); /* OFFSET */ - int hpos = m_read_spritetable(which, 2, no); /* HPOS 0x000..0x7ff (signed) */ - int vpos = m_read_spritetable(which, 3, no); /* VPOS 0x000..0x7ff (signed) */ - u16 hsize = m_read_spritetable(which, 4, no); /* HSIZE max 0x3ff pixels */ - u16 vsize = m_read_spritetable(which, 5, no); /* VSIZE max 0x3ff pixels */ - /* m_read_spritetable(which, 6, no) contains priority/palette */ - /* m_read_spritetable(which, 7, no) is used in Lucky & Wild, possibly for sprite-road priority */ - - int xscroll = (s16)m_position[1]; - int yscroll = (s16)m_position[0]; - - xscroll &= 0x1ff; if (xscroll & 0x100) xscroll |= ~0x1ff; - yscroll &= 0x1ff; if (yscroll & 0x100) yscroll |= ~0x1ff; - - if (screen().height() > 384) - { /* Medium Resolution: system21 adjust */ - xscroll = (s16)m_position[1]; - xscroll &= 0x3ff; if (xscroll & 0x200) xscroll |= ~0x3ff; - if (yscroll < 0) - { /* solvalou */ - yscroll += 0x20; - } - yscroll += 0x10; - } - else - { - xscroll += m_scrolloffs[0]; - yscroll += m_scrolloffs[1]; - } - - hpos -= xscroll; - vpos -= yscroll; - - int clipentry = (palette >> 8) & 0xf; - rectangle clip; - clip.set(m_read_cliptable(clipentry, 0) - xscroll, m_read_cliptable(clipentry, 1) - xscroll, m_read_cliptable(clipentry, 2) - yscroll, m_read_cliptable(clipentry, 3) - yscroll); - sprite_ptr->clip = clip; - - hpos &= 0x7ff; if (hpos & 0x400) hpos |= ~0x7ff; /* sign extend */ - vpos &= 0x7ff; if (vpos & 0x400) vpos |= ~0x7ff; /* sign extend */ - - int tile_index = m_read_spriteformat(spriteformatram_offset, 0); - const u16 format = m_read_spriteformat(spriteformatram_offset, 1); - const int dx = m_read_spriteformat(spriteformatram_offset, 2) & 0x1ff; - const int dy = m_read_spriteformat(spriteformatram_offset, 3) & 0x1ff; - int num_cols = (format >> 4) & 0xf; - int num_rows = (format) & 0xf; - - if (num_cols == 0) num_cols = 0x10; - const bool flipx = (hsize & 0x8000); - hsize &= 0x3ff; - if (hsize == 0) - { - sprite_ptr->disable = true; - return; - } - u32 zoomx = (hsize << 16) / (num_cols * 16); - s32 dx_zoomed = ((dx & 0xff) * zoomx + 0x8000) >> 16; - if (dx & 0x100) dx_zoomed = -dx_zoomed; - - if (!flipx) - { - hpos -= dx_zoomed; - } - else - { - hpos += dx_zoomed; - } - - if (num_rows == 0) num_rows = 0x10; - const bool flipy = (vsize & 0x8000); - vsize &= 0x3ff; - if (vsize == 0) - { - sprite_ptr->disable = true; - return; - } - u32 zoomy = (vsize << 16) / (num_rows * 16); - s32 dy_zoomed = ((dy & 0xff) * zoomy + 0x8000) >> 16; - if (dy & 0x100) dy_zoomed = -dy_zoomed; - - if (!flipy) - { - vpos -= dy_zoomed; - } - else - { - vpos += dy_zoomed; - } - - sprite_ptr->flipx = flipx; - sprite_ptr->flipy = flipy; - sprite_ptr->size = num_rows * num_cols; - sprite_ptr->color = (palette & (m_colors-1)) ^ m_palxor; - - u32 source_height_remaining = num_rows * 16; - u32 screen_height_remaining = vsize; - int y = vpos; - int ind = 0; - for (int row = 0; row < num_rows; row++) - { - int tile_screen_height = 16 * screen_height_remaining / source_height_remaining; - zoomy = (screen_height_remaining << 16) / source_height_remaining; - if (flipy) - { - y -= tile_screen_height; - } - u32 source_width_remaining = num_cols * 16; - u32 screen_width_remaining = hsize; - int x = hpos; - for (int col = 0; col < num_cols; col++) - { - int tile_screen_width = 16 * screen_width_remaining / source_width_remaining; - zoomx = (screen_width_remaining << 16) / source_width_remaining; - if (flipx) - { - x -= tile_screen_width; - } - const u16 tile = m_read_spritetile(tile_index++); - sprite_ptr->tile[ind] = tile; - if ((tile & 0x8000) == 0) - { - sprite_ptr->x[ind] = x << 16; - sprite_ptr->y[ind] = y << 16; - sprite_ptr->zoomx[ind] = zoomx; - sprite_ptr->zoomy[ind] = zoomy; - } - if (!flipx) - { - x += tile_screen_width; - } - screen_width_remaining -= tile_screen_width; - source_width_remaining -= 16; - ind++; - } /* next col */ - if (!flipy) - { - y += tile_screen_height; - } - screen_height_remaining -= tile_screen_height; - source_height_remaining -= 16; - } /* next row */ -} - diff --git a/src/mame/namco/namco_c355spr.h b/src/mame/namco/namco_c355spr.h deleted file mode 100644 index 33aed939a36..00000000000 --- a/src/mame/namco/namco_c355spr.h +++ /dev/null @@ -1,166 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood - -#ifndef MAME_VIDEO_NAMCO_C355SPR_H -#define MAME_VIDEO_NAMCO_C355SPR_H - -#pragma once - -#include "screen.h" - -class namco_c355spr_device : public device_t, public device_gfx_interface, public device_video_interface -{ -public: - // construction/destruction - namco_c355spr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - - void set_color_base(u16 base) { m_colbase = base; } - void set_scroll_offsets(int x, int y) { m_scrolloffs[0] = x; m_scrolloffs[1] = y; } - //void set_ram_words(u32 size) { m_ramsize = size; } - void set_palxor(int palxor) { m_palxor = palxor; } - void set_buffer(int buffer) { m_buffer = buffer; } - void set_external_prifill(bool external) { m_external_prifill = external; } - void set_colors(int colors) { m_colors = colors; } - void set_granularity(int granularity) { m_granularity = granularity; } - void set_draw_2_lists(bool draw_2_lists) { m_draw_2_lists = draw_2_lists; } - - // the Namco code currently requires us to allocate memory in the device, the Data East hookup uses access callbacks - void set_device_allocates_spriteram_and_bitmaps(bool allocate_memory) { m_device_allocates_spriteram_and_bitmaps = allocate_memory; } - - - template void set_priority_callback(T &&... args) { m_pri_cb.set(std::forward(args)...); } - template void set_read_spritetile(T &&... args) { m_read_spritetile.set(std::forward(args)...); } - template void set_read_spriteformat(T &&... args) { m_read_spriteformat.set(std::forward(args)...); } - template void set_read_spritetable(T &&... args) { m_read_spritetable.set(std::forward(args)...); } - template void set_read_cliptable(T &&... args) { m_read_cliptable.set(std::forward(args)...); } - template void set_read_spritelist(T &&... args) { m_read_spritelist.set(std::forward(args)...); } - - u16 spriteram_r(offs_t offset); - void spriteram_w(offs_t offset, u16 data, u16 mem_mask = ~0); - u16 position_r(offs_t offset); - void position_w(offs_t offset, u16 data, u16 mem_mask = ~0); - DECLARE_WRITE_LINE_MEMBER(vblank); - - typedef delegate c355_obj_code2tile_delegate; - typedef device_delegate c355_obj_entry_attr_delegate; - typedef device_delegate c355_obj_entry_attr_which_delegate; - typedef device_delegate c355_obj_entry_delegate; - typedef device_delegate c355_obj_entry_which_delegate; - typedef device_delegate c355_priority_delegate; - - void set_tile_callback(c355_obj_code2tile_delegate cb) - { - if (!cb.isnull()) - m_code2tile = cb; - else - m_code2tile = c355_obj_code2tile_delegate(&namco_c355spr_device::default_code2tile, this); - } - - - void draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri); - void draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int pri); - - void draw_dg(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &pri_bitmap, bitmap_rgb32 &temp_bitmap); - - void build_sprite_list_and_render_sprites(const rectangle cliprect); - - template - void render_sprites(const rectangle cliprect, bitmap_ind8 *pri_bitmap, BitmapClass &temp_bitmap, int alt_precision); - - void clear_screen_bitmap() { m_screenbitmap.fill(0xffff); } - void clear_screen_bitmap(const rectangle cliprect) { m_screenbitmap.fill(0xffff, cliprect); } - bitmap_ind16 &screen_bitmap() { return m_screenbitmap; } - -protected: - namco_c355spr_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock = 0); - - // device-level overrides - virtual void device_start() override; - virtual void device_stop() override; - - c355_obj_code2tile_delegate m_code2tile; - c355_priority_delegate m_pri_cb; - c355_obj_entry_delegate m_read_spritetile; - c355_obj_entry_attr_delegate m_read_spriteformat; - c355_obj_entry_attr_which_delegate m_read_spritetable; - c355_obj_entry_attr_delegate m_read_cliptable; - c355_obj_entry_which_delegate m_read_spritelist; - - u16 read_spritetile(int entry); - u16 read_spriteformat(int entry, u8 attr); - u16 read_spritetable(int entry, u8 attr, int whichlist); - u16 read_cliptable(int entry, u8 attr); - u16 read_spritelist(int entry, int whichlist); - - int default_priority(int pal_pri) { return ((pal_pri >> 4) & 0xf); } - - // general - template - void zdrawgfxzoom( - BitmapClass *dest_bmp, const rectangle &clip, gfx_element *gfx, - u32 code, u32 color, - bool flipx, bool flipy, - int sx, int sy, - int scalex, int scaley, - u8 prival, - bitmap_ind8 *pri_buffer, - int sprite_screen_width, int sprite_screen_height, - bitmap_ind8 *pri_bitmap); - - struct c355_sprite - { - bool disable; - int size; - rectangle clip; - int offset; - int color; - bool flipx,flipy; - int tile[16*16]; - int x[16*16],y[16*16]; - int zoomx[16*16],zoomy[16*16]; - int pri; - }; - - std::unique_ptr m_spritelist[2]; - const c355_sprite *m_sprite_end[2]{}; - int m_palxor; - u16 m_position[4]; - std::unique_ptr m_spriteram[2]; - bitmap_ind16 m_renderbitmap; - bitmap_ind16 m_screenbitmap; - - void build_sprite_list(int no); - -private: - - void copybitmap(bitmap_ind16 &dest_bmp, const rectangle &clip, u8 pri); - void copybitmap(bitmap_rgb32 &dest_bmp, const rectangle &clip, u8 pri); - - void copybitmap(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &pri_bitmap, bitmap_rgb32 &temp_bitmap); - - // C355 Motion Object Emulation - // for pal_xor, supply either 0x0 (normal) or 0xf (palette mapping reversed) - int default_code2tile(int code); - - // C355 Motion Object internals - void get_single_sprite(u16 which, c355_sprite *sprite_ptr, int no); - template void draw_sprites(BitmapClass &bitmap, const rectangle &cliprect, int pri); - - - int m_scrolloffs[2]; - //u32 m_ramsize; - int m_buffer; - bool m_external_prifill; - - required_memory_region m_gfx_region; - u16 m_colbase; - int m_colors; - int m_granularity; - bool m_draw_2_lists; - bool m_device_allocates_spriteram_and_bitmaps; -}; - -// device type definition -DECLARE_DEVICE_TYPE(NAMCO_C355SPR, namco_c355spr_device) - -#endif // MAME_VIDEO_NAMCO_C355SPR_H diff --git a/src/mame/namco/namco_c45road.cpp b/src/mame/namco/namco_c45road.cpp index ea378cd55ad..91053377e36 100644 --- a/src/mame/namco/namco_c45road.cpp +++ b/src/mame/namco/namco_c45road.cpp @@ -37,7 +37,7 @@ */ #include "emu.h" -#include "video/namco_c45road.h" +#include "namco_c45road.h" //**************************************************************************** diff --git a/src/mame/namco/namcofl.cpp b/src/mame/namco/namcofl.cpp index 5d904687d25..770afeb8d98 100644 --- a/src/mame/namco/namcofl.cpp +++ b/src/mame/namco/namcofl.cpp @@ -161,7 +161,7 @@ OSC3: 48.384MHz */ #include "emu.h" -#include "includes/namcofl.h" +#include "namcofl.h" #include "sound/c352.h" #include "machine/nvram.h" diff --git a/src/mame/namco/namcofl.h b/src/mame/namco/namcofl.h index d74c195f5f4..2ad6a8f7b55 100644 --- a/src/mame/namco/namcofl.h +++ b/src/mame/namco/namcofl.h @@ -2,12 +2,12 @@ // copyright-holders:R. Belmont, ElSemi #include "cpu/i960/i960.h" -#include "machine/namcomcu.h" +#include "namcomcu.h" #include "machine/timer.h" -#include "video/namco_c123tmap.h" -#include "video/namco_c116.h" -#include "video/namco_c169roz.h" -#include "video/namco_c355spr.h" +#include "namco_c123tmap.h" +#include "namco_c116.h" +#include "namco_c169roz.h" +#include "namco_c355spr.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/namco/namcofl_v.cpp b/src/mame/namco/namcofl_v.cpp index a11d002daad..bed20d5ee63 100644 --- a/src/mame/namco/namcofl_v.cpp +++ b/src/mame/namco/namcofl_v.cpp @@ -3,7 +3,7 @@ /* video/namcofl.cpp */ #include "emu.h" -#include "includes/namcofl.h" +#include "namcofl.h" void namcofl_state::TilemapCB(uint16_t code, int *tile, int *mask) { diff --git a/src/mame/namco/namcoio.cpp b/src/mame/namco/namcoio.cpp index 5ff571450c6..a7efb5164ff 100644 --- a/src/mame/namco/namcoio.cpp +++ b/src/mame/namco/namcoio.cpp @@ -111,7 +111,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "machine/namcoio.h" +#include "namcoio.h" #define VERBOSE 0 diff --git a/src/mame/namco/namcona1.cpp b/src/mame/namco/namcona1.cpp index 286d9650a3a..3ba9d393def 100644 --- a/src/mame/namco/namcona1.cpp +++ b/src/mame/namco/namcona1.cpp @@ -174,7 +174,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/namcona1.h" +#include "namcona1.h" #include "cpu/m68000/m68000.h" #include "speaker.h" diff --git a/src/mame/namco/namcona1.h b/src/mame/namco/namcona1.h index 8b5a288a9c6..769677c2d74 100644 --- a/src/mame/namco/namcona1.h +++ b/src/mame/namco/namcona1.h @@ -11,7 +11,7 @@ #pragma once #include "machine/eeprompar.h" -#include "machine/namcomcu.h" +#include "namcomcu.h" #include "machine/timer.h" #include "machine/msm6242.h" #include "sound/c140.h" diff --git a/src/mame/namco/namcona1_v.cpp b/src/mame/namco/namcona1_v.cpp index 2096cdf91f1..7de7d66ba81 100644 --- a/src/mame/namco/namcona1_v.cpp +++ b/src/mame/namco/namcona1_v.cpp @@ -18,7 +18,7 @@ TODO: */ #include "emu.h" -#include "includes/namcona1.h" +#include "namcona1.h" void namcona1_state::tilemap_get_info( diff --git a/src/mame/namco/namconb1.cpp b/src/mame/namco/namconb1.cpp index cb9e002ebc0..3fcfa39a4fe 100644 --- a/src/mame/namco/namconb1.cpp +++ b/src/mame/namco/namconb1.cpp @@ -272,7 +272,7 @@ GFX: Custom 145 ( 80 pin PQFP) Custom 169 (120 pin PQFP) */ #include "emu.h" -#include "includes/namconb1.h" +#include "namconb1.h" #include "cpu/m68000/m68000.h" #include "sound/c352.h" diff --git a/src/mame/namco/namconb1.h b/src/mame/namco/namconb1.h index e265c1ac955..9aa88395100 100644 --- a/src/mame/namco/namconb1.h +++ b/src/mame/namco/namconb1.h @@ -11,13 +11,13 @@ #pragma once #include "machine/eeprompar.h" -#include "machine/namcomcu.h" +#include "namcomcu.h" #include "machine/timer.h" #include "screen.h" -#include "video/namco_c116.h" -#include "video/namco_c355spr.h" -#include "video/namco_c123tmap.h" -#include "video/namco_c169roz.h" +#include "namco_c116.h" +#include "namco_c355spr.h" +#include "namco_c123tmap.h" +#include "namco_c169roz.h" class namconb1_state : public driver_device diff --git a/src/mame/namco/namconb1_v.cpp b/src/mame/namco/namconb1_v.cpp index a6a7c2ecc5f..c507889959b 100644 --- a/src/mame/namco/namconb1_v.cpp +++ b/src/mame/namco/namconb1_v.cpp @@ -3,7 +3,7 @@ /* video/namconb1.c */ #include "emu.h" -#include "includes/namconb1.h" +#include "namconb1.h" #include diff --git a/src/mame/namco/namcond1.cpp b/src/mame/namco/namcond1.cpp index 9cd307e7dbb..57acb4b3423 100644 --- a/src/mame/namco/namcond1.cpp +++ b/src/mame/namco/namcond1.cpp @@ -190,7 +190,7 @@ Some logic, resistors/caps/transistors, some connectors etc. *************************************************************/ #include "emu.h" -#include "includes/namcond1.h" +#include "namcond1.h" #include "cpu/h8/h83002.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/namco/namcond1.h b/src/mame/namco/namcond1.h index b23f7cec607..a3ba7c7cd2f 100644 --- a/src/mame/namco/namcond1.h +++ b/src/mame/namco/namcond1.h @@ -8,7 +8,7 @@ ***************************************************************************/ -#include "video/ygv608.h" +#include "ygv608.h" #include "machine/nvram.h" class namcond1_state : public driver_device diff --git a/src/mame/namco/namcond1_m.cpp b/src/mame/namco/namcond1_m.cpp index ddedeec6cf7..690396f51c7 100644 --- a/src/mame/namco/namcond1_m.cpp +++ b/src/mame/namco/namcond1_m.cpp @@ -13,7 +13,7 @@ #include "emu.h" #include "cpu/m6809/m6809.h" -#include "includes/namcond1.h" +#include "namcond1.h" /* Perform basic machine initialisation */ diff --git a/src/mame/namco/namcos1.cpp b/src/mame/namco/namcos1.cpp index e913fb877c8..f7c0f7bb3ef 100644 --- a/src/mame/namco/namcos1.cpp +++ b/src/mame/namco/namcos1.cpp @@ -337,7 +337,7 @@ C - uses sub board with support for player 3 and 4 controls ***********************************************************************/ #include "emu.h" -#include "includes/namcos1.h" +#include "namcos1.h" #include "machine/nvram.h" #include "sound/ymopm.h" diff --git a/src/mame/namco/namcos1.h b/src/mame/namco/namcos1.h index fc2967446d7..c11fbaff7c7 100644 --- a/src/mame/namco/namcos1.h +++ b/src/mame/namco/namcos1.h @@ -7,11 +7,11 @@ #include "cpu/m6800/m6801.h" #include "cpu/m6809/m6809.h" -#include "machine/c117.h" +#include "c117.h" #include "sound/dac.h" #include "sound/namco.h" -#include "video/namco_c116.h" -#include "video/namco_c123tmap.h" +#include "namco_c116.h" +#include "namco_c123tmap.h" #include "machine/74157.h" class namcos1_state : public driver_device diff --git a/src/mame/namco/namcos10.cpp b/src/mame/namco/namcos10.cpp index 369f9c6003e..0bade5b1df1 100644 --- a/src/mame/namco/namcos10.cpp +++ b/src/mame/namco/namcos10.cpp @@ -404,7 +404,7 @@ earlier TK games, so it appears to be optional or is only used by the later TK51 */ #include "emu.h" -#include "machine/ns10crypt.h" +#include "ns10crypt.h" #include "cpu/psx/psx.h" #include "cpu/tlcs900/tmp95c061.h" diff --git a/src/mame/namco/namcos11.cpp b/src/mame/namco/namcos11.cpp index 82e026ef3e7..7efac7e2de1 100644 --- a/src/mame/namco/namcos11.cpp +++ b/src/mame/namco/namcos11.cpp @@ -310,8 +310,8 @@ Pin 22 Solder Side - Gun 2 Trigger #include "emu.h" #include "cpu/psx/psx.h" #include "machine/at28c16.h" -#include "machine/namcomcu.h" -#include "machine/ns11prot.h" +#include "namcomcu.h" +#include "ns11prot.h" #include "machine/ram.h" #include "machine/timer.h" #include "sound/c352.h" diff --git a/src/mame/namco/namcos12.cpp b/src/mame/namco/namcos12.cpp index 17d577aa7be..6ec5a19105d 100644 --- a/src/mame/namco/namcos12.cpp +++ b/src/mame/namco/namcos12.cpp @@ -1101,7 +1101,7 @@ The lever must be wired to analog port 0 (pin B22 parts side) of the Namco 48-wa #include "machine/ram.h" #include "sound/c352.h" #include "machine/rtc4543.h" -#include "machine/namco_settings.h" +#include "namco_settings.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/namco/namcos1_m.cpp b/src/mame/namco/namcos1_m.cpp index 67d79665f30..4a37b387e4b 100644 --- a/src/mame/namco/namcos1_m.cpp +++ b/src/mame/namco/namcos1_m.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi #include "emu.h" -#include "includes/namcos1.h" +#include "namcos1.h" /******************************************************************************* diff --git a/src/mame/namco/namcos1_v.cpp b/src/mame/namco/namcos1_v.cpp index ccabf3c0ca9..a61f43aa099 100644 --- a/src/mame/namco/namcos1_v.cpp +++ b/src/mame/namco/namcos1_v.cpp @@ -7,7 +7,7 @@ Namco System 1 Video Hardware *******************************************************************/ #include "emu.h" -#include "includes/namcos1.h" +#include "namcos1.h" #include "screen.h" diff --git a/src/mame/namco/namcos2.cpp b/src/mame/namco/namcos2.cpp index 69c6899e3f5..0e9b3323752 100644 --- a/src/mame/namco/namcos2.cpp +++ b/src/mame/namco/namcos2.cpp @@ -544,7 +544,7 @@ C102 - Controls CPU access to ROZ Memory Area. ***************************************************************************/ #include "emu.h" -#include "includes/namcos2.h" +#include "namcos2.h" #include "cpu/m68000/m68000.h" #include "cpu/m6805/m6805.h" diff --git a/src/mame/namco/namcos2.h b/src/mame/namco/namcos2.h index d145beec552..76d5c165da7 100644 --- a/src/mame/namco/namcos2.h +++ b/src/mame/namco/namcos2.h @@ -12,19 +12,19 @@ #pragma once -#include "machine/namco_c139.h" -#include "machine/namco_c148.h" +#include "namco_c139.h" +#include "namco_c148.h" #include "machine/timer.h" #include "sound/c140.h" -#include "video/namco_c45road.h" -#include "video/namco_c116.h" -#include "machine/namco65.h" -#include "machine/namco68.h" -#include "video/namco_c169roz.h" -#include "video/namco_c355spr.h" -#include "video/namco_c123tmap.h" -#include "video/namcos2_sprite.h" -#include "video/namcos2_roz.h" +#include "namco_c45road.h" +#include "namco_c116.h" +#include "namco65.h" +#include "namco68.h" +#include "namco_c169roz.h" +#include "namco_c355spr.h" +#include "namco_c123tmap.h" +#include "namcos2_sprite.h" +#include "namcos2_roz.h" #include "screen.h" /*********************************************/ diff --git a/src/mame/namco/namcos21.cpp b/src/mame/namco/namcos21.cpp index 77481edf007..fca06602484 100644 --- a/src/mame/namco/namcos21.cpp +++ b/src/mame/namco/namcos21.cpp @@ -289,11 +289,11 @@ Filter Board #include "cpu/tms32025/tms32025.h" #include "machine/timer.h" #include "machine/nvram.h" -#include "machine/namco65.h" -#include "machine/namcos21_dsp.h" -#include "machine/namco_c139.h" -#include "machine/namco_c148.h" -#include "video/namcos21_3d.h" +#include "namco65.h" +#include "namcos21_dsp.h" +#include "namco_c139.h" +#include "namco_c148.h" +#include "namcos21_3d.h" #include "sound/c140.h" #include "sound/ymopm.h" diff --git a/src/mame/namco/namcos21_c67.cpp b/src/mame/namco/namcos21_c67.cpp index 08305d7921a..0cd87c0611d 100644 --- a/src/mame/namco/namcos21_c67.cpp +++ b/src/mame/namco/namcos21_c67.cpp @@ -258,15 +258,15 @@ Namco System 21 Video Hardware #include "cpu/m6805/m6805.h" #include "cpu/m6809/m6809.h" #include "machine/nvram.h" -#include "machine/namcoio_gearbox.h" +#include "namcoio_gearbox.h" #include "machine/timer.h" -#include "machine/namco_c139.h" -#include "machine/namco_c148.h" -#include "machine/namco68.h" -#include "machine/namco_c67.h" -#include "machine/namcos21_dsp_c67.h" -#include "video/namco_c355spr.h" -#include "video/namcos21_3d.h" +#include "namco_c139.h" +#include "namco_c148.h" +#include "namco68.h" +#include "namco_c67.h" +#include "namcos21_dsp_c67.h" +#include "namco_c355spr.h" +#include "namcos21_3d.h" #include "sound/c140.h" #include "sound/ymopm.h" #include "emupal.h" diff --git a/src/mame/namco/namcos21_de.cpp b/src/mame/namco/namcos21_de.cpp index a037cca5c2d..1df18f70736 100644 --- a/src/mame/namco/namcos21_de.cpp +++ b/src/mame/namco/namcos21_de.cpp @@ -28,7 +28,7 @@ Driver's Eyes works, */ #include "emu.h" -#include "machine/namcoio_gearbox.h" +#include "namcoio_gearbox.h" #include "screen.h" #include "emupal.h" #include "speaker.h" @@ -38,12 +38,12 @@ Driver's Eyes works, #include "cpu/tms32025/tms32025.h" #include "machine/nvram.h" #include "machine/timer.h" -#include "machine/namco_c139.h" -#include "machine/namco_c148.h" -#include "machine/namco68.h" -#include "machine/namcos21_dsp.h" -#include "video/namco_c355spr.h" -#include "video/namcos21_3d.h" +#include "namco_c139.h" +#include "namco_c148.h" +#include "namco68.h" +#include "namcos21_dsp.h" +#include "namco_c355spr.h" +#include "namcos21_3d.h" #include "sound/c140.h" #include "sound/ymopm.h" #include "emupal.h" diff --git a/src/mame/namco/namcos21_dsp.h b/src/mame/namco/namcos21_dsp.h index 5efc1676094..fb01c650277 100644 --- a/src/mame/namco/namcos21_dsp.h +++ b/src/mame/namco/namcos21_dsp.h @@ -6,7 +6,7 @@ #pragma once #include "cpu/tms32025/tms32025.h" -#include "video/namcos21_3d.h" +#include "namcos21_3d.h" #define WINRUN_MAX_POLY_PARAM (1+256*3) diff --git a/src/mame/namco/namcos21_dsp_c67.h b/src/mame/namco/namcos21_dsp_c67.h index 7fbb7988af2..6909ff742f1 100644 --- a/src/mame/namco/namcos21_dsp_c67.h +++ b/src/mame/namco/namcos21_dsp_c67.h @@ -5,8 +5,8 @@ #pragma once -#include "machine/namco_c67.h" -#include "video/namcos21_3d.h" +#include "namco_c67.h" +#include "namcos21_3d.h" #include diff --git a/src/mame/namco/namcos22.cpp b/src/mame/namco/namcos22.cpp index 354c9c7ba00..cd77e1585e7 100644 --- a/src/mame/namco/namcos22.cpp +++ b/src/mame/namco/namcos22.cpp @@ -1081,7 +1081,7 @@ Notes: */ #include "emu.h" -#include "includes/namcos22.h" +#include "namcos22.h" #include "cpu/m68000/m68000.h" #include "cpu/tms32025/tms32025.h" diff --git a/src/mame/namco/namcos22.h b/src/mame/namco/namcos22.h index 39e00baaff2..10e7f6ca361 100644 --- a/src/mame/namco/namcos22.h +++ b/src/mame/namco/namcos22.h @@ -13,7 +13,7 @@ #include "machine/eeprompar.h" #include "machine/mb87078.h" -#include "machine/namcomcu.h" +#include "namcomcu.h" #include "machine/timer.h" #include "sound/c352.h" #include "video/rgbutil.h" diff --git a/src/mame/namco/namcos22_v.cpp b/src/mame/namco/namcos22_v.cpp index 160ec3df5db..2efc926be6a 100644 --- a/src/mame/namco/namcos22_v.cpp +++ b/src/mame/namco/namcos22_v.cpp @@ -7,7 +7,7 @@ */ #include "emu.h" -#include "includes/namcos22.h" +#include "namcos22.h" // poly constructor diff --git a/src/mame/namco/namcos23.cpp b/src/mame/namco/namcos23.cpp index 6878c402ef5..5428b19df43 100644 --- a/src/mame/namco/namcos23.cpp +++ b/src/mame/namco/namcos23.cpp @@ -1261,7 +1261,7 @@ Notes: #include "cpu/h8/h83337.h" #include "cpu/mips/mips3.h" #include "cpu/sh/sh2.h" -#include "machine/namco_settings.h" +#include "namco_settings.h" #include "machine/nvram.h" #include "machine/rtc4543.h" #include "sound/c352.h" diff --git a/src/mame/namco/namcos2_m.cpp b/src/mame/namco/namcos2_m.cpp index b55f000450e..a65702cf6c1 100644 --- a/src/mame/namco/namcos2_m.cpp +++ b/src/mame/namco/namcos2_m.cpp @@ -14,7 +14,7 @@ Namco System II #include "emu.h" #include "cpu/m6809/m6809.h" #include "cpu/m6805/m6805.h" -#include "includes/namcos2.h" +#include "namcos2.h" #include "machine/nvram.h" diff --git a/src/mame/namco/namcos2_v.cpp b/src/mame/namco/namcos2_v.cpp index 6b6a8ac0fca..a8665da4056 100644 --- a/src/mame/namco/namcos2_v.cpp +++ b/src/mame/namco/namcos2_v.cpp @@ -3,7 +3,7 @@ /* video hardware for Namco System II */ #include "emu.h" -#include "includes/namcos2.h" +#include "namcos2.h" void namcos2_state::TilemapCB(uint16_t code, int *tile, int *mask) { diff --git a/src/mame/namco/namcos86.cpp b/src/mame/namco/namcos86.cpp index 6a57a466cf7..89e45816aa1 100644 --- a/src/mame/namco/namcos86.cpp +++ b/src/mame/namco/namcos86.cpp @@ -175,7 +175,7 @@ TODO: *******************************************************************/ #include "emu.h" -#include "includes/namcos86.h" +#include "namcos86.h" #include "cpu/m6809/m6809.h" #include "sound/ymopm.h" diff --git a/src/mame/namco/namcos86_v.cpp b/src/mame/namco/namcos86_v.cpp index ecc8bf6c5c5..fdcf9ba2aca 100644 --- a/src/mame/namco/namcos86_v.cpp +++ b/src/mame/namco/namcos86_v.cpp @@ -7,7 +7,7 @@ Namco System 86 Video Hardware *******************************************************************/ #include "emu.h" -#include "includes/namcos86.h" +#include "namcos86.h" #include "screen.h" diff --git a/src/mame/namco/polepos.cpp b/src/mame/namco/polepos.cpp index 54f1fc4a36c..1a3594e1f79 100644 --- a/src/mame/namco/polepos.cpp +++ b/src/mame/namco/polepos.cpp @@ -221,17 +221,17 @@ Todo: ***************************************************************************/ #include "emu.h" -#include "includes/polepos.h" -#include "audio/namco52.h" -#include "audio/namco54.h" -#include "audio/polepos.h" +#include "polepos.h" +#include "namco52.h" +#include "namco54.h" +#include "polepos_a.h" #include "cpu/z80/z80.h" #include "cpu/z8000/z8000.h" #include "cpu/mb88xx/mb88xx.h" -#include "machine/namco06.h" -#include "machine/namco51.h" -#include "machine/namco53.h" +#include "namco06.h" +#include "namco51.h" +#include "namco53.h" #include "machine/nvram.h" #include "machine/watchdog.h" #include "sound/dac.h" diff --git a/src/mame/namco/polepos_a.cpp b/src/mame/namco/polepos_a.cpp index a1dd8bc24dc..46fc1ca16b0 100644 --- a/src/mame/namco/polepos_a.cpp +++ b/src/mame/namco/polepos_a.cpp @@ -5,7 +5,7 @@ Sound handler ****************************************************************************/ #include "emu.h" -#include "polepos.h" +#include "polepos_a.h" #include "namco52.h" #include "namco54.h" diff --git a/src/mame/namco/polepos_v.cpp b/src/mame/namco/polepos_v.cpp index a6bfbcf6679..4c7014494cc 100644 --- a/src/mame/namco/polepos_v.cpp +++ b/src/mame/namco/polepos_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi, Juergen Buchmueller, Alex Pasadyn, Aaron Giles, Nicola Salmoria #include "emu.h" -#include "includes/polepos.h" +#include "polepos.h" /* modified vertical position built from three nibbles (12 bit) diff --git a/src/mame/namco/rallyx.cpp b/src/mame/namco/rallyx.cpp index 1b827664320..32fc588febe 100644 --- a/src/mame/namco/rallyx.cpp +++ b/src/mame/namco/rallyx.cpp @@ -194,7 +194,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/rallyx.h" +#include "rallyx.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/namco/rallyx.h b/src/mame/namco/rallyx.h index ad39a061c55..cb36590b223 100644 --- a/src/mame/namco/rallyx.h +++ b/src/mame/namco/rallyx.h @@ -1,13 +1,15 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_RALLYX_H -#define MAME_INCLUDES_RALLYX_H +#ifndef MAME_NAMCO_RALLYX_H +#define MAME_NAMCO_RALLYX_H #pragma once -#include "audio/timeplt.h" +#include "timeplt_a.h" + #include "sound/namco.h" #include "sound/samples.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" @@ -127,4 +129,4 @@ private: void rallyx_map(address_map &map); }; -#endif // MAME_INCLUDES_RALLYX_H +#endif // MAME_NAMCO_RALLYX_H diff --git a/src/mame/namco/rallyx_v.cpp b/src/mame/namco/rallyx_v.cpp index 740b587b6b8..f183eef9261 100644 --- a/src/mame/namco/rallyx_v.cpp +++ b/src/mame/namco/rallyx_v.cpp @@ -30,7 +30,7 @@ needs more color combination to render its graphics. ***************************************************************************/ #include "emu.h" -#include "includes/rallyx.h" +#include "rallyx.h" #include "video/resnet.h" #include "screen.h" diff --git a/src/mame/namco/tankbatt.cpp b/src/mame/namco/tankbatt.cpp index 85880fbee91..453b9614c81 100644 --- a/src/mame/namco/tankbatt.cpp +++ b/src/mame/namco/tankbatt.cpp @@ -74,7 +74,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/tankbatt.h" +#include "tankbatt.h" #include "cpu/m6502/m6502.h" #include "machine/74259.h" diff --git a/src/mame/namco/tankbatt.h b/src/mame/namco/tankbatt.h index 8b811b2a7ad..4dda63dde44 100644 --- a/src/mame/namco/tankbatt.h +++ b/src/mame/namco/tankbatt.h @@ -9,7 +9,7 @@ #include "machine/netlist.h" #include "netlist/nl_setup.h" -#include "audio/nl_tankbatt.h" +#include "nl_tankbatt.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/namco/tankbatt_v.cpp b/src/mame/namco/tankbatt_v.cpp index ad9e370c256..74825df1a22 100644 --- a/src/mame/namco/tankbatt_v.cpp +++ b/src/mame/namco/tankbatt_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/tankbatt.h" +#include "tankbatt.h" /*************************************************************************** diff --git a/src/mame/namco/tceptor.cpp b/src/mame/namco/tceptor.cpp index d38c5ff9402..ca9c83aeef9 100644 --- a/src/mame/namco/tceptor.cpp +++ b/src/mame/namco/tceptor.cpp @@ -9,7 +9,7 @@ */ #include "emu.h" -#include "includes/tceptor.h" +#include "tceptor.h" #include "cpu/m6809/m6809.h" #include "cpu/m6800/m6801.h" diff --git a/src/mame/namco/tceptor.h b/src/mame/namco/tceptor.h index 7f4007b7663..744a0e16463 100644 --- a/src/mame/namco/tceptor.h +++ b/src/mame/namco/tceptor.h @@ -7,7 +7,7 @@ #include "cpu/m6502/m65c02.h" #include "sound/namco.h" -#include "video/namco_c45road.h" +#include "namco_c45road.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/namco/tceptor_v.cpp b/src/mame/namco/tceptor_v.cpp index 912b0078101..450aa05151b 100644 --- a/src/mame/namco/tceptor_v.cpp +++ b/src/mame/namco/tceptor_v.cpp @@ -6,7 +6,7 @@ */ #include "emu.h" -#include "includes/tceptor.h" +#include "tceptor.h" #include diff --git a/src/mame/namco/toypop.cpp b/src/mame/namco/toypop.cpp index f06e5bc06ef..b86cf71fa6d 100644 --- a/src/mame/namco/toypop.cpp +++ b/src/mame/namco/toypop.cpp @@ -27,7 +27,7 @@ ****************************************/ #include "emu.h" -#include "machine/namcoio.h" +#include "namcoio.h" #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/namco/turrett.cpp b/src/mame/namco/turrett.cpp index 6855101dcbc..d2acf8ea5e4 100644 --- a/src/mame/namco/turrett.cpp +++ b/src/mame/namco/turrett.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/turrett.h" +#include "turrett.h" #include "bus/ata/idehd.h" diff --git a/src/mame/namco/turrett_a.cpp b/src/mame/namco/turrett_a.cpp index a2f9ecdb5af..72d0d61e35d 100644 --- a/src/mame/namco/turrett_a.cpp +++ b/src/mame/namco/turrett_a.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/turrett.h" +#include "turrett.h" DEFINE_DEVICE_TYPE(TURRETT, turrett_device, "ttsnd", "Turret Tower Sound") diff --git a/src/mame/namco/turrett_v.cpp b/src/mame/namco/turrett_v.cpp index 7672daf96c5..7b84c216c66 100644 --- a/src/mame/namco/turrett_v.cpp +++ b/src/mame/namco/turrett_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "machine/idectrl.h" -#include "includes/turrett.h" +#include "turrett.h" diff --git a/src/mame/namco/warpwarp.cpp b/src/mame/namco/warpwarp.cpp index 2563bb06d06..a9dcaee9c7a 100644 --- a/src/mame/namco/warpwarp.cpp +++ b/src/mame/namco/warpwarp.cpp @@ -200,7 +200,7 @@ Notes: (All ICs shown above) ***************************************************************************/ #include "emu.h" -#include "includes/warpwarp.h" +#include "warpwarp.h" #include "cpu/i8085/i8085.h" #include "screen.h" diff --git a/src/mame/namco/warpwarp.h b/src/mame/namco/warpwarp.h index 25882677ae9..00e9835363e 100644 --- a/src/mame/namco/warpwarp.h +++ b/src/mame/namco/warpwarp.h @@ -7,8 +7,8 @@ #include "machine/74259.h" #include "machine/watchdog.h" -#include "audio/geebee.h" -#include "audio/warpwarp.h" +#include "geebee.h" +#include "warpwarp_a.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/namco/warpwarp_a.cpp b/src/mame/namco/warpwarp_a.cpp index a8154c98861..4be2c5d7f77 100644 --- a/src/mame/namco/warpwarp_a.cpp +++ b/src/mame/namco/warpwarp_a.cpp @@ -10,7 +10,7 @@ ****************************************************************************/ #include "emu.h" -#include "audio/warpwarp.h" +#include "warpwarp_a.h" DEFINE_DEVICE_TYPE(WARPWARP_SOUND, warpwarp_sound_device, "warpwarp_sound", "Warp Warp Custom Sound") diff --git a/src/mame/namco/warpwarp_v.cpp b/src/mame/namco/warpwarp_v.cpp index d4b05326db0..af943a6b2ef 100644 --- a/src/mame/namco/warpwarp_v.cpp +++ b/src/mame/namco/warpwarp_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/warpwarp.h" +#include "warpwarp.h" static constexpr rgb_t geebee_pens[] = diff --git a/src/mame/namco/xevious.cpp b/src/mame/namco/xevious.cpp index a47a58682a4..be2e0a58f4d 100644 --- a/src/mame/namco/xevious.cpp +++ b/src/mame/namco/xevious.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/galaga.h" -#include "includes/xevious.h" +#include "galaga.h" +#include "xevious.h" /*************************************************************************** diff --git a/src/mame/namco/xevious_m.cpp b/src/mame/namco/xevious_m.cpp index ea662444e5b..e7857ac920c 100644 --- a/src/mame/namco/xevious_m.cpp +++ b/src/mame/namco/xevious_m.cpp @@ -11,8 +11,8 @@ #include "emu.h" #include "sound/samples.h" -#include "includes/galaga.h" -#include "includes/xevious.h" +#include "galaga.h" +#include "xevious.h" /*************************************************************************** diff --git a/src/mame/namco/ygv608.cpp b/src/mame/namco/ygv608.cpp index e8d08639717..371d7068e9e 100644 --- a/src/mame/namco/ygv608.cpp +++ b/src/mame/namco/ygv608.cpp @@ -51,7 +51,7 @@ #include "emu.h" -#include "video/ygv608.h" +#include "ygv608.h" #include "screen.h" diff --git a/src/mame/ncd/bert_m.cpp b/src/mame/ncd/bert_m.cpp index b175a3efad7..f23e82baec2 100644 --- a/src/mame/ncd/bert_m.cpp +++ b/src/mame/ncd/bert_m.cpp @@ -9,7 +9,7 @@ */ #include "emu.h" -#include "bert.h" +#include "bert_m.h" DEFINE_DEVICE_TYPE(BERT, bert_device, "ncd_bert_asic", "NCD BERT ASIC") diff --git a/src/mame/ncd/ncd68k.cpp b/src/mame/ncd/ncd68k.cpp index 007df9d0571..802c371b8d9 100644 --- a/src/mame/ncd/ncd68k.cpp +++ b/src/mame/ncd/ncd68k.cpp @@ -54,6 +54,8 @@ */ #include "emu.h" +#include "bert_m.h" + // processors #include "cpu/m68000/m68000.h" #include "cpu/m6805/m68705.h" @@ -63,7 +65,6 @@ #include "machine/mc68681.h" #include "machine/am79c90.h" #include "machine/eepromser.h" -#include "machine/bert.h" // busses and connectors #include "bus/pc_kbd/pc_kbdc.h" diff --git a/src/mame/ne/z80ne.cpp b/src/mame/ne/z80ne.cpp index fe974fe7948..b8aaba82e47 100644 --- a/src/mame/ne/z80ne.cpp +++ b/src/mame/ne/z80ne.cpp @@ -128,7 +128,7 @@ Natural Keyboard and Paste: /* Core includes */ #include "emu.h" -#include "includes/z80ne.h" +#include "z80ne.h" #include "cpu/z80/z80.h" #include "machine/ram.h" diff --git a/src/mame/ne/z80ne_m.cpp b/src/mame/ne/z80ne_m.cpp index 5cdc78a3727..533344ed445 100644 --- a/src/mame/ne/z80ne_m.cpp +++ b/src/mame/ne/z80ne_m.cpp @@ -11,7 +11,7 @@ /* Core includes */ #include "emu.h" -#include "includes/z80ne.h" +#include "z80ne.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/mame/nec/pc6001.cpp b/src/mame/nec/pc6001.cpp index 7a5630e87c8..09ea78eea55 100644 --- a/src/mame/nec/pc6001.cpp +++ b/src/mame/nec/pc6001.cpp @@ -141,7 +141,7 @@ irq vector 0x26: ***************************************************************************************************/ #include "emu.h" -#include "includes/pc6001.h" +#include "pc6001.h" #include "softlist_dev.h" diff --git a/src/mame/nec/pc6001.h b/src/mame/nec/pc6001.h index d2c67a80768..0abca82dce7 100644 --- a/src/mame/nec/pc6001.h +++ b/src/mame/nec/pc6001.h @@ -14,7 +14,7 @@ #include "machine/bankdev.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/pc80s31k.h" +#include "pc80s31k.h" #include "machine/timer.h" #include "machine/upd765.h" #include "sound/ay8910.h" diff --git a/src/mame/nec/pc6001_v.cpp b/src/mame/nec/pc6001_v.cpp index 2c3804c6c88..0abfbf817ef 100644 --- a/src/mame/nec/pc6001_v.cpp +++ b/src/mame/nec/pc6001_v.cpp @@ -9,7 +9,7 @@ ******************************************************************/ #include "emu.h" -#include "includes/pc6001.h" +#include "pc6001.h" /***************************************** * diff --git a/src/mame/nec/pc8001.cpp b/src/mame/nec/pc8001.cpp index eacabbfb279..93b690da374 100644 --- a/src/mame/nec/pc8001.cpp +++ b/src/mame/nec/pc8001.cpp @@ -38,7 +38,7 @@ */ #include "emu.h" -#include "includes/pc8001.h" +#include "pc8001.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/nec/pc8001.h b/src/mame/nec/pc8001.h index 1566753b02a..75296f58cb1 100644 --- a/src/mame/nec/pc8001.h +++ b/src/mame/nec/pc8001.h @@ -15,7 +15,7 @@ #include "machine/i8251.h" #include "machine/ram.h" #include "machine/upd1990a.h" -#include "machine/pc80s31k.h" +#include "pc80s31k.h" #include "sound/beep.h" #include "video/upd3301.h" #include "emupal.h" diff --git a/src/mame/nec/pc8401a.cpp b/src/mame/nec/pc8401a.cpp index a977f1cf43b..4a57f8726f4 100644 --- a/src/mame/nec/pc8401a.cpp +++ b/src/mame/nec/pc8401a.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/pc8401a.h" +#include "pc8401a.h" /* diff --git a/src/mame/nec/pc8401a_v.cpp b/src/mame/nec/pc8401a_v.cpp index 66b1c4d7c23..1880f2b7724 100644 --- a/src/mame/nec/pc8401a_v.cpp +++ b/src/mame/nec/pc8401a_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/pc8401a.h" +#include "pc8401a.h" #include "pc8500.lh" diff --git a/src/mame/nec/pc8801.cpp b/src/mame/nec/pc8801.cpp index d00eea1b2e8..ebb81447def 100644 --- a/src/mame/nec/pc8801.cpp +++ b/src/mame/nec/pc8801.cpp @@ -104,7 +104,7 @@ #include "emu.h" -#include "includes/pc8801.h" +#include "pc8801.h" #include "softlist_dev.h" diff --git a/src/mame/nec/pc8801.h b/src/mame/nec/pc8801.h index d076a0bd8af..bd2aa7042bc 100644 --- a/src/mame/nec/pc8801.h +++ b/src/mame/nec/pc8801.h @@ -11,7 +11,7 @@ #pragma once -#include "includes/pc8001.h" +#include "pc8001.h" #include "cpu/z80/z80.h" #include "imagedev/cassette.h" #include "imagedev/floppy.h" @@ -20,7 +20,7 @@ #include "machine/i8255.h" #include "machine/timer.h" #include "machine/upd1990a.h" -#include "machine/pc80s31k.h" +#include "pc80s31k.h" #include "sound/beep.h" #include "sound/ymopn.h" #include "bus/centronics/ctronics.h" diff --git a/src/mame/nec/pc88va.cpp b/src/mame/nec/pc88va.cpp index 6da9ac140e3..68671bc1560 100644 --- a/src/mame/nec/pc88va.cpp +++ b/src/mame/nec/pc88va.cpp @@ -26,7 +26,7 @@ ********************************************************************************************/ #include "emu.h" -#include "includes/pc88va.h" +#include "pc88va.h" #include "softlist_dev.h" diff --git a/src/mame/nec/pc9801.cpp b/src/mame/nec/pc9801.cpp index 6946d67923f..d9f5451c911 100644 --- a/src/mame/nec/pc9801.cpp +++ b/src/mame/nec/pc9801.cpp @@ -355,7 +355,7 @@ Keyboard TX commands: **************************************************************************************************/ #include "emu.h" -#include "includes/pc9801.h" +#include "pc9801.h" #include "machine/input_merger.h" void pc98_base_state::rtc_w(uint8_t data) diff --git a/src/mame/nec/pc9801.h b/src/mame/nec/pc9801.h index a8636f7d748..d3ed1801c90 100644 --- a/src/mame/nec/pc9801.h +++ b/src/mame/nec/pc9801.h @@ -24,7 +24,7 @@ #include "machine/i8251.h" #include "machine/i8255.h" #include "machine/output_latch.h" -#include "machine/pc9801_memsw.h" +#include "pc9801_memsw.h" #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/ram.h" @@ -51,8 +51,8 @@ #include "bus/cbus/pc9801_amd98.h" #include "bus/cbus/mpu_pc98.h" #include "bus/cbus/pc9801_cbus.h" -#include "machine/pc9801_kbd.h" -#include "machine/pc9801_cd.h" +#include "pc9801_kbd.h" +#include "pc9801_cd.h" #include "bus/ata/atadev.h" #include "bus/ata/ataintf.h" diff --git a/src/mame/nec/pc9801_epson.cpp b/src/mame/nec/pc9801_epson.cpp index 2c417268a4d..ba44895583a 100644 --- a/src/mame/nec/pc9801_epson.cpp +++ b/src/mame/nec/pc9801_epson.cpp @@ -41,7 +41,7 @@ **************************************************************************************************/ #include "emu.h" -#include "includes/pc9801_epson.h" +#include "pc9801_epson.h" template void pc98_epson_state::shadow_ipl_w(offs_t offset, u16 data, u16 mem_mask) { diff --git a/src/mame/nec/pc9801_epson.h b/src/mame/nec/pc9801_epson.h index 04eb8c30d91..0682ab888f7 100644 --- a/src/mame/nec/pc9801_epson.h +++ b/src/mame/nec/pc9801_epson.h @@ -11,7 +11,7 @@ #pragma once -#include "includes/pc9801.h" +#include "pc9801.h" class pc98_epson_state : public pc9801vm_state { diff --git a/src/mame/nec/pc9801_kbd.cpp b/src/mame/nec/pc9801_kbd.cpp index 26ce6a92409..f3785c204ba 100644 --- a/src/mame/nec/pc9801_kbd.cpp +++ b/src/mame/nec/pc9801_kbd.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/pc9801_kbd.h" +#include "pc9801_kbd.h" //************************************************************************** diff --git a/src/mame/nec/pc9801_v.cpp b/src/mame/nec/pc9801_v.cpp index 655c1eeea41..7b52c8403c1 100644 --- a/src/mame/nec/pc9801_v.cpp +++ b/src/mame/nec/pc9801_v.cpp @@ -10,7 +10,7 @@ ******************************************************************/ #include "emu.h" -#include "includes/pc9801.h" +#include "pc9801.h" void pc9801_state::video_start() diff --git a/src/mame/nec/pc9821.cpp b/src/mame/nec/pc9821.cpp index 648c38c00c3..b44fa91e4dd 100644 --- a/src/mame/nec/pc9821.cpp +++ b/src/mame/nec/pc9821.cpp @@ -43,7 +43,7 @@ **************************************************************************************************/ #include "emu.h" -#include "includes/pc9821.h" +#include "pc9821.h" UPD7220_DISPLAY_PIXELS_MEMBER( pc9821_state::pegc_display_pixels ) { diff --git a/src/mame/nec/pc9821.h b/src/mame/nec/pc9821.h index 744b5656e1f..062d854ec28 100644 --- a/src/mame/nec/pc9821.h +++ b/src/mame/nec/pc9821.h @@ -11,7 +11,7 @@ #pragma once -#include "includes/pc9801.h" +#include "pc9801.h" class pc9821_state : public pc9801bx_state { diff --git a/src/mame/nec/pc98ha.cpp b/src/mame/nec/pc98ha.cpp index bd4ca0806a5..211f42b7101 100644 --- a/src/mame/nec/pc98ha.cpp +++ b/src/mame/nec/pc98ha.cpp @@ -27,7 +27,7 @@ **************************************************************************************************/ #include "emu.h" -#include "includes/pc98ha.h" +#include "pc98ha.h" void pc98lt_state::lt_palette(palette_device &palette) const { diff --git a/src/mame/nec/pc98ha.h b/src/mame/nec/pc98ha.h index b5437f70e01..b69d8303c0b 100644 --- a/src/mame/nec/pc98ha.h +++ b/src/mame/nec/pc98ha.h @@ -11,7 +11,7 @@ #pragma once -#include "includes/pc9801.h" +#include "pc9801.h" class pc98lt_state : public pc98_base_state { diff --git a/src/mame/nec/pce.cpp b/src/mame/nec/pce.cpp index 1923b74578f..bb828805cab 100644 --- a/src/mame/nec/pce.cpp +++ b/src/mame/nec/pce.cpp @@ -53,7 +53,7 @@ Super System Card: **********************************************************************/ #include "emu.h" -#include "includes/pce.h" +#include "pce.h" #include "bus/pce/pce_rom.h" #include "cpu/h6280/h6280.h" diff --git a/src/mame/nec/pce.h b/src/mame/nec/pce.h index 0ad9e84ee6f..e4ccdd8dde3 100644 --- a/src/mame/nec/pce.h +++ b/src/mame/nec/pce.h @@ -11,13 +11,16 @@ #ifndef MAME_INCLUDES_PCE_H #define MAME_INCLUDES_PCE_H -#include "cdrom.h" +#include "pce_cd.h" + #include "cpu/h6280/h6280.h" #include "bus/pce/pce_slot.h" #include "bus/pce_ctrl/pcectrl.h" -#include "machine/pce_cd.h" #include "video/huc6260.h" +#include "cdrom.h" + + #define C6280_TAG "c6280" #define MAIN_CLOCK 21477270 diff --git a/src/mame/nec/pce_cd.cpp b/src/mame/nec/pce_cd.cpp index 5b82e4fc944..7870295ecc8 100644 --- a/src/mame/nec/pce_cd.cpp +++ b/src/mame/nec/pce_cd.cpp @@ -70,7 +70,7 @@ CD Interface Register 0x0f - ADPCM fade in/out register #include "emu.h" #include "coreutil.h" -#include "machine/pce_cd.h" +#include "pce_cd.h" #define PCE_CD_CLOCK 9216000 diff --git a/src/mame/nec/pce_m.cpp b/src/mame/nec/pce_m.cpp index 8f2f456f264..015dae8f4ce 100644 --- a/src/mame/nec/pce_m.cpp +++ b/src/mame/nec/pce_m.cpp @@ -69,7 +69,7 @@ CD Interface Register 0x0f - ADPCM fade in/out register #include "emu.h" #include "cpu/h6280/h6280.h" -#include "includes/pce.h" +#include "pce.h" /* joystick related data*/ diff --git a/src/mame/neogeo/midas.cpp b/src/mame/neogeo/midas.cpp index c8c86d209bd..3419f0acd82 100644 --- a/src/mame/neogeo/midas.cpp +++ b/src/mame/neogeo/midas.cpp @@ -52,7 +52,7 @@ *************************************************************************************************************/ #include "emu.h" -#include "includes/neogeo.h" +#include "neogeo.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" @@ -64,6 +64,8 @@ #include "speaker.h" +namespace { + class midas_state : public driver_device { public: @@ -911,5 +913,8 @@ ROM_START( hammer ) /* uploaded */ ROM_END +} // anonymous namespace + + GAME( 1999, livequiz, 0, livequiz, livequiz, midas_state, init_livequiz, ROT0, "Andamiro", "Live Quiz Show", 0 ) GAME( 2000, hammer, 0, hammer, hammer, midas_state, empty_init, ROT0, "Andamiro", "Hammer", 0 ) diff --git a/src/mame/neogeo/neogeo.cpp b/src/mame/neogeo/neogeo.cpp index 2a9f5f5944a..21327a5af41 100644 --- a/src/mame/neogeo/neogeo.cpp +++ b/src/mame/neogeo/neogeo.cpp @@ -551,7 +551,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/neogeo.h" +#include "neogeo.h" #include "machine/nvram.h" #include "machine/watchdog.h" diff --git a/src/mame/neogeo/neogeo.h b/src/mame/neogeo/neogeo.h index e27a5bf4ea4..4c386ad6254 100644 --- a/src/mame/neogeo/neogeo.h +++ b/src/mame/neogeo/neogeo.h @@ -18,8 +18,8 @@ #include "machine/gen_latch.h" #include "machine/input_merger.h" #include "machine/upd1990a.h" -#include "machine/ng_memcard.h" -#include "video/neogeo_spr.h" +#include "ng_memcard.h" +#include "neogeo_spr.h" #include "bus/neogeo/slot.h" #include "bus/neogeo/carts.h" diff --git a/src/mame/neogeo/neogeo_v.cpp b/src/mame/neogeo/neogeo_v.cpp index 256ecf79cf1..8f334ec913c 100644 --- a/src/mame/neogeo/neogeo_v.cpp +++ b/src/mame/neogeo/neogeo_v.cpp @@ -8,7 +8,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/neogeo.h" +#include "neogeo.h" #include "video/resnet.h" #define VERBOSE (0) diff --git a/src/mame/neogeo/neogeocd.cpp b/src/mame/neogeo/neogeocd.cpp new file mode 100644 index 00000000000..6b4a8166abe --- /dev/null +++ b/src/mame/neogeo/neogeocd.cpp @@ -0,0 +1,1127 @@ +// license:BSD-3-Clause +// copyright-holders:Bryan McPhail,Ernesto Corvi,Andrew Prime,Zsolt Vasvari +// thanks-to:Fuzz +/*************************************************************************** + + Neo-Geo CD hardware + + Thanks to: + * Jan Klaassen (of the former FBA team) for much of the CDC / CDD code and system details. + * Mirko Buffoni for a commented disassembly of the NeoCD bios rom. + + Current status: + - NeoCDZ runs, the original NeoCD does not + - Might think the tray is open? (check) + - Some unknown / unhandled CD commands, code is still a bit messy + - CDDA continues to play during loading, should stop it + - Games using Raster Effects are broken without a kludge + - CPU gets overloaded with IRQs from the timer callback... + - Double Dragon doesn't load, it erases the IRQ table + - might need better handling of the Vector Table Mapping, or better interrupts (see point above) + - Softlist are based on an old Tosec set and should be updated to the TruRip set once we can convert CCD + without throwing away gap data etc. + +****************************************************************************/ + +#include "emu.h" +#include "neogeo.h" + +#include "megacdcd.h" + +#include "imagedev/chd_cd.h" +#include "machine/74259.h" +#include "machine/nvram.h" + +#include "softlist.h" + + +// was it actually released in eu / asia? +#define NEOCD_REGION_ASIA 3 // IronClad runs with a darkened screen (MVS has the same issue) +#define NEOCD_REGION_EUROPE 2 // ^ +#define NEOCD_REGION_US 1 +#define NEOCD_REGION_JAPAN 0 + + +class ngcd_state : public aes_base_state +{ +public: + ngcd_state(const machine_config &mconfig, device_type type, const char *tag) + : aes_base_state(mconfig, type, tag) + , m_tempcdc(*this, "tempcdc") + , m_z80_ram(*this, "z80_ram") + , m_adpcm_ram(*this, "adpcm_ram") + { + m_dma_address1 = 0; + m_dma_address2 = 0; + m_dma_value1 = 0; + m_dma_value2 = 0; + m_dma_count = 0; + m_dma_mode = 0; + m_irq_ack = ~0; + m_irq_vector_ack = 0; + m_irq_vector = 0; + m_has_sprite_bus = true; + m_has_text_bus = true; + m_has_ymrom_bus = true; + m_has_z80_bus = true; + } + + optional_device m_tempcdc; + required_shared_ptr m_z80_ram; + required_shared_ptr m_adpcm_ram; + + void do_dma(address_space& curr_space); + void set_dma_regs(int offset, uint16_t wordValue); + + uint16_t memcard_r(offs_t offset); + void memcard_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t control_r(offs_t offset); + void control_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t transfer_r(offs_t offset); + void transfer_w(offs_t offset, uint8_t data); + + DECLARE_INPUT_CHANGED_MEMBER(aes_jp1); + + // neoCD + uint8_t m_system_region = 0; + int32_t m_active_transfer_area = 0; + int32_t m_sprite_transfer_bank = 0; + int32_t m_adpcm_transfer_bank = 0; + int32_t m_dma_address1; + int32_t m_dma_address2; + int32_t m_dma_value1; + int32_t m_dma_value2; + int32_t m_dma_count; + int32_t m_dma_mode; + int32_t m_irq_ack; + int m_irq_vector_ack; + int m_irq_vector; + + bool m_has_sprite_bus; + bool m_has_text_bus; + bool m_has_ymrom_bus; + bool m_has_z80_bus; + + int get_irq_vector_ack(void) { return m_irq_vector_ack; } + void set_irq_vector_ack(int val) { m_irq_vector_ack = val; } + int get_irq_vector(void) { return m_irq_vector; } + void irq_update(uint8_t byteValue); + + // from the CDC + void interrupt_callback_type1(void); + void interrupt_callback_type2(void); + void interrupt_callback_type3(void); + + uint8_t m_transfer_write_enable = 0; + + bool prohibit_cdc_irq = false; // hack? + + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + + void init_neocdz(); + void init_neocdzj(); + + uint8_t cdc_irq_ack(); + + std::unique_ptr m_meminternal_data; + std::unique_ptr m_sprite_ram; + std::unique_ptr m_fix_ram; + + void neocd_ntsc(machine_config &config); + void neocd_audio_io_map(address_map &map); + void neocd_audio_map(address_map &map); + void neocd_main_map(address_map &map); + void neocd_vector_map(address_map &map); + void neocd_ym_map(address_map &map); + +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + + int32_t SekIdle(int32_t nCycles); +}; + + + +/************************************* + * + * Memory card + * + *************************************/ + +#define MEMCARD_SIZE 0x0800 + + +/* The NeoCD has an 8kB internal memory card, instead of memcard slots like the MVS and AES */ +uint16_t ngcd_state::memcard_r(offs_t offset) +{ + return m_meminternal_data[offset] | 0xff00; +} + + +void ngcd_state::memcard_w(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + if (ACCESSING_BITS_0_7) + { + m_meminternal_data[offset] = data; + } +} + + +/************************************* + * + * System control register + * + *************************************/ + +uint16_t ngcd_state::control_r(offs_t offset) +{ + uint32_t sekAddress = 0xff0000+ (offset*2); + + switch (sekAddress & 0xFFFF) { + case 0x0016: + return m_tempcdc->nff0016_r(); + + // LC8951 registers + case 0x0100: + return m_tempcdc->segacd_cdc_mode_address_r(); + case 0x0102: + return m_tempcdc->CDC_Reg_r(); + + // CD mechanism communication + case 0x0160: + return m_tempcdc->neocd_cdd_rx_r(); + + case 0x011C: // region + return ~((0x10 | (m_system_region & 3)) << 8); + } + + +// bprintf(PRINT_NORMAL, _T(" - NGCD port 0x%06X read (word, PC: 0x%06X)\n"), sekAddress, SekGetPC(-1)); + + return ~0; +} + + +void ngcd_state::control_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) +{ + uint32_t sekAddress = 0xff0000+ (offset*2); + uint16_t wordValue = data; + +// bprintf(PRINT_NORMAL, _T(" - NGCD port 0x%06X -> 0x%04X (PC: 0x%06X)\n"), sekAddress, wordValue, SekGetPC(-1)); + int byteValue = wordValue & 0xff; + + switch (sekAddress & 0xFFFE) { + case 0x0002: + + m_tempcdc->nff0002_set(wordValue); + + break; + + case 0x000E: + irq_update(wordValue); // irqack + break; + + case 0x0016: + m_tempcdc->nff0016_set(byteValue); + break; + + // DMA controller + case 0x0060: + if (byteValue & 0x40) { + do_dma(space); + } + break; + + case 0x0064: + case 0x0066: + case 0x0068: + case 0x006A: + case 0x006C: + case 0x006E: + case 0x0070: + case 0x0072: + case 0x007E: + set_dma_regs(sekAddress & 0xFFFE, wordValue); + break; + + // upload DMA controller program + + case 0x0080: + case 0x0082: + case 0x0084: + case 0x0086: + case 0x0088: + case 0x008A: + case 0x008C: + case 0x008E: +// bprintf(PRINT_NORMAL, _T(" - DMA controller program[%02i] -> 0x%04X (PC: 0x%06X)\n"), sekAddress & 0x0F, wordValue, SekGetPC(-1)); + break; + + // LC8951 registers + case 0x0100: + m_tempcdc->segacd_cdc_mode_address_w(0, byteValue, 0xffff); + break; + case 0x0102: + m_tempcdc->CDC_Reg_w(byteValue); + break; + + case 0x0104: +// bprintf(PRINT_NORMAL, _T(" - NGCD 0xE00000 area -> 0x%02X (PC: 0x%06X)\n"), byteValue, SekGetPC(-1)); + if (ACCESSING_BITS_0_7) + { + m_active_transfer_area = byteValue; + } + break; + + case 0x0120: +// bprintf(PRINT_NORMAL, _T(" - NGCD OBJ BUSREQ -> 1 (PC: 0x%06X)\n"), SekGetPC(-1)); + m_has_sprite_bus = false; + break; + case 0x0122: +// bprintf(PRINT_NORMAL, _T(" - NGCD PCM BUSREQ -> 1 (PC: 0x%06X) %x\n"), SekGetPC(-1), byteValue); + m_has_ymrom_bus = false; + break; + case 0x0126: +// bprintf(PRINT_NORMAL, _T(" - NGCD Z80 BUSREQ -> 1 (PC: 0x%06X)\n"), SekGetPC(-1)); + m_has_z80_bus = false; + machine().scheduler().synchronize(); + m_audiocpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); + break; + case 0x0128: +// bprintf(PRINT_NORMAL, _T(" - NGCD FIX BUSREQ -> 1 (PC: 0x%06X)\n"), SekGetPC(-1)); + m_has_text_bus = false; + break; + case 0x0140: +// bprintf(PRINT_NORMAL, _T(" - NGCD OBJ BUSREQ -> 0 (PC: 0x%06X)\n"), SekGetPC(-1)); + m_has_sprite_bus = true; + m_sprgen->optimize_sprite_data(); + break; + case 0x0142: +// bprintf(PRINT_NORMAL, _T(" - NGCD PCM BUSREQ -> 0 (PC: 0x%06X)\n"), SekGetPC(-1)); + m_has_ymrom_bus = true; + break; + case 0x0146: +// bprintf(PRINT_NORMAL, _T(" - NGCD Z80 BUSREQ -> 0 (PC: 0x%06X)\n"), SekGetPC(-1)); + m_has_z80_bus = true; + machine().scheduler().synchronize(); + m_audiocpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); + break; + case 0x0148: +// bprintf(PRINT_NORMAL, _T(" - NGCD FIX BUSREQ -> 0 (PC: 0x%06X)\n"), SekGetPC(-1)); + m_has_text_bus = true; + break; + + // CD mechanism communication + case 0x0162: + m_tempcdc->neocd_cdd_tx_w(byteValue); + break; + case 0x0164: + m_tempcdc->NeoCDCommsControl(byteValue & 1, byteValue & 2); + break; + + case 0x016c: +// bprintf(PRINT_ERROR, _T(" - NGCD port 0x%06X -> 0x%02X (PC: 0x%06X)\n"), sekAddress, byteValue, SekGetPC(-1)); + //MapVectorTable(!(byteValue == 0xFF)); + if (ACCESSING_BITS_0_7) + { + // even like this doubledr ends up mapping vectors in, then erasing them causing the loading to crash?? + // is there some way to enable write protection on the RAM vector area or is it some IRQ masking issue? + // the games still write to the normal address for this too? + // writes 00 / 01 / ff + printf("MapVectorTable? %04x %04x\n",data,mem_mask); + + //m_bank_vectors->set_entry(data == 0 ? 0 : 1); + m_use_cart_vectors = (data == 0 ? 0 : 1); + } + +//extern int32_t bRunPause; +//bRunPause = 1; + break; + + case 0x016e: +// bprintf(PRINT_IMPORTANT, _T(" - NGCD 0xE00000 area write access %s (0x%02X, PC: 0x%06X)\n"), byteValue ? _T("enabled") : _T("disabled"), byteValue, SekGetPC(-1)); + + m_transfer_write_enable = byteValue; + break; + + case 0x0180: { + // 1 during CD access, 0 otherwise, written frequently + //printf("reset cdc %04x %04x\n",data, mem_mask); + + if (ACCESSING_BITS_0_7) + { + if (data==0x00) + { + // not a good idea, causes hangs + // m_tempcdc->NeoCDCommsReset(); + + // I doubt this is correct either, but we need something to stop + // the interrupts during gameplay and I'm not sure what... + prohibit_cdc_irq = true; + } + else + { + prohibit_cdc_irq = false; + } + } + break; + } + case 0x0182: { + // printf("blah %02x\n", byteValue); + if (byteValue == 0x00) + { + m_ym->reset(); + m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); + } + else m_audiocpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); + + break; + } + case 0x01A0: + m_sprite_transfer_bank = (byteValue & 3) << 20; + break; + case 0x01A2: + m_adpcm_transfer_bank = (byteValue & 1) << 19; + break; + + + default: { +// bprintf(PRINT_NORMAL, _T(" - NGCD port 0x%06X -> 0x%04X (PC: 0x%06X)\n"), sekAddress, wordValue, SekGetPC(-1)); + } + } + +} + + + + +/* + * Handling NeoCD banked RAM + * When the Z80 space is banked in to 0xe00000, only the low byte of each word is used + */ + + +uint8_t ngcd_state::transfer_r(offs_t offset) +{ + uint32_t sekAddress = 0xe00000+ (offset); + int address; + sekAddress ^= 1; + + switch (m_active_transfer_area) { + case 0: // Sprites + address = (m_sprite_transfer_bank + (sekAddress & 0x0FFFFF)); + + // address is swizzled a bit due to out sprite decoding + if ((address&3)==0) return m_sprite_ram[address]; + if ((address&3)==1) return m_sprite_ram[address^3]; + if ((address&3)==2) return m_sprite_ram[address^3]; + if ((address&3)==3) return m_sprite_ram[address]; + + return m_sprite_ram[m_sprite_transfer_bank + (sekAddress & 0x0FFFFF)]; + case 1: // ADPCM + return m_adpcm_ram[m_adpcm_transfer_bank + ((sekAddress & 0x0FFFFF) >> 1)]; + case 4: // Z80 + if ((sekAddress & 0xfffff) >= 0x20000) return ~0; + return m_z80_ram[(sekAddress & 0x1FFFF) >> 1]; + case 5: // Text + return m_fix_ram[(sekAddress & 0x3FFFF) >> 1]; + } + + return ~0; + +} + +void ngcd_state::transfer_w(offs_t offset, uint8_t data) +{ + uint8_t byteValue = data; + uint32_t sekAddress = 0xe00000+ (offset); + + if (!m_transfer_write_enable) { +// return; + } + int address; + + sekAddress ^= 1; + + switch (m_active_transfer_area) { + case 0: // Sprites + address = (m_sprite_transfer_bank + (sekAddress & 0x0FFFFF)); + + // address is swizzled a bit due to out sprite decoding + if ((address&3)==0) m_sprite_ram[address] = byteValue; + if ((address&3)==1) m_sprite_ram[address^3] = byteValue; + if ((address&3)==2) m_sprite_ram[address^3] = byteValue; + if ((address&3)==3) m_sprite_ram[address] = byteValue; + + break; + case 1: // ADPCM + m_adpcm_ram[m_adpcm_transfer_bank + ((sekAddress & 0x0FFFFF) >> 1)] = byteValue; + break; + case 4: // Z80 + + // kof98 and lresort attempt to write here when the system still has the z80 bank + // it seems they attempt to write regular samples (not even deltat) maybe there is + // some kind of fall-through behavior, or it shouldn't be allowed to select a + // transfer area without the bus? - this should really be checked on hw + if (m_has_z80_bus) + { + m_adpcm_ram[m_adpcm_transfer_bank + ((sekAddress & 0x0FFFFF) >> 1)] = byteValue; + } + else + { + // printf("sekAddress %08x %02x\n", sekAddress, data); + if ((sekAddress & 0xfffff) >= 0x20000) break; + m_z80_ram[(sekAddress & 0x1FFFF) >> 1] = byteValue; + } + break; + case 5: // Text + m_fix_ram[(sekAddress & 0x3FFFF) >> 1] = byteValue; + break; + } +} + + + +void ngcd_state::set_dma_regs(int offset, uint16_t wordValue) +{ + switch (offset) + { + case 0x0064: + m_dma_address1 &= 0x0000FFFF; + m_dma_address1 |= wordValue << 16; + break; + case 0x0066: + m_dma_address1 &= 0xFFFF0000; + m_dma_address1 |= wordValue; + break; + case 0x0068: + m_dma_address2 &= 0x0000FFFF; + m_dma_address2 |= wordValue << 16; + break; + case 0x006A: + m_dma_address2 &= 0xFFFF0000; + m_dma_address2 |= wordValue; + break; + case 0x006C: + m_dma_value1 = wordValue; + break; + case 0x006E: + m_dma_value2 = wordValue; + break; + case 0x0070: + m_dma_count &= 0x0000FFFF; + m_dma_count |= wordValue << 16; + break; + case 0x0072: + m_dma_count &= 0xFFFF0000; + m_dma_count |= wordValue; + break; + + case 0x007E: + m_dma_mode = wordValue; +// bprintf(PRINT_NORMAL, _T(" - DMA controller 0x%2X -> 0x%04X (PC: 0x%06X)\n"), sekAddress & 0xFF, wordValue, SekGetPC(-1)); + break; + + } +} + + + +int32_t ngcd_state::SekIdle(int32_t nCycles) +{ + return nCycles; +} + + + +/* + * CD-ROM / DMA control + * + * DMA + + FF0061 Write 0x40 means start DMA transfer + FF0064 Source address (in copy mode), Target address (in fill mode) + FF0068 Target address (in copy mode) + FF006C Fill word + FF0070 Words count + FF007E \ + ...... | DMA programming words? NeoGeoCD uses Sanyo Puppet LC8359 chip to + FF008E / interface with CD, and do DMA transfers + + Memory access control + + FF011C DIP SWITCH (Region code) + FF0105 Area Selector (5 = FIX, 0 = SPR, 4 = Z80, 1 = PCM) + FF01A1 Sprite bank selector + FF01A3 PCM bank selector + FF0120 Prepare sprite area for transfer + FF0122 Prepare PCM area for transfer + FF0126 Prepare Z80 area for transfer + FF0128 Prepare Fix area for transfer + FF0140 Terminate work on Spr Area (Sprites must be decoded here) + FF0142 Terminate work on Pcm Area + FF0146 Terminate work on Z80 Area (Z80 needs to be reset) + FF0148 Terminate work on Fix Area + + CD-ROM: + 0xff0102 == 0xF0 start cd transfer + int m=bcd(fast_r8(0x10f6c8)); + int s=bcd(fast_r8(0x10f6c9)); + int f=bcd(fast_r8(0x10f6ca)); + int seccount=fast_r16(0x10f688); + + inisec=((m*60)+s)*75+f; + inisec-=150; + dstaddr=0x111204; // this must come from somewhere + + the value @ 0x10f688 is decremented each time a sector is read until it's 0. + + * + */ + + +void ngcd_state::do_dma(address_space& curr_space) +{ + // The LC8953 chip has a programmable DMA controller, which is not properly emulated. + // Since the software only uses it in a limited way, we can apply a simple heuristic + // to determine the requested operation. + + // Additionally, we don't know how many cycles DMA operations take. + // Here, only bus access is used to get a rough approximation -- + // each read/write takes a single cycle, setup and everything else is ignored. + +// bprintf(PRINT_IMPORTANT, _T(" - DMA controller transfer started (PC: 0x%06X)\n"), SekGetPC(-1)); + + switch (m_dma_mode) { + case 0xCFFD: { +// bprintf(PRINT_NORMAL, _T(" adr : 0x%08X - 0x%08X <- address, skip odd bytes\n"), m_dma_address1, m_dma_address1 + m_dma_count * 8); + + // - DMA controller 0x7E -> 0xCFFD (PC: 0xC07CE2) + // - DMA controller program[00] -> 0xFCF5 (PC: 0xC07CE8) + // - DMA controller program[02] -> 0xE8DA (PC: 0xC07CEE) + // - DMA controller program[04] -> 0x92DA (PC: 0xC07CF4) + // - DMA controller program[06] -> 0x92DB (PC: 0xC07CFA) + // - DMA controller program[08] -> 0x96DB (PC: 0xC07D00) + // - DMA controller program[10] -> 0x96F6 (PC: 0xC07D06) + // - DMA controller program[12] -> 0x2E02 (PC: 0xC07D0C) + // - DMA controller program[14] -> 0xFDFF (PC: 0xC07D12) + + SekIdle(m_dma_count * 4); + + while (m_dma_count--) { + curr_space.write_word(m_dma_address1 + 0, m_dma_address1 >> 24); + curr_space.write_word(m_dma_address1 + 2, m_dma_address1 >> 16); + curr_space.write_word(m_dma_address1 + 4, m_dma_address1 >> 8); + curr_space.write_word(m_dma_address1 + 6, m_dma_address1 >> 0); + m_dma_address1 += 8; + } + + break; + } + + case 0xE2DD: { +// bprintf(PRINT_NORMAL, _T(" copy: 0x%08X - 0x%08X <- 0x%08X - 0x%08X, skip odd bytes\n"), m_dma_address2, m_dma_address2 + m_dma_count * 2, m_dma_address1, m_dma_address1 + m_dma_count * 4); + + // - DMA controller 0x7E -> 0xE2DD (PC: 0xC0A190) + // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0A192) + // - DMA controller program[02] -> 0x82BE (PC: 0xC0A194) + // - DMA controller program[04] -> 0x93DA (PC: 0xC0A196) + // - DMA controller program[06] -> 0xBE93 (PC: 0xC0A198) + // - DMA controller program[08] -> 0xDABE (PC: 0xC0A19A) + // - DMA controller program[10] -> 0xF62D (PC: 0xC0A19C) + // - DMA controller program[12] -> 0x02FD (PC: 0xC0A19E) + // - DMA controller program[14] -> 0xFFFF (PC: 0xC0A1A0) + + SekIdle(m_dma_count * 1); + + while (m_dma_count--) { + curr_space.write_word(m_dma_address2 + 0, curr_space.read_byte(m_dma_address1 + 0)); + curr_space.write_word(m_dma_address2 + 2, curr_space.read_byte(m_dma_address1 + 1)); + m_dma_address1 += 2; + m_dma_address2 += 4; + } + + break; + } + + case 0xFC2D: { +// bprintf(PRINT_NORMAL, _T(" copy: 0x%08X - 0x%08X <- LC8951 external buffer, skip odd bytes\n"), m_dma_address1, m_dma_address1 + m_dma_count * 4); + + // - DMA controller 0x7E -> 0xFC2D (PC: 0xC0A190) + // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0A192) + // - DMA controller program[02] -> 0x8492 (PC: 0xC0A194) + // - DMA controller program[04] -> 0xDA92 (PC: 0xC0A196) + // - DMA controller program[06] -> 0xDAF6 (PC: 0xC0A198) + // - DMA controller program[08] -> 0x2A02 (PC: 0xC0A19A) + // - DMA controller program[10] -> 0xFDFF (PC: 0xC0A19C) + // - DMA controller program[12] -> 0x48E7 (PC: 0xC0A19E) + // - DMA controller program[14] -> 0xFFFE (PC: 0xC0A1A0) + + char* data = m_tempcdc->LC8915InitTransfer(m_dma_count); + if (data == nullptr) { + break; + } + + SekIdle(m_dma_count * 4); + + while (m_dma_count--) { + curr_space.write_byte(m_dma_address1 + 0, data[0]); + curr_space.write_byte(m_dma_address1 + 2, data[1]); + m_dma_address1 += 4; + data += 2; + } + + m_tempcdc->LC8915EndTransfer(); + + break; + } + + case 0xFE3D: + + // - DMA controller 0x7E -> 0xFE3D (PC: 0xC0A190) + // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0A192) + // - DMA controller program[02] -> 0x82BF (PC: 0xC0A194) + // - DMA controller program[04] -> 0x93BF (PC: 0xC0A196) + // - DMA controller program[06] -> 0xF629 (PC: 0xC0A198) + // - DMA controller program[08] -> 0x02FD (PC: 0xC0A19A) + // - DMA controller program[10] -> 0xFFFF (PC: 0xC0A19C) + // - DMA controller program[12] -> 0xF17D (PC: 0xC0A19E) + // - DMA controller program[14] -> 0xFCF5 (PC: 0xC0A1A0) + + case 0xFE6D: { +// bprintf(PRINT_NORMAL, _T(" copy: 0x%08X - 0x%08X <- 0x%08X - 0x%08X\n"), m_dma_address2, m_dma_address2 + m_dma_count * 2, m_dma_address1, m_dma_address1 + m_dma_count * 2); + + // - DMA controller 0x7E -> 0xFE6D (PC: 0xC0FD7A) + // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0FD7C) + // - DMA controller program[02] -> 0x82BF (PC: 0xC0FD7E) + // - DMA controller program[04] -> 0xF693 (PC: 0xC0FD80) + // - DMA controller program[06] -> 0xBF29 (PC: 0xC0FD82) + // - DMA controller program[08] -> 0x02FD (PC: 0xC0FD84) + // - DMA controller program[10] -> 0xFFFF (PC: 0xC0FD86) + // - DMA controller program[12] -> 0xC515 (PC: 0xC0FD88) + // - DMA controller program[14] -> 0xFCF5 (PC: 0xC0FD8A) + + SekIdle(m_dma_count * 1); + + while (m_dma_count--) { + curr_space.write_word(m_dma_address2, curr_space.read_word(m_dma_address1)); + m_dma_address1 += 2; + m_dma_address2 += 2; + } + +if (m_dma_address2 == 0x0800) { +// MapVectorTable(false); +// bprintf(PRINT_ERROR, _T(" RAM vectors mapped (PC = 0x%08X\n"), SekGetPC(0)); +// extern int32_t bRunPause; +// bRunPause = 1; +} + break; + } + + case 0xFEF5: { +// bprintf(PRINT_NORMAL, _T(" adr : 0x%08X - 0x%08X <- address\n"), m_dma_address1, m_dma_address1 + m_dma_count * 4); + + // - DMA controller 0x7E -> 0xFEF5 (PC: 0xC07CE2) + // - DMA controller program[00] -> 0xFCF5 (PC: 0xC07CE8) + // - DMA controller program[02] -> 0x92E8 (PC: 0xC07CEE) + // - DMA controller program[04] -> 0xBE96 (PC: 0xC07CF4) + // - DMA controller program[06] -> 0xF629 (PC: 0xC07CFA) + // - DMA controller program[08] -> 0x02FD (PC: 0xC07D00) + // - DMA controller program[10] -> 0xFFFF (PC: 0xC07D06) + // - DMA controller program[12] -> 0xFC3D (PC: 0xC07D0C) + // - DMA controller program[14] -> 0xFCF5 (PC: 0xC07D12) + + SekIdle(m_dma_count * 2); + + while (m_dma_count--) { + curr_space.write_word(m_dma_address1 + 0, m_dma_address1 >> 16); + curr_space.write_word(m_dma_address1 + 2, m_dma_address1 >> 0); + m_dma_address1 += 4; + } + + break; + } + + case 0xFFC5: { +// bprintf(PRINT_NORMAL, _T(" copy: 0x%08X - 0x%08X <- LC8951 external buffer\n"), m_dma_address1, m_dma_address1 + m_dma_count * 2); + + // - DMA controller 0x7E -> 0xFFC5 (PC: 0xC0A190) + // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0A192) + // - DMA controller program[02] -> 0xA6F6 (PC: 0xC0A194) + // - DMA controller program[04] -> 0x2602 (PC: 0xC0A196) + // - DMA controller program[06] -> 0xFDFF (PC: 0xC0A198) + // - DMA controller program[08] -> 0xFC2D (PC: 0xC0A19A) + // - DMA controller program[10] -> 0xFCF5 (PC: 0xC0A19C) + // - DMA controller program[12] -> 0x8492 (PC: 0xC0A19E) + // - DMA controller program[14] -> 0xDA92 (PC: 0xC0A1A0) + + char* data = m_tempcdc->LC8915InitTransfer(m_dma_count); + if (data == nullptr) { + break; + } + + SekIdle(m_dma_count * 4); + + while (m_dma_count--) { + curr_space.write_byte(m_dma_address1 + 0, data[0]); + curr_space.write_byte(m_dma_address1 + 1, data[1]); + m_dma_address1 += 2; + data += 2; + } + + m_tempcdc->LC8915EndTransfer(); + + break; + } + + case 0xFFCD: + + // - DMA controller 0x7E -> 0xFFCD (PC: 0xC0A190) + // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0A192) + // - DMA controller program[02] -> 0x92F6 (PC: 0xC0A194) + // - DMA controller program[04] -> 0x2602 (PC: 0xC0A196) + // - DMA controller program[06] -> 0xFDFF (PC: 0xC0A198) + // - DMA controller program[08] -> 0x7006 (PC: 0xC0A19A) + // - DMA controller program[10] -> 0x6100 (PC: 0xC0A19C) + // - DMA controller program[12] -> 0x2412 (PC: 0xC0A19E) + // - DMA controller program[14] -> 0x13FC (PC: 0xC0A1A0) + + case 0xFFDD: { +// bprintf(PRINT_NORMAL, _T(" Fill: 0x%08X - 0x%08X <- 0x%04X\n"), m_dma_address1, m_dma_address1 + m_dma_count * 2, m_dma_value1); + + // - DMA controller 0x7E -> 0xFFDD (PC: 0xC07CE2) + // - DMA controller program[00] -> 0xFCF5 (PC: 0xC07CE8) + // - DMA controller program[02] -> 0x92F6 (PC: 0xC07CEE) + // - DMA controller program[04] -> 0x2602 (PC: 0xC07CF4) + // - DMA controller program[06] -> 0xFDFF (PC: 0xC07CFA) + // - DMA controller program[08] -> 0xFFFF (PC: 0xC07D00) + // - DMA controller program[10] -> 0xFCF5 (PC: 0xC07D06) + // - DMA controller program[12] -> 0x8AF0 (PC: 0xC07D0C) + // - DMA controller program[14] -> 0x1609 (PC: 0xC07D12) + + SekIdle(m_dma_count * 1); + + while (m_dma_count--) { + curr_space.write_word(m_dma_address1, m_dma_value1); + m_dma_address1 += 2; + } + + break; + } + default: { + //bprintf(PRINT_ERROR, _T(" Unknown transfer type 0x%04X (PC: 0x%06X)\n"), m_dma_mode, SekGetPC(-1)); + //bprintf(PRINT_NORMAL, _T(" ??? : 0x%08X 0x%08X 0x%04X 0x%04X 0x%08X\n"), m_dma_address1, m_dma_address2, m_dma_value1, m_dma_value2, m_dma_count); + +//extern int32_t bRunPause; +//bRunPause = 1; + + } + } +} + + +/************************************* + * + * Machine initialization + * + *************************************/ + +void ngcd_state::machine_start() +{ + aes_base_state::machine_start(); + + // set curr_slot to 0, so to allow checking m_slots[m_curr_slot] != nullptr + m_curr_slot = 0; + + // initialize sprite to point to memory regions + m_sprite_ram = make_unique_clear(0x400000); + m_fix_ram = make_unique_clear(0x20000); + save_pointer(NAME(m_sprite_ram), 0x400000); + save_pointer(NAME(m_fix_ram), 0x20000); + + m_sprgen->set_sprite_region(m_sprite_ram.get(), 0x400000); + m_sprgen->set_fixed_regions(m_fix_ram.get(), 0x20000, nullptr); + m_sprgen->neogeo_set_fixed_layer_source(1); + + // irq levels for NEOCD (swapped compared to MVS / AES) + m_vblank_level = 2; + m_raster_level = 1; + + // initialize the memcard data structure + // NeoCD doesn't have memcard slots, rather, it has a larger internal memory which works the same + m_meminternal_data = make_unique_clear(0x2000); + subdevice("saveram")->set_base(m_meminternal_data.get(), 0x2000); + save_pointer(NAME(m_meminternal_data), 0x2000); + + m_tempcdc->reset_cd(); +} + + +/************************************* + * + * Machine reset + * + *************************************/ + +void ngcd_state::machine_reset() +{ + aes_base_state::machine_reset(); + + m_tempcdc->NeoCDCommsReset(); + + m_audiocpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); + m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); + + m_transfer_write_enable = 0; +} + + +/************************************* + * + * Main CPU memory handlers + * + *************************************/ + +void ngcd_state::neocd_main_map(address_map &map) +{ + aes_base_main_map(map); + + map(0x000000, 0x1fffff).ram().share("maincpu"); + map(0x000000, 0x00007f).r(FUNC(ngcd_state::banked_vectors_r)); // writes will fall through to area above + + map(0x800000, 0x803fff).rw(FUNC(ngcd_state::memcard_r), FUNC(ngcd_state::memcard_w)); + map(0xc00000, 0xc7ffff).mirror(0x080000).rom().region("mainbios", 0); + map(0xd00000, 0xdfffff).r(FUNC(ngcd_state::unmapped_r)); + map(0xe00000, 0xefffff).rw(FUNC(ngcd_state::transfer_r), FUNC(ngcd_state::transfer_w)); + map(0xf00000, 0xfeffff).r(FUNC(ngcd_state::unmapped_r)); + map(0xff0000, 0xff01ff).rw(FUNC(ngcd_state::control_r), FUNC(ngcd_state::control_w)); // CDROM / DMA + map(0xff0200, 0xffffff).r(FUNC(ngcd_state::unmapped_r)); +} + +void ngcd_state::neocd_vector_map(address_map &map) +{ + map(0xfffff0, 0xffffff).m(m_maincpu, FUNC(m68000_base_device::autovectors_map)); + map(0xfffff9, 0xfffff9).r(FUNC(ngcd_state::cdc_irq_ack)); +} + + +/************************************* + * + * Audio CPU port handlers + * + *************************************/ + + +void ngcd_state::neocd_audio_map(address_map &map) +{ + map(0x0000, 0xffff).ram().share("z80_ram"); +} + + +void ngcd_state::neocd_audio_io_map(address_map &map) +{ + map(0x00, 0x00).mirror(0xff00).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::clear_w)); + map(0x04, 0x07).mirror(0xff00).rw(m_ym, FUNC(ym2610_device::read), FUNC(ym2610_device::write)); + map(0x08, 0x08).mirror(0xff00).select(0x0010).w(FUNC(ngcd_state::audio_cpu_enable_nmi_w)); + // banking reads are actually NOP on NeoCD? but some games still access them +// map(0x08, 0x0b).mirror(0x00f0).select(0xff00).r(FUNC(ngcd_state::audio_cpu_bank_select_r)); + map(0x0c, 0x0c).mirror(0xff00).w(m_soundlatch2, FUNC(generic_latch_8_device::write)); + + // ?? + map(0x80, 0x80).mirror(0xff00).nopw(); + map(0xc0, 0xc0).mirror(0xff00).nopw(); + map(0xc1, 0xc1).mirror(0xff00).nopw(); +} + +void ngcd_state::neocd_ym_map(address_map &map) +{ + map(0x000000, 0x0fffff).ram().share("adpcm_ram"); +} + + +/************************************* + * + * Input port definitions + * + *************************************/ + +static INPUT_PORTS_START( neocd ) + PORT_INCLUDE( aes ) + + PORT_MODIFY("IN2") + PORT_BIT( 0x7000, IP_ACTIVE_HIGH, IPT_UNUSED ) // the NeoCD memcard is internal +INPUT_PORTS_END + + + +/************************************* + * + * Machine driver + * + *************************************/ + + +/* NeoCD uses custom vectors on IRQ4 to handle various events from the CDC */ + +uint8_t ngcd_state::cdc_irq_ack() +{ + if (get_irq_vector_ack()) { + set_irq_vector_ack(0); + return get_irq_vector(); + } + + return (0x60+4*4)/4; +} + +void ngcd_state::interrupt_callback_type1(void) +{ + m_irq_ack &= ~0x20; + irq_update(0); +} + +void ngcd_state::interrupt_callback_type2(void) +{ + m_irq_ack &= ~0x10; + irq_update(0); +} + +void ngcd_state::interrupt_callback_type3(void) +{ + m_irq_ack &= ~0x08; + irq_update(0); +} + + +void ngcd_state::irq_update(uint8_t byteValue) +{ + // do we also need to check the regular interrupts like FBA? + + m_irq_ack |= (byteValue & 0x38); + + if (!prohibit_cdc_irq) + { + if ((m_irq_ack & 0x08) == 0) { + m_irq_vector = 0x17; + m_irq_vector_ack = 1; + m_maincpu->set_input_line(4, HOLD_LINE); + return; + } + if ((m_irq_ack & 0x10) == 0) { + m_irq_vector = 0x16; + m_irq_vector_ack = 1; + m_maincpu->set_input_line(4, HOLD_LINE); + return; + } + if ((m_irq_ack & 0x20) == 0) { + m_irq_vector = 0x15; + m_irq_vector_ack = 1; + m_maincpu->set_input_line(4, HOLD_LINE); + return; + } + } +} + + +uint32_t ngcd_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + // fill with background color first + bitmap.fill(*m_bg_pen, cliprect); + + if (m_has_sprite_bus) m_sprgen->draw_sprites(bitmap, cliprect.min_y); + + if (m_has_text_bus) m_sprgen->draw_fixed_layer(bitmap, cliprect.min_y); + + return 0; +} + +// NTSC region +void ngcd_state::neocd_ntsc(machine_config &config) +{ + neogeo_base(config); + neogeo_stereo(config); + + m_maincpu->set_addrmap(AS_PROGRAM, &ngcd_state::neocd_main_map); + m_maincpu->set_addrmap(m68000_base_device::AS_CPU_SPACE, &ngcd_state::neocd_vector_map); + + m_audiocpu->set_addrmap(AS_PROGRAM, &ngcd_state::neocd_audio_map); + m_audiocpu->set_addrmap(AS_IO, &ngcd_state::neocd_audio_io_map); + + subdevice("systemlatch")->q_out_cb<1>().set_log("NeoCD: write to regular vector change address?"); // what IS going on with "neocdz doubledr" and why do games write here if it's hooked up to nothing? + + m_screen->set_screen_update(FUNC(ngcd_state::screen_update)); + + // temporary until things are cleaned up + LC89510_TEMP(config, m_tempcdc, 0); // cd controller + m_tempcdc->set_cdrom_tag("cdrom"); + m_tempcdc->set_is_neoCD(true); + m_tempcdc->set_type1_interrupt_callback(FUNC(ngcd_state::interrupt_callback_type1)); + m_tempcdc->set_type2_interrupt_callback(FUNC(ngcd_state::interrupt_callback_type2)); + m_tempcdc->set_type3_interrupt_callback(FUNC(ngcd_state::interrupt_callback_type3)); + + NVRAM(config, "saveram", nvram_device::DEFAULT_ALL_0); + + NEOGEO_CONTROL_PORT(config, m_ctrl1, neogeo_controls, "joy", false); + NEOGEO_CONTROL_PORT(config, m_ctrl2, neogeo_controls, "joy", false); + + CDROM(config, "cdrom").set_interface("neocd_cdrom"); + SOFTWARE_LIST(config, "cd_list").set_original("neocd"); + + m_ym->set_addrmap(0, &ngcd_state::neocd_ym_map); +} + + + +/************************************* + * + * Driver initialization + * + *************************************/ + +ROM_START( neocd ) + ROM_REGION16_BE( 0x80000, "mainbios", 0 ) + ROM_SYSTEM_BIOS( 0, "top", "Top loading Neo-Geo CD" ) + ROMX_LOAD("top-sp1.bin", 0x00000, 0x80000, CRC(c36a47c0) SHA1(235f4d1d74364415910f73c10ae5482d90b4274f), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(0)) + ROM_SYSTEM_BIOS( 1, "front", "Front loading Neo-Geo CD" ) + ROMX_LOAD("front-sp1.bin", 0x00000, 0x80000, CRC(cac62307) SHA1(53bc1f283cdf00fa2efbb79f2e36d4c8038d743a), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(1)) + ROM_SYSTEM_BIOS( 2, "unibios32", "Universe Bios (Hack, Ver. 3.2)" ) + ROMX_LOAD("uni-bioscd32.rom", 0x00000, 0x80000, CRC(0ffb3127) SHA1(5158b728e62b391fb69493743dcf7abbc62abc82), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(2)) + ROM_SYSTEM_BIOS( 3, "unibios33", "Universe Bios (Hack, Ver. 3.3)" ) + ROMX_LOAD("uni-bioscd33.rom", 0x00000, 0x80000, CRC(ff3abc59) SHA1(5142f205912869b673a71480c5828b1eaed782a8), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(3)) + + ROM_REGION( 0x20000, "spritegen:zoomy", 0 ) + ROM_LOAD( "000-lo.lo", 0x00000, 0x20000, CRC(5a86cff2) SHA1(5992277debadeb64d1c1c64b0a92d9293eaf7e4a) ) +ROM_END + +ROM_START( neocdz ) + ROM_REGION16_BE( 0x80000, "mainbios", 0 ) + ROM_SYSTEM_BIOS( 0, "official", "Official BIOS" ) + ROMX_LOAD("neocd.bin", 0x00000, 0x80000, CRC(df9de490) SHA1(7bb26d1e5d1e930515219cb18bcde5b7b23e2eda), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(0)) + ROM_SYSTEM_BIOS( 1, "unibios32", "Universe Bios (Hack, Ver. 3.2)" ) + ROMX_LOAD("uni-bioscd32.rom", 0x00000, 0x80000, CRC(0ffb3127) SHA1(5158b728e62b391fb69493743dcf7abbc62abc82), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(1)) + ROM_SYSTEM_BIOS( 2, "unibios33", "Universe Bios (Hack, Ver. 3.3)" ) + ROMX_LOAD("uni-bioscd33.rom", 0x00000, 0x80000, CRC(ff3abc59) SHA1(5142f205912869b673a71480c5828b1eaed782a8), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(2)) + + ROM_REGION( 0x20000, "spritegen:zoomy", 0 ) + ROM_LOAD( "000-lo.lo", 0x00000, 0x20000, CRC(5a86cff2) SHA1(5992277debadeb64d1c1c64b0a92d9293eaf7e4a) ) +ROM_END + +#define rom_neocdzj rom_neocdz + +void ngcd_state::init_neocdz() +{ + m_system_region = NEOCD_REGION_US; +} + +void ngcd_state::init_neocdzj() +{ + m_system_region = NEOCD_REGION_JAPAN; +} + + +// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ +CONS( 1996, neocdz, 0, 0, neocd_ntsc, neocd, ngcd_state, init_neocdz, "SNK", "Neo-Geo CDZ (US)", 0 ) // the CDZ is the newer model +CONS( 1996, neocdzj, neocdz, 0, neocd_ntsc, neocd, ngcd_state, init_neocdzj, "SNK", "Neo-Geo CDZ (Japan)", 0 ) + +// NTSC region? +CONS( 1994, neocd, neocdz, 0, neocd_ntsc, neocd, ngcd_state, empty_init, "SNK", "Neo-Geo CD (NTSC?)", MACHINE_NOT_WORKING ) // older model, ignores disc protections? diff --git a/src/mame/neogeo/neopcb.cpp b/src/mame/neogeo/neopcb.cpp index 4eacf0fe585..88ce619d7fb 100644 --- a/src/mame/neogeo/neopcb.cpp +++ b/src/mame/neogeo/neopcb.cpp @@ -4,7 +4,7 @@ #include "emu.h" -#include "includes/neogeo.h" +#include "neogeo.h" #include "bus/neogeo/prot_pcm2.h" #include "bus/neogeo/prot_cmc.h" diff --git a/src/mame/netronic/elf.cpp b/src/mame/netronic/elf.cpp index 8f1ac6d11fc..dad9f1667f6 100644 --- a/src/mame/netronic/elf.cpp +++ b/src/mame/netronic/elf.cpp @@ -15,7 +15,7 @@ */ #include "emu.h" -#include "includes/elf.h" +#include "elf.h" #include "screen.h" #include "speaker.h" #include "elf2.lh" diff --git a/src/mame/next/next.cpp b/src/mame/next/next.cpp index ef78cf74f2d..9b862594bb9 100644 --- a/src/mame/next/next.cpp +++ b/src/mame/next/next.cpp @@ -26,7 +26,7 @@ #include "emu.h" -#include "includes/next.h" +#include "next.h" #include "bus/nscsi/cd.h" #include "bus/nscsi/hd.h" diff --git a/src/mame/next/next.h b/src/mame/next/next.h index 2cc98bc0763..27ea0ff3cdc 100644 --- a/src/mame/next/next.h +++ b/src/mame/next/next.h @@ -10,11 +10,11 @@ #include "machine/nscsi_bus.h" #include "machine/mccs1850.h" #include "machine/8530scc.h" -#include "machine/nextkbd.h" +#include "nextkbd.h" #include "machine/upd765.h" #include "machine/ncr5390.h" #include "machine/mb8795.h" -#include "machine/nextmo.h" +#include "nextmo.h" #include "imagedev/chd_cd.h" #include "imagedev/harddriv.h" diff --git a/src/mame/nichibut/armedf.cpp b/src/mame/nichibut/armedf.cpp index 914c5cdf180..1dfc77ac211 100644 --- a/src/mame/nichibut/armedf.cpp +++ b/src/mame/nichibut/armedf.cpp @@ -315,7 +315,7 @@ Notes: ***********************************************************************/ #include "emu.h" -#include "includes/armedf.h" +#include "armedf.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" diff --git a/src/mame/nichibut/armedf.h b/src/mame/nichibut/armedf.h index f002dc38428..e78555657d4 100644 --- a/src/mame/nichibut/armedf.h +++ b/src/mame/nichibut/armedf.h @@ -5,7 +5,7 @@ #pragma once -#include "machine/nb1414m4.h" +#include "nb1414m4.h" #include "machine/gen_latch.h" #include "video/bufsprite.h" #include "screen.h" diff --git a/src/mame/nichibut/armedf_v.cpp b/src/mame/nichibut/armedf_v.cpp index 11995cb029e..d362e41d786 100644 --- a/src/mame/nichibut/armedf_v.cpp +++ b/src/mame/nichibut/armedf_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/armedf.h" +#include "armedf.h" /*************************************************************************** diff --git a/src/mame/nichibut/cclimber.cpp b/src/mame/nichibut/cclimber.cpp index eb8ac5e59fe..6d09ec4738b 100644 --- a/src/mame/nichibut/cclimber.cpp +++ b/src/mame/nichibut/cclimber.cpp @@ -243,8 +243,8 @@ Dip location verified from manual for: cclimber, guzzler, swimmer ***************************************************************************/ #include "emu.h" -#include "includes/cclimber.h" -#include "audio/cclimber.h" +#include "cclimber.h" +#include "cclimber_a.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/nichibut/cclimber.h b/src/mame/nichibut/cclimber.h index dea13389044..5cc7cd3721c 100644 --- a/src/mame/nichibut/cclimber.h +++ b/src/mame/nichibut/cclimber.h @@ -1,13 +1,15 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_CCLIMBER_H -#define MAME_INCLUDES_CCLIMBER_H +#ifndef MAME_NICHIBUT_CCLIMBER_H +#define MAME_NICHIBUT_CCLIMBER_H #pragma once +#include "segacrpt_device.h" + #include "machine/74259.h" #include "machine/gen_latch.h" -#include "machine/segacrpt_device.h" + #include "emupal.h" #include "tilemap.h" @@ -157,4 +159,4 @@ private: void yamato_portmap(address_map &map); }; -#endif // MAME_INCLUDES_CCLIMBER_H +#endif // MAME_NICHIBUT_CCLIMBER_H diff --git a/src/mame/nichibut/cclimber_a.cpp b/src/mame/nichibut/cclimber_a.cpp deleted file mode 100644 index dc885a6c5e0..00000000000 --- a/src/mame/nichibut/cclimber_a.cpp +++ /dev/null @@ -1,123 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Nicola Salmoria, hap -/*************************************************************************** - -Crazy Climber sound hardware - -It has an AY-3-8910. -And 8KB ROM for voice samples, done with TTL chips. - -***************************************************************************/ - -#include "emu.h" -#include "audio/cclimber.h" - -#include "sound/ay8910.h" - - -//************************************************************************** -// DEVICE DEFINITIONS -//************************************************************************** - -DEFINE_DEVICE_TYPE(CCLIMBER_AUDIO, cclimber_audio_device, "cclimber_audio", "Crazy Climber Sound Board") - - -//------------------------------------------------- -// cclimber_audio_device: Constructor -//------------------------------------------------- - -cclimber_audio_device::cclimber_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : - device_t(mconfig, CCLIMBER_AUDIO, tag, owner, clock), - m_dac(*this, "dac"), - m_volume(*this, "volume"), - m_rom(*this, "samples"), - m_sample_clockdiv(2) -{ } - - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void cclimber_audio_device::device_start() -{ - assert(m_rom.bytes() == 0x2000); - - m_address = 0; - m_start_address = 0; - m_loop_address = 0; - m_sample_rate = 0; - m_sample_trigger = 0; - - m_sample_timer = timer_alloc(FUNC(cclimber_audio_device::sample_tick), this); - m_sample_timer->adjust(attotime::zero); - - // register for savestates - save_item(NAME(m_address)); - save_item(NAME(m_start_address)); - save_item(NAME(m_loop_address)); - save_item(NAME(m_sample_rate)); - save_item(NAME(m_sample_trigger)); -} - - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void cclimber_audio_device::device_add_mconfig(machine_config &config) -{ - ay8910_device &aysnd(AY8910(config, "aysnd", DERIVED_CLOCK(1, 1))); - aysnd.port_a_write_callback().set(FUNC(cclimber_audio_device::start_address_w)); - aysnd.port_b_write_callback().set(FUNC(cclimber_audio_device::loop_address_w)); - aysnd.add_route(ALL_OUTPUTS, ":speaker", 0.5); - - DAC_4BIT_R2R(config, m_dac).add_route(ALL_OUTPUTS, "volume", 0.5); - - FILTER_VOLUME(config, m_volume).add_route(ALL_OUTPUTS, ":speaker", 1.0); -} - - -//------------------------------------------------- -// handlers -//------------------------------------------------- - -void cclimber_audio_device::sample_rate_w(u8 data) -{ - m_sample_rate = data; -} - -void cclimber_audio_device::sample_volume_w(u8 data) -{ - m_volume->flt_volume_set_volume(double(data & 0x1f) / 31.0); // range 0-31 -} - -void cclimber_audio_device::sample_trigger(int state) -{ - // start playing on rising edge - if (state && !m_sample_trigger) - m_address = m_start_address * 64; - - m_sample_trigger = state; -} - -void cclimber_audio_device::sample_trigger_w(u8 data) -{ - sample_trigger(data != 0); -} - -TIMER_CALLBACK_MEMBER(cclimber_audio_device::sample_tick) -{ - u8 data = m_rom[m_address >> 1 & 0x1fff]; - - m_dac->write((m_address & 1) ? (data & 0xf) : (data >> 4)); - - if (m_sample_trigger) - m_address++; - - // sample end marker, continue from loop point - if (data == 0x70) - m_address = m_loop_address * 64; - - m_sample_timer->adjust(attotime::from_ticks(256 - m_sample_rate, clock() / m_sample_clockdiv)); -} diff --git a/src/mame/nichibut/cclimber_a.h b/src/mame/nichibut/cclimber_a.h deleted file mode 100644 index 1f6d56703cb..00000000000 --- a/src/mame/nichibut/cclimber_a.h +++ /dev/null @@ -1,61 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Nicola Salmoria, hap -/*************************************************************************** - - Crazy Climber sound hardware - -***************************************************************************/ - -#ifndef MAME_AUDIO_CCLIMBER_H -#define MAME_AUDIO_CCLIMBER_H - -#pragma once - -#include "sound/dac.h" -#include "sound/flt_vol.h" - -DECLARE_DEVICE_TYPE(CCLIMBER_AUDIO, cclimber_audio_device) - -// ======================> cclimber_audio_device - -class cclimber_audio_device : public device_t -{ -public: - // construction/destruction - cclimber_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - - auto &set_sample_clockdiv(u8 div) { m_sample_clockdiv = div; return *this; } // determines base sound pitch (default 2) - - void sample_trigger(int state); - void sample_trigger_w(u8 data); - void sample_rate_w(u8 data); - void sample_volume_w(u8 data); - -protected: - // device level overrides - virtual void device_start() override; - virtual void device_reset() override { sample_volume_w(0); } - virtual void device_add_mconfig(machine_config &config) override; - -private: - required_device m_dac; - required_device m_volume; - required_region_ptr m_rom; - - void start_address_w(u8 data) { m_start_address = data; } - void loop_address_w(u8 data) { m_loop_address = data; } - - u8 m_sample_clockdiv; - - emu_timer *m_sample_timer; - TIMER_CALLBACK_MEMBER(sample_tick); - - u16 m_address; - u8 m_start_address; - u8 m_loop_address; - u8 m_sample_rate; - int m_sample_trigger; -}; - - -#endif // MAME_AUDIO_CCLIMBER_H diff --git a/src/mame/nichibut/cclimber_m.cpp b/src/mame/nichibut/cclimber_m.cpp index f8977e29f5a..6d3b624b0d9 100644 --- a/src/mame/nichibut/cclimber_m.cpp +++ b/src/mame/nichibut/cclimber_m.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/cclimber.h" +#include "cclimber.h" /* set to 1 to fix protection check after bonus round (see notes in pacman.c driver) */ #define CANNONB_HACK 0 diff --git a/src/mame/nichibut/cclimber_v.cpp b/src/mame/nichibut/cclimber_v.cpp index 5e91f91810b..c881d4dc0cb 100644 --- a/src/mame/nichibut/cclimber_v.cpp +++ b/src/mame/nichibut/cclimber_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/cclimber.h" +#include "cclimber.h" #define CCLIMBER_BG_PEN (0) diff --git a/src/mame/nichibut/clshroad.cpp b/src/mame/nichibut/clshroad.cpp index 987358c7d1e..ed78c688f80 100644 --- a/src/mame/nichibut/clshroad.cpp +++ b/src/mame/nichibut/clshroad.cpp @@ -41,8 +41,8 @@ TODO: *******************************************************************************/ #include "emu.h" -#include "includes/clshroad.h" -#include "audio/wiping.h" +#include "clshroad.h" +#include "wiping_a.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/nichibut/clshroad_v.cpp b/src/mame/nichibut/clshroad_v.cpp index 7cec0f8b61b..4888f7d3595 100644 --- a/src/mame/nichibut/clshroad_v.cpp +++ b/src/mame/nichibut/clshroad_v.cpp @@ -33,7 +33,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/clshroad.h" +#include "clshroad.h" WRITE_LINE_MEMBER(clshroad_state::flipscreen_w) diff --git a/src/mame/nichibut/cop01.cpp b/src/mame/nichibut/cop01.cpp index 7676a3bb2d6..c9eb144993e 100644 --- a/src/mame/nichibut/cop01.cpp +++ b/src/mame/nichibut/cop01.cpp @@ -54,7 +54,7 @@ Mighty Guy board layout: ***************************************************************************/ #include "emu.h" -#include "includes/cop01.h" +#include "cop01.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/nichibut/cop01.h b/src/mame/nichibut/cop01.h index 6de3d43feaf..f4a32f8a441 100644 --- a/src/mame/nichibut/cop01.h +++ b/src/mame/nichibut/cop01.h @@ -11,7 +11,7 @@ #pragma once #include "machine/gen_latch.h" -#include "machine/nb1412m2.h" +#include "nb1412m2.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/nichibut/cop01_v.cpp b/src/mame/nichibut/cop01_v.cpp index 4393cf3870a..981cc0a6350 100644 --- a/src/mame/nichibut/cop01_v.cpp +++ b/src/mame/nichibut/cop01_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/cop01.h" +#include "cop01.h" void cop01_state::cop01_palette(palette_device &palette) const diff --git a/src/mame/nichibut/csplayh5.cpp b/src/mame/nichibut/csplayh5.cpp index afc81968d81..f9730e6aac1 100644 --- a/src/mame/nichibut/csplayh5.cpp +++ b/src/mame/nichibut/csplayh5.cpp @@ -38,7 +38,7 @@ #include "machine/idectrl.h" #include "machine/timer.h" #include "video/v9938.h" -#include "audio/nichisnd.h" +#include "nichisnd.h" #define USE_H8 0 #define DVD_CLOCK XTAL(27'000'000) diff --git a/src/mame/nichibut/galivan.cpp b/src/mame/nichibut/galivan.cpp index f5f25ba76c0..91b47dc3df1 100644 --- a/src/mame/nichibut/galivan.cpp +++ b/src/mame/nichibut/galivan.cpp @@ -27,7 +27,7 @@ TODO ***************************************************************************/ #include "emu.h" -#include "includes/galivan.h" +#include "galivan.h" #include "cpu/z80/z80.h" #include "sound/dac.h" diff --git a/src/mame/nichibut/galivan.h b/src/mame/nichibut/galivan.h index 7fd0bcdb43b..7498fbabe9f 100644 --- a/src/mame/nichibut/galivan.h +++ b/src/mame/nichibut/galivan.h @@ -10,8 +10,8 @@ #pragma once -#include "machine/nb1412m2.h" -#include "machine/nb1414m4.h" +#include "nb1412m2.h" +#include "nb1414m4.h" #include "machine/gen_latch.h" #include "video/bufsprite.h" #include "screen.h" diff --git a/src/mame/nichibut/galivan_v.cpp b/src/mame/nichibut/galivan_v.cpp index ca88951f840..700026a11a5 100644 --- a/src/mame/nichibut/galivan_v.cpp +++ b/src/mame/nichibut/galivan_v.cpp @@ -32,7 +32,7 @@ background: 0x4000 bytes of ROM: 76543210 tile code low bits ***************************************************************************/ #include "emu.h" -#include "includes/galivan.h" +#include "galivan.h" /* Layers has only bits 5-7 active. 7 selects text off/on diff --git a/src/mame/nichibut/gomoku.cpp b/src/mame/nichibut/gomoku.cpp index 65b7d579fad..ce74580e123 100644 --- a/src/mame/nichibut/gomoku.cpp +++ b/src/mame/nichibut/gomoku.cpp @@ -24,8 +24,8 @@ todo: ******************************************************************************/ #include "emu.h" -#include "includes/gomoku.h" -#include "audio/gomoku.h" +#include "gomoku.h" +#include "gomoku_a.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/nichibut/gomoku_a.cpp b/src/mame/nichibut/gomoku_a.cpp index 632b016441e..633799d39d0 100644 --- a/src/mame/nichibut/gomoku_a.cpp +++ b/src/mame/nichibut/gomoku_a.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/gomoku.h" +#include "gomoku_a.h" // device type definition diff --git a/src/mame/nichibut/gomoku_v.cpp b/src/mame/nichibut/gomoku_v.cpp index 17d6c6266af..55d04325f95 100644 --- a/src/mame/nichibut/gomoku_v.cpp +++ b/src/mame/nichibut/gomoku_v.cpp @@ -11,7 +11,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/gomoku.h" +#include "gomoku.h" /****************************************************************************** diff --git a/src/mame/nichibut/hyhoo.cpp b/src/mame/nichibut/hyhoo.cpp index 7b6a6e9803c..33ac6fe7bfa 100644 --- a/src/mame/nichibut/hyhoo.cpp +++ b/src/mame/nichibut/hyhoo.cpp @@ -24,7 +24,7 @@ Memo: ******************************************************************************/ #include "emu.h" -#include "includes/hyhoo.h" +#include "hyhoo.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" diff --git a/src/mame/nichibut/hyhoo.h b/src/mame/nichibut/hyhoo.h index 0b0d73a5748..8e65e0361b6 100644 --- a/src/mame/nichibut/hyhoo.h +++ b/src/mame/nichibut/hyhoo.h @@ -1,6 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi -#include "machine/nb1413m3.h" +#include "nb1413m3.h" #include "screen.h" class hyhoo_state : public driver_device diff --git a/src/mame/nichibut/hyhoo_v.cpp b/src/mame/nichibut/hyhoo_v.cpp index 25cdb37dc52..b0625e82728 100644 --- a/src/mame/nichibut/hyhoo_v.cpp +++ b/src/mame/nichibut/hyhoo_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/hyhoo.h" +#include "hyhoo.h" void hyhoo_state::hyhoo_blitter_w(offs_t offset, uint8_t data) diff --git a/src/mame/nichibut/jangou.cpp b/src/mame/nichibut/jangou.cpp index 4db40597213..2b473e5947c 100644 --- a/src/mame/nichibut/jangou.cpp +++ b/src/mame/nichibut/jangou.cpp @@ -26,19 +26,23 @@ $c088-$c095 player tiles *******************************************************************************************/ #include "emu.h" + +#include "segacrpt_device.h" + #include "cpu/m6800/m6800.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/nvram.h" -#include "machine/segacrpt_device.h" #include "sound/ay8910.h" #include "sound/hc55516.h" #include "sound/msm5205.h" #include "video/jangou_blitter.h" -#include "video/resnet.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" +#include "video/resnet.h" + #define MASTER_CLOCK XTAL(19'968'000) diff --git a/src/mame/nichibut/magmax.cpp b/src/mame/nichibut/magmax.cpp index 6ce7be0b4c5..2e6f601669e 100644 --- a/src/mame/nichibut/magmax.cpp +++ b/src/mame/nichibut/magmax.cpp @@ -26,7 +26,7 @@ Stephh's notes (based on the game M68000 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/magmax.h" +#include "magmax.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/nichibut/magmax_v.cpp b/src/mame/nichibut/magmax_v.cpp index 6786f8f8119..17bb0a3e8a4 100644 --- a/src/mame/nichibut/magmax_v.cpp +++ b/src/mame/nichibut/magmax_v.cpp @@ -10,7 +10,7 @@ Additional tweaking by Jarek Burczynski ***************************************************************************/ #include "emu.h" -#include "includes/magmax.h" +#include "magmax.h" /*************************************************************************** diff --git a/src/mame/nichibut/nb1412m2.cpp b/src/mame/nichibut/nb1412m2.cpp index dd1a134df68..9dbe7fbe5ad 100644 --- a/src/mame/nichibut/nb1412m2.cpp +++ b/src/mame/nichibut/nb1412m2.cpp @@ -72,7 +72,7 @@ Legacy notes from drivers: ***************************************************************************/ #include "emu.h" -#include "machine/nb1412m2.h" +#include "nb1412m2.h" diff --git a/src/mame/nichibut/nb1413m3.cpp b/src/mame/nichibut/nb1413m3.cpp index 03400207522..d237d690aab 100644 --- a/src/mame/nichibut/nb1413m3.cpp +++ b/src/mame/nichibut/nb1413m3.cpp @@ -13,7 +13,7 @@ Memo: The NB1413M3 is a Fujitsu ULA ******************************************************************************/ #include "emu.h" -#include "machine/nb1413m3.h" +#include "nb1413m3.h" #include "cpu/z80/z80.h" diff --git a/src/mame/nichibut/nb1414m4.cpp b/src/mame/nichibut/nb1414m4.cpp index 2967ceb58bd..820c4677772 100644 --- a/src/mame/nichibut/nb1414m4.cpp +++ b/src/mame/nichibut/nb1414m4.cpp @@ -28,7 +28,7 @@ Notes: ********************************************************************************************************************/ #include "emu.h" -#include "machine/nb1414m4.h" +#include "nb1414m4.h" #include "screen.h" DEFINE_DEVICE_TYPE(NB1414M4, nb1414m4_device, "nb1414m4", "NB1414M4 Mahjong Custom") diff --git a/src/mame/nichibut/nbmj8688.cpp b/src/mame/nichibut/nbmj8688.cpp index 59e2d7f54b7..d22d9b62cd9 100644 --- a/src/mame/nichibut/nbmj8688.cpp +++ b/src/mame/nichibut/nbmj8688.cpp @@ -31,7 +31,7 @@ TODO: ******************************************************************************/ #include "emu.h" -#include "includes/nbmj8688.h" +#include "nbmj8688.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" diff --git a/src/mame/nichibut/nbmj8688.h b/src/mame/nichibut/nbmj8688.h index bd4e713fb2b..118637dcbdc 100644 --- a/src/mame/nichibut/nbmj8688.h +++ b/src/mame/nichibut/nbmj8688.h @@ -6,7 +6,7 @@ #pragma once #include "video/hd61830.h" -#include "machine/nb1413m3.h" +#include "nb1413m3.h" #include "emupal.h" class nbmj8688_state : public driver_device diff --git a/src/mame/nichibut/nbmj8688_v.cpp b/src/mame/nichibut/nbmj8688_v.cpp index 93efa108a4f..caba62bcdfb 100644 --- a/src/mame/nichibut/nbmj8688_v.cpp +++ b/src/mame/nichibut/nbmj8688_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/nbmj8688.h" +#include "nbmj8688.h" /* the blitter can copy data both in "direct" mode, where every byte of the source diff --git a/src/mame/nichibut/nbmj8891.cpp b/src/mame/nichibut/nbmj8891.cpp index b8b8a81e48b..9de6bdf5cf5 100644 --- a/src/mame/nichibut/nbmj8891.cpp +++ b/src/mame/nichibut/nbmj8891.cpp @@ -41,7 +41,7 @@ TODO: ******************************************************************************/ #include "emu.h" -#include "includes/nbmj8891.h" +#include "nbmj8891.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" diff --git a/src/mame/nichibut/nbmj8891.h b/src/mame/nichibut/nbmj8891.h index 5e814009f1e..5d73155047d 100644 --- a/src/mame/nichibut/nbmj8891.h +++ b/src/mame/nichibut/nbmj8891.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi -#include "machine/nb1413m3.h" +#include "nb1413m3.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/nichibut/nbmj8891_v.cpp b/src/mame/nichibut/nbmj8891_v.cpp index eb344890e0a..e8a1467c794 100644 --- a/src/mame/nichibut/nbmj8891_v.cpp +++ b/src/mame/nichibut/nbmj8891_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/nbmj8891.h" +#include "nbmj8891.h" /****************************************************************************** diff --git a/src/mame/nichibut/nbmj8900.cpp b/src/mame/nichibut/nbmj8900.cpp index a7d3a39b306..1657b885e78 100644 --- a/src/mame/nichibut/nbmj8900.cpp +++ b/src/mame/nichibut/nbmj8900.cpp @@ -26,7 +26,7 @@ TODO: ******************************************************************************/ #include "emu.h" -#include "includes/nbmj8900.h" +#include "nbmj8900.h" #include "cpu/z80/z80.h" #include "sound/dac.h" diff --git a/src/mame/nichibut/nbmj8900.h b/src/mame/nichibut/nbmj8900.h index be53917e5f7..cff9d241951 100644 --- a/src/mame/nichibut/nbmj8900.h +++ b/src/mame/nichibut/nbmj8900.h @@ -5,7 +5,7 @@ #pragma once -#include "machine/nb1413m3.h" +#include "nb1413m3.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/nichibut/nbmj8900_v.cpp b/src/mame/nichibut/nbmj8900_v.cpp index 76bd0caf9e2..5e7ae5b4b81 100644 --- a/src/mame/nichibut/nbmj8900_v.cpp +++ b/src/mame/nichibut/nbmj8900_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/nbmj8900.h" +#include "nbmj8900.h" /****************************************************************************** diff --git a/src/mame/nichibut/nbmj8991.cpp b/src/mame/nichibut/nbmj8991.cpp index 5963a61fe0c..5dc57934d6a 100644 --- a/src/mame/nichibut/nbmj8991.cpp +++ b/src/mame/nichibut/nbmj8991.cpp @@ -31,7 +31,7 @@ Notes: ******************************************************************************/ #include "emu.h" -#include "includes/nbmj8991.h" +#include "nbmj8991.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" diff --git a/src/mame/nichibut/nbmj8991.h b/src/mame/nichibut/nbmj8991.h index 68b43384d8b..6df7ee152e2 100644 --- a/src/mame/nichibut/nbmj8991.h +++ b/src/mame/nichibut/nbmj8991.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi -#include "machine/nb1413m3.h" +#include "nb1413m3.h" #include "machine/gen_latch.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/nichibut/nbmj8991_v.cpp b/src/mame/nichibut/nbmj8991_v.cpp index a632c75914d..93f184e6072 100644 --- a/src/mame/nichibut/nbmj8991_v.cpp +++ b/src/mame/nichibut/nbmj8991_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/nbmj8991.h" +#include "nbmj8991.h" /****************************************************************************** diff --git a/src/mame/nichibut/nbmj9195.cpp b/src/mame/nichibut/nbmj9195.cpp index 95babd256e4..db8685bc8cb 100644 --- a/src/mame/nichibut/nbmj9195.cpp +++ b/src/mame/nichibut/nbmj9195.cpp @@ -22,7 +22,7 @@ Notes: ******************************************************************************/ #include "emu.h" -#include "includes/nbmj9195.h" +#include "nbmj9195.h" #include "machine/gen_latch.h" #include "machine/nvram.h" diff --git a/src/mame/nichibut/nbmj9195.h b/src/mame/nichibut/nbmj9195.h index 52b8cda28cf..70428df1f74 100644 --- a/src/mame/nichibut/nbmj9195.h +++ b/src/mame/nichibut/nbmj9195.h @@ -11,7 +11,7 @@ #pragma once #include "cpu/z80/tmpz84c011.h" -#include "machine/nb1413m3.h" // needed for mahjong input controller +#include "nb1413m3.h" // needed for mahjong input controller #include "machine/gen_latch.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/nichibut/nbmj9195_v.cpp b/src/mame/nichibut/nbmj9195_v.cpp index c3d09c7dbb0..9dba81bbab3 100644 --- a/src/mame/nichibut/nbmj9195_v.cpp +++ b/src/mame/nichibut/nbmj9195_v.cpp @@ -10,7 +10,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/nbmj9195.h" +#include "nbmj9195.h" /****************************************************************************** diff --git a/src/mame/nichibut/niyanpai.cpp b/src/mame/nichibut/niyanpai.cpp index 308d2912126..0802bb10493 100644 --- a/src/mame/nichibut/niyanpai.cpp +++ b/src/mame/nichibut/niyanpai.cpp @@ -36,7 +36,7 @@ Memo: ******************************************************************************/ #include "emu.h" -#include "includes/niyanpai.h" +#include "niyanpai.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" diff --git a/src/mame/nichibut/niyanpai.h b/src/mame/nichibut/niyanpai.h index 4cd805d5307..b51a9f1b5e5 100644 --- a/src/mame/nichibut/niyanpai.h +++ b/src/mame/nichibut/niyanpai.h @@ -3,8 +3,8 @@ #include "machine/tmp68301.h" #include "screen.h" -#include "audio/nichisnd.h" -#include "machine/nb1413m3.h" +#include "nichisnd.h" +#include "nb1413m3.h" #include "emupal.h" #define VRAM_MAX 3 diff --git a/src/mame/nichibut/niyanpai_v.cpp b/src/mame/nichibut/niyanpai_v.cpp index f35c5faa5df..855e67cd3ad 100644 --- a/src/mame/nichibut/niyanpai_v.cpp +++ b/src/mame/nichibut/niyanpai_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/niyanpai.h" +#include "niyanpai.h" /****************************************************************************** diff --git a/src/mame/nichibut/pastelg.cpp b/src/mame/nichibut/pastelg.cpp index 2513ce5b7aa..1259a2a383a 100644 --- a/src/mame/nichibut/pastelg.cpp +++ b/src/mame/nichibut/pastelg.cpp @@ -23,7 +23,7 @@ Memo: ******************************************************************************/ #include "emu.h" -#include "includes/pastelg.h" +#include "pastelg.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" diff --git a/src/mame/nichibut/pastelg.h b/src/mame/nichibut/pastelg.h index 97d15dbf7d1..45c2f96d201 100644 --- a/src/mame/nichibut/pastelg.h +++ b/src/mame/nichibut/pastelg.h @@ -5,7 +5,7 @@ #pragma once -#include "machine/nb1413m3.h" +#include "nb1413m3.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/nichibut/pastelg_v.cpp b/src/mame/nichibut/pastelg_v.cpp index 86e22eb1c54..3fb8aa59c05 100644 --- a/src/mame/nichibut/pastelg_v.cpp +++ b/src/mame/nichibut/pastelg_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/pastelg.h" +#include "pastelg.h" // pastelg specific methods diff --git a/src/mame/nichibut/seicross.cpp b/src/mame/nichibut/seicross.cpp index 7a15b421a08..302b309cec0 100644 --- a/src/mame/nichibut/seicross.cpp +++ b/src/mame/nichibut/seicross.cpp @@ -41,7 +41,7 @@ This info came from http://www.ne.jp/asahi/cc-sakura/akkun/old/fryski.html ***************************************************************************/ #include "emu.h" -#include "includes/seicross.h" +#include "seicross.h" #include "cpu/m6800/m6800.h" #include "cpu/z80/z80.h" diff --git a/src/mame/nichibut/seicross_v.cpp b/src/mame/nichibut/seicross_v.cpp index 54f9b4ce7a2..7b3c1b3d858 100644 --- a/src/mame/nichibut/seicross_v.cpp +++ b/src/mame/nichibut/seicross_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/seicross.h" +#include "seicross.h" /*************************************************************************** diff --git a/src/mame/nichibut/terracre.cpp b/src/mame/nichibut/terracre.cpp index d3ccbbe46a7..66cbbd2519c 100644 --- a/src/mame/nichibut/terracre.cpp +++ b/src/mame/nichibut/terracre.cpp @@ -81,7 +81,7 @@ AT-2 */ #include "emu.h" -#include "includes/terracre.h" +#include "terracre.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/nichibut/terracre.h b/src/mame/nichibut/terracre.h index 4c42099aff9..08e5be85457 100644 --- a/src/mame/nichibut/terracre.h +++ b/src/mame/nichibut/terracre.h @@ -5,7 +5,7 @@ #pragma once -#include "machine/nb1412m2.h" +#include "nb1412m2.h" #include "machine/gen_latch.h" #include "video/bufsprite.h" #include "emupal.h" diff --git a/src/mame/nichibut/terracre_v.cpp b/src/mame/nichibut/terracre_v.cpp index d5fee609c50..6a330561fe7 100644 --- a/src/mame/nichibut/terracre_v.cpp +++ b/src/mame/nichibut/terracre_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/terracre.h" +#include "terracre.h" TILE_GET_INFO_MEMBER(terracre_state::get_bg_tile_info) diff --git a/src/mame/nichibut/tubep.cpp b/src/mame/nichibut/tubep.cpp index f4d2ecfb523..853669537bc 100644 --- a/src/mame/nichibut/tubep.cpp +++ b/src/mame/nichibut/tubep.cpp @@ -101,7 +101,7 @@ TP-S.1 TP-S.2 TP-S.3 TP-B.1 8212 TP-B.2 TP-B.3 TP-B.4 #include "emu.h" -#include "includes/tubep.h" +#include "tubep.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" diff --git a/src/mame/nichibut/tubep_v.cpp b/src/mame/nichibut/tubep_v.cpp index 8590a3e606f..ac2b619eb73 100644 --- a/src/mame/nichibut/tubep_v.cpp +++ b/src/mame/nichibut/tubep_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/tubep.h" +#include "tubep.h" #include "video/resnet.h" diff --git a/src/mame/nichibut/wiping.cpp b/src/mame/nichibut/wiping.cpp index 42680c0ec57..46b3e7246d1 100644 --- a/src/mame/nichibut/wiping.cpp +++ b/src/mame/nichibut/wiping.cpp @@ -40,8 +40,8 @@ dip: 6.7 7.7 ***************************************************************************/ #include "emu.h" -#include "includes/wiping.h" -#include "audio/wiping.h" +#include "wiping.h" +#include "wiping_a.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/nichibut/wiping_a.cpp b/src/mame/nichibut/wiping_a.cpp index 1e1ab744400..8d43425f7d3 100644 --- a/src/mame/nichibut/wiping_a.cpp +++ b/src/mame/nichibut/wiping_a.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/wiping.h" +#include "wiping_a.h" DEFINE_DEVICE_TYPE(WIPING_CUSTOM, wiping_sound_device, "wiping_sound", "Wiping Custom Sound") diff --git a/src/mame/nichibut/wiping_v.cpp b/src/mame/nichibut/wiping_v.cpp index 01260184c2c..0575a4a1a4c 100644 --- a/src/mame/nichibut/wiping_v.cpp +++ b/src/mame/nichibut/wiping_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/wiping.h" +#include "wiping.h" /*************************************************************************** diff --git a/src/mame/nintendo/aleck64.cpp b/src/mame/nintendo/aleck64.cpp index 18b9e3bb7a2..22601d3ff29 100644 --- a/src/mame/nintendo/aleck64.cpp +++ b/src/mame/nintendo/aleck64.cpp @@ -173,7 +173,7 @@ Notes: */ #include "emu.h" -#include "includes/n64.h" +#include "n64.h" #include "cpu/rsp/rsp.h" #include "cpu/mips/mips3.h" @@ -183,6 +183,8 @@ Notes: #include "speaker.h" +namespace { + class aleck64_state : public n64_state { public: @@ -1412,6 +1414,8 @@ ROM_START( mayjin3 ) ROM_END +} // anonymous namespace + diff --git a/src/mame/nintendo/dkong.cpp b/src/mame/nintendo/dkong.cpp index 3514493adcd..422d148a825 100644 --- a/src/mame/nintendo/dkong.cpp +++ b/src/mame/nintendo/dkong.cpp @@ -407,7 +407,7 @@ Donkey Kong Notes ***************************************************************************/ #include "emu.h" -#include "includes/dkong.h" +#include "dkong.h" #include "cpu/z80/z80.h" #include "cpu/s2650/s2650.h" diff --git a/src/mame/nintendo/dkong_a.cpp b/src/mame/nintendo/dkong_a.cpp index c8eeda735a3..9fb19db9fff 100644 --- a/src/mame/nintendo/dkong_a.cpp +++ b/src/mame/nintendo/dkong_a.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Couriersud #include "emu.h" -#include "includes/dkong.h" +#include "dkong.h" #include "sound/discrete.h" #include "speaker.h" diff --git a/src/mame/nintendo/dkong_v.cpp b/src/mame/nintendo/dkong_v.cpp index f019e72e6da..97b9fcd57eb 100644 --- a/src/mame/nintendo/dkong_v.cpp +++ b/src/mame/nintendo/dkong_v.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/dkong.h" +#include "dkong.h" #define RADARSCP_BCK_COL_OFFSET 256 #define RADARSCP_GRID_COL_OFFSET (RADARSCP_BCK_COL_OFFSET + 256) diff --git a/src/mame/nintendo/gb.cpp b/src/mame/nintendo/gb.cpp index 200413c84d4..18d5312c031 100644 --- a/src/mame/nintendo/gb.cpp +++ b/src/mame/nintendo/gb.cpp @@ -274,7 +274,7 @@ space. This mapper uses 32KB sized banks. ***************************************************************************/ #include "emu.h" -#include "includes/gb.h" +#include "gb.h" #include "bus/gameboy/rom.h" #include "bus/gameboy/mbc.h" #include "screen.h" diff --git a/src/mame/nintendo/gb_m.cpp b/src/mame/nintendo/gb_m.cpp index c40618ff43d..00cb53ab0e7 100644 --- a/src/mame/nintendo/gb_m.cpp +++ b/src/mame/nintendo/gb_m.cpp @@ -82,7 +82,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/gb.h" +#include "gb.h" #define ENABLE_LOGGING 0 diff --git a/src/mame/nintendo/gba.cpp b/src/mame/nintendo/gba.cpp index 15e3519dc1b..d2f39d0dd2a 100644 --- a/src/mame/nintendo/gba.cpp +++ b/src/mame/nintendo/gba.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gba.h" +#include "gba.h" #include "bus/gba/rom.h" #include "cpu/arm7/arm7.h" diff --git a/src/mame/nintendo/mario.cpp b/src/mame/nintendo/mario.cpp index ca897d0563a..4e932e3e3a9 100644 --- a/src/mame/nintendo/mario.cpp +++ b/src/mame/nintendo/mario.cpp @@ -92,7 +92,7 @@ write: ***************************************************************************/ #include "emu.h" -#include "includes/mario.h" +#include "mario.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/nintendo/mario_a.cpp b/src/mame/nintendo/mario_a.cpp index b4feeecbc32..fca0c8ba98b 100644 --- a/src/mame/nintendo/mario_a.cpp +++ b/src/mame/nintendo/mario_a.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Couriersud #include "emu.h" -#include "includes/mario.h" +#include "mario.h" #include "cpu/mcs48/mcs48.h" #include "cpu/z80/z80.h" @@ -9,7 +9,7 @@ #include "speaker.h" #if !OLD_SOUND -#include "audio/nl_mario.h" +#include "nl_mario.h" #endif /**************************************************************** diff --git a/src/mame/nintendo/mario_v.cpp b/src/mame/nintendo/mario_v.cpp index c6526cc919f..8cf57a15765 100644 --- a/src/mame/nintendo/mario_v.cpp +++ b/src/mame/nintendo/mario_v.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/mario.h" +#include "mario.h" static const res_net_decode_info mario_decode_info = { diff --git a/src/mame/nintendo/n64.cpp b/src/mame/nintendo/n64.cpp index 603c80f68bc..08d8ff090a7 100644 --- a/src/mame/nintendo/n64.cpp +++ b/src/mame/nintendo/n64.cpp @@ -10,7 +10,7 @@ */ #include "emu.h" -#include "includes/n64.h" +#include "n64.h" #include "cpu/rsp/rsp.h" #include "cpu/mips/mips3.h" diff --git a/src/mame/nintendo/n64.h b/src/mame/nintendo/n64.h index fb04eca2eb5..e43c6cfa333 100644 --- a/src/mame/nintendo/n64.h +++ b/src/mame/nintendo/n64.h @@ -1,14 +1,15 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_INCLUDES_N64_H -#define MAME_INCLUDES_N64_H +#ifndef MAME_NINTENDO_N64_H +#define MAME_NINTENDO_N64_H #pragma once +#include "n64_v.h" + #include "cpu/rsp/rsp.h" #include "cpu/mips/mips3.h" #include "sound/dmadac.h" -#include "video/n64.h" /*----------- driver state -----------*/ @@ -406,4 +407,4 @@ const unsigned int ddStartOffset[16] = {0x0,0x5F15E0,0xB79D00,0x10801A0,0x1523720,0x1963D80,0x1D414C0,0x20BBCE0, 0x23196E0,0x28A1E00,0x2DF5DC0,0x3299340,0x36D99A0,0x3AB70E0,0x3E31900,0x4149200}; -#endif // MAME_INCLUDES_N64_H +#endif // MAME_NINTENDO_N64_H diff --git a/src/mame/nintendo/n64_m.cpp b/src/mame/nintendo/n64_m.cpp index 7aabc803b7f..fcecb3c1e5f 100644 --- a/src/mame/nintendo/n64_m.cpp +++ b/src/mame/nintendo/n64_m.cpp @@ -3,12 +3,15 @@ /* machine/n64.c - contains N64 hardware emulation shared between arcade and console */ #include "emu.h" -#include "debugger.h" -#include "screen.h" +#include "n64.h" + +#include "n64_v.h" + #include "cpu/mips/mips3.h" #include "cpu/mips/mips3com.h" -#include "includes/n64.h" -#include "video/n64.h" + +#include "debugger.h" +#include "screen.h" // device type definition DEFINE_DEVICE_TYPE(N64PERIPH, n64_periphs, "n64_periphs", "N64 Peripheral Chips") diff --git a/src/mame/nintendo/n64_v.cpp b/src/mame/nintendo/n64_v.cpp index 2891632afdb..01eb2d424b1 100644 --- a/src/mame/nintendo/n64_v.cpp +++ b/src/mame/nintendo/n64_v.cpp @@ -25,9 +25,11 @@ TODO: *******************************************************************************/ #include "emu.h" -#include "includes/n64.h" -#include "video/rdpblend.h" -#include "video/rdptpipe.h" +#include "n64.h" + +#include "rdpblend.h" +#include "rdptpipe.h" + #include "screen.h" #include diff --git a/src/mame/nintendo/n64_v.h b/src/mame/nintendo/n64_v.h index bc0327b6d42..ffcb1529cd1 100644 --- a/src/mame/nintendo/n64_v.h +++ b/src/mame/nintendo/n64_v.h @@ -123,9 +123,9 @@ class n64_periphs; class n64_rdp; -#include "video/n64types.h" -#include "video/rdpblend.h" -#include "video/rdptpipe.h" +#include "n64types.h" +#include "rdpblend.h" +#include "rdptpipe.h" class n64_state; diff --git a/src/mame/nintendo/n64types.h b/src/mame/nintendo/n64types.h index d48d7be3fab..6c99aec4e68 100644 --- a/src/mame/nintendo/n64types.h +++ b/src/mame/nintendo/n64types.h @@ -1,11 +1,16 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef _VIDEO_N64TYPES_H_ -#define _VIDEO_N64TYPES_H_ +#ifndef MAME_NINTENDO_N64TYPES_H +#define MAME_NINTENDO_N64TYPES_H + +#pragma once + #include "video/rgbutil.h" +class n64_rdp; + struct misc_state_t { misc_state_t() @@ -337,4 +342,4 @@ class span_param_t }; }; -#endif // _VIDEO_N64TYPES_H_ +#endif // MAME_NINTENDO_N64TYPES_H diff --git a/src/mame/nintendo/n8080.cpp b/src/mame/nintendo/n8080.cpp index 6cd812871a0..e99c9ff8eaf 100644 --- a/src/mame/nintendo/n8080.cpp +++ b/src/mame/nintendo/n8080.cpp @@ -137,7 +137,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/n8080.h" +#include "n8080.h" // Shifter circuit done with TTL diff --git a/src/mame/nintendo/n8080_a.cpp b/src/mame/nintendo/n8080_a.cpp index 41f95175986..cb9b9b5ae4d 100644 --- a/src/mame/nintendo/n8080_a.cpp +++ b/src/mame/nintendo/n8080_a.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/n8080.h" +#include "n8080.h" #include "speaker.h" diff --git a/src/mame/nintendo/n8080_v.cpp b/src/mame/nintendo/n8080_v.cpp index 6f90fbd8811..75861c87f59 100644 --- a/src/mame/nintendo/n8080_v.cpp +++ b/src/mame/nintendo/n8080_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/n8080.h" +#include "n8080.h" void n8080_state::n8080_video_control_w(uint8_t data) diff --git a/src/mame/nintendo/nds.cpp b/src/mame/nintendo/nds.cpp index 8936ea5a47b..24f6af3d811 100644 --- a/src/mame/nintendo/nds.cpp +++ b/src/mame/nintendo/nds.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/nds.h" +#include "nds.h" #define VERBOSE_LEVEL (0) diff --git a/src/mame/nintendo/nes.cpp b/src/mame/nintendo/nes.cpp index ba80fe08043..52183fb54b8 100644 --- a/src/mame/nintendo/nes.cpp +++ b/src/mame/nintendo/nes.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/nes.h" +#include "nes.h" #include "cpu/m6502/n2a03.h" #include "softlist_dev.h" diff --git a/src/mame/nintendo/nes_m.cpp b/src/mame/nintendo/nes_m.cpp index 4f0b747e77d..87014b0b75d 100644 --- a/src/mame/nintendo/nes_m.cpp +++ b/src/mame/nintendo/nes_m.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "cpu/m6502/m6502.h" -#include "includes/nes.h" +#include "nes.h" /*************************************************************************** FUNCTIONS diff --git a/src/mame/nintendo/nes_v.cpp b/src/mame/nintendo/nes_v.cpp index 8356e0b53b6..aaa23987a63 100644 --- a/src/mame/nintendo/nes_v.cpp +++ b/src/mame/nintendo/nes_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/nes.h" +#include "nes.h" void nes_state::video_reset() { diff --git a/src/mame/nintendo/nes_vt02_vt03.cpp b/src/mame/nintendo/nes_vt02_vt03.cpp index 2ef858c9be6..3f230d07e8d 100644 --- a/src/mame/nintendo/nes_vt02_vt03.cpp +++ b/src/mame/nintendo/nes_vt02_vt03.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/nes_vt_soc.h" +#include "nes_vt_soc.h" class nes_vt_base_state : public driver_device { diff --git a/src/mame/nintendo/nes_vt09.cpp b/src/mame/nintendo/nes_vt09.cpp index 8416e7ca3fa..a0be3e78ee7 100644 --- a/src/mame/nintendo/nes_vt09.cpp +++ b/src/mame/nintendo/nes_vt09.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/nes_vt09_soc.h" +#include "nes_vt09_soc.h" class nes_vt09_common_base_state : public driver_device { diff --git a/src/mame/nintendo/nes_vt09_soc.h b/src/mame/nintendo/nes_vt09_soc.h index 89846bf03ac..766c1eed42a 100644 --- a/src/mame/nintendo/nes_vt09_soc.h +++ b/src/mame/nintendo/nes_vt09_soc.h @@ -8,8 +8,8 @@ #include "nes_vt_soc.h" #include "cpu/m6502/n2a03.h" #include "sound/nes_apu_vt.h" -#include "machine/m6502_vtscr.h" -#include "machine/m6502_swap_op_d5_d6.h" +#include "m6502_vtscr.h" +#include "m6502_swap_op_d5_d6.h" #include "video/ppu2c0x_vt.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/nintendo/nes_vt32.cpp b/src/mame/nintendo/nes_vt32.cpp index 065bba55ab4..f1eb1ce6487 100644 --- a/src/mame/nintendo/nes_vt32.cpp +++ b/src/mame/nintendo/nes_vt32.cpp @@ -12,8 +12,8 @@ ***************************************************************************/ #include "emu.h" -#include "machine/nes_vt369_vtunknown_soc.h" -#include "machine/nes_vt32_soc.h" +#include "nes_vt369_vtunknown_soc.h" +#include "nes_vt32_soc.h" class nes_vt32_base_state : public driver_device { diff --git a/src/mame/nintendo/nes_vt32_soc.h b/src/mame/nintendo/nes_vt32_soc.h index 66915adbef0..d7a9539c708 100644 --- a/src/mame/nintendo/nes_vt32_soc.h +++ b/src/mame/nintendo/nes_vt32_soc.h @@ -8,8 +8,8 @@ #include "nes_vt09_soc.h" #include "cpu/m6502/n2a03.h" #include "sound/nes_apu_vt.h" -#include "machine/m6502_vtscr.h" -#include "machine/m6502_swap_op_d5_d6.h" +#include "m6502_vtscr.h" +#include "m6502_swap_op_d5_d6.h" #include "video/ppu2c0x_vt.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/nintendo/nes_vt369_vtunknown.cpp b/src/mame/nintendo/nes_vt369_vtunknown.cpp index e77d942c6bd..473e08996e9 100644 --- a/src/mame/nintendo/nes_vt369_vtunknown.cpp +++ b/src/mame/nintendo/nes_vt369_vtunknown.cpp @@ -23,8 +23,8 @@ ***************************************************************************/ #include "emu.h" -#include "machine/nes_vt369_vtunknown_soc.h" -#include "machine/nes_vt32_soc.h" +#include "nes_vt369_vtunknown_soc.h" +#include "nes_vt32_soc.h" class nes_vt369_vtunknown_base_state : public driver_device { diff --git a/src/mame/nintendo/nes_vt369_vtunknown_soc.h b/src/mame/nintendo/nes_vt369_vtunknown_soc.h index 9751c409f86..d8ad5b7ad26 100644 --- a/src/mame/nintendo/nes_vt369_vtunknown_soc.h +++ b/src/mame/nintendo/nes_vt369_vtunknown_soc.h @@ -8,9 +8,9 @@ #include "nes_vt09_soc.h" #include "cpu/m6502/n2a03.h" #include "sound/nes_apu_vt.h" -#include "machine/m6502_vtscr.h" -#include "machine/m6502_swap_op_d5_d6.h" -#include "machine/vt1682_alu.h" +#include "m6502_vtscr.h" +#include "m6502_swap_op_d5_d6.h" +#include "vt1682_alu.h" #include "video/ppu2c0x_vt.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/nintendo/nes_vt_soc.h b/src/mame/nintendo/nes_vt_soc.h index 9a1cb3f6caf..1de0ebb42dc 100644 --- a/src/mame/nintendo/nes_vt_soc.h +++ b/src/mame/nintendo/nes_vt_soc.h @@ -7,8 +7,8 @@ #include "cpu/m6502/n2a03.h" #include "sound/nes_apu_vt.h" -#include "machine/m6502_vtscr.h" -#include "machine/m6502_swap_op_d5_d6.h" +#include "m6502_vtscr.h" +#include "m6502_swap_op_d5_d6.h" #include "video/ppu2c0x_vt.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/nintendo/nss.cpp b/src/mame/nintendo/nss.cpp index bf04705faa8..d9de8256fca 100644 --- a/src/mame/nintendo/nss.cpp +++ b/src/mame/nintendo/nss.cpp @@ -295,7 +295,7 @@ Contra III CONTRA_III_1 TC574000 CONTRA_III_0 TC574000 GAME1_NSSU ***************************************************************************/ #include "emu.h" -#include "includes/snes.h" +#include "snes.h" #include "cpu/z80/z80.h" #include "machine/m6m80011ap.h" diff --git a/src/mame/nintendo/playch10.cpp b/src/mame/nintendo/playch10.cpp index 35cf16131ae..5a9559b5ac7 100644 --- a/src/mame/nintendo/playch10.cpp +++ b/src/mame/nintendo/playch10.cpp @@ -289,7 +289,7 @@ Notes & Todo: ***************************************************************************/ #include "emu.h" -#include "includes/playch10.h" +#include "playch10.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/nintendo/playch10_m.cpp b/src/mame/nintendo/playch10_m.cpp index 5f26d5f1b0f..eaea15a1708 100644 --- a/src/mame/nintendo/playch10_m.cpp +++ b/src/mame/nintendo/playch10_m.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "screen.h" -#include "includes/playch10.h" +#include "playch10.h" #include "video/ppu2c0x.h" diff --git a/src/mame/nintendo/playch10_v.cpp b/src/mame/nintendo/playch10_v.cpp index ae59487a2d4..2b13085cda4 100644 --- a/src/mame/nintendo/playch10_v.cpp +++ b/src/mame/nintendo/playch10_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi,Brad Oliver #include "emu.h" -#include "includes/playch10.h" +#include "playch10.h" #include "video/ppu2c0x.h" #include "screen.h" diff --git a/src/mame/nintendo/popeye.cpp b/src/mame/nintendo/popeye.cpp index 03e395de846..90f2de4abd6 100644 --- a/src/mame/nintendo/popeye.cpp +++ b/src/mame/nintendo/popeye.cpp @@ -16,13 +16,13 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/popeye.h" +#include "popeye.h" #include "machine/eepromser.h" #include "machine/netlist.h" #include "netlist/devices/net_lib.h" #include "screen.h" #include "speaker.h" -#include "audio/nl_popeye.h" +#include "nl_popeye.h" void tnx1_state::driver_start() { diff --git a/src/mame/nintendo/popeye_v.cpp b/src/mame/nintendo/popeye_v.cpp index edb10dc7b1f..025fa4760a8 100644 --- a/src/mame/nintendo/popeye_v.cpp +++ b/src/mame/nintendo/popeye_v.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/popeye.h" +#include "popeye.h" /*************************************************************************** diff --git a/src/mame/nintendo/punchout.cpp b/src/mame/nintendo/punchout.cpp index dcc456f951f..de728a95ab9 100644 --- a/src/mame/nintendo/punchout.cpp +++ b/src/mame/nintendo/punchout.cpp @@ -115,7 +115,7 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" -#include "includes/punchout.h" +#include "punchout.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/nintendo/punchout_v.cpp b/src/mame/nintendo/punchout_v.cpp index b959f0b791c..69ce807b5c3 100644 --- a/src/mame/nintendo/punchout_v.cpp +++ b/src/mame/nintendo/punchout_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/punchout.h" +#include "punchout.h" /*************************************************************************** diff --git a/src/mame/nintendo/rdpblend.cpp b/src/mame/nintendo/rdpblend.cpp index 7e20b68aa64..34bd373df45 100644 --- a/src/mame/nintendo/rdpblend.cpp +++ b/src/mame/nintendo/rdpblend.cpp @@ -14,8 +14,8 @@ ******************************************************************************/ #include "emu.h" -#include "includes/n64.h" -#include "video/n64.h" +#include "n64.h" +#include "n64_v.h" n64_blender_t::n64_blender_t() { diff --git a/src/mame/nintendo/rdpblend.h b/src/mame/nintendo/rdpblend.h index e329d8943ac..ac6326b2423 100644 --- a/src/mame/nintendo/rdpblend.h +++ b/src/mame/nintendo/rdpblend.h @@ -16,7 +16,7 @@ #ifndef _VIDEO_RDPBLEND_H_ #define _VIDEO_RDPBLEND_H_ -#include "video/n64.h" +#include "n64_v.h" class n64_blender_t { diff --git a/src/mame/nintendo/rdptpipe.cpp b/src/mame/nintendo/rdptpipe.cpp index 4cb556eb1ca..ca5f5db27d2 100644 --- a/src/mame/nintendo/rdptpipe.cpp +++ b/src/mame/nintendo/rdptpipe.cpp @@ -14,9 +14,9 @@ ******************************************************************************/ #include "emu.h" -#include "includes/n64.h" -#include "video/rdptpipe.h" -#include "video/n64.h" +#include "rdptpipe.h" +#include "n64.h" +#include "n64_v.h" #include "video/rgbutil.h" #define RELATIVE(x, y) ((((x) >> 3) - (y)) << 3) | (x & 7); diff --git a/src/mame/nintendo/rdptpipe.h b/src/mame/nintendo/rdptpipe.h index b9c80e15353..9c04e8f215d 100644 --- a/src/mame/nintendo/rdptpipe.h +++ b/src/mame/nintendo/rdptpipe.h @@ -16,7 +16,7 @@ #ifndef _VIDEO_RDPTEXPIPE_H_ #define _VIDEO_RDPTEXPIPE_H_ -#include "video/n64types.h" +#include "n64types.h" class n64_texture_pipe_t { diff --git a/src/mame/nintendo/sfcbox.cpp b/src/mame/nintendo/sfcbox.cpp index 722a2f0d3a9..a549e244fe4 100644 --- a/src/mame/nintendo/sfcbox.cpp +++ b/src/mame/nintendo/sfcbox.cpp @@ -117,7 +117,7 @@ How does the Super Famicom Box operates ***************************************************************************/ #include "emu.h" -#include "includes/snes.h" +#include "snes.h" #include "cpu/z180/z180.h" #include "machine/s3520cf.h" diff --git a/src/mame/nintendo/snes.cpp b/src/mame/nintendo/snes.cpp index b40a056f4c1..61057aada02 100644 --- a/src/mame/nintendo/snes.cpp +++ b/src/mame/nintendo/snes.cpp @@ -27,9 +27,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/snes.h" +#include "snes.h" -#include "machine/snescx4.h" +#include "snescx4.h" #include "bus/snes/snes_slot.h" #include "bus/snes/snes_carts.h" diff --git a/src/mame/nintendo/snes_m.cpp b/src/mame/nintendo/snes_m.cpp index fe2a810c5ee..388e23c8cbc 100644 --- a/src/mame/nintendo/snes_m.cpp +++ b/src/mame/nintendo/snes_m.cpp @@ -23,7 +23,7 @@ #define __MACHINE_SNES_C #include "emu.h" -#include "includes/snes.h" +#include "snes.h" #define DMA_REG(a) m_dma_regs[a - 0x4300] // regs 0x4300-0x437f diff --git a/src/mame/nintendo/snesb.cpp b/src/mame/nintendo/snesb.cpp index a035ec3799a..19b1d15cd66 100644 --- a/src/mame/nintendo/snesb.cpp +++ b/src/mame/nintendo/snesb.cpp @@ -152,7 +152,7 @@ Iron PCB (same as Final Fight 2?) ***************************************************************************/ #include "emu.h" -#include "includes/snes.h" +#include "snes.h" #include "speaker.h" diff --git a/src/mame/nintendo/snesb51.cpp b/src/mame/nintendo/snesb51.cpp index 4cf687cf489..8acaf994703 100644 --- a/src/mame/nintendo/snesb51.cpp +++ b/src/mame/nintendo/snesb51.cpp @@ -61,7 +61,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/snes.h" +#include "snes.h" #include "cpu/mcs51/mcs51.h" #include "emupal.h" #include "speaker.h" diff --git a/src/mame/nintendo/snescx4.cpp b/src/mame/nintendo/snescx4.cpp index 7a1b96f7237..7c359fbe307 100644 --- a/src/mame/nintendo/snescx4.cpp +++ b/src/mame/nintendo/snescx4.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/snescx4.h" +#include "snescx4.h" static CX4 cx4; @@ -25,8 +25,8 @@ static void CX4_writew(address_space &space, uint16_t addr, uint16_t data); static void CX4_C4DrawLine(int32_t X1, int32_t Y1, int16_t Z1, int32_t X2, int32_t Y2, int16_t Z2, uint8_t Color); -#include "machine/cx4data.ipp" -#include "machine/cx4fn.ipp" +#include "cx4data.ipp" +#include "cx4fn.ipp" static uint32_t CX4_ldr(uint8_t r) { @@ -114,8 +114,8 @@ static void CX4_transfer_data(address_space &space) } } -#include "machine/cx4oam.ipp" -#include "machine/cx4ops.ipp" +#include "cx4oam.ipp" +#include "cx4ops.ipp" void CX4_write(address_space &space, uint32_t addr, uint8_t data) { diff --git a/src/mame/nintendo/spacefb.cpp b/src/mame/nintendo/spacefb.cpp index 8bec6ef5cc8..019d7fbed0f 100644 --- a/src/mame/nintendo/spacefb.cpp +++ b/src/mame/nintendo/spacefb.cpp @@ -116,7 +116,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "includes/spacefb.h" +#include "spacefb.h" #include "sound/dac.h" diff --git a/src/mame/nintendo/spacefb_a.cpp b/src/mame/nintendo/spacefb_a.cpp index 5d70b81c4f2..c33e003d073 100644 --- a/src/mame/nintendo/spacefb_a.cpp +++ b/src/mame/nintendo/spacefb_a.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/spacefb.h" +#include "spacefb.h" #include "cpu/mcs48/mcs48.h" #include "sound/dac.h" diff --git a/src/mame/nintendo/spacefb_v.cpp b/src/mame/nintendo/spacefb_v.cpp index 845fc6f2525..7cef0520902 100644 --- a/src/mame/nintendo/spacefb_v.cpp +++ b/src/mame/nintendo/spacefb_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/spacefb.h" +#include "spacefb.h" #include "video/resnet.h" diff --git a/src/mame/nintendo/vboy.cpp b/src/mame/nintendo/vboy.cpp index 16a689781d3..7a17242c9c3 100644 --- a/src/mame/nintendo/vboy.cpp +++ b/src/mame/nintendo/vboy.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ #include "emu.h" -#include "audio/vboy.h" + +#include "vboysound.h" #include "cpu/v810/v810.h" #include "bus/vboy/slot.h" diff --git a/src/mame/nintendo/vsnes.cpp b/src/mame/nintendo/vsnes.cpp index af58644f1ac..416ade4c867 100644 --- a/src/mame/nintendo/vsnes.cpp +++ b/src/mame/nintendo/vsnes.cpp @@ -139,7 +139,7 @@ Changes: ***************************************************************************/ #include "emu.h" -#include "includes/vsnes.h" +#include "vsnes.h" #include "cpu/m6502/n2a03.h" #include "cpu/z80/z80.h" diff --git a/src/mame/nintendo/vsnes_m.cpp b/src/mame/nintendo/vsnes_m.cpp index b3d9b7d1269..774516fe959 100644 --- a/src/mame/nintendo/vsnes_m.cpp +++ b/src/mame/nintendo/vsnes_m.cpp @@ -12,7 +12,7 @@ Nintendo VS UniSystem and DualSystem - (c) 1984 Nintendo of America #include "emu.h" #include "screen.h" #include "video/ppu2c0x.h" -#include "includes/vsnes.h" +#include "vsnes.h" /* PPU notes */ diff --git a/src/mame/nintendo/vt1682.cpp b/src/mame/nintendo/vt1682.cpp index 24fcc151e88..7053ada918a 100644 --- a/src/mame/nintendo/vt1682.cpp +++ b/src/mame/nintendo/vt1682.cpp @@ -59,12 +59,12 @@ */ #include "emu.h" -#include "machine/m6502_swap_op_d2_d7.h" -#include "machine/m6502_swap_op_d5_d6.h" -#include "machine/vt1682_io.h" -#include "machine/vt1682_uio.h" -#include "machine/vt1682_alu.h" -#include "machine/vt1682_timer.h" +#include "m6502_swap_op_d2_d7.h" +#include "m6502_swap_op_d5_d6.h" +#include "vt1682_io.h" +#include "vt1682_uio.h" +#include "vt1682_alu.h" +#include "vt1682_timer.h" #include "machine/bankdev.h" #include "machine/timer.h" #include "sound/dac.h" diff --git a/src/mame/nintendo/vt1682_alu.cpp b/src/mame/nintendo/vt1682_alu.cpp index 59ed242e154..0114c56aab5 100644 --- a/src/mame/nintendo/vt1682_alu.cpp +++ b/src/mame/nintendo/vt1682_alu.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" -#include "machine/vt1682_alu.h" +#include "vt1682_alu.h" #define LOG_ALU (1U << 1) diff --git a/src/mame/nintendo/vt1682_io.cpp b/src/mame/nintendo/vt1682_io.cpp index 0e06a82f959..aaa4f0bbf14 100644 --- a/src/mame/nintendo/vt1682_io.cpp +++ b/src/mame/nintendo/vt1682_io.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" -#include "machine/vt1682_io.h" +#include "vt1682_io.h" #define LOG_IO (1U << 1) diff --git a/src/mame/nintendo/vt1682_timer.cpp b/src/mame/nintendo/vt1682_timer.cpp index afe5bdc2697..57a0421bcf6 100644 --- a/src/mame/nintendo/vt1682_timer.cpp +++ b/src/mame/nintendo/vt1682_timer.cpp @@ -5,7 +5,7 @@ // Does writing to Enable actually turn on the timer, or writing to preload MSB? (which appears to be done AFTER turning on in many cases) #include "emu.h" -#include "machine/vt1682_timer.h" +#include "vt1682_timer.h" #define LOG_TIMER (1U << 1) diff --git a/src/mame/nintendo/vt1682_uio.cpp b/src/mame/nintendo/vt1682_uio.cpp index 557ed7e3646..000ec8acbfe 100644 --- a/src/mame/nintendo/vt1682_uio.cpp +++ b/src/mame/nintendo/vt1682_uio.cpp @@ -4,7 +4,7 @@ // UIO seems to be a different IO module to the vt1682_io.cpp one, 8-bit ports instead of 4-bit #include "emu.h" -#include "machine/vt1682_uio.h" +#include "vt1682_uio.h" #define LOG_UIO (1U << 1) diff --git a/src/mame/nix/fitfight.cpp b/src/mame/nix/fitfight.cpp index 07715ac1191..240e76b964d 100644 --- a/src/mame/nix/fitfight.cpp +++ b/src/mame/nix/fitfight.cpp @@ -84,7 +84,7 @@ Stephh's notes : */ #include "emu.h" -#include "includes/fitfight.h" +#include "fitfight.h" #include "cpu/m68000/m68000.h" #include "cpu/upd7810/upd7810.h" diff --git a/src/mame/nix/fitfight_v.cpp b/src/mame/nix/fitfight_v.cpp index 2a2b67a54ac..c9d5d7d02ce 100644 --- a/src/mame/nix/fitfight_v.cpp +++ b/src/mame/nix/fitfight_v.cpp @@ -3,7 +3,7 @@ /* Fit of Fighting Video Hardware */ #include "emu.h" -#include "includes/fitfight.h" +#include "fitfight.h" void fitfight_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int layer ) diff --git a/src/mame/nix/pirates.cpp b/src/mame/nix/pirates.cpp index 67dd40ad851..72c4b378c67 100644 --- a/src/mame/nix/pirates.cpp +++ b/src/mame/nix/pirates.cpp @@ -90,7 +90,7 @@ Notes: ---*/ #include "emu.h" -#include "includes/pirates.h" +#include "pirates.h" #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" diff --git a/src/mame/nix/pirates_v.cpp b/src/mame/nix/pirates_v.cpp index 82eb84825d8..73e85fa061d 100644 --- a/src/mame/nix/pirates_v.cpp +++ b/src/mame/nix/pirates_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood,Nicola Salmoria,Paul Priest #include "emu.h" -#include "includes/pirates.h" +#include "pirates.h" /* Video Hardware */ diff --git a/src/mame/nl.lst b/src/mame/nl.lst index 7d217f6c5be..54fbc9b1acf 100644 --- a/src/mame/nl.lst +++ b/src/mame/nl.lst @@ -11,7 +11,7 @@ /* Use CPUs */ -@source:1942.cpp +@source:capcom/1942.cpp 1942 // 12/1984 (c) 1984 1942a // 12/1984 (c) 1984 1942abl // bootleg @@ -22,7 +22,7 @@ /* FIXME: games commented out complain about being a clone of a game not in the driver */ -@source:cinemat.cpp +@source:cinemat/cinemat.cpp armora // (c) 1980 armorap // (c) 1980 armorar // (c) 1980 Cinematronics (Rock-ola license) @@ -49,19 +49,19 @@ warrior // (c) 1979 Vectorbeam wotw // (c) 1981 wotwc // (c) 1981 -@source:carpolo.cpp +@source:exidy/carpolo.cpp carpolo // (c) 1977 -@source:starfire.cpp +@source:exidy/starfire.cpp fireone // (c) 1979 Exidy starfir2 // (c) 1979 Exidy starfire // Exidy [1979?] starfirea // Exidy [1979?] -@source:flyball.cpp +@source:atari/flyball.cpp flyball -@source:galaxian.cpp +@source:galaxian/galaxian.cpp 600 // GX353 (c) 1981 Konami amidar // GX337 (c) 1982 Konami amidar1 // GX337 (c) 1981 Konami @@ -276,13 +276,13 @@ zerotimemc // hack (Marti Colls) zigzagb // (c) 1982 LAX (bootleg) zigzagb2 // (c) 1982 LAX (bootleg) -@source:gamemachine.cpp +@source:vtech/gamemachine.cpp gamemach // -@source:hazeltin.cpp +@source:skeleton/hazeltin.cpp hazl1500 // Hazeltine 1500 (c) 1977 -@source:jpmsru.cpp +@source:jpm/jpmsru.cpp j_ewn // Each Way Nudger (JPM) j_ewna // j_ewnb // @@ -310,7 +310,7 @@ j_goldn2 // Golden 2's (CTL) j_sup2p // Super 2p Shuffle (MDM) j_la // Lucky Aces -@source:m62.cpp // m62.cpp +@source:irem/m62.cpp // m62.cpp battroad // (c) 1984 horizon // (c) 1985 kidniki // (c) 1986 + Data East USA license @@ -334,23 +334,23 @@ spelunkrj // (c) 1985 licensed from Broderbund yanchamr // (c) 1986 (Japan) youjyudn // (c) 1986 (Japan) -@source:mario.cpp +@source:nintendo/mario.cpp mario // (c) 1983 Nintendo of America mariof // (c) 1983 Nintendo of America marioe // (c) 1983 Nintendo of America marioj // (c) 1983 Nintendo masao // bootleg -@source:mw8080bw.cpp +@source:midw8080/mw8080bw.cpp gunfight // 597 [1975] Dave Nutting Associates / Midway gunfighto // 597 [1975] Dave Nutting Associates / Midway 280zzzap // 610 [1976] Dave Nutting Associates / Midway lagunar // 622 [1977] Midway -@source:palestra.cpp +@source:skeleton/palestra.cpp palestra -@source:popeye.cpp +@source:nintendo/popeye.cpp skyskipr popeye // (c) 1982 popeyeu // (c) 1982 @@ -362,7 +362,7 @@ popeyej popeyejo popeyehs -@source:segag80r.cpp +@source:sega/segag80r.cpp 005 // (c) 1981 astrob // (c) 1981 astrob1 // (c) 1981 @@ -378,7 +378,7 @@ sindbadm // 834-5244 (c) 1983 Sega spaceod // (c) 1981 spaceod2 // (c) 1981 -@source:segag80v.cpp +@source:sega/segag80v.cpp elim2 // (c) 1981 Gremlin elim2a // (c) 1981 Gremlin elim2c // (c) 1981 Gremlin @@ -391,7 +391,7 @@ startrek // (c) 1982 tacscan // (c) 1982 zektor // (c) 1982 -@source:vicdual.cpp +@source:sega/vicdual.cpp brdrlinb // Karateco bootleg brdrline // (c) 1980 Sega brdrlinet // (c) 1981 Sega @@ -400,7 +400,7 @@ starrkr // (c) 1981 Sega tranqgun // 413-428 (c) 1980 Sega frogs // 112-119 [1978 Gremlin?] -@source:zaxxon.cpp +@source:sega/zaxxon.cpp congo // 605-5167 (c) 1983 (2 board stack) congoa // 605-5167 (c) 1983 (3 board stack) futspy // (c) 1984 @@ -414,7 +414,7 @@ zaxxon3 // (c) 1982 zaxxonb // bootleg zaxxonj // (c) 1982 -@source:segas16b.cpp +@source:sega/segas16b.cpp aceattac // (c) 1988 (FD1094) //afightere //afighterf @@ -554,18 +554,18 @@ wrestwar1d // wrestwar2 // (c) 1989 (FD1094) wrestwar2d // -@source:segas16b_isgsm.cpp +@source:sega/segas16b_isgsm.cpp isgsm // shinfz // tetrbx // -@source:sspeedr.cpp +@source:midway/sspeedr.cpp sspeedr // Midway -@source:starcrus.cpp +@source:ramtek/starcrus.cpp starcrus -@source:testpat.cpp +@source:skeleton/testpat.cpp tp1983 tp1985 @@ -573,7 +573,7 @@ tp1985 /* Do not use CPUs */ -@source:atarittl.cpp +@source:atari/atarittl.cpp antiairc // (c) 1975 Atari crashnsc // (c) 1975 Atari gtrak10 // (c) 1974 Atari / Kee @@ -592,21 +592,21 @@ stuntcyc // (c) 1976 Atari tank // (c) 1974 Atari / Kee tankii // (c) 1975 Atari / Kee -@source:pong.cpp +@source:atari/pong.cpp breakout // (c) 1976 Atari pong // (c) 1972 Atari pongd // (c) 1973 Atari rebound // -@source:cheekyms.cpp +@source:univers/cheekyms.cpp cheekyms // 8004 (c) [1980?] -@source:cocoloco.cpp +@source:misc/cocoloco.cpp cocoloco // 198?, Petaco S.A. cocolocoa // 198?, Recel S.A. cocolocob // 198?, Petaco S.A. -@source:zaccaria.cpp +@source:zaccaria/zaccaria.cpp jackrabt // (c) 1984 jackrabt2 // (c) 1984 jackrabts // (c) 1984 @@ -616,56 +616,56 @@ monymony // (c) 1983 // Skeletons // ****************************************************************************** -@source:a1supply.cpp +@source:misc/a1supply.cpp tv21 // (c) 197? A-1 Supply tv21_3 // (c) 197? A-1 Supply tvpoker // (c) 197? A-1 Supply -@source:aleisttl.cpp +@source:alliedl/aleisttl.cpp sburners // (c) 1975 Allied Leisure -@source:bailey.cpp +@source:misc/bailey.cpp fun4 // (c) 1976 Bailey fun4a // (c) 1976 Bailey -@source:chicago.cpp +@source:misc/chicago.cpp dmodrbcc // (c) 1976 Chicago Coin -@source:crazybal.cpp +@source:misc/crazybal.cpp crazybal // (c) 1978 EGS -@source:electra.cpp +@source:misc/electra.cpp avenger // (c) 1975 Electra -@source:exidyttl.cpp +@source:exidy/exidyttl.cpp attckexd // (c) 1977 Exidy attckexd2 // (c) 1977 Exidy deathrac // (c) 1976 Exidy rhunting // bootleg of deathrac -@source:fungames.cpp +@source:misc/fungames.cpp biplane // (c) 1975 Fun Games biplane4 // (c) 1976 Fun Games take5 // (c) 1975 Fun Games -@source:meadwttl.cpp +@source:meadows/meadwttl.cpp bombaway // (c) 1976 Meadows cgunship // (c) 1976 Meadows ckidzo // (c) 1976 Meadows mead4in1 // (c) 197? Meadows -@source:monacogp.cpp +@source:sega/monacogp.cpp monacogp // (c) 1980 Sega monacogpa // (c) 1980 Sega -@source:pse.cpp +@source:misc/pse.cpp bazooka // (c) 1976 PSE bazookabr // (c) 1977 Taito do Brasil dpatrol // (c) 1977 PSE dpatrola // (c) 1977 PSE / Telegames gametree // (c) 1978 PSE -@source:ramtek.cpp +@source:ramtek/ramtek.cpp bballrmt // (c) 1974 Ramtek cleanswp // (c) 1974 Ramtek hockyrmt // (c) 1973 Ramtek @@ -674,10 +674,10 @@ trivia // (c) 1976 Ramtek vollyrmt // (c) 1973 Ramtek wipeormt // (c) 1974 Ramtek -@source:segattl.cpp +@source:sega/segattl.cpp fonz // -@source:taitottl.cpp +@source:taito/taitottl.cpp fisco400 // (c) 1977 Taito gunman // (c) 1977 Taito missilex // (c) 1977 Taito @@ -685,5 +685,5 @@ ttblock // (c) 1977 Taito ttsracec // (c) 1978 Taito zzblock // (c) 1979 Taito -@source:usbilliards.cpp +@source:misc/usbilliards.cpp sharkusb // (c) 1975 US Billiards diff --git a/src/mame/nmk/nmk16.cpp b/src/mame/nmk/nmk16.cpp index 4327ba9cc7b..b8ae97eb075 100644 --- a/src/mame/nmk/nmk16.cpp +++ b/src/mame/nmk/nmk16.cpp @@ -196,15 +196,16 @@ Reference of music tempo: ********************************************************************/ #include "emu.h" -#include "includes/nmk16.h" -#include "audio/seibu.h" +#include "nmk16.h" + +#include "nmk004.h" + +#include "nmk112.h" #include "cpu/m68000/m68000.h" #include "cpu/pic16c5x/pic16c5x.h" #include "cpu/tlcs90/tlcs90.h" #include "cpu/z80/z80.h" -#include "machine/nmk004.h" -#include "machine/nmk112.h" #include "sound/okim6295.h" #include "sound/ymopm.h" #include "sound/ymopn.h" diff --git a/src/mame/nmk/nmk16.h b/src/mame/nmk/nmk16.h index e1f86b6fb41..6b8025d5038 100644 --- a/src/mame/nmk/nmk16.h +++ b/src/mame/nmk/nmk16.h @@ -6,16 +6,20 @@ #pragma once -#include "audio/seibu.h" +#include "nmk004.h" +#include "nmk16spr.h" + +#include "seibusound.h" + #include "machine/gen_latch.h" -#include "machine/nmk004.h" #include "machine/timer.h" #include "sound/okim6295.h" -#include "video/nmk16spr.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" + class nmk16_state : public driver_device, public seibu_sound_common { public: diff --git a/src/mame/nmk/nmk16_v.cpp b/src/mame/nmk/nmk16_v.cpp index 7f4542a16b1..d70a6191d82 100644 --- a/src/mame/nmk/nmk16_v.cpp +++ b/src/mame/nmk/nmk16_v.cpp @@ -11,7 +11,7 @@ */ #include "emu.h" -#include "includes/nmk16.h" +#include "nmk16.h" // the larger tilemaps on macross2, rapid hero and thunder dragon 2 appear to act like 4 'banks' // of the smaller tilemaps, rather than being able to scroll into each other (not verified on real hw, diff --git a/src/mame/nmk/powerins.cpp b/src/mame/nmk/powerins.cpp index baa4dc9369d..e0f1e31e985 100644 --- a/src/mame/nmk/powerins.cpp +++ b/src/mame/nmk/powerins.cpp @@ -32,12 +32,14 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/powerins.h" + +#include "powerins.h" + +#include "nmk112.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "machine/gen_latch.h" -#include "machine/nmk112.h" #include "sound/okim6295.h" #include "sound/ymopn.h" #include "speaker.h" diff --git a/src/mame/nmk/powerins.h b/src/mame/nmk/powerins.h index 291a2081fa2..593b9a62c4c 100644 --- a/src/mame/nmk/powerins.h +++ b/src/mame/nmk/powerins.h @@ -3,8 +3,8 @@ #ifndef MAME_INCLUDES_POWERINS_H #define MAME_INCLUDES_POWERINS_H -#include "includes/nmk16.h" -#include "video/nmk16spr.h" +#include "nmk16.h" +#include "nmk16spr.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/nmk/powerins_v.cpp b/src/mame/nmk/powerins_v.cpp index c59a02180cd..5905eac1f7a 100644 --- a/src/mame/nmk/powerins_v.cpp +++ b/src/mame/nmk/powerins_v.cpp @@ -40,7 +40,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: **************************************************************************/ #include "emu.h" -#include "includes/powerins.h" +#include "powerins.h" #include diff --git a/src/mame/nmk/quizdna.cpp b/src/mame/nmk/quizdna.cpp index f682d0c6465..860e4a97582 100644 --- a/src/mame/nmk/quizdna.cpp +++ b/src/mame/nmk/quizdna.cpp @@ -11,7 +11,7 @@ Quiz Gekiretsu Scramble (Gakuen Paradise 2) (c) 1993 Face *****************************************************************************/ #include "emu.h" -#include "includes/quizdna.h" +#include "quizdna.h" #include "cpu/z80/z80.h" #include "sound/okim6295.h" diff --git a/src/mame/nmk/quizdna_v.cpp b/src/mame/nmk/quizdna_v.cpp index cdf14d2c5bc..e0d883f50d2 100644 --- a/src/mame/nmk/quizdna_v.cpp +++ b/src/mame/nmk/quizdna_v.cpp @@ -12,7 +12,7 @@ Video hardware ******************************************************************************/ #include "emu.h" -#include "includes/quizdna.h" +#include "quizdna.h" TILE_GET_INFO_MEMBER(quizdna_state::get_bg_tile_info) diff --git a/src/mame/nmk/quizpani.cpp b/src/mame/nmk/quizpani.cpp index 8c60f9e4ad5..64f24d4f3a2 100644 --- a/src/mame/nmk/quizpani.cpp +++ b/src/mame/nmk/quizpani.cpp @@ -48,7 +48,7 @@ Stephh's notes (based on the games M68000 code and some tests) : *************************************************************************/ #include "emu.h" -#include "includes/quizpani.h" +#include "quizpani.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" diff --git a/src/mame/nmk/quizpani.h b/src/mame/nmk/quizpani.h index 79c4894f6e9..42dc5d9e084 100644 --- a/src/mame/nmk/quizpani.h +++ b/src/mame/nmk/quizpani.h @@ -1,11 +1,12 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Pierpaolo Prazzoli -#ifndef MAME_INCLUDES_QUIZPANI_H -#define MAME_INCLUDES_QUIZPANI_H +#ifndef MAME_NMK_QUIZPANI_H +#define MAME_NMK_QUIZPANI_H #pragma once -#include "machine/nmk112.h" +#include "nmk112.h" + #include "tilemap.h" class quizpani_state : public driver_device @@ -47,4 +48,4 @@ public: void quizpani_map(address_map &map); }; -#endif // MAME_INCLUDES_QUIZPANI_H +#endif // MAME_NMK_QUIZPANI_H diff --git a/src/mame/nmk/quizpani_v.cpp b/src/mame/nmk/quizpani_v.cpp index f8cd6090410..869603d95ec 100644 --- a/src/mame/nmk/quizpani_v.cpp +++ b/src/mame/nmk/quizpani_v.cpp @@ -7,7 +7,7 @@ ************************************************************************/ #include "emu.h" -#include "includes/quizpani.h" +#include "quizpani.h" TILEMAP_MAPPER_MEMBER(quizpani_state::bg_scan) diff --git a/src/mame/nokia/mikromik.cpp b/src/mame/nokia/mikromik.cpp index 5d02dfcb0f1..4f5f848025c 100644 --- a/src/mame/nokia/mikromik.cpp +++ b/src/mame/nokia/mikromik.cpp @@ -53,7 +53,7 @@ */ #include "emu.h" -#include "includes/mikromik.h" +#include "mikromik.h" #include "machine/74259.h" #include "softlist_dev.h" diff --git a/src/mame/nokia/mikromik.h b/src/mame/nokia/mikromik.h index ba4e96690eb..6719cf522f7 100644 --- a/src/mame/nokia/mikromik.h +++ b/src/mame/nokia/mikromik.h @@ -11,7 +11,7 @@ #include "machine/am9517a.h" #include "machine/bankdev.h" #include "machine/i8212.h" -#include "machine/mm1kb.h" +#include "mm1kb.h" #include "machine/pit8253.h" #include "machine/ram.h" #include "machine/upd765.h" diff --git a/src/mame/nokia/mikromik_v.cpp b/src/mame/nokia/mikromik_v.cpp index bd4defbf90a..40a2a270c59 100644 --- a/src/mame/nokia/mikromik_v.cpp +++ b/src/mame/nokia/mikromik_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/mikromik.h" +#include "mikromik.h" #include "screen.h" #define HORIZONTAL_CHARACTER_PIXELS 10 diff --git a/src/mame/olivetti/m20.cpp b/src/mame/olivetti/m20.cpp index a4380062ef8..f423f57c9cf 100644 --- a/src/mame/olivetti/m20.cpp +++ b/src/mame/olivetti/m20.cpp @@ -37,8 +37,8 @@ E I1 Vectored interrupt error #include "emu.h" -#include "machine/m20_8086.h" -#include "machine/m20_kbd.h" +#include "m20_8086.h" +#include "m20_kbd.h" #include "bus/rs232/rs232.h" #include "cpu/i86/i86.h" diff --git a/src/mame/olivetti/m20_kbd.cpp b/src/mame/olivetti/m20_kbd.cpp index ff2358d3143..47e1de9685b 100644 --- a/src/mame/olivetti/m20_kbd.cpp +++ b/src/mame/olivetti/m20_kbd.cpp @@ -2,7 +2,7 @@ // copyright-holders:Carl,Vas Crabb #include "emu.h" -#include "machine/m20_kbd.h" +#include "m20_kbd.h" #include "machine/keyboard.ipp" diff --git a/src/mame/olivetti/m24.cpp b/src/mame/olivetti/m24.cpp index 4d156e12c59..feb3ff6eb70 100644 --- a/src/mame/olivetti/m24.cpp +++ b/src/mame/olivetti/m24.cpp @@ -28,8 +28,8 @@ #include "imagedev/floppy.h" #include "machine/am9517a.h" #include "machine/i8087.h" -#include "machine/m24_kbd.h" -#include "machine/m24_z8000.h" +#include "m24_kbd.h" +#include "m24_z8000.h" #include "machine/mm58174.h" #include "machine/pit8253.h" #include "machine/pic8259.h" diff --git a/src/mame/olympia/dday.cpp b/src/mame/olympia/dday.cpp index 2f7bf9fadab..eabb34a8e7d 100644 --- a/src/mame/olympia/dday.cpp +++ b/src/mame/olympia/dday.cpp @@ -52,7 +52,7 @@ write: ***************************************************************************/ #include "emu.h" -#include "includes/dday.h" +#include "dday.h" #include "cpu/z80/z80.h" #include "speaker.h" diff --git a/src/mame/olympia/dday_v.cpp b/src/mame/olympia/dday_v.cpp index 33e4912edf1..dd7aa8c0799 100644 --- a/src/mame/olympia/dday_v.cpp +++ b/src/mame/olympia/dday_v.cpp @@ -12,7 +12,7 @@ #include "emu.h" #include "sound/ay8910.h" -#include "includes/dday.h" +#include "dday.h" /* Note: There seems to be no way to reset this timer via hardware. diff --git a/src/mame/olympia/portrait.cpp b/src/mame/olympia/portrait.cpp index 74e4a1851b0..7c4dc7390d6 100644 --- a/src/mame/olympia/portrait.cpp +++ b/src/mame/olympia/portrait.cpp @@ -91,7 +91,7 @@ DM81LS95 = TriState buffer **************************************************************************/ #include "emu.h" -#include "includes/portrait.h" +#include "portrait.h" #include "cpu/z80/z80.h" #include "cpu/mcs48/mcs48.h" diff --git a/src/mame/olympia/portrait_v.cpp b/src/mame/olympia/portrait_v.cpp index 907fc540fbe..0ae1b40d2b7 100644 --- a/src/mame/olympia/portrait_v.cpp +++ b/src/mame/olympia/portrait_v.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/portrait.h" +#include "portrait.h" void portrait_state::bgvideo_write(offs_t offset, uint8_t data) diff --git a/src/mame/omnibyte/ob68k1a.cpp b/src/mame/omnibyte/ob68k1a.cpp index 8c73e6e2c83..6ad34e6505f 100644 --- a/src/mame/omnibyte/ob68k1a.cpp +++ b/src/mame/omnibyte/ob68k1a.cpp @@ -61,7 +61,7 @@ Notes: #include "emu.h" -#include "includes/ob68k1a.h" +#include "ob68k1a.h" diff --git a/src/mame/omori/battlex.cpp b/src/mame/omori/battlex.cpp index 3679d83dc0c..a2f77aae534 100644 --- a/src/mame/omori/battlex.cpp +++ b/src/mame/omori/battlex.cpp @@ -82,7 +82,7 @@ #include "emu.h" -#include "includes/battlex.h" +#include "battlex.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/omori/battlex_v.cpp b/src/mame/omori/battlex_v.cpp index 73cfa6351ea..899376181dd 100644 --- a/src/mame/omori/battlex_v.cpp +++ b/src/mame/omori/battlex_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/battlex.h" +#include "battlex.h" void battlex_state::battlex_palette_w(offs_t offset, uint8_t data) diff --git a/src/mame/orca/espial.cpp b/src/mame/orca/espial.cpp index f4c1614f66e..3088624e55a 100644 --- a/src/mame/orca/espial.cpp +++ b/src/mame/orca/espial.cpp @@ -39,7 +39,7 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/espial.h" +#include "espial.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/orca/espial_v.cpp b/src/mame/orca/espial_v.cpp index 3a29447a029..580c40c2bc3 100644 --- a/src/mame/orca/espial_v.cpp +++ b/src/mame/orca/espial_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/espial.h" +#include "espial.h" /*************************************************************************** diff --git a/src/mame/orca/funkybee.cpp b/src/mame/orca/funkybee.cpp index 8792c1081a1..a5e57eff67f 100644 --- a/src/mame/orca/funkybee.cpp +++ b/src/mame/orca/funkybee.cpp @@ -74,7 +74,7 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/funkybee.h" +#include "funkybee.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/orca/funkybee_v.cpp b/src/mame/orca/funkybee_v.cpp index 859230c8089..27ee49107fa 100644 --- a/src/mame/orca/funkybee_v.cpp +++ b/src/mame/orca/funkybee_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/funkybee.h" +#include "funkybee.h" void funkybee_state::funkybee_palette(palette_device &palette) const { diff --git a/src/mame/orca/marineb.cpp b/src/mame/orca/marineb.cpp index 93f7811bb66..0a4c2cf8c22 100644 --- a/src/mame/orca/marineb.cpp +++ b/src/mame/orca/marineb.cpp @@ -38,7 +38,7 @@ write ***************************************************************************/ #include "emu.h" -#include "includes/marineb.h" +#include "marineb.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/orca/marineb_v.cpp b/src/mame/orca/marineb_v.cpp index 2f6f4422357..939c6bc11a0 100644 --- a/src/mame/orca/marineb_v.cpp +++ b/src/mame/orca/marineb_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/marineb.h" +#include "marineb.h" void marineb_state::marineb_palette(palette_device &palette) const diff --git a/src/mame/orca/orca40c.cpp b/src/mame/orca/orca40c.cpp index 63b9bba34f9..80a8ac941a7 100644 --- a/src/mame/orca/orca40c.cpp +++ b/src/mame/orca/orca40c.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/orca40c.h" +#include "orca40c.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/orca/vastar.cpp b/src/mame/orca/vastar.cpp index 98d9cfd4801..ab34ca7ff6f 100644 --- a/src/mame/orca/vastar.cpp +++ b/src/mame/orca/vastar.cpp @@ -103,13 +103,13 @@ Vsync : 60.58hz #include "emu.h" -#include "includes/vastar.h" +#include "vastar.h" #include "cpu/z80/z80.h" #include "machine/74259.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "video/orca40c.h" +#include "orca40c.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/orca/vastar_v.cpp b/src/mame/orca/vastar_v.cpp index a3173aea438..2e7eea0c887 100644 --- a/src/mame/orca/vastar_v.cpp +++ b/src/mame/orca/vastar_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/vastar.h" +#include "vastar.h" /*************************************************************************** diff --git a/src/mame/orca/zodiack.cpp b/src/mame/orca/zodiack.cpp index 944557918da..b1c83c75d81 100644 --- a/src/mame/orca/zodiack.cpp +++ b/src/mame/orca/zodiack.cpp @@ -96,11 +96,11 @@ Bounty2: ***************************************************************************/ #include "emu.h" -#include "includes/zodiack.h" +#include "zodiack.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "video/orca40c.h" +#include "orca40c.h" #include "speaker.h" diff --git a/src/mame/osborne/osborne1.cpp b/src/mame/osborne/osborne1.cpp index 4eb48432f7d..beb077055b2 100644 --- a/src/mame/osborne/osborne1.cpp +++ b/src/mame/osborne/osborne1.cpp @@ -89,7 +89,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/osborne1.h" +#include "osborne1.h" #include "bus/rs232/rs232.h" #include "speaker.h" diff --git a/src/mame/osborne/osborne1_m.cpp b/src/mame/osborne/osborne1_m.cpp index 840ff50d22f..fe3bc0cc819 100644 --- a/src/mame/osborne/osborne1_m.cpp +++ b/src/mame/osborne/osborne1_m.cpp @@ -10,7 +10,7 @@ There are three IRQ sources: ***************************************************************************/ #include "emu.h" -#include "includes/osborne1.h" +#include "osborne1.h" void osborne1_state::bank_0xxx_w(offs_t offset, u8 data) diff --git a/src/mame/osi/osi.cpp b/src/mame/osi/osi.cpp index e5b96c3af5a..81d691b02a0 100644 --- a/src/mame/osi/osi.cpp +++ b/src/mame/osi/osi.cpp @@ -227,7 +227,7 @@ Keyboard notes and BTANBs: */ #include "emu.h" -#include "includes/osi.h" +#include "osi.h" #include "machine/clock.h" #include "screen.h" diff --git a/src/mame/osi/osi_v.cpp b/src/mame/osi/osi_v.cpp index 8e2c1cd3016..9130a7a80e1 100644 --- a/src/mame/osi/osi_v.cpp +++ b/src/mame/osi/osi_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder, Robbbert, Wilbert Pol #include "emu.h" -#include "includes/osi.h" +#include "osi.h" #include "screen.h" /* Palette Initialization */ diff --git a/src/mame/pacific/mrflea.cpp b/src/mame/pacific/mrflea.cpp index 3b17ab96cd1..291ccff3a64 100644 --- a/src/mame/pacific/mrflea.cpp +++ b/src/mame/pacific/mrflea.cpp @@ -63,7 +63,7 @@ Stephh's notes (based on the games Z80 code and some tests) : ******************************************************************/ #include "emu.h" -#include "includes/mrflea.h" +#include "mrflea.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" diff --git a/src/mame/pacific/mrflea_v.cpp b/src/mame/pacific/mrflea_v.cpp index 9ea933c0052..9e723d55170 100644 --- a/src/mame/pacific/mrflea_v.cpp +++ b/src/mame/pacific/mrflea_v.cpp @@ -8,7 +8,7 @@ Mr. F. Lea ******************************************************************/ #include "emu.h" -#include "includes/mrflea.h" +#include "mrflea.h" void mrflea_state::mrflea_gfx_bank_w(uint8_t data) { diff --git a/src/mame/pacific/thief.cpp b/src/mame/pacific/thief.cpp index 48a86334fe8..30428e63885 100644 --- a/src/mame/pacific/thief.cpp +++ b/src/mame/pacific/thief.cpp @@ -23,7 +23,7 @@ Credits: ******************************************************************/ #include "emu.h" -#include "includes/thief.h" +#include "thief.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" diff --git a/src/mame/pacific/thief_v.cpp b/src/mame/pacific/thief_v.cpp index 1a16e5b6bf4..3f4bb9784d4 100644 --- a/src/mame/pacific/thief_v.cpp +++ b/src/mame/pacific/thief_v.cpp @@ -5,7 +5,7 @@ */ #include "emu.h" -#include "includes/thief.h" +#include "thief.h" enum { diff --git a/src/mame/pacman/jrpacman.cpp b/src/mame/pacman/jrpacman.cpp index ad5f6401927..738225fb59e 100644 --- a/src/mame/pacman/jrpacman.cpp +++ b/src/mame/pacman/jrpacman.cpp @@ -101,7 +101,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/pacman.h" +#include "pacman.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/pacman/jumpshot.cpp b/src/mame/pacman/jumpshot.cpp index ef569cf041d..d140bf145d0 100644 --- a/src/mame/pacman/jumpshot.cpp +++ b/src/mame/pacman/jumpshot.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/pacman.h" +#include "pacman.h" uint8_t pacman_state::jumpshot_decrypt(int addr, uint8_t e) diff --git a/src/mame/pacman/pacman.cpp b/src/mame/pacman/pacman.cpp index 30451d33f00..5d89c5fb71b 100644 --- a/src/mame/pacman/pacman.cpp +++ b/src/mame/pacman/pacman.cpp @@ -340,9 +340,9 @@ Boards: ****************************************************************************/ #include "emu.h" -#include "includes/pacman.h" -#include "machine/jumpshot.h" -#include "machine/pacplus.h" +#include "pacman.h" +#include "jumpshot.h" +#include "pacplus.h" #include "cpu/s2650/s2650.h" #include "cpu/z80/z80.h" diff --git a/src/mame/pacman/pacman_m.cpp b/src/mame/pacman/pacman_m.cpp index 9f6140b486d..79427e26235 100644 --- a/src/mame/pacman/pacman_m.cpp +++ b/src/mame/pacman/pacman_m.cpp @@ -2,7 +2,7 @@ // copyright-holders:smf, Mike Balfour, David Widel #include "emu.h" -#include "includes/pacman.h" +#include "pacman.h" uint8_t epospm_state::epos_decryption_w(offs_t offset) { diff --git a/src/mame/pacman/pacman_v.cpp b/src/mame/pacman/pacman_v.cpp index 0bdf54ed8f9..b530ab2e291 100644 --- a/src/mame/pacman/pacman_v.cpp +++ b/src/mame/pacman/pacman_v.cpp @@ -19,7 +19,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/pacman.h" +#include "pacman.h" #include "video/resnet.h" /*************************************************************************** diff --git a/src/mame/pacman/pacplus.cpp b/src/mame/pacman/pacplus.cpp index 67e09c92552..31126306001 100644 --- a/src/mame/pacman/pacplus.cpp +++ b/src/mame/pacman/pacplus.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/pacman.h" +#include "pacman.h" uint8_t pacman_state::pacplus_decrypt(int addr, uint8_t e) diff --git a/src/mame/pacman/pengo.cpp b/src/mame/pacman/pengo.cpp index 53417d4c1f3..05283372185 100644 --- a/src/mame/pacman/pengo.cpp +++ b/src/mame/pacman/pengo.cpp @@ -64,13 +64,15 @@ ***************************************************************************/ #include "emu.h" -#include "includes/pacman.h" +#include "pacman.h" + +#include "segacrpt_device.h" #include "cpu/z80/z80.h" #include "machine/74259.h" #include "machine/gen_latch.h" -#include "machine/segacrpt_device.h" #include "sound/ay8910.h" + #include "screen.h" #include "speaker.h" diff --git a/src/mame/pc/europc.cpp b/src/mame/pc/europc.cpp index b5d99561118..8ec829e5f6b 100644 --- a/src/mame/pc/europc.cpp +++ b/src/mame/pc/europc.cpp @@ -34,7 +34,7 @@ #include "bus/isa/fdc.h" #include "bus/pc_kbd/keyboards.h" #include "bus/pc_kbd/pc_kbdc.h" -#include "machine/europc_kbd.h" +#include "europc_kbd.h" #include "machine/genpc.h" #include "machine/m3002.h" #include "machine/ram.h" diff --git a/src/mame/pc/ibmpcjr.cpp b/src/mame/pc/ibmpcjr.cpp index 3122a3343af..89d16da2e64 100644 --- a/src/mame/pc/ibmpcjr.cpp +++ b/src/mame/pc/ibmpcjr.cpp @@ -13,7 +13,7 @@ #include "machine/ram.h" #include "sound/sn76496.h" #include "sound/spkrdev.h" -#include "video/pc_t1t.h" +#include "pc_t1t.h" #include "bus/generic/carts.h" #include "bus/generic/slot.h" diff --git a/src/mame/pc/nforcepc.cpp b/src/mame/pc/nforcepc.cpp index 8d43ccb80c9..04f94c4fd28 100644 --- a/src/mame/pc/nforcepc.cpp +++ b/src/mame/pc/nforcepc.cpp @@ -20,21 +20,21 @@ */ - #include "emu.h" +#include "nforcepc.h" + +#include "xbox_pci.h" + #include "bus/ata/atadev.h" -#include "cpu/i386/athlon.h" -#include "machine/pci.h" -#include "machine/pci-ide.h" -#include "machine/intelfsh.h" -#include "video/virge_pci.h" -#include "bus/rs232/rs232.h" #include "bus/rs232/hlemouse.h" #include "bus/rs232/null_modem.h" +#include "bus/rs232/rs232.h" #include "bus/rs232/sun_kbd.h" #include "bus/rs232/terminal.h" -#include "machine/xbox_pci.h" -#include "includes/nforcepc.h" +#include "cpu/i386/athlon.h" +#include "machine/pci-ide.h" +#include "video/virge_pci.h" + #if 1 // for now let's use this as the contents of the spd chip in the ddr dimm memory module diff --git a/src/mame/pc/nforcepc.h b/src/mame/pc/nforcepc.h index cca0d9a8eaa..7dee2c67dc1 100644 --- a/src/mame/pc/nforcepc.h +++ b/src/mame/pc/nforcepc.h @@ -1,20 +1,23 @@ // license:BSD-3-Clause // copyright-holders: Samuele Zannoli -#ifndef MAME_MACHINE_NFORCEPC_H -#define MAME_MACHINE_NFORCEPC_H +#ifndef MAME_PC_NFORCEPC_H +#define MAME_PC_NFORCEPC_H #pragma once -// floppy disk controller -#include "machine/upd765.h" + +#include "xbox_pci.h" + #include "imagedev/floppy.h" -#include "formats/pc_dsk.h" -#include "formats/naslite_dsk.h" -// keyboard #include "machine/8042kbdc.h" -// parallel port -#include "machine/pc_lpt.h" -// serial port #include "machine/ins8250.h" +#include "machine/intelfsh.h" +#include "machine/pc_lpt.h" +#include "machine/pci.h" +#include "machine/upd765.h" + +#include "formats/naslite_dsk.h" +#include "formats/pc_dsk.h" + // NVIDIA Corporation nForce CPU bridge @@ -327,5 +330,4 @@ private: DECLARE_DEVICE_TYPE(IT8703F, it8703f_device) - -#endif +#endif // MAME_PC_NFORCEPC_H diff --git a/src/mame/pc/tandy1t.cpp b/src/mame/pc/tandy1t.cpp index 05bb113f118..85db48e1a43 100644 --- a/src/mame/pc/tandy1t.cpp +++ b/src/mame/pc/tandy1t.cpp @@ -46,7 +46,7 @@ used XTA (8-bit IDE) harddisks. #include "machine/pckeybrd.h" #include "machine/nvram.h" #include "machine/bankdev.h" -#include "video/pc_t1t.h" +#include "pc_t1t.h" #include "sound/sn76496.h" #include "cpu/i86/i86.h" #include "cpu/i86/i286.h" diff --git a/src/mame/pc/tosh1000.cpp b/src/mame/pc/tosh1000.cpp index 15871eb5e52..fe60b1fe8e6 100644 --- a/src/mame/pc/tosh1000.cpp +++ b/src/mame/pc/tosh1000.cpp @@ -39,7 +39,7 @@ #include "emu.h" #include "machine/genpc.h" -#include "machine/tosh1000_bram.h" +#include "tosh1000_bram.h" #include "bus/isa/isa_cards.h" #include "bus/pc_kbd/keyboards.h" diff --git a/src/mame/pce/ggconnie.cpp b/src/mame/pce/ggconnie.cpp index 55dd1589849..03cd5ed1cc4 100644 --- a/src/mame/pce/ggconnie.cpp +++ b/src/mame/pce/ggconnie.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "emu.h" -#include "machine/pcecommn.h" +#include "pcecommn.h" #include "video/huc6270.h" #include "video/huc6260.h" diff --git a/src/mame/pce/paranoia.cpp b/src/mame/pce/paranoia.cpp index 38541b5086b..53b3e9633ce 100644 --- a/src/mame/pce/paranoia.cpp +++ b/src/mame/pce/paranoia.cpp @@ -36,7 +36,7 @@ HuC6280A (Hudson) ****************************************************************************/ #include "emu.h" -#include "machine/pcecommn.h" +#include "pcecommn.h" #include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/pce/pcecommn.cpp b/src/mame/pce/pcecommn.cpp index d7e17d5a5cd..f60255ce8e7 100644 --- a/src/mame/pce/pcecommn.cpp +++ b/src/mame/pce/pcecommn.cpp @@ -2,7 +2,7 @@ // copyright-holders:Mariusz Wojcieszek #include "emu.h" -#include "machine/pcecommn.h" +#include "pcecommn.h" #include "cpu/h6280/h6280.h" #define TG_16_JOY_SIG 0x00 diff --git a/src/mame/pce/tourvis.cpp b/src/mame/pce/tourvis.cpp index 641270730c6..c7f8793c74e 100644 --- a/src/mame/pce/tourvis.cpp +++ b/src/mame/pce/tourvis.cpp @@ -176,7 +176,7 @@ http://blog.system11.org/?p=1943 ****************************************************************************/ #include "emu.h" -#include "machine/pcecommn.h" +#include "pcecommn.h" #include "cpu/h6280/h6280.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/pce/uapce.cpp b/src/mame/pce/uapce.cpp index a2d68b2b034..b2bdc4f7e6f 100644 --- a/src/mame/pce/uapce.cpp +++ b/src/mame/pce/uapce.cpp @@ -111,7 +111,7 @@ Alien Crush & Pac_Land: dumps made from PC-Engine dumps of JP versions */ #include "emu.h" -#include "machine/pcecommn.h" +#include "pcecommn.h" #include "cpu/h6280/h6280.h" #include "cpu/z80/z80.h" diff --git a/src/mame/pdp1/pdp1.cpp b/src/mame/pdp1/pdp1.cpp index 93936b961d2..fd719ce63b0 100644 --- a/src/mame/pdp1/pdp1.cpp +++ b/src/mame/pdp1/pdp1.cpp @@ -56,10 +56,10 @@ To load and play a game: */ #include "emu.h" -#include "includes/pdp1.h" +#include "pdp1.h" #include "cpu/pdp1/pdp1.h" -#include "video/crt.h" + #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/pdp1/pdp1.h b/src/mame/pdp1/pdp1.h index 5fbe80bb3d0..203bee6e168 100644 --- a/src/mame/pdp1/pdp1.h +++ b/src/mame/pdp1/pdp1.h @@ -5,13 +5,15 @@ * includes/pdp1.h * ****************************************************************************/ +#ifndef MAME_PDP1_PDP1_H +#define MAME_PDP1_PDP1_H -#ifndef MAME_INCLUDES_PDP1_H -#define MAME_INCLUDES_PDP1_H +#pragma once + +#include "mitcrt.h" #include "cpu/pdp1/pdp1.h" #include "imagedev/papertape.h" -#include "video/crt.h" #include "emupal.h" /* defines for each bit and mask in input port "CSW" */ @@ -479,4 +481,4 @@ public: required_ioport m_lighty; }; -#endif // MAME_INCLUDES_PDP1_H +#endif // MAME_PDP1_PDP1_H diff --git a/src/mame/pdp1/pdp1_v.cpp b/src/mame/pdp1/pdp1_v.cpp index cbdb3031fbd..a80f52f06e7 100644 --- a/src/mame/pdp1/pdp1_v.cpp +++ b/src/mame/pdp1/pdp1_v.cpp @@ -19,7 +19,7 @@ #include "emu.h" #include "cpu/pdp1/pdp1.h" -#include "includes/pdp1.h" +#include "pdp1.h" #include #include diff --git a/src/mame/philips/p2000t.cpp b/src/mame/philips/p2000t.cpp index 9cba555622a..fe313f33eec 100644 --- a/src/mame/philips/p2000t.cpp +++ b/src/mame/philips/p2000t.cpp @@ -29,7 +29,7 @@ Philips P2000 1 Memory map ************************************************************************/ #include "emu.h" -#include "includes/p2000t.h" +#include "p2000t.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/philips/p2000t.h b/src/mame/philips/p2000t.h index ed5260df60d..0037d6707f6 100644 --- a/src/mame/philips/p2000t.h +++ b/src/mame/philips/p2000t.h @@ -14,7 +14,7 @@ #include "cpu/z80/z80.h" #include "sound/spkrdev.h" #include "video/saa5050.h" -#include "machine/p2000t_mdcr.h" +#include "p2000t_mdcr.h" #include "machine/ram.h" #include "emupal.h" diff --git a/src/mame/philips/p2000t_m.cpp b/src/mame/philips/p2000t_m.cpp index e155e3afd33..b1e3daf0877 100644 --- a/src/mame/philips/p2000t_m.cpp +++ b/src/mame/philips/p2000t_m.cpp @@ -10,7 +10,7 @@ **********************************************************************/ #include "emu.h" -#include "includes/p2000t.h" +#include "p2000t.h" #define P2000M_101F_CASDAT 0x01 #define P2000M_101F_CASCMD 0x02 diff --git a/src/mame/philips/p2000t_v.cpp b/src/mame/philips/p2000t_v.cpp index 380ee26a143..fc8c277a5d3 100644 --- a/src/mame/philips/p2000t_v.cpp +++ b/src/mame/philips/p2000t_v.cpp @@ -9,7 +9,7 @@ **********************************************************************/ #include "emu.h" -#include "includes/p2000t.h" +#include "p2000t.h" diff --git a/src/mame/phoenix/naughtyb.cpp b/src/mame/phoenix/naughtyb.cpp index d7f1dda8e0b..83b6fac7fb7 100644 --- a/src/mame/phoenix/naughtyb.cpp +++ b/src/mame/phoenix/naughtyb.cpp @@ -105,7 +105,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/naughtyb.h" +#include "naughtyb.h" #include "cpu/z80/z80.h" #include "sound/tms36xx.h" diff --git a/src/mame/phoenix/naughtyb.h b/src/mame/phoenix/naughtyb.h index 005d3277db5..edfc671b6ff 100644 --- a/src/mame/phoenix/naughtyb.h +++ b/src/mame/phoenix/naughtyb.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/pleiads.h" +#include "pleiads.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/phoenix/naughtyb_v.cpp b/src/mame/phoenix/naughtyb_v.cpp index 2dd4d21b9f4..50890e7c423 100644 --- a/src/mame/phoenix/naughtyb_v.cpp +++ b/src/mame/phoenix/naughtyb_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/naughtyb.h" +#include "naughtyb.h" #if 0 diff --git a/src/mame/phoenix/phoenix.cpp b/src/mame/phoenix/phoenix.cpp index 2f24e6ef059..7225b0e3d3d 100644 --- a/src/mame/phoenix/phoenix.cpp +++ b/src/mame/phoenix/phoenix.cpp @@ -48,8 +48,8 @@ Pleiads: ***************************************************************************/ #include "emu.h" -#include "includes/phoenix.h" -#include "audio/phoenix.h" +#include "phoenix.h" +#include "phoenix_a.h" #include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/phoenix/phoenix.h b/src/mame/phoenix/phoenix.h index 8602ccce1c6..e0f634b9457 100644 --- a/src/mame/phoenix/phoenix.h +++ b/src/mame/phoenix/phoenix.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/pleiads.h" +#include "pleiads.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/phoenix/phoenix_a.cpp b/src/mame/phoenix/phoenix_a.cpp index 772f4bb889a..1008a61539c 100644 --- a/src/mame/phoenix/phoenix_a.cpp +++ b/src/mame/phoenix/phoenix_a.cpp @@ -11,7 +11,7 @@ #include "emu.h" -#include "audio/phoenix.h" +#include "phoenix_a.h" /**************************************************************************** * 4006 diff --git a/src/mame/phoenix/phoenix_v.cpp b/src/mame/phoenix/phoenix_v.cpp index 84c9787cedf..11332375d4a 100644 --- a/src/mame/phoenix/phoenix_v.cpp +++ b/src/mame/phoenix/phoenix_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/phoenix.h" +#include "phoenix.h" #include "video/resnet.h" diff --git a/src/mame/phoenix/pleiads.cpp b/src/mame/phoenix/pleiads.cpp index 965b445f67a..5fa717c7a57 100644 --- a/src/mame/phoenix/pleiads.cpp +++ b/src/mame/phoenix/pleiads.cpp @@ -9,7 +9,7 @@ * ****************************************************************************/ #include "emu.h" -#include "audio/pleiads.h" +#include "pleiads.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/mame/pinball/allied.cpp b/src/mame/pinball/allied.cpp index 08d5850fefd..e9ae733556f 100644 --- a/src/mame/pinball/allied.cpp +++ b/src/mame/pinball/allied.cpp @@ -44,7 +44,7 @@ ToDo: ***************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6502/m6504.h" #include "machine/mos6530.h" #include "machine/6821pia.h" diff --git a/src/mame/pinball/alvg.cpp b/src/mame/pinball/alvg.cpp index 99225e40435..4f27edbf249 100644 --- a/src/mame/pinball/alvg.cpp +++ b/src/mame/pinball/alvg.cpp @@ -63,7 +63,7 @@ ToDo: ****************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6502/m65c02.h" #include "cpu/m6809/m6809.h" #include "cpu/mcs51/mcs51.h" diff --git a/src/mame/pinball/atari_4x4.cpp b/src/mame/pinball/atari_4x4.cpp index 381ca981f92..698c269f071 100644 --- a/src/mame/pinball/atari_4x4.cpp +++ b/src/mame/pinball/atari_4x4.cpp @@ -23,7 +23,7 @@ ToDo: *****************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6502/m6502.h" //#include "machine/timer.h" //#include "sound/dac.h" diff --git a/src/mame/pinball/atari_s1.cpp b/src/mame/pinball/atari_s1.cpp index 09ad4f90f1b..58fb15850b7 100644 --- a/src/mame/pinball/atari_s1.cpp +++ b/src/mame/pinball/atari_s1.cpp @@ -47,7 +47,7 @@ ToDo: ****************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6800/m6800.h" #include "machine/timer.h" diff --git a/src/mame/pinball/atari_s2.cpp b/src/mame/pinball/atari_s2.cpp index d5dc71c173d..4b4d82f0059 100644 --- a/src/mame/pinball/atari_s2.cpp +++ b/src/mame/pinball/atari_s2.cpp @@ -21,7 +21,7 @@ ToDo: *****************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6800/m6800.h" #include "machine/timer.h" diff --git a/src/mame/pinball/barni.cpp b/src/mame/pinball/barni.cpp index a9284e98c33..f1cc344f793 100644 --- a/src/mame/pinball/barni.cpp +++ b/src/mame/pinball/barni.cpp @@ -37,7 +37,7 @@ TODO: **************************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" #include "machine/6522via.h" diff --git a/src/mame/pinball/by17.cpp b/src/mame/pinball/by17.cpp index 85e8c4cba18..5a4f3917a2f 100644 --- a/src/mame/pinball/by17.cpp +++ b/src/mame/pinball/by17.cpp @@ -33,7 +33,7 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" diff --git a/src/mame/pinball/by35.cpp b/src/mame/pinball/by35.cpp index 13b56fcc3ce..805a08890af 100644 --- a/src/mame/pinball/by35.cpp +++ b/src/mame/pinball/by35.cpp @@ -129,12 +129,14 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" + +#include "ballysound.h" #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" #include "machine/timer.h" -#include "audio/bally.h" + #include "speaker.h" //#define VERBOSE 1 diff --git a/src/mame/pinball/by6803.cpp b/src/mame/pinball/by6803.cpp index ab3d519739b..02730b52ab3 100644 --- a/src/mame/pinball/by6803.cpp +++ b/src/mame/pinball/by6803.cpp @@ -67,7 +67,7 @@ ToDo: #include "emu.h" //#include "audio/midway.h" //#include "audio/williams.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6800/m6801.h" //#include "cpu/m6809/m6809.h" diff --git a/src/mame/pinball/byvid.cpp b/src/mame/pinball/byvid.cpp index 5dc069223a8..0c4e6295bb2 100644 --- a/src/mame/pinball/byvid.cpp +++ b/src/mame/pinball/byvid.cpp @@ -51,12 +51,15 @@ ToDo (granny): #include "emu.h" -#include "machine/genpin.h" + +#include "genpin.h" + +#include "ballysound.h" + #include "cpu/m6800/m6801.h" #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" #include "machine/timer.h" -#include "audio/bally.h" #include "sound/beep.h" #include "video/tms9928a.h" #include "speaker.h" diff --git a/src/mame/pinball/de_2.cpp b/src/mame/pinball/de_2.cpp index 71e72a58cea..b42b1ea6321 100644 --- a/src/mame/pinball/de_2.cpp +++ b/src/mame/pinball/de_2.cpp @@ -49,8 +49,8 @@ ToDo: *********************************************************************************************************************/ #include "emu.h" -#include "machine/decopincpu.h" -#include "machine/genpin.h" +#include "decopincpu.h" +#include "genpin.h" #include "cpu/m6809/m6809.h" #include "sound/msm5205.h" diff --git a/src/mame/pinball/de_3.cpp b/src/mame/pinball/de_3.cpp index 2bf27f161f7..c738fc66fdc 100644 --- a/src/mame/pinball/de_3.cpp +++ b/src/mame/pinball/de_3.cpp @@ -55,17 +55,20 @@ ToDo: *********************************************************************************************************************/ #include "emu.h" +#include "decodmd1.h" +#include "decodmd2.h" +#include "decodmd3.h" +#include "decopincpu.h" +#include "genpin.h" + +#include "decobsmt.h" + #include "cpu/m6809/m6809.h" #include "sound/msm5205.h" #include "sound/ymopm.h" + #include "speaker.h" -#include "audio/decobsmt.h" -#include "machine/decopincpu.h" -#include "machine/genpin.h" -#include "video/decodmd1.h" -#include "video/decodmd2.h" -#include "video/decodmd3.h" namespace { diff --git a/src/mame/pinball/flicker.cpp b/src/mame/pinball/flicker.cpp index a39af343933..9659c406267 100644 --- a/src/mame/pinball/flicker.cpp +++ b/src/mame/pinball/flicker.cpp @@ -40,7 +40,7 @@ The programming seems to be incomplete with some bugs and omissions. *************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/mcs40/mcs40.h" #include "flicker.lh" diff --git a/src/mame/pinball/g627.cpp b/src/mame/pinball/g627.cpp index 04e667c8db6..4c6736d42a4 100644 --- a/src/mame/pinball/g627.cpp +++ b/src/mame/pinball/g627.cpp @@ -41,7 +41,7 @@ ToDo: #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/genpin.h" +#include "genpin.h" #include "machine/i8155.h" #include "sound/astrocde.h" #include "screen.h" diff --git a/src/mame/pinball/gp_1.cpp b/src/mame/pinball/gp_1.cpp index eeba20b39db..289d5a26436 100644 --- a/src/mame/pinball/gp_1.cpp +++ b/src/mame/pinball/gp_1.cpp @@ -22,7 +22,7 @@ ToDo: ********************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/z80/z80.h" #include "machine/z80daisy.h" #include "machine/i8255.h" diff --git a/src/mame/pinball/gp_2.cpp b/src/mame/pinball/gp_2.cpp index d1aa422fe6d..e505906f721 100644 --- a/src/mame/pinball/gp_2.cpp +++ b/src/mame/pinball/gp_2.cpp @@ -40,7 +40,7 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/z80/z80.h" #include "machine/z80daisy.h" #include "machine/i8255.h" diff --git a/src/mame/pinball/gts1.cpp b/src/mame/pinball/gts1.cpp index 5f324a0bd5f..a5834c86dbe 100644 --- a/src/mame/pinball/gts1.cpp +++ b/src/mame/pinball/gts1.cpp @@ -84,14 +84,18 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" + +#include "gottlieb_a.h" + #include "machine/ra17xx.h" #include "machine/r10696.h" #include "machine/r10788.h" #include "cpu/pps4/pps4.h" -#include "audio/gottlieb.h" #include "sound/beep.h" + #include "speaker.h" + #include "gts1.lh" #define VERBOSE 1 diff --git a/src/mame/pinball/gts3.cpp b/src/mame/pinball/gts3.cpp index 55256952689..e37fdcc61e2 100644 --- a/src/mame/pinball/gts3.cpp +++ b/src/mame/pinball/gts3.cpp @@ -60,8 +60,10 @@ ToDo: *****************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" -#include "audio/gottlieb.h" +#include "genpin.h" + +#include "gottlieb_a.h" + #include "cpu/m6502/m65c02.h" #include "machine/6522via.h" #include "machine/input_merger.h" diff --git a/src/mame/pinball/gts3a.cpp b/src/mame/pinball/gts3a.cpp index b3284ae2739..224bec81a13 100644 --- a/src/mame/pinball/gts3a.cpp +++ b/src/mame/pinball/gts3a.cpp @@ -46,17 +46,20 @@ ToDo: *****************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" + +#include "gottlieb_a.h" #include "cpu/m6502/m65c02.h" -#include "audio/gottlieb.h" #include "machine/6522via.h" #include "machine/input_merger.h" #include "video/mc6845.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" + namespace { class gts3a_state : public genpin_class diff --git a/src/mame/pinball/gts80.cpp b/src/mame/pinball/gts80.cpp index 4c7af005b31..4beb35466df 100644 --- a/src/mame/pinball/gts80.cpp +++ b/src/mame/pinball/gts80.cpp @@ -47,10 +47,13 @@ ToDO: #include "emu.h" +#include "genpin.h" + +#include "gottlieb_a.h" + #include "machine/input_merger.h" -#include "machine/genpin.h" -#include "audio/gottlieb.h" #include "speaker.h" + #include "gts80.lh" namespace { diff --git a/src/mame/pinball/gts80a.cpp b/src/mame/pinball/gts80a.cpp index 49d174884bf..c0e8ce0ee16 100644 --- a/src/mame/pinball/gts80a.cpp +++ b/src/mame/pinball/gts80a.cpp @@ -54,10 +54,13 @@ ToDo: *****************************************************************************************************************/ #include "emu.h" -#include "machine/input_merger.h" -#include "machine/genpin.h" -#include "audio/gottlieb.h" +#include "genpin.h" + +#include "gottlieb_a.h" + #include "cpu/i86/i86.h" +#include "machine/input_merger.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/pinball/gts80b.cpp b/src/mame/pinball/gts80b.cpp index 852d36d5224..f8e11ea5230 100644 --- a/src/mame/pinball/gts80b.cpp +++ b/src/mame/pinball/gts80b.cpp @@ -63,9 +63,12 @@ ToDo: *****************************************************************************************************************/ #include "emu.h" +#include "genpin.h" + +#include "gottlieb_a.h" + #include "machine/input_merger.h" -#include "machine/genpin.h" -#include "audio/gottlieb.h" + #include "speaker.h" #include "gts80b.lh" diff --git a/src/mame/pinball/hankin.cpp b/src/mame/pinball/hankin.cpp index 7ffbe2d3b60..dcb68d89718 100644 --- a/src/mame/pinball/hankin.cpp +++ b/src/mame/pinball/hankin.cpp @@ -18,7 +18,7 @@ ToDo: ***********************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" diff --git a/src/mame/pinball/idsa.cpp b/src/mame/pinball/idsa.cpp index bb3d4e74868..675a23c30db 100644 --- a/src/mame/pinball/idsa.cpp +++ b/src/mame/pinball/idsa.cpp @@ -34,7 +34,7 @@ ToDO: **********************************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/pinball/inder.cpp b/src/mame/pinball/inder.cpp index 648f293cad1..d812b190222 100644 --- a/src/mame/pinball/inder.cpp +++ b/src/mame/pinball/inder.cpp @@ -35,7 +35,7 @@ ToDo: ********************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/z80/z80.h" #include "machine/74157.h" diff --git a/src/mame/pinball/inderp.cpp b/src/mame/pinball/inderp.cpp index fd78ba52f68..cb2238360d1 100644 --- a/src/mame/pinball/inderp.cpp +++ b/src/mame/pinball/inderp.cpp @@ -32,7 +32,7 @@ ToDo: ************************************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6502/m6504.h" #include "machine/clock.h" #include "inderp.lh" diff --git a/src/mame/pinball/jeutel.cpp b/src/mame/pinball/jeutel.cpp index 3c715a72239..de7894fdfc8 100644 --- a/src/mame/pinball/jeutel.cpp +++ b/src/mame/pinball/jeutel.cpp @@ -26,7 +26,7 @@ ToDo: ********************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/z80/z80.h" #include "machine/clock.h" diff --git a/src/mame/pinball/jp.cpp b/src/mame/pinball/jp.cpp index 8589b9ca562..75ba745abe8 100644 --- a/src/mame/pinball/jp.cpp +++ b/src/mame/pinball/jp.cpp @@ -42,7 +42,7 @@ stage. *******************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/z80/z80.h" #include "machine/74157.h" diff --git a/src/mame/pinball/jvh.cpp b/src/mame/pinball/jvh.cpp index efd4dd8f442..5b0e3f31a89 100644 --- a/src/mame/pinball/jvh.cpp +++ b/src/mame/pinball/jvh.cpp @@ -20,7 +20,7 @@ ToDo: ********************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/tms9900/tms9980a.h" #include "cpu/tms9900/tms9995.h" #include "cpu/m6800/m6800.h" diff --git a/src/mame/pinball/lancelot.cpp b/src/mame/pinball/lancelot.cpp index 2b1c4e93e65..64a5239497c 100644 --- a/src/mame/pinball/lancelot.cpp +++ b/src/mame/pinball/lancelot.cpp @@ -26,7 +26,7 @@ ToDo: ***************************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/tlcs90/tlcs90.h" #include "cpu/z80/z80.h" #include "speaker.h" diff --git a/src/mame/pinball/lckydraw.cpp b/src/mame/pinball/lckydraw.cpp index 30b5d841de0..2b7de735c3f 100644 --- a/src/mame/pinball/lckydraw.cpp +++ b/src/mame/pinball/lckydraw.cpp @@ -26,7 +26,7 @@ ToDo: ***************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/mcs48/mcs48.h" #include "lckydraw.lh" diff --git a/src/mame/pinball/ltd.cpp b/src/mame/pinball/ltd.cpp index e6bcd229b92..8c96347dc2f 100644 --- a/src/mame/pinball/ltd.cpp +++ b/src/mame/pinball/ltd.cpp @@ -46,7 +46,7 @@ ToDo: ********************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6800/m6801.h" #include "machine/74123.h" diff --git a/src/mame/pinball/macp.cpp b/src/mame/pinball/macp.cpp index 8944512be3a..696aea46ed6 100644 --- a/src/mame/pinball/macp.cpp +++ b/src/mame/pinball/macp.cpp @@ -27,7 +27,7 @@ ToDo ***************************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/z80/z80.h" #include "machine/clock.h" #include "machine/i8279.h" diff --git a/src/mame/pinball/mephistp.cpp b/src/mame/pinball/mephistp.cpp index 4c7e4133cfa..68041ae03d4 100644 --- a/src/mame/pinball/mephistp.cpp +++ b/src/mame/pinball/mephistp.cpp @@ -24,7 +24,7 @@ ToDo: ******************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/i86/i86.h" #include "cpu/mcs51/mcs51.h" #include "machine/i8155.h" diff --git a/src/mame/pinball/micropin.cpp b/src/mame/pinball/micropin.cpp index c9c2365ac66..a14b38208b8 100644 --- a/src/mame/pinball/micropin.cpp +++ b/src/mame/pinball/micropin.cpp @@ -31,7 +31,7 @@ ToDo: **************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/i8085/i8085.h" #include "cpu/m6800/m6800.h" diff --git a/src/mame/pinball/mrgame.cpp b/src/mame/pinball/mrgame.cpp index a3e534b6bc5..7dd4db6dd1c 100644 --- a/src/mame/pinball/mrgame.cpp +++ b/src/mame/pinball/mrgame.cpp @@ -52,7 +52,7 @@ ToDo: *****************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/pinball/nsm.cpp b/src/mame/pinball/nsm.cpp index 8c30e736d1f..dff985c9655 100644 --- a/src/mame/pinball/nsm.cpp +++ b/src/mame/pinball/nsm.cpp @@ -36,7 +36,7 @@ ToDo: *********************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/tms9900/tms9995.h" #include "sound/ay8910.h" diff --git a/src/mame/pinball/peyper.cpp b/src/mame/pinball/peyper.cpp index ee78448172d..3d58c686f61 100644 --- a/src/mame/pinball/peyper.cpp +++ b/src/mame/pinball/peyper.cpp @@ -38,7 +38,7 @@ ToDo: *********************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/z80/z80.h" #include "machine/i8279.h" diff --git a/src/mame/pinball/play_1.cpp b/src/mame/pinball/play_1.cpp index 291252fb53c..542a0754c48 100644 --- a/src/mame/pinball/play_1.cpp +++ b/src/mame/pinball/play_1.cpp @@ -22,7 +22,7 @@ Todo: **********************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/cosmac/cosmac.h" #include "machine/clock.h" diff --git a/src/mame/pinball/play_2.cpp b/src/mame/pinball/play_2.cpp index 9d1ddd49279..9fd443f25ed 100644 --- a/src/mame/pinball/play_2.cpp +++ b/src/mame/pinball/play_2.cpp @@ -42,7 +42,7 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/cop400/cop400.h" #include "cpu/cosmac/cosmac.h" diff --git a/src/mame/pinball/play_3.cpp b/src/mame/pinball/play_3.cpp index 394f426ccf3..e2f3537fad9 100644 --- a/src/mame/pinball/play_3.cpp +++ b/src/mame/pinball/play_3.cpp @@ -60,8 +60,9 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" -#include "audio/efo_zsu.h" +#include "genpin.h" + +#include "efo_zsu.h" #include "cpu/cosmac/cosmac.h" #include "machine/clock.h" diff --git a/src/mame/pinball/recel.cpp b/src/mame/pinball/recel.cpp index 637a4a1427d..c1b91370055 100644 --- a/src/mame/pinball/recel.cpp +++ b/src/mame/pinball/recel.cpp @@ -40,7 +40,7 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "machine/ra17xx.h" #include "machine/r10696.h" #include "machine/r10788.h" diff --git a/src/mame/pinball/rowamet.cpp b/src/mame/pinball/rowamet.cpp index ed4c37303e2..0865c22331b 100644 --- a/src/mame/pinball/rowamet.cpp +++ b/src/mame/pinball/rowamet.cpp @@ -25,7 +25,7 @@ ToDO: *************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/z80/z80.h" #include "sound/dac.h" diff --git a/src/mame/pinball/s11.cpp b/src/mame/pinball/s11.cpp index a81ad390295..8cb18decb89 100644 --- a/src/mame/pinball/s11.cpp +++ b/src/mame/pinball/s11.cpp @@ -38,7 +38,7 @@ ToDo: *****************************************************************************************/ #include "emu.h" -#include "includes/s11.h" +#include "s11.h" #include "cpu/m6809/m6809.h" #include "speaker.h" diff --git a/src/mame/pinball/s11.h b/src/mame/pinball/s11.h index f83372a7738..0b187d57507 100644 --- a/src/mame/pinball/s11.h +++ b/src/mame/pinball/s11.h @@ -10,10 +10,10 @@ #define MAME_INCLUDES_S11_H #include "cpu/m6800/m6800.h" -#include "audio/pinsnd88.h" -#include "audio/s11c_bg.h" +#include "pinsnd88.h" +#include "s11c_bg.h" #include "machine/6821pia.h" -#include "machine/genpin.h" +#include "genpin.h" #include "machine/input_merger.h" #include "machine/rescap.h" #include "sound/dac.h" diff --git a/src/mame/pinball/s11a.cpp b/src/mame/pinball/s11a.cpp index e03a883feb4..38035941444 100644 --- a/src/mame/pinball/s11a.cpp +++ b/src/mame/pinball/s11a.cpp @@ -33,7 +33,7 @@ ToDo: *****************************************************************************************/ #include "emu.h" -#include "includes/s11.h" +#include "s11.h" #include "cpu/m6809/m6809.h" #include "speaker.h" diff --git a/src/mame/pinball/s11b.cpp b/src/mame/pinball/s11b.cpp index b0eeeeacdd8..28bbd42f35b 100644 --- a/src/mame/pinball/s11b.cpp +++ b/src/mame/pinball/s11b.cpp @@ -55,7 +55,7 @@ Known issues: ***************************************************************************************************************/ #include "emu.h" -#include "includes/s11.h" +#include "s11.h" #include "cpu/m6809/m6809.h" #include "speaker.h" diff --git a/src/mame/pinball/s11c.cpp b/src/mame/pinball/s11c.cpp index d935b721d4d..1b14c92c6f5 100644 --- a/src/mame/pinball/s11c.cpp +++ b/src/mame/pinball/s11c.cpp @@ -39,7 +39,7 @@ ToDo: *******************************************************************************************************************/ #include "emu.h" -#include "includes/s11.h" +#include "s11.h" #include "cpu/m6809/m6809.h" #include "speaker.h" diff --git a/src/mame/pinball/s3.cpp b/src/mame/pinball/s3.cpp index a0a7742bd90..d6f766f704f 100644 --- a/src/mame/pinball/s3.cpp +++ b/src/mame/pinball/s3.cpp @@ -43,13 +43,15 @@ ToDo: ************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" + +#include "williamssound.h" #include "cpu/m6800/m6800.h" -#include "audio/williams.h" #include "machine/6821pia.h" #include "machine/input_merger.h" #include "machine/timer.h" + #include "speaker.h" #include "s3.lh" diff --git a/src/mame/pinball/s4.cpp b/src/mame/pinball/s4.cpp index 52bdadc5e31..1c94132ae43 100644 --- a/src/mame/pinball/s4.cpp +++ b/src/mame/pinball/s4.cpp @@ -33,10 +33,11 @@ ToDo: ************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" + +#include "williamssound.h" #include "cpu/m6800/m6800.h" -#include "audio/williams.h" #include "machine/6821pia.h" #include "machine/clock.h" #include "machine/input_merger.h" diff --git a/src/mame/pinball/s6.cpp b/src/mame/pinball/s6.cpp index f325a78248e..441e3c31972 100644 --- a/src/mame/pinball/s6.cpp +++ b/src/mame/pinball/s6.cpp @@ -56,10 +56,11 @@ ToDo: ************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" + +#include "williamssound.h" #include "cpu/m6800/m6800.h" -#include "audio/williams.h" #include "machine/6821pia.h" #include "machine/input_merger.h" #include "speaker.h" diff --git a/src/mame/pinball/s7.cpp b/src/mame/pinball/s7.cpp index 34c667092f3..7e8148f3e07 100644 --- a/src/mame/pinball/s7.cpp +++ b/src/mame/pinball/s7.cpp @@ -76,10 +76,11 @@ ToDo: *****************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" + +#include "williamssound.h" #include "cpu/m6800/m6800.h" -#include "audio/williams.h" #include "machine/6821pia.h" #include "speaker.h" diff --git a/src/mame/pinball/s8.cpp b/src/mame/pinball/s8.cpp index 891c30b868e..bade50e2bf8 100644 --- a/src/mame/pinball/s8.cpp +++ b/src/mame/pinball/s8.cpp @@ -110,10 +110,11 @@ ToDo: ************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" + +#include "williamssound.h" #include "cpu/m6800/m6800.h" -#include "audio/williams.h" #include "machine/6821pia.h" #include "sound/dac.h" #include "speaker.h" diff --git a/src/mame/pinball/s9.cpp b/src/mame/pinball/s9.cpp index fede832b032..0da72ce3c1f 100644 --- a/src/mame/pinball/s9.cpp +++ b/src/mame/pinball/s9.cpp @@ -36,10 +36,12 @@ ToDo: *****************************************************************************************/ #include "emu.h" +#include "genpin.h" + +#include "williamssound.h" + #include "cpu/m6800/m6800.h" -#include "audio/williams.h" #include "machine/6821pia.h" -#include "machine/genpin.h" #include "speaker.h" #include "s9.lh" diff --git a/src/mame/pinball/sleic.cpp b/src/mame/pinball/sleic.cpp index a5c80d64102..14238137c78 100644 --- a/src/mame/pinball/sleic.cpp +++ b/src/mame/pinball/sleic.cpp @@ -45,7 +45,7 @@ ToDo: ****************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/i86/i186.h" #include "cpu/mcs48/mcs48.h" #include "cpu/z80/z80.h" diff --git a/src/mame/pinball/spectra.cpp b/src/mame/pinball/spectra.cpp index a52db1161cd..4a59bae36ba 100644 --- a/src/mame/pinball/spectra.cpp +++ b/src/mame/pinball/spectra.cpp @@ -39,7 +39,7 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6502/m6502.h" #include "machine/6532riot.h" diff --git a/src/mame/pinball/spinb.cpp b/src/mame/pinball/spinb.cpp index 02b2e1fc815..ed7df7e4eb3 100644 --- a/src/mame/pinball/spinb.cpp +++ b/src/mame/pinball/spinb.cpp @@ -57,7 +57,7 @@ ToDo: ****************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/mcs51/mcs51.h" #include "cpu/z80/z80.h" diff --git a/src/mame/pinball/spirit76.cpp b/src/mame/pinball/spirit76.cpp index b1fa310a8e7..0c52f5a19be 100644 --- a/src/mame/pinball/spirit76.cpp +++ b/src/mame/pinball/spirit76.cpp @@ -37,7 +37,7 @@ TODO: *********************************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" #include "machine/timer.h" diff --git a/src/mame/pinball/st_mp100.cpp b/src/mame/pinball/st_mp100.cpp index 7ac98b27582..203f5fb1a74 100644 --- a/src/mame/pinball/st_mp100.cpp +++ b/src/mame/pinball/st_mp100.cpp @@ -19,7 +19,7 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" #include "machine/clock.h" diff --git a/src/mame/pinball/st_mp200.cpp b/src/mame/pinball/st_mp200.cpp index 35570a79b6e..822e3f75320 100644 --- a/src/mame/pinball/st_mp200.cpp +++ b/src/mame/pinball/st_mp200.cpp @@ -52,7 +52,7 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" diff --git a/src/mame/pinball/stargame.cpp b/src/mame/pinball/stargame.cpp index 0e2d2760cb9..51d964e65bc 100644 --- a/src/mame/pinball/stargame.cpp +++ b/src/mame/pinball/stargame.cpp @@ -20,7 +20,7 @@ Todo: *****************************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/z80/z80.h" #include "machine/7474.h" #include "machine/74259.h" diff --git a/src/mame/pinball/taito.cpp b/src/mame/pinball/taito.cpp index ef39fcb91a2..1229ac570df 100644 --- a/src/mame/pinball/taito.cpp +++ b/src/mame/pinball/taito.cpp @@ -42,7 +42,7 @@ ToDO: *****************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/i8085/i8085.h" #include "cpu/m6800/m6800.h" diff --git a/src/mame/pinball/techno.cpp b/src/mame/pinball/techno.cpp index 0fb0442a97f..9c05f686f9b 100644 --- a/src/mame/pinball/techno.cpp +++ b/src/mame/pinball/techno.cpp @@ -29,7 +29,7 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m68000/m68000.h" #include "cpu/tms7000/tms7000.h" #include "sound/dac.h" diff --git a/src/mame/pinball/vd.cpp b/src/mame/pinball/vd.cpp index 3683a918d2a..e82fdfae845 100644 --- a/src/mame/pinball/vd.cpp +++ b/src/mame/pinball/vd.cpp @@ -24,7 +24,7 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "machine/timer.h" #include "cpu/z80/z80.h" diff --git a/src/mame/pinball/whitestar.cpp b/src/mame/pinball/whitestar.cpp index ea959b259f7..bc444d84dd3 100644 --- a/src/mame/pinball/whitestar.cpp +++ b/src/mame/pinball/whitestar.cpp @@ -70,10 +70,13 @@ ToDo: *********************************************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" + +#include "decodmd2.h" + +#include "decobsmt.h" + //#include "video/mc6845.h" -#include "audio/decobsmt.h" -#include "video/decodmd2.h" namespace { diff --git a/src/mame/pinball/wico.cpp b/src/mame/pinball/wico.cpp index e1aaf95e11e..7cf37cafa7d 100644 --- a/src/mame/pinball/wico.cpp +++ b/src/mame/pinball/wico.cpp @@ -34,7 +34,7 @@ Status: ***************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/m6809/m6809.h" #include "machine/timer.h" diff --git a/src/mame/pinball/wms_shuffle.cpp b/src/mame/pinball/wms_shuffle.cpp index 29a9348ee21..0f34c2ec4f5 100644 --- a/src/mame/pinball/wms_shuffle.cpp +++ b/src/mame/pinball/wms_shuffle.cpp @@ -42,13 +42,16 @@ ToDo: ************************************************************************************/ #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" + +#include "williamssound.h" + #include "cpu/m6800/m6800.h" -#include "audio/williams.h" #include "machine/6821pia.h" #include "machine/clock.h" #include "machine/input_merger.h" #include "machine/ripple_counter.h" + #include "speaker.h" #include "shuffle4.lh" diff --git a/src/mame/pinball/wpc_95.cpp b/src/mame/pinball/wpc_95.cpp index 01070c0a421..b6c5598821a 100644 --- a/src/mame/pinball/wpc_95.cpp +++ b/src/mame/pinball/wpc_95.cpp @@ -36,15 +36,18 @@ ToDo: *********************************************************************************************/ #include "emu.h" + +#include "wpc_dmd.h" +#include "wpc_lamp.h" +#include "wpc_out.h" +#include "wpc_pic.h" +#include "wpc_shift.h" + +#include "dcs.h" + #include "cpu/m6809/m6809.h" -#include "audio/dcs.h" #include "machine/nvram.h" #include "machine/timer.h" -#include "video/wpc_dmd.h" -#include "machine/wpc_pic.h" -#include "machine/wpc_shift.h" -#include "machine/wpc_lamp.h" -#include "machine/wpc_out.h" namespace { diff --git a/src/mame/pinball/wpc_an.cpp b/src/mame/pinball/wpc_an.cpp index ec33b35076b..7dfb7aeabe2 100644 --- a/src/mame/pinball/wpc_an.cpp +++ b/src/mame/pinball/wpc_an.cpp @@ -87,11 +87,11 @@ TODO: (wpc in general) #include "emu.h" -#include "audio/s11c_bg.h" -#include "audio/wpcsnd.h" +#include "s11c_bg.h" +#include "wpcsnd.h" #include "cpu/m6809/m6809.h" -#include "machine/wpc.h" +#include "wpc.h" #include "speaker.h" #include "wpc_an.lh" diff --git a/src/mame/pinball/wpc_dcs.cpp b/src/mame/pinball/wpc_dcs.cpp index 50d938eb2ba..cf2a326ac55 100644 --- a/src/mame/pinball/wpc_dcs.cpp +++ b/src/mame/pinball/wpc_dcs.cpp @@ -27,13 +27,15 @@ ToDo: *********************************************************************************************/ #include "emu.h" +#include "wpc_dmd.h" +#include "wpc_shift.h" +#include "wpc_lamp.h" +#include "wpc_out.h" + +#include "dcs.h" + #include "cpu/m6809/m6809.h" -#include "audio/dcs.h" #include "machine/nvram.h" -#include "video/wpc_dmd.h" -#include "machine/wpc_shift.h" -#include "machine/wpc_lamp.h" -#include "machine/wpc_out.h" namespace { diff --git a/src/mame/pinball/wpc_dot.cpp b/src/mame/pinball/wpc_dot.cpp index c327fe1c2c2..35747e3284d 100644 --- a/src/mame/pinball/wpc_dot.cpp +++ b/src/mame/pinball/wpc_dot.cpp @@ -31,7 +31,7 @@ ToDo: *********************************************************************************************/ #include "emu.h" -#include "includes/wpc_dot.h" +#include "wpc_dot.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/pinball/wpc_dot.h b/src/mame/pinball/wpc_dot.h index e59249a45f2..91b832d7a5e 100644 --- a/src/mame/pinball/wpc_dot.h +++ b/src/mame/pinball/wpc_dot.h @@ -7,15 +7,16 @@ * Author: bsr */ -#ifndef MAME_INCLUDES_WPC_DOT_H -#define MAME_INCLUDES_WPC_DOT_H +#ifndef MAME_PINBALL_WPC_DOT_H +#define MAME_PINBALL_WPC_DOT_H #pragma once +#include "dcs.h" + #include "cpu/m6809/m6809.h" -#include "audio/wpcsnd.h" -#include "audio/dcs.h" -#include "machine/wpc.h" +#include "wpcsnd.h" +#include "wpc.h" class wpc_dot_state : public driver_device { @@ -99,4 +100,4 @@ protected: void wpc_flip2_map(address_map &map); }; -#endif // MAME_INCLUDES_WPC_DOT_H +#endif // MAME_PINBALL_WPC_DOT_H diff --git a/src/mame/pinball/wpc_flip1.cpp b/src/mame/pinball/wpc_flip1.cpp index 13eb2e70a8f..2e00aa8baf6 100644 --- a/src/mame/pinball/wpc_flip1.cpp +++ b/src/mame/pinball/wpc_flip1.cpp @@ -19,7 +19,7 @@ ToDo: *********************************************************************************************/ #include "emu.h" -#include "includes/wpc_dot.h" +#include "wpc_dot.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/pinball/wpc_flip2.cpp b/src/mame/pinball/wpc_flip2.cpp index 57d11e7e152..35d7f271053 100644 --- a/src/mame/pinball/wpc_flip2.cpp +++ b/src/mame/pinball/wpc_flip2.cpp @@ -36,7 +36,7 @@ ToDo: *********************************************************************************************/ #include "emu.h" -#include "includes/wpc_dot.h" +#include "wpc_dot.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/pinball/wpc_s.cpp b/src/mame/pinball/wpc_s.cpp index 390e524d62f..c2c2d49a4d3 100644 --- a/src/mame/pinball/wpc_s.cpp +++ b/src/mame/pinball/wpc_s.cpp @@ -37,14 +37,17 @@ ToDo: *********************************************************************************************/ #include "emu.h" + +#include "wpc_dmd.h" +#include "wpc_lamp.h" +#include "wpc_out.h" +#include "wpc_pic.h" +#include "wpc_shift.h" + +#include "dcs.h" + #include "cpu/m6809/m6809.h" -#include "audio/dcs.h" #include "machine/nvram.h" -#include "video/wpc_dmd.h" -#include "machine/wpc_pic.h" -#include "machine/wpc_shift.h" -#include "machine/wpc_lamp.h" -#include "machine/wpc_out.h" namespace { diff --git a/src/mame/pinball/zac_1.cpp b/src/mame/pinball/zac_1.cpp index 9761b2bad6a..a85457e2c79 100644 --- a/src/mame/pinball/zac_1.cpp +++ b/src/mame/pinball/zac_1.cpp @@ -76,7 +76,7 @@ ToDo: #include "cpu/mcs48/mcs48.h" #include "machine/clock.h" #include "machine/gen_latch.h" -#include "machine/genpin.h" +#include "genpin.h" #include "machine/timer.h" #include "sound/dac.h" #include "sound/mm5837.h" diff --git a/src/mame/pinball/zac_2.cpp b/src/mame/pinball/zac_2.cpp index fe1600c4f09..1044e99580b 100644 --- a/src/mame/pinball/zac_2.cpp +++ b/src/mame/pinball/zac_2.cpp @@ -48,7 +48,7 @@ ToDo: #include "emu.h" -#include "machine/genpin.h" +#include "genpin.h" #include "cpu/s2650/s2650.h" #include "machine/timer.h" #include "speaker.h" diff --git a/src/mame/pinball/zac_proto.cpp b/src/mame/pinball/zac_proto.cpp index 13d206ac4dd..173fbe62ea2 100644 --- a/src/mame/pinball/zac_proto.cpp +++ b/src/mame/pinball/zac_proto.cpp @@ -30,7 +30,7 @@ ToDo: #include "emu.h" #include "machine/clock.h" -#include "machine/genpin.h" +#include "genpin.h" #include "sound/spkrdev.h" #include "cpu/scmp/scmp.h" #include "speaker.h" diff --git a/src/mame/pinball/zpinball.cpp b/src/mame/pinball/zpinball.cpp index 77fd1fcd0bc..fc2e6c3104a 100644 --- a/src/mame/pinball/zpinball.cpp +++ b/src/mame/pinball/zpinball.cpp @@ -14,11 +14,14 @@ ToDo: ****************************************************************************/ #include "emu.h" -#include "audio/efo_zsu.h" + +#include "efo_zsu.h" + #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "machine/z80ctc.h" #include "sound/saa1099.h" + #include "speaker.h" diff --git a/src/mame/playmark/playmark.cpp b/src/mame/playmark/playmark.cpp index d39c19e7ce3..9d92b2d05f0 100644 --- a/src/mame/playmark/playmark.cpp +++ b/src/mame/playmark/playmark.cpp @@ -91,7 +91,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/playmark.h" +#include "playmark.h" #include "cpu/m68000/m68000.h" #include "cpu/pic16c5x/pic16c5x.h" diff --git a/src/mame/playmark/playmark_v.cpp b/src/mame/playmark/playmark_v.cpp index c17f562abdc..ea3d651406c 100644 --- a/src/mame/playmark/playmark_v.cpp +++ b/src/mame/playmark/playmark_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria, Pierpaolo Prazzoli, Quench #include "emu.h" -#include "includes/playmark.h" +#include "playmark.h" #include "screen.h" diff --git a/src/mame/playmark/powerbal.cpp b/src/mame/playmark/powerbal.cpp index 099f5e83241..490a4511dd4 100644 --- a/src/mame/playmark/powerbal.cpp +++ b/src/mame/playmark/powerbal.cpp @@ -16,7 +16,7 @@ Magic Sticks: */ #include "emu.h" -#include "includes/playmark.h" +#include "playmark.h" #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" diff --git a/src/mame/playmark/sslam.cpp b/src/mame/playmark/sslam.cpp index ebc445e5fe0..0e9f57ffcee 100644 --- a/src/mame/playmark/sslam.cpp +++ b/src/mame/playmark/sslam.cpp @@ -83,7 +83,7 @@ Notes: #include "emu.h" -#include "includes/sslam.h" +#include "sslam.h" #include "cpu/m68000/m68000.h" #include "screen.h" diff --git a/src/mame/playmark/sslam_v.cpp b/src/mame/playmark/sslam_v.cpp index e2def7b5bf1..87810a4efad 100644 --- a/src/mame/playmark/sslam_v.cpp +++ b/src/mame/playmark/sslam_v.cpp @@ -3,7 +3,7 @@ /* Super Slam - Video Hardware */ #include "emu.h" -#include "includes/sslam.h" +#include "sslam.h" void sslam_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/poly/poly.cpp b/src/mame/poly/poly.cpp index 4f6265ec99c..e91b9869d1a 100644 --- a/src/mame/poly/poly.cpp +++ b/src/mame/poly/poly.cpp @@ -31,7 +31,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/poly.h" +#include "poly.h" #include "formats/flex_dsk.h" #include "softlist_dev.h" diff --git a/src/mame/poly/poly_m.cpp b/src/mame/poly/poly_m.cpp index babd159b9ec..815b6b758b5 100644 --- a/src/mame/poly/poly_m.cpp +++ b/src/mame/poly/poly_m.cpp @@ -8,7 +8,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/poly.h" +#include "poly.h" inline offs_t poly_state::physical(offs_t offset) diff --git a/src/mame/poly88/poly88.cpp b/src/mame/poly88/poly88.cpp index 8365ff5aaa9..cd559cfc6b4 100644 --- a/src/mame/poly88/poly88.cpp +++ b/src/mame/poly88/poly88.cpp @@ -46,7 +46,7 @@ at least some models of the Poly-88 are known to have used.) ****************************************************************************/ #include "emu.h" -#include "includes/poly88.h" +#include "poly88.h" #include "bus/s100/ascsasi.h" #include "bus/s100/poly16k.h" diff --git a/src/mame/poly88/poly88_m.cpp b/src/mame/poly88/poly88_m.cpp index 06fba3a2849..37d4eb6a4bc 100644 --- a/src/mame/poly88/poly88_m.cpp +++ b/src/mame/poly88/poly88_m.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "cpu/i8085/i8085.h" -#include "includes/poly88.h" +#include "poly88.h" bool poly88_state::is_onboard(offs_t offset) diff --git a/src/mame/psikyo/psikyo.cpp b/src/mame/psikyo/psikyo.cpp index 31d65d4f018..1959a699053 100644 --- a/src/mame/psikyo/psikyo.cpp +++ b/src/mame/psikyo/psikyo.cpp @@ -78,7 +78,7 @@ This was pointed out by Bart Puype *****/ #include "emu.h" -#include "includes/psikyo.h" +#include "psikyo.h" #include "cpu/z80/z80.h" #include "cpu/z80/lz8420m.h" diff --git a/src/mame/psikyo/psikyo4.cpp b/src/mame/psikyo/psikyo4.cpp index 7a4fa62a5f7..66c417603f2 100644 --- a/src/mame/psikyo/psikyo4.cpp +++ b/src/mame/psikyo/psikyo4.cpp @@ -130,7 +130,7 @@ ROMs - ----------------------------------------------------------------*/ #include "emu.h" -#include "includes/psikyo4.h" +#include "psikyo4.h" #include "speaker.h" diff --git a/src/mame/psikyo/psikyo4_v.cpp b/src/mame/psikyo/psikyo4_v.cpp index 64a31bf7dc4..7bac6444227 100644 --- a/src/mame/psikyo/psikyo4_v.cpp +++ b/src/mame/psikyo/psikyo4_v.cpp @@ -29,7 +29,7 @@ HgKairak: 86010000 1f201918 a0000000 Large Screen */ #include "emu.h" -#include "includes/psikyo4.h" +#include "psikyo4.h" /* --- SPRITES --- */ diff --git a/src/mame/psikyo/psikyo_v.cpp b/src/mame/psikyo/psikyo_v.cpp index b91dcba1a83..5ecdd6ed044 100644 --- a/src/mame/psikyo/psikyo_v.cpp +++ b/src/mame/psikyo/psikyo_v.cpp @@ -57,7 +57,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: **************************************************************************/ #include "emu.h" -#include "includes/psikyo.h" +#include "psikyo.h" /*************************************************************************** diff --git a/src/mame/psikyo/psikyosh.cpp b/src/mame/psikyo/psikyosh.cpp index f6d3284512e..1d3115b28e6 100644 --- a/src/mame/psikyo/psikyosh.cpp +++ b/src/mame/psikyo/psikyosh.cpp @@ -333,7 +333,7 @@ ROM Usage */ #include "emu.h" -#include "includes/psikyosh.h" +#include "psikyosh.h" #include "cpu/sh/sh2.h" #include "machine/eepromser.h" diff --git a/src/mame/psikyo/psikyosh_v.cpp b/src/mame/psikyo/psikyosh_v.cpp index 9bb763311e0..0fdf1e547ee 100644 --- a/src/mame/psikyo/psikyosh_v.cpp +++ b/src/mame/psikyo/psikyosh_v.cpp @@ -66,7 +66,7 @@ The only viable way to do this is to have one tilemap per bank (0x0a-0x20), and #include "emu.h" #include "drawgfxt.ipp" -#include "includes/psikyosh.h" +#include "psikyosh.h" #include diff --git a/src/mame/psion/psion.cpp b/src/mame/psion/psion.cpp index 4caa9c949b0..037d61095f2 100644 --- a/src/mame/psion/psion.cpp +++ b/src/mame/psion/psion.cpp @@ -21,7 +21,7 @@ #include "emu.h" -#include "includes/psion.h" +#include "psion.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/psion/psion.h b/src/mame/psion/psion.h index a20009c6251..2b94420f53c 100644 --- a/src/mame/psion/psion.h +++ b/src/mame/psion/psion.h @@ -12,7 +12,7 @@ #include "cpu/m6800/m6801.h" #include "machine/nvram.h" -#include "machine/psion_pack.h" +#include "psion_pack.h" #include "machine/timer.h" #include "video/hd44780.h" #include "sound/beep.h" diff --git a/src/mame/psion/psion5.cpp b/src/mame/psion/psion5.cpp index bdc2adc84d8..64b58cc3f1c 100644 --- a/src/mame/psion/psion5.cpp +++ b/src/mame/psion/psion5.cpp @@ -16,7 +16,7 @@ ****************************************************************************/ -#include "includes/psion5.h" +#include "psion5.h" #define LOG_UNKNOWNS (1 << 0) #define LOG_IRQ (1 << 1) diff --git a/src/mame/psion/psion5.h b/src/mame/psion/psion5.h index 150a7919f41..39d64a47c3e 100644 --- a/src/mame/psion/psion5.h +++ b/src/mame/psion/psion5.h @@ -16,7 +16,7 @@ #include "emu.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" -#include "machine/etna.h" +#include "etna.h" #include "sound/spkrdev.h" #include "screen.h" diff --git a/src/mame/radio/apogee.cpp b/src/mame/radio/apogee.cpp index 5fb80a2ba65..9bc7021a817 100644 --- a/src/mame/radio/apogee.cpp +++ b/src/mame/radio/apogee.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/radio86.h" +#include "radio86.h" #include "cpu/i8085/i8085.h" #include "machine/pit8253.h" diff --git a/src/mame/radio/mikrosha.cpp b/src/mame/radio/mikrosha.cpp index 79bd6b78f50..45bde38ca55 100644 --- a/src/mame/radio/mikrosha.cpp +++ b/src/mame/radio/mikrosha.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/radio86.h" +#include "radio86.h" #include "cpu/i8085/i8085.h" #include "machine/pit8253.h" diff --git a/src/mame/radio/orion.cpp b/src/mame/radio/orion.cpp index 51fd03a8b48..a54cd7b03ae 100644 --- a/src/mame/radio/orion.cpp +++ b/src/mame/radio/orion.cpp @@ -20,7 +20,7 @@ It's unknown how to create a tape. #include "emu.h" -#include "includes/orion.h" +#include "orion.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/radio/orion.h b/src/mame/radio/orion.h index d3ebbac1a7f..164394fcff5 100644 --- a/src/mame/radio/orion.h +++ b/src/mame/radio/orion.h @@ -6,12 +6,12 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_ORION_H -#define MAME_INCLUDES_ORION_H +#ifndef MAME_RADIO_ORION_H +#define MAME_RADIO_ORION_H #pragma once -#include "includes/radio86.h" +#include "radio86.h" #include "cpu/i8085/i8085.h" #include "cpu/z80/z80.h" @@ -167,4 +167,4 @@ private: void mem_map(address_map &map); }; -#endif // MAME_INCLUDES_ORION_H +#endif // MAME_RADIO_ORION_H diff --git a/src/mame/radio/orion_m.cpp b/src/mame/radio/orion_m.cpp index e1587447609..08026de137d 100644 --- a/src/mame/radio/orion_m.cpp +++ b/src/mame/radio/orion_m.cpp @@ -11,7 +11,7 @@ #include "emu.h" -#include "includes/orion.h" +#include "orion.h" #include "screen.h" diff --git a/src/mame/radio/orion_v.cpp b/src/mame/radio/orion_v.cpp index 44e49a2afd0..9deb50d7ca6 100644 --- a/src/mame/radio/orion_v.cpp +++ b/src/mame/radio/orion_v.cpp @@ -11,7 +11,7 @@ #include "emu.h" -#include "includes/orion.h" +#include "orion.h" uint32_t orion_state::screen_update_orion128(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { diff --git a/src/mame/radio/partner.cpp b/src/mame/radio/partner.cpp index e27605d735d..8aed9e669f5 100644 --- a/src/mame/radio/partner.cpp +++ b/src/mame/radio/partner.cpp @@ -16,7 +16,7 @@ Cursor is one position too far to the right. #include "emu.h" -#include "includes/partner.h" +#include "partner.h" #include "cpu/i8085/i8085.h" #include "screen.h" diff --git a/src/mame/radio/partner.h b/src/mame/radio/partner.h index 6e88b255394..66f0f8bddbb 100644 --- a/src/mame/radio/partner.h +++ b/src/mame/radio/partner.h @@ -11,7 +11,7 @@ #pragma once -#include "includes/radio86.h" +#include "radio86.h" #include "imagedev/floppy.h" #include "machine/i8255.h" diff --git a/src/mame/radio/partner_m.cpp b/src/mame/radio/partner_m.cpp index 8cf6b347979..2d5bb055813 100644 --- a/src/mame/radio/partner_m.cpp +++ b/src/mame/radio/partner_m.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/partner.h" +#include "partner.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/radio/radio86.cpp b/src/mame/radio/radio86.cpp index 917531c6780..a6d31ed5701 100644 --- a/src/mame/radio/radio86.cpp +++ b/src/mame/radio/radio86.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/radio86.h" +#include "radio86.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/radio/radio86_m.cpp b/src/mame/radio/radio86_m.cpp index 7f3e5705c1a..0807ec01a89 100644 --- a/src/mame/radio/radio86_m.cpp +++ b/src/mame/radio/radio86_m.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/radio86.h" +#include "radio86.h" #include "cpu/i8085/i8085.h" diff --git a/src/mame/ramtek/hitme.cpp b/src/mame/ramtek/hitme.cpp index e5a62f0acc3..7baff2cebb8 100644 --- a/src/mame/ramtek/hitme.cpp +++ b/src/mame/ramtek/hitme.cpp @@ -17,7 +17,7 @@ */ #include "emu.h" -#include "includes/hitme.h" +#include "hitme.h" #include "cpu/i8085/i8085.h" #include "sound/discrete.h" diff --git a/src/mame/ramtek/hitme_a.cpp b/src/mame/ramtek/hitme_a.cpp index 10ab8b0c698..566d58180e6 100644 --- a/src/mame/ramtek/hitme_a.cpp +++ b/src/mame/ramtek/hitme_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/hitme.h" +#include "hitme.h" #include "sound/discrete.h" diff --git a/src/mame/ramtek/starcrus.cpp b/src/mame/ramtek/starcrus.cpp index d76011e7c24..f0935f5928d 100644 --- a/src/mame/ramtek/starcrus.cpp +++ b/src/mame/ramtek/starcrus.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/starcrus.h" +#include "starcrus.h" #include "cpu/i8085/i8085.h" #include "screen.h" diff --git a/src/mame/ramtek/starcrus.h b/src/mame/ramtek/starcrus.h index 620ed70ac73..02aff7f3a1f 100644 --- a/src/mame/ramtek/starcrus.h +++ b/src/mame/ramtek/starcrus.h @@ -8,7 +8,7 @@ #include "emupal.h" #include "machine/netlist.h" #include "netlist/nl_setup.h" -#include "audio/nl_starcrus.h" +#include "nl_starcrus.h" class starcrus_state : public driver_device { diff --git a/src/mame/ramtek/starcrus_v.cpp b/src/mame/ramtek/starcrus_v.cpp index ca7122e3068..698264db98b 100644 --- a/src/mame/ramtek/starcrus_v.cpp +++ b/src/mame/ramtek/starcrus_v.cpp @@ -4,7 +4,7 @@ /* Ramtek - Star Cruiser */ #include "emu.h" -#include "includes/starcrus.h" +#include "starcrus.h" #include "sound/samples.h" #include "screen.h" diff --git a/src/mame/rare/btoads.cpp b/src/mame/rare/btoads.cpp index cfc28a0b29c..3d0cc667ecc 100644 --- a/src/mame/rare/btoads.cpp +++ b/src/mame/rare/btoads.cpp @@ -9,7 +9,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/btoads.h" +#include "btoads.h" #include "speaker.h" diff --git a/src/mame/rare/btoads_v.cpp b/src/mame/rare/btoads_v.cpp index fccf3194d8f..ecc75cbbe97 100644 --- a/src/mame/rare/btoads_v.cpp +++ b/src/mame/rare/btoads_v.cpp @@ -9,7 +9,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/btoads.h" +#include "btoads.h" #define BT_DEBUG 0 diff --git a/src/mame/rare/kinst.cpp b/src/mame/rare/kinst.cpp index 2a58e21c603..fd77e00a27f 100644 --- a/src/mame/rare/kinst.cpp +++ b/src/mame/rare/kinst.cpp @@ -190,7 +190,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "audio/dcs.h" +#include "dcs.h" #include "bus/ata/ataintf.h" #include "bus/ata/idehd.h" diff --git a/src/mame/rca/vip.cpp b/src/mame/rca/vip.cpp index 156d1172a67..30a32c79ce7 100644 --- a/src/mame/rca/vip.cpp +++ b/src/mame/rca/vip.cpp @@ -235,7 +235,7 @@ Usage: */ #include "emu.h" -#include "includes/vip.h" +#include "vip.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/regnecentralen/rc759.cpp b/src/mame/regnecentralen/rc759.cpp index 5de6473dedb..44de63834be 100644 --- a/src/mame/regnecentralen/rc759.cpp +++ b/src/mame/regnecentralen/rc759.cpp @@ -22,7 +22,7 @@ #include "machine/pic8259.h" #include "machine/ram.h" #include "machine/wd_fdc.h" -#include "machine/rc759_kbd.h" +#include "rc759_kbd.h" #include "sound/sn76496.h" #include "sound/spkrdev.h" #include "video/i82730.h" diff --git a/src/mame/rm/rm380z.cpp b/src/mame/rm/rm380z.cpp index 2da7f2b946a..e7a8dcf8e8e 100644 --- a/src/mame/rm/rm380z.cpp +++ b/src/mame/rm/rm380z.cpp @@ -166,7 +166,7 @@ Module timer tag static_vblank_timer name m_expire.seconds #include "emu.h" -#include "includes/rm380z.h" +#include "rm380z.h" #include "speaker.h" #include "emupal.h" diff --git a/src/mame/rm/rm380z_m.cpp b/src/mame/rm/rm380z_m.cpp index 76651b1547d..6bf6ce535b9 100644 --- a/src/mame/rm/rm380z_m.cpp +++ b/src/mame/rm/rm380z_m.cpp @@ -9,7 +9,7 @@ RM 380Z machine #include "emu.h" -#include "includes/rm380z.h" +#include "rm380z.h" /* diff --git a/src/mame/rm/rm380z_v.cpp b/src/mame/rm/rm380z_v.cpp index f7ead5a4c27..55a58be3ecb 100644 --- a/src/mame/rm/rm380z_v.cpp +++ b/src/mame/rm/rm380z_v.cpp @@ -9,7 +9,7 @@ RM 380Z video code #include "emu.h" -#include "includes/rm380z.h" +#include "rm380z.h" void rm380z_state::put_point(int charnum,int x,int y,int col) diff --git a/src/mame/rm/rmnimbus.cpp b/src/mame/rm/rmnimbus.cpp index dfd855bdf31..e9f915e9753 100644 --- a/src/mame/rm/rmnimbus.cpp +++ b/src/mame/rm/rmnimbus.cpp @@ -10,8 +10,8 @@ */ #include "emu.h" -#include "includes/rmnimbus.h" -#include "machine/rmnkbd.h" +#include "rmnimbus.h" +#include "rmnkbd.h" #include "cpu/mcs51/mcs51.h" #include "imagedev/floppy.h" diff --git a/src/mame/rm/rmnimbus_m.cpp b/src/mame/rm/rmnimbus_m.cpp index 557422c38ff..466010411ec 100644 --- a/src/mame/rm/rmnimbus_m.cpp +++ b/src/mame/rm/rmnimbus_m.cpp @@ -62,7 +62,7 @@ chdman createhd -o ST125N.chd -chs 41921,1,1 -ss 512 #include "emu.h" #include -#include "includes/rmnimbus.h" +#include "rmnimbus.h" #include "debugger.h" #include "debug/debugcon.h" #include "debug/debugcpu.h" diff --git a/src/mame/rm/rmnimbus_v.cpp b/src/mame/rm/rmnimbus_v.cpp index 244a2e2c4a0..6e4980180ea 100644 --- a/src/mame/rm/rmnimbus_v.cpp +++ b/src/mame/rm/rmnimbus_v.cpp @@ -29,7 +29,7 @@ */ #include "emu.h" -#include "includes/rmnimbus.h" +#include "rmnimbus.h" #include "debugger.h" #include "debug/debugcon.h" diff --git a/src/mame/rm/rmnkbd.cpp b/src/mame/rm/rmnkbd.cpp index b2e0918b3bf..7316ce28dff 100644 --- a/src/mame/rm/rmnkbd.cpp +++ b/src/mame/rm/rmnkbd.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Carl,Vas Crabb #include "emu.h" -#include "machine/rmnkbd.h" +#include "rmnkbd.h" #include "machine/keyboard.ipp" diff --git a/src/mame/robotron/a7150.cpp b/src/mame/robotron/a7150.cpp index faf67818acf..c1ed7d1093d 100644 --- a/src/mame/robotron/a7150.cpp +++ b/src/mame/robotron/a7150.cpp @@ -24,6 +24,8 @@ To do: #include "emu.h" +#include "isbc_215g.h" + #include "bus/rs232/rs232.h" #include "cpu/i86/i86.h" #include "cpu/z80/z80.h" @@ -32,7 +34,6 @@ To do: #include "machine/i8251.h" #include "machine/i8255.h" #include "machine/input_merger.h" -#include "machine/isbc_215g.h" #include "machine/keyboard.h" #include "machine/pic8259.h" #include "machine/pit8253.h" diff --git a/src/mame/rockwell/aim65.cpp b/src/mame/rockwell/aim65.cpp index 998408e7b59..b3f158e8a1f 100644 --- a/src/mame/rockwell/aim65.cpp +++ b/src/mame/rockwell/aim65.cpp @@ -22,7 +22,7 @@ ToDo: ******************************************************************************/ #include "emu.h" -#include "includes/aim65.h" +#include "aim65.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/rockwell/aim65_m.cpp b/src/mame/rockwell/aim65_m.cpp index 031d5272c06..86fd9b71168 100644 --- a/src/mame/rockwell/aim65_m.cpp +++ b/src/mame/rockwell/aim65_m.cpp @@ -8,7 +8,7 @@ #include "emu.h" -#include "includes/aim65.h" +#include "aim65.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/mame/roland/alphajuno.cpp b/src/mame/roland/alphajuno.cpp index e2dc6c1f3f0..6de2cfe79cc 100644 --- a/src/mame/roland/alphajuno.cpp +++ b/src/mame/roland/alphajuno.cpp @@ -9,8 +9,8 @@ #include "emu.h" //#include "bus/midi/midi.h" #include "cpu/mcs51/mcs51.h" -#include "machine/mb62h195.h" -#include "machine/mb63h149.h" +#include "mb62h195.h" +#include "mb63h149.h" #include "machine/nvram.h" #include "machine/rescap.h" #include "machine/upd7001.h" diff --git a/src/mame/roland/juno106.cpp b/src/mame/roland/juno106.cpp index 0634d3c9735..7a8ed589930 100644 --- a/src/mame/roland/juno106.cpp +++ b/src/mame/roland/juno106.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "audio/mb63h114.h" +#include "mb63h114.h" //#include "bus/midi/midi.h" #include "cpu/upd7810/upd7810.h" #include "machine/nvram.h" diff --git a/src/mame/roland/roland_d10.cpp b/src/mame/roland/roland_d10.cpp index 8aadbcff775..29c05b79c1d 100644 --- a/src/mame/roland/roland_d10.cpp +++ b/src/mame/roland/roland_d10.cpp @@ -20,7 +20,7 @@ #include "emu.h" #include "cpu/mcs96/i8x9x.h" #include "machine/bankdev.h" -#include "machine/mb63h149.h" +#include "mb63h149.h" #include "machine/nvram.h" #include "machine/timer.h" #include "video/msm6222b.h" diff --git a/src/mame/roland/roland_d50.cpp b/src/mame/roland/roland_d50.cpp index ab0d6446453..817356971f5 100644 --- a/src/mame/roland/roland_d50.cpp +++ b/src/mame/roland/roland_d50.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "cpu/upd78k/upd78k3.h" #include "machine/bankdev.h" -#include "machine/mb63h149.h" +#include "mb63h149.h" #include "machine/nvram.h" class roland_d50_state : public driver_device diff --git a/src/mame/roland/roland_jx3p.cpp b/src/mame/roland/roland_jx3p.cpp index c86f22c811d..4e791bf29f7 100644 --- a/src/mame/roland/roland_jx3p.cpp +++ b/src/mame/roland/roland_jx3p.cpp @@ -13,7 +13,7 @@ #include "cpu/mcs51/mcs51.h" #include "machine/adc0804.h" #include "machine/nvram.h" -#include "machine/pg200.h" +#include "pg200.h" #include "machine/pit8253.h" #include "machine/rescap.h" diff --git a/src/mame/roland/roland_jx8p.cpp b/src/mame/roland/roland_jx8p.cpp index 37136fd1ddb..5322fd00dce 100644 --- a/src/mame/roland/roland_jx8p.cpp +++ b/src/mame/roland/roland_jx8p.cpp @@ -7,13 +7,13 @@ ****************************************************************************/ #include "emu.h" -#include "audio/jx8p_synth.h" +#include "jx8p_synth.h" #include "bus/generic/carts.h" #include "bus/generic/slot.h" //#include "bus/midi/midi.h" #include "cpu/m6800/m6801.h" //#include "cpu/upd7500/upd7500.h" -#include "machine/mb63h149.h" +#include "mb63h149.h" #include "machine/nvram.h" //#include "machine/pg800.h" #include "machine/rescap.h" diff --git a/src/mame/roland/roland_pr100.cpp b/src/mame/roland/roland_pr100.cpp index 72aeebfec33..3f98b40c546 100644 --- a/src/mame/roland/roland_pr100.cpp +++ b/src/mame/roland/roland_pr100.cpp @@ -20,7 +20,7 @@ #include "machine/eepromser.h" #include "machine/input_merger.h" #include "machine/i8251.h" -#include "machine/mb87013.h" +#include "mb87013.h" namespace { diff --git a/src/mame/roland/roland_s10.cpp b/src/mame/roland/roland_s10.cpp index b5eb0493c19..08adeb1c537 100644 --- a/src/mame/roland/roland_s10.cpp +++ b/src/mame/roland/roland_s10.cpp @@ -11,14 +11,14 @@ ****************************************************************************/ #include "emu.h" -#include "audio/bu3905.h" -#include "audio/sa16.h" +#include "bu3905.h" +#include "sa16.h" //#include "bus/midi/midi.h" #include "cpu/mcs51/mcs51.h" #include "machine/i8251.h" -#include "machine/mb62h195.h" -#include "machine/mb63h149.h" -#include "machine/mb87013.h" +#include "mb62h195.h" +#include "mb63h149.h" +#include "mb87013.h" #include "machine/nvram.h" #include "machine/rescap.h" #include "machine/upd7001.h" diff --git a/src/mame/roland/roland_s50.cpp b/src/mame/roland/roland_s50.cpp index 69e42d5db40..3ca5d6fce0a 100644 --- a/src/mame/roland/roland_s50.cpp +++ b/src/mame/roland/roland_s50.cpp @@ -7,13 +7,13 @@ ****************************************************************************/ #include "emu.h" -#include "audio/bu3905.h" -#include "audio/sa16.h" +#include "bu3905.h" +#include "sa16.h" //#include "bus/midi/midi.h" #include "cpu/mcs96/i8x9x.h" #include "imagedev/floppy.h" #include "machine/bankdev.h" -#include "machine/mb63h149.h" +#include "mb63h149.h" #include "machine/timer.h" #include "machine/wd_fdc.h" #include "video/tms3556.h" diff --git a/src/mame/roland/roland_tr505.cpp b/src/mame/roland/roland_tr505.cpp index 4f95c90068e..d45b729965f 100644 --- a/src/mame/roland/roland_tr505.cpp +++ b/src/mame/roland/roland_tr505.cpp @@ -10,7 +10,7 @@ **********************************************************************/ #include "emu.h" -#include "audio/mb63h114.h" +#include "mb63h114.h" //#include "bus/midi/midi.h" #include "cpu/m6800/m6801.h" //#include "machine/nvram.h" diff --git a/src/mame/roland/roland_tr707.cpp b/src/mame/roland/roland_tr707.cpp index 172c59965c9..31ef0e323ed 100644 --- a/src/mame/roland/roland_tr707.cpp +++ b/src/mame/roland/roland_tr707.cpp @@ -12,7 +12,7 @@ ****************************************************************************/ #include "emu.h" -#include "audio/mb63h114.h" +#include "mb63h114.h" #include "bus/generic/carts.h" #include "bus/generic/slot.h" //#include "bus/midi/midi.h" diff --git a/src/mame/rtpc/rtpc.cpp b/src/mame/rtpc/rtpc.cpp index 4e68efcf037..bb40b4e8e6d 100644 --- a/src/mame/rtpc/rtpc.cpp +++ b/src/mame/rtpc/rtpc.cpp @@ -80,8 +80,8 @@ #include "cpu/mcs51/mcs51.h" // various hardware -#include "machine/rosetta.h" -#include "machine/rtpc_iocc.h" +#include "rosetta.h" +#include "rtpc_iocc.h" #include "machine/am9517a.h" #include "machine/pic8259.h" #include "machine/i8255.h" diff --git a/src/mame/sage/sage2.cpp b/src/mame/sage/sage2.cpp index 28bf2dac9fe..f3c5cd285b0 100644 --- a/src/mame/sage/sage2.cpp +++ b/src/mame/sage/sage2.cpp @@ -24,7 +24,7 @@ */ #include "emu.h" -#include "includes/sage2.h" +#include "sage2.h" #include "bus/rs232/rs232.h" #include "softlist_dev.h" diff --git a/src/mame/saitek/saitek_corona.cpp b/src/mame/saitek/saitek_corona.cpp index 342dfa316fa..961eeae3111 100644 --- a/src/mame/saitek/saitek_corona.cpp +++ b/src/mame/saitek/saitek_corona.cpp @@ -11,7 +11,7 @@ different compared to Stratos/Turbo King. ***************************************************************************/ #include "emu.h" -#include "includes/saitek_stratos.h" +#include "saitek_stratos.h" #include "cpu/m6502/m65c02.h" #include "machine/nvram.h" diff --git a/src/mame/saitek/saitek_stratos.cpp b/src/mame/saitek/saitek_stratos.cpp index 65674975518..d96ce234e16 100644 --- a/src/mame/saitek/saitek_stratos.cpp +++ b/src/mame/saitek/saitek_stratos.cpp @@ -50,7 +50,7 @@ very few bytes difference between revisions. The first Corona is engine version ******************************************************************************/ #include "emu.h" -#include "includes/saitek_stratos.h" +#include "saitek_stratos.h" #include "cpu/m6502/m65c02.h" #include "machine/nvram.h" diff --git a/src/mame/sanritsu/appoooh.cpp b/src/mame/sanritsu/appoooh.cpp index 9da785d7890..751bb7b2f64 100644 --- a/src/mame/sanritsu/appoooh.cpp +++ b/src/mame/sanritsu/appoooh.cpp @@ -165,7 +165,7 @@ Language #include "emu.h" -#include "machine/segacrp2_device.h" +#include "segacrp2_device.h" #include "cpu/z80/z80.h" #include "sound/msm5205.h" diff --git a/src/mame/sanritsu/bankp.cpp b/src/mame/sanritsu/bankp.cpp index 843c6e9296e..845163e4ffe 100644 --- a/src/mame/sanritsu/bankp.cpp +++ b/src/mame/sanritsu/bankp.cpp @@ -94,7 +94,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bankp.h" +#include "bankp.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" diff --git a/src/mame/sanritsu/bankp_v.cpp b/src/mame/sanritsu/bankp_v.cpp index 73dbf04cd30..19b403d8a07 100644 --- a/src/mame/sanritsu/bankp_v.cpp +++ b/src/mame/sanritsu/bankp_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bankp.h" +#include "bankp.h" /*************************************************************************** diff --git a/src/mame/sanritsu/chinsan.cpp b/src/mame/sanritsu/chinsan.cpp index 3b4c00a6d28..8092b8aec8a 100644 --- a/src/mame/sanritsu/chinsan.cpp +++ b/src/mame/sanritsu/chinsan.cpp @@ -20,18 +20,23 @@ ***************************************************************************/ #include "emu.h" + +#include "mc8123.h" + #include "cpu/z80/z80.h" -#include "machine/mc8123.h" -#include "machine/nvram.h" #include "machine/i8255.h" +#include "machine/nvram.h" #include "sound/msm5205.h" #include "sound/ymopn.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" #include "tilemap.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -611,6 +616,8 @@ ROM_START( mayumi ) ROM_LOAD( "my-9k.bin", 0x0200, 0x0100, CRC(3e7a8012) SHA1(24129586a1c39f68dad274b5afbdd6c027ab0901) ) // b ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/sanritsu/drmicro.cpp b/src/mame/sanritsu/drmicro.cpp index 53d202e1a29..4ee70d68a07 100644 --- a/src/mame/sanritsu/drmicro.cpp +++ b/src/mame/sanritsu/drmicro.cpp @@ -11,7 +11,7 @@ Quite similar to Appoooh *****************************************************************************/ #include "emu.h" -#include "includes/drmicro.h" +#include "drmicro.h" #include "cpu/z80/z80.h" #include "sound/msm5205.h" diff --git a/src/mame/sanritsu/drmicro_v.cpp b/src/mame/sanritsu/drmicro_v.cpp index 63e12ede6a3..34274f56869 100644 --- a/src/mame/sanritsu/drmicro_v.cpp +++ b/src/mame/sanritsu/drmicro_v.cpp @@ -10,7 +10,7 @@ Video hardware *******************************************************************************/ #include "emu.h" -#include "includes/drmicro.h" +#include "drmicro.h" /****************************************************************************/ diff --git a/src/mame/sanritsu/mermaid.cpp b/src/mame/sanritsu/mermaid.cpp index 795cb189fab..756a2254bc2 100644 --- a/src/mame/sanritsu/mermaid.cpp +++ b/src/mame/sanritsu/mermaid.cpp @@ -118,7 +118,7 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/mermaid.h" +#include "mermaid.h" #include "cpu/z80/z80.h" #include "speaker.h" diff --git a/src/mame/sanritsu/mermaid_v.cpp b/src/mame/sanritsu/mermaid_v.cpp index fd8cc9a951d..bec0e084745 100644 --- a/src/mame/sanritsu/mermaid_v.cpp +++ b/src/mame/sanritsu/mermaid_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Zsolt Vasvari #include "emu.h" -#include "includes/mermaid.h" +#include "mermaid.h" void mermaid_state::common_palette(palette_device &palette) const diff --git a/src/mame/sanritsu/mjkjidai.cpp b/src/mame/sanritsu/mjkjidai.cpp index e94b5b3c6fd..8b63f2a0294 100644 --- a/src/mame/sanritsu/mjkjidai.cpp +++ b/src/mame/sanritsu/mjkjidai.cpp @@ -23,7 +23,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/mjkjidai.h" +#include "mjkjidai.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" diff --git a/src/mame/sanritsu/mjkjidai_v.cpp b/src/mame/sanritsu/mjkjidai_v.cpp index 8fb077bdad5..3ff306720bf 100644 --- a/src/mame/sanritsu/mjkjidai_v.cpp +++ b/src/mame/sanritsu/mjkjidai_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/mjkjidai.h" +#include "mjkjidai.h" /*************************************************************************** diff --git a/src/mame/sanyo/mbc55x.cpp b/src/mame/sanyo/mbc55x.cpp index e9ee574bbe1..731a7c1136c 100644 --- a/src/mame/sanyo/mbc55x.cpp +++ b/src/mame/sanyo/mbc55x.cpp @@ -12,14 +12,14 @@ #include "emu.h" -#include "includes/mbc55x.h" +#include "mbc55x.h" #include "bus/isa/isa.h" #include "bus/isa/isa_cards.h" #include "bus/rs232/rs232.h" #include "machine/clock.h" #include "machine/i8087.h" #include "machine/input_merger.h" -#include "machine/mbc55x_kbd.h" +#include "mbc55x_kbd.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/sanyo/mbc55x_kbd.cpp b/src/mame/sanyo/mbc55x_kbd.cpp index fb8e51d5b5e..cf530d64e41 100644 --- a/src/mame/sanyo/mbc55x_kbd.cpp +++ b/src/mame/sanyo/mbc55x_kbd.cpp @@ -17,7 +17,7 @@ *******************************************************************************/ #include "emu.h" -#include "machine/mbc55x_kbd.h" +#include "mbc55x_kbd.h" #include "cpu/mcs48/mcs48.h" #include "machine/keyboard.ipp" diff --git a/src/mame/sanyo/mbc55x_v.cpp b/src/mame/sanyo/mbc55x_v.cpp index 79b09351b67..a01d6ac0ef4 100644 --- a/src/mame/sanyo/mbc55x_v.cpp +++ b/src/mame/sanyo/mbc55x_v.cpp @@ -71,7 +71,7 @@ give the leftmost column of the rectangle, the next four give the next column, a #include "emu.h" #include -#include "includes/mbc55x.h" +#include "mbc55x.h" #define DEBUG_LINES 1 #define DEBUG_VSYNC 2 diff --git a/src/mame/sanyo/phc25.cpp b/src/mame/sanyo/phc25.cpp index 91bcb572fce..78c310bbabd 100644 --- a/src/mame/sanyo/phc25.cpp +++ b/src/mame/sanyo/phc25.cpp @@ -40,7 +40,7 @@ RUN *****************************************************************************/ #include "emu.h" -#include "includes/phc25.h" +#include "phc25.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/sega/315-5838_317-0229_comp.cpp b/src/mame/sega/315-5838_317-0229_comp.cpp index c87d7622484..2c2d24ced62 100644 --- a/src/mame/sega/315-5838_317-0229_comp.cpp +++ b/src/mame/sega/315-5838_317-0229_comp.cpp @@ -32,7 +32,7 @@ */ #include "emu.h" -#include "machine/315-5838_317-0229_comp.h" +#include "315-5838_317-0229_comp.h" DEFINE_DEVICE_TYPE(SEGA315_5838_COMP, sega_315_5838_comp_device, "sega315_5838", "Sega 315-5838 / 317-0229 Compression and Encryption") diff --git a/src/mame/sega/315-5881_crypt.cpp b/src/mame/sega/315-5881_crypt.cpp index 6b462dbae40..aa6378320d1 100644 --- a/src/mame/sega/315-5881_crypt.cpp +++ b/src/mame/sega/315-5881_crypt.cpp @@ -18,7 +18,7 @@ */ #include "emu.h" -#include "machine/315-5881_crypt.h" +#include "315-5881_crypt.h" DEFINE_DEVICE_TYPE(SEGA315_5881_CRYPT, sega_315_5881_crypt_device, "sega315_5881", "Sega 315-5881 Encryption") diff --git a/src/mame/sega/315-6154.cpp b/src/mame/sega/315-6154.cpp index 9e29a6646bc..633a88de447 100644 --- a/src/mame/sega/315-6154.cpp +++ b/src/mame/sega/315-6154.cpp @@ -2,7 +2,7 @@ // copyright-holders:Samuele Zannoli #include "emu.h" -#include "machine/315-6154.h" +#include "315-6154.h" DEFINE_DEVICE_TYPE(SEGA315_6154, sega_315_6154_device, "sega315_6154", "Sega 315-6154 Northbridge") diff --git a/src/mame/sega/315_5195.h b/src/mame/sega/315_5195.h index 3934d426d5a..143248a7614 100644 --- a/src/mame/sega/315_5195.h +++ b/src/mame/sega/315_5195.h @@ -12,8 +12,8 @@ #pragma once #include "cpu/m68000/m68000.h" -#include "machine/fd1089.h" -#include "machine/fd1094.h" +#include "fd1089.h" +#include "fd1094.h" //************************************************************************** diff --git a/src/mame/sega/315_5296.cpp b/src/mame/sega/315_5296.cpp index b08494dfc8f..99d28a3b6fd 100644 --- a/src/mame/sega/315_5296.cpp +++ b/src/mame/sega/315_5296.cpp @@ -23,7 +23,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/315_5296.h" +#include "315_5296.h" DEFINE_DEVICE_TYPE(SEGA_315_5296, sega_315_5296_device, "315_5296", "Sega 315-5296 I/O") diff --git a/src/mame/sega/angelkds.cpp b/src/mame/sega/angelkds.cpp index 2503b7248af..943bc7f3ef1 100644 --- a/src/mame/sega/angelkds.cpp +++ b/src/mame/sega/angelkds.cpp @@ -128,7 +128,7 @@ Dumped by Chackn #include "emu.h" -#include "machine/segacrp2_device.h" +#include "segacrp2_device.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" diff --git a/src/mame/sega/bingoc.cpp b/src/mame/sega/bingoc.cpp index 4c3cde5740d..e42518ced26 100644 --- a/src/mame/sega/bingoc.cpp +++ b/src/mame/sega/bingoc.cpp @@ -42,8 +42,8 @@ SOUND : 2 x ASSP 5C68A #include "emu.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "machine/315_5338a.h" -#include "machine/bingoct.h" +#include "315_5338a.h" +#include "bingoct.h" #include "machine/gen_latch.h" #include "machine/i8251.h" #include "sound/rf5c68.h" diff --git a/src/mame/sega/bingoct.cpp b/src/mame/sega/bingoct.cpp index d7dd3fca499..224c0dbd110 100644 --- a/src/mame/sega/bingoct.cpp +++ b/src/mame/sega/bingoct.cpp @@ -34,7 +34,7 @@ #include "emu.h" #include "bingoct.h" -#include "machine/315_5338a.h" +#include "315_5338a.h" #include "machine/i8251.h" #include "machine/nvram.h" #include "machine/pit8253.h" diff --git a/src/mame/sega/calorie.cpp b/src/mame/sega/calorie.cpp index 734defb6bce..d4f57ec7708 100644 --- a/src/mame/sega/calorie.cpp +++ b/src/mame/sega/calorie.cpp @@ -82,7 +82,7 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "machine/segacrp2_device.h" +#include "segacrp2_device.h" #include "sound/ay8910.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/sega/carnival.cpp b/src/mame/sega/carnival.cpp deleted file mode 100644 index 5bf7366efaf..00000000000 --- a/src/mame/sega/carnival.cpp +++ /dev/null @@ -1,257 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Zsolt Vasvari, hap -/* - * Carnival audio routines - */ - -#include "emu.h" -#include "includes/vicdual.h" - - -/* output port 0x01 definitions - sound effect drive outputs */ -#define OUT_PORT_1_RIFLE 0x01 -#define OUT_PORT_1_CLANG 0x02 -#define OUT_PORT_1_DUCK1 0x04 -#define OUT_PORT_1_DUCK2 0x08 -#define OUT_PORT_1_DUCK3 0x10 -#define OUT_PORT_1_PIPEHIT 0x20 -#define OUT_PORT_1_BONUS1 0x40 -#define OUT_PORT_1_BONUS2 0x80 - -/* output port 0x02 definitions - sound effect drive outputs */ -#define OUT_PORT_2_BEAR 0x04 -#define OUT_PORT_2_RANKING 0x20 - - -#define PLAY(samp,id,loop) samp->start( id, id, loop ) -#define STOP(samp,id) samp->stop( id ) - - -/* sample file names */ -static const char *const carnival_sample_names[] = -{ - "*carnival", - "bear", - "bonus1", - "bonus2", - "clang", - "duck1", - "duck2", - "duck3", - "pipehit", - "ranking", - "rifle", - nullptr -}; - - -/* sample IDs - must match sample file name table above */ -enum -{ - SND_BEAR = 0, - SND_BONUS1, - SND_BONUS2, - SND_CLANG, - SND_DUCK1, - SND_DUCK2, - SND_DUCK3, - SND_PIPEHIT, - SND_RANKING, - SND_RIFLE -}; - - -void carnival_state::carnival_audio_1_w(uint8_t data) -{ - int bitsChanged; - int bitsGoneHigh; - int bitsGoneLow; - - bitsChanged = m_port1State ^ data; - bitsGoneHigh = bitsChanged & data; - bitsGoneLow = bitsChanged & ~data; - - m_port1State = data; - - if ( bitsGoneLow & OUT_PORT_1_RIFLE ) - { - PLAY( m_samples, SND_RIFLE, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_1_CLANG ) - { - PLAY( m_samples, SND_CLANG, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_1_DUCK1 ) - { - PLAY( m_samples, SND_DUCK1, 1 ); - } - if ( bitsGoneHigh & OUT_PORT_1_DUCK1 ) - { - STOP( m_samples, SND_DUCK1 ); - } - - if ( bitsGoneLow & OUT_PORT_1_DUCK2 ) - { - PLAY( m_samples, SND_DUCK2, 1 ); - } - if ( bitsGoneHigh & OUT_PORT_1_DUCK2 ) - { - STOP( m_samples, SND_DUCK2 ); - } - - if ( bitsGoneLow & OUT_PORT_1_DUCK3 ) - { - PLAY( m_samples, SND_DUCK3, 1 ); - } - if ( bitsGoneHigh & OUT_PORT_1_DUCK3 ) - { - STOP( m_samples, SND_DUCK3 ); - } - - if ( bitsGoneLow & OUT_PORT_1_PIPEHIT ) - { - PLAY( m_samples, SND_PIPEHIT, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_1_BONUS1 ) - { - PLAY( m_samples, SND_BONUS1, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_1_BONUS2 ) - { - PLAY( m_samples, SND_BONUS2, 0 ); - } -} - -void carnival_state::carnival_audio_2_w(uint8_t data) -{ - int bitsChanged; - //int bitsGoneHigh; - int bitsGoneLow; - - bitsChanged = m_port2State ^ data; - //bitsGoneHigh = bitsChanged & data; - bitsGoneLow = bitsChanged & ~data; - - m_port2State = data; - - if ( bitsGoneLow & OUT_PORT_2_BEAR ) - { - PLAY( m_samples, SND_BEAR, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_2_RANKING ) - { - PLAY( m_samples, SND_RANKING, 0 ); - } - - // d4: music board MCU reset - m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE); -} - - -/* Music board */ - -// common - -void carnival_state::mboard_map(address_map &map) -{ - map(0x0000, 0x03ff).rom(); -} - -READ_LINE_MEMBER( carnival_state::carnival_music_port_t1_r ) -{ - // T1: comms from audio port 2 d3 - return ~m_port2State >> 3 & 1; -} - - -// AY8912 music - -void carnival_state::carnival_psg_latch() -{ - if (m_musicBus & 1) - { - // BDIR W, BC1 selects address or data - if (m_musicBus & 2) - m_psg->address_w(m_musicData); - else - m_psg->data_w(m_musicData); - } -} - -void carnival_state::carnivala_music_port_1_w(uint8_t data) -{ - // P1: AY8912 d0-d7 - m_musicData = data; - carnival_psg_latch(); -} - -void carnival_state::carnivala_music_port_2_w(uint8_t data) -{ - // P2 d6: AY8912 BDIR(R/W) - // P2 d7: AY8912 BC1 - m_musicBus = data >> 6 & 3; - carnival_psg_latch(); -} - -void carnival_state::carnivala_audio(machine_config &config) -{ - /* music board */ - I8035(config, m_audiocpu, XTAL(3'579'545)); - m_audiocpu->set_addrmap(AS_PROGRAM, &carnival_state::mboard_map); - m_audiocpu->p1_out_cb().set(FUNC(carnival_state::carnivala_music_port_1_w)); - m_audiocpu->p2_out_cb().set(FUNC(carnival_state::carnivala_music_port_2_w)); - m_audiocpu->t1_in_cb().set(FUNC(carnival_state::carnival_music_port_t1_r)); - - AY8912(config, m_psg, XTAL(3'579'545)/3).add_route(ALL_OUTPUTS, "mono", 0.25); // also seen with AY-3-8910, daughterboard has place for either chip - - /* samples */ - SAMPLES(config, m_samples); - m_samples->set_channels(10); - m_samples->set_samples_names(carnival_sample_names); - m_samples->add_route(ALL_OUTPUTS, "mono", 0.5); -} - - -// PIT8253 music - -void carnival_state::carnivalb_music_port_1_w(uint8_t data) -{ - // P1: PIT8253 d0-d7 - m_musicData = data; -} - -void carnival_state::carnivalb_music_port_2_w(uint8_t data) -{ - // P2 d7: PIT8253 write strobe - // P2 d5,d6: PIT8253 A0,A1 - if (~m_musicBus & data & 0x80) - m_pit->write(data >> 5 & 3, m_musicData); - - m_musicBus = data; -} - -void carnival_state::carnivalb_audio(machine_config &config) -{ - // already inherited carnivala_audio - config.device_remove("psg"); - - m_audiocpu->p1_out_cb().set(FUNC(carnival_state::carnivalb_music_port_1_w)); - m_audiocpu->p2_out_cb().set(FUNC(carnival_state::carnivalb_music_port_2_w)); - - PIT8253(config, m_pit, 0); - m_pit->set_clk<0>(XTAL(3'579'545)/3); - m_pit->set_clk<1>(XTAL(3'579'545)/3); - m_pit->set_clk<2>(XTAL(3'579'545)/3); - - m_pit->out_handler<0>().set(m_dac[0], FUNC(dac_bit_interface::write)); - m_pit->out_handler<1>().set(m_dac[1], FUNC(dac_bit_interface::write)); - m_pit->out_handler<2>().set(m_dac[2], FUNC(dac_bit_interface::write)); - - for (int i = 0; i < 3; i++) - DAC_1BIT(config, m_dac[i]).add_route(ALL_OUTPUTS, "mono", 0.15); -} diff --git a/src/mame/sega/chihiro.cpp b/src/mame/sega/chihiro.cpp index 2fc4b864e4a..aab4a889715 100644 --- a/src/mame/sega/chihiro.cpp +++ b/src/mame/sega/chihiro.cpp @@ -429,16 +429,18 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info. */ #include "emu.h" + +#include "xbox_pci.h" +#include "xbox.h" + #include "machine/pci.h" #include "machine/idectrl.h" -#include "machine/xbox_pci.h" -#include "machine/xbox.h" #include "bus/ata/idehd.h" #include "cpu/i386/i386.h" -#include "machine/jvs13551.h" +#include "jvs13551.h" #include "machine/jvshost.h" -#include "machine/naomigd.h" +#include "naomigd.h" #include "debug/debugcmd.h" #include "debug/debugcon.h" diff --git a/src/mame/sega/coolridr.cpp b/src/mame/sega/coolridr.cpp index 7ee61164add..4f7d356d9d4 100644 --- a/src/mame/sega/coolridr.cpp +++ b/src/mame/sega/coolridr.cpp @@ -286,7 +286,7 @@ to the same bank as defined through A20. #include "cpu/sh/sh2.h" #include "machine/nvram.h" #include "machine/timer.h" -#include "machine/315_5649.h" +#include "315_5649.h" #include "sound/scsp.h" #include "emupal.h" #include "layout/generic.h" diff --git a/src/mame/sega/dc_atomiswave.cpp b/src/mame/sega/dc_atomiswave.cpp index c4ea9e2178f..8d37c3a03c1 100644 --- a/src/mame/sega/dc_atomiswave.cpp +++ b/src/mame/sega/dc_atomiswave.cpp @@ -430,7 +430,7 @@ Premier Eleven **************************************************************************************************/ #include "emu.h" -#include "includes/dc_atomiswave.h" +#include "dc_atomiswave.h" //#include "machine/gunsense.h" //#include "emupal.h" diff --git a/src/mame/sega/dc_atomiswave.h b/src/mame/sega/dc_atomiswave.h index fb180e4520e..ba692522ebf 100644 --- a/src/mame/sega/dc_atomiswave.h +++ b/src/mame/sega/dc_atomiswave.h @@ -6,9 +6,9 @@ #pragma once -#include "machine/awboard.h" +#include "awboard.h" #include "machine/intelfsh.h" -#include "machine/dc-ctrl.h" +#include "dc-ctrl.h" #include "machine/nvram.h" #include "machine/aicartc.h" //#include "machine/m3comm.h" diff --git a/src/mame/sega/deniam.cpp b/src/mame/sega/deniam.cpp index 6ce91362ad2..744677dfa14 100644 --- a/src/mame/sega/deniam.cpp +++ b/src/mame/sega/deniam.cpp @@ -44,7 +44,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/deniam.h" +#include "deniam.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/sega/deniam_v.cpp b/src/mame/sega/deniam_v.cpp index c5676be36e1..0dce18f1440 100644 --- a/src/mame/sega/deniam_v.cpp +++ b/src/mame/sega/deniam_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/deniam.h" +#include "deniam.h" #include "screen.h" diff --git a/src/mame/sega/depthch.cpp b/src/mame/sega/depthch.cpp deleted file mode 100644 index 299192c6112..00000000000 --- a/src/mame/sega/depthch.cpp +++ /dev/null @@ -1,93 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Zsolt Vasvari -/* - * Depth Charge audio routines - */ - -#include "emu.h" -#include "includes/vicdual.h" - -/* output port 0x01 definitions - sound effect drive outputs */ -#define OUT_PORT_1_LONGEXPL 0x01 -#define OUT_PORT_1_SHRTEXPL 0x02 -#define OUT_PORT_1_SPRAY 0x04 -#define OUT_PORT_1_SONAR 0x08 - - -#define PLAY(samp,id,loop) samp->start( id, id, loop ) -#define STOP(samp,id) samp->stop( id ) - - -/* sample file names */ -static const char *const depthch_sample_names[] = -{ - "*depthch", - "longex", - "shortex", - "spray", - "bonus", - "sonar", - nullptr -}; - - -/* sample IDs - must match sample file name table above */ -enum -{ - SND_LONGEXPL = 0, - SND_SHRTEXPL, - SND_SPRAY, - SND_BONUS, - SND_SONAR -}; - - -void vicdual_state::depthch_audio_w(uint8_t data) -{ - int bitsChanged; - int bitsGoneHigh; - int bitsGoneLow; - - bitsChanged = m_port1State ^ data; - bitsGoneHigh = bitsChanged & data; - bitsGoneLow = bitsChanged & ~data; - - m_port1State = data; - - if ( bitsGoneHigh & OUT_PORT_1_LONGEXPL ) - { - PLAY( m_samples, SND_LONGEXPL, 0 ); - } - - if ( bitsGoneHigh & OUT_PORT_1_SHRTEXPL ) - { - PLAY( m_samples, SND_SHRTEXPL, 0 ); - } - - if ( bitsGoneHigh & OUT_PORT_1_SPRAY ) - { - PLAY( m_samples, SND_SPRAY, 0 ); - } - - if ( bitsGoneHigh & OUT_PORT_1_SONAR ) - { - PLAY( m_samples, SND_SONAR, 1 ); - } - if ( bitsGoneLow & OUT_PORT_1_SONAR ) - { - STOP( m_samples, SND_SONAR ); - - // bonus sound on same line as sonar - PLAY( m_samples, SND_BONUS, 0 ); - } -} - - -void vicdual_state::depthch_audio(machine_config &config) -{ - /* samples */ - SAMPLES(config, m_samples); - m_samples->set_channels(5); - m_samples->set_samples_names(depthch_sample_names); - m_samples->add_route(ALL_OUTPUTS, "mono", 0.5); -} diff --git a/src/mame/sega/dsbz80.cpp b/src/mame/sega/dsbz80.cpp index ad7f25bbfcd..85c4e8ce2cc 100644 --- a/src/mame/sega/dsbz80.cpp +++ b/src/mame/sega/dsbz80.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "audio/dsbz80.h" +#include "dsbz80.h" #include "machine/clock.h" #define Z80_TAG "mpegcpu" diff --git a/src/mame/sega/fd1089.cpp b/src/mame/sega/fd1089.cpp index cf42dc7f0bf..755f57addca 100644 --- a/src/mame/sega/fd1089.cpp +++ b/src/mame/sega/fd1089.cpp @@ -134,7 +134,7 @@ #include "emu.h" #include "fd1089.h" -#include "segaic16.h" +#include "segaic16_m.h" //************************************************************************** diff --git a/src/mame/sega/flashbeats.cpp b/src/mame/sega/flashbeats.cpp index 2883c6f6690..ca6aa3e1647 100644 --- a/src/mame/sega/flashbeats.cpp +++ b/src/mame/sega/flashbeats.cpp @@ -20,8 +20,8 @@ #include "cpu/h8/h83006.h" #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" -#include "machine/315_5296.h" -#include "machine/315_5338a.h" +#include "315_5296.h" +#include "315_5338a.h" #include "machine/te7750.h" #include "sound/scsp.h" #include "screen.h" diff --git a/src/mame/sega/fwheel.cpp b/src/mame/sega/fwheel.cpp index 63b9ee7083c..1ff7bc4aeba 100644 --- a/src/mame/sega/fwheel.cpp +++ b/src/mame/sega/fwheel.cpp @@ -37,7 +37,7 @@ OKI M2128-15 RAM #include "emu.h" #include "speaker.h" -#include "includes/sms.h" +#include "sms.h" #include "cpu/z80/z80.h" #include "sound/ymopl.h" diff --git a/src/mame/sega/hshavoc.cpp b/src/mame/sega/hshavoc.cpp index e772fb79e37..28a572a803c 100644 --- a/src/mame/sega/hshavoc.cpp +++ b/src/mame/sega/hshavoc.cpp @@ -39,8 +39,8 @@ help with figuring out the encryption on the coin-op parts of the program. #include "emu.h" -#include "includes/megadriv.h" -#include "includes/megadriv_acbl.h" +#include "megadriv.h" +#include "megadriv_acbl.h" #include "cpu/m68000/m68000.h" #include "cpu/pic16c5x/pic16c5x.h" diff --git a/src/mame/sega/invinco.cpp b/src/mame/sega/invinco.cpp deleted file mode 100644 index 87b046b7e59..00000000000 --- a/src/mame/sega/invinco.cpp +++ /dev/null @@ -1,104 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Zsolt Vasvari -/* - * Invinco sound routines - */ - -#include "emu.h" -#include "includes/vicdual.h" - -/* output port 0x02 definitions - sound effect drive outputs */ -#define OUT_PORT_2_SAUCER 0x04 -#define OUT_PORT_2_MOVE1 0x08 -#define OUT_PORT_2_MOVE2 0x10 -#define OUT_PORT_2_FIRE 0x20 -#define OUT_PORT_2_INVHIT 0x40 -#define OUT_PORT_2_SHIPHIT 0x80 - - -#define PLAY(samp,id,loop) samp->start( id, id, loop ) -#define STOP(samp,id) samp->stop( id ) - - -/* sample file names */ -static const char *const invinco_sample_names[] = -{ - "*invinco", - "saucer", - "move1", - "move2", - "fire", - "invhit", - "shiphit", - "move3", /* currently not used */ - "move4", /* currently not used */ - nullptr -}; - - -/* sample IDs - must match sample file name table above */ -enum -{ - SND_SAUCER = 0, - SND_MOVE1, - SND_MOVE2, - SND_FIRE, - SND_INVHIT, - SND_SHIPHIT, - SND_MOVE3, - SND_MOVE4 -}; - - -void vicdual_state::invinco_audio_w(uint8_t data) -{ - int bitsChanged; - //int bitsGoneHigh; - int bitsGoneLow; - - bitsChanged = m_port2State ^ data; - //bitsGoneHigh = bitsChanged & data; - bitsGoneLow = bitsChanged & ~data; - - m_port2State = data; - - if ( bitsGoneLow & OUT_PORT_2_SAUCER ) - { - PLAY( m_samples, SND_SAUCER, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_2_MOVE1 ) - { - PLAY( m_samples, SND_MOVE1, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_2_MOVE2 ) - { - PLAY( m_samples, SND_MOVE2, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_2_FIRE ) - { - PLAY( m_samples, SND_FIRE, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_2_INVHIT ) - { - PLAY( m_samples, SND_INVHIT, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_2_SHIPHIT ) - { - PLAY( m_samples, SND_SHIPHIT, 0 ); - } -} - - -void vicdual_state::invinco_audio(machine_config &config) -{ - /* samples */ - SAMPLES(config, m_samples); - m_samples->set_channels(8); - m_samples->set_samples_names(invinco_sample_names); - m_samples->add_route(ALL_OUTPUTS, "mono", 0.5); -} diff --git a/src/mame/sega/kopunch.cpp b/src/mame/sega/kopunch.cpp index 1b5c1a296ad..586fc7ec30a 100644 --- a/src/mame/sega/kopunch.cpp +++ b/src/mame/sega/kopunch.cpp @@ -32,7 +32,7 @@ ********************************************************/ #include "emu.h" -#include "includes/kopunch.h" +#include "kopunch.h" #include "cpu/i8085/i8085.h" #include "machine/i8255.h" diff --git a/src/mame/sega/kopunch_v.cpp b/src/mame/sega/kopunch_v.cpp index 7160c48dbad..391d6bb2a17 100644 --- a/src/mame/sega/kopunch_v.cpp +++ b/src/mame/sega/kopunch_v.cpp @@ -9,7 +9,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/kopunch.h" +#include "kopunch.h" void kopunch_state::kopunch_palette(palette_device &palette) const diff --git a/src/mame/sega/lindbergh.cpp b/src/mame/sega/lindbergh.cpp index 490e2ec8e64..f03601227dd 100644 --- a/src/mame/sega/lindbergh.cpp +++ b/src/mame/sega/lindbergh.cpp @@ -364,7 +364,7 @@ Sega 2005 #include "machine/pci-sata.h" #include "machine/pci-smbus.h" #include "machine/i82541.h" -#include "machine/segabb.h" +#include "segabb.h" #include "sound/pci-ac97.h" #include "sound/sb0400.h" #include "video/gf7600gs.h" diff --git a/src/mame/sega/m1comm.cpp b/src/mame/sega/m1comm.cpp index 64e763e41f7..6771229dc92 100644 --- a/src/mame/sega/m1comm.cpp +++ b/src/mame/sega/m1comm.cpp @@ -52,7 +52,7 @@ Notes: */ #include "emu.h" -#include "machine/m1comm.h" +#include "m1comm.h" #include "emuopts.h" #define Z80_TAG "commcpu" diff --git a/src/mame/sega/m2comm.cpp b/src/mame/sega/m2comm.cpp index dd25325f6f6..f590e0d3edb 100644 --- a/src/mame/sega/m2comm.cpp +++ b/src/mame/sega/m2comm.cpp @@ -166,7 +166,7 @@ Sega PC BD MODEL2 C-CRX COMMUNICATION 837-12839 #include "emu.h" #include "emuopts.h" -#include "machine/m2comm.h" +#include "m2comm.h" #define VERBOSE 0 #include "logmacro.h" diff --git a/src/mame/sega/m3comm.cpp b/src/mame/sega/m3comm.cpp index 8b9eeaa40a3..c60ecbbf7bf 100644 --- a/src/mame/sega/m3comm.cpp +++ b/src/mame/sega/m3comm.cpp @@ -80,7 +80,7 @@ SEGA 1998 #include "emu.h" #include "emuopts.h" -#include "machine/m3comm.h" +#include "m3comm.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/mame/sega/megadriv.h b/src/mame/sega/megadriv.h deleted file mode 100644 index 0e3efdc0c21..00000000000 --- a/src/mame/sega/megadriv.h +++ /dev/null @@ -1,249 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood -#ifndef MAME_INCLUDES_MEGADRIV_H -#define MAME_INCLUDES_MEGADRIV_H - -#pragma once - -#include "cpu/m68000/m68000.h" -#include "cpu/z80/z80.h" -#include "sound/sn76496.h" -#include "sound/ymopn.h" -#include "video/315_5313.h" - -/* Megadrive Console Specific */ -#include "bus/megadrive/md_slot.h" -#include "bus/megadrive/md_carts.h" -#include "machine/mega32x.h" -#include "machine/megacd.h" - -#define MASTER_CLOCK_NTSC 53693175 -#define MASTER_CLOCK_PAL 53203424 - -#define MD_CPU_REGION_SIZE 0x800000 - - -/*----------- defined in machine/megadriv.cpp -----------*/ - -INPUT_PORTS_EXTERN( md_common ); -INPUT_PORTS_EXTERN( megadriv ); -INPUT_PORTS_EXTERN( megadri6 ); -INPUT_PORTS_EXTERN( ssf2mdb ); -INPUT_PORTS_EXTERN( mk3mdb ); - - -class md_base_state : public driver_device -{ -public: - md_base_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device(mconfig, type, tag), - m_maincpu(*this,"maincpu"), - m_z80snd(*this,"genesis_snd_z80"), - m_ymsnd(*this,"ymsnd"), - m_scan_timer(*this, "md_scan_timer"), - m_vdp(*this,"gen_vdp"), - m_megadrive_ram(*this,"megadrive_ram"), - m_screen(*this,"megadriv"), - m_io_reset(*this, "RESET"), - m_megadrive_io_read_data_port_ptr(*this), - m_megadrive_io_write_data_port_ptr(*this) - { } - - required_device m_maincpu; - optional_device m_z80snd; - optional_device m_ymsnd; - optional_device m_scan_timer; - required_device m_vdp; - optional_shared_ptr m_megadrive_ram; - optional_device m_screen; - - optional_ioport m_io_reset; - ioport_port *m_io_pad_3b[4]; - ioport_port *m_io_pad_6b[4]; - - struct genesis_z80_vars - { - int z80_is_reset = 0; - int z80_has_bus = 0; - uint32_t z80_bank_addr = 0; - std::unique_ptr z80_prgram; - emu_timer *z80_run_timer = nullptr; - }; - - genesis_z80_vars m_genz80; - int m_version_hi_nibble; - - void init_megadrie(); - void init_megadriv(); - void init_megadrij(); - - uint8_t megadriv_68k_YM2612_read(offs_t offset, uint8_t mem_mask = ~0); - void megadriv_68k_YM2612_write(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); - IRQ_CALLBACK_MEMBER(genesis_int_callback); - void megadriv_init_common(); - - void megadriv_z80_bank_w(uint16_t data); - void megadriv_68k_z80_bank_write(uint16_t data); - void megadriv_z80_z80_bank_w(uint8_t data); - uint16_t megadriv_68k_io_read(offs_t offset); - void megadriv_68k_io_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - uint16_t megadriv_68k_read_z80_ram(offs_t offset, uint16_t mem_mask = ~0); - void megadriv_68k_write_z80_ram(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - uint16_t megadriv_68k_check_z80_bus(offs_t offset, uint16_t mem_mask = ~0); - void megadriv_68k_req_z80_bus(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - void megadriv_68k_req_z80_reset(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - uint8_t z80_read_68k_banked_data(offs_t offset); - void z80_write_68k_banked_data(offs_t offset, uint8_t data); - void megadriv_z80_vdp_write(offs_t offset, uint8_t data); - uint8_t megadriv_z80_vdp_read(offs_t offset); - uint8_t megadriv_z80_unmapped_read(); - TIMER_CALLBACK_MEMBER(megadriv_z80_run_state); - - /* Megadrive / Genesis has 3 I/O ports */ - emu_timer *m_io_timeout[3]; - int m_io_stage[3]; - uint8_t m_megadrive_io_data_regs[3]; - uint8_t m_megadrive_io_ctrl_regs[3]; - uint8_t m_megadrive_io_tx_regs[3]; - read8sm_delegate m_megadrive_io_read_data_port_ptr; - write16sm_delegate m_megadrive_io_write_data_port_ptr; - - WRITE_LINE_MEMBER(vdp_sndirqline_callback_genesis_z80); - WRITE_LINE_MEMBER(vdp_lv6irqline_callback_genesis_68k); - WRITE_LINE_MEMBER(vdp_lv4irqline_callback_genesis_68k); - - TIMER_CALLBACK_MEMBER( io_timeout_timer_callback ); - void megadrive_reset_io(); - uint8_t megadrive_io_read_data_port_6button(offs_t offset); - uint8_t megadrive_io_read_data_port_3button(offs_t offset); - uint8_t megadrive_io_read_ctrl_port(int portnum); - uint8_t megadrive_io_read_tx_port(int portnum); - uint8_t megadrive_io_read_rx_port(int portnum); - uint8_t megadrive_io_read_sctrl_port(int portnum); - - void megadrive_io_write_data_port_3button(offs_t offset, uint16_t data); - void megadrive_io_write_data_port_6button(offs_t offset, uint16_t data); - void megadrive_io_write_ctrl_port(int portnum, uint16_t data); - void megadrive_io_write_tx_port(int portnum, uint16_t data); - void megadrive_io_write_rx_port(int portnum, uint16_t data); - void megadrive_io_write_sctrl_port(int portnum, uint16_t data); - - void megadriv_stop_scanline_timer(); - - uint32_t screen_update_megadriv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_megadriv); - - void megadriv_tas_callback(offs_t offset, uint8_t data); - - void megadriv_timers(machine_config &config); - void md_ntsc(machine_config &config); - void md2_ntsc(machine_config &config); - void md_pal(machine_config &config); - void md2_pal(machine_config &config); - void md_bootleg(machine_config &config); - - void dcat16_megadriv_base(machine_config &config); - void dcat16_megadriv_map(address_map &map); - void megadriv_map(address_map &map); - void megadriv_z80_io_map(address_map &map); - void megadriv_z80_map(address_map &map); - -protected: - virtual void machine_start() override; - virtual void machine_reset() override; - virtual void video_start() override; -}; - -class md_cons_state : public md_base_state -{ -public: - md_cons_state(const machine_config &mconfig, device_type type, const char *tag) : - md_base_state(mconfig, type, tag), - m_32x(*this,"sega32x"), - m_segacd(*this,"segacd"), - m_cart(*this, "mdslot"), - m_tmss(*this, "tmss") - { } - - ioport_port *m_io_ctrlr = nullptr; - ioport_port *m_io_pad3b[4]{}; - ioport_port *m_io_pad6b[2][4]{}; - - optional_device m_32x; - optional_device m_segacd; - optional_device m_cart; - optional_region_ptr m_tmss; - - void init_mess_md_common(); - void init_genesis(); - void init_md_eur(); - void init_md_jpn(); - - uint8_t mess_md_io_read_data_port(offs_t offset); - void mess_md_io_write_data_port(offs_t offset, uint16_t data); - - DECLARE_WRITE_LINE_MEMBER(screen_vblank_console); - - DECLARE_DEVICE_IMAGE_LOAD_MEMBER( _32x_cart ); - - void _32x_scanline_callback(int x, uint32_t priority, uint32_t &lineptr); - void _32x_interrupt_callback(int scanline, int irq6); - void _32x_scanline_helper_callback(int scanline); - - void install_cartslot(); - void install_tmss(); - uint16_t tmss_r(offs_t offset); - void tmss_swap_w(uint16_t data); - void dcat16_megadriv_base(machine_config &config); - void dcat16_megadriv(machine_config &config); - - void md_32x(machine_config &config); - void genesis_32x(machine_config &config); - void mdj_32x(machine_config &config); - -protected: - virtual void machine_start() override; - virtual void machine_reset() override; -}; - -class md_cons_slot_state : public md_cons_state -{ -public: - md_cons_slot_state(const machine_config &mconfig, device_type type, const char *tag) : - md_cons_state(mconfig, type, tag) - { } - - void ms_megadpal(machine_config &config); - void ms_megadriv(machine_config &config); - void ms_megadriv2(machine_config &config); - - void genesis_tmss(machine_config &config); - - -protected: - virtual void machine_start() override; -}; - -class md_cons_cd_state : public md_cons_state -{ -public: - md_cons_cd_state(const machine_config &mconfig, device_type type, const char *tag) : - md_cons_state(mconfig, type, tag) - { } - - void genesis_scd(machine_config &config); - void genesis2_scd(machine_config &config); - void md_scd(machine_config &config); - void md2_scd(machine_config &config); - void mdj_scd(machine_config &config); - - void mdj_32x_scd(machine_config &config); - void md2j_scd(machine_config &config); - void genesis_32x_scd(machine_config &config); - void md_32x_scd(machine_config &config); - -protected: - virtual void machine_start() override; -}; - -#endif // MAME_INCLUDES_MEGADRIV_H diff --git a/src/mame/sega/megadriv_acbl.cpp b/src/mame/sega/megadriv_acbl.cpp index 045a3b2cf94..f39e45ec68e 100644 --- a/src/mame/sega/megadriv_acbl.cpp +++ b/src/mame/sega/megadriv_acbl.cpp @@ -260,8 +260,8 @@ connector, but of course, I can be wrong. ****************************************************************************/ #include "emu.h" -#include "includes/megadriv.h" -#include "includes/megadriv_acbl.h" +#include "megadriv.h" +#include "megadriv_acbl.h" /************************************ Mega Drive Bootlegs *************************************/ diff --git a/src/mame/sega/megadriv_m.cpp b/src/mame/sega/megadriv_m.cpp deleted file mode 100644 index f7513e21b51..00000000000 --- a/src/mame/sega/megadriv_m.cpp +++ /dev/null @@ -1,1115 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood -/* - -Megadrive / Genesis support - -this could probably do with a complete rewrite at this point to take into -account all new information discovered since this was created, it's looking -rather old now. - - - -Cleanup / Rewrite notes: - - - -Known Non-Issues (confirmed on Real Genesis) - Castlevania - Bloodlines (U) [!] - Pause text is missing on upside down level - Blood Shot (E) (M4) [!] - corrupt texture in level 1 is correct... - - - -*/ - - -#include "emu.h" -#include "includes/megadriv.h" -#include "speaker.h" - -#define LOG_AUDIOBANK (1U << 1) // z80 to 68k space window access at $8000-$ffff -#define LOG_AUDIOBUS (1U << 2) // z80 bus grants -#define LOG_AUDIORESET (1U << 3) // z80 reset line - -#define VERBOSE (0) - -#include "logmacro.h" - -#define LOGAUDIOBANK(...) LOGMASKED(LOG_AUDIOBANK, __VA_ARGS__) -#define LOGAUDIOBUS(...) LOGMASKED(LOG_AUDIOBUS, __VA_ARGS__) -#define LOGAUDIORESET(...) LOGMASKED(LOG_AUDIORESET, __VA_ARGS__) - - -void md_base_state::megadriv_z80_bank_w(uint16_t data) -{ - // TODO: menghu crashes here - // Tries to setup a bank of 0xff0000 from z80 side (PC=1131) after you talk with the cashier twice. - // Without a guard over it game will trash 68k memory causing a crash, works on real HW with everdrive - // so not coming from a cart copy protection. - // Update: it breaks cfodder BGM on character select at least, therefore we current don't guard against it - // Apparently reading 68k RAM from z80 is not recommended by Sega, so *writing* isn't possible lacking bus grant? - m_genz80.z80_bank_addr = ((m_genz80.z80_bank_addr >> 1) | (data << 23)) & 0xff8000; -} - -void md_base_state::megadriv_68k_z80_bank_write(uint16_t data) -{ - megadriv_z80_bank_w(data & 0x01); -} - -void md_base_state::megadriv_z80_z80_bank_w(uint8_t data) -{ - LOGAUDIOBANK("%s: port $6000 write 0x%02x ", machine().describe_context(), data); - megadriv_z80_bank_w(data & 0x01); - LOGAUDIOBANK("Current bank %08x\n", m_genz80.z80_bank_addr); -} - -uint8_t md_base_state::megadriv_68k_YM2612_read(offs_t offset, uint8_t mem_mask) -{ - //osd_printf_debug("megadriv_68k_YM2612_read %02x %04x\n",offset,mem_mask); - if ((m_genz80.z80_has_bus == 0) && (m_genz80.z80_is_reset == 0)) - { - return m_ymsnd->read(offset); - } - else - { - LOG("%s: 68000 attempting to access YM2612 (read) without bus\n", machine().describe_context()); - return 0; - } - - // never executed - //return -1; -} - - -void md_base_state::megadriv_68k_YM2612_write(offs_t offset, uint8_t data, uint8_t mem_mask) -{ - //osd_printf_debug("megadriv_68k_YM2612_write %02x %04x %04x\n",offset,data,mem_mask); - if ((m_genz80.z80_has_bus == 0) && (m_genz80.z80_is_reset == 0)) - { - m_ymsnd->write(offset, data); - } - else - { - LOG("%s: 68000 attempting to access YM2612 (write) without bus\n", machine().describe_context()); - } -} - -// this is used by 6 button pads and gets installed in machine_start for drivers requiring it -TIMER_CALLBACK_MEMBER(md_base_state::io_timeout_timer_callback) -{ - m_io_stage[(int)param] = -1; -} - - -/* - - A10001h = A0 Version register - - A10003h = 7F Data register for port A - A10005h = 7F Data register for port B - A10007h = 7F Data register for port C - - A10009h = 00 Ctrl register for port A - A1000Bh = 00 Ctrl register for port B - A1000Dh = 00 Ctrl register for port C - - A1000Fh = FF TxData register for port A - A10011h = 00 RxData register for port A - A10013h = 00 S-Ctrl register for port A - - A10015h = FF TxData register for port B - A10017h = 00 RxData register for port B - A10019h = 00 S-Ctrl register for port B - - A1001Bh = FF TxData register for port C - A1001Dh = 00 RxData register for port C - A1001Fh = 00 S-Ctrl register for port C - - - - - Bit 7 - (Not connected) - Bit 6 - TH - Bit 5 - TL - Bit 4 - TR - Bit 3 - RIGHT - Bit 2 - LEFT - Bit 1 - DOWN - Bit 0 - UP - - -*/ - -INPUT_PORTS_START( md_common ) - PORT_START("PAD1") /* Joypad 1 (3 button + start) NOT READ DIRECTLY */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 B") // b - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 C") // c - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 A") // a - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME("P1 START") // start - - PORT_START("PAD2") /* Joypad 2 (3 button + start) NOT READ DIRECTLY */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 B") // b - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 C") // c - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 A") // a - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("P2 START") // start -INPUT_PORTS_END - - -INPUT_PORTS_START( megadriv ) - PORT_INCLUDE( md_common ) - - PORT_START("RESET") /* Buttons on Genesis Console */ - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Reset Button") PORT_IMPULSE(1) // reset, resets 68k (and..?) -INPUT_PORTS_END - -INPUT_PORTS_START( megadri6 ) - PORT_INCLUDE( megadriv ) - - PORT_START("EXTRA1") /* Extra buttons for Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1) PORT_NAME("P1 Z") // z - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) PORT_NAME("P1 Y") // y - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_NAME("P1 X") // x - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_PLAYER(1) PORT_NAME("P1 MODE") // mode - - PORT_START("EXTRA2") /* Extra buttons for Joypad 2 (6 button + start + mode) NOT READ DIRECTLY */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(2) PORT_NAME("P2 Z") // z - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) PORT_NAME("P2 Y") // y - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) PORT_NAME("P2 X") // x - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_PLAYER(2) PORT_NAME("P2 MODE") // mode -INPUT_PORTS_END - -void md_base_state::megadrive_reset_io() -{ - int i; - - m_megadrive_io_data_regs[0] = 0x7f; - m_megadrive_io_data_regs[1] = 0x7f; - m_megadrive_io_data_regs[2] = 0x7f; - m_megadrive_io_ctrl_regs[0] = 0x00; - m_megadrive_io_ctrl_regs[1] = 0x00; - m_megadrive_io_ctrl_regs[2] = 0x00; - m_megadrive_io_tx_regs[0] = 0xff; - m_megadrive_io_tx_regs[1] = 0xff; - m_megadrive_io_tx_regs[2] = 0xff; - - for (i=0; i<3; i++) - { - m_io_stage[i] = -1; - } -} - -/************* 6 buttons version **************************/ -uint8_t md_base_state::megadrive_io_read_data_port_6button(offs_t offset) -{ - int portnum = offset; - uint8_t retdata, helper = (m_megadrive_io_ctrl_regs[portnum] & 0x3f) | 0xc0; // bits 6 & 7 always come from m_megadrive_io_data_regs - - if (m_megadrive_io_data_regs[portnum] & 0x40) - { - if (m_io_stage[portnum] == 2) - { - /* here we read B, C & the additional buttons */ - retdata = (m_megadrive_io_data_regs[portnum] & helper) | - ((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0x30) | - ((m_io_pad_6b[portnum] ? m_io_pad_6b[portnum]->read() : 0) & 0x0f)) & ~helper); - } - else - { - /* here we read B, C & the directional buttons */ - retdata = (m_megadrive_io_data_regs[portnum] & helper) | - (((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0x3f) & ~helper); - } - } - else - { - if (m_io_stage[portnum] == 1) - { - /* here we read ((Start & A) >> 2) | 0x00 */ - retdata = (m_megadrive_io_data_regs[portnum] & helper) | - ((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0xc0) >> 2) & ~helper); - } - else if (m_io_stage[portnum]==2) - { - /* here we read ((Start & A) >> 2) | 0x0f */ - retdata = (m_megadrive_io_data_regs[portnum] & helper) | - (((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0xc0) >> 2) | 0x0f) & ~helper); - } - else - { - /* here we read ((Start & A) >> 2) | Up and Down */ - retdata = (m_megadrive_io_data_regs[portnum] & helper) | - (((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0xc0) >> 2) | - ((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0x03)) & ~helper); - } - } - -// osd_printf_debug("read io data port stage %d port %d %02x\n",m_io_stage[portnum],portnum,retdata); - - return retdata | (retdata << 8); -} - - -/************* 3 buttons version **************************/ -uint8_t md_base_state::megadrive_io_read_data_port_3button(offs_t offset) -{ - int portnum = offset; - uint8_t retdata, helper = (m_megadrive_io_ctrl_regs[portnum] & 0x7f) | 0x80; // bit 7 always comes from m_megadrive_io_data_regs - - if (m_megadrive_io_data_regs[portnum] & 0x40) - { - /* here we read B, C & the directional buttons */ - retdata = (m_megadrive_io_data_regs[portnum] & helper) | - ((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0x3f) | 0x40) & ~helper); - } - else - { - /* here we read ((Start & A) >> 2) | Up and Down */ - retdata = (m_megadrive_io_data_regs[portnum] & helper) | - (((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0xc0) >> 2) | - ((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0x03) | 0x40) & ~helper); - } - - return retdata; -} - -uint8_t md_base_state::megadrive_io_read_ctrl_port(int portnum) -{ - uint8_t retdata; - retdata = m_megadrive_io_ctrl_regs[portnum]; - //osd_printf_debug("read io ctrl port %d %02x\n",portnum,retdata); - - return retdata | (retdata << 8); -} - -uint8_t md_base_state::megadrive_io_read_tx_port(int portnum) -{ - uint8_t retdata; - retdata = m_megadrive_io_tx_regs[portnum]; - return retdata | (retdata << 8); -} - -uint8_t md_base_state::megadrive_io_read_rx_port(int portnum) -{ - return 0x00; -} - -uint8_t md_base_state::megadrive_io_read_sctrl_port(int portnum) -{ - return 0x00; -} - - -uint16_t md_base_state::megadriv_68k_io_read(offs_t offset) -{ - uint8_t retdata; - - retdata = 0; - /* Charles MacDonald ( http://cgfm2.emuviews.com/ ) - D7 : Console is 1= Export (USA, Europe, etc.) 0= Domestic (Japan) - D6 : Video type is 1= PAL, 0= NTSC - D5 : Sega CD unit is 1= not present, 0= connected. - D4 : Unused (always returns zero) - D3 : Bit 3 of version number - D2 : Bit 2 of version number - D1 : Bit 1 of version number - D0 : Bit 0 of version number - */ - - //return (machine().rand()&0x0f0f)|0xf0f0;//0x0000; - switch (offset) - { - case 0: - LOG("%06x read version register\n", m_maincpu->pc()); - // Version number contained in bits 3-0 - // TODO: non-TMSS BIOSes must return 0 here - retdata = m_version_hi_nibble | 0x01; - break; - - /* Joystick Port Registers */ - - case 0x1: - case 0x2: - case 0x3: - retdata = m_megadrive_io_read_data_port_ptr(offset-1); - break; - - case 0x4: - case 0x5: - case 0x6: - retdata = megadrive_io_read_ctrl_port(offset-4); - break; - - /* Serial I/O Registers */ - - case 0x7: retdata = megadrive_io_read_tx_port(0); break; - case 0x8: retdata = megadrive_io_read_rx_port(0); break; - case 0x9: retdata = megadrive_io_read_sctrl_port(0); break; - - case 0xa: retdata = megadrive_io_read_tx_port(1); break; - case 0xb: retdata = megadrive_io_read_rx_port(1); break; - case 0xc: retdata = megadrive_io_read_sctrl_port(1); break; - - case 0xd: retdata = megadrive_io_read_tx_port(2); break; - case 0xe: retdata = megadrive_io_read_rx_port(2); break; - case 0xf: retdata = megadrive_io_read_sctrl_port(2); break; - - } - - return retdata | (retdata << 8); -} - - -void md_base_state::megadrive_io_write_data_port_3button(offs_t offset, uint16_t data) -{ - int portnum = offset; - m_megadrive_io_data_regs[portnum] = data; - //osd_printf_debug("Writing IO Data Register #%d data %04x\n",portnum,data); - -} - - -/****************************** 6 buttons version*****************************/ - -void md_base_state::megadrive_io_write_data_port_6button(offs_t offset, uint16_t data) -{ - int portnum = offset; - if (m_megadrive_io_ctrl_regs[portnum]&0x40) - { - if (((m_megadrive_io_data_regs[portnum]&0x40)==0x00) && ((data&0x40) == 0x40)) - { - m_io_stage[portnum]++; - m_io_timeout[portnum]->adjust(m_maincpu->cycles_to_attotime(8192), portnum); - } - - } - - m_megadrive_io_data_regs[portnum] = data; - //osd_printf_debug("Writing IO Data Register #%d data %04x\n",portnum,data); - -} - - -/*************************** 3 buttons version ****************************/ - -void md_base_state::megadrive_io_write_ctrl_port(int portnum, uint16_t data) -{ - m_megadrive_io_ctrl_regs[portnum] = data; -// osd_printf_debug("Setting IO Control Register #%d data %04x\n",portnum,data); -} - -void md_base_state::megadrive_io_write_tx_port(int portnum, uint16_t data) -{ - m_megadrive_io_tx_regs[portnum] = data; -} - -void md_base_state::megadrive_io_write_rx_port(int portnum, uint16_t data) -{ -} - -void md_base_state::megadrive_io_write_sctrl_port(int portnum, uint16_t data) -{ -} - - -void md_base_state::megadriv_68k_io_write(offs_t offset, uint16_t data, uint16_t mem_mask) -{ -// osd_printf_debug("IO Write #%02x data %04x mem_mask %04x\n",offset,data,mem_mask); - - - switch (offset) - { - case 0x0: - osd_printf_debug("Write to Version Register?!\n"); - break; - - /* Joypad Port Registers */ - - case 0x1: - case 0x2: - case 0x3: - m_megadrive_io_write_data_port_ptr(offset-1,data); - break; - - case 0x4: - case 0x5: - case 0x6: - megadrive_io_write_ctrl_port(offset-4,data); - break; - - /* Serial I/O Registers */ - - case 0x7: megadrive_io_write_tx_port(0,data); break; - case 0x8: megadrive_io_write_rx_port(0,data); break; - case 0x9: megadrive_io_write_sctrl_port(0,data); break; - - case 0xa: megadrive_io_write_tx_port(1,data); break; - case 0xb: megadrive_io_write_rx_port(1,data); break; - case 0xc: megadrive_io_write_sctrl_port(1,data); break; - - case 0xd: megadrive_io_write_tx_port(2,data); break; - case 0xe: megadrive_io_write_rx_port(2,data); break; - case 0xf: megadrive_io_write_sctrl_port(2,data); break; - } -} - - - -void md_base_state::megadriv_map(address_map &map) -{ - map(0x000000, 0x3fffff).rom(); - /* (0x000000 - 0x3fffff) == GAME ROM (4Meg Max, Some games have special banking too) */ - - map(0xa00000, 0xa01fff).rw(FUNC(md_base_state::megadriv_68k_read_z80_ram), FUNC(md_base_state::megadriv_68k_write_z80_ram)); - map(0xa02000, 0xa03fff).w(FUNC(md_base_state::megadriv_68k_write_z80_ram)); - map(0xa04000, 0xa04003).rw(FUNC(md_base_state::megadriv_68k_YM2612_read), FUNC(md_base_state::megadriv_68k_YM2612_write)); - - map(0xa06000, 0xa06001).w(FUNC(md_base_state::megadriv_68k_z80_bank_write)); - - map(0xa10000, 0xa1001f).rw(FUNC(md_base_state::megadriv_68k_io_read), FUNC(md_base_state::megadriv_68k_io_write)); - - map(0xa11100, 0xa11101).rw(FUNC(md_base_state::megadriv_68k_check_z80_bus), FUNC(md_base_state::megadriv_68k_req_z80_bus)); - map(0xa11200, 0xa11201).w(FUNC(md_base_state::megadriv_68k_req_z80_reset)); - - map(0xc00000, 0xc0001f).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); - map(0xd00000, 0xd0001f).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); // the earth defend - map(0xe00000, 0xe0ffff).ram().mirror(0x1f0000).share("megadrive_ram"); -// map(0xff0000, 0xffffff).readonly(); - /* 0xe00000 - 0xffffff) == MAIN RAM (64kb, Mirrored, most games use ff0000 - ffffff) */ -} - - -void md_base_state::dcat16_megadriv_map(address_map &map) -{ - megadriv_map(map); - map(0x000000, 0x7fffff).rom(); -} - - -/* z80 sounds/sub CPU */ - - -uint16_t md_base_state::megadriv_68k_read_z80_ram(offs_t offset, uint16_t mem_mask) -{ - //osd_printf_debug("read z80 ram %04x\n",mem_mask); - - if ((m_genz80.z80_has_bus == 0) && (m_genz80.z80_is_reset == 0)) - { - return m_genz80.z80_prgram[(offset<<1)^1] | (m_genz80.z80_prgram[(offset<<1)]<<8); - } - else - { - LOG("%06x: 68000 attempting to access Z80 (read) address space without bus\n", m_maincpu->pc()); - return machine().rand(); - } -} - -void md_base_state::megadriv_68k_write_z80_ram(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - if ((m_genz80.z80_has_bus == 0) && (m_genz80.z80_is_reset == 0)) - { - if (!ACCESSING_BITS_0_7) // byte (MSB) access - { - m_genz80.z80_prgram[(offset<<1)] = (data & 0xff00) >> 8; - } - else if (!ACCESSING_BITS_8_15) - { - m_genz80.z80_prgram[(offset<<1)^1] = (data & 0x00ff); - } - else - { - // for WORD access only the MSB is used, LSB is ignored - m_genz80.z80_prgram[(offset<<1)] = (data & 0xff00) >> 8; - } - } - else - { - LOG("%06x: 68000 attempting to access Z80 (write) address space without bus\n", m_maincpu->pc()); - } -} - -/* - * ddragon, beast, superoff, and timekill have buggy sound programs. - * They request the bus, then have a loop which waits for the bus - * to be unavailable, checking for a 0 value due to bad coding. The real hardware - * appears to return bits of the next instruction in the unused bits, thus meaning - * the value is never zero. Time Killers is the most fussy, and doesn't like the - * read_next_instruction function from system16, so I just return a random value - * in the unused bits - */ -uint16_t md_base_state::megadriv_68k_check_z80_bus(offs_t offset, uint16_t mem_mask) -{ - uint16_t retvalue; - - - uint16_t nextvalue = machine().rand(); //read_next_instruction(space)&0xff00; - - - /* Check if the 68k has the z80 bus */ - if (!ACCESSING_BITS_0_7) // byte (MSB) access - { - if (m_genz80.z80_has_bus || m_genz80.z80_is_reset) retvalue = nextvalue | 0x0100; - else retvalue = (nextvalue & 0xfeff); - - LOGAUDIOBUS("%06x: 68000 check z80 Bus (byte MSB access) returning %04x mask %04x\n", m_maincpu->pc(),retvalue, mem_mask); - return retvalue; - - } - else if (!ACCESSING_BITS_8_15) // is this valid? - { - LOGAUDIOBUS("%06x: 68000 check z80 Bus (byte LSB access) %04x\n", m_maincpu->pc(), mem_mask); - if (m_genz80.z80_has_bus || m_genz80.z80_is_reset) retvalue = 0x0001; - else retvalue = 0x0000; - - return retvalue; - } - else - { - LOGAUDIOBUS("%06x: 68000 check z80 Bus (word access) %04x\n", m_maincpu->pc(),mem_mask); - if (m_genz80.z80_has_bus || m_genz80.z80_is_reset) retvalue = nextvalue | 0x0100; - else retvalue = (nextvalue & 0xfeff); - - // osd_printf_debug("%06x: 68000 check z80 Bus (word access) %04x %04x\n", m_maincpu->pc(),mem_mask, retvalue); - return retvalue; - } -} - - -TIMER_CALLBACK_MEMBER(md_base_state::megadriv_z80_run_state) -{ - /* Is the z80 RESET line pulled? */ - // TODO: Z80 /RESET - if (m_genz80.z80_is_reset) - { - m_z80snd->reset(); - m_z80snd->suspend(SUSPEND_REASON_HALT, 1); - m_ymsnd->reset(); - } - else - { - /* Check if z80 has the bus */ - // TODO: Z80 /BUSREQ - if (m_genz80.z80_has_bus) - m_z80snd->resume(SUSPEND_REASON_HALT); - else - m_z80snd->suspend(SUSPEND_REASON_HALT, 1); - } -} - - -void md_base_state::megadriv_68k_req_z80_bus(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - /* Request the Z80 bus, allows 68k to read/write Z80 address space */ - if (!ACCESSING_BITS_0_7) // byte access - { - if (data & 0x0100) - { - LOGAUDIOBUS("%06x: 68000 request z80 Bus (byte MSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_has_bus = 0; - } - else - { - LOGAUDIOBUS("%06x: 68000 return z80 Bus (byte MSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_has_bus = 1; - } - } - else if (!ACCESSING_BITS_8_15) // is this valid? - { - if (data & 0x0001) - { - LOGAUDIOBUS("%06x: 68000 request z80 Bus (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_has_bus = 0; - } - else - { - LOGAUDIOBUS("%06x: 68000 return z80 Bus (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_has_bus = 1; - } - } - else // word access - { - if (data & 0x0100) - { - LOGAUDIOBUS("%06x: 68000 request z80 Bus (word access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_has_bus = 0; - } - else - { - LOGAUDIOBUS("%06x: 68000 return z80 Bus (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_has_bus = 1; - } - } - - /* If the z80 is running, sync the z80 execution state */ - if (!m_genz80.z80_is_reset) - m_genz80.z80_run_timer->adjust(attotime::zero); -} - -void md_base_state::megadriv_68k_req_z80_reset(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - if (!ACCESSING_BITS_0_7) // byte access - { - if (data & 0x0100) - { - LOGAUDIORESET("%06x: 68000 clear z80 reset (byte MSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_is_reset = 0; - } - else - { - LOGAUDIORESET("%06x: 68000 start z80 reset (byte MSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_is_reset = 1; - } - } - else if (!ACCESSING_BITS_8_15) // is this valid? - { - if (data & 0x0001) - { - LOGAUDIORESET("%06x: 68000 clear z80 reset (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_is_reset = 0; - } - else - { - LOGAUDIORESET("%06x: 68000 start z80 reset (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_is_reset = 1; - } - } - else // word access - { - if (data & 0x0100) - { - LOGAUDIORESET("%06x: 68000 clear z80 reset (word access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_is_reset = 0; - } - else - { - LOGAUDIORESET("%06x: 68000 start z80 reset (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); - m_genz80.z80_is_reset = 1; - } - } - m_genz80.z80_run_timer->adjust(attotime::zero); -} - - -// just directly access the 68k space, this makes it easier to deal with -// add-on hardware which changes the cpu mapping like the 32x and SegaCD. -// - we might need to add exceptions for example, z80 reading / writing the -// z80 area of the 68k if games misbehave -uint8_t md_base_state::z80_read_68k_banked_data(offs_t offset) -{ - address_space &space68k = m_maincpu->space(); - uint8_t ret = space68k.read_byte(m_genz80.z80_bank_addr+offset); - return ret; -} - -void md_base_state::z80_write_68k_banked_data(offs_t offset, uint8_t data) -{ - address_space &space68k = m_maincpu->space(); - space68k.write_byte(m_genz80.z80_bank_addr+offset,data); -} - -void md_base_state::megadriv_z80_vdp_write(offs_t offset, uint8_t data) -{ - switch (offset) - { - case 0x11: - case 0x13: - case 0x15: - case 0x17: - // accessed by either segapsg_device or sn76496_device - m_vdp->vdp_w(offset >> 1, data, 0x00ff); - break; - - default: - osd_printf_debug("unhandled z80 vdp write %02x %02x\n",offset,data); - } -} - - -uint8_t md_base_state::megadriv_z80_vdp_read(offs_t offset) -{ - u8 ret = 0; - u8 shift = ((~offset & 1) << 3); - switch (offset & ~1) - { - case 0x04: // ctrl_port_r - case 0x06: - case 0x08: // H/V counter - case 0x0a: - case 0x0c: - case 0x0e: - ret = m_vdp->vdp_r(offset >> 1, 0xff << shift) >> shift; - break; - - default: - if (!machine().side_effects_disabled()) - osd_printf_debug("unhandled z80 vdp read %02x\n",offset); - ret = machine().rand(); - break; - } - return ret; -} - -uint8_t md_base_state::megadriv_z80_unmapped_read() -{ - return 0xff; -} - -void md_base_state::megadriv_z80_map(address_map &map) -{ - map(0x0000, 0x1fff).bankrw("bank1").mirror(0x2000); // RAM can be accessed by the 68k - map(0x4000, 0x4003).rw(m_ymsnd, FUNC(ym_generic_device::read), FUNC(ym_generic_device::write)); - - map(0x6000, 0x6000).w(FUNC(md_base_state::megadriv_z80_z80_bank_w)); - map(0x6001, 0x6001).w(FUNC(md_base_state::megadriv_z80_z80_bank_w)); // wacky races uses this address - - map(0x6100, 0x7eff).r(FUNC(md_base_state::megadriv_z80_unmapped_read)); - - map(0x7f00, 0x7fff).rw(FUNC(md_base_state::megadriv_z80_vdp_read), FUNC(md_base_state::megadriv_z80_vdp_write)); - - map(0x8000, 0xffff).rw(FUNC(md_base_state::z80_read_68k_banked_data), FUNC(md_base_state::z80_write_68k_banked_data)); // The Z80 can read the 68k address space this way -} - -void md_base_state::megadriv_z80_io_map(address_map &map) -{ - map.global_mask(0xff); - map(0x00, 0xff).noprw(); -} - -uint32_t md_base_state::screen_update_megadriv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ - /* Copy our screen buffer here */ - for (int y = cliprect.min_y; y <= cliprect.max_y; y++) - { - uint32_t *const desty = &bitmap.pix(y, 0); - uint32_t const *srcy; - - if (!m_vdp->m_use_alt_timing) - srcy = &m_vdp->m_render_bitmap->pix(y, 0); - else - srcy = m_vdp->m_render_line.get(); - - for (int x = cliprect.min_x; x <= cliprect.max_x; x++) - { - desty[x] = srcy[x]; - } - } - - return 0; -} - - - -/*****************************************************************************************/ - -void md_base_state::video_start() -{ - // nothing? -} - -void md_base_state::machine_start() -{ - m_io_pad_3b[0] = ioport("PAD1"); - m_io_pad_3b[1] = ioport("PAD2"); - m_io_pad_3b[2] = ioport("IN0"); - m_io_pad_3b[3] = ioport("UNK"); - - save_item(NAME(m_io_stage)); - save_item(NAME(m_megadrive_io_data_regs)); - save_item(NAME(m_megadrive_io_ctrl_regs)); - save_item(NAME(m_megadrive_io_tx_regs)); - - if (m_z80snd) - m_genz80.z80_run_timer = timer_alloc(FUNC(md_base_state::megadriv_z80_run_state), this); -} - -void md_base_state::machine_reset() -{ - /* default state of z80 = reset, with bus */ - osd_printf_debug("Resetting Megadrive / Genesis\n"); - - if (m_z80snd) - { - m_genz80.z80_is_reset = 1; - m_genz80.z80_has_bus = 1; - m_genz80.z80_bank_addr = 0; - m_vdp->set_scanline_counter(-1); - m_genz80.z80_run_timer->adjust(attotime::zero); - } - - megadrive_reset_io(); - - if (!m_vdp->m_use_alt_timing) - { - m_vdp->m_megadriv_scanline_timer = m_scan_timer; - m_vdp->m_megadriv_scanline_timer->adjust(attotime::zero); - } - - if (m_megadrive_ram) - memset(m_megadrive_ram, 0x00, 0x10000); - - m_vdp->device_reset_old(); -} - -void md_base_state::megadriv_stop_scanline_timer() -{ - if (!m_vdp->m_use_alt_timing) - m_vdp->m_megadriv_scanline_timer->reset(); -} - - - -// this comes from the VDP on lines 240 (on) 241 (off) and is connected to the z80 irq 0 -WRITE_LINE_MEMBER(md_base_state::vdp_sndirqline_callback_genesis_z80) -{ - if (m_z80snd) - { - if (state == ASSERT_LINE) - { - if ((m_genz80.z80_has_bus == 1) && (m_genz80.z80_is_reset == 0)) - m_z80snd->set_input_line(0, HOLD_LINE); - } - else if (state == CLEAR_LINE) - { - m_z80snd->set_input_line(0, CLEAR_LINE); - } - } -} - -// this comes from the vdp, and is connected to 68k irq level 6 (main vbl interrupt) -WRITE_LINE_MEMBER(md_base_state::vdp_lv6irqline_callback_genesis_68k) -{ - if (state == ASSERT_LINE) - m_maincpu->set_input_line(6, HOLD_LINE); - else - m_maincpu->set_input_line(6, CLEAR_LINE); -} - -// this comes from the vdp, and is connected to 68k irq level 4 (raster interrupt) -WRITE_LINE_MEMBER(md_base_state::vdp_lv4irqline_callback_genesis_68k) -{ - if (state == ASSERT_LINE) - m_maincpu->set_input_line(4, HOLD_LINE); - else - m_maincpu->set_input_line(4, CLEAR_LINE); -} - -/* Callback when the 68k takes an IRQ */ -IRQ_CALLBACK_MEMBER(md_base_state::genesis_int_callback) -{ - if (irqline==4) - { - m_vdp->vdp_clear_irq4_pending(); - } - - if (irqline==6) - { - m_vdp->vdp_clear_irq6_pending(); - } - - return (0x60+irqline*4)/4; // vector address -} - -void md_base_state::megadriv_timers(machine_config &config) -{ - TIMER(config, m_scan_timer).configure_generic("gen_vdp", FUNC(sega315_5313_device::megadriv_scanline_timer_callback)); -} - - -void md_base_state::md_ntsc(machine_config &config) -{ - M68000(config, m_maincpu, MASTER_CLOCK_NTSC / 7); /* 7.67 MHz */ - m_maincpu->set_addrmap(AS_PROGRAM, &md_base_state::megadriv_map); - m_maincpu->set_irq_acknowledge_callback(FUNC(md_base_state::genesis_int_callback)); - - /* IRQs are handled via the timers */ - - Z80(config, m_z80snd, MASTER_CLOCK_NTSC / 15); /* 3.58 MHz */ - m_z80snd->set_addrmap(AS_PROGRAM, &md_base_state::megadriv_z80_map); - m_z80snd->set_addrmap(AS_IO, &md_base_state::megadriv_z80_io_map); - /* IRQ handled via the timers */ - - megadriv_timers(config); - - SEGA315_5313(config, m_vdp, MASTER_CLOCK_NTSC, m_maincpu); - m_vdp->set_is_pal(false); - m_vdp->snd_irq().set(FUNC(md_base_state::vdp_sndirqline_callback_genesis_z80)); - m_vdp->lv6_irq().set(FUNC(md_base_state::vdp_lv6irqline_callback_genesis_68k)); - m_vdp->lv4_irq().set(FUNC(md_base_state::vdp_lv4irqline_callback_genesis_68k)); - m_vdp->set_screen("megadriv"); - m_vdp->add_route(ALL_OUTPUTS, "lspeaker", 0.50); - m_vdp->add_route(ALL_OUTPUTS, "rspeaker", 0.50); - - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(double(MASTER_CLOCK_NTSC) / 10.0 / 262.0 / 342.0); // same as SMS? -// m_screen->set_refresh_hz(double(MASTER_CLOCK_NTSC) / 8.0 / 262.0 / 427.0); // or 427 Htotal? - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); // Vblank handled manually. - m_screen->set_size(64*8, 620); - m_screen->set_visarea(0, 32*8-1, 0, 28*8-1); - m_screen->set_screen_update(FUNC(md_base_state::screen_update_megadriv)); /* Copies a bitmap */ - m_screen->screen_vblank().set(FUNC(md_base_state::screen_vblank_megadriv)); /* Used to Sync the timing */ - - /* sound hardware */ - SPEAKER(config, "lspeaker").front_left(); - SPEAKER(config, "rspeaker").front_right(); - - YM2612(config, m_ymsnd, MASTER_CLOCK_NTSC/7); /* 7.67 MHz */ - m_ymsnd->add_route(0, "lspeaker", 0.50); - m_ymsnd->add_route(1, "rspeaker", 0.50); -} - -void md_base_state::md2_ntsc(machine_config &config) -{ - md_ntsc(config); - - // Internalized YM3438 in VDP ASIC - YM3438(config.replace(), m_ymsnd, MASTER_CLOCK_NTSC/7); /* 7.67 MHz */ - m_ymsnd->add_route(0, "lspeaker", 0.50); - m_ymsnd->add_route(1, "rspeaker", 0.50); -} - -void md_cons_state::dcat16_megadriv_base(machine_config &config) -{ - md_ntsc(config); - - m_maincpu->set_addrmap(AS_PROGRAM, &md_base_state::dcat16_megadriv_map); -} - -/************ PAL hardware has a different master clock *************/ - -void md_base_state::md_pal(machine_config &config) -{ - M68000(config, m_maincpu, MASTER_CLOCK_PAL / 7); /* 7.67 MHz */ - m_maincpu->set_addrmap(AS_PROGRAM, &md_base_state::megadriv_map); - m_maincpu->set_irq_acknowledge_callback(FUNC(md_base_state::genesis_int_callback)); - /* IRQs are handled via the timers */ - - Z80(config, m_z80snd, MASTER_CLOCK_PAL / 15); /* 3.58 MHz */ - m_z80snd->set_addrmap(AS_PROGRAM, &md_base_state::megadriv_z80_map); - m_z80snd->set_addrmap(AS_IO, &md_base_state::megadriv_z80_io_map); - /* IRQ handled via the timers */ - - megadriv_timers(config); - - SEGA315_5313(config, m_vdp, MASTER_CLOCK_PAL, m_maincpu); - m_vdp->set_is_pal(true); - m_vdp->snd_irq().set(FUNC(md_base_state::vdp_sndirqline_callback_genesis_z80)); - m_vdp->lv6_irq().set(FUNC(md_base_state::vdp_lv6irqline_callback_genesis_68k)); - m_vdp->lv4_irq().set(FUNC(md_base_state::vdp_lv4irqline_callback_genesis_68k)); - m_vdp->set_screen("megadriv"); - m_vdp->add_route(ALL_OUTPUTS, "lspeaker", 0.50); - m_vdp->add_route(ALL_OUTPUTS, "rspeaker", 0.50); - - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(double(MASTER_CLOCK_PAL) / 10.0 / 313.0 / 342.0); // same as SMS? -// m_screen->set_refresh_hz(double(MASTER_CLOCK_PAL) / 8.0 / 313.0 / 423.0); // or 423 Htotal? - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); // Vblank handled manually. - m_screen->set_size(64*8, 620); - m_screen->set_visarea(0, 32*8-1, 0, 28*8-1); - m_screen->set_screen_update(FUNC(md_base_state::screen_update_megadriv)); /* Copies a bitmap */ - m_screen->screen_vblank().set(FUNC(md_base_state::screen_vblank_megadriv)); /* Used to Sync the timing */ - - /* sound hardware */ - SPEAKER(config, "lspeaker").front_left(); - SPEAKER(config, "rspeaker").front_right(); - - YM2612(config, m_ymsnd, MASTER_CLOCK_PAL / 7); /* 7.67 MHz */ - m_ymsnd->add_route(0, "lspeaker", 0.50); - m_ymsnd->add_route(1, "rspeaker", 0.50); -} - -void md_base_state::md2_pal(machine_config &config) -{ - md_pal(config); - - // Internalized YM3438 in VDP ASIC - YM3438(config.replace(), m_ymsnd, MASTER_CLOCK_PAL / 7); /* 7.67 MHz */ - m_ymsnd->add_route(0, "lspeaker", 0.50); - m_ymsnd->add_route(1, "rspeaker", 0.50); -} - - -void md_base_state::megadriv_tas_callback(offs_t offset, uint8_t data) -{ - // writeback not allowed -} - -void md_base_state::megadriv_init_common() -{ - /* Look to see if this system has the standard Sound Z80 */ - if (m_z80snd) - { - m_genz80.z80_prgram = std::make_unique(0x2000); - membank("bank1")->set_base(m_genz80.z80_prgram.get()); - save_item(NAME(m_genz80.z80_is_reset)); - save_item(NAME(m_genz80.z80_has_bus)); - save_item(NAME(m_genz80.z80_bank_addr)); - save_pointer(NAME(m_genz80.z80_prgram), 0x2000); - } - - m_maincpu->set_tas_write_callback(*this, FUNC(md_base_state::megadriv_tas_callback)); - - m_megadrive_io_read_data_port_ptr = read8sm_delegate(*this, FUNC(md_base_state::megadrive_io_read_data_port_3button)); - m_megadrive_io_write_data_port_ptr = write16sm_delegate(*this, FUNC(md_base_state::megadrive_io_write_data_port_3button)); -} - -void md_base_state::init_megadriv() -{ - megadriv_init_common(); - - // todo: move this to the device interface? - m_vdp->set_use_cram(1); - m_vdp->set_vdp_pal(false); - m_vdp->set_framerate(60); - m_vdp->set_total_scanlines(262); - - m_version_hi_nibble = 0xa0; // Export NTSC no-SCD -} - -void md_base_state::init_megadrij() -{ - megadriv_init_common(); - - // todo: move this to the device interface? - m_vdp->set_use_cram(1); - m_vdp->set_vdp_pal(false); - m_vdp->set_framerate(60); - m_vdp->set_total_scanlines(262); - - m_version_hi_nibble = 0x20; // JPN NTSC no-SCD -} - -void md_base_state::init_megadrie() -{ - megadriv_init_common(); - - // todo: move this to the device interface? - m_vdp->set_use_cram(1); - m_vdp->set_vdp_pal(true); - m_vdp->set_framerate(50); - m_vdp->set_total_scanlines(313); - - m_version_hi_nibble = 0xe0; // Export PAL no-SCD -} - -WRITE_LINE_MEMBER(md_base_state::screen_vblank_megadriv) -{ - if (m_io_reset.read_safe(0) & 0x01) - m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); - - // rising edge - if (state) - { - if (!m_vdp->m_use_alt_timing) - { - m_vdp->vdp_handle_eof(); - m_vdp->m_megadriv_scanline_timer->adjust(attotime::zero); - } - } -} diff --git a/src/mame/sega/megaplay.cpp b/src/mame/sega/megaplay.cpp index 5a843cc2745..6a435523093 100644 --- a/src/mame/sega/megaplay.cpp +++ b/src/mame/sega/megaplay.cpp @@ -34,7 +34,7 @@ this reason. #include "cpu/z80/z80.h" #include "machine/cxd1095.h" -#include "includes/megadriv.h" +#include "megadriv.h" #define MASTER_CLOCK 53693100 diff --git a/src/mame/sega/megatech.cpp b/src/mame/sega/megatech.cpp index 623a65b47bc..8590c6dd289 100644 --- a/src/mame/sega/megatech.cpp +++ b/src/mame/sega/megatech.cpp @@ -76,12 +76,14 @@ Sonic Hedgehog 2 171-6215A 837-6963-62 610-0239-62 MPR */ #include "emu.h" +#include "megadriv.h" + +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" #include "cpu/z80/z80.h" #include "machine/cxd1095.h" -#include "includes/megadriv.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" +#include "softlist_dev.h" #include "layout/generic.h" diff --git a/src/mame/sega/model1.cpp b/src/mame/sega/model1.cpp index cb233c62586..7bae7338ee2 100644 --- a/src/mame/sega/model1.cpp +++ b/src/mame/sega/model1.cpp @@ -591,12 +591,12 @@ Notes: */ #include "emu.h" -#include "includes/model1.h" +#include "model1.h" #include "cpu/i386/i386.h" #include "machine/clock.h" -#include "machine/model1io.h" -#include "machine/model1io2.h" +#include "model1io.h" +#include "model1io2.h" #include "machine/nvram.h" #include "speaker.h" diff --git a/src/mame/sega/model1.h b/src/mame/sega/model1.h index 25435dca822..1d45a01b2c1 100644 --- a/src/mame/sega/model1.h +++ b/src/mame/sega/model1.h @@ -5,17 +5,18 @@ #pragma once -#include "audio/dsbz80.h" -#include "audio/segam1audio.h" +#include "dsbz80.h" +#include "m1comm.h" +#include "segaic24.h" + +#include "segam1audio.h" #include "cpu/mb86233/mb86233.h" #include "cpu/v60/v60.h" #include "machine/i8251.h" #include "machine/gen_fifo.h" #include "machine/mb8421.h" -#include "machine/m1comm.h" #include "machine/timer.h" -#include "video/segaic24.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/sega/model1_m.cpp b/src/mame/sega/model1_m.cpp index f0fb5ca2c12..b551f6bb523 100644 --- a/src/mame/sega/model1_m.cpp +++ b/src/mame/sega/model1_m.cpp @@ -8,7 +8,7 @@ #include "debugger.h" #include "cpu/mb86233/mb86233.h" #include "cpu/v60/v60.h" -#include "includes/model1.h" +#include "model1.h" void model1_state::machine_start() { diff --git a/src/mame/sega/model1_v.cpp b/src/mame/sega/model1_v.cpp index 783c796551b..da1eb83c821 100644 --- a/src/mame/sega/model1_v.cpp +++ b/src/mame/sega/model1_v.cpp @@ -5,7 +5,7 @@ #include "emu.h" #include "cpu/mb86233/mb86233.h" -#include "includes/model1.h" +#include "model1.h" #define LOG_TGP_VIDEO 0 diff --git a/src/mame/sega/model1io.cpp b/src/mame/sega/model1io.cpp index 5bc8aee9e70..731f31b0df9 100644 --- a/src/mame/sega/model1io.cpp +++ b/src/mame/sega/model1io.cpp @@ -60,7 +60,7 @@ #include "model1io.h" #include "cpu/z80/z80.h" #include "machine/msm6253.h" -#include "machine/315_5338a.h" +#include "315_5338a.h" //************************************************************************** diff --git a/src/mame/sega/model1io2.cpp b/src/mame/sega/model1io2.cpp index 9ff771dbcc2..334c27c5f79 100644 --- a/src/mame/sega/model1io2.cpp +++ b/src/mame/sega/model1io2.cpp @@ -50,7 +50,7 @@ #include "model1io2.h" #include "cpu/z80/tmpz84c015.h" #include "machine/msm6253.h" -#include "machine/315_5338a.h" +#include "315_5338a.h" #include "bus/rs232/rs232.h" #include "screen.h" diff --git a/src/mame/sega/model2.cpp b/src/mame/sega/model2.cpp index 665ea0d96a2..8e9e0ae14d5 100644 --- a/src/mame/sega/model2.cpp +++ b/src/mame/sega/model2.cpp @@ -85,7 +85,7 @@ */ #include "emu.h" -#include "includes/model2.h" +#include "model2.h" #include "cpu/i960/i960.h" #include "cpu/m68000/m68000.h" @@ -96,12 +96,12 @@ #include "machine/mb8421.h" #include "machine/msm6253.h" #include "machine/nvram.h" -#include "machine/315_5296.h" -#include "machine/315_5649.h" -#include "machine/model1io.h" -#include "machine/model1io2.h" +#include "315_5296.h" +#include "315_5649.h" +#include "model1io.h" +#include "model1io2.h" #include "sound/ymopn.h" -#include "video/segaic24.h" +#include "segaic24.h" #include "speaker.h" #include "model1io2.lh" diff --git a/src/mame/sega/model2.h b/src/mame/sega/model2.h index 43a9a3b396f..eb038822aa3 100644 --- a/src/mame/sega/model2.h +++ b/src/mame/sega/model2.h @@ -1,28 +1,31 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont, Olivier Galibert, ElSemi, Angelo Salese -#ifndef MAME_INCLUDES_MODEL2_H -#define MAME_INCLUDES_MODEL2_H +#ifndef MAME_SEGA_MODEL2_H +#define MAME_SEGA_MODEL2_H #pragma once -#include "audio/dsbz80.h" -#include "audio/segam1audio.h" +#include "315-5881_crypt.h" +#include "315-5838_317-0229_comp.h" +#include "dsbz80.h" +#include "m2comm.h" +#include "segabill.h" +#include "segaic24.h" + +#include "segam1audio.h" + #include "cpu/i960/i960.h" #include "cpu/mb86233/mb86233.h" #include "cpu/sharc/sharc.h" #include "cpu/mb86235/mb86235.h" -#include "machine/315-5881_crypt.h" -#include "machine/315-5838_317-0229_comp.h" #include "machine/bankdev.h" #include "machine/eepromser.h" #include "machine/gen_fifo.h" #include "machine/i8251.h" -#include "machine/m2comm.h" -#include "machine/segabill.h" #include "machine/timer.h" #include "sound/scsp.h" -#include "video/segaic24.h" #include "video/poly.h" + #include "emupal.h" #include "screen.h" @@ -663,56 +666,56 @@ public: /* checker = 0, textured = 0, transparent = 0 */ #define MODEL2_FUNC 0 #define MODEL2_FUNC_NAME model2_3d_render_0 - #include "video/model2rd.ipp" + #include "model2rd.ipp" #undef MODEL2_FUNC #undef MODEL2_FUNC_NAME /* checker = 0, textured = 0, translucent = 1 */ #define MODEL2_FUNC 1 #define MODEL2_FUNC_NAME model2_3d_render_1 - #include "video/model2rd.ipp" + #include "model2rd.ipp" #undef MODEL2_FUNC #undef MODEL2_FUNC_NAME /* checker = 0, textured = 1, translucent = 0 */ #define MODEL2_FUNC 2 #define MODEL2_FUNC_NAME model2_3d_render_2 - #include "video/model2rd.ipp" + #include "model2rd.ipp" #undef MODEL2_FUNC #undef MODEL2_FUNC_NAME /* checker = 0, textured = 1, translucent = 1 */ #define MODEL2_FUNC 3 #define MODEL2_FUNC_NAME model2_3d_render_3 - #include "video/model2rd.ipp" + #include "model2rd.ipp" #undef MODEL2_FUNC #undef MODEL2_FUNC_NAME /* checker = 1, textured = 0, translucent = 0 */ #define MODEL2_FUNC 4 #define MODEL2_FUNC_NAME model2_3d_render_4 - #include "video/model2rd.ipp" + #include "model2rd.ipp" #undef MODEL2_FUNC #undef MODEL2_FUNC_NAME /* checker = 1, textured = 0, translucent = 1 */ #define MODEL2_FUNC 5 #define MODEL2_FUNC_NAME model2_3d_render_5 - #include "video/model2rd.ipp" + #include "model2rd.ipp" #undef MODEL2_FUNC #undef MODEL2_FUNC_NAME /* checker = 1, textured = 1, translucent = 0 */ #define MODEL2_FUNC 6 #define MODEL2_FUNC_NAME model2_3d_render_6 - #include "video/model2rd.ipp" + #include "model2rd.ipp" #undef MODEL2_FUNC #undef MODEL2_FUNC_NAME /* checker = 1, textured = 1, translucent = 1 */ #define MODEL2_FUNC 7 #define MODEL2_FUNC_NAME model2_3d_render_7 - #include "video/model2rd.ipp" + #include "model2rd.ipp" #undef MODEL2_FUNC #undef MODEL2_FUNC_NAME diff --git a/src/mame/sega/model2_m.cpp b/src/mame/sega/model2_m.cpp index 642642bef66..f9ef81adbf3 100644 --- a/src/mame/sega/model2_m.cpp +++ b/src/mame/sega/model2_m.cpp @@ -7,7 +7,7 @@ *********************************************************************************************************************************/ #include "emu.h" -#include "includes/model2.h" +#include "model2.h" #include "debug/debugcon.h" #include "debug/debugcmd.h" diff --git a/src/mame/sega/model2_v.cpp b/src/mame/sega/model2_v.cpp index 16132a2f15d..fdffc686003 100644 --- a/src/mame/sega/model2_v.cpp +++ b/src/mame/sega/model2_v.cpp @@ -89,7 +89,7 @@ *********************************************************************************************************************************/ #include "emu.h" -#include "includes/model2.h" +#include "model2.h" #include diff --git a/src/mame/sega/model3.cpp b/src/mame/sega/model3.cpp index 0c3c17c89d2..e70967448d2 100644 --- a/src/mame/sega/model3.cpp +++ b/src/mame/sega/model3.cpp @@ -735,16 +735,16 @@ JP4/5/6/7 - Jumpers to configure ROMs */ #include "emu.h" -#include "includes/model3.h" +#include "model3.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/kl5c80a16.h" -#include "machine/315_5296.h" +#include "315_5296.h" #include "machine/clock.h" #include "machine/eepromser.h" #include "machine/53c810.h" #include "machine/nvram.h" -#include "machine/m3comm.h" +#include "m3comm.h" #include "speaker.h" #include "segabill.lh" diff --git a/src/mame/sega/model3.h b/src/mame/sega/model3.h index 389ff4f35cc..a90382eb4c8 100644 --- a/src/mame/sega/model3.h +++ b/src/mame/sega/model3.h @@ -9,13 +9,13 @@ #include "video/poly.h" #include "bus/scsi/scsi.h" #include "machine/53c810.h" -#include "audio/dsbz80.h" +#include "dsbz80.h" #include "machine/eepromser.h" #include "machine/i8251.h" #include "sound/scsp.h" -#include "machine/315_5649.h" -#include "machine/315-5881_crypt.h" -#include "machine/segabill.h" +#include "315_5649.h" +#include "315-5881_crypt.h" +#include "segabill.h" #include "machine/msm6242.h" #include "machine/timer.h" #include "emupal.h" diff --git a/src/mame/sega/model3_m.cpp b/src/mame/sega/model3_m.cpp index 50dc7fc2eb6..f8a60d75751 100644 --- a/src/mame/sega/model3_m.cpp +++ b/src/mame/sega/model3_m.cpp @@ -7,7 +7,7 @@ */ #include "emu.h" -#include "includes/model3.h" +#include "model3.h" /******************************************************************/ diff --git a/src/mame/sega/model3_v.cpp b/src/mame/sega/model3_v.cpp index 980a682721c..df181d55a23 100644 --- a/src/mame/sega/model3_v.cpp +++ b/src/mame/sega/model3_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:R. Belmont, Ville Linde #include "emu.h" #include "video/rgbutil.h" -#include "includes/model3.h" +#include "model3.h" /* TODO: diff --git a/src/mame/sega/naomi.cpp b/src/mame/sega/naomi.cpp index 25bd4b248f4..2f3f0b5137a 100644 --- a/src/mame/sega/naomi.cpp +++ b/src/mame/sega/naomi.cpp @@ -1182,9 +1182,9 @@ key matrix is shown in below **************************************************************************************************/ #include "emu.h" -#include "includes/naomi.h" +#include "naomi.h" -#include "machine/gunsense.h" +#include "gunsense.h" //#include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/sega/naomi.h b/src/mame/sega/naomi.h index d479e1d496e..7c6e98f92fa 100644 --- a/src/mame/sega/naomi.h +++ b/src/mame/sega/naomi.h @@ -10,21 +10,21 @@ #include "machine/x76f100.h" #include "machine/eepromser.h" //#include "machine/intelfsh.h" -#include "machine/maple-dc.h" -#include "machine/dc-ctrl.h" -#include "machine/mie.h" -#include "machine/naomirom.h" -#include "machine/naomigd.h" -#include "machine/naomim1.h" -#include "machine/naomim2.h" -#include "machine/naomim4.h" +#include "maple-dc.h" +#include "dc-ctrl.h" +#include "mie.h" +#include "naomirom.h" +#include "naomigd.h" +#include "naomim1.h" +#include "naomim2.h" +#include "naomim4.h" #include "machine/nvram.h" #include "machine/aicartc.h" #include "machine/jvsdev.h" -#include "machine/jvs13551.h" -#include "machine/m3comm.h" -#include "machine/gunsense.h" -#include "machine/segashiobd.h" +#include "jvs13551.h" +#include "m3comm.h" +#include "gunsense.h" +#include "segashiobd.h" #include "sound/aica.h" #include "dc.h" diff --git a/src/mame/sega/naomibd.h b/src/mame/sega/naomibd.h index e60bbbcde29..9498d62c9bb 100644 --- a/src/mame/sega/naomibd.h +++ b/src/mame/sega/naomibd.h @@ -5,7 +5,7 @@ #pragma once -#include "machine/naomig1.h" +#include "naomig1.h" #include "machine/x76f100.h" class naomi_board : public naomi_g1_device diff --git a/src/mame/sega/naomigd.h b/src/mame/sega/naomigd.h index 0f12ba69601..1042359856f 100644 --- a/src/mame/sega/naomigd.h +++ b/src/mame/sega/naomigd.h @@ -5,13 +5,13 @@ #pragma once -#include "machine/naomibd.h" +#include "naomibd.h" #include "cpu/pic16c62x/pic16c62x.h" #include "machine/i2cmem.h" #include "machine/eepromser.h" -#include "machine/315-6154.h" +#include "315-6154.h" #include "machine/idectrl.h" -#include "machine/gdrom.h" +#include "gdrom.h" // For ide gdrom controller diff --git a/src/mame/sega/puckpkmn.cpp b/src/mame/sega/puckpkmn.cpp index d7c0cbffd8e..d4c89d4b607 100644 --- a/src/mame/sega/puckpkmn.cpp +++ b/src/mame/sega/puckpkmn.cpp @@ -50,8 +50,8 @@ Notes: #include "sound/sn76496.h" #include "sound/ymopn.h" -#include "includes/megadriv.h" -#include "includes/megadriv_acbl.h" +#include "megadriv.h" +#include "megadriv_acbl.h" /* Puckman Pockimon Input Ports */ static INPUT_PORTS_START( puckpkmn ) diff --git a/src/mame/sega/pulsar_a.cpp b/src/mame/sega/pulsar_a.cpp deleted file mode 100644 index 4e7a50e60c5..00000000000 --- a/src/mame/sega/pulsar_a.cpp +++ /dev/null @@ -1,181 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Zsolt Vasvari -/* - * Pulsar sound routines - * - * TODO: change heart rate based on bit 7 of Port 1 - * - */ - -#include "emu.h" -#include "includes/vicdual.h" - - -/* output port 0x01 definitions - sound effect drive outputs */ -#define OUT_PORT_1_CLANG 0x01 -#define OUT_PORT_1_KEY 0x02 -#define OUT_PORT_1_ALIENHIT 0x04 -#define OUT_PORT_1_PHIT 0x08 -#define OUT_PORT_1_ASHOOT 0x10 -#define OUT_PORT_1_PSHOOT 0x20 -#define OUT_PORT_1_BONUS 0x40 -#define OUT_PORT_1_HBEAT_RATE 0x80 /* currently not used */ - -/* output port 0x02 definitions - sound effect drive outputs */ -#define OUT_PORT_2_SIZZLE 0x01 -#define OUT_PORT_2_GATE 0x02 -#define OUT_PORT_2_BIRTH 0x04 -#define OUT_PORT_2_HBEAT 0x08 -#define OUT_PORT_2_MOVMAZE 0x10 - - -#define PLAY(samp,id,loop) samp->start( id, id, loop ) -#define STOP(samp,id) samp->stop( id ) - - -/* sample file names */ -static const char *const pulsar_sample_names[] = -{ - "*pulsar", - "clang", - "key", - "alienhit", - "phit", - "ashoot", - "pshoot", - "bonus", - "sizzle", - "gate", - "birth", - "hbeat", - "movmaze", - nullptr -}; - - -/* sample IDs - must match sample file name table above */ -enum -{ - SND_CLANG = 0, - SND_KEY, - SND_ALIENHIT, - SND_PHIT, - SND_ASHOOT, - SND_PSHOOT, - SND_BONUS, - SND_SIZZLE, - SND_GATE, - SND_BIRTH, - SND_HBEAT, - SND_MOVMAZE -}; - - -void vicdual_state::pulsar_audio_1_w(uint8_t data) -{ - int bitsChanged; - //int bitsGoneHigh; - int bitsGoneLow; - - bitsChanged = m_port1State ^ data; - //bitsGoneHigh = bitsChanged & data; - bitsGoneLow = bitsChanged & ~data; - - m_port1State = data; - - if ( bitsGoneLow & OUT_PORT_1_CLANG ) - { - PLAY( m_samples, SND_CLANG, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_1_KEY ) - { - PLAY( m_samples, SND_KEY, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_1_ALIENHIT ) - { - PLAY( m_samples, SND_ALIENHIT, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_1_PHIT ) - { - PLAY( m_samples, SND_PHIT, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_1_ASHOOT ) - { - PLAY( m_samples, SND_ASHOOT, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_1_PSHOOT ) - { - PLAY( m_samples, SND_PSHOOT, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_1_BONUS ) - { - PLAY( m_samples, SND_BONUS, 0 ); - } -} - - -void vicdual_state::pulsar_audio_2_w(uint8_t data) -{ - int bitsChanged; - int bitsGoneHigh; - int bitsGoneLow; - - bitsChanged = m_port2State ^ data; - bitsGoneHigh = bitsChanged & data; - bitsGoneLow = bitsChanged & ~data; - - m_port2State = data; - - if ( bitsGoneLow & OUT_PORT_2_SIZZLE ) - { - PLAY( m_samples, SND_SIZZLE, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_2_GATE ) - { - m_samples->start(SND_CLANG, SND_GATE); - } - if ( bitsGoneHigh & OUT_PORT_2_GATE ) - { - STOP( m_samples, SND_CLANG ); - } - - if ( bitsGoneLow & OUT_PORT_2_BIRTH ) - { - PLAY( m_samples, SND_BIRTH, 0 ); - } - - if ( bitsGoneLow & OUT_PORT_2_HBEAT ) - { - PLAY( m_samples, SND_HBEAT, 1 ); - } - if ( bitsGoneHigh & OUT_PORT_2_HBEAT ) - { - STOP( m_samples, SND_HBEAT ); - } - - if ( bitsGoneLow & OUT_PORT_2_MOVMAZE ) - { - PLAY( m_samples, SND_MOVMAZE, 1 ); - } - if ( bitsGoneHigh & OUT_PORT_2_MOVMAZE ) - { - STOP( m_samples, SND_MOVMAZE ); - } -} - - -void vicdual_state::pulsar_audio(machine_config &config) -{ - /* samples */ - SAMPLES(config, m_samples); - m_samples->set_channels(12); - m_samples->set_samples_names(pulsar_sample_names); - m_samples->add_route(ALL_OUTPUTS, "mono", 0.5); -} diff --git a/src/mame/sega/s32comm.cpp b/src/mame/sega/s32comm.cpp index f448d8fcfc2..667b6c50541 100644 --- a/src/mame/sega/s32comm.cpp +++ b/src/mame/sega/s32comm.cpp @@ -68,7 +68,7 @@ Sega System Multi32 Comm PCB 837-8792-91 #include "emu.h" #include "emuopts.h" -#include "machine/s32comm.h" +#include "s32comm.h" #define VERBOSE 0 #include "logmacro.h" diff --git a/src/mame/sega/saturn.cpp b/src/mame/sega/saturn.cpp index 16edfa1bdd6..20a9711813a 100644 --- a/src/mame/sega/saturn.cpp +++ b/src/mame/sega/saturn.cpp @@ -423,7 +423,7 @@ test1f diagnostic hacks: ****************************************************************************************************/ #include "emu.h" -#include "includes/saturn.h" +#include "saturn.h" #include "cpu/m68000/m68000.h" #include "cpu/scudsp/scudsp.h" @@ -431,7 +431,7 @@ test1f diagnostic hacks: #include "machine/nvram.h" #include "machine/smpc.h" #include "machine/stvcd.h" -#include "machine/saturn_cdb.h" +#include "saturn_cdb.h" #include "bus/saturn/bram.h" #include "bus/saturn/dram.h" diff --git a/src/mame/sega/saturn.h b/src/mame/sega/saturn.h index 14ec8f79dac..c3fd77a5f14 100644 --- a/src/mame/sega/saturn.h +++ b/src/mame/sega/saturn.h @@ -14,8 +14,8 @@ #include "debug/debugcon.h" #include "debug/debugcmd.h" -#include "machine/315-5881_crypt.h" -#include "machine/315-5838_317-0229_comp.h" +#include "315-5881_crypt.h" +#include "315-5838_317-0229_comp.h" #include "machine/sega_scu.h" #include "machine/smpc.h" #include "machine/timer.h" diff --git a/src/mame/sega/saturn_cdb.cpp b/src/mame/sega/saturn_cdb.cpp index e31761bdd2f..4163e36d78f 100644 --- a/src/mame/sega/saturn_cdb.cpp +++ b/src/mame/sega/saturn_cdb.cpp @@ -10,7 +10,7 @@ YGR019B - Hitachi YGR019B CD-Subsystem LSI. Earlier revision is YGR019A. Later r */ #include "emu.h" -#include "machine/saturn_cdb.h" +#include "saturn_cdb.h" DEFINE_DEVICE_TYPE(SATURN_CDB, saturn_cdb_device, "satcdb", "Saturn CDB (CD Block)") diff --git a/src/mame/sega/saturn_m.cpp b/src/mame/sega/saturn_m.cpp index 1de768692e6..0ec4e9f890e 100644 --- a/src/mame/sega/saturn_m.cpp +++ b/src/mame/sega/saturn_m.cpp @@ -44,7 +44,7 @@ **************************************************************************************/ #include "emu.h" -#include "includes/saturn.h" +#include "saturn.h" #include "cpu/sh/sh2.h" #include "cpu/scudsp/scudsp.h" diff --git a/src/mame/sega/saturn_v.cpp b/src/mame/sega/saturn_v.cpp index 9bb18ef972e..a04ea06c4ad 100644 --- a/src/mame/sega/saturn_v.cpp +++ b/src/mame/sega/saturn_v.cpp @@ -22,7 +22,7 @@ Framebuffer todo: #include "emu.h" -#include "includes/saturn.h" +#include "saturn.h" #define VDP1_LOG 0 diff --git a/src/mame/sega/segabill.h b/src/mame/sega/segabill.h index 03b6b3adb9b..4fdc839cfa0 100644 --- a/src/mame/sega/segabill.h +++ b/src/mame/sega/segabill.h @@ -11,7 +11,7 @@ #pragma once -#include "machine/315_5338a.h" +#include "315_5338a.h" //************************************************************************** diff --git a/src/mame/sega/segac2.cpp b/src/mame/sega/segac2.cpp index 19f81905793..93d9a6f0c40 100644 --- a/src/mame/sega/segac2.cpp +++ b/src/mame/sega/segac2.cpp @@ -76,11 +76,11 @@ ***********************************************************************************************/ #include "emu.h" -#include "includes/segaipt.h" +#include "segaipt.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" -#include "machine/315_5296.h" +#include "315_5296.h" #include "sound/sn76496.h" #include "sound/upd7759.h" #include "sound/ymopn.h" diff --git a/src/mame/sega/segacoin.cpp b/src/mame/sega/segacoin.cpp index 768c673e64b..9d4ad828c66 100644 --- a/src/mame/sega/segacoin.cpp +++ b/src/mame/sega/segacoin.cpp @@ -19,7 +19,7 @@ TODO: #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/315_5338a.h" +#include "315_5338a.h" #include "machine/pit8253.h" #include "sound/ymopn.h" #include "speaker.h" diff --git a/src/mame/sega/segae.cpp b/src/mame/sega/segae.cpp index b1cf8faf621..2c37bc0fd8c 100644 --- a/src/mame/sega/segae.cpp +++ b/src/mame/sega/segae.cpp @@ -294,14 +294,14 @@ GND 8A 8B GND #include "emu.h" -#include "includes/segaipt.h" +#include "segaipt.h" #include "cpu/z80/z80.h" #include "machine/adc0804.h" #include "machine/i8255.h" -#include "machine/mc8123.h" +#include "mc8123.h" #include "machine/rescap.h" -#include "machine/segacrp2_device.h" +#include "segacrp2_device.h" #include "machine/upd4701.h" #include "video/315_5124.h" #include "speaker.h" diff --git a/src/mame/sega/segag80.cpp b/src/mame/sega/segag80.cpp index cf790afc61c..8f78dd70f3a 100644 --- a/src/mame/sega/segag80.cpp +++ b/src/mame/sega/segag80.cpp @@ -7,13 +7,13 @@ *************************************************************************/ #include "emu.h" -#include "audio/segag80.h" +#include "segag80.h" -#include "includes/segag80v.h" // FIXME: eliminate the need for this dependency +#include "segag80v.h" // FIXME: eliminate the need for this dependency -#include "audio/nl_astrob.h" -#include "audio/nl_elim.h" -#include "audio/nl_spacfury.h" +#include "nl_astrob.h" +#include "nl_elim.h" +#include "nl_spacfury.h" #include "sound/samples.h" diff --git a/src/mame/sega/segag80_m.cpp b/src/mame/sega/segag80_m.cpp index 42ed293f056..b621924b1cb 100644 --- a/src/mame/sega/segag80_m.cpp +++ b/src/mame/sega/segag80_m.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/segag80.h" +#include "segag80_m.h" /****************************************************************************/ diff --git a/src/mame/sega/segag80r.cpp b/src/mame/sega/segag80r.cpp index 3efe30ae378..bb542d23a8d 100644 --- a/src/mame/sega/segag80r.cpp +++ b/src/mame/sega/segag80r.cpp @@ -107,12 +107,13 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segag80r.h" -#include "machine/segag80.h" +#include "segag80r.h" +#include "segag80_m.h" + +#include "segacrpt_device.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" -#include "machine/segacrpt_device.h" #include "speaker.h" diff --git a/src/mame/sega/segag80r.h b/src/mame/sega/segag80r.h index 976b422918c..a5988521f30 100644 --- a/src/mame/sega/segag80r.h +++ b/src/mame/sega/segag80r.h @@ -10,13 +10,13 @@ #pragma once -#include "audio/segag80.h" -#include "audio/segag80r.h" -#include "audio/segaspeech.h" -#include "audio/segausb.h" +#include "segag80.h" +#include "segag80r_a.h" +#include "segaspeech.h" +#include "segausb.h" #include "machine/i8255.h" -#include "machine/segag80.h" +#include "segag80_m.h" #include "sound/samples.h" #include "sound/sn76496.h" diff --git a/src/mame/sega/segag80r_a.cpp b/src/mame/sega/segag80r_a.cpp index cbf62d8a510..475451e9f01 100644 --- a/src/mame/sega/segag80r_a.cpp +++ b/src/mame/sega/segag80r_a.cpp @@ -10,9 +10,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segag80r.h" +#include "segag80r.h" -#include "audio/segag80r.h" +#include "segag80r_a.h" #include "sound/dac.h" #include "speaker.h" diff --git a/src/mame/sega/segag80r_v.cpp b/src/mame/sega/segag80r_v.cpp index 62aa237283f..57629d60c88 100644 --- a/src/mame/sega/segag80r_v.cpp +++ b/src/mame/sega/segag80r_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segag80r.h" +#include "segag80r.h" #include "machine/rescap.h" #include "video/resnet.h" diff --git a/src/mame/sega/segag80v.cpp b/src/mame/sega/segag80v.cpp index f9948f3c13a..a611333b976 100644 --- a/src/mame/sega/segag80v.cpp +++ b/src/mame/sega/segag80v.cpp @@ -135,9 +135,9 @@ ***************************************************************************/ #include "emu.h" -#include "audio/segag80.h" -#include "includes/segag80v.h" -#include "machine/segag80.h" +#include "segag80.h" +#include "segag80v.h" +#include "segag80_m.h" #include "cpu/z80/z80.h" #include "sound/samples.h" diff --git a/src/mame/sega/segag80v.h b/src/mame/sega/segag80v.h index 4106ade06be..c31a98c051c 100644 --- a/src/mame/sega/segag80v.h +++ b/src/mame/sega/segag80v.h @@ -10,12 +10,12 @@ #pragma once -#include "audio/segag80.h" -#include "audio/segaspeech.h" -#include "audio/segausb.h" +#include "segag80.h" +#include "segaspeech.h" +#include "segausb.h" #include "cpu/z80/z80.h" -#include "machine/segag80.h" +#include "segag80_m.h" #include "sound/ay8910.h" #include "sound/samples.h" #include "sound/tms5110.h" diff --git a/src/mame/sega/segag80v_v.cpp b/src/mame/sega/segag80v_v.cpp index bc126f72fe4..c65ac5bcce8 100644 --- a/src/mame/sega/segag80v_v.cpp +++ b/src/mame/sega/segag80v_v.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/segag80v.h" +#include "segag80v.h" #define VECTOR_CLOCK 15468480 // master clock #define U34_CLOCK (VECTOR_CLOCK/3) // clock for interrupt chain diff --git a/src/mame/sega/segahang.cpp b/src/mame/sega/segahang.cpp index 3e08832ef30..ac4aebb383a 100644 --- a/src/mame/sega/segahang.cpp +++ b/src/mame/sega/segahang.cpp @@ -16,11 +16,11 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segahang.h" -#include "includes/segaipt.h" +#include "segahang.h" +#include "segaipt.h" -#include "machine/fd1089.h" -#include "machine/fd1094.h" +#include "fd1089.h" +#include "fd1094.h" #include "sound/segapcm.h" #include "sound/ymopm.h" #include "sound/ymopn.h" diff --git a/src/mame/sega/segahang.h b/src/mame/sega/segahang.h index a6ac60158fc..90207697cae 100644 --- a/src/mame/sega/segahang.h +++ b/src/mame/sega/segahang.h @@ -12,9 +12,9 @@ #include "machine/adc0804.h" #include "machine/i8255.h" #include "machine/gen_latch.h" -#include "video/segaic16.h" -#include "video/segaic16_road.h" -#include "video/sega16sp.h" +#include "segaic16.h" +#include "segaic16_road.h" +#include "sega16sp.h" #include "screen.h" diff --git a/src/mame/sega/segahang_v.cpp b/src/mame/sega/segahang_v.cpp index 5fc4882182d..aa351c0cf8d 100644 --- a/src/mame/sega/segahang_v.cpp +++ b/src/mame/sega/segahang_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segahang.h" +#include "segahang.h" diff --git a/src/mame/sega/segaic16_m.cpp b/src/mame/sega/segaic16_m.cpp index 11f47ce911e..080386e1f86 100644 --- a/src/mame/sega/segaic16_m.cpp +++ b/src/mame/sega/segaic16_m.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "segaic16.h" +#include "segaic16_m.h" #include diff --git a/src/mame/sega/segajw.cpp b/src/mame/sega/segajw.cpp index 1f4be5b537d..ab5a8964de3 100644 --- a/src/mame/sega/segajw.cpp +++ b/src/mame/sega/segajw.cpp @@ -32,7 +32,7 @@ Also seem to be running on the same/similar hardware: #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/nvram.h" -#include "machine/315_5296.h" +#include "315_5296.h" #include "sound/ymopn.h" #include "video/hd63484.h" #include "video/ramdac.h" diff --git a/src/mame/sega/segaorun.cpp b/src/mame/sega/segaorun.cpp index bf74894ec2d..8a7d4a7d966 100644 --- a/src/mame/sega/segaorun.cpp +++ b/src/mame/sega/segaorun.cpp @@ -277,10 +277,10 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/segaorun.h" -#include "includes/segaipt.h" +#include "segaorun.h" +#include "segaipt.h" -#include "machine/fd1089.h" +#include "fd1089.h" #include "sound/segapcm.h" #include "sound/ymopm.h" #include "speaker.h" diff --git a/src/mame/sega/segaorun.h b/src/mame/sega/segaorun.h index cfbd01fe588..7f63c3d0054 100644 --- a/src/mame/sega/segaorun.h +++ b/src/mame/sega/segaorun.h @@ -8,15 +8,15 @@ #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "machine/315_5195.h" +#include "315_5195.h" #include "machine/adc0804.h" #include "machine/i8255.h" #include "machine/nvram.h" #include "machine/timer.h" #include "machine/watchdog.h" -#include "video/segaic16.h" -#include "video/segaic16_road.h" -#include "video/sega16sp.h" +#include "segaic16.h" +#include "segaic16_road.h" +#include "sega16sp.h" #include "screen.h" diff --git a/src/mame/sega/segaorun_v.cpp b/src/mame/sega/segaorun_v.cpp index 1c8b0ae7f6d..1de27571d69 100644 --- a/src/mame/sega/segaorun_v.cpp +++ b/src/mame/sega/segaorun_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segaorun.h" +#include "segaorun.h" diff --git a/src/mame/sega/segas16a.cpp b/src/mame/sega/segas16a.cpp index b3482ab0b71..a75393e9566 100644 --- a/src/mame/sega/segas16a.cpp +++ b/src/mame/sega/segas16a.cpp @@ -147,13 +147,13 @@ Tetris - - - - EPR12169 EPR12170 - ***************************************************************************/ #include "emu.h" -#include "includes/segas16a.h" -#include "includes/segaipt.h" +#include "segas16a.h" +#include "segaipt.h" -#include "machine/fd1089.h" -#include "machine/fd1094.h" +#include "fd1089.h" +#include "fd1094.h" #include "machine/nvram.h" -#include "machine/segacrp2_device.h" +#include "segacrp2_device.h" #include "sound/dac.h" #include "speaker.h" diff --git a/src/mame/sega/segas16a.h b/src/mame/sega/segas16a.h index c2c1b31f1ee..e644e9ecadf 100644 --- a/src/mame/sega/segas16a.h +++ b/src/mame/sega/segas16a.h @@ -17,8 +17,8 @@ #include "machine/nvram.h" #include "machine/watchdog.h" #include "sound/ymopm.h" -#include "video/segaic16.h" -#include "video/sega16sp.h" +#include "segaic16.h" +#include "sega16sp.h" #include "screen.h" diff --git a/src/mame/sega/segas16a_v.cpp b/src/mame/sega/segas16a_v.cpp index 381efd31863..349dbcd1a9a 100644 --- a/src/mame/sega/segas16a_v.cpp +++ b/src/mame/sega/segas16a_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segas16a.h" +#include "segas16a.h" diff --git a/src/mame/sega/segas16b.cpp b/src/mame/sega/segas16b.cpp index 402eb581b83..c31aa34d588 100644 --- a/src/mame/sega/segas16b.cpp +++ b/src/mame/sega/segas16b.cpp @@ -870,10 +870,10 @@ S11 S13 S15 S17 |EPR12194 - - - EPR12195 - - ***************************************************************************/ #include "emu.h" -#include "includes/segas16b.h" -#include "includes/segaipt.h" +#include "segas16b.h" +#include "segaipt.h" -#include "machine/mc8123.h" +#include "mc8123.h" #include "sound/okim6295.h" #include "speaker.h" @@ -882,7 +882,7 @@ S11 S13 S15 S17 |EPR12194 - - - EPR12195 - - #if USE_NL #include "machine/netlist.h" #include "netlist/nl_setup.h" -#include "audio/nl_segas16b.h" +#include "nl_segas16b.h" #endif //************************************************************************** diff --git a/src/mame/sega/segas16b.h b/src/mame/sega/segas16b.h index ded3280f68e..92668e3cb7b 100644 --- a/src/mame/sega/segas16b.h +++ b/src/mame/sega/segas16b.h @@ -13,18 +13,18 @@ #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" #include "cpu/z80/z80.h" -#include "machine/315_5195.h" +#include "315_5195.h" #include "machine/cxd1095.h" #include "machine/gen_latch.h" #include "machine/nvram.h" -#include "machine/segaic16.h" +#include "segaic16_m.h" #include "machine/upd4701.h" #include "sound/dac.h" #include "sound/upd7759.h" #include "sound/ymopm.h" #include "sound/ymopl.h" -#include "video/segaic16.h" -#include "video/sega16sp.h" +#include "segaic16.h" +#include "sega16sp.h" #include "screen.h" INPUT_PORTS_EXTERN( system16b_generic ); diff --git a/src/mame/sega/segas16b_isgsm.cpp b/src/mame/sega/segas16b_isgsm.cpp index 5c368f8c10b..eae80840810 100644 --- a/src/mame/sega/segas16b_isgsm.cpp +++ b/src/mame/sega/segas16b_isgsm.cpp @@ -23,8 +23,8 @@ removed. */ #include "emu.h" -#include "includes/segas16b.h" -#include "includes/segaipt.h" +#include "segas16b.h" +#include "segaipt.h" #include "speaker.h" diff --git a/src/mame/sega/segas16b_v.cpp b/src/mame/sega/segas16b_v.cpp index fb96477975d..b3e28480bda 100644 --- a/src/mame/sega/segas16b_v.cpp +++ b/src/mame/sega/segas16b_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segas16b.h" +#include "segas16b.h" diff --git a/src/mame/sega/segas18.cpp b/src/mame/sega/segas18.cpp index aca0dc63a1e..033787658d4 100644 --- a/src/mame/sega/segas18.cpp +++ b/src/mame/sega/segas18.cpp @@ -32,8 +32,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segas18.h" -#include "includes/segaipt.h" +#include "segas18.h" +#include "segaipt.h" #include "machine/nvram.h" #include "sound/rf5c68.h" diff --git a/src/mame/sega/segas18.h b/src/mame/sega/segas18.h index 9db5cd1371a..5095b3bcbc3 100644 --- a/src/mame/sega/segas18.h +++ b/src/mame/sega/segas18.h @@ -13,13 +13,13 @@ #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" #include "cpu/z80/z80.h" -#include "machine/315_5195.h" -#include "machine/315_5296.h" +#include "315_5195.h" +#include "315_5296.h" #include "machine/nvram.h" #include "machine/upd4701.h" #include "video/315_5313.h" -#include "video/segaic16.h" -#include "video/sega16sp.h" +#include "segaic16.h" +#include "sega16sp.h" #include "screen.h" diff --git a/src/mame/sega/segas18_astormbl.cpp b/src/mame/sega/segas18_astormbl.cpp index 99cfd0898fc..6ae3019748d 100644 --- a/src/mame/sega/segas18_astormbl.cpp +++ b/src/mame/sega/segas18_astormbl.cpp @@ -43,8 +43,8 @@ #include "emu.h" -#include "video/segaic16.h" -#include "video/sega16sp.h" +#include "segaic16.h" +#include "sega16sp.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/sega/segas18_v.cpp b/src/mame/sega/segas18_v.cpp index 3654e061f1e..4f58f5605fb 100644 --- a/src/mame/sega/segas18_v.cpp +++ b/src/mame/sega/segas18_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segas18.h" +#include "segas18.h" diff --git a/src/mame/sega/segas24.cpp b/src/mame/sega/segas24.cpp index 20bfb50f229..996ec44e443 100644 --- a/src/mame/sega/segas24.cpp +++ b/src/mame/sega/segas24.cpp @@ -337,18 +337,18 @@ Notes: */ #include "emu.h" -#include "includes/segas24.h" -#include "includes/segaipt.h" +#include "segas24.h" +#include "segaipt.h" #include "cpu/m68000/m68000.h" -#include "machine/fd1094.h" +#include "fd1094.h" #include "machine/msm6253.h" #include "machine/nvram.h" #include "machine/upd4701.h" -#include "machine/315_5296.h" +#include "315_5296.h" #include "sound/dac.h" #include "sound/ymopm.h" -#include "video/segaic24.h" +#include "segaic24.h" #include "speaker.h" diff --git a/src/mame/sega/segas24.h b/src/mame/sega/segas24.h index a9636d18f10..5beae3fb322 100644 --- a/src/mame/sega/segas24.h +++ b/src/mame/sega/segas24.h @@ -10,7 +10,7 @@ #pragma once #include "machine/timer.h" -#include "video/segaic24.h" +#include "segaic24.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/sega/segas24_v.cpp b/src/mame/sega/segas24_v.cpp index 705c9307c21..4da6a0eb53a 100644 --- a/src/mame/sega/segas24_v.cpp +++ b/src/mame/sega/segas24_v.cpp @@ -6,7 +6,7 @@ */ #include "emu.h" -#include "includes/segas24.h" +#include "segas24.h" #include #include diff --git a/src/mame/sega/segas32.cpp b/src/mame/sega/segas32.cpp index ab69c80ef79..57c842289e3 100644 --- a/src/mame/sega/segas32.cpp +++ b/src/mame/sega/segas32.cpp @@ -525,7 +525,7 @@ orunners: Interleaved with the dj and << >> buttons is the data the drives the ****************************************************************************/ #include "emu.h" -#include "includes/segas32.h" +#include "segas32.h" #include "bus/scsi/scsi.h" #include "bus/scsi/scsicd.h" @@ -540,7 +540,7 @@ orunners: Interleaved with the dj and << >> buttons is the data the drives the #include "machine/mb89352.h" #include "machine/msm6253.h" #include "machine/upd4701.h" -#include "machine/315_5296.h" +#include "315_5296.h" #include "sound/rf5c68.h" #include "sound/ymopn.h" #include "speaker.h" diff --git a/src/mame/sega/segas32.h b/src/mame/sega/segas32.h index 6aeb6bfc52a..3f617a43e3b 100644 --- a/src/mame/sega/segas32.h +++ b/src/mame/sega/segas32.h @@ -11,7 +11,7 @@ #pragma once #include "sound/multipcm.h" -#include "machine/s32comm.h" +#include "s32comm.h" #include "machine/timer.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/sega/segas32_m.cpp b/src/mame/sega/segas32_m.cpp index adbe1d39ea2..b78e0d912b1 100644 --- a/src/mame/sega/segas32_m.cpp +++ b/src/mame/sega/segas32_m.cpp @@ -3,7 +3,7 @@ /* Sega System 32 Protection related functions */ #include "emu.h" -#include "includes/segas32.h" +#include "segas32.h" /****************************************************************************** diff --git a/src/mame/sega/segas32_v.cpp b/src/mame/sega/segas32_v.cpp index ffaa12b9bba..643587aabec 100644 --- a/src/mame/sega/segas32_v.cpp +++ b/src/mame/sega/segas32_v.cpp @@ -184,7 +184,7 @@ #include "emu.h" -#include "includes/segas32.h" +#include "segas32.h" #include diff --git a/src/mame/sega/segashiobd.cpp b/src/mame/sega/segashiobd.cpp index 11fe33fb2f0..b30f6406eb9 100644 --- a/src/mame/sega/segashiobd.cpp +++ b/src/mame/sega/segashiobd.cpp @@ -2,7 +2,7 @@ // copyright-holders:Samuele Zannoli #include "emu.h" -#include "machine/segashiobd.h" +#include "segashiobd.h" /* 837-14438 SH I/O BD diff --git a/src/mame/sega/segasm1.cpp b/src/mame/sega/segasm1.cpp index dbb8c6171e9..f0997a59757 100644 --- a/src/mame/sega/segasm1.cpp +++ b/src/mame/sega/segasm1.cpp @@ -42,8 +42,8 @@ #include "emu.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "video/segaic24.h" -#include "machine/315_5296.h" +#include "segaic24.h" +#include "315_5296.h" #include "machine/gen_latch.h" #include "machine/i8251.h" #include "machine/mb8421.h" diff --git a/src/mame/sega/segasp.cpp b/src/mame/sega/segasp.cpp index 1807514b536..57822cc905d 100644 --- a/src/mame/sega/segasp.cpp +++ b/src/mame/sega/segasp.cpp @@ -95,8 +95,8 @@ G 171-8278G 315-6416 2x 512Mbit RMI #include "emu.h" #include "cpu/sh/sh4.h" #include "debugger.h" -#include "includes/segasp.h" -#include "machine/naomim4.h" +#include "segasp.h" +#include "naomim4.h" uint64_t segasp_state::sp_bank_r(offs_t offset, uint64_t mem_mask) { diff --git a/src/mame/sega/segaspeech.cpp b/src/mame/sega/segaspeech.cpp index e3a83f308bc..48b49b8c796 100644 --- a/src/mame/sega/segaspeech.cpp +++ b/src/mame/sega/segaspeech.cpp @@ -15,7 +15,7 @@ #include "netlist/nl_setup.h" -#include "audio/nl_segaspeech.h" +#include "nl_segaspeech.h" #define VERBOSE 0 #include "logmacro.h" diff --git a/src/mame/sega/segaufo.cpp b/src/mame/sega/segaufo.cpp index 9a24aa555e7..7c803a0b7aa 100644 --- a/src/mame/sega/segaufo.cpp +++ b/src/mame/sega/segaufo.cpp @@ -45,8 +45,8 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "machine/pit8253.h" -#include "machine/315_5296.h" -#include "machine/315_5338a.h" +#include "315_5296.h" +#include "315_5338a.h" #include "machine/timer.h" #include "sound/upd7759.h" #include "sound/ymopn.h" diff --git a/src/mame/sega/segaxbd.cpp b/src/mame/sega/segaxbd.cpp index 72c9c7d993e..01a0fee8aa3 100644 --- a/src/mame/sega/segaxbd.cpp +++ b/src/mame/sega/segaxbd.cpp @@ -266,11 +266,11 @@ ROMs: ***************************************************************************/ #include "emu.h" -#include "includes/segaxbd.h" -#include "includes/segaipt.h" +#include "segaxbd.h" +#include "segaipt.h" #include "machine/adc0804.h" -#include "machine/fd1094.h" +#include "fd1094.h" #include "machine/nvram.h" #include "sound/segapcm.h" #include "sound/ymopm.h" diff --git a/src/mame/sega/segaxbd.h b/src/mame/sega/segaxbd.h index 1cb30b526e9..30ab96e9d9d 100644 --- a/src/mame/sega/segaxbd.h +++ b/src/mame/sega/segaxbd.h @@ -10,9 +10,9 @@ #pragma once -#include "video/segaic16.h" -#include "video/segaic16_road.h" -#include "video/sega16sp.h" +#include "segaic16.h" +#include "segaic16_road.h" +#include "sega16sp.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" @@ -21,7 +21,7 @@ #include "machine/i8251.h" #include "machine/mb3773.h" #include "machine/mb8421.h" -#include "machine/segaic16.h" +#include "segaic16_m.h" #include "video/resnet.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/sega/segaxbd_v.cpp b/src/mame/sega/segaxbd_v.cpp index 297f88731e2..fe9ef490cc1 100644 --- a/src/mame/sega/segaxbd_v.cpp +++ b/src/mame/sega/segaxbd_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segaxbd.h" +#include "segaxbd.h" //************************************************************************** diff --git a/src/mame/sega/segaybd.cpp b/src/mame/sega/segaybd.cpp index da819bcd135..55b2256e9e2 100644 --- a/src/mame/sega/segaybd.cpp +++ b/src/mame/sega/segaybd.cpp @@ -57,15 +57,15 @@ MB89372 - Uses 3 serial data transfer protocols: ASYNC, COP & BOP. Has a built ***************************************************************************/ #include "emu.h" -#include "includes/segaybd.h" -#include "includes/segaipt.h" +#include "segaybd.h" +#include "segaipt.h" #include "machine/gen_latch.h" #include "machine/mb8421.h" #include "machine/msm6253.h" #include "machine/nvram.h" -#include "machine/segaic16.h" -#include "machine/315_5296.h" +#include "segaic16_m.h" +#include "315_5296.h" #include "sound/segapcm.h" #include "sound/ymopm.h" #include "speaker.h" diff --git a/src/mame/sega/segaybd.h b/src/mame/sega/segaybd.h index bea65ac14a7..6d7f4ac628d 100644 --- a/src/mame/sega/segaybd.h +++ b/src/mame/sega/segaybd.h @@ -13,8 +13,8 @@ #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/mb3773.h" -#include "video/segaic16.h" -#include "video/sega16sp.h" +#include "segaic16.h" +#include "sega16sp.h" #include "screen.h" diff --git a/src/mame/sega/segaybd_v.cpp b/src/mame/sega/segaybd_v.cpp index 924ba250116..a3894ec1619 100644 --- a/src/mame/sega/segaybd_v.cpp +++ b/src/mame/sega/segaybd_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/segaybd.h" +#include "segaybd.h" //************************************************************************** diff --git a/src/mame/sega/sg1000a.cpp b/src/mame/sega/sg1000a.cpp index 6d7fa320c90..2480d61567d 100644 --- a/src/mame/sega/sg1000a.cpp +++ b/src/mame/sega/sg1000a.cpp @@ -270,11 +270,14 @@ End */ #include "emu.h" + +#include "segacrpt_device.h" + #include "cpu/z80/z80.h" #include "sound/sn76496.h" #include "video/tms9928a.h" #include "machine/i8255.h" -#include "machine/segacrpt_device.h" + #include "speaker.h" diff --git a/src/mame/sega/shtzone.cpp b/src/mame/sega/shtzone.cpp index fe47a6b4738..d7f496fac84 100644 --- a/src/mame/sega/shtzone.cpp +++ b/src/mame/sega/shtzone.cpp @@ -58,7 +58,7 @@ TODO: */ #include "emu.h" -#include "includes/sms.h" +#include "sms.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "sound/beep.h" diff --git a/src/mame/sega/sms.cpp b/src/mame/sega/sms.cpp index 28f85f5c694..c471fffc943 100644 --- a/src/mame/sega/sms.cpp +++ b/src/mame/sega/sms.cpp @@ -243,7 +243,7 @@ DC00 - Selection buttons #2, 9-16 (R) ******************************************************************************/ #include "emu.h" -#include "includes/sms.h" +#include "sms.h" #include "cpu/z80/z80.h" #include "softlist_dev.h" diff --git a/src/mame/sega/sms_bootleg.cpp b/src/mame/sega/sms_bootleg.cpp index e6abb0a9cdc..be9a3e54a36 100644 --- a/src/mame/sega/sms_bootleg.cpp +++ b/src/mame/sega/sms_bootleg.cpp @@ -229,7 +229,7 @@ A Korean version has been seen too (unless this can be switched?) */ #include "emu.h" -#include "includes/sms.h" +#include "sms.h" #include "cpu/z80/z80.h" #include "speaker.h" diff --git a/src/mame/sega/sms_m.cpp b/src/mame/sega/sms_m.cpp index 465147d6eb2..c57547d7fab 100644 --- a/src/mame/sega/sms_m.cpp +++ b/src/mame/sega/sms_m.cpp @@ -5,7 +5,7 @@ #include "cpu/z80/z80.h" #include "video/315_5124.h" #include "sound/ymopl.h" -#include "includes/sms.h" +#include "sms.h" #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) diff --git a/src/mame/sega/speedbsk.cpp b/src/mame/sega/speedbsk.cpp index e44ca8a5ffe..6d486adbd45 100644 --- a/src/mame/sega/speedbsk.cpp +++ b/src/mame/sega/speedbsk.cpp @@ -63,7 +63,7 @@ #include "emu.h" -#include "machine/315_5338a.h" +#include "315_5338a.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" diff --git a/src/mame/sega/stactics.cpp b/src/mame/sega/stactics.cpp index a817d35de77..1dd061a1d1f 100644 --- a/src/mame/sega/stactics.cpp +++ b/src/mame/sega/stactics.cpp @@ -43,7 +43,7 @@ Verify Color PROM resistor values (Last 8 colors) ****************************************************************************/ #include "emu.h" -#include "includes/stactics.h" +#include "stactics.h" #include "stactics.lh" #include "cpu/i8085/i8085.h" diff --git a/src/mame/sega/stactics_v.cpp b/src/mame/sega/stactics_v.cpp index fee32be9139..2f055e744d7 100644 --- a/src/mame/sega/stactics_v.cpp +++ b/src/mame/sega/stactics_v.cpp @@ -49,7 +49,7 @@ tilt the mirror up and down, and the monitor left and right. ***************************************************************************/ #include "emu.h" -#include "includes/stactics.h" +#include "stactics.h" #include "screen.h" diff --git a/src/mame/sega/stv.cpp b/src/mame/sega/stv.cpp index 6f1cea1d794..1fd14112b1e 100644 --- a/src/mame/sega/stv.cpp +++ b/src/mame/sega/stv.cpp @@ -41,8 +41,7 @@ ************************************************************************************************************************/ #include "emu.h" -#include "includes/stv.h" -#include "audio/rax.h" +#include "stv.h" #include "cpu/m68000/m68000.h" #include "cpu/scudsp/scudsp.h" diff --git a/src/mame/sega/stv.h b/src/mame/sega/stv.h index 4eea57923b4..d06338cb62e 100644 --- a/src/mame/sega/stv.h +++ b/src/mame/sega/stv.h @@ -1,15 +1,18 @@ // license:LGPL-2.1+ // copyright-holders:David Haywood, Angelo Salese, Olivier Galibert, Mariusz Wojcieszek, R. Belmont -#ifndef MAME_INCLUDES_STV_H -#define MAME_INCLUDES_STV_H +#ifndef MAME_SEGA_STV_H +#define MAME_SEGA_STV_H #pragma once -#include "includes/saturn.h" -#include "audio/rax.h" +#include "saturn.h" + +#include "segabill.h" + +#include "rax.h" + #include "machine/eepromser.h" #include "machine/ticket.h" -#include "machine/segabill.h" class stv_state : public saturn_state { @@ -200,4 +203,4 @@ public: extern gfx_decode_entry const gfx_stv[]; -#endif // MAME_INCLUDES_STV_H +#endif // MAME_SEGA_STV_H diff --git a/src/mame/sega/suprloco.cpp b/src/mame/sega/suprloco.cpp index 0125c1bab1b..fa16728f4e9 100644 --- a/src/mame/sega/suprloco.cpp +++ b/src/mame/sega/suprloco.cpp @@ -22,15 +22,18 @@ Sega PCB 834-5137 ******************************************************************************/ #include "emu.h" -#include "includes/suprloco.h" +#include "suprloco.h" + +#include "segacrpt_device.h" #include "cpu/z80/z80.h" #include "machine/i8255.h" -#include "machine/segacrpt_device.h" #include "sound/sn76496.h" + #include "screen.h" #include "speaker.h" + void suprloco_state::main_map(address_map &map) { map(0x0000, 0xbfff).rom(); diff --git a/src/mame/sega/suprloco_v.cpp b/src/mame/sega/suprloco_v.cpp index 203fe9d38b0..550b4049a78 100644 --- a/src/mame/sega/suprloco_v.cpp +++ b/src/mame/sega/suprloco_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/suprloco.h" +#include "suprloco.h" diff --git a/src/mame/sega/system1.cpp b/src/mame/sega/system1.cpp index 93944696448..1f7d3c59a69 100644 --- a/src/mame/sega/system1.cpp +++ b/src/mame/sega/system1.cpp @@ -304,11 +304,13 @@ seem to have access to. ******************************************************************************/ #include "emu.h" -#include "includes/system1.h" +#include "system1.h" + +#include "mc8123.h" +#include "segacrpt_device.h" -#include "machine/segacrpt_device.h" -#include "machine/mc8123.h" #include "sound/sn76496.h" + #include "speaker.h" diff --git a/src/mame/sega/system1.h b/src/mame/sega/system1.h index 2b56226f593..8f4de2cfca7 100644 --- a/src/mame/sega/system1.h +++ b/src/mame/sega/system1.h @@ -10,7 +10,7 @@ #include "machine/z80pio.h" #include "machine/gen_latch.h" #include "machine/i8255.h" -#include "machine/segacrp2_device.h" +#include "segacrp2_device.h" #include "machine/timer.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/sega/system16.cpp b/src/mame/sega/system16.cpp index 621fd1affe0..63eb6826b76 100644 --- a/src/mame/sega/system16.cpp +++ b/src/mame/sega/system16.cpp @@ -89,8 +89,8 @@ */ #include "emu.h" -#include "includes/system16.h" -#include "includes/segaipt.h" +#include "system16.h" +#include "segaipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/sega/system16.h b/src/mame/sega/system16.h index 45d794af9d2..eb9a8c99023 100644 --- a/src/mame/sega/system16.h +++ b/src/mame/sega/system16.h @@ -9,8 +9,8 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" #include "sound/upd7759.h" -#include "video/sega16sp.h" -#include "video/segaic16.h" +#include "sega16sp.h" +#include "segaic16.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/sega/system16_v.cpp b/src/mame/sega/system16_v.cpp index 7a2a891a573..def4c9d6ccf 100644 --- a/src/mame/sega/system16_v.cpp +++ b/src/mame/sega/system16_v.cpp @@ -27,9 +27,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/system16.h" +#include "system16.h" #include "video/resnet.h" -#include "video/segaic16.h" +#include "segaic16.h" void segas1x_bootleg_state::setup_system16_bootleg_spritebanking( ) diff --git a/src/mame/sega/system1_v.cpp b/src/mame/sega/system1_v.cpp index e13a2cb618c..ddffaec8125 100644 --- a/src/mame/sega/system1_v.cpp +++ b/src/mame/sega/system1_v.cpp @@ -89,7 +89,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/system1.h" +#include "system1.h" #include "video/resnet.h" void system1_state::system1_palette(palette_device &palette) const diff --git a/src/mame/sega/triforce.cpp b/src/mame/sega/triforce.cpp index 78619cab99b..f989ebae859 100644 --- a/src/mame/sega/triforce.cpp +++ b/src/mame/sega/triforce.cpp @@ -457,7 +457,7 @@ Notes: #include "emu.h" #include "cpu/powerpc/ppc.h" -#include "machine/naomigd.h" +#include "naomigd.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/sega/turbo.cpp b/src/mame/sega/turbo.cpp index b30ae77ac22..a910d04423c 100644 --- a/src/mame/sega/turbo.cpp +++ b/src/mame/sega/turbo.cpp @@ -147,10 +147,12 @@ **************************************************************************/ #include "emu.h" -#include "includes/turbo.h" +#include "turbo.h" + +#include "segacrpt_device.h" + #include "machine/74259.h" #include "machine/i8279.h" -#include "machine/segacrpt_device.h" #include "turbo.lh" #include "subroc3d.lh" diff --git a/src/mame/sega/turbo_a.cpp b/src/mame/sega/turbo_a.cpp index f1732c80acd..54a3f31212d 100644 --- a/src/mame/sega/turbo_a.cpp +++ b/src/mame/sega/turbo_a.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/turbo.h" +#include "turbo.h" #include "speaker.h" diff --git a/src/mame/sega/turbo_v.cpp b/src/mame/sega/turbo_v.cpp index 2cf22dd9d6c..34159bcee41 100644 --- a/src/mame/sega/turbo_v.cpp +++ b/src/mame/sega/turbo_v.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/turbo.h" +#include "turbo.h" #include "video/resnet.h" static constexpr uint32_t sprite_expand[16] = diff --git a/src/mame/sega/vicdual-97269pb.cpp b/src/mame/sega/vicdual-97269pb.cpp index 6ae4830492e..c67b5edb18a 100644 --- a/src/mame/sega/vicdual-97269pb.cpp +++ b/src/mame/sega/vicdual-97269pb.cpp @@ -54,7 +54,7 @@ Notes: */ #include "emu.h" -#include "video/vicdual-97269pb.h" +#include "vicdual-97269pb.h" #define S97269PB_TAG "s97269pb" diff --git a/src/mame/sega/vicdual-97271p.cpp b/src/mame/sega/vicdual-97271p.cpp index 6d202e73a15..66479232b80 100644 --- a/src/mame/sega/vicdual-97271p.cpp +++ b/src/mame/sega/vicdual-97271p.cpp @@ -9,7 +9,7 @@ for the time being this is a simple sample player based on the work by MASH. #include "emu.h" #include "speaker.h" -#include "audio/vicdual-97271p.h" +#include "vicdual-97271p.h" #define S97271P_TAG "s97271p" diff --git a/src/mame/sega/vicdual.cpp b/src/mame/sega/vicdual.cpp index 1bbea1c472e..04a43e13099 100644 --- a/src/mame/sega/vicdual.cpp +++ b/src/mame/sega/vicdual.cpp @@ -55,9 +55,9 @@ ****************************************************************************/ #include "emu.h" -#include "includes/vicdual.h" -#include "audio/vicdual-97271p.h" -#include "video/vicdual-97269pb.h" +#include "vicdual.h" +#include "vicdual-97271p.h" +#include "vicdual-97269pb.h" #include "cpu/i8085/i8085.h" #include "cpu/z80/z80.h" @@ -66,6 +66,7 @@ #include "depthch.lh" + #define VICDUAL_MASTER_CLOCK (XTAL(15'468'480)) #define VICDUAL_MAIN_CPU_CLOCK (VICDUAL_MASTER_CLOCK/8) #define VICDUAL_PIXEL_CLOCK (VICDUAL_MASTER_CLOCK/3) @@ -83,6 +84,634 @@ +/* + * Carnival sound routines + * + */ + +/* output port 0x01 definitions - sound effect drive outputs */ +#define OUT_CARNIVAL_PORT_1_RIFLE 0x01 +#define OUT_CARNIVAL_PORT_1_CLANG 0x02 +#define OUT_CARNIVAL_PORT_1_DUCK1 0x04 +#define OUT_CARNIVAL_PORT_1_DUCK2 0x08 +#define OUT_CARNIVAL_PORT_1_DUCK3 0x10 +#define OUT_CARNIVAL_PORT_1_PIPEHIT 0x20 +#define OUT_CARNIVAL_PORT_1_BONUS1 0x40 +#define OUT_CARNIVAL_PORT_1_BONUS2 0x80 + +/* output port 0x02 definitions - sound effect drive outputs */ +#define OUT_CARNIVAL_PORT_2_BEAR 0x04 +#define OUT_CARNIVAL_PORT_2_RANKING 0x20 + + +#define PLAY(samp,id,loop) samp->start( id, id, loop ) +#define STOP(samp,id) samp->stop( id ) + + +/* sample file names */ +static const char *const carnival_sample_names[] = +{ + "*carnival", + "bear", + "bonus1", + "bonus2", + "clang", + "duck1", + "duck2", + "duck3", + "pipehit", + "ranking", + "rifle", + nullptr +}; + + +/* sample IDs - must match sample file name table above */ +enum +{ + SND_CARNIVAL_BEAR = 0, + SND_CARNIVAL_BONUS1, + SND_CARNIVAL_BONUS2, + SND_CARNIVAL_CLANG, + SND_CARNIVAL_DUCK1, + SND_CARNIVAL_DUCK2, + SND_CARNIVAL_DUCK3, + SND_CARNIVAL_PIPEHIT, + SND_CARNIVAL_RANKING, + SND_CARNIVAL_RIFLE +}; + + +void carnival_state::carnival_audio_1_w(uint8_t data) +{ + int bitsChanged; + int bitsGoneHigh; + int bitsGoneLow; + + bitsChanged = m_port1State ^ data; + bitsGoneHigh = bitsChanged & data; + bitsGoneLow = bitsChanged & ~data; + + m_port1State = data; + + if ( bitsGoneLow & OUT_CARNIVAL_PORT_1_RIFLE ) + { + PLAY( m_samples, SND_CARNIVAL_RIFLE, 0 ); + } + + if ( bitsGoneLow & OUT_CARNIVAL_PORT_1_CLANG ) + { + PLAY( m_samples, SND_CARNIVAL_CLANG, 0 ); + } + + if ( bitsGoneLow & OUT_CARNIVAL_PORT_1_DUCK1 ) + { + PLAY( m_samples, SND_CARNIVAL_DUCK1, 1 ); + } + if ( bitsGoneHigh & OUT_CARNIVAL_PORT_1_DUCK1 ) + { + STOP( m_samples, SND_CARNIVAL_DUCK1 ); + } + + if ( bitsGoneLow & OUT_CARNIVAL_PORT_1_DUCK2 ) + { + PLAY( m_samples, SND_CARNIVAL_DUCK2, 1 ); + } + if ( bitsGoneHigh & OUT_CARNIVAL_PORT_1_DUCK2 ) + { + STOP( m_samples, SND_CARNIVAL_DUCK2 ); + } + + if ( bitsGoneLow & OUT_CARNIVAL_PORT_1_DUCK3 ) + { + PLAY( m_samples, SND_CARNIVAL_DUCK3, 1 ); + } + if ( bitsGoneHigh & OUT_CARNIVAL_PORT_1_DUCK3 ) + { + STOP( m_samples, SND_CARNIVAL_DUCK3 ); + } + + if ( bitsGoneLow & OUT_CARNIVAL_PORT_1_PIPEHIT ) + { + PLAY( m_samples, SND_CARNIVAL_PIPEHIT, 0 ); + } + + if ( bitsGoneLow & OUT_CARNIVAL_PORT_1_BONUS1 ) + { + PLAY( m_samples, SND_CARNIVAL_BONUS1, 0 ); + } + + if ( bitsGoneLow & OUT_CARNIVAL_PORT_1_BONUS2 ) + { + PLAY( m_samples, SND_CARNIVAL_BONUS2, 0 ); + } +} + +void carnival_state::carnival_audio_2_w(uint8_t data) +{ + int bitsChanged; + //int bitsGoneHigh; + int bitsGoneLow; + + bitsChanged = m_port2State ^ data; + //bitsGoneHigh = bitsChanged & data; + bitsGoneLow = bitsChanged & ~data; + + m_port2State = data; + + if ( bitsGoneLow & OUT_CARNIVAL_PORT_2_BEAR ) + { + PLAY( m_samples, SND_CARNIVAL_BEAR, 0 ); + } + + if ( bitsGoneLow & OUT_CARNIVAL_PORT_2_RANKING ) + { + PLAY( m_samples, SND_CARNIVAL_RANKING, 0 ); + } + + // d4: music board MCU reset + m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE); +} + + +/* Music board */ + +// common + +void carnival_state::mboard_map(address_map &map) +{ + map(0x0000, 0x03ff).rom(); +} + +READ_LINE_MEMBER( carnival_state::carnival_music_port_t1_r ) +{ + // T1: comms from audio port 2 d3 + return ~m_port2State >> 3 & 1; +} + + +// AY8912 music + +void carnival_state::carnival_psg_latch() +{ + if (m_musicBus & 1) + { + // BDIR W, BC1 selects address or data + if (m_musicBus & 2) + m_psg->address_w(m_musicData); + else + m_psg->data_w(m_musicData); + } +} + +void carnival_state::carnivala_music_port_1_w(uint8_t data) +{ + // P1: AY8912 d0-d7 + m_musicData = data; + carnival_psg_latch(); +} + +void carnival_state::carnivala_music_port_2_w(uint8_t data) +{ + // P2 d6: AY8912 BDIR(R/W) + // P2 d7: AY8912 BC1 + m_musicBus = data >> 6 & 3; + carnival_psg_latch(); +} + +void carnival_state::carnivala_audio(machine_config &config) +{ + /* music board */ + I8035(config, m_audiocpu, XTAL(3'579'545)); + m_audiocpu->set_addrmap(AS_PROGRAM, &carnival_state::mboard_map); + m_audiocpu->p1_out_cb().set(FUNC(carnival_state::carnivala_music_port_1_w)); + m_audiocpu->p2_out_cb().set(FUNC(carnival_state::carnivala_music_port_2_w)); + m_audiocpu->t1_in_cb().set(FUNC(carnival_state::carnival_music_port_t1_r)); + + AY8912(config, m_psg, XTAL(3'579'545)/3).add_route(ALL_OUTPUTS, "mono", 0.25); // also seen with AY-3-8910, daughterboard has place for either chip + + /* samples */ + SAMPLES(config, m_samples); + m_samples->set_channels(10); + m_samples->set_samples_names(carnival_sample_names); + m_samples->add_route(ALL_OUTPUTS, "mono", 0.5); +} + + +// PIT8253 music + +void carnival_state::carnivalb_music_port_1_w(uint8_t data) +{ + // P1: PIT8253 d0-d7 + m_musicData = data; +} + +void carnival_state::carnivalb_music_port_2_w(uint8_t data) +{ + // P2 d7: PIT8253 write strobe + // P2 d5,d6: PIT8253 A0,A1 + if (~m_musicBus & data & 0x80) + m_pit->write(data >> 5 & 3, m_musicData); + + m_musicBus = data; +} + +void carnival_state::carnivalb_audio(machine_config &config) +{ + // already inherited carnivala_audio + config.device_remove("psg"); + + m_audiocpu->p1_out_cb().set(FUNC(carnival_state::carnivalb_music_port_1_w)); + m_audiocpu->p2_out_cb().set(FUNC(carnival_state::carnivalb_music_port_2_w)); + + PIT8253(config, m_pit, 0); + m_pit->set_clk<0>(XTAL(3'579'545)/3); + m_pit->set_clk<1>(XTAL(3'579'545)/3); + m_pit->set_clk<2>(XTAL(3'579'545)/3); + + m_pit->out_handler<0>().set(m_dac[0], FUNC(dac_bit_interface::write)); + m_pit->out_handler<1>().set(m_dac[1], FUNC(dac_bit_interface::write)); + m_pit->out_handler<2>().set(m_dac[2], FUNC(dac_bit_interface::write)); + + for (int i = 0; i < 3; i++) + DAC_1BIT(config, m_dac[i]).add_route(ALL_OUTPUTS, "mono", 0.15); +} + + + +/* + * Deptch Charge sound routines + * + */ + +/* output port 0x01 definitions - sound effect drive outputs */ +#define OUT_DEPTHCH_PORT_1_LONGEXPL 0x01 +#define OUT_DEPTHCH_PORT_1_SHRTEXPL 0x02 +#define OUT_DEPTHCH_PORT_1_SPRAY 0x04 +#define OUT_DEPTHCH_PORT_1_SONAR 0x08 + + +#define PLAY(samp,id,loop) samp->start( id, id, loop ) +#define STOP(samp,id) samp->stop( id ) + + +/* sample file names */ +static const char *const depthch_sample_names[] = +{ + "*depthch", + "longex", + "shortex", + "spray", + "bonus", + "sonar", + nullptr +}; + + +/* sample IDs - must match sample file name table above */ +enum +{ + SND_DEPTHCH_LONGEXPL = 0, + SND_DEPTHCH_SHRTEXPL, + SND_DEPTHCH_SPRAY, + SND_DEPTHCH_BONUS, + SND_DEPTHCH_SONAR +}; + + +void vicdual_state::depthch_audio_w(uint8_t data) +{ + int bitsChanged; + int bitsGoneHigh; + int bitsGoneLow; + + bitsChanged = m_port1State ^ data; + bitsGoneHigh = bitsChanged & data; + bitsGoneLow = bitsChanged & ~data; + + m_port1State = data; + + if ( bitsGoneHigh & OUT_DEPTHCH_PORT_1_LONGEXPL ) + { + PLAY( m_samples, SND_DEPTHCH_LONGEXPL, 0 ); + } + + if ( bitsGoneHigh & OUT_DEPTHCH_PORT_1_SHRTEXPL ) + { + PLAY( m_samples, SND_DEPTHCH_SHRTEXPL, 0 ); + } + + if ( bitsGoneHigh & OUT_DEPTHCH_PORT_1_SPRAY ) + { + PLAY( m_samples, SND_DEPTHCH_SPRAY, 0 ); + } + + if ( bitsGoneHigh & OUT_DEPTHCH_PORT_1_SONAR ) + { + PLAY( m_samples, SND_DEPTHCH_SONAR, 1 ); + } + if ( bitsGoneLow & OUT_DEPTHCH_PORT_1_SONAR ) + { + STOP( m_samples, SND_DEPTHCH_SONAR ); + + // bonus sound on same line as sonar + PLAY( m_samples, SND_DEPTHCH_BONUS, 0 ); + } +} + + +void vicdual_state::depthch_audio(machine_config &config) +{ + /* samples */ + SAMPLES(config, m_samples); + m_samples->set_channels(5); + m_samples->set_samples_names(depthch_sample_names); + m_samples->add_route(ALL_OUTPUTS, "mono", 0.5); +} + + + +/* + * Invinco sound routines + * + */ + +/* output port 0x02 definitions - sound effect drive outputs */ +#define OUT_INVINCO_PORT_2_SAUCER 0x04 +#define OUT_INVINCO_PORT_2_MOVE1 0x08 +#define OUT_INVINCO_PORT_2_MOVE2 0x10 +#define OUT_INVINCO_PORT_2_FIRE 0x20 +#define OUT_INVINCO_PORT_2_INVHIT 0x40 +#define OUT_INVINCO_PORT_2_SHIPHIT 0x80 + + +#define PLAY(samp,id,loop) samp->start( id, id, loop ) +#define STOP(samp,id) samp->stop( id ) + + +/* sample file names */ +static const char *const invinco_sample_names[] = +{ + "*invinco", + "saucer", + "move1", + "move2", + "fire", + "invhit", + "shiphit", + "move3", /* currently not used */ + "move4", /* currently not used */ + nullptr +}; + + +/* sample IDs - must match sample file name table above */ +enum +{ + SND_INVINCO_SAUCER = 0, + SND_INVINCO_MOVE1, + SND_INVINCO_MOVE2, + SND_INVINCO_FIRE, + SND_INVINCO_INVHIT, + SND_INVINCO_SHIPHIT, + SND_INVINCO_MOVE3, + SND_INVINCO_MOVE4 +}; + + +void vicdual_state::invinco_audio_w(uint8_t data) +{ + int bitsChanged; + //int bitsGoneHigh; + int bitsGoneLow; + + bitsChanged = m_port2State ^ data; + //bitsGoneHigh = bitsChanged & data; + bitsGoneLow = bitsChanged & ~data; + + m_port2State = data; + + if ( bitsGoneLow & OUT_INVINCO_PORT_2_SAUCER ) + { + PLAY( m_samples, SND_INVINCO_SAUCER, 0 ); + } + + if ( bitsGoneLow & OUT_INVINCO_PORT_2_MOVE1 ) + { + PLAY( m_samples, SND_INVINCO_MOVE1, 0 ); + } + + if ( bitsGoneLow & OUT_INVINCO_PORT_2_MOVE2 ) + { + PLAY( m_samples, SND_INVINCO_MOVE2, 0 ); + } + + if ( bitsGoneLow & OUT_INVINCO_PORT_2_FIRE ) + { + PLAY( m_samples, SND_INVINCO_FIRE, 0 ); + } + + if ( bitsGoneLow & OUT_INVINCO_PORT_2_INVHIT ) + { + PLAY( m_samples, SND_INVINCO_INVHIT, 0 ); + } + + if ( bitsGoneLow & OUT_INVINCO_PORT_2_SHIPHIT ) + { + PLAY( m_samples, SND_INVINCO_SHIPHIT, 0 ); + } +} + + +void vicdual_state::invinco_audio(machine_config &config) +{ + /* samples */ + SAMPLES(config, m_samples); + m_samples->set_channels(8); + m_samples->set_samples_names(invinco_sample_names); + m_samples->add_route(ALL_OUTPUTS, "mono", 0.5); +} + + + +/* + * Pulsar sound routines + * + * TODO: change heart rate based on bit 7 of Port 1 + * + */ + +/* output port 0x01 definitions - sound effect drive outputs */ +#define OUT_PULSAR_PORT_1_CLANG 0x01 +#define OUT_PULSAR_PORT_1_KEY 0x02 +#define OUT_PULSAR_PORT_1_ALIENHIT 0x04 +#define OUT_PULSAR_PORT_1_PHIT 0x08 +#define OUT_PULSAR_PORT_1_ASHOOT 0x10 +#define OUT_PULSAR_PORT_1_PSHOOT 0x20 +#define OUT_PULSAR_PORT_1_BONUS 0x40 +#define OUT_PULSAR_PORT_1_HBEAT_RATE 0x80 /* currently not used */ + +/* output port 0x02 definitions - sound effect drive outputs */ +#define OUT_PULSAR_PORT_2_SIZZLE 0x01 +#define OUT_PULSAR_PORT_2_GATE 0x02 +#define OUT_PULSAR_PORT_2_BIRTH 0x04 +#define OUT_PULSAR_PORT_2_HBEAT 0x08 +#define OUT_PULSAR_PORT_2_MOVMAZE 0x10 + + +#define PLAY(samp,id,loop) samp->start( id, id, loop ) +#define STOP(samp,id) samp->stop( id ) + + +/* sample file names */ +static const char *const pulsar_sample_names[] = +{ + "*pulsar", + "clang", + "key", + "alienhit", + "phit", + "ashoot", + "pshoot", + "bonus", + "sizzle", + "gate", + "birth", + "hbeat", + "movmaze", + nullptr +}; + + +/* sample IDs - must match sample file name table above */ +enum +{ + SND_PULSAR_CLANG = 0, + SND_PULSAR_KEY, + SND_PULSAR_ALIENHIT, + SND_PULSAR_PHIT, + SND_PULSAR_ASHOOT, + SND_PULSAR_PSHOOT, + SND_PULSAR_BONUS, + SND_PULSAR_SIZZLE, + SND_PULSAR_GATE, + SND_PULSAR_BIRTH, + SND_PULSAR_HBEAT, + SND_PULSAR_MOVMAZE +}; + + +void vicdual_state::pulsar_audio_1_w(uint8_t data) +{ + int bitsChanged; + //int bitsGoneHigh; + int bitsGoneLow; + + bitsChanged = m_port1State ^ data; + //bitsGoneHigh = bitsChanged & data; + bitsGoneLow = bitsChanged & ~data; + + m_port1State = data; + + if ( bitsGoneLow & OUT_PULSAR_PORT_1_CLANG ) + { + PLAY( m_samples, SND_PULSAR_CLANG, 0 ); + } + + if ( bitsGoneLow & OUT_PULSAR_PORT_1_KEY ) + { + PLAY( m_samples, SND_PULSAR_KEY, 0 ); + } + + if ( bitsGoneLow & OUT_PULSAR_PORT_1_ALIENHIT ) + { + PLAY( m_samples, SND_PULSAR_ALIENHIT, 0 ); + } + + if ( bitsGoneLow & OUT_PULSAR_PORT_1_PHIT ) + { + PLAY( m_samples, SND_PULSAR_PHIT, 0 ); + } + + if ( bitsGoneLow & OUT_PULSAR_PORT_1_ASHOOT ) + { + PLAY( m_samples, SND_PULSAR_ASHOOT, 0 ); + } + + if ( bitsGoneLow & OUT_PULSAR_PORT_1_PSHOOT ) + { + PLAY( m_samples, SND_PULSAR_PSHOOT, 0 ); + } + + if ( bitsGoneLow & OUT_PULSAR_PORT_1_BONUS ) + { + PLAY( m_samples, SND_PULSAR_BONUS, 0 ); + } +} + + +void vicdual_state::pulsar_audio_2_w(uint8_t data) +{ + int bitsChanged; + int bitsGoneHigh; + int bitsGoneLow; + + bitsChanged = m_port2State ^ data; + bitsGoneHigh = bitsChanged & data; + bitsGoneLow = bitsChanged & ~data; + + m_port2State = data; + + if ( bitsGoneLow & OUT_PULSAR_PORT_2_SIZZLE ) + { + PLAY( m_samples, SND_PULSAR_SIZZLE, 0 ); + } + + if ( bitsGoneLow & OUT_PULSAR_PORT_2_GATE ) + { + m_samples->start(SND_PULSAR_CLANG, SND_PULSAR_GATE); + } + if ( bitsGoneHigh & OUT_PULSAR_PORT_2_GATE ) + { + STOP( m_samples, SND_PULSAR_CLANG ); + } + + if ( bitsGoneLow & OUT_PULSAR_PORT_2_BIRTH ) + { + PLAY( m_samples, SND_PULSAR_BIRTH, 0 ); + } + + if ( bitsGoneLow & OUT_PULSAR_PORT_2_HBEAT ) + { + PLAY( m_samples, SND_PULSAR_HBEAT, 1 ); + } + if ( bitsGoneHigh & OUT_PULSAR_PORT_2_HBEAT ) + { + STOP( m_samples, SND_PULSAR_HBEAT ); + } + + if ( bitsGoneLow & OUT_PULSAR_PORT_2_MOVMAZE ) + { + PLAY( m_samples, SND_PULSAR_MOVMAZE, 1 ); + } + if ( bitsGoneHigh & OUT_PULSAR_PORT_2_MOVMAZE ) + { + STOP( m_samples, SND_PULSAR_MOVMAZE ); + } +} + + +void vicdual_state::pulsar_audio(machine_config &config) +{ + /* samples */ + SAMPLES(config, m_samples); + m_samples->set_channels(12); + m_samples->set_samples_names(pulsar_sample_names); + m_samples->add_route(ALL_OUTPUTS, "mono", 0.5); +} + + + /************************************* * * Coin handling diff --git a/src/mame/sega/vicdual.h b/src/mame/sega/vicdual.h index b66a1118a48..c2c7eac8e2c 100644 --- a/src/mame/sega/vicdual.h +++ b/src/mame/sega/vicdual.h @@ -14,9 +14,9 @@ #include "sound/discrete.h" #include "sound/samples.h" #include "screen.h" -#include "audio/vicdual.h" -#include "audio/vicdual-97271p.h" -#include "video/vicdual-97269pb.h" +#include "vicdual_a.h" +#include "vicdual-97271p.h" +#include "vicdual-97269pb.h" class vicdual_state : public driver_device { diff --git a/src/mame/sega/vicdual_a.cpp b/src/mame/sega/vicdual_a.cpp index 2c44cd6107c..b53ba6f6aa6 100644 --- a/src/mame/sega/vicdual_a.cpp +++ b/src/mame/sega/vicdual_a.cpp @@ -7,10 +7,10 @@ *************************************************************************/ #include "emu.h" -#include "includes/vicdual.h" +#include "vicdual.h" -#include "audio/nl_brdrline.h" -#include "audio/nl_frogs.h" +#include "nl_brdrline.h" +#include "nl_frogs.h" /************************************************************************ diff --git a/src/mame/sega/vicdual_v.cpp b/src/mame/sega/vicdual_v.cpp index a0b0b6a25cd..78ecaf84d7b 100644 --- a/src/mame/sega/vicdual_v.cpp +++ b/src/mame/sega/vicdual_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/vicdual.h" +#include "vicdual.h" static const pen_t pens_from_color_prom[] = diff --git a/src/mame/sega/zaxxon.cpp b/src/mame/sega/zaxxon.cpp index 42cba3ee00d..02538231aa7 100644 --- a/src/mame/sega/zaxxon.cpp +++ b/src/mame/sega/zaxxon.cpp @@ -254,13 +254,14 @@ ***************************************************************************/ #include "emu.h" -#include "includes/zaxxon.h" -#include "audio/segausb.h" +#include "zaxxon.h" +#include "segausb.h" + +#include "segacrpt_device.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/i8255.h" -#include "machine/segacrpt_device.h" #include "sound/samples.h" #include "sound/sn76496.h" diff --git a/src/mame/sega/zaxxon_a.cpp b/src/mame/sega/zaxxon_a.cpp index 054b9fec076..28777daa27e 100644 --- a/src/mame/sega/zaxxon_a.cpp +++ b/src/mame/sega/zaxxon_a.cpp @@ -63,7 +63,7 @@ #include "emu.h" #include "sound/samples.h" -#include "includes/zaxxon.h" +#include "zaxxon.h" diff --git a/src/mame/sega/zaxxon_v.cpp b/src/mame/sega/zaxxon_v.cpp index 8aac841e2d4..9b7696b4650 100644 --- a/src/mame/sega/zaxxon_v.cpp +++ b/src/mame/sega/zaxxon_v.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/zaxxon.h" +#include "zaxxon.h" /************************************* diff --git a/src/mame/segacons/dccons.cpp b/src/mame/segacons/dccons.cpp index cd624bd60b2..255c1d42654 100644 --- a/src/mame/segacons/dccons.cpp +++ b/src/mame/segacons/dccons.cpp @@ -47,15 +47,16 @@ */ #include "emu.h" -#include "includes/dccons.h" +#include "dccons.h" + +#include "dc-ctrl.h" +#include "gdrom.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "cpu/sh/sh4.h" #include "imagedev/chd_cd.h" #include "machine/aicartc.h" -#include "machine/dc-ctrl.h" -#include "machine/gdrom.h" //#include "emupal.h" #include "screen.h" diff --git a/src/mame/segacons/dccons.h b/src/mame/segacons/dccons.h index ef98cb57a16..23680acaa1c 100644 --- a/src/mame/segacons/dccons.h +++ b/src/mame/segacons/dccons.h @@ -1,15 +1,15 @@ // license:LGPL-2.1+ // copyright-holders:Angelo Salese, R. Belmont -#ifndef MAME_INCLUDES_DCCONS_H -#define MAME_INCLUDES_DCCONS_H +#ifndef MAME_SEGACONS_DCCONS_H +#define MAME_SEGACONS_DCCONS_H #pragma once #include "dc.h" +#include "gdrom.h" #include "bus/ata/ataintf.h" #include "imagedev/chd_cd.h" -#include "machine/gdrom.h" #include "machine/intelfsh.h" class dc_cons_state : public dc_state @@ -58,4 +58,4 @@ private: int atapi_xferlen = 0, atapi_xferbase = 0, atapi_xfercomplete; }; -#endif // MAME_INCLUDES_DCCONS_H +#endif // MAME_SEGACONS_DCCONS_H diff --git a/src/mame/segacons/dccons_m.cpp b/src/mame/segacons/dccons_m.cpp index 07c1a95afde..a69834a46e3 100644 --- a/src/mame/segacons/dccons_m.cpp +++ b/src/mame/segacons/dccons_m.cpp @@ -22,12 +22,12 @@ */ #include "emu.h" +#include "dccons.h" + #include "cdrom.h" //#include "debugger.h" -#include "includes/dc.h" #include "cpu/sh/sh4.h" #include "sound/aica.h" -#include "includes/dccons.h" // TODO: fine grain this value #define ATAPI_CYCLES_PER_SECTOR (5000) diff --git a/src/mame/segacons/mdconsole.cpp b/src/mame/segacons/mdconsole.cpp new file mode 100644 index 00000000000..0021f421f11 --- /dev/null +++ b/src/mame/segacons/mdconsole.cpp @@ -0,0 +1,1205 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood + +#include "emu.h" +#include "mdconsole.h" + +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "imagedev/chd_cd.h" +#include "sound/sn76496.h" + +#include "softlist.h" + +#include "formats/imageutl.h" + + +/************************************* + * + * Input handlers + * + *************************************/ + +/* These overwrite the MAME ones in DRIVER_INIT */ +/* They're needed to give the users the choice between different controllers */ +uint8_t md_cons_state::mess_md_io_read_data_port(offs_t offset) +{ + int portnum = offset; + + uint8_t retdata; + int controller; + uint8_t helper_6b = (m_megadrive_io_ctrl_regs[portnum] & 0x3f) | 0xc0; // bits 6 & 7 always come from megadrive_io_data_regs + uint8_t helper_3b = (m_megadrive_io_ctrl_regs[portnum] & 0x7f) | 0x80; // bit 7 always comes from megadrive_io_data_regs + + switch (portnum) + { + case 0: + controller = (m_io_ctrlr->read() & 0x0f); + break; + + case 1: + controller = (m_io_ctrlr->read() & 0xf0); + break; + + default: + controller = 0; + break; + } + + /* Are we using a 6 buttons Joypad? */ + if (controller) + { + if (m_megadrive_io_data_regs[portnum] & 0x40) + { + if (m_io_stage[portnum] == 2) + { + /* here we read B, C & the additional buttons */ + retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) | + ((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0x30) | + ((m_io_pad6b[1][portnum] ? m_io_pad6b[1][portnum]->read() : 0) & 0x0f)) & ~helper_6b); + } + else + { + /* here we read B, C & the directional buttons */ + retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) | + (((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0x3f) & ~helper_6b); + } + } + else + { + if (m_io_stage[portnum] == 1) + { + /* here we read ((Start & A) >> 2) | 0x00 */ + retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) | + ((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0xc0) >> 2) & ~helper_6b); + } + else if (m_io_stage[portnum]==2) + { + /* here we read ((Start & A) >> 2) | 0x0f */ + retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) | + (((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0xc0) >> 2) | 0x0f) & ~helper_6b); + } + else + { + /* here we read ((Start & A) >> 2) | Up and Down */ + retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) | + (((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0xc0) >> 2) | + ((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0x03)) & ~helper_6b); + } + } + + // osd_printf_debug("read io data port stage %d port %d %02x\n",mess_io_stage[portnum],portnum,retdata); + + retdata |= (retdata << 8); + } + /* Otherwise it's a 3 buttons Joypad */ + else + { + uint8_t svp_test = 0; + if (m_cart) + svp_test = m_cart->read_test(); + + // handle test input for SVP test + if (portnum == 0 && svp_test) + { + retdata = (m_megadrive_io_data_regs[0] & 0xc0); + } + else if (m_megadrive_io_data_regs[portnum] & 0x40) + { + /* here we read B, C & the directional buttons */ + retdata = (m_megadrive_io_data_regs[portnum] & helper_3b) | + ((((m_io_pad3b[portnum] ? m_io_pad3b[portnum]->read() : 0) & 0x3f) | 0x40) & ~helper_3b); + } + else + { + /* here we read ((Start & A) >> 2) | Up and Down */ + retdata = (m_megadrive_io_data_regs[portnum] & helper_3b) | + (((((m_io_pad3b[portnum] ? m_io_pad3b[portnum]->read() : 0) & 0xc0) >> 2) | + ((m_io_pad3b[portnum] ? m_io_pad3b[portnum]->read() : 0) & 0x03) | 0x40) & ~helper_3b); + } + } + + return retdata; +} + + +void md_cons_state::mess_md_io_write_data_port(offs_t offset, uint16_t data) +{ + int portnum = offset; + int controller; + + switch (portnum) + { + case 0: + controller = (m_io_ctrlr->read() & 0x0f); + break; + + case 1: + controller = (m_io_ctrlr->read() & 0xf0); + break; + + default: + controller = 0; + break; + } + + if (controller) + { + if (m_megadrive_io_ctrl_regs[portnum] & 0x40) + { + if (((m_megadrive_io_data_regs[portnum] & 0x40) == 0x00) && ((data & 0x40) == 0x40)) + { + m_io_stage[portnum]++; + m_io_timeout[portnum]->adjust(m_maincpu->cycles_to_attotime(8192)); + } + + } + } + m_megadrive_io_data_regs[portnum] = data; + //osd_printf_debug("Writing IO Data Register #%d data %04x\n",portnum,data); +} + + +/************************************* + * + * Input ports + * + *************************************/ + + +static INPUT_PORTS_START( md_base ) + PORT_START("PAD1_3B") /* Joypad 1 (3 button + start) NOT READ DIRECTLY */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 B") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 C") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 A") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) + + PORT_START("PAD2_3B") /* Joypad 2 (3 button + start) NOT READ DIRECTLY */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 B") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 C") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 A") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) + + PORT_START("PAD1_6B") /* Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 B") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 C") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 A") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + + PORT_START("EXTRA1") /* Extra buttons for Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) PORT_NAME("P1 Z") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_NAME("P1 Y") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME("P1 X") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1) PORT_NAME("P1 Mode") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) + + PORT_START("PAD2_6B") /* Joypad 2 (6 button + start + mode) NOT READ DIRECTLY */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 B") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 C") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 A") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + + PORT_START("EXTRA2") /* Extra buttons for Joypad 2 (6 button + start + mode) NOT READ DIRECTLY */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) PORT_NAME("P2 Z") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) PORT_NAME("P2 Y") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("P2 X") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(2) PORT_NAME("P2 Mode") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) + + PORT_START("RESET") /* Buttons on Genesis Console */ + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Reset Button") PORT_IMPULSE(1) // reset, resets 68k (and..?) +INPUT_PORTS_END + +static INPUT_PORTS_START( md ) + PORT_INCLUDE( md_base ) + + PORT_START("CTRLSEL") /* Controller selection */ + PORT_CONFNAME( 0x0f, 0x00, "Player 1 Controller" ) + PORT_CONFSETTING( 0x00, "Joystick 3 Buttons" ) + PORT_CONFSETTING( 0x01, "Joystick 6 Buttons" ) +// PORT_CONFSETTING( 0x02, "Sega Mouse" ) +/* there exists both a 2 buttons version of the Mouse (Jpn ver, to be used with RPGs, it + can aslo be used as trackball) and a 3 buttons version (US ver, no trackball feats.) */ +// PORT_CONFSETTING( 0x03, "Sega Menacer" ) +// PORT_CONFSETTING( 0x04, "Konami Justifier" ) +// PORT_CONFSETTING( 0x05, "Team Player (Sega Multitap)" ) +// PORT_CONFSETTING( 0x06, "4-Play (EA Multitap)" ) +// PORT_CONFSETTING( 0x07, "J-Cart" ) + PORT_CONFNAME( 0xf0, 0x00, "Player 2 Controller" ) + PORT_CONFSETTING( 0x00, "Joystick 3 Buttons" ) + PORT_CONFSETTING( 0x10, "Joystick 6 Buttons" ) +INPUT_PORTS_END + +static INPUT_PORTS_START( megajet ) + PORT_INCLUDE( md_base ) + + PORT_START("CTRLSEL") /* Fixed controller setting for Player 1 */ + PORT_CONFNAME( 0x0f, 0x01, "Player 1 Controller" ) // Fixed + PORT_CONFSETTING( 0x01, "Joystick 6 Buttons" ) + PORT_CONFNAME( 0xf0, 0x00, "Player 2 Controller" ) + PORT_CONFSETTING( 0x00, "Joystick 3 Buttons" ) + PORT_CONFSETTING( 0x10, "Joystick 6 Buttons" ) +INPUT_PORTS_END + +static INPUT_PORTS_START( gen_nomd ) + PORT_INCLUDE( megajet ) + + PORT_MODIFY("RESET") /* No reset button */ + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED ) +INPUT_PORTS_END + + +/************************************* + * + * Machine driver + * + *************************************/ + +void md_cons_state::machine_start() +{ + static const char *const pad6names[2][4] = { + { "PAD1_6B", "PAD2_6B", "UNUSED", "UNUSED" }, + { "EXTRA1", "EXTRA2", "UNUSED", "UNUSED" } + }; + static const char *const pad3names[4] = { "PAD1_3B", "PAD2_3B", "UNUSED", "UNUSED" }; + + m_io_ctrlr = ioport("CTRLSEL"); + + for (int i = 0; i < 4; i++) + { + m_io_pad3b[i] = ioport(pad3names[i]); + m_io_pad6b[0][i] = ioport(pad6names[0][i]); + m_io_pad6b[1][i] = ioport(pad6names[1][i]); + } + + // setup timers for 6 button pads + for (int i = 0; i < 3; i++) + m_io_timeout[i] = timer_alloc(FUNC(md_base_state::io_timeout_timer_callback), this); + + m_vdp->stop_timers(); + + if (m_cart) + m_cart->save_nvram(); + + if (m_z80snd) + m_genz80.z80_run_timer = timer_alloc(FUNC(md_base_state::megadriv_z80_run_state), this); +} + +void md_cons_state::install_cartslot() +{ + if (m_cart) + { + // for now m_cartslot is only in MD and not 32x and SegaCD + m_maincpu->space(AS_PROGRAM).install_read_handler(0x000000, 0x7fffff, read16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::read))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x000000, 0x7fffff, write16s_delegate(*m_cart, FUNC(base_md_cart_slot_device::write))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa13000, 0xa130ff, read16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::read_a13)), write16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::write_a13))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa15000, 0xa150ff, read16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::read_a15)), write16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::write_a15))); +// m_maincpu->space(AS_PROGRAM).install_write_handler(0xa14000, 0xa14003, write16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::write_tmss_bank))); + } +} + +uint16_t md_cons_state::tmss_r(offs_t offset) +{ + if (offset < 0x4000 / 2) + return m_tmss[offset]; + + return 0xffff; +} + +void md_cons_state::tmss_swap_w(uint16_t data) +{ + if (data & 0x0001) + { + install_cartslot(); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xa14100, 0xa14101, write16smo_delegate(*this, FUNC(md_cons_state::tmss_swap_w))); + } + else + { + install_tmss(); + } +} + + +void md_cons_state::install_tmss() +{ + m_maincpu->space(AS_PROGRAM).unmap_readwrite(0x000000, 0x7fffff); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x000000, 0x7fffff, read16sm_delegate(*this, FUNC(md_cons_state::tmss_r))); + + m_maincpu->space(AS_PROGRAM).install_write_handler(0xa14100, 0xa14101, write16smo_delegate(*this, FUNC(md_cons_state::tmss_swap_w))); + +} + + +void md_cons_slot_state::machine_start() +{ + md_cons_state::machine_start(); + + // the SVP introduces some kind of DMA 'lag', which we have to compensate for, this is obvious even on gfx DMAd from ROM (the Speedometer) + if (m_cart && (m_cart->get_type() == SEGA_SVP)) + m_vdp->set_dma_delay(2); + + if (m_tmss) + { + install_tmss(); + } + else + { + install_cartslot(); + } +} + +void md_cons_state::machine_reset() +{ + md_base_state::machine_reset(); + + // if the system has a 32x, pause the extra CPUs until they are actually turned on + if (m_32x) + m_32x->pause_cpu(); +} + +void md_cons_cd_state::machine_start() +{ + md_cons_state::machine_start(); + + // the segaCD introduces some kind of DMA 'lag', which we have to compensate for, + // at least when reading wordram? we might need to check what mode we're in the DMA... + m_vdp->set_dma_delay(2); +} + +// same as screen_eof_megadriv but with addition of 32x and SegaCD/MegaCD pieces +WRITE_LINE_MEMBER(md_cons_state::screen_vblank_console) +{ + if (m_io_reset.read_safe(0) & 0x01) + m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); + + // rising edge + if (state) + { + if (!m_vdp->m_use_alt_timing) + { + bool mode3 = (m_vdp->get_imode() == 3); + m_vdp->vdp_handle_eof(); + m_vdp->m_megadriv_scanline_timer->adjust(attotime::zero); + + if (m_32x) + m_32x->screen_eof(mode3); + + if (m_segacd) + m_segacd->update_total_scanlines(mode3); + } + } +} + +void md_cons_state::dcat16_megadriv_base(machine_config &config) +{ + md_ntsc(config); + + m_maincpu->set_addrmap(AS_PROGRAM, &md_base_state::dcat16_megadriv_map); +} + +void md_cons_slot_state::ms_megadriv(machine_config &config) +{ + md_ntsc(config); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + MD_CART_SLOT(config, m_cart, md_cart, nullptr).set_must_be_loaded(true); + SOFTWARE_LIST(config, "cart_list").set_original("megadriv"); +} + +void md_cons_slot_state::ms_megadpal(machine_config &config) +{ + md_pal(config); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + MD_CART_SLOT(config, m_cart, md_cart, nullptr).set_must_be_loaded(true); + SOFTWARE_LIST(config, "cart_list").set_original("megadriv"); +} + +void md_cons_slot_state::ms_megadriv2(machine_config &config) +{ + md2_ntsc(config); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + MD_CART_SLOT(config, m_cart, md_cart, nullptr).set_must_be_loaded(true); + SOFTWARE_LIST(config, "cart_list").set_original("megadriv"); +} + +void md_cons_slot_state::genesis_tmss(machine_config &config) +{ + ms_megadriv(config); + subdevice("cart_list")->set_filter("TMSS"); +} + +void md_cons_state::dcat16_megadriv(machine_config &config) +{ + dcat16_megadriv_base(config); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + +// has SD card slot instead? +// MD_CART_SLOT(config, m_cart, md_cart, nullptr).set_must_be_loaded(true); +// SOFTWARE_LIST(config, "cart_list").set_original("megadriv"); +} + +/************************************* + * + * ROM definition(s) + * + *************************************/ + + +/* we don't use the bios rom (it's not needed and only provides security on early models) */ + +ROM_START(genesis) + ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) + ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) +ROM_END + +ROM_START(megadriv) + ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) + ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) +ROM_END + +ROM_START(megadrij) + ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) + ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) +ROM_END + +ROM_START(genesis_tmss) + ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) + ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) + + ROM_REGION16_BE(0x4000, "tmss", ROMREGION_ERASEFF) + ROM_LOAD( "tmss_usa.bin", 0x0000, 0x4000, CRC(5f5e64eb) SHA1(453fca4e1db6fae4a10657c4451bccbb71955628) ) +ROM_END + +ROM_START(dcat16) + ROM_REGION(0x800000, "maincpu", ROMREGION_ERASEFF) + ROM_LOAD16_WORD_SWAP( "mg6025.u1", 0x0000, 0x800000, CRC(5453d673) SHA1(b9f8d849cbed81fe73525229f4897ccaeeb7a833) ) + + ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) +ROM_END + +ROM_START(megajet) + ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) + ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) +ROM_END + +ROM_START(gen_nomd) + ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) + ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) +ROM_END + +/************************************* + * + * Driver initialization + * + *************************************/ + +void md_cons_state::init_mess_md_common() +{ + m_megadrive_io_read_data_port_ptr = read8sm_delegate(*this, FUNC(md_cons_state::mess_md_io_read_data_port)); + m_megadrive_io_write_data_port_ptr = write16sm_delegate(*this, FUNC(md_cons_state::mess_md_io_write_data_port)); +} + +void md_cons_state::init_genesis() +{ + init_megadriv(); + init_mess_md_common(); + + if (m_32x) + { + m_32x->set_32x_pal(false); + m_32x->set_framerate(60); + m_32x->set_total_scanlines(262); + } + if (m_segacd) + { + m_segacd->set_framerate(60); + m_segacd->set_total_scanlines(262); + } + + m_version_hi_nibble = 0x80; // Export NTSC + if (!m_segacd) + m_version_hi_nibble |= 0x20; +} + +void md_cons_state::init_md_eur() +{ + init_megadrie(); + init_mess_md_common(); + + if (m_32x) + { + m_32x->set_32x_pal(true); + m_32x->set_framerate(50); + m_32x->set_total_scanlines(313); + } + if (m_segacd) + { + m_segacd->set_framerate(50); + m_segacd->set_total_scanlines(313); + } + + m_version_hi_nibble = 0xc0; // Export PAL + if (!m_segacd) + m_version_hi_nibble |= 0x20; +} + +void md_cons_state::init_md_jpn() +{ + init_megadrij(); + init_mess_md_common(); + + if (m_32x) + { + m_32x->set_32x_pal(false); + m_32x->set_framerate(60); + m_32x->set_total_scanlines(262); + } + if (m_segacd) + { + m_segacd->set_framerate(60); + m_segacd->set_total_scanlines(262); + } + + m_version_hi_nibble = 0x00; // JPN NTSC + if (!m_segacd) + m_version_hi_nibble |= 0x20; +} + +/****************************************** 32X emulation ****************************************/ + +DEVICE_IMAGE_LOAD_MEMBER( md_cons_state::_32x_cart ) +{ + uint32_t length; + std::vector temp_copy; + uint16_t *ROM16; + uint32_t *ROM32; + int i; + + if (!image.loaded_through_softlist()) + { + length = image.length(); + temp_copy.resize(length); + image.fread(&temp_copy[0], length); + } + else + { + length = image.get_software_region_length("rom"); + temp_copy.resize(length); + memcpy(&temp_copy[0], image.get_software_region("rom"), length); + } + + /* Copy the cart image in the locations the driver expects */ + // Notice that, by using pick_integer, we are sure the code works on both LE and BE machines + ROM16 = (uint16_t *) memregion("gamecart")->base(); + for (i = 0; i < length; i += 2) + ROM16[i / 2] = pick_integer_be(&temp_copy[0], i, 2); + + ROM32 = (uint32_t *) memregion("gamecart_sh2")->base(); + for (i = 0; i < length; i += 4) + ROM32[i / 4] = pick_integer_be(&temp_copy[0], i, 4); + + ROM16 = (uint16_t *) memregion("maincpu")->base(); + for (i = 0x00; i < length; i += 2) + ROM16[i / 2] = pick_integer_be(&temp_copy[0], i, 2); + + return image_init_result::PASS; +} + + +void md_cons_state::_32x_scanline_callback(int x, uint32_t priority, uint32_t &lineptr) +{ + if (m_32x) + m_32x->render_videobuffer_to_screenbuffer(x, priority, lineptr); +} + +void md_cons_state::_32x_interrupt_callback(int scanline, int irq6) +{ + if (m_32x) + m_32x->interrupt_cb(scanline, irq6); +} + +void md_cons_state::_32x_scanline_helper_callback(int scanline) +{ + if (m_32x) + m_32x->render_videobuffer_to_screenbuffer_helper(scanline); +} + +void md_cons_state::genesis_32x(machine_config &config) +{ + md_ntsc(config); + + m_vdp->set_md_32x_scanline(FUNC(md_cons_state::_32x_scanline_callback)); + m_vdp->set_md_32x_scanline_helper(FUNC(md_cons_state::_32x_scanline_helper_callback)); + m_vdp->set_md_32x_interrupt(FUNC(md_cons_state::_32x_interrupt_callback)); + m_vdp->reset_routes(); + m_vdp->add_route(ALL_OUTPUTS, "lspeaker", (0.50)/2); + m_vdp->add_route(ALL_OUTPUTS, "rspeaker", (0.50)/2); + + SEGA_32X_NTSC(config, m_32x, (MASTER_CLOCK_NTSC * 3) / 7, m_maincpu, m_scan_timer); + m_32x->set_screen("megadriv"); + m_32x->add_route(0, "lspeaker", 1.00); + m_32x->add_route(1, "rspeaker", 1.00); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + // we need to remove and re-add the YM because the balance is different + // due to MAME having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is silent?!) + m_ymsnd->reset_routes(); + m_ymsnd->add_route(0, "lspeaker", (0.50)/2); + m_ymsnd->add_route(1, "rspeaker", (0.50)/2); + + generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin")); + cartslot.set_must_be_loaded(true); + cartslot.set_device_load(FUNC(md_cons_state::_32x_cart)); + + SOFTWARE_LIST(config, "cart_list").set_original("32x").set_filter("NTSC-U"); +} + + +void md_cons_state::mdj_32x(machine_config &config) +{ + md_ntsc(config); + + m_vdp->set_md_32x_scanline(FUNC(md_cons_state::_32x_scanline_callback)); + m_vdp->set_md_32x_scanline_helper(FUNC(md_cons_state::_32x_scanline_helper_callback)); + m_vdp->set_md_32x_interrupt(FUNC(md_cons_state::_32x_interrupt_callback)); + m_vdp->reset_routes(); + m_vdp->add_route(ALL_OUTPUTS, "lspeaker", (0.50)/2); + m_vdp->add_route(ALL_OUTPUTS, "rspeaker", (0.50)/2); + + SEGA_32X_NTSC(config, m_32x, (MASTER_CLOCK_NTSC * 3) / 7, m_maincpu, m_scan_timer); + m_32x->set_screen("megadriv"); + m_32x->add_route(0, "lspeaker", 1.00); + m_32x->add_route(1, "rspeaker", 1.00); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + // we need to remove and re-add the sound system because the balance is different + // due to MAME having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is silent?!) + m_ymsnd->reset_routes(); + m_ymsnd->add_route(0, "lspeaker", (0.50)/2); + m_ymsnd->add_route(1, "rspeaker", (0.50)/2); + + generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin")); + cartslot.set_must_be_loaded(true); + cartslot.set_device_load(FUNC(md_cons_state::_32x_cart)); + + SOFTWARE_LIST(config, "cart_list").set_original("32x").set_filter("NTSC-J"); +} + + +void md_cons_state::md_32x(machine_config &config) +{ + md_pal(config); + + m_vdp->set_md_32x_scanline(FUNC(md_cons_state::_32x_scanline_callback)); + m_vdp->set_md_32x_scanline_helper(FUNC(md_cons_state::_32x_scanline_helper_callback)); + m_vdp->set_md_32x_interrupt(FUNC(md_cons_state::_32x_interrupt_callback)); + m_vdp->reset_routes(); + m_vdp->add_route(ALL_OUTPUTS, "lspeaker", (0.50)/2); + m_vdp->add_route(ALL_OUTPUTS, "rspeaker", (0.50)/2); + + SEGA_32X_PAL(config, m_32x, (MASTER_CLOCK_PAL * 3) / 7, m_maincpu, m_scan_timer); + m_32x->set_screen("megadriv"); + m_32x->add_route(0, "lspeaker", 1.00); + m_32x->add_route(1, "rspeaker", 1.00); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + // we need to remove and re-add the sound system because the balance is different + // due to MAME having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is silent?!) + m_ymsnd->reset_routes(); + m_ymsnd->add_route(0, "lspeaker", (0.50)/2); + m_ymsnd->add_route(1, "rspeaker", (0.50)/2); + + generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin")); + cartslot.set_must_be_loaded(true); + cartslot.set_device_load(FUNC(md_cons_state::_32x_cart)); + + SOFTWARE_LIST(config, "cart_list").set_original("32x").set_filter("PAL"); +} + + + +#define _32X_ROMS \ + ROM_REGION16_BE( 0x400000, "gamecart", ROMREGION_ERASE00 ) /* 68000 Code */ \ + ROM_REGION32_BE( 0x400000, "gamecart_sh2", ROMREGION_ERASE00 ) /* Copy for the SH2 */ \ + ROM_REGION16_BE( 0x400000, "32x_68k_bios", 0 ) /* 68000 Code */ \ + ROM_LOAD( "32x_g_bios.bin", 0x000000, 0x000100, CRC(5c12eae8) SHA1(dbebd76a448447cb6e524ac3cb0fd19fc065d944) ) \ + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) \ + /* temp, rom should only be visible here when one of the regs is set, tempo needs it */ \ + ROM_COPY( "32x_68k_bios", 0x0, 0x0, 0x100) \ + ROM_REGION32_BE( 0x400000, "master", 0 ) /* SH2 Code */ \ + ROM_SYSTEM_BIOS( 0, "retail", "Mars Version 1.0 (retail)" ) \ + ROMX_LOAD( "32x_m_bios.bin", 0x000000, 0x000800, CRC(dd9c46b8) SHA1(1e5b0b2441a4979b6966d942b20cc76c413b8c5e), ROM_BIOS(0) ) \ + ROM_SYSTEM_BIOS( 1, "sdk", "Mars Version 1.0 (early sdk)" ) \ + ROMX_LOAD( "32x_m_bios_sdk.bin", 0x000000, 0x000800, BAD_DUMP CRC(c7102c53) SHA1(ed73a47f186b373b8eff765f84ef26c3d9ef6cb0), ROM_BIOS(1) ) \ + ROM_REGION32_BE( 0x400000, "slave", 0 ) /* SH2 Code */ \ + ROM_LOAD( "32x_s_bios.bin", 0x000000, 0x000400, CRC(bfda1fe5) SHA1(4103668c1bbd66c5e24558e73d4f3f92061a109a) ) + +ROM_START( 32x ) + _32X_ROMS +ROM_END + +ROM_START( 32xe ) + _32X_ROMS +ROM_END + +ROM_START( 32xj ) + _32X_ROMS +ROM_END + + +/****************************************** SegaCD emulation ****************************************/ + +void md_cons_cd_state::genesis_scd(machine_config &config) +{ + md_ntsc(config); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + SEGA_SEGACD_US(config, m_segacd, 0); + m_segacd->set_palette("gen_vdp:gfx_palette"); + m_segacd->set_hostcpu(m_maincpu); + m_segacd->set_screen("megadriv"); + + config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu + + CDROM(config, "cdrom").set_interface("scd_cdrom"); + + SOFTWARE_LIST(config, "cd_list").set_original("segacd"); +} + +void md_cons_cd_state::genesis2_scd(machine_config &config) +{ + md2_ntsc(config); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + SEGA_SEGACD_US(config, m_segacd, 0); + m_segacd->set_palette("gen_vdp:gfx_palette"); + m_segacd->set_hostcpu(m_maincpu); + m_segacd->set_screen("megadriv"); + + config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu + + CDROM(config, "cdrom").set_interface("scd_cdrom"); + + SOFTWARE_LIST(config, "cd_list").set_original("segacd"); +} + +void md_cons_cd_state::md_scd(machine_config &config) +{ + md_pal(config); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + SEGA_SEGACD_EUROPE(config, m_segacd, 0); + m_segacd->set_palette("gen_vdp:gfx_palette"); + m_segacd->set_hostcpu(m_maincpu); + m_segacd->set_screen("megadriv"); + + config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu + + CDROM(config, "cdrom").set_interface("scd_cdrom"); + + SOFTWARE_LIST(config, "cd_list").set_original("megacd"); +} + +void md_cons_cd_state::md2_scd(machine_config &config) +{ + md2_pal(config); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + SEGA_SEGACD_EUROPE(config, m_segacd, 0); + m_segacd->set_palette("gen_vdp:gfx_palette"); + m_segacd->set_hostcpu(m_maincpu); + m_segacd->set_screen("megadriv"); + + config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu + + CDROM(config, "cdrom").set_interface("scd_cdrom"); + + SOFTWARE_LIST(config, "cd_list").set_original("megacd"); +} + +void md_cons_cd_state::mdj_scd(machine_config &config) +{ + md_ntsc(config); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + SEGA_SEGACD_JAPAN(config, m_segacd, 0); + m_segacd->set_palette("gen_vdp:gfx_palette"); + m_segacd->set_hostcpu(m_maincpu); + m_segacd->set_screen("megadriv"); + + config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu + + CDROM(config, "cdrom").set_interface("scd_cdrom"); + + SOFTWARE_LIST(config, "cd_list").set_original("megacdj"); +} + +void md_cons_cd_state::md2j_scd(machine_config &config) +{ + md2_ntsc(config); + + subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); + + SEGA_SEGACD_JAPAN(config, m_segacd, 0); + m_segacd->set_palette("gen_vdp:gfx_palette"); + m_segacd->set_hostcpu(m_maincpu); + m_segacd->set_screen("megadriv"); + + config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu + + CDROM(config, "cdrom").set_interface("scd_cdrom"); + + SOFTWARE_LIST(config, "cd_list").set_original("megacdj"); +} + +/******************SEGA CD + 32X****************************/ + +void md_cons_cd_state::genesis_32x_scd(machine_config &config) +{ + genesis_32x(config); + + SEGA_SEGACD_US(config, m_segacd, 0); + m_segacd->set_palette("gen_vdp:gfx_palette"); + m_segacd->set_hostcpu(m_maincpu); + m_segacd->set_screen("megadriv"); + + config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu + + CDROM(config, "cdrom").set_interface("scd_cdrom"); + + config.device_remove("cartslot"); + GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin").set_device_load(FUNC(md_cons_state::_32x_cart)); + + //config.m_perfect_cpu_quantum = subtag("32x_master_sh2"); + SOFTWARE_LIST(config, "cd_list").set_original("segacd"); +} + +void md_cons_cd_state::md_32x_scd(machine_config &config) +{ + md_32x(config); + + SEGA_SEGACD_EUROPE(config, m_segacd, 0); + m_segacd->set_palette("gen_vdp:gfx_palette"); + m_segacd->set_hostcpu(m_maincpu); + m_segacd->set_screen("megadriv"); + + config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu + + CDROM(config, "cdrom").set_interface("scd_cdrom"); + + config.device_remove("cartslot"); + GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin").set_device_load(FUNC(md_cons_state::_32x_cart)); + + //config.m_perfect_cpu_quantum = subtag("32x_master_sh2"); + SOFTWARE_LIST(config, "cd_list").set_original("megacd"); +} + +void md_cons_cd_state::mdj_32x_scd(machine_config &config) +{ + mdj_32x(config); + + SEGA_SEGACD_JAPAN(config, m_segacd, 0); + m_segacd->set_palette("gen_vdp:gfx_palette"); + m_segacd->set_hostcpu(m_maincpu); + m_segacd->set_screen("megadriv"); + + config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu + + CDROM(config, "cdrom").set_interface("scd_cdrom"); + + config.device_remove("cartslot"); + GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin").set_device_load(FUNC(md_cons_state::_32x_cart)); + + //config.m_perfect_cpu_quantum = subtag("32x_master_sh2"); + SOFTWARE_LIST(config, "cd_list").set_original("megacdj"); +} + +/* We need proper names for most of these BIOS ROMs! */ +ROM_START( segacd ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + /* v1.10 confirmed dump by dead_screem */ + ROM_LOAD( "mpr-15045b.bin", 0x000000, 0x020000, CRC(c6d10268) SHA1(f4f315adcef9b8feb0364c21ab7f0eaf5457f3ed) ) +ROM_END + +ROM_START( megacd ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + /* v1.00, confirmed good dump */ + ROM_LOAD( "megacd_model1_bios_1_00_e.bin", 0x000000, 0x020000, CRC(529ac15a) SHA1(f891e0ea651e2232af0c5c4cb46a0cae2ee8f356) ) +ROM_END + +ROM_START( megacdj ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + ROM_DEFAULT_BIOS("v100g") // this seems the only revision where the cursor in CD menu works, allowing to boot games + /* Confirmed by ElBarto */ + ROM_SYSTEM_BIOS(0, "v100s", "v1.00S") + ROMX_LOAD( "mpr-14088h.bin", 0x000000, 0x020000, CRC(3773d5aa) SHA1(bbf729a1aaa1667b783749299e1ad932aaf5f253), ROM_BIOS(0) | ROM_GROUPWORD | ROM_REVERSE) + /* Confirmed by ElBarto */ + ROM_SYSTEM_BIOS(1, "v100g", "v1.00G") + ROMX_LOAD( "epr-14088b.bin", 0x000000, 0x020000, CRC(69ed6ccd) SHA1(27d11c3836506f01ee81cd142c0cd8b51abebbd2), ROM_BIOS(1) | ROM_GROUPWORD | ROM_REVERSE) + /* Confirmed by ElBarto */ + ROM_SYSTEM_BIOS(2, "v100l", "v1.00L") + ROMX_LOAD( "mpr-14088c.bin", 0x000000, 0x020000, CRC(03134289) SHA1(d60cb5a53f26d6b13e354bc149217587f2301718), ROM_BIOS(2) | ROM_GROUPWORD | ROM_REVERSE) + /* Confirmed by ElBarto */ + ROM_SYSTEM_BIOS(3, "v100o", "v1.00O") + ROMX_LOAD( "epr-14088d.bin", 0x000000, 0x020000, CRC(dfa95ee9) SHA1(e13666c76fa0a2e94e2f651b26b0fd625bf55f07), ROM_BIOS(3) | ROM_GROUPWORD | ROM_REVERSE) + ROM_SYSTEM_BIOS(4, "v100p", "v1.00P") // CRC: e2e70bc8 when byteswapped + ROMX_LOAD( "epr-14088e.bin", 0x000000, 0x020000, CRC(9d2da8f2) SHA1(4846f448160059a7da0215a5df12ca160f26dd69), ROM_BIOS(4) ) + // EEPROM had no SEGA's label, might be 14088(no rev) or 14088A + ROM_SYSTEM_BIOS(5, "v100c", "v1.00C") // CRC: c3b60c13 when byteswapped + ROMX_LOAD( "100c.bin", 0x000000, 0x020000, CRC(41af44c4) SHA1(f30d109d1c2f7c9feaf38600c65834261db73d1f), ROM_BIOS(5) ) + ROM_SYSTEM_BIOS(6, "v111", "v1.11") // CRC: e0a6179b when byteswapped + ROMX_LOAD( "mpr-14837.bin", 0x000000, 0x020000, CRC(4be18ff6) SHA1(204758d5a64c24e96e1a9fe6bd82e1878fef7ade), ROM_BIOS(6) ) +ROM_END + +/* Asia bios, when run in USA region will show : +ERROR! +THIS IS A PAL-COMPATIBLE MEGA CD +FOR EXCLUSIVE USE IN SOUTHEAST ASIA. + +Confirmed by Jakovasaur +*/ +ROM_START( megacda ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + ROM_LOAD( "epr-14536h.bin", 0x000000, 0x020000, CRC(550f30bb) SHA1(e4193c6ae44c3cea002707d2a88f1fbcced664de)) +ROM_END + +ROM_START( segacd2 ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + ROM_SYSTEM_BIOS(0, "v211x", "Model 2 v2.11X") + ROMX_LOAD( "mpr-15764-t.bin", 0x000000, 0x020000, CRC(2e49d72c) SHA1(328a3228c29fba244b9db2055adc1ec4f7a87e6b), ROM_BIOS(0) ) + ROM_SYSTEM_BIOS(1, "v200", "Model 2 v2.00") /* verified dump */ + ROMX_LOAD( "us_scd2_930314.bin", 0x000000, 0x020000, CRC(8af65f58) SHA1(5a8c4b91d3034c1448aac4b5dc9a6484fce51636), ROM_BIOS(1) ) + /* this is reportedly a bad dump, it has many differences from the verified dump and does not boot in Kega */ + /* ROMX_LOAD( "segacd_model2_bios_2_00_u.bin", 0x000000, 0x020000, CRC(340b4be4) SHA1(bd3ee0c8ab732468748bf98953603ce772612704), ROM_BIOS(1) ) */ + ROM_SYSTEM_BIOS(2, "v200w", "Model 2 v2.00W") + ROMX_LOAD( "segacd_model2_bios_2_00w_u.bin", 0x000000, 0x020000, CRC(9f6f6276) SHA1(5adb6c3af218c60868e6b723ec47e36bbdf5e6f0), ROM_BIOS(2) ) +ROM_END + +/* v2.00, v2.00w confirmed good dumps by ElBarto */ +/* v2.11x confirmed good dump by TwistedTom */ +ROM_START( megacd2 ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + ROM_SYSTEM_BIOS(0, "v211x", "v2.11X") // MK-4102A-50 Sony pcb + ROMX_LOAD( "mpr-15811-t.bin", 0x000000, 0x020000, CRC(391a80d2) SHA1(aa4bb1803b06714fbc04d8a209161876796dd511), ROM_BIOS(0) | ROM_GROUPWORD | ROM_REVERSE ) + ROM_SYSTEM_BIOS(1, "v200w", "v2.00W") // MK-4102-50 Funai pcb + ROMX_LOAD( "mpr-15512a.bin", 0x000000, 0x020000, CRC(53f1757c) SHA1(67bf3970ca5a05fd5ce3d6c446789c5d971b98a4), ROM_BIOS(1) | ROM_GROUPWORD | ROM_REVERSE ) + ROM_SYSTEM_BIOS(2, "v200", "v2.00") // ? + ROMX_LOAD( "mpr-15512.bin", 0x000000, 0x020000, CRC(cb76f114) SHA1(939f173cadc41e996a3c34498da1bf55e7e18ff8), ROM_BIOS(2) | ROM_GROUPWORD | ROM_REVERSE ) +ROM_END + +/* Confirmed good dump by ElBarto */ +ROM_START( megacd2j ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + ROM_SYSTEM_BIOS(0, "v200c", "v2.00C") + ROMX_LOAD( "mpr-15398.bin", 0x000000, 0x020000, CRC(1e4344e6) SHA1(4d1251a6973d932e734ae5e8c6b9b55eb40e4143), ROM_BIOS(0) | ROM_GROUPWORD | ROM_REVERSE ) +ROM_END + +ROM_START( aiwamcd ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + /* v2.11 */ + ROM_LOAD( "mpr-15768-t.bin", 0x000000, 0x020000, CRC(8052c7a0) SHA1(219d284dcf63ce366a4dc6d1ff767a0d2eea283d) ) +ROM_END + +ROM_START( laseract ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + ROM_SYSTEM_BIOS(0, "v104", "v1.04") + ROMX_LOAD( "laseractive_bios_1_04_u.bin", 0x000000, 0x020000, CRC(50cd3d23) SHA1(aa811861f8874775075bd3f53008c8aaf59b07db), ROM_BIOS(0) ) + ROM_SYSTEM_BIOS(1, "v102", "v1.02") + ROMX_LOAD( "laseractive_bios_1_02_u.bin", 0x000000, 0x020000, CRC(3b10cf41) SHA1(8af162223bb12fc19b414f126022910372790103), ROM_BIOS(1) ) +ROM_END + +ROM_START( laseractj ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + ROM_SYSTEM_BIOS(0, "v105", "v1.05") + ROMX_LOAD( "mega-ld 1.05 bios.bin", 0x000000, 0x020000, CRC(474aaa44) SHA1(b3b1d880e288b6dc79eec0ff1b0480c229ec141d), ROM_BIOS(0) ) + ROM_SYSTEM_BIOS(1, "v102", "v1.02") + ROMX_LOAD( "laseractive_bios_1_02_j.bin", 0x000000, 0x020000, CRC(00eedb3a) SHA1(26237b333db4a4c6770297fa5e655ea95840d5d9), ROM_BIOS(1) ) +ROM_END + +ROM_START( xeye ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + /* v2.00 (US), confirmed good with a chip dump */ + ROM_LOAD( "g304.bin", 0x000000, 0x020000, CRC(290f8e33) SHA1(651f14d5a5e0ecb974a60c0f43b1d2006323fb09) ) +ROM_END + +ROM_START( wmega ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + /* v1.00 (Japan NTSC) Sega BIOS, chip-dumped */ + ROM_LOAD( "g301.bin", 0x000000, 0x020000, CRC(d21fe71d) SHA1(3fc9358072f74bd24e3e297ea11b2bf15a7af891) ) +ROM_END + +ROM_START( wmegam2 ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + /* v2.00 */ + ROM_LOAD( "wondermega_m2_bios_2_00_j.bin", 0x000000, 0x020000, CRC(2b19972f) SHA1(b3f32e409bd5508c89ed8be33d41a58d791d0e5d) ) +ROM_END + +ROM_START( cdx ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + /* v2.21X */ + ROM_LOAD( "segacdx_bios_2_21_u.bin", 0x000000, 0x020000, CRC(d48c44b5) SHA1(2b125c0545afa089b617f2558e686ea723bdc06e) ) +ROM_END + +ROM_START( multmega ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + /* v2.21X */ + ROM_LOAD( "opr-16140.bin", 0x000000, 0x020000, CRC(aacb851e) SHA1(75548ac9aaa6e81224499f9a1403b2b42433f5b7) ) + /* the below was marked "confirmed good dump", but 0x72 and 0x73 are 0xFF, indicating a bad dump made from memory */ + /* ROM_LOAD( "multimega_bios_2_21_e.bin", 0x000000, 0x020000, CRC(34d3cce1) SHA1(73fc9c014ad803e9e7d8076b3642a8a5224b3e51) ) */ +ROM_END + +/* some games use the 32x and SegaCD together to give better quality FMV */ +ROM_START( 32x_scd ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + + ROM_REGION16_BE( 0x400000, "gamecart", 0 ) /* 68000 Code */ + ROM_LOAD( "mpr-15764-t.bin", 0x000000, 0x020000, CRC(2e49d72c) SHA1(328a3228c29fba244b9db2055adc1ec4f7a87e6b) ) + + ROM_REGION32_BE( 0x400000, "gamecart_sh2", 0 ) /* Copy for the SH2 */ + ROM_COPY( "gamecart", 0x000000, 0x0, 0x400000) + + ROM_REGION16_BE( 0x400000, "32x_68k_bios", 0 ) /* 68000 Code */ + ROM_LOAD( "32x_g_bios.bin", 0x000000, 0x000100, CRC(5c12eae8) SHA1(dbebd76a448447cb6e524ac3cb0fd19fc065d944) ) + + ROM_REGION32_BE( 0x400000, "master", 0 ) /* SH2 Code */ + ROM_LOAD( "32x_m_bios.bin", 0x000000, 0x000800, CRC(dd9c46b8) SHA1(1e5b0b2441a4979b6966d942b20cc76c413b8c5e) ) + + ROM_REGION32_BE( 0x400000, "slave", 0 ) /* SH2 Code */ + ROM_LOAD( "32x_s_bios.bin", 0x000000, 0x000400, CRC(bfda1fe5) SHA1(4103668c1bbd66c5e24558e73d4f3f92061a109a) ) +ROM_END + +ROM_START( 32x_mcd ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + + ROM_REGION16_BE( 0x400000, "gamecart", 0 ) /* 68000 Code */ + ROM_LOAD( "megacd_model1_bios_1_00_e.bin", 0x000000, 0x020000, CRC(529ac15a) SHA1(f891e0ea651e2232af0c5c4cb46a0cae2ee8f356) ) + + ROM_REGION32_BE( 0x400000, "gamecart_sh2", 0 ) /* Copy for the SH2 */ + ROM_COPY( "gamecart", 0x000000, 0x0, 0x400000) + + ROM_REGION16_BE( 0x400000, "32x_68k_bios", 0 ) /* 68000 Code */ + ROM_LOAD( "32x_g_bios.bin", 0x000000, 0x000100, CRC(5c12eae8) SHA1(dbebd76a448447cb6e524ac3cb0fd19fc065d944) ) + + ROM_REGION32_BE( 0x400000, "master", 0 ) /* SH2 Code */ + ROM_LOAD( "32x_m_bios.bin", 0x000000, 0x000800, CRC(dd9c46b8) SHA1(1e5b0b2441a4979b6966d942b20cc76c413b8c5e) ) + + ROM_REGION32_BE( 0x400000, "slave", 0 ) /* SH2 Code */ + ROM_LOAD( "32x_s_bios.bin", 0x000000, 0x000400, CRC(bfda1fe5) SHA1(4103668c1bbd66c5e24558e73d4f3f92061a109a) ) +ROM_END + +ROM_START( 32x_mcdj ) + ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) + + ROM_REGION16_BE( 0x400000, "gamecart", 0 ) /* 68000 Code */ + ROM_DEFAULT_BIOS("v100g") // this seems the only revision where the cursor in CD menu works, allowing to boot games + /* Confirmed by ElBarto */ + ROM_SYSTEM_BIOS(0, "v100s", "v1.00S") + ROMX_LOAD( "mpr-14088h.bin", 0x000000, 0x020000, CRC(3773d5aa) SHA1(bbf729a1aaa1667b783749299e1ad932aaf5f253), ROM_BIOS(0) | ROM_GROUPWORD | ROM_REVERSE) + /* Confirmed by ElBarto */ + ROM_SYSTEM_BIOS(1, "v100g", "v1.00G") + ROMX_LOAD( "epr-14088b.bin", 0x000000, 0x020000, CRC(69ed6ccd) SHA1(27d11c3836506f01ee81cd142c0cd8b51abebbd2), ROM_BIOS(1) | ROM_GROUPWORD | ROM_REVERSE) + /* Confirmed by ElBarto */ + ROM_SYSTEM_BIOS(2, "v100l", "v1.00L") + ROMX_LOAD( "mpr-14088c.bin", 0x000000, 0x020000, CRC(03134289) SHA1(d60cb5a53f26d6b13e354bc149217587f2301718), ROM_BIOS(2) | ROM_GROUPWORD | ROM_REVERSE) + /* Confirmed by ElBarto */ + ROM_SYSTEM_BIOS(3, "v100o", "v1.00O") + ROMX_LOAD( "epr-14088d.bin", 0x000000, 0x020000, CRC(dfa95ee9) SHA1(e13666c76fa0a2e94e2f651b26b0fd625bf55f07), ROM_BIOS(3) | ROM_GROUPWORD | ROM_REVERSE) + ROM_SYSTEM_BIOS(4, "v100p", "v1.00P") // CRC: e2e70bc8 when byteswapped + ROMX_LOAD( "epr-14088e.bin", 0x000000, 0x020000, CRC(9d2da8f2) SHA1(4846f448160059a7da0215a5df12ca160f26dd69), ROM_BIOS(4) ) + + ROM_REGION32_BE( 0x400000, "gamecart_sh2", 0 ) /* Copy for the SH2 */ + ROM_COPY( "gamecart", 0x000000, 0x0, 0x400000) + + ROM_REGION16_BE( 0x400000, "32x_68k_bios", 0 ) /* 68000 Code */ + ROM_LOAD( "32x_g_bios.bin", 0x000000, 0x000100, CRC(5c12eae8) SHA1(dbebd76a448447cb6e524ac3cb0fd19fc065d944) ) + + ROM_REGION32_BE( 0x400000, "master", 0 ) /* SH2 Code */ + ROM_LOAD( "32x_m_bios.bin", 0x000000, 0x000800, CRC(dd9c46b8) SHA1(1e5b0b2441a4979b6966d942b20cc76c413b8c5e) ) + + ROM_REGION32_BE( 0x400000, "slave", 0 ) /* SH2 Code */ + ROM_LOAD( "32x_s_bios.bin", 0x000000, 0x000400, CRC(bfda1fe5) SHA1(4103668c1bbd66c5e24558e73d4f3f92061a109a) ) +ROM_END + + + +/*************************************************************************** + + Game driver(s) + +***************************************************************************/ + +/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ +CONS( 1989, genesis, 0, 0, ms_megadriv, md, md_cons_slot_state, init_genesis, "Sega", "Genesis (USA, NTSC)", MACHINE_SUPPORTS_SAVE ) +CONS( 1990, megadriv, genesis, 0, ms_megadpal, md, md_cons_slot_state, init_md_eur, "Sega", "Mega Drive (Europe, PAL)", MACHINE_SUPPORTS_SAVE ) +CONS( 1988, megadrij, genesis, 0, ms_megadriv, md, md_cons_slot_state, init_md_jpn, "Sega", "Mega Drive (Japan, NTSC)", MACHINE_SUPPORTS_SAVE ) + +// 1990+ models had the TMSS security chip, leave this as a clone, it reduces compatibility and nothing more. +CONS( 1990, genesis_tmss, genesis, 0, genesis_tmss, md, md_cons_slot_state, init_genesis, "Sega", "Genesis (USA, NTSC, with TMSS chip)", MACHINE_SUPPORTS_SAVE ) + +// the 32X plugged in the cart slot, games plugged into the 32x. Maybe it should be handled as an expansion device? +CONS( 1994, 32x, 0, 0, genesis_32x, md, md_cons_state, init_genesis, "Sega", "Genesis with 32X (USA, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1994, 32xe, 32x, 0, md_32x, md, md_cons_state, init_md_eur, "Sega", "Mega Drive with 32X (Europe, PAL)", MACHINE_NOT_WORKING ) +CONS( 1994, 32xj, 32x, 0, mdj_32x, md, md_cons_state, init_md_jpn, "Sega", "Mega Drive with 32X (Japan, NTSC)", MACHINE_NOT_WORKING ) + +// the SegaCD plugged into the expansion port.. +CONS( 1992, segacd, 0, 0, genesis_scd, md, md_cons_cd_state, init_genesis, "Sega", "Sega CD (USA, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1993, megacd, segacd, 0, md_scd, md, md_cons_cd_state, init_md_eur, "Sega", "Mega-CD (Europe, PAL)", MACHINE_NOT_WORKING ) +CONS( 1991, megacdj, segacd, 0, mdj_scd, md, md_cons_cd_state, init_md_jpn, "Sega", "Mega-CD (Japan, NTSC)", MACHINE_NOT_WORKING ) // this bios doesn't work with our ram interleave needed by a few games?! +CONS( 1991, megacda, segacd, 0, md_scd, md, md_cons_cd_state, init_md_eur, "Sega", "Mega-CD (Asia, PAL)", MACHINE_NOT_WORKING ) +CONS( 1993, segacd2, 0, 0, genesis_scd, md, md_cons_cd_state, init_genesis, "Sega", "Sega CD 2 (USA, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1993, megacd2, segacd2, 0, md_scd, md, md_cons_cd_state, init_md_eur, "Sega", "Mega-CD 2 (Europe, PAL)", MACHINE_NOT_WORKING ) +CONS( 1993, megacd2j, segacd2, 0, mdj_scd, md, md_cons_cd_state, init_md_jpn, "Sega", "Mega-CD 2 (Japan, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1994, aiwamcd, segacd2, 0, mdj_scd, md, md_cons_cd_state, init_md_jpn, "AIWA", "Mega-CD CSD-G1M (Japan, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1993, xeye, 0, 0, genesis2_scd, md, md_cons_cd_state, init_genesis, "JVC", "X'eye (USA, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1992, wmega, xeye, 0, mdj_scd, md, md_cons_cd_state, init_md_jpn, "Sega", "Wondermega (Japan, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1993, wmegam2, xeye, 0, md2j_scd, md, md_cons_cd_state, init_md_jpn, "Victor", "Wondermega M2 (Japan, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1994, cdx, 0, 0, genesis2_scd, md, md_cons_cd_state, init_genesis, "Sega", "CDX (USA, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1994, multmega, cdx, 0, md2_scd, md, md_cons_cd_state, init_md_eur, "Sega", "Multi-Mega (Europe, PAL)", MACHINE_NOT_WORKING ) + +//32X plugged in the cart slot + SegaCD plugged into the expansion port.. +CONS( 1994, 32x_scd, 0, 0, genesis_32x_scd, md, md_cons_cd_state, init_genesis, "Sega", "Sega CD with 32X (USA, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1995, 32x_mcd, 32x_scd, 0, md_32x_scd, md, md_cons_cd_state, init_md_eur, "Sega", "Mega-CD with 32X (Europe, PAL)", MACHINE_NOT_WORKING ) +CONS( 1994, 32x_mcdj, 32x_scd, 0, mdj_32x_scd, md, md_cons_cd_state, init_md_jpn, "Sega", "Mega-CD with 32X (Japan, NTSC)", MACHINE_NOT_WORKING ) + +// handheld hardware +CONS( 1995, gen_nomd, 0, 0, ms_megadriv2, gen_nomd, md_cons_slot_state, init_genesis, "Sega", "Genesis Nomad (USA Genesis handheld)", MACHINE_SUPPORTS_SAVE ) + +// handheld without LCD +CONS( 1993, megajet, gen_nomd, 0, ms_megadriv2, megajet, md_cons_slot_state, init_md_jpn, "Sega", "Mega Jet (Japan Mega Drive handheld)", MACHINE_SUPPORTS_SAVE ) + +// LaserActive (Laserdisc Player(ex: CLD-A100) with 'Control Pack' Addon slot) +// Mega Drive Pack(PAC-S1)/Genesis Pack(PAC-S10) plugged into the Control Pack slot, for plays Mega Drive/Genesis Cartridge, Mega-CD/Sega CD, Mega-LD stuffs +CONS( 1993, laseract, 0, 0, genesis_scd, md, md_cons_cd_state, init_genesis, "Pioneer / Sega","LaserActive with Genesis Pack PAC-S10 (USA, NTSC)", MACHINE_NOT_WORKING ) +CONS( 1993, laseractj, laseract, 0, mdj_scd, md, md_cons_cd_state, init_md_jpn, "Pioneer / Sega","LaserActive with Mega Drive Pack PAC-S1 (Japan, NTSC)", MACHINE_NOT_WORKING ) +//TODO: it has also PC Engine Pack(PAC-N1)/TG16 Pack(PAC-N10) for plays PC Engine/TG16 Cartridge, (Super/Arcade) CD-ROM2/TurboGrafx-CD, LD-ROM2 stuffs, but not emulated. + +/* clone hardware - not sure if this hardware is running some kind of emulator, or enhanced MD clone, or just custom banking */ +CONS( 200?, dcat16, 0, 0, dcat16_megadriv, md, md_cons_slot_state, init_genesis, "Firecore", "D-CAT16 (Mega Drive handheld)", MACHINE_NOT_WORKING ) diff --git a/src/mame/segacons/mdconsole.h b/src/mame/segacons/mdconsole.h new file mode 100644 index 00000000000..1290be529d5 --- /dev/null +++ b/src/mame/segacons/mdconsole.h @@ -0,0 +1,109 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood +#ifndef MAME_SEGACONS_MDCONSOLE_H +#define MAME_SEGACONS_MDCONSOLE_H + +#pragma once + +#include "megadriv.h" + +#include "mega32x.h" +#include "megacd.h" + +#include "bus/megadrive/md_slot.h" +#include "bus/megadrive/md_carts.h" + + +class md_cons_state : public md_base_state +{ +public: + md_cons_state(const machine_config &mconfig, device_type type, const char *tag) : + md_base_state(mconfig, type, tag), + m_32x(*this,"sega32x"), + m_segacd(*this,"segacd"), + m_cart(*this, "mdslot"), + m_tmss(*this, "tmss") + { } + + ioport_port *m_io_ctrlr = nullptr; + ioport_port *m_io_pad3b[4]{}; + ioport_port *m_io_pad6b[2][4]{}; + + optional_device m_32x; + optional_device m_segacd; + optional_device m_cart; + optional_region_ptr m_tmss; + + void init_mess_md_common(); + void init_genesis(); + void init_md_eur(); + void init_md_jpn(); + + uint8_t mess_md_io_read_data_port(offs_t offset); + void mess_md_io_write_data_port(offs_t offset, uint16_t data); + + DECLARE_WRITE_LINE_MEMBER(screen_vblank_console); + + DECLARE_DEVICE_IMAGE_LOAD_MEMBER( _32x_cart ); + + void _32x_scanline_callback(int x, uint32_t priority, uint32_t &lineptr); + void _32x_interrupt_callback(int scanline, int irq6); + void _32x_scanline_helper_callback(int scanline); + + void install_cartslot(); + void install_tmss(); + uint16_t tmss_r(offs_t offset); + void tmss_swap_w(uint16_t data); + void dcat16_megadriv_base(machine_config &config); + void dcat16_megadriv(machine_config &config); + + void md_32x(machine_config &config); + void genesis_32x(machine_config &config); + void mdj_32x(machine_config &config); + +protected: + virtual void machine_start() override; + virtual void machine_reset() override; +}; + +class md_cons_slot_state : public md_cons_state +{ +public: + md_cons_slot_state(const machine_config &mconfig, device_type type, const char *tag) : + md_cons_state(mconfig, type, tag) + { } + + void ms_megadpal(machine_config &config); + void ms_megadriv(machine_config &config); + void ms_megadriv2(machine_config &config); + + void genesis_tmss(machine_config &config); + + +protected: + virtual void machine_start() override; +}; + +class md_cons_cd_state : public md_cons_state +{ +public: + md_cons_cd_state(const machine_config &mconfig, device_type type, const char *tag) : + md_cons_state(mconfig, type, tag) + { } + + void genesis_scd(machine_config &config); + void genesis2_scd(machine_config &config); + void md_scd(machine_config &config); + void md2_scd(machine_config &config); + void mdj_scd(machine_config &config); + + void mdj_32x_scd(machine_config &config); + void md2j_scd(machine_config &config); + void genesis_32x_scd(machine_config &config); + void md_32x_scd(machine_config &config); + +protected: + virtual void machine_start() override; +}; + +#endif // MAME_SEGACONS_MDCONSOLE_H diff --git a/src/mame/segacons/megacd.cpp b/src/mame/segacons/megacd.cpp index 6780593dcb7..6f7bc7d82f6 100644 --- a/src/mame/segacons/megacd.cpp +++ b/src/mame/segacons/megacd.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood #include "emu.h" -#include "machine/megacd.h" +#include "megacd.h" #include "machine/nvram.h" #include "video/315_5313.h" #include "megacd.lh" diff --git a/src/mame/segacons/megacd.h b/src/mame/segacons/megacd.h index 4e2494b7fac..13bcb2579da 100644 --- a/src/mame/segacons/megacd.h +++ b/src/mame/segacons/megacd.h @@ -8,7 +8,7 @@ #include "cpu/m68000/m68000.h" #include "machine/lc89510.h" -#include "machine/megacdcd.h" +#include "megacdcd.h" #include "sound/rf5c68.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/segacons/megadriv.cpp b/src/mame/segacons/megadriv.cpp deleted file mode 100644 index 1c44eb8dc5a..00000000000 --- a/src/mame/segacons/megadriv.cpp +++ /dev/null @@ -1,1197 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood - -#include "emu.h" -#include "includes/megadriv.h" -#include "sound/sn76496.h" - -#include "imagedev/chd_cd.h" - -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" - -#include "formats/imageutl.h" -#include "softlist.h" - -/************************************* - * - * Input handlers - * - *************************************/ - -/* These overwrite the MAME ones in DRIVER_INIT */ -/* They're needed to give the users the choice between different controllers */ -uint8_t md_cons_state::mess_md_io_read_data_port(offs_t offset) -{ - int portnum = offset; - - uint8_t retdata; - int controller; - uint8_t helper_6b = (m_megadrive_io_ctrl_regs[portnum] & 0x3f) | 0xc0; // bits 6 & 7 always come from megadrive_io_data_regs - uint8_t helper_3b = (m_megadrive_io_ctrl_regs[portnum] & 0x7f) | 0x80; // bit 7 always comes from megadrive_io_data_regs - - switch (portnum) - { - case 0: - controller = (m_io_ctrlr->read() & 0x0f); - break; - - case 1: - controller = (m_io_ctrlr->read() & 0xf0); - break; - - default: - controller = 0; - break; - } - - /* Are we using a 6 buttons Joypad? */ - if (controller) - { - if (m_megadrive_io_data_regs[portnum] & 0x40) - { - if (m_io_stage[portnum] == 2) - { - /* here we read B, C & the additional buttons */ - retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) | - ((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0x30) | - ((m_io_pad6b[1][portnum] ? m_io_pad6b[1][portnum]->read() : 0) & 0x0f)) & ~helper_6b); - } - else - { - /* here we read B, C & the directional buttons */ - retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) | - (((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0x3f) & ~helper_6b); - } - } - else - { - if (m_io_stage[portnum] == 1) - { - /* here we read ((Start & A) >> 2) | 0x00 */ - retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) | - ((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0xc0) >> 2) & ~helper_6b); - } - else if (m_io_stage[portnum]==2) - { - /* here we read ((Start & A) >> 2) | 0x0f */ - retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) | - (((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0xc0) >> 2) | 0x0f) & ~helper_6b); - } - else - { - /* here we read ((Start & A) >> 2) | Up and Down */ - retdata = (m_megadrive_io_data_regs[portnum] & helper_6b) | - (((((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0xc0) >> 2) | - ((m_io_pad6b[0][portnum] ? m_io_pad6b[0][portnum]->read() : 0) & 0x03)) & ~helper_6b); - } - } - - // osd_printf_debug("read io data port stage %d port %d %02x\n",mess_io_stage[portnum],portnum,retdata); - - retdata |= (retdata << 8); - } - /* Otherwise it's a 3 buttons Joypad */ - else - { - uint8_t svp_test = 0; - if (m_cart) - svp_test = m_cart->read_test(); - - // handle test input for SVP test - if (portnum == 0 && svp_test) - { - retdata = (m_megadrive_io_data_regs[0] & 0xc0); - } - else if (m_megadrive_io_data_regs[portnum] & 0x40) - { - /* here we read B, C & the directional buttons */ - retdata = (m_megadrive_io_data_regs[portnum] & helper_3b) | - ((((m_io_pad3b[portnum] ? m_io_pad3b[portnum]->read() : 0) & 0x3f) | 0x40) & ~helper_3b); - } - else - { - /* here we read ((Start & A) >> 2) | Up and Down */ - retdata = (m_megadrive_io_data_regs[portnum] & helper_3b) | - (((((m_io_pad3b[portnum] ? m_io_pad3b[portnum]->read() : 0) & 0xc0) >> 2) | - ((m_io_pad3b[portnum] ? m_io_pad3b[portnum]->read() : 0) & 0x03) | 0x40) & ~helper_3b); - } - } - - return retdata; -} - - -void md_cons_state::mess_md_io_write_data_port(offs_t offset, uint16_t data) -{ - int portnum = offset; - int controller; - - switch (portnum) - { - case 0: - controller = (m_io_ctrlr->read() & 0x0f); - break; - - case 1: - controller = (m_io_ctrlr->read() & 0xf0); - break; - - default: - controller = 0; - break; - } - - if (controller) - { - if (m_megadrive_io_ctrl_regs[portnum] & 0x40) - { - if (((m_megadrive_io_data_regs[portnum] & 0x40) == 0x00) && ((data & 0x40) == 0x40)) - { - m_io_stage[portnum]++; - m_io_timeout[portnum]->adjust(m_maincpu->cycles_to_attotime(8192)); - } - - } - } - m_megadrive_io_data_regs[portnum] = data; - //osd_printf_debug("Writing IO Data Register #%d data %04x\n",portnum,data); -} - - -/************************************* - * - * Input ports - * - *************************************/ - - -static INPUT_PORTS_START( md_base ) - PORT_START("PAD1_3B") /* Joypad 1 (3 button + start) NOT READ DIRECTLY */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 B") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 C") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 A") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x00) - - PORT_START("PAD2_3B") /* Joypad 2 (3 button + start) NOT READ DIRECTLY */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 B") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 C") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 A") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x00) - - PORT_START("PAD1_6B") /* Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 B") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 C") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 A") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) PORT_PLAYER(1) PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - - PORT_START("EXTRA1") /* Extra buttons for Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) PORT_NAME("P1 Z") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_NAME("P1 Y") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME("P1 X") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1) PORT_NAME("P1 Mode") PORT_CONDITION("CTRLSEL", 0x0f, EQUALS, 0x01) - - PORT_START("PAD2_6B") /* Joypad 2 (6 button + start + mode) NOT READ DIRECTLY */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 B") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 C") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 A") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) PORT_PLAYER(2) PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - - PORT_START("EXTRA2") /* Extra buttons for Joypad 2 (6 button + start + mode) NOT READ DIRECTLY */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) PORT_NAME("P2 Z") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) PORT_NAME("P2 Y") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("P2 X") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(2) PORT_NAME("P2 Mode") PORT_CONDITION("CTRLSEL", 0xf0, EQUALS, 0x10) - - PORT_START("RESET") /* Buttons on Genesis Console */ - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Reset Button") PORT_IMPULSE(1) // reset, resets 68k (and..?) -INPUT_PORTS_END - -static INPUT_PORTS_START( md ) - PORT_INCLUDE( md_base ) - - PORT_START("CTRLSEL") /* Controller selection */ - PORT_CONFNAME( 0x0f, 0x00, "Player 1 Controller" ) - PORT_CONFSETTING( 0x00, "Joystick 3 Buttons" ) - PORT_CONFSETTING( 0x01, "Joystick 6 Buttons" ) -// PORT_CONFSETTING( 0x02, "Sega Mouse" ) -/* there exists both a 2 buttons version of the Mouse (Jpn ver, to be used with RPGs, it - can aslo be used as trackball) and a 3 buttons version (US ver, no trackball feats.) */ -// PORT_CONFSETTING( 0x03, "Sega Menacer" ) -// PORT_CONFSETTING( 0x04, "Konami Justifier" ) -// PORT_CONFSETTING( 0x05, "Team Player (Sega Multitap)" ) -// PORT_CONFSETTING( 0x06, "4-Play (EA Multitap)" ) -// PORT_CONFSETTING( 0x07, "J-Cart" ) - PORT_CONFNAME( 0xf0, 0x00, "Player 2 Controller" ) - PORT_CONFSETTING( 0x00, "Joystick 3 Buttons" ) - PORT_CONFSETTING( 0x10, "Joystick 6 Buttons" ) -INPUT_PORTS_END - -static INPUT_PORTS_START( megajet ) - PORT_INCLUDE( md_base ) - - PORT_START("CTRLSEL") /* Fixed controller setting for Player 1 */ - PORT_CONFNAME( 0x0f, 0x01, "Player 1 Controller" ) // Fixed - PORT_CONFSETTING( 0x01, "Joystick 6 Buttons" ) - PORT_CONFNAME( 0xf0, 0x00, "Player 2 Controller" ) - PORT_CONFSETTING( 0x00, "Joystick 3 Buttons" ) - PORT_CONFSETTING( 0x10, "Joystick 6 Buttons" ) -INPUT_PORTS_END - -static INPUT_PORTS_START( gen_nomd ) - PORT_INCLUDE( megajet ) - - PORT_MODIFY("RESET") /* No reset button */ - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED ) -INPUT_PORTS_END - - -/************************************* - * - * Machine driver - * - *************************************/ - -void md_cons_state::machine_start() -{ - static const char *const pad6names[2][4] = { - { "PAD1_6B", "PAD2_6B", "UNUSED", "UNUSED" }, - { "EXTRA1", "EXTRA2", "UNUSED", "UNUSED" } - }; - static const char *const pad3names[4] = { "PAD1_3B", "PAD2_3B", "UNUSED", "UNUSED" }; - - m_io_ctrlr = ioport("CTRLSEL"); - - for (int i = 0; i < 4; i++) - { - m_io_pad3b[i] = ioport(pad3names[i]); - m_io_pad6b[0][i] = ioport(pad6names[0][i]); - m_io_pad6b[1][i] = ioport(pad6names[1][i]); - } - - // setup timers for 6 button pads - for (int i = 0; i < 3; i++) - m_io_timeout[i] = timer_alloc(FUNC(md_base_state::io_timeout_timer_callback), this); - - m_vdp->stop_timers(); - - if (m_cart) - m_cart->save_nvram(); - - if (m_z80snd) - m_genz80.z80_run_timer = timer_alloc(FUNC(md_base_state::megadriv_z80_run_state), this); -} - -void md_cons_state::install_cartslot() -{ - if (m_cart) - { - // for now m_cartslot is only in MD and not 32x and SegaCD - m_maincpu->space(AS_PROGRAM).install_read_handler(0x000000, 0x7fffff, read16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::read))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x000000, 0x7fffff, write16s_delegate(*m_cart, FUNC(base_md_cart_slot_device::write))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa13000, 0xa130ff, read16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::read_a13)), write16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::write_a13))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa15000, 0xa150ff, read16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::read_a15)), write16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::write_a15))); -// m_maincpu->space(AS_PROGRAM).install_write_handler(0xa14000, 0xa14003, write16sm_delegate(*m_cart, FUNC(base_md_cart_slot_device::write_tmss_bank))); - } -} - -uint16_t md_cons_state::tmss_r(offs_t offset) -{ - if (offset < 0x4000 / 2) - return m_tmss[offset]; - - return 0xffff; -} - -void md_cons_state::tmss_swap_w(uint16_t data) -{ - if (data & 0x0001) - { - install_cartslot(); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xa14100, 0xa14101, write16smo_delegate(*this, FUNC(md_cons_state::tmss_swap_w))); - } - else - { - install_tmss(); - } -} - - -void md_cons_state::install_tmss() -{ - m_maincpu->space(AS_PROGRAM).unmap_readwrite(0x000000, 0x7fffff); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x000000, 0x7fffff, read16sm_delegate(*this, FUNC(md_cons_state::tmss_r))); - - m_maincpu->space(AS_PROGRAM).install_write_handler(0xa14100, 0xa14101, write16smo_delegate(*this, FUNC(md_cons_state::tmss_swap_w))); - -} - - -void md_cons_slot_state::machine_start() -{ - md_cons_state::machine_start(); - - // the SVP introduces some kind of DMA 'lag', which we have to compensate for, this is obvious even on gfx DMAd from ROM (the Speedometer) - if (m_cart && (m_cart->get_type() == SEGA_SVP)) - m_vdp->set_dma_delay(2); - - if (m_tmss) - { - install_tmss(); - } - else - { - install_cartslot(); - } -} - -void md_cons_state::machine_reset() -{ - md_base_state::machine_reset(); - - // if the system has a 32x, pause the extra CPUs until they are actually turned on - if (m_32x) - m_32x->pause_cpu(); -} - -void md_cons_cd_state::machine_start() -{ - md_cons_state::machine_start(); - - // the segaCD introduces some kind of DMA 'lag', which we have to compensate for, - // at least when reading wordram? we might need to check what mode we're in the DMA... - m_vdp->set_dma_delay(2); -} - -// same as screen_eof_megadriv but with addition of 32x and SegaCD/MegaCD pieces -WRITE_LINE_MEMBER(md_cons_state::screen_vblank_console) -{ - if (m_io_reset.read_safe(0) & 0x01) - m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); - - // rising edge - if (state) - { - if (!m_vdp->m_use_alt_timing) - { - bool mode3 = (m_vdp->get_imode() == 3); - m_vdp->vdp_handle_eof(); - m_vdp->m_megadriv_scanline_timer->adjust(attotime::zero); - - if (m_32x) - m_32x->screen_eof(mode3); - - if (m_segacd) - m_segacd->update_total_scanlines(mode3); - } - } -} - -void md_cons_slot_state::ms_megadriv(machine_config &config) -{ - md_ntsc(config); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - MD_CART_SLOT(config, m_cart, md_cart, nullptr).set_must_be_loaded(true); - SOFTWARE_LIST(config, "cart_list").set_original("megadriv"); -} - -void md_cons_slot_state::ms_megadpal(machine_config &config) -{ - md_pal(config); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - MD_CART_SLOT(config, m_cart, md_cart, nullptr).set_must_be_loaded(true); - SOFTWARE_LIST(config, "cart_list").set_original("megadriv"); -} - -void md_cons_slot_state::ms_megadriv2(machine_config &config) -{ - md2_ntsc(config); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - MD_CART_SLOT(config, m_cart, md_cart, nullptr).set_must_be_loaded(true); - SOFTWARE_LIST(config, "cart_list").set_original("megadriv"); -} - -void md_cons_slot_state::genesis_tmss(machine_config &config) -{ - ms_megadriv(config); - subdevice("cart_list")->set_filter("TMSS"); -} - -void md_cons_state::dcat16_megadriv(machine_config &config) -{ - dcat16_megadriv_base(config); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - -// has SD card slot instead? -// MD_CART_SLOT(config, m_cart, md_cart, nullptr).set_must_be_loaded(true); -// SOFTWARE_LIST(config, "cart_list").set_original("megadriv"); -} - -/************************************* - * - * ROM definition(s) - * - *************************************/ - - -/* we don't use the bios rom (it's not needed and only provides security on early models) */ - -ROM_START(genesis) - ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) - ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) -ROM_END - -ROM_START(megadriv) - ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) - ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) -ROM_END - -ROM_START(megadrij) - ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) - ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) -ROM_END - -ROM_START(genesis_tmss) - ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) - ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) - - ROM_REGION16_BE(0x4000, "tmss", ROMREGION_ERASEFF) - ROM_LOAD( "tmss_usa.bin", 0x0000, 0x4000, CRC(5f5e64eb) SHA1(453fca4e1db6fae4a10657c4451bccbb71955628) ) -ROM_END - -ROM_START(dcat16) - ROM_REGION(0x800000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD16_WORD_SWAP( "mg6025.u1", 0x0000, 0x800000, CRC(5453d673) SHA1(b9f8d849cbed81fe73525229f4897ccaeeb7a833) ) - - ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) -ROM_END - -ROM_START(megajet) - ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) - ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) -ROM_END - -ROM_START(gen_nomd) - ROM_REGION(MD_CPU_REGION_SIZE, "maincpu", ROMREGION_ERASEFF) - ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) -ROM_END - -/************************************* - * - * Driver initialization - * - *************************************/ - -void md_cons_state::init_mess_md_common() -{ - m_megadrive_io_read_data_port_ptr = read8sm_delegate(*this, FUNC(md_cons_state::mess_md_io_read_data_port)); - m_megadrive_io_write_data_port_ptr = write16sm_delegate(*this, FUNC(md_cons_state::mess_md_io_write_data_port)); -} - -void md_cons_state::init_genesis() -{ - init_megadriv(); - init_mess_md_common(); - - if (m_32x) - { - m_32x->set_32x_pal(false); - m_32x->set_framerate(60); - m_32x->set_total_scanlines(262); - } - if (m_segacd) - { - m_segacd->set_framerate(60); - m_segacd->set_total_scanlines(262); - } - - m_version_hi_nibble = 0x80; // Export NTSC - if (!m_segacd) - m_version_hi_nibble |= 0x20; -} - -void md_cons_state::init_md_eur() -{ - init_megadrie(); - init_mess_md_common(); - - if (m_32x) - { - m_32x->set_32x_pal(true); - m_32x->set_framerate(50); - m_32x->set_total_scanlines(313); - } - if (m_segacd) - { - m_segacd->set_framerate(50); - m_segacd->set_total_scanlines(313); - } - - m_version_hi_nibble = 0xc0; // Export PAL - if (!m_segacd) - m_version_hi_nibble |= 0x20; -} - -void md_cons_state::init_md_jpn() -{ - init_megadrij(); - init_mess_md_common(); - - if (m_32x) - { - m_32x->set_32x_pal(false); - m_32x->set_framerate(60); - m_32x->set_total_scanlines(262); - } - if (m_segacd) - { - m_segacd->set_framerate(60); - m_segacd->set_total_scanlines(262); - } - - m_version_hi_nibble = 0x00; // JPN NTSC - if (!m_segacd) - m_version_hi_nibble |= 0x20; -} - -/****************************************** 32X emulation ****************************************/ - -DEVICE_IMAGE_LOAD_MEMBER( md_cons_state::_32x_cart ) -{ - uint32_t length; - std::vector temp_copy; - uint16_t *ROM16; - uint32_t *ROM32; - int i; - - if (!image.loaded_through_softlist()) - { - length = image.length(); - temp_copy.resize(length); - image.fread(&temp_copy[0], length); - } - else - { - length = image.get_software_region_length("rom"); - temp_copy.resize(length); - memcpy(&temp_copy[0], image.get_software_region("rom"), length); - } - - /* Copy the cart image in the locations the driver expects */ - // Notice that, by using pick_integer, we are sure the code works on both LE and BE machines - ROM16 = (uint16_t *) memregion("gamecart")->base(); - for (i = 0; i < length; i += 2) - ROM16[i / 2] = pick_integer_be(&temp_copy[0], i, 2); - - ROM32 = (uint32_t *) memregion("gamecart_sh2")->base(); - for (i = 0; i < length; i += 4) - ROM32[i / 4] = pick_integer_be(&temp_copy[0], i, 4); - - ROM16 = (uint16_t *) memregion("maincpu")->base(); - for (i = 0x00; i < length; i += 2) - ROM16[i / 2] = pick_integer_be(&temp_copy[0], i, 2); - - return image_init_result::PASS; -} - - -void md_cons_state::_32x_scanline_callback(int x, uint32_t priority, uint32_t &lineptr) -{ - if (m_32x) - m_32x->render_videobuffer_to_screenbuffer(x, priority, lineptr); -} - -void md_cons_state::_32x_interrupt_callback(int scanline, int irq6) -{ - if (m_32x) - m_32x->interrupt_cb(scanline, irq6); -} - -void md_cons_state::_32x_scanline_helper_callback(int scanline) -{ - if (m_32x) - m_32x->render_videobuffer_to_screenbuffer_helper(scanline); -} - -void md_cons_state::genesis_32x(machine_config &config) -{ - md_ntsc(config); - - m_vdp->set_md_32x_scanline(FUNC(md_cons_state::_32x_scanline_callback)); - m_vdp->set_md_32x_scanline_helper(FUNC(md_cons_state::_32x_scanline_helper_callback)); - m_vdp->set_md_32x_interrupt(FUNC(md_cons_state::_32x_interrupt_callback)); - m_vdp->reset_routes(); - m_vdp->add_route(ALL_OUTPUTS, "lspeaker", (0.50)/2); - m_vdp->add_route(ALL_OUTPUTS, "rspeaker", (0.50)/2); - - SEGA_32X_NTSC(config, m_32x, (MASTER_CLOCK_NTSC * 3) / 7, m_maincpu, m_scan_timer); - m_32x->set_screen("megadriv"); - m_32x->add_route(0, "lspeaker", 1.00); - m_32x->add_route(1, "rspeaker", 1.00); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - // we need to remove and re-add the YM because the balance is different - // due to MAME having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is silent?!) - m_ymsnd->reset_routes(); - m_ymsnd->add_route(0, "lspeaker", (0.50)/2); - m_ymsnd->add_route(1, "rspeaker", (0.50)/2); - - generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin")); - cartslot.set_must_be_loaded(true); - cartslot.set_device_load(FUNC(md_cons_state::_32x_cart)); - - SOFTWARE_LIST(config, "cart_list").set_original("32x").set_filter("NTSC-U"); -} - - -void md_cons_state::mdj_32x(machine_config &config) -{ - md_ntsc(config); - - m_vdp->set_md_32x_scanline(FUNC(md_cons_state::_32x_scanline_callback)); - m_vdp->set_md_32x_scanline_helper(FUNC(md_cons_state::_32x_scanline_helper_callback)); - m_vdp->set_md_32x_interrupt(FUNC(md_cons_state::_32x_interrupt_callback)); - m_vdp->reset_routes(); - m_vdp->add_route(ALL_OUTPUTS, "lspeaker", (0.50)/2); - m_vdp->add_route(ALL_OUTPUTS, "rspeaker", (0.50)/2); - - SEGA_32X_NTSC(config, m_32x, (MASTER_CLOCK_NTSC * 3) / 7, m_maincpu, m_scan_timer); - m_32x->set_screen("megadriv"); - m_32x->add_route(0, "lspeaker", 1.00); - m_32x->add_route(1, "rspeaker", 1.00); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - // we need to remove and re-add the sound system because the balance is different - // due to MAME having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is silent?!) - m_ymsnd->reset_routes(); - m_ymsnd->add_route(0, "lspeaker", (0.50)/2); - m_ymsnd->add_route(1, "rspeaker", (0.50)/2); - - generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin")); - cartslot.set_must_be_loaded(true); - cartslot.set_device_load(FUNC(md_cons_state::_32x_cart)); - - SOFTWARE_LIST(config, "cart_list").set_original("32x").set_filter("NTSC-J"); -} - - -void md_cons_state::md_32x(machine_config &config) -{ - md_pal(config); - - m_vdp->set_md_32x_scanline(FUNC(md_cons_state::_32x_scanline_callback)); - m_vdp->set_md_32x_scanline_helper(FUNC(md_cons_state::_32x_scanline_helper_callback)); - m_vdp->set_md_32x_interrupt(FUNC(md_cons_state::_32x_interrupt_callback)); - m_vdp->reset_routes(); - m_vdp->add_route(ALL_OUTPUTS, "lspeaker", (0.50)/2); - m_vdp->add_route(ALL_OUTPUTS, "rspeaker", (0.50)/2); - - SEGA_32X_PAL(config, m_32x, (MASTER_CLOCK_PAL * 3) / 7, m_maincpu, m_scan_timer); - m_32x->set_screen("megadriv"); - m_32x->add_route(0, "lspeaker", 1.00); - m_32x->add_route(1, "rspeaker", 1.00); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - // we need to remove and re-add the sound system because the balance is different - // due to MAME having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is silent?!) - m_ymsnd->reset_routes(); - m_ymsnd->add_route(0, "lspeaker", (0.50)/2); - m_ymsnd->add_route(1, "rspeaker", (0.50)/2); - - generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin")); - cartslot.set_must_be_loaded(true); - cartslot.set_device_load(FUNC(md_cons_state::_32x_cart)); - - SOFTWARE_LIST(config, "cart_list").set_original("32x").set_filter("PAL"); -} - - - -#define _32X_ROMS \ - ROM_REGION16_BE( 0x400000, "gamecart", ROMREGION_ERASE00 ) /* 68000 Code */ \ - ROM_REGION32_BE( 0x400000, "gamecart_sh2", ROMREGION_ERASE00 ) /* Copy for the SH2 */ \ - ROM_REGION16_BE( 0x400000, "32x_68k_bios", 0 ) /* 68000 Code */ \ - ROM_LOAD( "32x_g_bios.bin", 0x000000, 0x000100, CRC(5c12eae8) SHA1(dbebd76a448447cb6e524ac3cb0fd19fc065d944) ) \ - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) \ - /* temp, rom should only be visible here when one of the regs is set, tempo needs it */ \ - ROM_COPY( "32x_68k_bios", 0x0, 0x0, 0x100) \ - ROM_REGION32_BE( 0x400000, "master", 0 ) /* SH2 Code */ \ - ROM_SYSTEM_BIOS( 0, "retail", "Mars Version 1.0 (retail)" ) \ - ROMX_LOAD( "32x_m_bios.bin", 0x000000, 0x000800, CRC(dd9c46b8) SHA1(1e5b0b2441a4979b6966d942b20cc76c413b8c5e), ROM_BIOS(0) ) \ - ROM_SYSTEM_BIOS( 1, "sdk", "Mars Version 1.0 (early sdk)" ) \ - ROMX_LOAD( "32x_m_bios_sdk.bin", 0x000000, 0x000800, BAD_DUMP CRC(c7102c53) SHA1(ed73a47f186b373b8eff765f84ef26c3d9ef6cb0), ROM_BIOS(1) ) \ - ROM_REGION32_BE( 0x400000, "slave", 0 ) /* SH2 Code */ \ - ROM_LOAD( "32x_s_bios.bin", 0x000000, 0x000400, CRC(bfda1fe5) SHA1(4103668c1bbd66c5e24558e73d4f3f92061a109a) ) - -ROM_START( 32x ) - _32X_ROMS -ROM_END - -ROM_START( 32xe ) - _32X_ROMS -ROM_END - -ROM_START( 32xj ) - _32X_ROMS -ROM_END - - -/****************************************** SegaCD emulation ****************************************/ - -void md_cons_cd_state::genesis_scd(machine_config &config) -{ - md_ntsc(config); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - SEGA_SEGACD_US(config, m_segacd, 0); - m_segacd->set_palette("gen_vdp:gfx_palette"); - m_segacd->set_hostcpu(m_maincpu); - m_segacd->set_screen("megadriv"); - - config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu - - CDROM(config, "cdrom").set_interface("scd_cdrom"); - - SOFTWARE_LIST(config, "cd_list").set_original("segacd"); -} - -void md_cons_cd_state::genesis2_scd(machine_config &config) -{ - md2_ntsc(config); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - SEGA_SEGACD_US(config, m_segacd, 0); - m_segacd->set_palette("gen_vdp:gfx_palette"); - m_segacd->set_hostcpu(m_maincpu); - m_segacd->set_screen("megadriv"); - - config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu - - CDROM(config, "cdrom").set_interface("scd_cdrom"); - - SOFTWARE_LIST(config, "cd_list").set_original("segacd"); -} - -void md_cons_cd_state::md_scd(machine_config &config) -{ - md_pal(config); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - SEGA_SEGACD_EUROPE(config, m_segacd, 0); - m_segacd->set_palette("gen_vdp:gfx_palette"); - m_segacd->set_hostcpu(m_maincpu); - m_segacd->set_screen("megadriv"); - - config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu - - CDROM(config, "cdrom").set_interface("scd_cdrom"); - - SOFTWARE_LIST(config, "cd_list").set_original("megacd"); -} - -void md_cons_cd_state::md2_scd(machine_config &config) -{ - md2_pal(config); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - SEGA_SEGACD_EUROPE(config, m_segacd, 0); - m_segacd->set_palette("gen_vdp:gfx_palette"); - m_segacd->set_hostcpu(m_maincpu); - m_segacd->set_screen("megadriv"); - - config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu - - CDROM(config, "cdrom").set_interface("scd_cdrom"); - - SOFTWARE_LIST(config, "cd_list").set_original("megacd"); -} - -void md_cons_cd_state::mdj_scd(machine_config &config) -{ - md_ntsc(config); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - SEGA_SEGACD_JAPAN(config, m_segacd, 0); - m_segacd->set_palette("gen_vdp:gfx_palette"); - m_segacd->set_hostcpu(m_maincpu); - m_segacd->set_screen("megadriv"); - - config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu - - CDROM(config, "cdrom").set_interface("scd_cdrom"); - - SOFTWARE_LIST(config, "cd_list").set_original("megacdj"); -} - -void md_cons_cd_state::md2j_scd(machine_config &config) -{ - md2_ntsc(config); - - subdevice("megadriv")->screen_vblank().set(FUNC(md_cons_state::screen_vblank_console)); - - SEGA_SEGACD_JAPAN(config, m_segacd, 0); - m_segacd->set_palette("gen_vdp:gfx_palette"); - m_segacd->set_hostcpu(m_maincpu); - m_segacd->set_screen("megadriv"); - - config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu - - CDROM(config, "cdrom").set_interface("scd_cdrom"); - - SOFTWARE_LIST(config, "cd_list").set_original("megacdj"); -} - -/******************SEGA CD + 32X****************************/ - -void md_cons_cd_state::genesis_32x_scd(machine_config &config) -{ - genesis_32x(config); - - SEGA_SEGACD_US(config, m_segacd, 0); - m_segacd->set_palette("gen_vdp:gfx_palette"); - m_segacd->set_hostcpu(m_maincpu); - m_segacd->set_screen("megadriv"); - - config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu - - CDROM(config, "cdrom").set_interface("scd_cdrom"); - - config.device_remove("cartslot"); - GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin").set_device_load(FUNC(md_cons_state::_32x_cart)); - - //config.m_perfect_cpu_quantum = subtag("32x_master_sh2"); - SOFTWARE_LIST(config, "cd_list").set_original("segacd"); -} - -void md_cons_cd_state::md_32x_scd(machine_config &config) -{ - md_32x(config); - - SEGA_SEGACD_EUROPE(config, m_segacd, 0); - m_segacd->set_palette("gen_vdp:gfx_palette"); - m_segacd->set_hostcpu(m_maincpu); - m_segacd->set_screen("megadriv"); - - config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu - - CDROM(config, "cdrom").set_interface("scd_cdrom"); - - config.device_remove("cartslot"); - GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin").set_device_load(FUNC(md_cons_state::_32x_cart)); - - //config.m_perfect_cpu_quantum = subtag("32x_master_sh2"); - SOFTWARE_LIST(config, "cd_list").set_original("megacd"); -} - -void md_cons_cd_state::mdj_32x_scd(machine_config &config) -{ - mdj_32x(config); - - SEGA_SEGACD_JAPAN(config, m_segacd, 0); - m_segacd->set_palette("gen_vdp:gfx_palette"); - m_segacd->set_hostcpu(m_maincpu); - m_segacd->set_screen("megadriv"); - - config.set_perfect_quantum("segacd:segacd_68k"); // perfect sync to the fastest cpu - - CDROM(config, "cdrom").set_interface("scd_cdrom"); - - config.device_remove("cartslot"); - GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "_32x_cart", "32x,bin").set_device_load(FUNC(md_cons_state::_32x_cart)); - - //config.m_perfect_cpu_quantum = subtag("32x_master_sh2"); - SOFTWARE_LIST(config, "cd_list").set_original("megacdj"); -} - -/* We need proper names for most of these BIOS ROMs! */ -ROM_START( segacd ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - /* v1.10 confirmed dump by dead_screem */ - ROM_LOAD( "mpr-15045b.bin", 0x000000, 0x020000, CRC(c6d10268) SHA1(f4f315adcef9b8feb0364c21ab7f0eaf5457f3ed) ) -ROM_END - -ROM_START( megacd ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - /* v1.00, confirmed good dump */ - ROM_LOAD( "megacd_model1_bios_1_00_e.bin", 0x000000, 0x020000, CRC(529ac15a) SHA1(f891e0ea651e2232af0c5c4cb46a0cae2ee8f356) ) -ROM_END - -ROM_START( megacdj ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - ROM_DEFAULT_BIOS("v100g") // this seems the only revision where the cursor in CD menu works, allowing to boot games - /* Confirmed by ElBarto */ - ROM_SYSTEM_BIOS(0, "v100s", "v1.00S") - ROMX_LOAD( "mpr-14088h.bin", 0x000000, 0x020000, CRC(3773d5aa) SHA1(bbf729a1aaa1667b783749299e1ad932aaf5f253), ROM_BIOS(0) | ROM_GROUPWORD | ROM_REVERSE) - /* Confirmed by ElBarto */ - ROM_SYSTEM_BIOS(1, "v100g", "v1.00G") - ROMX_LOAD( "epr-14088b.bin", 0x000000, 0x020000, CRC(69ed6ccd) SHA1(27d11c3836506f01ee81cd142c0cd8b51abebbd2), ROM_BIOS(1) | ROM_GROUPWORD | ROM_REVERSE) - /* Confirmed by ElBarto */ - ROM_SYSTEM_BIOS(2, "v100l", "v1.00L") - ROMX_LOAD( "mpr-14088c.bin", 0x000000, 0x020000, CRC(03134289) SHA1(d60cb5a53f26d6b13e354bc149217587f2301718), ROM_BIOS(2) | ROM_GROUPWORD | ROM_REVERSE) - /* Confirmed by ElBarto */ - ROM_SYSTEM_BIOS(3, "v100o", "v1.00O") - ROMX_LOAD( "epr-14088d.bin", 0x000000, 0x020000, CRC(dfa95ee9) SHA1(e13666c76fa0a2e94e2f651b26b0fd625bf55f07), ROM_BIOS(3) | ROM_GROUPWORD | ROM_REVERSE) - ROM_SYSTEM_BIOS(4, "v100p", "v1.00P") // CRC: e2e70bc8 when byteswapped - ROMX_LOAD( "epr-14088e.bin", 0x000000, 0x020000, CRC(9d2da8f2) SHA1(4846f448160059a7da0215a5df12ca160f26dd69), ROM_BIOS(4) ) - // EEPROM had no SEGA's label, might be 14088(no rev) or 14088A - ROM_SYSTEM_BIOS(5, "v100c", "v1.00C") // CRC: c3b60c13 when byteswapped - ROMX_LOAD( "100c.bin", 0x000000, 0x020000, CRC(41af44c4) SHA1(f30d109d1c2f7c9feaf38600c65834261db73d1f), ROM_BIOS(5) ) - ROM_SYSTEM_BIOS(6, "v111", "v1.11") // CRC: e0a6179b when byteswapped - ROMX_LOAD( "mpr-14837.bin", 0x000000, 0x020000, CRC(4be18ff6) SHA1(204758d5a64c24e96e1a9fe6bd82e1878fef7ade), ROM_BIOS(6) ) -ROM_END - -/* Asia bios, when run in USA region will show : -ERROR! -THIS IS A PAL-COMPATIBLE MEGA CD -FOR EXCLUSIVE USE IN SOUTHEAST ASIA. - -Confirmed by Jakovasaur -*/ -ROM_START( megacda ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - ROM_LOAD( "epr-14536h.bin", 0x000000, 0x020000, CRC(550f30bb) SHA1(e4193c6ae44c3cea002707d2a88f1fbcced664de)) -ROM_END - -ROM_START( segacd2 ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - ROM_SYSTEM_BIOS(0, "v211x", "Model 2 v2.11X") - ROMX_LOAD( "mpr-15764-t.bin", 0x000000, 0x020000, CRC(2e49d72c) SHA1(328a3228c29fba244b9db2055adc1ec4f7a87e6b), ROM_BIOS(0) ) - ROM_SYSTEM_BIOS(1, "v200", "Model 2 v2.00") /* verified dump */ - ROMX_LOAD( "us_scd2_930314.bin", 0x000000, 0x020000, CRC(8af65f58) SHA1(5a8c4b91d3034c1448aac4b5dc9a6484fce51636), ROM_BIOS(1) ) - /* this is reportedly a bad dump, it has many differences from the verified dump and does not boot in Kega */ - /* ROMX_LOAD( "segacd_model2_bios_2_00_u.bin", 0x000000, 0x020000, CRC(340b4be4) SHA1(bd3ee0c8ab732468748bf98953603ce772612704), ROM_BIOS(1) ) */ - ROM_SYSTEM_BIOS(2, "v200w", "Model 2 v2.00W") - ROMX_LOAD( "segacd_model2_bios_2_00w_u.bin", 0x000000, 0x020000, CRC(9f6f6276) SHA1(5adb6c3af218c60868e6b723ec47e36bbdf5e6f0), ROM_BIOS(2) ) -ROM_END - -/* v2.00, v2.00w confirmed good dumps by ElBarto */ -/* v2.11x confirmed good dump by TwistedTom */ -ROM_START( megacd2 ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - ROM_SYSTEM_BIOS(0, "v211x", "v2.11X") // MK-4102A-50 Sony pcb - ROMX_LOAD( "mpr-15811-t.bin", 0x000000, 0x020000, CRC(391a80d2) SHA1(aa4bb1803b06714fbc04d8a209161876796dd511), ROM_BIOS(0) | ROM_GROUPWORD | ROM_REVERSE ) - ROM_SYSTEM_BIOS(1, "v200w", "v2.00W") // MK-4102-50 Funai pcb - ROMX_LOAD( "mpr-15512a.bin", 0x000000, 0x020000, CRC(53f1757c) SHA1(67bf3970ca5a05fd5ce3d6c446789c5d971b98a4), ROM_BIOS(1) | ROM_GROUPWORD | ROM_REVERSE ) - ROM_SYSTEM_BIOS(2, "v200", "v2.00") // ? - ROMX_LOAD( "mpr-15512.bin", 0x000000, 0x020000, CRC(cb76f114) SHA1(939f173cadc41e996a3c34498da1bf55e7e18ff8), ROM_BIOS(2) | ROM_GROUPWORD | ROM_REVERSE ) -ROM_END - -/* Confirmed good dump by ElBarto */ -ROM_START( megacd2j ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - ROM_SYSTEM_BIOS(0, "v200c", "v2.00C") - ROMX_LOAD( "mpr-15398.bin", 0x000000, 0x020000, CRC(1e4344e6) SHA1(4d1251a6973d932e734ae5e8c6b9b55eb40e4143), ROM_BIOS(0) | ROM_GROUPWORD | ROM_REVERSE ) -ROM_END - -ROM_START( aiwamcd ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - /* v2.11 */ - ROM_LOAD( "mpr-15768-t.bin", 0x000000, 0x020000, CRC(8052c7a0) SHA1(219d284dcf63ce366a4dc6d1ff767a0d2eea283d) ) -ROM_END - -ROM_START( laseract ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - ROM_SYSTEM_BIOS(0, "v104", "v1.04") - ROMX_LOAD( "laseractive_bios_1_04_u.bin", 0x000000, 0x020000, CRC(50cd3d23) SHA1(aa811861f8874775075bd3f53008c8aaf59b07db), ROM_BIOS(0) ) - ROM_SYSTEM_BIOS(1, "v102", "v1.02") - ROMX_LOAD( "laseractive_bios_1_02_u.bin", 0x000000, 0x020000, CRC(3b10cf41) SHA1(8af162223bb12fc19b414f126022910372790103), ROM_BIOS(1) ) -ROM_END - -ROM_START( laseractj ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - ROM_SYSTEM_BIOS(0, "v105", "v1.05") - ROMX_LOAD( "mega-ld 1.05 bios.bin", 0x000000, 0x020000, CRC(474aaa44) SHA1(b3b1d880e288b6dc79eec0ff1b0480c229ec141d), ROM_BIOS(0) ) - ROM_SYSTEM_BIOS(1, "v102", "v1.02") - ROMX_LOAD( "laseractive_bios_1_02_j.bin", 0x000000, 0x020000, CRC(00eedb3a) SHA1(26237b333db4a4c6770297fa5e655ea95840d5d9), ROM_BIOS(1) ) -ROM_END - -ROM_START( xeye ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - /* v2.00 (US), confirmed good with a chip dump */ - ROM_LOAD( "g304.bin", 0x000000, 0x020000, CRC(290f8e33) SHA1(651f14d5a5e0ecb974a60c0f43b1d2006323fb09) ) -ROM_END - -ROM_START( wmega ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - /* v1.00 (Japan NTSC) Sega BIOS, chip-dumped */ - ROM_LOAD( "g301.bin", 0x000000, 0x020000, CRC(d21fe71d) SHA1(3fc9358072f74bd24e3e297ea11b2bf15a7af891) ) -ROM_END - -ROM_START( wmegam2 ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - /* v2.00 */ - ROM_LOAD( "wondermega_m2_bios_2_00_j.bin", 0x000000, 0x020000, CRC(2b19972f) SHA1(b3f32e409bd5508c89ed8be33d41a58d791d0e5d) ) -ROM_END - -ROM_START( cdx ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - /* v2.21X */ - ROM_LOAD( "segacdx_bios_2_21_u.bin", 0x000000, 0x020000, CRC(d48c44b5) SHA1(2b125c0545afa089b617f2558e686ea723bdc06e) ) -ROM_END - -ROM_START( multmega ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - /* v2.21X */ - ROM_LOAD( "opr-16140.bin", 0x000000, 0x020000, CRC(aacb851e) SHA1(75548ac9aaa6e81224499f9a1403b2b42433f5b7) ) - /* the below was marked "confirmed good dump", but 0x72 and 0x73 are 0xFF, indicating a bad dump made from memory */ - /* ROM_LOAD( "multimega_bios_2_21_e.bin", 0x000000, 0x020000, CRC(34d3cce1) SHA1(73fc9c014ad803e9e7d8076b3642a8a5224b3e51) ) */ -ROM_END - -/* some games use the 32x and SegaCD together to give better quality FMV */ -ROM_START( 32x_scd ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - - ROM_REGION16_BE( 0x400000, "gamecart", 0 ) /* 68000 Code */ - ROM_LOAD( "mpr-15764-t.bin", 0x000000, 0x020000, CRC(2e49d72c) SHA1(328a3228c29fba244b9db2055adc1ec4f7a87e6b) ) - - ROM_REGION32_BE( 0x400000, "gamecart_sh2", 0 ) /* Copy for the SH2 */ - ROM_COPY( "gamecart", 0x000000, 0x0, 0x400000) - - ROM_REGION16_BE( 0x400000, "32x_68k_bios", 0 ) /* 68000 Code */ - ROM_LOAD( "32x_g_bios.bin", 0x000000, 0x000100, CRC(5c12eae8) SHA1(dbebd76a448447cb6e524ac3cb0fd19fc065d944) ) - - ROM_REGION32_BE( 0x400000, "master", 0 ) /* SH2 Code */ - ROM_LOAD( "32x_m_bios.bin", 0x000000, 0x000800, CRC(dd9c46b8) SHA1(1e5b0b2441a4979b6966d942b20cc76c413b8c5e) ) - - ROM_REGION32_BE( 0x400000, "slave", 0 ) /* SH2 Code */ - ROM_LOAD( "32x_s_bios.bin", 0x000000, 0x000400, CRC(bfda1fe5) SHA1(4103668c1bbd66c5e24558e73d4f3f92061a109a) ) -ROM_END - -ROM_START( 32x_mcd ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - - ROM_REGION16_BE( 0x400000, "gamecart", 0 ) /* 68000 Code */ - ROM_LOAD( "megacd_model1_bios_1_00_e.bin", 0x000000, 0x020000, CRC(529ac15a) SHA1(f891e0ea651e2232af0c5c4cb46a0cae2ee8f356) ) - - ROM_REGION32_BE( 0x400000, "gamecart_sh2", 0 ) /* Copy for the SH2 */ - ROM_COPY( "gamecart", 0x000000, 0x0, 0x400000) - - ROM_REGION16_BE( 0x400000, "32x_68k_bios", 0 ) /* 68000 Code */ - ROM_LOAD( "32x_g_bios.bin", 0x000000, 0x000100, CRC(5c12eae8) SHA1(dbebd76a448447cb6e524ac3cb0fd19fc065d944) ) - - ROM_REGION32_BE( 0x400000, "master", 0 ) /* SH2 Code */ - ROM_LOAD( "32x_m_bios.bin", 0x000000, 0x000800, CRC(dd9c46b8) SHA1(1e5b0b2441a4979b6966d942b20cc76c413b8c5e) ) - - ROM_REGION32_BE( 0x400000, "slave", 0 ) /* SH2 Code */ - ROM_LOAD( "32x_s_bios.bin", 0x000000, 0x000400, CRC(bfda1fe5) SHA1(4103668c1bbd66c5e24558e73d4f3f92061a109a) ) -ROM_END - -ROM_START( 32x_mcdj ) - ROM_REGION16_BE( 0x400000, "maincpu", ROMREGION_ERASE00 ) - - ROM_REGION16_BE( 0x400000, "gamecart", 0 ) /* 68000 Code */ - ROM_DEFAULT_BIOS("v100g") // this seems the only revision where the cursor in CD menu works, allowing to boot games - /* Confirmed by ElBarto */ - ROM_SYSTEM_BIOS(0, "v100s", "v1.00S") - ROMX_LOAD( "mpr-14088h.bin", 0x000000, 0x020000, CRC(3773d5aa) SHA1(bbf729a1aaa1667b783749299e1ad932aaf5f253), ROM_BIOS(0) | ROM_GROUPWORD | ROM_REVERSE) - /* Confirmed by ElBarto */ - ROM_SYSTEM_BIOS(1, "v100g", "v1.00G") - ROMX_LOAD( "epr-14088b.bin", 0x000000, 0x020000, CRC(69ed6ccd) SHA1(27d11c3836506f01ee81cd142c0cd8b51abebbd2), ROM_BIOS(1) | ROM_GROUPWORD | ROM_REVERSE) - /* Confirmed by ElBarto */ - ROM_SYSTEM_BIOS(2, "v100l", "v1.00L") - ROMX_LOAD( "mpr-14088c.bin", 0x000000, 0x020000, CRC(03134289) SHA1(d60cb5a53f26d6b13e354bc149217587f2301718), ROM_BIOS(2) | ROM_GROUPWORD | ROM_REVERSE) - /* Confirmed by ElBarto */ - ROM_SYSTEM_BIOS(3, "v100o", "v1.00O") - ROMX_LOAD( "epr-14088d.bin", 0x000000, 0x020000, CRC(dfa95ee9) SHA1(e13666c76fa0a2e94e2f651b26b0fd625bf55f07), ROM_BIOS(3) | ROM_GROUPWORD | ROM_REVERSE) - ROM_SYSTEM_BIOS(4, "v100p", "v1.00P") // CRC: e2e70bc8 when byteswapped - ROMX_LOAD( "epr-14088e.bin", 0x000000, 0x020000, CRC(9d2da8f2) SHA1(4846f448160059a7da0215a5df12ca160f26dd69), ROM_BIOS(4) ) - - ROM_REGION32_BE( 0x400000, "gamecart_sh2", 0 ) /* Copy for the SH2 */ - ROM_COPY( "gamecart", 0x000000, 0x0, 0x400000) - - ROM_REGION16_BE( 0x400000, "32x_68k_bios", 0 ) /* 68000 Code */ - ROM_LOAD( "32x_g_bios.bin", 0x000000, 0x000100, CRC(5c12eae8) SHA1(dbebd76a448447cb6e524ac3cb0fd19fc065d944) ) - - ROM_REGION32_BE( 0x400000, "master", 0 ) /* SH2 Code */ - ROM_LOAD( "32x_m_bios.bin", 0x000000, 0x000800, CRC(dd9c46b8) SHA1(1e5b0b2441a4979b6966d942b20cc76c413b8c5e) ) - - ROM_REGION32_BE( 0x400000, "slave", 0 ) /* SH2 Code */ - ROM_LOAD( "32x_s_bios.bin", 0x000000, 0x000400, CRC(bfda1fe5) SHA1(4103668c1bbd66c5e24558e73d4f3f92061a109a) ) -ROM_END - - - -/*************************************************************************** - - Game driver(s) - -***************************************************************************/ - -/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ -CONS( 1989, genesis, 0, 0, ms_megadriv, md, md_cons_slot_state, init_genesis, "Sega", "Genesis (USA, NTSC)", MACHINE_SUPPORTS_SAVE ) -CONS( 1990, megadriv, genesis, 0, ms_megadpal, md, md_cons_slot_state, init_md_eur, "Sega", "Mega Drive (Europe, PAL)", MACHINE_SUPPORTS_SAVE ) -CONS( 1988, megadrij, genesis, 0, ms_megadriv, md, md_cons_slot_state, init_md_jpn, "Sega", "Mega Drive (Japan, NTSC)", MACHINE_SUPPORTS_SAVE ) - -// 1990+ models had the TMSS security chip, leave this as a clone, it reduces compatibility and nothing more. -CONS( 1990, genesis_tmss, genesis, 0, genesis_tmss, md, md_cons_slot_state, init_genesis, "Sega", "Genesis (USA, NTSC, with TMSS chip)", MACHINE_SUPPORTS_SAVE ) - -// the 32X plugged in the cart slot, games plugged into the 32x. Maybe it should be handled as an expansion device? -CONS( 1994, 32x, 0, 0, genesis_32x, md, md_cons_state, init_genesis, "Sega", "Genesis with 32X (USA, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1994, 32xe, 32x, 0, md_32x, md, md_cons_state, init_md_eur, "Sega", "Mega Drive with 32X (Europe, PAL)", MACHINE_NOT_WORKING ) -CONS( 1994, 32xj, 32x, 0, mdj_32x, md, md_cons_state, init_md_jpn, "Sega", "Mega Drive with 32X (Japan, NTSC)", MACHINE_NOT_WORKING ) - -// the SegaCD plugged into the expansion port.. -CONS( 1992, segacd, 0, 0, genesis_scd, md, md_cons_cd_state, init_genesis, "Sega", "Sega CD (USA, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1993, megacd, segacd, 0, md_scd, md, md_cons_cd_state, init_md_eur, "Sega", "Mega-CD (Europe, PAL)", MACHINE_NOT_WORKING ) -CONS( 1991, megacdj, segacd, 0, mdj_scd, md, md_cons_cd_state, init_md_jpn, "Sega", "Mega-CD (Japan, NTSC)", MACHINE_NOT_WORKING ) // this bios doesn't work with our ram interleave needed by a few games?! -CONS( 1991, megacda, segacd, 0, md_scd, md, md_cons_cd_state, init_md_eur, "Sega", "Mega-CD (Asia, PAL)", MACHINE_NOT_WORKING ) -CONS( 1993, segacd2, 0, 0, genesis_scd, md, md_cons_cd_state, init_genesis, "Sega", "Sega CD 2 (USA, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1993, megacd2, segacd2, 0, md_scd, md, md_cons_cd_state, init_md_eur, "Sega", "Mega-CD 2 (Europe, PAL)", MACHINE_NOT_WORKING ) -CONS( 1993, megacd2j, segacd2, 0, mdj_scd, md, md_cons_cd_state, init_md_jpn, "Sega", "Mega-CD 2 (Japan, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1994, aiwamcd, segacd2, 0, mdj_scd, md, md_cons_cd_state, init_md_jpn, "AIWA", "Mega-CD CSD-G1M (Japan, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1993, xeye, 0, 0, genesis2_scd, md, md_cons_cd_state, init_genesis, "JVC", "X'eye (USA, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1992, wmega, xeye, 0, mdj_scd, md, md_cons_cd_state, init_md_jpn, "Sega", "Wondermega (Japan, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1993, wmegam2, xeye, 0, md2j_scd, md, md_cons_cd_state, init_md_jpn, "Victor", "Wondermega M2 (Japan, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1994, cdx, 0, 0, genesis2_scd, md, md_cons_cd_state, init_genesis, "Sega", "CDX (USA, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1994, multmega, cdx, 0, md2_scd, md, md_cons_cd_state, init_md_eur, "Sega", "Multi-Mega (Europe, PAL)", MACHINE_NOT_WORKING ) - -//32X plugged in the cart slot + SegaCD plugged into the expansion port.. -CONS( 1994, 32x_scd, 0, 0, genesis_32x_scd, md, md_cons_cd_state, init_genesis, "Sega", "Sega CD with 32X (USA, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1995, 32x_mcd, 32x_scd, 0, md_32x_scd, md, md_cons_cd_state, init_md_eur, "Sega", "Mega-CD with 32X (Europe, PAL)", MACHINE_NOT_WORKING ) -CONS( 1994, 32x_mcdj, 32x_scd, 0, mdj_32x_scd, md, md_cons_cd_state, init_md_jpn, "Sega", "Mega-CD with 32X (Japan, NTSC)", MACHINE_NOT_WORKING ) - -// handheld hardware -CONS( 1995, gen_nomd, 0, 0, ms_megadriv2, gen_nomd, md_cons_slot_state, init_genesis, "Sega", "Genesis Nomad (USA Genesis handheld)", MACHINE_SUPPORTS_SAVE ) - -// handheld without LCD -CONS( 1993, megajet, gen_nomd, 0, ms_megadriv2, megajet, md_cons_slot_state, init_md_jpn, "Sega", "Mega Jet (Japan Mega Drive handheld)", MACHINE_SUPPORTS_SAVE ) - -// LaserActive (Laserdisc Player(ex: CLD-A100) with 'Control Pack' Addon slot) -// Mega Drive Pack(PAC-S1)/Genesis Pack(PAC-S10) plugged into the Control Pack slot, for plays Mega Drive/Genesis Cartridge, Mega-CD/Sega CD, Mega-LD stuffs -CONS( 1993, laseract, 0, 0, genesis_scd, md, md_cons_cd_state, init_genesis, "Pioneer / Sega","LaserActive with Genesis Pack PAC-S10 (USA, NTSC)", MACHINE_NOT_WORKING ) -CONS( 1993, laseractj, laseract, 0, mdj_scd, md, md_cons_cd_state, init_md_jpn, "Pioneer / Sega","LaserActive with Mega Drive Pack PAC-S1 (Japan, NTSC)", MACHINE_NOT_WORKING ) -//TODO: it has also PC Engine Pack(PAC-N1)/TG16 Pack(PAC-N10) for plays PC Engine/TG16 Cartridge, (Super/Arcade) CD-ROM2/TurboGrafx-CD, LD-ROM2 stuffs, but not emulated. - -/* clone hardware - not sure if this hardware is running some kind of emulator, or enhanced MD clone, or just custom banking */ -CONS( 200?, dcat16, 0, 0, dcat16_megadriv, md, md_cons_slot_state, init_genesis, "Firecore", "D-CAT16 (Mega Drive handheld)", MACHINE_NOT_WORKING ) diff --git a/src/mame/segacons/megadriv_rad.cpp b/src/mame/segacons/megadriv_rad.cpp index 4668d5a841b..42e14b90572 100644 --- a/src/mame/segacons/megadriv_rad.cpp +++ b/src/mame/segacons/megadriv_rad.cpp @@ -20,8 +20,8 @@ */ #include "emu.h" -#include "includes/megadriv.h" -#include "includes/megadriv_rad.h" +#include "megadriv.h" +#include "megadriv_rad.h" // todo, use actual MD map, easier once maps are part of base class. void megadriv_radica_state::megadriv_base_map(address_map &map) diff --git a/src/mame/segacons/megadriv_sunplus_hybrid.cpp b/src/mame/segacons/megadriv_sunplus_hybrid.cpp index 78816d123e0..678d84863da 100644 --- a/src/mame/segacons/megadriv_sunplus_hybrid.cpp +++ b/src/mame/segacons/megadriv_sunplus_hybrid.cpp @@ -14,7 +14,7 @@ */ #include "emu.h" -#include "includes/megadriv.h" +#include "megadriv.h" class megadriv_sunplus_state : public md_base_state { diff --git a/src/mame/segacons/megadriv_vt_hybrid.cpp b/src/mame/segacons/megadriv_vt_hybrid.cpp index a31f4a15280..0644fb1ab3a 100644 --- a/src/mame/segacons/megadriv_vt_hybrid.cpp +++ b/src/mame/segacons/megadriv_vt_hybrid.cpp @@ -13,7 +13,9 @@ */ #include "emu.h" -#include "includes/megadriv.h" +#include "megadriv.h" + +namespace { class megadriv_vt0203_state : public md_base_state { @@ -142,6 +144,8 @@ void megadriv_vt0203_state::megadriv_vt0203_pal(machine_config &config) // but instead we'll need to use a shared screen that is reconfigured depending on which part is enabled } +} // anonymous namespace + ROM_START( sarc110 ) ROM_REGION( 0x1000000, "maincpu", 0 ) // Mega Drive part diff --git a/src/mame/segacons/segapico.cpp b/src/mame/segacons/segapico.cpp index f95a4d75c66..5b13193333a 100644 --- a/src/mame/segacons/segapico.cpp +++ b/src/mame/segacons/segapico.cpp @@ -118,12 +118,14 @@ C = MB3514 / 9325 M36 */ #include "emu.h" -#include "includes/megadriv.h" +#include "mdconsole.h" #include "sound/315-5641.h" #include "bus/megadrive/rom.h" #include "softlist.h" +namespace { + #define PICO_PENX 1 #define PICO_PENY 2 @@ -468,10 +470,6 @@ void pico_base_state::init_picoj() } -CONS( 1994, pico, 0, 0, picopal, pico, pico_state, init_pico, "Sega", "Pico (Europe, PAL)", MACHINE_NOT_WORKING) -CONS( 1994, picou, pico, 0, pico, pico, pico_state, init_picou, "Sega", "Pico (USA, NTSC)", MACHINE_NOT_WORKING) -CONS( 1993, picoj, pico, 0, pico, pico, pico_state, init_picoj, "Sega", "Pico (Japan, NTSC)", MACHINE_NOT_WORKING) - /* This looks a lot like a Pico with extra sound hardware... @@ -630,4 +628,11 @@ ROM_START( copera ) ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF) ROM_END +} // anonymous namespace + + +CONS( 1994, pico, 0, 0, picopal, pico, pico_state, init_pico, "Sega", "Pico (Europe, PAL)", MACHINE_NOT_WORKING) +CONS( 1994, picou, pico, 0, pico, pico, pico_state, init_picou, "Sega", "Pico (USA, NTSC)", MACHINE_NOT_WORKING) +CONS( 1993, picoj, pico, 0, pico, pico, pico_state, init_picoj, "Sega", "Pico (Japan, NTSC)", MACHINE_NOT_WORKING) + CONS( 1993, copera, 0, 0, copera, pico, copera_state, init_picoj, "Yamaha / Sega", "Yamaha Mixt Book Player Copera", MACHINE_NOT_WORKING) diff --git a/src/mame/segacons/sg1000.cpp b/src/mame/segacons/sg1000.cpp index 4ad502b9d87..a3004543a98 100644 --- a/src/mame/segacons/sg1000.cpp +++ b/src/mame/segacons/sg1000.cpp @@ -65,7 +65,7 @@ Notes: #include "emu.h" -#include "includes/sg1000.h" +#include "sg1000.h" #include "bus/rs232/rs232.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/seibu/airraid.cpp b/src/mame/seibu/airraid.cpp index 98a99f3a5ab..a8356d08677 100644 --- a/src/mame/seibu/airraid.cpp +++ b/src/mame/seibu/airraid.cpp @@ -143,12 +143,14 @@ Stephh's notes (based on the game Z80 code and some tests) : #include "emu.h" -#include "audio/seibu.h" -#include "video/airraid_dev.h" +#include "airraid_dev.h" + +#include "seibusound.h" #include "cpu/z80/z80.h" #include "machine/timer.h" #include "sound/ymopm.h" + #include "emupal.h" #include "speaker.h" diff --git a/src/mame/seibu/banprestoms.cpp b/src/mame/seibu/banprestoms.cpp index b1b9a8c81a6..79a581b72fa 100644 --- a/src/mame/seibu/banprestoms.cpp +++ b/src/mame/seibu/banprestoms.cpp @@ -36,7 +36,7 @@ TODO: #include "emu.h" -#include "video/seibu_crtc.h" +#include "seibu_crtc.h" #include "cpu/m68000/m68000.h" #include "machine/nvram.h" diff --git a/src/mame/seibu/bloodbro.cpp b/src/mame/seibu/bloodbro.cpp index b0e516c735a..9e64a0370b0 100644 --- a/src/mame/seibu/bloodbro.cpp +++ b/src/mame/seibu/bloodbro.cpp @@ -138,12 +138,12 @@ Video: **************************************************************************/ #include "emu.h" -#include "includes/bloodbro.h" +#include "bloodbro.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/okim6295.h" -#include "video/seibu_crtc.h" +#include "seibu_crtc.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/seibu/bloodbro.h b/src/mame/seibu/bloodbro.h index 4884cf93bc8..3a9d4b4cb81 100644 --- a/src/mame/seibu/bloodbro.h +++ b/src/mame/seibu/bloodbro.h @@ -1,12 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Carlos A. Lozano -#ifndef MAME_INCLUDES_BLOODBRO_H -#define MAME_INCLUDES_BLOODBRO_H +#ifndef MAME_SEIBU_BLOODBRO_H +#define MAME_SEIBU_BLOODBRO_H #pragma once -#include "audio/seibu.h" +#include "seibusound.h" + #include "sound/ymopl.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" @@ -91,4 +93,4 @@ private: void weststry_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_BLOODBRO_H +#endif // MAME_SEIBU_BLOODBRO_H diff --git a/src/mame/seibu/bloodbro_v.cpp b/src/mame/seibu/bloodbro_v.cpp index ff8dc287b90..3413fe6c08b 100644 --- a/src/mame/seibu/bloodbro_v.cpp +++ b/src/mame/seibu/bloodbro_v.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bloodbro.h" +#include "bloodbro.h" #include "screen.h" diff --git a/src/mame/seibu/cabal.cpp b/src/mame/seibu/cabal.cpp index 2debed9d534..ed0ee86034d 100644 --- a/src/mame/seibu/cabal.cpp +++ b/src/mame/seibu/cabal.cpp @@ -163,7 +163,7 @@ Notes: ******************************************************************/ #include "emu.h" -#include "includes/cabal.h" +#include "cabal.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/seibu/cabal.h b/src/mame/seibu/cabal.h index 4e799c3761d..65b80f817e2 100644 --- a/src/mame/seibu/cabal.h +++ b/src/mame/seibu/cabal.h @@ -1,12 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Carlos A. Lozano -#ifndef MAME_INCLUDES_CABAL_H -#define MAME_INCLUDES_CABAL_H +#ifndef MAME_SEIBU_CABAL_H +#define MAME_SEIBU_CABAL_H #pragma once -#include "audio/seibu.h" +#include "seibusound.h" + #include "sound/msm5205.h" + #include "emupal.h" #include "tilemap.h" @@ -113,4 +115,4 @@ private: void talk2_portmap(address_map &map); }; -#endif // MAME_INCLUDES_CABAL_H +#endif // MAME_SEIBU_CABAL_H diff --git a/src/mame/seibu/cabal_v.cpp b/src/mame/seibu/cabal_v.cpp index 1823445e7db..1f2e385461c 100644 --- a/src/mame/seibu/cabal_v.cpp +++ b/src/mame/seibu/cabal_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/cabal.h" +#include "cabal.h" TILE_GET_INFO_MEMBER(cabal_base_state::get_back_tile_info) { diff --git a/src/mame/seibu/darkmist.cpp b/src/mame/seibu/darkmist.cpp index 2990d6fbe50..96a1f37a351 100644 --- a/src/mame/seibu/darkmist.cpp +++ b/src/mame/seibu/darkmist.cpp @@ -29,7 +29,7 @@ TODO: */ #include "emu.h" -#include "includes/darkmist.h" +#include "darkmist.h" #include "cpu/z80/z80.h" #include "speaker.h" diff --git a/src/mame/seibu/darkmist.h b/src/mame/seibu/darkmist.h index 9ef1a1f9882..da3ee84a486 100644 --- a/src/mame/seibu/darkmist.h +++ b/src/mame/seibu/darkmist.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/t5182.h" +#include "t5182.h" #include "machine/timer.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/seibu/darkmist_v.cpp b/src/mame/seibu/darkmist_v.cpp index 7d82d6b817e..7b9c514aa0d 100644 --- a/src/mame/seibu/darkmist_v.cpp +++ b/src/mame/seibu/darkmist_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Nicola Salmoria, Tomasz Slanina #include "emu.h" -#include "includes/darkmist.h" +#include "darkmist.h" diff --git a/src/mame/seibu/dcon.cpp b/src/mame/seibu/dcon.cpp index 225ab1eddcc..84dad3e00c8 100644 --- a/src/mame/seibu/dcon.cpp +++ b/src/mame/seibu/dcon.cpp @@ -15,14 +15,14 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dcon.h" +#include "dcon.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/okim6295.h" #include "sound/ymopm.h" #include "sound/ymopl.h" -#include "video/seibu_crtc.h" +#include "seibu_crtc.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/seibu/dcon.h b/src/mame/seibu/dcon.h index 8934cbcfa5b..987c85ec509 100644 --- a/src/mame/seibu/dcon.h +++ b/src/mame/seibu/dcon.h @@ -1,11 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail -#ifndef MAME_INCLUDES_DCON_H -#define MAME_INCLUDES_DCON_H +#ifndef MAME_SEIBU_DCON_H +#define MAME_SEIBU_DCON_H #pragma once -#include "audio/seibu.h" +#include "seibusound.h" + #include "emupal.h" #include "tilemap.h" @@ -74,4 +75,4 @@ private: void sdgndmps_map(address_map &map); }; -#endif // MAME_INCLUDES_DCON_H +#endif // MAME_SEIBU_DCON_H diff --git a/src/mame/seibu/dcon_v.cpp b/src/mame/seibu/dcon_v.cpp index 2509bbbbe57..fa6a75857ea 100644 --- a/src/mame/seibu/dcon_v.cpp +++ b/src/mame/seibu/dcon_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dcon.h" +#include "dcon.h" #include "screen.h" diff --git a/src/mame/seibu/deadang.cpp b/src/mame/seibu/deadang.cpp index b56bcb18e4a..899e178c20a 100644 --- a/src/mame/seibu/deadang.cpp +++ b/src/mame/seibu/deadang.cpp @@ -44,7 +44,7 @@ Dip locations and factory settings verified with US manual */ #include "emu.h" -#include "includes/deadang.h" +#include "deadang.h" #include "cpu/nec/nec.h" #include "machine/watchdog.h" diff --git a/src/mame/seibu/deadang.h b/src/mame/seibu/deadang.h index 4360a2b9e5c..791417d1ec1 100644 --- a/src/mame/seibu/deadang.h +++ b/src/mame/seibu/deadang.h @@ -1,13 +1,15 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Haywood -#ifndef MAME_INCLUDES_DEADANG_H -#define MAME_INCLUDES_DEADANG_H +#ifndef MAME_SEIBU_DEADANG_H +#define MAME_SEIBU_DEADANG_H #pragma once -#include "audio/seibu.h" +#include "seibusound.h" + #include "machine/timer.h" #include "sound/ymopm.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" @@ -116,4 +118,4 @@ private: void popnrun_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; -#endif // MAME_INCLUDES_DEADANG_H +#endif // MAME_SEIBU_DEADANG_H diff --git a/src/mame/seibu/deadang_v.cpp b/src/mame/seibu/deadang_v.cpp index e3fff288eaa..e94def9c471 100644 --- a/src/mame/seibu/deadang_v.cpp +++ b/src/mame/seibu/deadang_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Haywood #include "emu.h" -#include "includes/deadang.h" +#include "deadang.h" #include "screen.h" diff --git a/src/mame/seibu/dynduke.cpp b/src/mame/seibu/dynduke.cpp index 877e5cbbb7a..078ef5a5cfb 100644 --- a/src/mame/seibu/dynduke.cpp +++ b/src/mame/seibu/dynduke.cpp @@ -68,7 +68,7 @@ Also, implemented conditional port for Coin Mode (SW1:1) ***************************************************************************/ #include "emu.h" -#include "includes/dynduke.h" +#include "dynduke.h" #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" diff --git a/src/mame/seibu/dynduke.h b/src/mame/seibu/dynduke.h index 91012b848f1..bd35e6a975d 100644 --- a/src/mame/seibu/dynduke.h +++ b/src/mame/seibu/dynduke.h @@ -1,15 +1,18 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Haywood -#ifndef MAME_INCLUDES_DYNDUKE_H -#define MAME_INCLUDES_DYNDUKE_H +#ifndef MAME_SEIBU_DYNDUKE_H +#define MAME_SEIBU_DYNDUKE_H #pragma once -#include "audio/seibu.h" +#include "seibusound.h" + #include "video/bufsprite.h" + #include "emupal.h" #include "tilemap.h" + class dynduke_state : public driver_device { public: @@ -80,4 +83,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_DYNDUKE_H +#endif // MAME_SEIBU_DYNDUKE_H diff --git a/src/mame/seibu/dynduke_v.cpp b/src/mame/seibu/dynduke_v.cpp index 2f0fff57946..de460585157 100644 --- a/src/mame/seibu/dynduke_v.cpp +++ b/src/mame/seibu/dynduke_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Haywood #include "emu.h" -#include "includes/dynduke.h" +#include "dynduke.h" diff --git a/src/mame/seibu/feversoc.cpp b/src/mame/seibu/feversoc.cpp index 394dd5311f8..649db8e3f37 100644 --- a/src/mame/seibu/feversoc.cpp +++ b/src/mame/seibu/feversoc.cpp @@ -73,7 +73,7 @@ U089 MAX232 Dual EIA Driver/Receiver #include "emu.h" #include "cpu/sh/sh2.h" -#include "machine/seibuspi.h" +#include "seibuspi_m.h" #include "sound/okim6295.h" #include "machine/eepromser.h" #include "machine/rtc4543.h" diff --git a/src/mame/seibu/goodejan.cpp b/src/mame/seibu/goodejan.cpp index 0f4f82b3ed0..2c0c50421f3 100644 --- a/src/mame/seibu/goodejan.cpp +++ b/src/mame/seibu/goodejan.cpp @@ -71,18 +71,23 @@ Secret menu hack [totmejan only] (I couldn't find official way to enter, so it's *******************************************************************************************/ #include "emu.h" -#include "audio/seibu.h" + +#include "seibu_crtc.h" + +#include "seibusound.h" #include "cpu/nec/nec.h" #include "sound/okim6295.h" #include "sound/ymopl.h" -#include "video/seibu_crtc.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" #include "tilemap.h" +namespace { + class goodejan_state : public driver_device, public seibu_sound_common { public: @@ -747,6 +752,8 @@ ROM_START( goodejana ) ROM_LOAD( "fmj08.083", 0x000, 0x100, CRC(9657b7ad) SHA1(e9b469c2b3534593f7fe0ea19cbbf93b55957e42) ) ROM_END +} // anonymous namespace + GAME( 1991, totmejan, 0, totmejan, goodejan, goodejan_state, empty_init, ROT0, "Seibu Kaihatsu (Tecmo license)", "Tottemo E Jong", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1991, goodejan, 0, goodejan, goodejan, goodejan_state, empty_init, ROT0, "Seibu Kaihatsu (Tecmo license)", "Good E Jong -Kachinuki Mahjong Syoukin Oh!!- (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1991, goodejana, goodejan, goodejan, goodejan, goodejan_state, empty_init, ROT0, "Seibu Kaihatsu (Tecmo license)", "Good E Jong -Kachinuki Mahjong Syoukin Oh!!- (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/seibu/kncljoe.cpp b/src/mame/seibu/kncljoe.cpp index 814d7eef42b..b9d9d1ad6d9 100644 --- a/src/mame/seibu/kncljoe.cpp +++ b/src/mame/seibu/kncljoe.cpp @@ -27,7 +27,7 @@ BTANB: ***************************************************************************/ #include "emu.h" -#include "includes/kncljoe.h" +#include "kncljoe.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" diff --git a/src/mame/seibu/kncljoe_v.cpp b/src/mame/seibu/kncljoe_v.cpp index 1edd294cf12..f7e9bf8386f 100644 --- a/src/mame/seibu/kncljoe_v.cpp +++ b/src/mame/seibu/kncljoe_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/kncljoe.h" +#include "kncljoe.h" /*************************************************************************** diff --git a/src/mame/seibu/legionna.cpp b/src/mame/seibu/legionna.cpp index f95fdc9ae08..c341d3fef46 100644 --- a/src/mame/seibu/legionna.cpp +++ b/src/mame/seibu/legionna.cpp @@ -83,7 +83,7 @@ Preliminary COP MCU memory map ***************************************************************************/ #include "emu.h" -#include "includes/legionna.h" +#include "legionna.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/seibu/legionna.h b/src/mame/seibu/legionna.h index 69255044b62..14439ff5d80 100644 --- a/src/mame/seibu/legionna.h +++ b/src/mame/seibu/legionna.h @@ -1,15 +1,18 @@ // license:BSD-3-Clause // copyright-holders:David Graves, Angelo Salese, David Haywood, Tomasz Slanina -#ifndef MAME_INCLUDES_LEGIONNA_H -#define MAME_INCLUDES_LEGIONNA_H +#ifndef MAME_SEIBU_LEGIONNA_H +#define MAME_SEIBU_LEGIONNA_H #pragma once +#include "seibu_crtc.h" +#include "seibucop.h" + +#include "seibusound.h" + #include "sound/okim6295.h" -#include "audio/seibu.h" #include "machine/gen_latch.h" -#include "machine/seibucop.h" -#include "video/seibu_crtc.h" + #include "emupal.h" #include "tilemap.h" @@ -134,4 +137,4 @@ private: optional_device m_raiden2cop; }; -#endif // MAME_INCLUDES_LEGIONNA_H +#endif // MAME_SEIBU_LEGIONNA_H diff --git a/src/mame/seibu/legionna_v.cpp b/src/mame/seibu/legionna_v.cpp index 082a38cf15a..6b1492de526 100644 --- a/src/mame/seibu/legionna_v.cpp +++ b/src/mame/seibu/legionna_v.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/legionna.h" +#include "legionna.h" #include "screen.h" diff --git a/src/mame/seibu/metlfrzr.cpp b/src/mame/seibu/metlfrzr.cpp index fb0497660ca..8ca2c880143 100644 --- a/src/mame/seibu/metlfrzr.cpp +++ b/src/mame/seibu/metlfrzr.cpp @@ -21,7 +21,7 @@ **************************************************************************************************************************/ #include "emu.h" -#include "audio/t5182.h" +#include "t5182.h" #include "cpu/z80/z80.h" #include "machine/timer.h" diff --git a/src/mame/seibu/mustache.cpp b/src/mame/seibu/mustache.cpp index ce95d7d56c8..8c185b45167 100644 --- a/src/mame/seibu/mustache.cpp +++ b/src/mame/seibu/mustache.cpp @@ -31,8 +31,8 @@ YM2151: ***************************************************************************/ #include "emu.h" -#include "includes/mustache.h" -#include "audio/t5182.h" +#include "mustache.h" +#include "t5182.h" #include "cpu/z80/z80.h" #include "speaker.h" diff --git a/src/mame/seibu/mustache.h b/src/mame/seibu/mustache.h index 1f3ff0660d7..48b39bf0552 100644 --- a/src/mame/seibu/mustache.h +++ b/src/mame/seibu/mustache.h @@ -1,16 +1,19 @@ // license:BSD-3-Clause // copyright-holders:Tomasz Slanina -#ifndef MAME_INCLUDES_MUSTACHE_H -#define MAME_INCLUDES_MUSTACHE_H +#ifndef MAME_SEIBU_MUSTACHE_H +#define MAME_SEIBU_MUSTACHE_H #pragma once -#include "audio/seibu.h" // for seibu_sound_decrypt on the MAIN cpu (not sound) +#include "seibusound.h" // for seibu_sound_decrypt on the MAIN cpu (not sound) + #include "machine/timer.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" + class mustache_state : public driver_device { public: @@ -58,4 +61,4 @@ private: void memmap(address_map &map); }; -#endif // MAME_INCLUDES_MUSTACHE_H +#endif // MAME_SEIBU_MUSTACHE_H diff --git a/src/mame/seibu/mustache_v.cpp b/src/mame/seibu/mustache_v.cpp index bc0172b25d0..d792286cf9b 100644 --- a/src/mame/seibu/mustache_v.cpp +++ b/src/mame/seibu/mustache_v.cpp @@ -9,7 +9,7 @@ #include "emu.h" -#include "includes/mustache.h" +#include "mustache.h" void mustache_state::videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/seibu/panicr.cpp b/src/mame/seibu/panicr.cpp index e7dd83f0326..3d81ea36044 100644 --- a/src/mame/seibu/panicr.cpp +++ b/src/mame/seibu/panicr.cpp @@ -61,7 +61,7 @@ D.9B [f99cac4b] / */ #include "emu.h" -#include "audio/t5182.h" +#include "t5182.h" #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" diff --git a/src/mame/seibu/r2crypt.cpp b/src/mame/seibu/r2crypt.cpp index ad297181bc8..dbf40ce8439 100644 --- a/src/mame/seibu/r2crypt.cpp +++ b/src/mame/seibu/r2crypt.cpp @@ -3,8 +3,8 @@ /* Raiden 2 Sprite Decryption */ #include "emu.h" -#include "includes/raiden2.h" -#include "seibuspi.h" +#include "raiden2.h" +#include "seibuspi_m.h" /* diff --git a/src/mame/seibu/r2crypt.h b/src/mame/seibu/r2crypt.h index 39293d4737c..8e2957a76e9 100644 --- a/src/mame/seibu/r2crypt.h +++ b/src/mame/seibu/r2crypt.h @@ -1,7 +1,7 @@ // license:LGPL-2.1+ // copyright-holders:Olivier Galibert, Angelo Salese, David Haywood, Tomasz Slanina -#include "machine/seibuspi.h" +#include "seibuspi_m.h" void raiden2_decrypt_sprites(running_machine &machine); void zeroteam_decrypt_sprites(running_machine &machine); diff --git a/src/mame/seibu/r2dx_v33.cpp b/src/mame/seibu/r2dx_v33.cpp index 9d496202320..5f628bbdaff 100644 --- a/src/mame/seibu/r2dx_v33.cpp +++ b/src/mame/seibu/r2dx_v33.cpp @@ -63,14 +63,14 @@ Then it puts settings at 0x9e08 and 0x9e0a (bp 91acb) */ #include "emu.h" -#include "includes/raiden2.h" +#include "raiden2.h" #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "sound/okim6295.h" #include "sound/ymopl.h" -#include "machine/r2crypt.h" +#include "r2crypt.h" #include "speaker.h" diff --git a/src/mame/seibu/raiden.cpp b/src/mame/seibu/raiden.cpp index 4a192edd8bc..2463e772541 100644 --- a/src/mame/seibu/raiden.cpp +++ b/src/mame/seibu/raiden.cpp @@ -79,13 +79,13 @@ ***************************************************************************/ #include "emu.h" -#include "includes/raiden.h" +#include "raiden.h" #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" #include "sound/okim6295.h" #include "sound/ymopl.h" -#include "video/seibu_crtc.h" +#include "seibu_crtc.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/seibu/raiden.h b/src/mame/seibu/raiden.h index ea3f0778209..9a5245545ad 100644 --- a/src/mame/seibu/raiden.h +++ b/src/mame/seibu/raiden.h @@ -5,13 +5,15 @@ Seibu Raiden hardware *******************************************************************************/ -#ifndef MAME_INCLUDES_RAIDEN_H -#define MAME_INCLUDES_RAIDEN_H +#ifndef MAME_SEIBU_RAIDEN_H +#define MAME_SEIBU_RAIDEN_H #pragma once -#include "audio/seibu.h" +#include "seibusound.h" + #include "video/bufsprite.h" + #include "emupal.h" #include "tilemap.h" @@ -120,4 +122,4 @@ private: void raidenb_main_map(address_map &map); }; -#endif // MAME_INCLUDES_RAIDEN_H +#endif // MAME_SEIBU_RAIDEN_H diff --git a/src/mame/seibu/raiden2.cpp b/src/mame/seibu/raiden2.cpp index 68732d64797..5bde7a8a6e0 100644 --- a/src/mame/seibu/raiden2.cpp +++ b/src/mame/seibu/raiden2.cpp @@ -169,7 +169,7 @@ Protection Notes: ********************************************************************************************************/ #include "emu.h" -#include "includes/raiden2.h" +#include "raiden2.h" #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" @@ -177,7 +177,7 @@ Protection Notes: #include "sound/okim6295.h" #include "sound/ymopm.h" #include "sound/ymopl.h" -#include "machine/r2crypt.h" +#include "r2crypt.h" #include "debugger.h" #include "speaker.h" diff --git a/src/mame/seibu/raiden2.h b/src/mame/seibu/raiden2.h index 1577afbeeac..51fb046c6c2 100644 --- a/src/mame/seibu/raiden2.h +++ b/src/mame/seibu/raiden2.h @@ -1,14 +1,17 @@ // license:LGPL-2.1+ // copyright-holders:Olivier Galibert, Angelo Salese, David Haywood, Tomasz Slanina -#ifndef MAME_INCLUDES_RAIDEN2_H -#define MAME_INCLUDES_RAIDEN2_H +#ifndef MAME_SEIBU_RAIDEN2_H +#define MAME_SEIBU_RAIDEN2_H #pragma once -#include "audio/seibu.h" -#include "machine/seibucop.h" +#include "seibu_crtc.h" +#include "seibucop.h" + +#include "seibusound.h" + #include "video/bufsprite.h" -#include "video/seibu_crtc.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" @@ -180,4 +183,4 @@ private: void zeroteam_mem(address_map &map); }; -#endif // MAME_INCLUDES_RAIDEN2_H +#endif // MAME_SEIBU_RAIDEN2_H diff --git a/src/mame/seibu/raiden2_v.cpp b/src/mame/seibu/raiden2_v.cpp index 2814159e1f5..09e7376ec21 100644 --- a/src/mame/seibu/raiden2_v.cpp +++ b/src/mame/seibu/raiden2_v.cpp @@ -7,7 +7,7 @@ ********************************************************************************************************/ #include "emu.h" -#include "includes/raiden2.h" +#include "raiden2.h" void raiden2_state::m_videoram_private_w(offs_t offset, uint16_t data) { diff --git a/src/mame/seibu/raiden_v.cpp b/src/mame/seibu/raiden_v.cpp index f87ad823d28..e47154b210c 100644 --- a/src/mame/seibu/raiden_v.cpp +++ b/src/mame/seibu/raiden_v.cpp @@ -9,7 +9,7 @@ *******************************************************************************/ #include "emu.h" -#include "includes/raiden.h" +#include "raiden.h" #include "screen.h" diff --git a/src/mame/seibu/seibu_crtc.cpp b/src/mame/seibu/seibu_crtc.cpp index 530ccef08df..4c882f63185 100644 --- a/src/mame/seibu/seibu_crtc.cpp +++ b/src/mame/seibu/seibu_crtc.cpp @@ -222,7 +222,7 @@ List of default vregs (title screen): ***************************************************************************/ #include "emu.h" -#include "video/seibu_crtc.h" +#include "seibu_crtc.h" diff --git a/src/mame/seibu/seibucats.cpp b/src/mame/seibu/seibucats.cpp index ac2ce289ab1..2c3626f50be 100644 --- a/src/mame/seibu/seibucats.cpp +++ b/src/mame/seibu/seibucats.cpp @@ -67,14 +67,14 @@ ***************************************************************************************************************************/ #include "emu.h" -#include "includes/seibuspi.h" +#include "seibuspi.h" #include "cpu/i386/i386.h" //#include "bus/rs232/rs232.h" #include "machine/i8251.h" //#include "machine/microtch.h" //#include "machine/rtc4543.h" -#include "machine/seibuspi.h" +#include "seibuspi_m.h" #include "sound/ymz280b.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/seibu/seibuspi.cpp b/src/mame/seibu/seibuspi.cpp index d00f644ce2a..44a4c0caf9a 100644 --- a/src/mame/seibu/seibuspi.cpp +++ b/src/mame/seibu/seibuspi.cpp @@ -876,16 +876,16 @@ Notes: */ #include "emu.h" -#include "includes/seibuspi.h" +#include "seibuspi.h" #include "cpu/i386/i386.h" #include "cpu/z80/z80.h" #include "machine/ds2404.h" #include "machine/intelfsh.h" -#include "machine/seibuspi.h" +#include "seibuspi_m.h" #include "sound/ymf271.h" #include "sound/ymz280b.h" -#include "video/seibu_crtc.h" +#include "seibu_crtc.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/seibu/seibuspi_m.cpp b/src/mame/seibu/seibuspi_m.cpp index f94773b12bc..715c50c9086 100644 --- a/src/mame/seibu/seibuspi_m.cpp +++ b/src/mame/seibu/seibuspi_m.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ville Linde, Nicola Salmoria #include "emu.h" -#include "machine/seibuspi.h" +#include "seibuspi_m.h" // add two numbers generating carry from one bit to the next only if // the corresponding bit in carry_mask is 1 diff --git a/src/mame/seibu/seibuspi_v.cpp b/src/mame/seibu/seibuspi_v.cpp index 1654ecf74c2..eaa814ead5c 100644 --- a/src/mame/seibu/seibuspi_v.cpp +++ b/src/mame/seibu/seibuspi_v.cpp @@ -9,8 +9,8 @@ ******************************************************************************/ #include "emu.h" -#include "includes/seibuspi.h" -#include "machine/seibuspi.h" +#include "seibuspi.h" +#include "seibuspi_m.h" #include "screen.h" #include diff --git a/src/mame/seibu/seicupbl.cpp b/src/mame/seibu/seicupbl.cpp index e4a7b23eed1..185cf4d488b 100644 --- a/src/mame/seibu/seicupbl.cpp +++ b/src/mame/seibu/seicupbl.cpp @@ -25,7 +25,7 @@ Measured clocks: #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "machine/seicopbl.h" +#include "seicopbl.h" #include "sound/okim6295.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/seibu/sengokmj.cpp b/src/mame/seibu/sengokmj.cpp index 3f5f62b54df..6f8ba6a4721 100644 --- a/src/mame/seibu/sengokmj.cpp +++ b/src/mame/seibu/sengokmj.cpp @@ -54,19 +54,22 @@ RSSENGO2.72 chr. *******************************************************************************************/ #include "emu.h" -#include "audio/seibu.h" + +#include "seibusound.h" #include "cpu/nec/nec.h" #include "machine/nvram.h" #include "sound/okim6295.h" #include "sound/ymopl.h" -#include "video/seibu_crtc.h" +#include "seibu_crtc.h" #include "emupal.h" #include "screen.h" #include "speaker.h" #include "tilemap.h" +namespace { + class sengokmj_state : public driver_device, public seibu_sound_common { public: @@ -664,5 +667,7 @@ ROM_START( sengokmj ) ROM_LOAD( "rs006.89", 0x000, 0x200, CRC(96f7646e) SHA1(400a831b83d6ac4d2a46ef95b97b1ee237099e44) ) /* Priority */ ROM_END +} // anonymous namespace + GAME( 1991, sengokmj, 0, sengokmj, sengokmj, sengokmj_state, empty_init, ROT0, "Sigma", "Sengoku Mahjong [BET] (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) /*Non-Bet Version?*/ diff --git a/src/mame/seibu/stfight.cpp b/src/mame/seibu/stfight.cpp index f1faef1dbce..b50d9fb96ca 100644 --- a/src/mame/seibu/stfight.cpp +++ b/src/mame/seibu/stfight.cpp @@ -264,7 +264,7 @@ TODO: *****************************************************************************/ #include "emu.h" -#include "includes/stfight.h" +#include "stfight.h" #include "cpu/z80/z80.h" #include "sound/ymopn.h" diff --git a/src/mame/seibu/stfight.h b/src/mame/seibu/stfight.h index 2d2d880a8a7..ec80b618e7a 100644 --- a/src/mame/seibu/stfight.h +++ b/src/mame/seibu/stfight.h @@ -8,8 +8,8 @@ #include "cpu/m6805/m68705.h" #include "sound/ymopn.h" #include "sound/msm5205.h" -#include "video/stfight_dev.h" -#include "video/airraid_dev.h" +#include "stfight_dev.h" +#include "airraid_dev.h" class stfight_state : public driver_device { diff --git a/src/mame/seibu/stfight_m.cpp b/src/mame/seibu/stfight_m.cpp index 1267445e71f..3ab2a9b7178 100644 --- a/src/mame/seibu/stfight_m.cpp +++ b/src/mame/seibu/stfight_m.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/stfight.h" +#include "stfight.h" #include "cpu/m6805/m68705.h" #include "cpu/z80/z80.h" diff --git a/src/mame/seibu/toki.cpp b/src/mame/seibu/toki.cpp index a8ec5551b5b..f4514713fb7 100644 --- a/src/mame/seibu/toki.cpp +++ b/src/mame/seibu/toki.cpp @@ -93,7 +93,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/toki.h" +#include "toki.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/seibu/toki.h b/src/mame/seibu/toki.h index 2d05f52e1d6..7776d6d40e5 100644 --- a/src/mame/seibu/toki.h +++ b/src/mame/seibu/toki.h @@ -1,18 +1,21 @@ // license:BSD-3-Clause // copyright-holders:Jarek Parchanski -#ifndef MAME_INCLUDES_TOKI_H -#define MAME_INCLUDES_TOKI_H +#ifndef MAME_SEIBU_TOKI_H +#define MAME_SEIBU_TOKI_H #pragma once -#include "audio/seibu.h" +#include "seibusound.h" + #include "machine/gen_latch.h" #include "sound/msm5205.h" #include "video/bufsprite.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" + class toki_state : public driver_device { public: @@ -98,4 +101,4 @@ private: void tokib_map(address_map &map); }; -#endif // MAME_INCLUDES_TOKI_H +#endif // MAME_SEIBU_TOKI_H diff --git a/src/mame/seibu/toki_v.cpp b/src/mame/seibu/toki_v.cpp index 2454ca2e3c1..d963e73d7fe 100644 --- a/src/mame/seibu/toki_v.cpp +++ b/src/mame/seibu/toki_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/toki.h" +#include "toki.h" /************************************************************************* diff --git a/src/mame/seibu/wiz.cpp b/src/mame/seibu/wiz.cpp index d16a787343b..7c53a1a4df2 100644 --- a/src/mame/seibu/wiz.cpp +++ b/src/mame/seibu/wiz.cpp @@ -177,7 +177,7 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/wiz.h" +#include "wiz.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/seibu/wiz_v.cpp b/src/mame/seibu/wiz_v.cpp index 94135c9cafd..7a2c2322d67 100644 --- a/src/mame/seibu/wiz_v.cpp +++ b/src/mame/seibu/wiz_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/wiz.h" +#include "wiz.h" #include "video/resnet.h" diff --git a/src/mame/seta/albazc.cpp b/src/mame/seta/albazc.cpp index 29c8a226c18..c8914b3524b 100644 --- a/src/mame/seta/albazc.cpp +++ b/src/mame/seta/albazc.cpp @@ -12,15 +12,18 @@ TODO: */ #include "emu.h" +#include "seta001.h" + #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "machine/ticket.h" #include "sound/ay8910.h" -#include "video/seta001.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" + namespace { class albazc_state : public driver_device diff --git a/src/mame/seta/jclub2.cpp b/src/mame/seta/jclub2.cpp index d73fbb15446..2f58f31072f 100644 --- a/src/mame/seta/jclub2.cpp +++ b/src/mame/seta/jclub2.cpp @@ -101,13 +101,13 @@ #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "machine/nvram.h" -#include "machine/st0016.h" +#include "st0016.h" #include "machine/ticket.h" #include "machine/timer.h" #include "machine/watchdog.h" #include "sound/setapcm.h" #include "sound/okim6295.h" -#include "video/st0020.h" +#include "st0020.h" #include "emupal.h" #include "speaker.h" #include "tilemap.h" diff --git a/src/mame/seta/macs.cpp b/src/mame/seta/macs.cpp index c5e43d72b12..e775c294d18 100644 --- a/src/mame/seta/macs.cpp +++ b/src/mame/seta/macs.cpp @@ -58,7 +58,7 @@ KISEKAE -- info */ #include "emu.h" -#include "machine/st0016.h" +#include "st0016.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/seta/seta.cpp b/src/mame/seta/seta.cpp index 7d1d09de93c..36caab61d31 100644 --- a/src/mame/seta/seta.cpp +++ b/src/mame/seta/seta.cpp @@ -1486,7 +1486,7 @@ Note: on screen copyright is (c)1998 Coinmaster. ***************************************************************************/ #include "emu.h" -#include "includes/seta.h" +#include "seta.h" #include "cpu/m6502/m65c02.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/seta/seta.h b/src/mame/seta/seta.h index ff1a5cc6c59..276de969681 100644 --- a/src/mame/seta/seta.h +++ b/src/mame/seta/seta.h @@ -20,8 +20,8 @@ #include "machine/upd4701.h" #include "machine/upd4992.h" #include "sound/x1_010.h" -#include "video/seta001.h" -#include "video/x1_012.h" +#include "seta001.h" +#include "x1_012.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/seta/seta2.cpp b/src/mame/seta/seta2.cpp index 76c81dbddd6..935df5326a3 100644 --- a/src/mame/seta/seta2.cpp +++ b/src/mame/seta/seta2.cpp @@ -91,7 +91,7 @@ funcube series: ***************************************************************************/ #include "emu.h" -#include "includes/seta2.h" +#include "seta2.h" #include "cpu/h8/h83006.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/seta/seta2_v.cpp b/src/mame/seta/seta2_v.cpp index 6072579fda0..9fa2ff04fc7 100644 --- a/src/mame/seta/seta2_v.cpp +++ b/src/mame/seta/seta2_v.cpp @@ -87,7 +87,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/seta2.h" +#include "seta2.h" /*************************************************************************** diff --git a/src/mame/seta/seta_v.cpp b/src/mame/seta/seta_v.cpp index e43c8a066ad..fe466914f5a 100644 --- a/src/mame/seta/seta_v.cpp +++ b/src/mame/seta/seta_v.cpp @@ -138,7 +138,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "emu.h" -#include "includes/seta.h" +#include "seta.h" #include "screen.h" /* 76-- ---- diff --git a/src/mame/seta/simple_st0016.cpp b/src/mame/seta/simple_st0016.cpp index 551c8ea3b3f..b8a10562401 100644 --- a/src/mame/seta/simple_st0016.cpp +++ b/src/mame/seta/simple_st0016.cpp @@ -21,7 +21,7 @@ Dips verified for Neratte Chu (nratechu) from manual #include "emu.h" #include "cpu/v810/v810.h" #include "cpu/z80/z80.h" -#include "machine/st0016.h" +#include "st0016.h" #include "machine/timer.h" #include "sound/st0016.h" #include "screen.h" diff --git a/src/mame/seta/speedatk.cpp b/src/mame/seta/speedatk.cpp index 67cfc0238e8..f586b1ae285 100644 --- a/src/mame/seta/speedatk.cpp +++ b/src/mame/seta/speedatk.cpp @@ -76,7 +76,7 @@ PS / PD : key matrix *****************************************************************************************/ #include "emu.h" -#include "includes/speedatk.h" +#include "speedatk.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/seta/speedatk_v.cpp b/src/mame/seta/speedatk_v.cpp index 055ded3f227..fab8739a957 100644 --- a/src/mame/seta/speedatk_v.cpp +++ b/src/mame/seta/speedatk_v.cpp @@ -6,7 +6,7 @@ *****************************************************************************************/ #include "emu.h" -#include "includes/speedatk.h" +#include "speedatk.h" void speedatk_state::speedatk_palette(palette_device &palette) const diff --git a/src/mame/seta/speglsht.cpp b/src/mame/seta/speglsht.cpp index 0869805296c..e23074473f3 100644 --- a/src/mame/seta/speglsht.cpp +++ b/src/mame/seta/speglsht.cpp @@ -107,7 +107,7 @@ Notes: #include "emu.h" #include "emupal.h" -#include "machine/st0016.h" +#include "st0016.h" #include "cpu/mips/mips1.h" #include "speaker.h" #include diff --git a/src/mame/seta/srmp2.cpp b/src/mame/seta/srmp2.cpp index 47ec75b30b4..0cae3b770e8 100644 --- a/src/mame/seta/srmp2.cpp +++ b/src/mame/seta/srmp2.cpp @@ -60,7 +60,7 @@ Note: #include "emu.h" -#include "includes/srmp2.h" +#include "srmp2.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/seta/srmp2.h b/src/mame/seta/srmp2.h index f7ac4b0781c..beddccd2037 100644 --- a/src/mame/seta/srmp2.h +++ b/src/mame/seta/srmp2.h @@ -6,7 +6,7 @@ #pragma once #include "sound/msm5205.h" -#include "video/seta001.h" +#include "seta001.h" #include "emupal.h" class srmp2_state : public driver_device diff --git a/src/mame/seta/srmp2_v.cpp b/src/mame/seta/srmp2_v.cpp index 086ca045a3d..80f96426378 100644 --- a/src/mame/seta/srmp2_v.cpp +++ b/src/mame/seta/srmp2_v.cpp @@ -8,7 +8,7 @@ Functions to emulate the video hardware of the machine. #include "emu.h" -#include "includes/srmp2.h" +#include "srmp2.h" void srmp2_state::srmp2_palette(palette_device &palette) const { diff --git a/src/mame/seta/srmp5.cpp b/src/mame/seta/srmp5.cpp index e75797a92d4..879475c2538 100644 --- a/src/mame/seta/srmp5.cpp +++ b/src/mame/seta/srmp5.cpp @@ -37,7 +37,7 @@ This is not a bug (real machine behaves the same). #include "emu.h" -#include "machine/st0016.h" +#include "st0016.h" #include "cpu/mips/mips1.h" #include "emupal.h" #include "speaker.h" diff --git a/src/mame/seta/ssv.cpp b/src/mame/seta/ssv.cpp index f95a1105b09..fe1bb3aee60 100644 --- a/src/mame/seta/ssv.cpp +++ b/src/mame/seta/ssv.cpp @@ -163,7 +163,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/ssv.h" +#include "ssv.h" #include "cpu/v810/v810.h" #include "cpu/v60/v60.h" diff --git a/src/mame/seta/ssv.h b/src/mame/seta/ssv.h index dcf82d5d942..cb84855c8ca 100644 --- a/src/mame/seta/ssv.h +++ b/src/mame/seta/ssv.h @@ -6,7 +6,7 @@ #pragma once #include "cpu/upd7725/upd7725.h" -#include "video/st0020.h" +#include "st0020.h" #include "machine/adc0808.h" #include "machine/eepromser.h" #include "machine/timer.h" diff --git a/src/mame/seta/ssv_v.cpp b/src/mame/seta/ssv_v.cpp index c8629284845..f7599987407 100644 --- a/src/mame/seta/ssv_v.cpp +++ b/src/mame/seta/ssv_v.cpp @@ -134,7 +134,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ssv.h" +#include "ssv.h" void ssv_state::drawgfx_line(bitmap_ind16 &bitmap, const rectangle &cliprect, int gfx, uint32_t code, uint32_t color, int flipx, int flipy, int base_sx, int base_sy, int shadow, int realline, int line) diff --git a/src/mame/seta/thedealr.cpp b/src/mame/seta/thedealr.cpp index 14b4d076c55..c0e8f83eb72 100644 --- a/src/mame/seta/thedealr.cpp +++ b/src/mame/seta/thedealr.cpp @@ -34,7 +34,7 @@ #include "machine/timer.h" #include "machine/watchdog.h" #include "sound/ay8910.h" -#include "video/seta001.h" +#include "seta001.h" #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/sgi/4dpi.cpp b/src/mame/sgi/4dpi.cpp index 9fadd3a5dd6..f14aaa5d073 100644 --- a/src/mame/sgi/4dpi.cpp +++ b/src/mame/sgi/4dpi.cpp @@ -59,7 +59,7 @@ #include "bus/rs232/hlemouse.h" // video and audio -#include "video/sgi_gr1.h" +#include "sgi_gr1.h" #include "4dpi.lh" diff --git a/src/mame/sgi/crime.cpp b/src/mame/sgi/crime.cpp index 11fdf42c4d6..6e6a6272698 100644 --- a/src/mame/sgi/crime.cpp +++ b/src/mame/sgi/crime.cpp @@ -7,7 +7,7 @@ **********************************************************************/ #include "emu.h" -#include "video/crime.h" +#include "crime.h" #define LOG_UNKNOWN (1 << 0U) #define LOG_READS (1 << 1U) diff --git a/src/mame/sgi/hal2.cpp b/src/mame/sgi/hal2.cpp index 09061451e99..9483e6419c3 100644 --- a/src/mame/sgi/hal2.cpp +++ b/src/mame/sgi/hal2.cpp @@ -7,7 +7,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/hal2.h" +#include "hal2.h" #define LOG_UNKNOWN (1 << 0U) #define LOG_READS (1 << 1U) diff --git a/src/mame/sgi/hpc1.cpp b/src/mame/sgi/hpc1.cpp index 28293b297bd..8c60331dca9 100644 --- a/src/mame/sgi/hpc1.cpp +++ b/src/mame/sgi/hpc1.cpp @@ -14,7 +14,7 @@ #include "bus/nscsi/cd.h" #include "bus/nscsi/hd.h" #include "bus/sgikbd/sgikbd.h" -#include "machine/hpc1.h" +#include "hpc1.h" #include "speaker.h" #define LOG_UNKNOWN (1 << 0) diff --git a/src/mame/sgi/hpc3.cpp b/src/mame/sgi/hpc3.cpp index 89e736c698c..ad5b58dd9dd 100644 --- a/src/mame/sgi/hpc3.cpp +++ b/src/mame/sgi/hpc3.cpp @@ -7,7 +7,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/hpc3.h" +#include "hpc3.h" #define LOG_UNKNOWN (1 << 0) #define LOG_PBUS_DMA (1 << 1) diff --git a/src/mame/sgi/hpc3.h b/src/mame/sgi/hpc3.h index 7a37648fbbc..af2e7319841 100644 --- a/src/mame/sgi/hpc3.h +++ b/src/mame/sgi/hpc3.h @@ -11,7 +11,7 @@ #pragma once -#include "machine/hal2.h" +#include "hal2.h" #include "machine/edlc.h" class hpc3_device : public device_t, public device_memory_interface diff --git a/src/mame/sgi/indigo.cpp b/src/mame/sgi/indigo.cpp index 996a55419a6..f1c9066d42b 100644 --- a/src/mame/sgi/indigo.cpp +++ b/src/mame/sgi/indigo.cpp @@ -20,9 +20,9 @@ #include "cpu/mips/mips1.h" #include "cpu/mips/r4000.h" #include "machine/eepromser.h" -#include "machine/hpc1.h" -#include "machine/sgi.h" -#include "video/light.h" +#include "hpc1.h" +#include "sgi.h" +#include "light.h" #define LOG_UNKNOWN (1 << 0) #define LOG_INT (1 << 1) diff --git a/src/mame/sgi/indy_indigo2.cpp b/src/mame/sgi/indy_indigo2.cpp index 740e4cf8905..fe538a99710 100644 --- a/src/mame/sgi/indy_indigo2.cpp +++ b/src/mame/sgi/indy_indigo2.cpp @@ -62,13 +62,13 @@ #include "machine/ds1386.h" #include "machine/edlc.h" #include "machine/eepromser.h" -#include "machine/hpc3.h" -#include "machine/ioc2.h" +#include "hpc3.h" +#include "ioc2.h" #include "machine/nscsi_bus.h" #include "bus/nscsi/cd.h" #include "bus/nscsi/hd.h" -#include "machine/sgi.h" -#include "machine/vino.h" +#include "sgi.h" +#include "vino.h" #include "machine/saa7191.h" #include "machine/wd33c9x.h" diff --git a/src/mame/sgi/ioc2.cpp b/src/mame/sgi/ioc2.cpp index bb230e05e58..7522eb84c69 100644 --- a/src/mame/sgi/ioc2.cpp +++ b/src/mame/sgi/ioc2.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "bus/rs232/rs232.h" #include "machine/input_merger.h" -#include "machine/ioc2.h" +#include "ioc2.h" #define LOG_PI1 (1 << 0) #define LOG_SERIAL (1 << 1) diff --git a/src/mame/sgi/light.cpp b/src/mame/sgi/light.cpp index 50fdb9e004b..9d2f986b34a 100644 --- a/src/mame/sgi/light.cpp +++ b/src/mame/sgi/light.cpp @@ -6,7 +6,7 @@ */ #include "emu.h" -#include "video/light.h" +#include "light.h" #include "screen.h" #define LOG_REX (1 << 0) diff --git a/src/mame/sgi/mace.cpp b/src/mame/sgi/mace.cpp index 86d5ffebd10..fa55b353289 100644 --- a/src/mame/sgi/mace.cpp +++ b/src/mame/sgi/mace.cpp @@ -7,7 +7,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/mace.h" +#include "mace.h" #define LOG_READ_PCI (1 << 0U) #define LOG_READ_VIN1 (1 << 1U) diff --git a/src/mame/sgi/o2.cpp b/src/mame/sgi/o2.cpp index e4421e8648e..c386ccb3159 100644 --- a/src/mame/sgi/o2.cpp +++ b/src/mame/sgi/o2.cpp @@ -23,8 +23,8 @@ NOTE: The default Sgi O2 Keyboard (Model No. RT6856T, Part No. 121472-101-B, #include "emu.h" #include "cpu/mips/mips3.h" #include "machine/ds17x85.h" -#include "machine/mace.h" -#include "video/crime.h" +#include "mace.h" +#include "crime.h" class o2_state : public driver_device { diff --git a/src/mame/sgi/sgi_gr1.h b/src/mame/sgi/sgi_gr1.h index a2aa6030e58..95be8df03f8 100644 --- a/src/mame/sgi/sgi_gr1.h +++ b/src/mame/sgi/sgi_gr1.h @@ -8,9 +8,9 @@ #include "machine/bankdev.h" #include "screen.h" -#include "video/sgi_ge5.h" -#include "video/sgi_re2.h" -#include "video/sgi_xmap2.h" +#include "sgi_ge5.h" +#include "sgi_re2.h" +#include "sgi_xmap2.h" #include "video/bt45x.h" #include "video/bt431.h" diff --git a/src/mame/sgi/sgi_re2.h b/src/mame/sgi/sgi_re2.h index e5fc5df9e63..0130e39d082 100644 --- a/src/mame/sgi/sgi_re2.h +++ b/src/mame/sgi/sgi_re2.h @@ -6,7 +6,7 @@ #pragma once -#include "video/sgi_xmap2.h" +#include "sgi_xmap2.h" #include "video/bt45x.h" #include "video/bt431.h" #include "screen.h" diff --git a/src/mame/shared/apple2common.cpp b/src/mame/shared/apple2common.cpp new file mode 100644 index 00000000000..317f4061cc6 --- /dev/null +++ b/src/mame/shared/apple2common.cpp @@ -0,0 +1,893 @@ +// license:BSD-3-Clause +// copyright-holders:R. Belmont +/********************************************************************* + + apple2common.cpp + + Apple II stuff shared between apple2/apple2e/apple2gs. + +*********************************************************************/ + +#include "emu.h" +#include "emuopts.h" + +#include "apple2common.h" + +// device type definition +DEFINE_DEVICE_TYPE(APPLE2_COMMON, apple2_common_device, "apple2com", "Apple II Common Components") + +//------------------------------------------------- +// apple2_common_device - constructor +//------------------------------------------------- + +apple2_common_device::apple2_common_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, APPLE2_COMMON, tag, owner, clock), + m_GScpu(*this, finder_base::DUMMY_TAG) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void apple2_common_device::device_start() +{ + // precalculate joystick time constants + m_x_calibration = attotime::from_nsec(10800).as_double(); + m_y_calibration = attotime::from_nsec(10800).as_double(); + m_joystick_x1_time = m_joystick_x2_time = m_joystick_y1_time = m_joystick_y2_time = 0.0; +} + +//------------------------------------------------- +// device_validity_check - device-specific validation +//------------------------------------------------- +void apple2_common_device::device_validity_check(validity_checker &valid) const +{ + if ((m_GScpu.finder_tag() != finder_base::DUMMY_TAG) && !m_GScpu) + { + osd_printf_error("IIgs CPU configured but not found.\n"); + } +} + +struct dasm_data +{ + u16 addr; + const char *name; +}; + +struct dasm_data32 +{ + u32 addr; + const char *name; +}; + +static const struct dasm_data p8_calls[] = +{ + { 0x40, "ALLOC_INTERRUPT" }, { 0x41, "DEALLOC_INTERRUPT" }, + { 0x65, "QUIT" }, { 0x80, "READ_BLOCK" }, { 0x81, "WRITE_BLOCK" }, { 0x82, "GET_TIME" }, + { 0x99, "ATINIT" }, { 0xc0, "CREATE" }, { 0xc1, "DESTROY" }, { 0xc2, "RENAME" }, { 0xc3, "SET_FILE_INFO" }, + { 0xc4, "GET_FILE_INFO" }, { 0xc5, "ONLINE" }, { 0xc6, "SET_PREFIX" }, { 0xc7, "GET_PREFIX" }, { 0xc8, "OPEN" }, + { 0xc9, "NEWLINE" }, { 0xca, "READ" }, { 0xcb, "WRITE" }, { 0xcc, "CLOSE" }, { 0xcd, "FLUSH" }, { 0xce, "SET_MARK" }, + { 0xcf, "GET_MARK" }, { 0xd0, "SET_EOF" }, { 0xd1, "GET_EOF" }, { 0xd2, "SET_BUF" }, { 0xd3, "GET_BUF" }, + + { 0xffff, "" } +}; + +static const struct dasm_data a2_stuff[] = +{ + { 0x0020, "WNDLFT" }, { 0x0021, "WNDWDTH" }, { 0x0022, "WNDTOP" }, { 0x0023, "WNDBTM" }, + { 0x0024, "CH" }, { 0x0025, "CV" }, { 0x0026, "GBASL" }, { 0x0027, "GBASH" }, + { 0x0028, "BASL" }, { 0x0029, "BASH" }, { 0x002b, "BOOTSLOT" }, { 0x002c, "H2" }, + { 0x002d, "V2" }, { 0x002e, "MASK" }, { 0x0030, "COLOR" }, { 0x0031, "MODE" }, + { 0x0032, "INVFLG" }, { 0x0033, "PROMPT" }, { 0x0036, "CSWL" }, { 0x0037, "CSWH" }, + { 0x0038, "KSWL" }, { 0x0039, "KSWH" }, { 0x0045, "ACC" }, { 0x0046, "XREG" }, + { 0x0047, "YREG" }, { 0x0048, "STATUS" }, { 0x004E, "RNDL" }, { 0x004F, "RNDH" }, + { 0x0067, "TXTTAB" }, { 0x0069, "VARTAB" }, { 0x006b, "ARYTAB" }, { 0x6d, "STREND" }, + { 0x006f, "FRETOP" }, { 0x0071, "FRESPC" }, { 0x0073, "MEMSIZ" }, { 0x0075, "CURLIN" }, + { 0x0077, "OLDLIN" }, { 0x0079, "OLDTEXT" }, { 0x007b, "DATLIN" }, { 0x007d, "DATPTR" }, + { 0x007f, "INPTR" }, { 0x0081, "VARNAM" }, { 0x0083, "VARPNT" }, { 0x0085, "FORPNT" }, + { 0x009A, "EXPON" }, { 0x009C, "EXPSGN" }, { 0x009d, "FAC" }, { 0x00A2, "FAC.SIGN" }, + { 0x00a5, "ARG" }, { 0x00AA, "ARG.SIGN" }, { 0x00af, "PRGEND" }, { 0x00B8, "TXTPTR" }, + { 0x00C9, "RNDSEED" }, { 0x00D6, "LOCK" }, { 0x00D8, "ERRFLG" }, { 0x00DA, "ERRLIN" }, + { 0x00DE, "ERRNUM" }, { 0x00E4, "HGR.COLOR" }, { 0x00E6, "HGR.PAGE" }, { 0x00F1, "SPEEDZ" }, + + { 0xc000, "KBD / 80STOREOFF" }, { 0xc001, "80STOREON" }, { 0xc002, "RDMAINRAM" }, {0xc003, "RDCARDRAM" }, {0xc004, "WRMAINRAM" }, + { 0xc005, "WRCARDRAM" }, { 0xc006, "SETSLOTCXROM" }, { 0xc007, "SETINTCXROM" }, { 0xc008, "SETSTDZP" }, + { 0xc009, "SETALTZP "}, { 0xc00a, "SETINTC3ROM" }, { 0xc00b, "SETSLOTC3ROM" }, { 0xc00c, "CLR80VID" }, + { 0xc00d, "SET80VID" }, { 0xc00e, "CLRALTCHAR" }, { 0xc00f, "SETALTCHAR" }, { 0xc010, "KBDSTRB" }, + { 0xc011, "RDLCBNK2" }, { 0xc012, "RDLCRAM" }, { 0xc013, "RDRAMRD" }, { 0xc014, "RDRAMWRT" }, + { 0xc015, "RDCXROM" }, { 0xc016, "RDALTZP" }, { 0xc017, "RDC3ROM" }, { 0xc018, "RD80STORE" }, + { 0xc019, "RDVBL" }, { 0xc01a, "RDTEXT" }, { 0xc01b, "RDMIXED" }, { 0xc01c, "RDPAGE2" }, + { 0xc01d, "RDHIRES" }, { 0xc01e, "RDALTCHAR" }, { 0xc01f, "RD80VID" }, { 0xc020, "TAPEOUT" }, + { 0xc021, "MONOCOLOR" }, { 0xc022, "TBCOLOR" }, { 0xc023, "VGCINT" }, { 0xc024, "MOUSEDATA" }, + { 0xc025, "KEYMODREG" }, { 0xc026, "DATAREG" }, { 0xc027, "KMSTATUS" }, { 0xc028, "ROMBANK" }, + { 0xc029, "NEWVIDEO"}, { 0xc02b, "LANGSEL" }, { 0xc02c, "CHARROM" }, { 0xc02d, "SLOTROMSEL" }, + { 0xc02e, "VERTCNT" }, { 0xc02f, "HORIZCNT" }, { 0xc030, "SPKR" }, { 0xc031, "DISKREG" }, + { 0xc032, "SCANINT" }, { 0xc033, "CLOCKDATA" }, { 0xc034, "CLOCKCTL" }, { 0xc035, "SHADOW" }, + { 0xc036, "FPIREG/CYAREG" }, { 0xc037, "BMAREG" }, { 0xc038, "SCCBREG" }, { 0xc039, "SCCAREG" }, + { 0xc03a, "SCCBDATA" }, { 0xc03b, "SCCADATA" }, { 0xc03c, "SOUNDCTL" }, { 0xc03d, "SOUNDDATA" }, + { 0xc03e, "SOUNDADRL" }, { 0xc03f, "SOUNDADRH" }, { 0xc040, "STROBE/RDXYMSK" }, { 0xc041, "RDVBLMSK" }, + { 0xc042, "RDX0EDGE" }, { 0xc043, "RDY0EDGE" }, { 0xc044, "MMDELTAX" }, { 0xc045, "MMDELTAY" }, + { 0xc046, "DIAGTYPE" }, { 0xc047, "CLRVBLINT" }, { 0xc048, "CLRXYINT" }, { 0xc04f, "EMUBYTE" }, + { 0xc050, "TXTCLR" }, { 0xc051, "TXTSET" }, + { 0xc052, "MIXCLR" }, { 0xc053, "MIXSET" }, { 0xc054, "TXTPAGE1" }, { 0xc055, "TXTPAGE2" }, + { 0xc056, "LORES" }, { 0xc057, "HIRES" }, { 0xc058, "CLRAN0" }, { 0xc059, "SETAN0" }, + { 0xc05a, "CLRAN1" }, { 0xc05b, "SETAN1" }, { 0xc05c, "CLRAN2" }, { 0xc05d, "SETAN2" }, + { 0xc05e, "DHIRESON" }, { 0xc05f, "DHIRESOFF" }, { 0xc060, "TAPEIN" }, { 0xc061, "RDBTN0" }, + { 0xc062, "BUTN1" }, { 0xc063, "RD63" }, { 0xc064, "PADDL0" }, { 0xc065, "PADDL1" }, + { 0xc066, "PADDL2" }, { 0xc067, "PADDL3" }, { 0xc068, "STATEREG" }, { 0xc070, "PTRIG" }, { 0xc073, "BANKSEL" }, + { 0xc07e, "IOUDISON" }, { 0xc07f, "IOUDISOFF" }, { 0xc081, "ROMIN" }, { 0xc083, "LCBANK2" }, + { 0xc085, "ROMIN" }, { 0xc087, "LCBANK2" }, { 0xcfff, "DISCC8ROM" }, + + { 0xF800, "F8ROM:PLOT" }, { 0xF80E, "F8ROM:PLOT1" } , { 0xF819, "F8ROM:HLINE" }, { 0xF828, "F8ROM:VLINE" }, + { 0xF832, "F8ROM:CLRSCR" }, { 0xF836, "F8ROM:CLRTOP" }, { 0xF838, "F8ROM:CLRSC2" }, { 0xF847, "F8ROM:GBASCALC" }, + { 0xF856, "F8ROM:GBCALC" }, { 0xF85F, "F8ROM:NXTCOL" }, { 0xF864, "F8ROM:SETCOL" }, { 0xF871, "F8ROM:SCRN" }, + { 0xF882, "F8ROM:INSDS1" }, { 0xF88E, "F8ROM:INSDS2" }, { 0xF8A5, "F8ROM:ERR" }, { 0xF8A9, "F8ROM:GETFMT" }, + { 0xF8D0, "F8ROM:INSTDSP" }, { 0xF940, "F8ROM:PRNTYX" }, { 0xF941, "F8ROM:PRNTAX" }, { 0xF944, "F8ROM:PRNTX" }, + { 0xF948, "F8ROM:PRBLNK" }, { 0xF94A, "F8ROM:PRBL2" }, { 0xF84C, "F8ROM:PRBL3" }, { 0xF953, "F8ROM:PCADJ" }, + { 0xF854, "F8ROM:PCADJ2" }, { 0xF856, "F8ROM:PCADJ3" }, { 0xF85C, "F8ROM:PCADJ4" }, { 0xF962, "F8ROM:FMT1" }, + { 0xF9A6, "F8ROM:FMT2" }, { 0xF9B4, "F8ROM:CHAR1" }, { 0xF9BA, "F8ROM:CHAR2" }, { 0xF9C0, "F8ROM:MNEML" }, + { 0xFA00, "F8ROM:MNEMR" }, { 0xFA40, "F8ROM:OLDIRQ" }, { 0xFA4C, "F8ROM:BREAK" }, { 0xFA59, "F8ROM:OLDBRK" }, + { 0xFA62, "F8ROM:RESET" }, { 0xFAA6, "F8ROM:PWRUP" }, { 0xFABA, "F8ROM:SLOOP" }, { 0xFAD7, "F8ROM:REGDSP" }, + { 0xFADA, "F8ROM:RGDSP1" }, { 0xFAE4, "F8ROM:RDSP1" }, { 0xFB19, "F8ROM:RTBL" }, { 0xFB1E, "F8ROM:PREAD" }, + { 0xFB21, "F8ROM:PREAD4" }, { 0xFB25, "F8ROM:PREAD2" }, { 0xFB2F, "F8ROM:INIT" }, { 0xFB39, "F8ROM:SETTXT" }, + { 0xFB40, "F8ROM:SETGR" }, { 0xFB4B, "F8ROM:SETWND" }, { 0xFB51, "F8ROM:SETWND2" }, { 0xFB5B, "F8ROM:TABV" }, + { 0xFB60, "F8ROM:APPLEII" }, { 0xFB6F, "F8ROM:SETPWRC" }, { 0xFB78, "F8ROM:VIDWAIT" }, { 0xFB88, "F8ROM:KBDWAIT" }, + { 0xFBB3, "F8ROM:VERSION" }, { 0xFBBF, "F8ROM:ZIDBYTE2" }, { 0xFBC0, "F8ROM:ZIDBYTE" }, { 0xFBC1, "F8ROM:BASCALC" }, + { 0xFBD0, "F8ROM:BSCLC2" }, { 0xFBDD, "F8ROM:BELL1" }, { 0xFBE2, "F8ROM:BELL1.2" }, { 0xFBE4, "F8ROM:BELL2" }, + { 0xFBF0, "F8ROM:STORADV" }, { 0xFBF4, "F8ROM:ADVANCE" }, { 0xFBFD, "F8ROM:VIDOUT" }, { 0xFC10, "F8ROM:BS" }, + { 0xFC1A, "F8ROM:UP" }, { 0xFC22, "F8ROM:VTAB" }, { 0xFC24, "F8ROM:VTABZ" }, { 0xFC42, "F8ROM:CLREOP" }, + { 0xFC46, "F8ROM:CLEOP1" }, { 0xFC58, "F8ROM:HOME" }, { 0xFC62, "F8ROM:CR" }, { 0xFC66, "F8ROM:LF" }, + { 0xFC70, "F8ROM:SCROLL" }, { 0xFC95, "F8ROM:SCRL3" }, { 0xFC9C, "F8ROM:CLREOL" }, { 0xFC9E, "F8ROM:CLREOLZ" }, + { 0xFCA8, "F8ROM:WAIT" }, { 0xFCB4, "F8ROM:NXTA4" }, { 0xFCBA, "F8ROM:NXTA1" }, { 0xFCC9, "F8ROM:HEADR" }, + { 0xFCEC, "F8ROM:RDBYTE" }, { 0xFCEE, "F8ROM:RDBYT2" }, { 0xFCFA, "F8ROM:RD2BIT" }, { 0xFD0C, "F8ROM:RDKEY" }, + { 0xFD18, "F8ROM:RDKEY1" }, { 0xFD1B, "F8ROM:KEYIN" }, { 0xFD2F, "F8ROM:ESC" }, { 0xFD35, "F8ROM:RDCHAR" }, + { 0xFD3D, "F8ROM:NOTCR" }, { 0xFD62, "F8ROM:CANCEL" }, { 0xFD67, "F8ROM:GETLNZ" }, { 0xFD6A, "F8ROM:GETLN" }, + { 0xFD6C, "F8ROM:GETLN0" }, { 0xFD6F, "F8ROM:GETLN1" }, { 0xFD8B, "F8ROM:CROUT1" }, { 0xFD8E, "F8ROM:CROUT" }, + { 0xFD92, "F8ROM:PRA1" }, { 0xFDA3, "F8ROM:XAM8" }, { 0xFDDA, "F8ROM:PRBYTE" }, { 0xFDE3, "F8ROM:PRHEX" }, + { 0xFDE5, "F8ROM:PRHEXZ" }, { 0xFDED, "F8ROM:COUT" }, { 0xFDF0, "F8ROM:COUT1" }, { 0xFDF6, "F8ROM:COUTZ" }, + { 0xFE18, "F8ROM:SETMODE" }, { 0xFE1F, "F8ROM:IDROUTINE" }, { 0xFE20, "F8ROM:LT" }, { 0xFE22, "F8ROM:LT2" }, + { 0xFE2C, "F8ROM:MOVE" }, { 0xFE36, "F8ROM:VFY" }, { 0xFE5E, "F8ROM:LIST" }, { 0xFE63, "F8ROM:LIST2" }, + { 0xFE75, "F8ROM:A1PC" }, { 0xFE80, "F8ROM:SETINV" }, { 0xFE84, "F8ROM:SETNORM" }, { 0xFE89, "F8ROM:SETKBD" }, + { 0xFE8B, "F8ROM:INPORT" }, { 0xFE8D, "F8ROM:INPRT" }, { 0xFE93, "F8ROM:SETVID" }, { 0xFE95, "F8ROM:OUTPORT" }, + { 0xFE97, "F8ROM:OUTPRT" }, { 0xFEB0, "F8ROM:XBASIC" }, { 0xFEB3, "F8ROM:BASCONT" }, { 0xFEB6, "F8ROM:GO" }, + { 0xFECA, "F8ROM:USR" }, { 0xFECD, "F8ROM:WRITE" }, { 0xFEFD, "F8ROM:READ" }, { 0xFF2D, "F8ROM:PRERR" }, + { 0xFF3A, "F8ROM:BELL" }, { 0xFF3F, "F8ROM:RESTORE" }, { 0xFF4A, "F8ROM:SAVE" }, { 0xFF58, "F8ROM:IORTS" }, + { 0xFF59, "F8ROM:OLDRST" }, { 0xFF65, "F8ROM:MON" }, { 0xFF69, "F8ROM:MONZ" }, { 0xFF6C, "F8ROM:MONZ2" }, + { 0xFF70, "F8ROM:MONZ4" }, { 0xFF8A, "F8ROM:DIG" }, { 0xFFA7, "F8ROM:GETNUM" }, { 0xFFAD, "F8ROM:NXTCHR" }, + { 0xFFBE, "F8ROM:TOSUB" }, { 0xFFC7, "F8ROM:ZMODE" }, { 0xFFCC, "F8ROM:CHRTBL" }, { 0xFFE3, "F8ROM:SUBTBL" }, + + { 0xffff, "" } +}; + +static const struct dasm_data gs_tools[] = +{ + { 0x0101, "TLBootInit()" }, { 0x0201, "TLStartUp()" }, { 0x0301, "TLShutDown()" }, { 0x0401, "TLVersion():Vers" }, { 0x0501, "TLReset()" }, + { 0x0601, "TLStatus():ActFlg" }, { 0x0901, "GetTSPtr(SysFlg,TS#):@FPT" }, { 0x0A01, "SetTSPtr(SysFlg,TS#,@FPT)" }, { 0x0B01, "GetFuncPtr(SysFlg,Func):@Func" }, + { 0x0C01, "GetWAP(SysFlg,TS#):@WAP" }, { 0x0D01, "SetWAP(SysFlg,TS#,@WAP)" }, { 0x0E01, "LoadTools(@ToolTable)" }, { 0x0F01, "LoadOneTool(TS#,MinVers)" }, + { 0x1001, "UnloadOneTool(TS#)" }, { 0x1101, "TLMountVolume(X,Y,@L1,@L2,@B1,@B2):Btn#" }, { 0x1201, "TLTextMountVolume(@L1,@L2,@B1,@B2):Btn#" }, + { 0x1301, "SaveTextState():StateH" }, { 0x1401, "RestoreTextState(StateH)" }, { 0x1501, "MessageCenter(Action,Type,MsgH)" }, { 0x1601, "SetDefaultTPT()" }, + { 0x1701, "MessageByName(CreateF,@inpRec):Created,Type" }, { 0x1801, "StartUpTools(MemID,ssDesc,ssRef/4):ssRef/4" }, { 0x1901, "ShutDownTools(ssDesc,ssRef/4)" }, + { 0x1A01, "GetMsgHandle(Flags,MsgRef/4):H" }, { 0x1B01, "AcceptRequests(@NameStr,UserID,@ReqProc)" }, { 0x1C01, "SendRequest(ReqCode,How,Target/4,@In,@Out)" }, + { 0x0102, "MMBootInit()" }, { 0x0202, "MMStartUp():MemID" }, { 0x0302, "MMShutDown(MemID)" }, { 0x0402, "MMVersion():Vers" }, { 0x0502, "MMReset()" }, + { 0x0602, "MMStatus():ActFlg" }, { 0x0902, "NewHandle(Size/4,MemID,Attr,@loc):H" }, { 0x0A02, "ReAllocHandle(Size/4,MemID,Attr,@loc,H)" }, { 0x0B02, "RestoreHandle(H)" }, + { 0x0C02, "AddToOOMQueue(@header)" }, { 0x0D02, "RemoveFromOOMQueue(@header)" }, { 0x1002, "DisposeHandle(H)" }, { 0x1102, "DisposeAll(MemID)" }, + { 0x1202, "PurgeHandle(H)" }, { 0x1302, "PurgeAll(MemID)" }, { 0x1802, "GetHandleSize(H):Size/4" }, { 0x1902, "SetHandleSize(Size/4,H)" }, { 0x1A02, "FindHandle(@byte):H" }, + { 0x1B02, "FreeMem():FreeBytes/4" }, { 0x1C02, "MaxBlock():Size/4" }, { 0x1D02, "TotalMem():Size/4" }, { 0x1E02, "CheckHandle(H)" }, { 0x1F02, "CompactMem()" }, + { 0x2002, "HLock(H)" }, { 0x2102, "HLockAll(MemID)" }, { 0x2202, "HUnlock(H)" }, { 0x2302, "HUnlockAll(MemID)" }, { 0x2402, "SetPurge(PrgLvl,H)" }, + { 0x2502, "SetPurgeAll(PrgLvl,MemID)" }, { 0x2802, "PtrToHand(@Src,DestH,Count/4)" }, { 0x2902, "HandToPtr(SrcH,@Dest,Count/4)" }, { 0x2A02, "HandToHand(SrcH,DestH,Count/4)" }, + { 0x2B02, "BlockMove(@Source,@Dest,Count/4)" }, { 0x2F02, "RealFreeMem():Size/4" }, { 0x3002, "SetHandleID(newMemID,theH):oldMemID" }, { 0x0103, "MTBootInit()" }, + { 0x0203, "MTStartUp()" }, { 0x0303, "MTShutDown()" }, { 0x0403, "MTVersion():Vers" }, { 0x0503, "MTReset()" }, { 0x0603, "MTStatus():ActFlg" }, + { 0x0903, "WriteBRam(@Buff)" }, { 0x0A03, "ReadBRam(@Buff)" }, { 0x0B03, "WriteBParam(Data,Parm#)" }, { 0x0C03, "ReadBParam(Parm#):Data" }, { 0x0D03, "ReadTimeHex():WkDay,Mn&Dy,Yr&Hr,Mn&Sec" }, + { 0x0E03, "WriteTimeHex(Mn&Dy,Yr&Hr,Mn&Sec)" }, { 0x0F03, "ReadAsciiTime(@Buff)" }, { 0x1003, "SetVector(Vec#,@x)" }, { 0x1103, "GetVector(Vec#):@x" }, + { 0x1203, "SetHeartBeat(@Task)" }, { 0x1303, "DelHeartBeat(@Task)" }, { 0x1403, "ClrHeartBeat()" }, { 0x1503, "SysFailMgr(Code,@Msg)" }, { 0x1603, "GetAddr(Ref#):@Parm" }, + { 0x1703, "ReadMouse():X,Y,Stat&Mode" }, { 0x1803, "InitMouse(Slot)" }, { 0x1903, "SetMouse(Mode)" }, { 0x1A03, "HomeMouse()" }, { 0x1B03, "ClearMouse()" }, + { 0x1C03, "ClampMouse(Xmn,Xmx,Ymn,Ymx)" }, { 0x1D03, "GetMouseClamp():Xmn,Xmx,Ymn,Ymx" }, { 0x1E03, "PosMouse(X,Y)" }, { 0x1F03, "ServeMouse():IntStat" }, + { 0x2003, "GetNewID(Kind):MemID" }, { 0x2103, "DeleteID(MemID)" }, { 0x2203, "StatusID(MemID)" }, { 0x2303, "IntSource(Ref#)" }, { 0x2403, "FWEntry(A,X,Y,Address):P,A,X,Y" }, + { 0x2503, "GetTick():Ticks/4" }, { 0x2603, "PackBytes(@StartPtr,@Sz,@OutBf,OutSz):Size" }, { 0x2703, "UnPackBytes(@Buff,BfSz,@StartPtr,@Sz):Size" }, + { 0x2803, "Munger(@Dst,@DstL,@t,tL,@Rpl,RplL,@Pad):N" }, { 0x2903, "GetIRQEnable():IntStat" }, { 0x2A03, "SetAbsClamp(Xmn,Xmx,Ymn,Ymx)" }, + { 0x2B03, "GetAbsClamp():Xmn,Xmx,Ymn,Ymx" }, { 0x2C03, "SysBeep()" }, { 0x2E03, "AddToQueue(@newTask,@queueHeader)" }, { 0x2F03, "DeleteFromQueue(@task,@queueHeader)" }, + { 0x3003, "SetInterruptState(@stateRec,NumBytes)" }, { 0x3103, "GetInterruptState(@stateRec,NumBytes)" }, { 0x3203, "GetIntStateRecSize():Size" }, + { 0x3303, "ReadMouse2():xPos,yPos,StatMode" }, { 0x3403, "GetCodeResConverter():@proc" }, { 0x3503, "GetROMResource(?,?/4):???H" }, + { 0x3603, "ReleaseROMResource(?,?/4)" }, { 0x3703, "ConvSeconds(convVerb,Secs/4,@Date):SecondsOut/4" }, { 0x3803, "SysBeep2(beepKind)" }, + { 0x3903, "VersionString(flags,Version/4,@Buffer)" }, { 0x3A03, "WaitUntil(WaitFromTime,DelayTime):NewTime" }, { 0x3B03, "StringToText(flags,@String,StrLen,@Buffer):ResFlags,PrntLen" }, + { 0x3C03, "ShowBootInfo(@String,@Icon)" }, { 0x3D03, "ScanDevices():DevNum" }, { 0x3E03, "AlertMessage(@Table,MsgNum,@Subs):Button" }, { 0x3F03, "DoSysPrefs(bitsToClear,bitsToSet):SysPrefs" }, + { 0x0104, "QDBootInit()" }, { 0x0204, "QDStartUp(DirPg,MastSCB,MaxWid,MemID)" }, { 0x0304, "QDShutDown()" }, { 0x0404, "QDVersion():Vers" }, { 0x0504, "QDReset()" }, + { 0x0604, "QDStatus():ActFlg" }, { 0x0904, "GetAddress(what):@Table" }, { 0x0A04, "GrafOn()" }, { 0x0B04, "GrafOff()" }, { 0x0C04, "GetStandardSCB():SCB" }, + { 0x0D04, "InitColorTable(@Table)" }, { 0x0E04, "SetColorTable(Tab#,@SrcTab)" }, { 0x0F04, "GetColorTable(Tab#,@DestTbl)" }, { 0x1004, "SetColorEntry(Tab#,Ent#,NewCol)" }, + { 0x1104, "GetColorEntry(Tab#,Ent#):Color" }, { 0x1204, "SetSCB(Line#,SCB)" }, { 0x1304, "GetSCB(Line#):SCB" }, { 0x1404, "SetAllSCBs(SCB)" }, { 0x1504, "ClearScreen(Color)" }, + { 0x1604, "SetMasterSCB(SCB)" }, { 0x1704, "GetMasterSCB():SCB" }, { 0x1804, "OpenPort(@Port)" }, { 0x1904, "InitPort(@Port)" }, { 0x1A04, "ClosePort(@Port)" }, + { 0x1B04, "SetPort(@Port)" }, { 0x1C04, "GetPort():@Port" }, { 0x1D04, "SetPortLoc(@LocInfo)" }, { 0x1E04, "GetPortLoc(@LocInfo)" }, { 0x1F04, "SetPortRect(@Rect)" }, + { 0x2004, "GetPortRect(@Rect)" }, { 0x2104, "SetPortSize(w,h)" }, { 0x2204, "MovePortTo(h,v)" }, { 0x2304, "SetOrigin(h,v)" }, { 0x2404, "SetClip(RgnH)" }, + { 0x2504, "GetClip(RgnH)" }, { 0x2604, "ClipRect(@Rect)" }, { 0x2704, "HidePen()" }, { 0x2804, "ShowPen()" }, { 0x2904, "GetPen(@Pt)" }, { 0x2A04, "SetPenState(@PenSt)" }, + { 0x2B04, "GetPenState(@PenSt)" }, { 0x2C04, "SetPenSize(w,h)" }, { 0x2D04, "GetPenSize(@Pt)" }, { 0x2E04, "SetPenMode(Mode)" }, { 0x2F04, "GetPenMode():Mode" }, { 0x3004, "SetPenPat(@Patt)" }, + { 0x3104, "GetPenPat(@Patt)" }, { 0x3204, "SetPenMask(@Mask)" }, { 0x3304, "GetPenMask(@Mask)" }, { 0x3404, "SetBackPat(@Patt)" }, { 0x3504, "GetBackPat(@Patt)" }, + { 0x3604, "PenNormal()" }, { 0x3704, "SetSolidPenPat(Color)" }, { 0x3804, "SetSolidBackPat(Color)" }, { 0x3904, "SolidPattern(Color,@Patt)" }, { 0x3A04, "MoveTo(h,v)" }, + { 0x3B04, "Move(dh,dv)" }, { 0x3C04, "LineTo(h,v)" }, { 0x3D04, "Line(dh,dv)" }, { 0x3E04, "SetPicSave(Val/4)" }, { 0x3F04, "GetPicSave():Val/4" },{ 0x4004, "SetRgnSave(Val/4)" }, + { 0x4104, "GetRgnSave():Val/4" }, { 0x4204, "SetPolySave(Val/4)" }, { 0x4304, "GetPolySave():Val/4" }, { 0x4404, "SetGrafProcs(@GrafProcs)" },{ 0x4504, "GetGrafProcs():@GrafProcs" }, + { 0x4604, "SetUserField(Val/4)" }, { 0x4704, "GetUserField():Val/4" }, { 0x4804, "SetSysField(Val/4)" }, { 0x4904, "GetSysField():Val/4" }, { 0x4A04, "SetRect(@Rect,left,top,right,bot)" }, + { 0x4B04, "OffsetRect(@Rect,dh,dv)" }, { 0x4C04, "InsetRect(@Rect,dh,dv)" }, { 0x4D04, "SectRect(@R1,@R2,@DstR):nonEmptyF" }, { 0x4E04, "UnionRect(@Rect1,@Rect2,@UnionRect)" }, + { 0x4F04, "PtInRect(@Pt,@Rect):Flag" }, { 0x5004, "Pt2Rect(@Pt1,@Pt2,@Rect)" }, { 0x5104, "EqualRect(@Rect1,@Rect2):Flag" }, { 0x5204, "NotEmptyRect(@Rect):Flag" }, + { 0x5304, "FrameRect(@Rect)" }, { 0x5404, "PaintRect(@Rect)" }, { 0x5504, "EraseRect(@Rect)" }, { 0x5604, "InvertRect(@Rect)" }, { 0x5704, "FillRect(@Rect,@Patt)" }, + { 0x5804, "FrameOval(@Rect)" }, { 0x5904, "PaintOval(@Rect)" }, { 0x5A04, "EraseOval(@Rect)" }, { 0x5B04, "InvertOval(@Rect)" }, { 0x5C04, "FillOval(@Rect,@Patt)" }, + { 0x5D04, "FrameRRect(@Rect,OvalW,OvalHt)" }, { 0x5E04, "PaintRRect(@Rect,OvalW,OvalHt)" }, { 0x5F04, "EraseRRect(@Rect,OvalW,OvalHt)" }, { 0x6004, "InvertRRect(@Rect,OvalW,OvalHt)" }, + { 0x6104, "FillRRect(@Rect,OvalW,OvalHt,@Patt)" }, { 0x6204, "FrameArc(@Rect,Ang1,ArcAng)" }, { 0x6304, "PaintArc(@Rect,Ang1,ArcAng)" }, { 0x6404, "EraseArc(@Rect,Ang1,ArcAng)" }, + { 0x6504, "InvertArc(@Rect,Ang1,ArcAng)" }, { 0x6604, "FillArc(@Rect,Ang1,ArcAng,@Patt)" }, { 0x6704, "NewRgn():RgnH" }, { 0x6804, "DisposeRgn(RgnH)" }, + { 0x6904, "CopyRgn(SrcRgnH,DestRgnH)" }, { 0x6A04, "SetEmptyRgn(RgnH)" }, { 0x6B04, "SetRectRgn(RgnH,left,top,right,bot)" }, { 0x6C04, "RectRgn(RgnH,@Rect)" }, + { 0x6D04, "OpenRgn()" }, { 0x6E04, "CloseRgn(RgnH)" }, { 0x6F04, "OffsetRgn(RgnH,dh,dv)" }, { 0x7004, "InsetRgn(RgnH,dh,dv)" }, { 0x7104, "SectRgn(Rgn1H,Rgn2H,DstRgnH)" }, + { 0x7204, "UnionRgn(Rgn1H,Rgn2H,UnionRgnH)" }, { 0x7304, "DiffRgn(Rgn1H,Rgn2H,DstRgnH)" }, { 0x7404, "XorRgn(Rgn1H,Rgn2H,DstRgnH)" }, { 0x7504, "PtInRgn(@Pt,RgnH):Flag" }, + { 0x7604, "RectInRgn(@Rect,RgnH):Flag" }, { 0x7704, "EqualRgn(Rgn1H,Rgn2H):Flag" }, { 0x7804, "EmptyRgn(RgnH):Flag" }, { 0x7904, "FrameRgn(RgnH)" }, + { 0x7A04, "PaintRgn(RgnH)" }, { 0x7B04, "EraseRgn(RgnH)" }, { 0x7C04, "InvertRgn(RgnH)" }, { 0x7D04, "FillRgn(RgnH,@Patt)" }, { 0x7E04, "ScrollRect(@Rect,dh,dv,UpdtRgnH)" }, + { 0x7F04, "PaintPixels(@ppParms)" }, { 0x8004, "AddPt(@SrcPt,@DestPt)" }, { 0x8104, "SubPt(@SrcPt,@DstPt)" }, { 0x8204, "SetPt(@Pt,h,v)" }, { 0x8304, "EqualPt(@Pt1,@Pt2):Flag" }, + { 0x8404, "LocalToGlobal(@Pt)" }, { 0x8504, "GlobalToLocal(@Pt)" }, { 0x8604, "Random():N" }, { 0x8704, "SetRandSeed(Seed/4)" }, { 0x8804, "GetPixel(Hor,Vert):Pixel" }, + { 0x8904, "ScalePt(@Pt,@SrcRect,@DstRect)" }, { 0x8A04, "MapPt(@Pt,@SrcRect,@DstRect)" }, { 0x8B04, "MapRect(@Rect,@SrcRect,@DstRect)" }, { 0x8C04, "MapRgn(MapRgnH,@SrcRect,@DstRect)" }, + { 0x8D04, "SetStdProcs(@StdProcRec)" }, { 0x8E04, "SetCursor(@Curs)" }, { 0x8F04, "GetCursorAdr():@Curs" }, { 0x9004, "HideCursor()" }, { 0x9104, "ShowCursor()" }, + { 0x9204, "ObscureCursor()" }, { 0x9304, "SetMouseLoc ???" }, { 0x9404, "SetFont(FontH)" }, { 0x9504, "GetFont():FontH" }, { 0x9604, "GetFontInfo(@InfoRec)" }, + { 0x9704, "GetFontGlobals(@FGRec)" }, { 0x9804, "SetFontFlags(Flags)" }, { 0x9904, "GetFontFlags():Flags" }, { 0x9A04, "SetTextFace(TextF)" }, { 0x9B04, "GetTextFace():TextF" }, + { 0x9C04, "SetTextMode(TextM)" }, { 0x9D04, "GetTextMode():TextM" }, { 0x9E04, "SetSpaceExtra(SpEx/4f)" }, { 0x9F04, "GetSpaceExtra():SpEx/4f" }, { 0xA004, "SetForeColor(Color)" }, + { 0xA104, "GetForeColor():Color" }, { 0xA204, "SetBackColor(BackCol)" }, { 0xA304, "GetBackColor():BackCol" }, { 0xA404, "DrawChar(Char)" }, { 0xA504, "DrawString(@Str)" }, + { 0xA604, "DrawCString(@cStr)" }, { 0xA704, "DrawText(@Text,Len)" }, { 0xA804, "CharWidth(Char):Width" }, { 0xA904, "StringWidth(@Str):Width" }, { 0xAA04, "CStringWidth(@cStr):Width" }, + { 0xAB04, "TextWidth(@Text,Len):Width" }, { 0xAC04, "CharBounds(Char,@Rect)" }, { 0xAD04, "StringBounds(@Str,@Rect)" }, { 0xAE04, "CStringBounds(@cStr,@Rect)" }, + { 0xAF04, "TextBounds(@Text,Len,@Rect)" }, { 0xB004, "SetArcRot(ArcRot)" }, { 0xB104, "GetArcRot():ArcRot" }, { 0xB204, "SetSysFont(FontH)" }, { 0xB304, "GetSysFont():FontH" }, + { 0xB404, "SetVisRgn(RgnH)" }, { 0xB504, "GetVisRgn(RgnH)" }, { 0xB604, "SetIntUse(Flag)" }, { 0xB704, "OpenPicture(@FrameRect):PicH" }, { 0xB804, "PicComment(Kind,DataSz,DataH)" }, + { 0xB904, "ClosePicture()" }, { 0xBA04, "DrawPicture(PicH,@DstRect)" }, { 0xBB04, "KillPicture(PicH)" }, { 0xBC04, "FramePoly(PolyH)" }, { 0xBD04, "PaintPoly(PolyH)" }, + { 0xBE04, "ErasePoly(PolyH)" }, { 0xBF04, "InvertPoly(PolyH)" }, { 0xC004, "FillPoly(PolyH,@Patt)" }, { 0xC104, "OpenPoly():PolyH" }, { 0xC204, "ClosePoly()" }, + { 0xC304, "KillPoly(PolyH)" }, { 0xC404, "OffsetPoly(PolyH,dh,dv)" }, { 0xC504, "MapPoly(PolyH,@SrcRect,@DstRect)" }, { 0xC604, "SetClipHandle(RgnH)" }, + { 0xC704, "GetClipHandle():RgnH" }, { 0xC804, "SetVisHandle(RgnH)" }, { 0xC904, "GetVisHandle():RgnH" }, { 0xCA04, "InitCursor()" }, { 0xCB04, "SetBufDims(MaxW,MaxFontHt,MaxFBRext)" }, + { 0xCC04, "ForceBufDims(MaxW,MaxFontHt,MaxFBRext)" }, { 0xCD04, "SaveBufDims(@SizeInfo)" }, { 0xCE04, "RestoreBufDims(@SizeInfo)" }, { 0xCF04, "GetFGSize():FGSize" }, + { 0xD004, "SetFontID(FontID/4)" }, { 0xD104, "GetFontID():FontID/4" }, { 0xD204, "SetTextSize(TextSz)" }, { 0xD304, "GetTextSize():TextSz" }, { 0xD404, "SetCharExtra(ChEx/4f)" }, + { 0xD504, "GetCharExtra():ChEx/4f" }, { 0xD604, "PPToPort(@SrcLoc,@SrcRect,X,Y,Mode)" }, { 0xD704, "InflateTextBuffer(NewW,NewHt)" }, { 0xD804, "GetRomFont(@Rec)" }, + { 0xD904, "GetFontLore(@Rec,RecSize):Size" }, { 0xDA04, "Get640Colors():@PattTable" }, { 0xDB04, "Set640Color(color)" }, { 0x0105, "DeskBootInit()" }, + { 0x0205, "DeskStartUp()" }, { 0x0305, "DeskShutDown()" }, { 0x0405, "DeskVersion():Vers" }, { 0x0505, "DeskReset()" }, { 0x0605, "DeskStatus():ActFlg" }, + { 0x0905, "SaveScrn()" }, { 0x0A05, "RestScrn()" }, { 0x0B05, "SaveAll()" }, { 0x0C05, "RestAll()" }, { 0x0E05, "InstallNDA(ndaH)" }, { 0x0F05, "InstallCDA(cdaH)" }, + { 0x1105, "ChooseCDA()" }, { 0x1305, "SetDAStrPtr(AltDispH,@StrTbl)" }, { 0x1405, "GetDAStrPtr():@StrTbl" }, { 0x1505, "OpenNDA(ItemID):Ref#" }, { 0x1605, "CloseNDA(Ref#)" }, + { 0x1705, "SystemClick(@EvRec,@Wind,fwRes)" }, { 0x1805, "SystemEdit(eType):Flag" }, { 0x1905, "SystemTask()" }, { 0x1A05, "SystemEvent(Mods,Where/4,When/4,Msg/4,What):F" }, + { 0x1B05, "GetNumNDAs():N" }, { 0x1C05, "CloseNDAbyWinPtr(@Wind)" }, { 0x1D05, "CloseAllNDAs()" }, { 0x1E05, "FixAppleMenu(MenuID)" }, { 0x1F05, "AddToRunQ(@taskHeader)" }, + { 0x2005, "RemoveFromRunQ(@taskHeader)" }, { 0x2105, "RemoveCDA(cdaH)" }, { 0x2205, "RemoveNDA(ndaH)" }, { 0x2305, "GetDeskAccInfo(flags,daRef/4,BufSize,@Buffer)" }, + { 0x2405, "CallDeskAcc(flags,daRef/4,Action,Data/4):Result" }, { 0x2505, "GetDeskGlobal(selector):Value/4" }, { 0x0106, "EMBootInit()" }, { 0x0206, "EMStartUp(DirPg,qSz,Xmn,Xmx,Ymn,Ymx,MemID)" }, + { 0x0306, "EMShutDown()" }, { 0x0406, "EMVersion():Vers" }, { 0x0506, "EMReset()" }, { 0x0606, "EMStatus():ActFlg" }, { 0x0906, "DoWindows():DirPg" },{ 0x0A06, "GetNextEvent(evMask,@EvRec):Flag" }, + { 0x0B06, "EventAvail(evMask,@EvRec):Flag" }, { 0x0C06, "GetMouse(@Pt)" }, { 0x0D06, "Button(Btn#):DownFlg" }, { 0x0E06, "StillDown(Btn#):Flag" }, + { 0x0F06, "WaitMouseUp(Btn#):Flag" }, { 0x1006, "TickCount():Ticks/4" }, { 0x1106, "GetDblTime():Ticks/4" }, { 0x1206, "GetCaretTime():Ticks/4" }, + { 0x1306, "SetSwitch()" }, { 0x1406, "PostEvent(code,Msg/4):Flag" }, { 0x1506, "FlushEvents(evMask,StopMask):F" }, { 0x1606, "GetOSEvent(evMask,@EvRec):Flag" }, + { 0x1706, "OSEventAvail(evMask,@EvRec):Flag" }, { 0x1806, "SetEventMask(evMask)" }, { 0x1906, "FakeMouse(ChFlg,Mods,X,Y,BtnStat)" }, { 0x1A06, "SetAutoKeyLimit(NewLimit)" }, + { 0x1B06, "GetKeyTranslation():kTransID" }, { 0x1C06, "SetKeyTranslation(kTransID)" }, { 0x0107, "SchBootInit()" }, { 0x0207, "SchStartUp()" }, { 0x0307, "SchShutDown()" }, + { 0x0407, "SchVersion():Vers" }, { 0x0507, "SchReset()" }, { 0x0607, "SchStatus():ActFlg" }, { 0x0907, "SchAddTask(@Task):Flag" }, { 0x0A07, "SchFlush()" }, + { 0x0108, "SoundBootInit()" }, { 0x0208, "SoundStartUp(DirPg)" }, { 0x0308, "SoundShutDown()" }, { 0x0408, "SoundVersion():Vers" }, { 0x0508, "SoundReset()" }, + { 0x0608, "SoundToolStatus():ActFlg" }, { 0x0908, "WriteRamBlock(@Src,DOCStart,Count)" }, { 0x0A08, "ReadRamBlock(@Dest,DOCStart,Count)" }, { 0x0B08, "GetTableAddress():@JumpTbl" }, + { 0x0C08, "GetSoundVolume(Gen#):Vol" }, { 0x0D08, "SetSoundVolume(Vol,Gen#)" }, { 0x0E08, "FFStartSound(GenN&mode,@Parms)" }, { 0x0F08, "FFStopSound(GenMask)" }, + { 0x1008, "FFSoundStatus():ActFlg" }, { 0x1108, "FFGeneratorStatus(Gen#):Stat" }, { 0x1208, "SetSoundMIRQV(@IntHandler)" }, { 0x1308, "SetUserSoundIRQV(@NewIRQ):@OldIRQ" }, + { 0x1408, "FFSoundDoneStatus(Gen#):Stat" }, { 0x1508, "FFSetUpSound(ChannelGen,@Parms)" }, { 0x1608, "FFStartPlaying(GenWord)" }, { 0x1708, "SetDocReg(@DocRegParms)" }, + { 0x1808, "ReadDocReg(@DocRegParms)" }, { 0x0109, "ADBBootInit()" }, { 0x0209, "ADBStartUp()" }, { 0x0309, "ADBShutDown()" }, { 0x0409, "ADBVersion():Vers" }, + { 0x0509, "ADBReset()" }, { 0x0609, "ADBStatus():ActFlg" }, { 0x0909, "SendInfo(NumB,@Data,Cmd)" }, { 0x0A09, "ReadKeyMicroData(NumB,@Data,Cmd)" }, { 0x0B09, "ReadKeyMicroMemory(@DataOut,@DataIn,Cmd)" }, + { 0x0C09, "[resynch--don't call]" }, { 0x0D09, "AsyncADBReceive(@CompVec,Cmd)" }, { 0x0E09, "SyncADBReceive(InputWrd,@CompVec,Cmd)" }, { 0x0F09, "AbsOn()" }, + { 0x1009, "AbsOff()" }, { 0x1109, "RdAbs():Flag" }, { 0x1209, "SetAbsScale(@DataOut)" }, { 0x1309, "GetAbsScale(@DataIn)" }, { 0x1409, "SRQPoll(@CompVec,ADBreg)" }, + { 0x1509, "SRQRemove(ADBreg)" }, { 0x1609, "ClearSRQTable()" }, { 0xFF09, "[OBSOLETE: Use 09FF]" }, { 0x010A, "SANEBootInit()" }, { 0x020A, "SANEStartUp(DirPg)" }, + { 0x030A, "SANEShutDown()" }, { 0x040A, "SANEVersion():Vers" }, { 0x050A, "SANEReset()" }, { 0x060A, "SANEStatus():ActFlg" }, { 0x090A, "FPNum (...)" }, + { 0x0A0A, "DecStrNum (...)" }, { 0x0B0A, "ElemNum (...)" }, { 0xFF0A, "[OBSOLETE: USE $0AFF]" }, { 0x010B, "IMBootInit()" }, { 0x020B, "IMStartUp()" }, + { 0x030B, "IMShutDown()" }, { 0x040B, "IMVersion():Vers" }, { 0x050B, "IMReset()" }, { 0x060B, "IMStatus():ActFlg" }, { 0x090B, "Multiply(A,B):Prod/4" }, + { 0x0A0B, "SDivide(Num,Den):Rem,Quot" }, { 0x0B0B, "UDivide(Num,Den):Rem,Quot" }, { 0x0C0B, "LongMul(A/4,B/4):Prod/8" }, { 0x0D0B, "LongDivide(Num/4,Denom/4):Rem/4,Quot/4" }, + { 0x0E0B, "FixRatio(Numer,Denom):fxRatio/4" }, { 0x0F0B, "FixMul(fx1/4,fx2/4):fxProd/4" }, { 0x100B, "FracMul(fr1/4,fr2/4):frRes/4" }, { 0x110B, "FixDiv(Quot/4,Divisor/4):fxRes/4" }, + { 0x120B, "FracDiv(Quot/4,Divisor/4):frRes/4" }, { 0x130B, "FixRound(fxVal/4):Int" }, { 0x140B, "FracSqrt(frVal/4):frRes/4" }, { 0x150B, "FracCos(fxAngle/4):frRes/4" }, + { 0x160B, "FracSin(fxAngle/4):frRes/4" }, { 0x170B, "FixATan2(In1/4,In2/4):fxArcTan/4" }, { 0x180B, "HiWord(Long/4):Int" }, { 0x190B, "LoWord(Long/4):Int" }, + { 0x1A0B, "Long2Fix(Long/4):fxRes/4" }, { 0x1B0B, "Fix2Long(Fix/4):Long/4" }, { 0x1C0B, "Fix2Frac(fxVal/4):Frac/4" }, { 0x1D0B, "Frac2Fix(frVal/4):fxRes/4" }, + { 0x1E0B, "Fix2X(Fix/4,@Extended)" }, { 0x1F0B, "Frac2X(frVal/4,@Extended)" }, { 0x200B, "X2Fix(@Extended):fxRes/4" }, { 0x210B, "X2Frac(@Extended):frRes/4" }, + { 0x220B, "Int2Hex(Int,@Str,Len)" }, { 0x230B, "Long2Hex(Long/4,@Str,Len)" }, { 0x240B, "Hex2Int(@Str,Len):Int" }, { 0x250B, "Hex2Long(@Str,Len):Long/4" }, + { 0x260B, "Int2Dec(Int,@Str,Len,SgnFlg)" }, { 0x270B, "Long2Dec(Long/4,@Str,Len,SgnFlg)" }, { 0x280B, "Dec2Int(@Str,Len,SgnFlg):Int" }, { 0x290B, "Dec2Long(@Str,Len,SgnFlg):Long/4" }, + { 0x2A0B, "HexIt(Int):Hex/4" }, { 0x010C, "TextBootInit()" }, { 0x020C, "TextStartUp()" }, { 0x030C, "TextShutDown()" }, { 0x040C, "TextVersion():Vers" }, + { 0x050C, "TextReset()" }, { 0x060C, "TextStatus():ActFlg" }, { 0x090C, "SetInGlobals(ANDmsk,ORmsk)" }, { 0x0A0C, "SetOutGlobals(ANDmsk,ORmsk)" }, + { 0x0B0C, "SetErrGlobals(ANDmsk,ORmsk)" }, { 0x0C0C, "GetInGlobals():ANDmsk,ORmsk" }, { 0x0D0C, "GetOutGlobals():ANDmsk,ORmsk" }, { 0x0E0C, "GetErrGlobals():ANDmsk,ORmsk" }, + { 0x0F0C, "SetInputDevice(Type,@drvr|Slot/4)" }, { 0x100C, "SetOutputDevice(Type,@drvr|Slot/4)" }, { 0x110C, "SetErrorDevice(Type,@drvr|Slot/4)" }, { 0x120C, "GetInputDevice():Type,@drvr|Slot/4" }, + { 0x130C, "GetOutputDevice():Type,@drvr|Slot/4" }, { 0x140C, "GetErrorDevice():Type,@drvr|Slot/4" },{ 0x150C, "InitTextDev(dev)" }, { 0x160C, "CtlTextDev(dev,code)" }, + { 0x170C, "StatusTextDev(dev,request)" }, { 0x180C, "WriteChar(Char)" }, { 0x190C, "ErrWriteChar(Char)" }, { 0x1A0C, "WriteLine(@Str)" }, { 0x1B0C, "ErrWriteLine(@Str)" }, + { 0x1C0C, "WriteString(@Str)" }, { 0x1D0C, "ErrWriteString(@Str)" }, { 0x1E0C, "TextWriteBlock(@Text,Offset,Len)" }, { 0x1F0C, "ErrWriteBlock(@Text,Offset,Len)" },{ 0x200C, "WriteCString(@cStr)" }, + { 0x210C, "ErrWriteCString(@cStr)" }, { 0x220C, "ReadChar(EchoFlg):Char" }, { 0x230C, "TextReadBlock(@Buff,Offset,Size,EchoFlg)" }, { 0x240C, "ReadLine(@Buff,Max,EOLch,EchoFlg):Count" }, + { 0x010E, "WindBootInit()" }, { 0x020E, "WindStartUp(MemID)" }, { 0x030E, "WindShutDown()" }, { 0x040E, "WindVersion():Vers" }, { 0x050E, "WindReset()" },{ 0x060E, "WindStatus():ActFlg" }, + { 0x090E, "NewWindow(@Parms):@Wind" }, { 0x0A0E, "CheckUpdate(@EvRec):Flag" }, { 0x0B0E, "CloseWindow(@Wind)" }, { 0x0C0E, "Desktop(Oper,param/4):result/4" }, + { 0x0D0E, "SetWTitle(@Title,@Wind)" }, { 0x0E0E, "GetWTitle(@Wind):@Title" }, { 0x0F0E, "SetFrameColor(@NewColTbl,@Wind)" }, { 0x100E, "GetFrameColor(@Table,@Wind)" }, + { 0x110E, "SelectWindow(@Wind)" }, { 0x120E, "HideWindow(@Wind)" }, { 0x130E, "ShowWindow(@Wind)" }, { 0x140E, "SendBehind(@BehindWho,@Wind)" }, + { 0x150E, "FrontWindow():@Wind" }, { 0x160E, "SetInfoDraw(@Proc,@Wind)" }, { 0x170E, "FindWindow(@WindVar,X,Y):Where" }, { 0x180E, "TrackGoAway(X,Y,@Wind):Flag" }, + { 0x190E, "MoveWindow(X,Y,@Wind)" }, { 0x1A0E, "DragWindow(Grid,X,Y,Grace,@bRect,@Wind)" }, { 0x1B0E, "GrowWindow(mnW,mnH,X,Y,@Wind):nSize/4" }, + { 0x1C0E, "SizeWindow(w,h,@Wind)" }, { 0x1D0E, "TaskMaster(evMask,@TaskRec):Code" }, { 0x1E0E, "BeginUpdate(@Wind)" }, { 0x1F0E, "EndUpdate(@Wind)" }, + { 0x200E, "GetWMgrPort():@Port" }, { 0x210E, "PinRect(X,Y,@Rect):Point/4" }, { 0x220E, "HiliteWindow(Flag,@Wind)" }, { 0x230E, "ShowHide(Flag,@Wind)" }, + { 0x240E, "BringToFront(@Wind)" }, { 0x250E, "WindNewRes()" }, { 0x260E, "TrackZoom(X,Y,@Wind):Flag" }, { 0x270E, "ZoomWindow(@Wind)" }, { 0x280E, "SetWRefCon(Refcon/4,@Wind)" }, + { 0x290E, "GetWRefCon(@Wind):Refcon/4" }, { 0x2A0E, "GetNextWindow(@Wind):@Wind" }, { 0x2B0E, "GetWKind(@Wind):Flag" }, { 0x2C0E, "GetWFrame(@Wind):Frame" }, + { 0x2D0E, "SetWFrame(Frame,@Wind)" }, { 0x2E0E, "GetStructRgn(@Wind):StructRgnH" }, { 0x2F0E, "GetContentRgn(@Wind):ContRgnH" }, { 0x300E, "GetUpdateRgn(@Wind):UpdateRgnH" }, + { 0x310E, "GetDefProc(@Wind):@Proc" }, { 0x320E, "SetDefProc(@Proc,@Wind)" }, { 0x330E, "GetWControls(@Wind):CtrlH" }, { 0x340E, "SetOriginMask(Mask,@Wind)" }, + { 0x350E, "GetInfoRefCon(@Wind):Refcon/4" }, { 0x360E, "SetInfoRefCon(Val/4,@Wind)" }, { 0x370E, "GetZoomRect(@Wind):@zRect" }, { 0x380E, "SetZoomRect(@zRect,@Wind)" }, + { 0x390E, "RefreshDesktop(@Rect)" }, { 0x3A0E, "InvalRect(@Rect)" }, { 0x3B0E, "InvalRgn(RgnH)" }, { 0x3C0E, "ValidRect(@Rect)" }, { 0x3D0E, "ValidRgn(RgnH)" }, + { 0x3E0E, "GetContentOrigin(@Wind):Origin/4" }, { 0x3F0E, "SetContentOrigin(X,Y,@Wind)" }, { 0x400E, "GetDataSize(@Wind):DataSize/4" }, { 0x410E, "SetDataSize(w,h,@Wind)" }, + { 0x420E, "GetMaxGrow(@Wind):MaxGrow/4" }, { 0x430E, "SetMaxGrow(maxWidth,maxHeight,@Wind)" }, { 0x440E, "GetScroll(@Wind):Scroll/4" }, { 0x450E, "SetScroll(h,v,@Wind)" }, + { 0x460E, "GetPage(@Wind):Page/4" }, { 0x470E, "SetPage(h,v,@Wind)" }, { 0x480E, "GetContentDraw(@Wind):@Proc" }, { 0x490E, "SetContentDraw(@Proc,@Wind)" }, + { 0x4A0E, "GetInfoDraw(@Wind):@Proc" }, { 0x4B0E, "SetSysWindow(@Wind)" }, { 0x4C0E, "GetSysWFlag(@Wind):Flag" }, { 0x4D0E, "StartDrawing(@Wind)" }, + { 0x4E0E, "SetWindowIcons(NewFontH):OldFontH" }, { 0x4F0E, "GetRectInfo(@InfoRect,@Wind)" }, { 0x500E, "StartInfoDrawing(@iRect,@Wind)" }, { 0x510E, "EndInfoDrawing()" }, + { 0x520E, "GetFirstWindow():@Wind" }, { 0x530E, "WindDragRect(@a,@P,X,Y,@R,@lR,@sR,F):M/4" }, { 0x540E, "Private01():@func [GetDragRectPtr]" }, + { 0x550E, "DrawInfoBar(@Wind)" }, { 0x560E, "WindowGlobal(Flags):Flags" }, { 0x570E, "SetContentOrigin2(ScrollFlag,X,Y,@Wind)" }, { 0x580E, "GetWindowMgrGlobals():@Globals" }, + { 0x590E, "AlertWindow(AlertDesc,@SubArray,AlertRef/4):Btn" }, { 0x5A0E, "StartFrameDrawing(@Wind)" }, { 0x5B0E, "EndFrameDrawing()" }, { 0x5C0E, "ResizeWindow(hidden,@ContRect,@Wind)" }, + { 0x5D0E, "TaskMasterContent" }, { 0x5E0E, "TaskMasterKey" }, { 0x5F0E, "TaskMasterDA(evMask,@bigTaskRec):taskCode" }, { 0x600E, "CompileText(subType,@subs,@text,size):H" }, + { 0x610E, "NewWindow2(@T,RC/4,@draw,@def,pDesc,pRef/4,rType):@W" }, { 0x620E, "ErrorWindow(subType,@subs,ErrNum):Button" }, + { 0x630E, "GetAuxWindInfo(@Wind):@Info" }, { 0x640E, "DoModalWindow(@Event,@Update,@EvHook,@Beep,Flags):Result/4" }, { 0x650E, "MWGetCtlPart():Part" }, + { 0x660E, "MWSetMenuProc(@NewMenuProc):@OldMenuProc" }, { 0x670E, "MWStdDrawProc()" }, { 0x680E, "MWSetUpEditMenu()" }, { 0x690E, "FindCursorCtl(@CtrlH,x,y,@Wind):PartCode" }, + { 0x6A0E, "ResizeInfoBar(flags,newHeight,@Wind)" }, { 0x6B0E, "HandleDiskInsert(flags,devNum):resFlags,resDevNum" }, { 0x6C0E, "UpdateWindow(flags,@Wind)" }, + { 0x010F, "MenuBootInit()" }, { 0x020F, "MenuStartUp(MemID,DirPg)" }, { 0x030F, "MenuShutDown()" }, { 0x040F, "MenuVersion():Vers" }, { 0x050F, "MenuReset()" }, + { 0x060F, "MenuStatus():ActFlg" }, { 0x090F, "MenuKey(@TaskRec,BarH)" }, { 0x0A0F, "GetMenuBar():BarH" }, { 0x0B0F, "MenuRefresh(@RedrawProc)" }, { 0x0C0F, "FlashMenuBar()" }, + { 0x0D0F, "InsertMenu(MenuH,AfterWhat)" }, { 0x0E0F, "DeleteMenu(MenuID)" }, { 0x0F0F, "InsertMItem(@Item,AfterItem,MenuID)" }, { 0x100F, "DeleteMItem(ItemID)" }, + { 0x110F, "GetSysBar():BarH" }, { 0x120F, "SetSysBar(BarH)" }, { 0x130F, "FixMenuBar():Height" }, { 0x140F, "CountMItems(MenuID):N" }, { 0x150F, "NewMenuBar(@Wind):BarH" }, + { 0x160F, "GetMHandle(MenuID):MenuH" }, { 0x170F, "SetBarColors(BarCol,InvCol,OutCol)" }, { 0x180F, "GetBarColors():Colors/4" }, { 0x190F, "SetMTitleStart(hStart)" }, + { 0x1A0F, "GetMTitleStart():hStart" }, { 0x1B0F, "GetMenuMgrPort():@Port" }, { 0x1C0F, "CalcMenuSize(w,h,MenuID)" }, { 0x1D0F, "SetMTitleWidth(w,MenuID)" }, + { 0x1E0F, "GetMTitleWidth(MenuID):TitleWidth" }, { 0x1F0F, "SetMenuFlag(Flags,MenuID)" }, { 0x200F, "GetMenuFlag(MenuID):Flags" },{ 0x210F, "SetMenuTitle(@Title,MenuID)" }, + { 0x220F, "GetMenuTitle(MenuID):@Title" }, { 0x230F, "MenuGlobal(Flags):Flags" }, { 0x240F, "SetMItem(@Str,ItemID)" }, { 0x250F, "GetMItem(ItemID):@ItemName" }, + { 0x260F, "SetMItemFlag(Flags,ItemID)" }, { 0x270F, "GetMItemFlag(ItemID):Flag" }, { 0x280F, "SetMItemBlink(Count)" }, { 0x290F, "MenuNewRes()" }, + { 0x2A0F, "DrawMenuBar()" }, { 0x2B0F, "MenuSelect(@TaskRec,BarH)" }, { 0x2C0F, "HiliteMenu(Flag,MenuID)" }, { 0x2D0F, "NewMenu(@MenuStr):MenuH" }, { 0x2E0F, "DisposeMenu(MenuH)" }, + { 0x2F0F, "InitPalette()" }, { 0x300F, "EnableMItem(ItemID)" }, { 0x310F, "DisableMItem(ItemID)" }, { 0x320F, "CheckMItem(Flag,ItemID)" }, { 0x330F, "SetMItemMark(MarkCh,ItemID)" }, + { 0x340F, "GetMItemMark(ItemID):MarkChar" }, { 0x350F, "SetMItemStyle(TextStyle,ItemID)" }, { 0x360F, "GetMItemStyle(ItemID):TextStyle" }, { 0x370F, "SetMenuID(New,Old)" }, + { 0x380F, "SetMItemID(New,Old)" }, { 0x390F, "SetMenuBar(BarH)" }, { 0x3A0F, "SetMItemName(@Str,ItemID)" }, { 0x3B0F, "GetPopUpDefProc():@proc" }, + { 0x3C0F, "PopUpMenuSelect(SelID,left,top,flag,MenuH):id" }, { 0x3D0F, "[DrawPopUp(SelID,Flag,right,bottom,left,top,MenuH)]" }, { 0x3E0F, "NewMenu2(RefDesc,Ref/4):MenuH" }, + { 0x3F0F, "InsertMItem2(RefDesc,Ref/4,After,MenuID)" }, { 0x400F, "SetMenuTitle2(RefDesc,TitleRef/4,MenuID)" }, { 0x410F, "SetMItem2(RefDesc,Ref/4,Item)" }, + { 0x420F, "SetMItemName2(RefDesc,Ref/4,Item)" }, { 0x430F, "NewMenuBar2(RefDesc,Ref/4,@Wind):BarH" }, { 0x450F, "HideMenuBar()" }, { 0x460F, "ShowMenuBar()" }, + { 0x470F, "SetMItemIcon(IconDesc,IconRef/4,ItemID)" }, { 0x480F, "GetMItemIcon(ItemID):IconRef/4" }, { 0x490F, "SetMItemStruct(Desc,StructRef/4,ItemID)" }, + { 0x4A0F, "GetMItemStruct(ItemID):ItemStruct/4" }, { 0x4B0F, "RemoveMItemStruct(ItemID)" }, { 0x4C0F, "GetMItemFlag2(ItemID):ItemFlag2" }, { 0x4D0F, "SetMItemFlag2(newValue,ItemID)" }, + { 0x4F0F, "GetMItemBlink():Count" }, { 0x500F, "InsertPathMItems(flags,@Path,devnum,MenuID,AfterID,StartID,@Results)" }, { 0x0110, "CtlBootInit()" }, + { 0x0210, "CtlStartUp(MemID,DirPg)" }, { 0x0310, "CtlShutDown()" }, { 0x0410, "CtlVersion():Vers" }, { 0x0510, "CtlReset()" }, { 0x0610, "CtlStatus():ActFlg" }, + { 0x0910, "NewControl(@W,@R,@T,F,V,P1,P2,@p,r/4,@C):cH" }, { 0x0A10, "DisposeControl(CtrlH)" }, { 0x0B10, "KillControls(@Wind)" }, { 0x0C10, "SetCtlTitle(@Title,CtrlH)" }, + { 0x0D10, "GetCtlTitle(CtrlH):@Title" }, { 0x0E10, "HideControl(CtrlH)" }, { 0x0F10, "ShowControl(CtrlH)" }, { 0x1010, "DrawControls(@Wind)" },{ 0x1110, "HiliteControl(Flag,CtrlH)" }, + { 0x1210, "CtlNewRes()" }, { 0x1310, "FindControl(@CtrlHVar,X,Y,@Wind):Part" }, { 0x1410, "TestControl(X,Y,CtrlH):Part" }, { 0x1510, "TrackControl(X,Y,@ActProc,CtrlH):Part" }, + { 0x1610, "MoveControl(X,Y,CtrlH)" }, { 0x1710, "DragControl(X,Y,@LimR,@slR,Axis,CtrlH)" }, { 0x1810, "SetCtlIcons(FontH):OldFontH" }, { 0x1910, "SetCtlValue(Val,CtrlH)" }, + { 0x1A10, "GetCtlValue(CtrlH):Val" }, { 0x1B10, "SetCtlParams(P2,P1,CtrlH)" }, { 0x1C10, "GetCtlParams(CtrlH):P1,P2" }, { 0x1D10, "DragRect(@acPr,@P,X,Y,@drR,@l,@slR,F):M/4" }, + { 0x1E10, "GrowSize():Size/4" }, { 0x1F10, "GetCtlDpage():DirPg" }, { 0x2010, "SetCtlAction(@ActProc,CtrlH)" }, { 0x2110, "GetCtlAction(CtrlH):Action/4" }, { 0x2210, "SetCtlRefCon(Refcon/4,CtrlH)" }, + { 0x2310, "GetCtlRefCon(CtrlH):Refcon/4" }, { 0x2410, "EraseControl(CtrlH)" }, { 0x2510, "DrawOneCtl(CtrlH)" }, { 0x2610, "FindTargetCtl():CtrlH" }, + { 0x2710, "MakeNextCtlTarget():CtrlH" }, { 0x2810, "MakeThisCtlTarget(CtrlH)" }, { 0x2910, "SendEventToCtl(TgtOnly,@Wind,@eTask):Accepted" }, { 0x2A10, "GetCtlID(CtrlH):CtlID/4" }, + { 0x2B10, "SetCtlID(CtlID/4,CtrlH)" }, { 0x2C10, "CallCtlDefProc(CtrlH,Msg,Param/4):Result/4" }, { 0x2D10, "NotifyCtls(Mask,Msg,Param/4,@Wind)" }, + { 0x2E10, "GetCtlMoreFlags(CtrlH):Flags" }, { 0x2F10, "SetCtlMoreFlags(Flags,CtrlH)" }, { 0x3010, "GetCtlHandleFromID(@Wind,CtlID/4):CtrlH" }, { 0x3110, "NewControl2(@Wind,InKind,InRef/4):CtrlH" }, + { 0x3210, "CMLoadResource(rType,rID/4):resH" }, { 0x3310, "CMReleaseResource(rType,rID/4)" }, { 0x3410, "SetCtlParamPtr(@SubArray)" }, { 0x3510, "GetCtlParamPtr():@SubArray" }, + { 0x3710, "InvalCtls(@Wind)" }, { 0x3810, "[reserved]" }, { 0x3910, "FindRadioButton(@Wind,FamilyNum):WhichRadio" }, { 0x3A10, "SetLETextByID(@Wind,leID/4,@PString)" }, + { 0x3B10, "GetLETextByID(@Wind,leID/4,@PString)" }, { 0x3C10, "SetCtlValueByID(Value,@Wind,CtlID/4)" }, { 0x3D10, "GetCtlValueByID(@Wind,CtlID/4):Value" },{ 0x3E10, "InvalOneCtlByID(@Wind,CtlID/4)" }, + { 0x3F10, "HiliteCtlByID(Hilite,@Wind,CtlID/4)" }, { 0x0111, "LoaderBootInit()" }, { 0x0211, "LoaderStartUp()" }, { 0x0311, "LoaderShutDown()" }, + { 0x0411, "LoaderVersion():Vers" }, { 0x0511, "LoaderReset()" }, { 0x0611, "LoaderStatus():ActFlg" }, { 0x0911, "InitialLoad(MemID,@path,F):dpsSz,dps,@l,MemID" }, + { 0x0A11, "Restart(MemID):dpsSz,dps,@loc,MemID" }, { 0x0B11, "LoadSegNum(MemID,file#,seg#):@loc" }, { 0x0C11, "UnloadSegNum(MemID,file#,seg#)" }, { 0x0D11, "LoadSegName(MemID,@path,@segn):@loc,MemID,file#,sg#" }, + { 0x0E11, "UnloadSeg(@loc):seg#,file#,MemID" }, { 0x0F11, "GetLoadSegInfo(MemID,file#,seg#,@buff)" }, { 0x1011, "GetUserID(@Pathname):MemID" }, { 0x1111, "LGetPathname(MemID,file#):@path" }, + { 0x1211, "UserShutDown(MemID,qFlag):MemID" }, { 0x1311, "RenamePathname(@path1,@path2)" }, { 0x2011, "InitialLoad2(MemID,@in,F,Type):dpsSz,dps,@l,MemID" }, + { 0x2111, "GetUserID2(@path):MemID" }, { 0x2211, "LGetPathname2(MemID,file#):@path" }, { 0x0112, "QDAuxBootInit()" }, { 0x0212, "QDAuxStartUp()" }, + { 0x0312, "QDAuxShutDown()" }, { 0x0412, "QDAuxVersion():Vers" }, { 0x0512, "QDAuxReset()" }, { 0x0612, "QDAuxStatus():ActFlg" }, { 0x0912, "CopyPixels(@sLoc,@dLoc,@sRect,@dRct,M,MskH)" }, + { 0x0A12, "WaitCursor()" }, { 0x0B12, "DrawIcon(@Icon,Mode,X,Y)" }, { 0x0C12, "SpecialRect(@Rect,FrameColor,FillColor)" }, { 0x0D12, "SeedFill(@sLoc,@sR,@dLoc,@dR,X,Y,Mode,@Patt,@Leak)" }, + { 0x0E12, "CalcMask(@sLoc,@sR,@dLoc,@dR,Mode,@Patt,@Leak)" }, { 0x0F12, "GetSysIcon(flags,value,aux/4):@Icon" }, { 0x1012, "PixelMap2Rgn(@srcLoc,bitsPerPix,colorMask):RgnH" }, + { 0x1312, "IBeamCursor()" }, { 0x1412, "WhooshRect(flags/4,@smallRect,@bigRect)" }, { 0x1512, "DrawStringWidth(Flags,Ref/4,Width)" }, { 0x1612, "UseColorTable(tableNum,@Table,Flags):ColorInfoH" }, + { 0x1712, "RestoreColorTable(ColorInfoH,Flags)" }, { 0x0113, "PMBootInit()" }, { 0x0213, "PMStartUp(MemID,DirPg)" }, { 0x0313, "PMShutDown()" }, + { 0x0413, "PMVersion():Vers" }, { 0x0513, "PMReset()" }, { 0x0613, "PMStatus():ActFlg" }, { 0x0913, "PrDefault(PrRecH)" }, { 0x0A13, "PrValidate(PrRecH):Flag" }, + { 0x0B13, "PrStlDialog(PrRecH):Flag" }, { 0x0C13, "PrJobDialog(PrRecH):Flag" }, { 0x0D13, "PrPixelMap(@LocInfo,@SrcRect,colorFlag)" }, { 0x0E13, "PrOpenDoc(PrRecH,@Port):@Port" }, + { 0x0F13, "PrCloseDoc(@Port)" }, { 0x1013, "PrOpenPage(@Port,@Frame)" }, { 0x1113, "PrClosePage(@Port)" }, { 0x1213, "PrPicFile(PrRecH,@Port,@StatRec)" },{ 0x1313, "PrControl [obsolete]" }, + { 0x1413, "PrError():Error" }, { 0x1513, "PrSetError(Error)" }, { 0x1613, "PrChoosePrinter():DrvFlag" }, { 0x1813, "PrGetPrinterSpecs():Type,Characteristics" }, + { 0x1913, "PrDevPrChanged(@PrinterName)" }, { 0x1A13, "PrDevStartup(@PrinterName,@ZoneName)" }, { 0x1B13, "PrDevShutDown()" }, { 0x1C13, "PrDevOpen(@compProc,Reserved/4)" }, + { 0x1D13, "PrDevRead(@buffer,reqCount):xferCount" }, { 0x1E13, "PrDevWrite(@compProc,@buff,bufLen)" }, { 0x1F13, "PrDevClose()" }, { 0x2013, "PrDevStatus(@statBuff)" }, + { 0x2113, "PrDevAsyncRead(@compPr,bufLen,@buff):xferCount" }, { 0x2213, "PrDevWriteBackground(@compProc,bufLen,@buff)" }, { 0x2313, "PrDriverVer():Vers" }, + { 0x2413, "PrPortVer():Vers" }, { 0x2513, "PrGetZoneName():@ZoneName" }, { 0x2813, "PrGetPrinterDvrName():@Name" }, { 0x2913, "PrGetPortDvrName():@Name" }, + { 0x2A13, "PrGetUserName():@Name" }, { 0x2B13, "PrGetNetworkName():@Name" }, { 0x3013, "PrDevIsItSafe():safeFlag" }, { 0x3113, "GetZoneList [obsolete?]" }, + { 0x3213, "GetMyZone [obsolete?]" }, { 0x3313, "GetPrinterList [obsolete?]" }, { 0x3413, "PMUnloadDriver(whichDriver)" }, { 0x3513, "PMLoadDriver(whichDriver)" }, + { 0x3613, "PrGetDocName():@pStr" }, { 0x3713, "PrSetDocName(@pStr)" }, { 0x3813, "PrGetPgOrientation(PrRecH):Orientation" }, { 0x0114, "LEBootInit()" }, + { 0x0214, "LEStartUp(MemID,DirPg)" }, { 0x0314, "LEShutDown()" }, { 0x0414, "LEVersion():Vers" }, { 0x0514, "LEReset()" }, { 0x0614, "LEStatus():ActFlg" }, + { 0x0914, "LENew(@DstRect,@ViewRect,MaxL):leH" }, { 0x0A14, "LEDispose(leH)" }, { 0x0B14, "LESetText(@Text,Len,leH)" }, { 0x0C14, "LEIdle(leH)" }, + { 0x0D14, "LEClick(@EvRec,leH)" }, { 0x0E14, "LESetSelect(Start,End,leH)" }, { 0x0F14, "LEActivate(leH)" }, { 0x1014, "LEDeactivate(leH)" }, { 0x1114, "LEKey(Key,Mods,leH)" }, + { 0x1214, "LECut(leH)" }, { 0x1314, "LECopy(leH)" }, { 0x1414, "LEPaste(leH)" }, { 0x1514, "LEDelete(leH)" },{ 0x1614, "LEInsert(@Text,Len,leH)" }, + { 0x1714, "LEUpdate(leH)" }, { 0x1814, "LETextBox(@Text,Len,@Rect,Just)" }, { 0x1914, "LEFromScrap()" }, { 0x1A14, "LEToScrap()" }, { 0x1B14, "LEScrapHandle():ScrapH" }, + { 0x1C14, "LEGetScrapLen():Len" }, { 0x1D14, "LESetScrapLen(NewL)" }, { 0x1E14, "LESetHilite(@HiliteProc,leH)" }, { 0x1F14, "LESetCaret(@CaretProc,leH)" }, + { 0x2014, "LETextBox2(@Text,Len,@Rect,Just)" }, { 0x2114, "LESetJust(Just,leH)" }, { 0x2214, "LEGetTextHand(leH):TextH" }, { 0x2314, "LEGetTextLen(leH):TxtLen" }, + { 0x2414, "GetLEDefProc():@proc" }, { 0x2514, "LEClassifyKey(@Event):Flag" }, { 0x0115, "DialogBootInit()" }, { 0x0215, "DialogStartUp(MemID)" }, { 0x0315, "DialogShutDown()" }, + { 0x0415, "DialogVersion():Vers" }, { 0x0515, "DialogReset()" }, { 0x0615, "DialogStatus():ActFlg" }, { 0x0915, "ErrorSound(@SoundProc)" }, { 0x0A15, "NewModalDialog(@bR,vis,refcon/4):@Dlog" }, + { 0x0B15, "NewModelessDialog(@R,@T,@b,fr,rf/4,@zR):@D" }, { 0x0C15, "CloseDialog(@Dlog)" }, { 0x0D15, "NewDItem(@Dlog,dItem,@R,ty,Des/4,V,F,@Col)" }, + { 0x0E15, "RemoveDItem(@Dlog,dItem)" }, { 0x0F15, "ModalDialog(@FilterProc):Hit" }, { 0x1015, "IsDialogEvent(@EvRec):Flag" },{ 0x1115, "DialogSelect(@EvRec,@Dlog,@Hit):Flag" }, + { 0x1215, "DlgCut(@Dlog)" }, { 0x1315, "DlgCopy(@Dlog)" }, { 0x1415, "DlgPaste(@Dlog)" }, { 0x1515, "DlgDelete(@Dlog)" }, { 0x1615, "DrawDialog(@Dlog)" }, + { 0x1715, "Alert(@AlertTmpl,@FiltProc):Hit" }, { 0x1815, "StopAlert(@AlertTmpl,@FiltProc):Hit" }, { 0x1915, "NoteAlert(@AlertTmpl,@FiltProc):Hit" }, + { 0x1A15, "CautionAlert(@AlertTmpl,@FiltProc):Hit" }, { 0x1B15, "ParamText(@P0,@P1,@P2,@P3)" }, { 0x1C15, "SetDAFont(FontH)" }, { 0x1E15, "GetControlDItem(@Dlog,dItem):CtrlH" }, + { 0x1F15, "GetIText(@Dlog,dItem,@Str)" }, { 0x2015, "SetIText(@Dlog,dItem,@Str)" }, { 0x2115, "SelectIText(@Dlog,dItem,start,end)" }, { 0x2215, "HideDItem(@Dlog,dItem)" }, + { 0x2315, "ShowDItem(@Dlog,dItem)" }, { 0x2415, "FindDItem(@Dlog,Point/4):Hit" }, { 0x2515, "UpdateDialog(@Dlog,UpdtRgnH)" }, { 0x2615, "GetDItemType(@Dlog,dItem):type" }, + { 0x2715, "SetDItemType(type,@Dlog,dItem)" }, { 0x2815, "GetDItemBox(@Dlog,dItem,@Rect)" }, { 0x2915, "SetDItemBox(@Dlog,dItem,@Rect)" }, + { 0x2A15, "GetFirstDItem(@Dlog):dItem" }, { 0x2B15, "GetNextDItem(@Dlog,dItem):dItem" }, { 0x2C15, "ModalDialog2(@FilterProc):HitInfo/4" },{ 0x2E15, "GetDItemValue(@Dlog,dItem):Val" }, + { 0x2F15, "SetDItemValue(val,@Dlog,dItem)" }, { 0x3215, "GetNewModalDialog(@DlogTmpl):@Dlog" }, { 0x3315, "GetNewDItem(@Dlog,@ItemTmpl)" },{ 0x3415, "GetAlertStage():Stage" }, + { 0x3515, "ResetAlertStage()" }, { 0x3615, "DefaultFilter(@Dlog,@EvRec,@Hit):Flag" }, { 0x3715, "GetDefButton(@Dlog):dItem" }, { 0x3815, "SetDefButton(BtnID,@Dlog)" }, + { 0x3915, "DisableDItem(@Dlog,dItem)" }, { 0x3A15, "EnableDItem(@Dlog,dItem)" }, { 0x0116, "ScrapBootInit()" }, { 0x0216, "ScrapStartUp()" }, { 0x0316, "ScrapShutDown()" }, + { 0x0416, "ScrapVersion():Vers" }, { 0x0516, "ScrapReset()" }, { 0x0616, "ScrapStatus():ActFlg" }, { 0x0916, "UnloadScrap()" }, { 0x0A16, "LoadScrap()" }, + { 0x0B16, "ZeroScrap()" }, { 0x0C16, "PutScrap(Count/4,Type,@Src)" }, { 0x0D16, "GetScrap(DestH,Type)" }, { 0x0E16, "GetScrapHandle(Type):ScrapH" }, + { 0x0F16, "GetScrapSize(Type):Size/4" },{ 0x1016, "GetScrapPath():@Pathname" }, { 0x1116, "SetScrapPath(@Pathname)" }, { 0x1216, "GetScrapCount():Count" }, + { 0x1316, "GetScrapState():State" }, { 0x1416, "GetIndScrap(Index,@buffer)" }, { 0x1516, "ShowClipboard(flags,@rect):@Wind" }, { 0x0117, "SFBootInit()" }, + { 0x0217, "SFStartUp(MemID,DirPg)" }, { 0x0317, "SFShutDown()" }, { 0x0417, "SFVersion():Vers" }, { 0x0517, "SFReset()" },{ 0x0617, "SFStatus():ActFlg" }, + { 0x0917, "SFGetFile(X,Y,@Prmpt,@FPrc,@tL,@Reply)" }, { 0x0A17, "SFPutFile(X,Y,@Prompt,@DfltName,mxL,@Reply)" },{ 0x0B17, "SFPGetFile(X,Y,@P,@FPrc,@tL,@dTmp,@dHk,@Rp)" }, + { 0x0C17, "SFPPutFile(X,Y,@P,@Df,mxL,@dTmpl,@dHk,@Rply)" }, { 0x0D17, "SFAllCaps(Flag)" },{ 0x0E17, "SFGetFile2(X,Y,prDesc,prRef/4,@fProc,@tList,@rep)" }, + { 0x0F17, "SFPutFile2(X,Y,prDesc,prRef/4,nmDesc,nmRef/4,@rep)" }, { 0x1017, "SFPGetFile2(X,Y,@draw,prD,prRf/4,@fP,@tL,@d,@hk,@rep)" }, { 0x1117, "SFPPutFile2(X,Y,@draw,prD,prRf/4,nmD,nmRf/4,@d,@hk,@rep)" }, + { 0x1217, "SFShowInvisible(InvisState):OldState" }, { 0x1317, "SFReScan(@filterProc,@typeList)" }, { 0x1417, "SFMultiGet2(X,Y,prDesc,prRef/4,@fP,@tL,@rep)" }, + { 0x1517, "SFPMultiGet2(X,Y,@draw,prD,prRf/4,@fP,@tL,@d,@hk,@rep)" }, { 0x0119, "NSBootInit()" }, { 0x0219, "NSStartUp(Rate,@UpdProc)" }, { 0x0319, "NSShutDown()" }, + { 0x0419, "NSVersion():Vers" }, { 0x0519, "NSReset()" }, { 0x0619, "NSStatus():ActFlg" }, { 0x0919, "AllocGen(Priority):Gen#" }, { 0x0A19, "DeallocGen(Gen#)" }, + { 0x0B19, "NoteOn(Gen#,Semitone,Vol,@Instr)" }, { 0x0C19, "NoteOff(Gen#,Semitone)" }, { 0x0D19, "AllNotesOff()" }, { 0x0E19, "NSSetUpdateRate(NewRate):OldRate" }, + { 0x0F19, "NSSetUserUpdateRtn(@New):@Old" }, { 0x011A, "SeqBootInit()" }, { 0x021A, "SeqStartUp(DirPg,Mode,Rate,Incr)" }, { 0x031A, "SeqShutDown()" }, + { 0x041A, "SeqVersion():Vers" }, { 0x051A, "SeqReset()" }, { 0x061A, "SeqStatus():ActFlg" }, { 0x091A, "SetIncr(Increment)" }, { 0x0A1A, "ClearIncr():OldIncr" }, + { 0x0B1A, "GetTimer():Tick" }, { 0x0C1A, "GetLoc():Phrase,Patt,Level" }, { 0x0D1A, "SeqAllNotesOff()" }, { 0x0E1A, "SetTrkInfo(Priority,InstIndex,TrkNum)" }, + { 0x0F1A, "StartSeq(@ErrRtn,@CompRtn,SeqH)" }, { 0x101A, "StepSeq()" }, { 0x111A, "StopSeq(NextFlag)" }, { 0x121A, "SetInstTable(TableH)" }, { 0x131A, "StartInts()" }, + { 0x141A, "StopInts()" }, { 0x151A, "StartSeqRel(@errHndlr,@CompRtn,SeqH)" }, { 0x011B, "FMBootInit()" }, { 0x021B, "FMStartUp(MemID,DirPg)" }, { 0x031B, "FMShutDown()" }, + { 0x041B, "FMVersion():Vers" }, { 0x051B, "FMReset()" }, { 0x061B, "FMStatus():ActFlg" }, { 0x091B, "CountFamilies(FamSpecs):Count" }, { 0x0A1B, "FindFamily(Specs,Pos,@Name):FamNum" }, + { 0x0B1B, "GetFamInfo(FamNum,@Name):FamStats" }, { 0x0C1B, "GetFamNum(@Name):FamNum" }, { 0x0D1B, "AddFamily(FamNum,@Name)" }, { 0x0E1B, "InstallFont(ID/4,Scale)" }, + { 0x0F1B, "SetPurgeStat(FontID/4,PrgStat)" }, { 0x101B, "CountFonts(ID/4,Specs):N" }, { 0x111B, "FindFontStats(ID/4,Specs,Pos,@FStatRec)" }, { 0x121B, "LoadFont(ID/4,Specs,Pos,@FStatRec)" }, + { 0x131B, "LoadSysFont()" }, { 0x141B, "AddFontVar(FontH,NewSpecs)" }, { 0x151B, "FixFontMenu(MenuID,StartID,FamSpecs)" }, { 0x161B, "ChooseFont(CurrID/4,Famspecs):NewID/4" }, + { 0x171B, "ItemID2FamNum(ItemID):FamNum" }, { 0x181B, "FMSetSysFont(FontID/4)" }, { 0x191B, "FMGetSysFID():SysID/4" }, { 0x1A1B, "FMGetCurFID():CurID/4" }, + { 0x1B1B, "FamNum2ItemID(FamNum):ItemID" }, { 0x1C1B, "InstallWithStats(ID/4,Scale,@ResultRec)" }, { 0x011C, "ListBootInit()" }, { 0x021C, "ListStartUp()" }, { 0x031C, "ListShutDown()" }, + { 0x041C, "ListVersion():Vers" }, { 0x051C, "ListReset()" }, { 0x061C, "ListStatus():ActFlg" }, { 0x091C, "CreateList(@Wind,@ListRec):CtrlH" }, { 0x0A1C, "SortList(@CompareProc,@ListRec)" }, + { 0x0B1C, "NextMember(@Member,@ListRec):@NxtMemVal" }, { 0x0C1C, "DrawMember(@Member,@ListRec)" }, { 0x0D1C, "SelectMember(@Member,@ListRec)" }, { 0x0E1C, "GetListDefProc():@Proc" }, + { 0x0F1C, "ResetMember(@ListRec):NxtMemVal/4" }, { 0x101C, "NewList(@Member,@ListRec)" }, { 0x111C, "DrawMember2(itemNum,CtrlH)" }, { 0x121C, "NextMember2(itemNum,CtrlH):itemNum" }, + { 0x131C, "ResetMember2(CtrlH):itemNum" }, { 0x141C, "SelectMember2(itemNum,CtrlH)" }, { 0x151C, "SortList2(@CompareProc,CtrlH)" }, { 0x161C, "NewList2(@draw,start,ref/4,refKind,size,CtrlH)" }, + { 0x171C, "ListKey(flags,@EventRec,CtrlH)" }, { 0x181C, "CompareStrings(flags,@String1,@String2):Order" }, { 0x011D, "ACEBootInit()" }, { 0x021D, "ACEStartUp(DirPg)" }, + { 0x031D, "ACEShutDown()" }, { 0x041D, "ACEVersion():Vers" }, { 0x051D, "ACEReset()" }, { 0x061D, "ACEStatus():ActFlg" }, { 0x071D, "ACEInfo(Code):Value/4" }, + { 0x091D, "ACECompress(SrcH,SrcOff/4,DestH,DestOff/4,Blks,Method)" }, { 0x0A1D, "ACEExpand(SrcH,SrcOff/4,DestH,DestOff/4,Blks,Method)" }, { 0x0B1D, "ACECompBegin()" }, + { 0x0C1D, "ACEExpBegin()" }, { 0x0D1D, "GetACEExpState(@Buffer)" }, { 0x0E1D, "SetACEExpState(@Buffer)" }, { 0x011E, "ResourceBootInit()" }, { 0x021E, "ResourceStartUp(MemID)" }, + { 0x031E, "ResourceShutDown()" }, { 0x041E, "ResourceVersion():Vers" }, { 0x051E, "ResourceReset()" }, { 0x061E, "ResourceStatus():ActFlag" }, { 0x091E, "CreateResourceFile(aux/4,fType,Access,@n)" }, + { 0x0A1E, "OpenResourceFile(reqAcc,@mapAddr,@n):fileID" }, { 0x0B1E, "CloseResourceFile(fileID)" }, { 0x0C1E, "AddResource(H,Attr,rType,rID/4)" }, { 0x0D1E, "UpdateResourcefile(fileID)" }, + { 0x0E1E, "LoadResource(rType,rID/4):H" }, { 0x0F1E, "RemoveResource(rType,rID/4)" }, { 0x101E, "MarkResourceChange(changeFlag,rType,rID/4)" }, { 0x111E, "SetCurResourceFile(fileID)" }, + { 0x121E, "GetCurResourceFile():fileID" }, { 0x131E, "SetCurResourceApp(MemID)" }, { 0x141E, "GetCurResourceApp():MemID" }, { 0x151E, "HomeResourceFile(rType,rID/4):fileID" }, + { 0x161E, "WriteResource(rType,rID/4)" }, { 0x171E, "ReleaseResource(PurgeLevel,rType,rID/4)" }, { 0x181E, "DetachResource(rType,rID/4)" }, { 0x191E, "UniqueResourceID(IDrange,rType):rID/4" }, + { 0x1A1E, "SetResourceID(newID/4,rType,oldID/4)" }, { 0x1B1E, "GetResourceAttr(rType,rID/4):Attr" }, { 0x1C1E, "SetResourceAttr(rAttr,rType,rID/4)" }, { 0x1D1E, "GetResourceSize(rType,rID/4):Size/4" }, + { 0x1E1E, "MatchResourceHandle(@buffer,H)" }, { 0x1F1E, "GetOpenFileRefNum(fileID):RefNum" }, { 0x201E, "CountTypes():Num" }, { 0x211E, "GetIndType(tIndex):rType" }, + { 0x221E, "CountResources(rType):Num/4" }, { 0x231E, "GetIndResource(rType,rIndex/4):rID/4" }, { 0x241E, "SetResourceLoad(Flag):oldFlag" }, { 0x251E, "SetResourceFileDepth(Depth):oldDepth" }, + { 0x261E, "GetMapHandle(fileID):MapH" }, { 0x271E, "LoadAbsResource(@loc,MaxSize/4,rType,rID/4):Size/4" }, { 0x281E, "ResourceConverter(@proc,rType,logFlags)" }, + { 0x291E, "LoadResource2(flag,@AttrBuff,rType,rID/4):H" }, { 0x2A1E, "RMFindNamedResource(rType,@name,@fileID):rID/4" },{ 0x2B1E, "RMGetResourceName(rType,rID/4,@nameBuffer)" }, + { 0x2C1E, "RMLoadNamedResource(rType,@name):H" }, { 0x2D1E, "RMSetResourceName(rType,rID/4,@name)" }, { 0x2E1E, "OpenResourceFileByID(reqAcc,userID):oldResApp" }, + { 0x2F1E, "CompactResourceFile(flags,fileID)" }, { 0x0120, "MidiBootInit()" }, { 0x0220, "MidiStartUp(MemID,DirPg)" }, { 0x0320, "MidiShutDown()" }, + { 0x0420, "MidiVersion():Vers" }, { 0x0520, "MidiReset()" }, { 0x0620, "MidiStatus():ActFlg" }, { 0x0920, "MidiControl(Function,Argument/4)" }, { 0x0A20, "MidiDevice(Function,@DriverInfo)" }, + { 0x0B20, "MidiClock(Function,Argument/4)" }, { 0x0C20, "MidiInfo(Function):Info/4" }, { 0x0D20, "MidiReadPacket(@buff,size):Count" }, { 0x0E20, "MidiWritePacket(@buff):Count" }, + { 0x0121, "VDBootInit()" }, { 0x0221, "VDStartUp()" }, { 0x0321, "VDShutDown()" }, { 0x0421, "VDVersion():Vers" }, { 0x0521, "VDReset()" }, { 0x0621, "VDStatus():ActFlg" }, + { 0x0921, "VDInStatus(Selector):Status" }, { 0x0A21, "VDInSetStd(InStandard)" }, { 0x0B21, "VDInGetStd():InStandard" }, { 0x0C21, "VDInConvAdj(Selector,AdjFunction)" }, + { 0x0D21, "VDKeyControl(Selector,KeyerCtrlVal)" }, { 0x0E21, "VDKeyStatus(Selector):KeyerStatus" }, { 0x0F21, "VDKeySetKCol(Red,Green,Blue)" }, { 0x1021, "VDKeyGetKRCol():RedValue" }, + { 0x1121, "VDKeyGetKGCol():GreenValue" }, { 0x1221, "VDKeyGetKBCol():BlueValue" }, { 0x1321, "VDKeySetKDiss(KDissolve)" }, { 0x1421, "VDKeyGetKDiss():KDissolve" }, + { 0x1521, "VDKeySetNKDiss(NKDissolve)" }, { 0x1621, "VDKeyGetNKDiss():NKDissolve" }, { 0x1721, "VDOutSetStd(OutStandard)" }, { 0x1821, "VDOutGetStd():OutStandard" }, + { 0x1921, "VDOutControl(Selector,Value)" }, { 0x1A21, "VDOutStatus(Selector):OutStatus" }, { 0x1B21, "VDGetFeatures(Feature):Info" }, { 0x1C21, "VDInControl(Selector,Value)" }, + { 0x1D21, "VDGGControl(Selector,Value)" }, { 0x1E21, "VDGGStatus(Selector):Value" }, { 0x0122, "TEBootInit()" }, { 0x0222, "TEStartUp(MemID,DirPg)" }, + { 0x0322, "TEShutDown()" }, { 0x0422, "TEVersion():Vers" }, { 0x0522, "TEReset()" }, { 0x0622, "TEStatus():ActFlg" }, { 0x0922, "TENew(@parms):teH" }, + { 0x0A22, "TEKill(teH)" }, { 0x0B22, "TESetText(tDesc,tRef/4,Len/4,stDesc,stRef/4,teH)" }, { 0x0C22, "TEGetText(bDesc,bRef/4,bLen/4,stDesc,stRef/4,teH):L/4" }, + { 0x0D22, "TEGetTextInfo(@infoRec,parmCount,teH)" }, { 0x0E22, "TEIdle(teH)" }, { 0x0F22, "TEActivate(teH)" }, { 0x1022, "TEDeactivate(teH)" }, { 0x1122, "TEClick(@eventRec,teH)" }, + { 0x1222, "TEUpdate(teH)" }, { 0x1322, "TEPaintText(@Port,startLn/4,@R,Flags,teH):NextLn/4" }, { 0x1422, "TEKey(@eventRec,teH)" }, { 0x1522, "[not supported]" }, + { 0x1622, "TECut(teH)" }, { 0x1722, "TECopy(teH)" }, { 0x1822, "TEPaste(teH)" }, { 0x1922, "TEClear(teH)" }, { 0x1A22, "TEInsert(tDesc,tRef/4,tLen/4,stDesc,stRef/4,teH)" },{ 0x1B22, "TEReplace(tDesc,tRef/4,tLen/4,stDesc,stRef/4,teH)" }, + { 0x1C22, "TEGetSelection(@selStart,@selEnd,teH)" }, { 0x1D22, "TESetSelection(selStart/4,selEnd/4,teH)" }, { 0x1E22, "TEGetSelectionStyle(@stRec,stH,teH):comFlag" }, { 0x1F22, "TEStyleChange(flags,@stRec,teH)" }, + { 0x2022, "TEOffsetToPoint(offset/4,@vertPos,@horPos,teH)" }, { 0x2122, "TEPointToOffset(vertPos/4,horPos/4,teH):textOffset/4" }, { 0x2222, "TEGetDefProc():@defProc" }, + { 0x2322, "TEGetRuler(rulerDesc,rulerRef/4,teH)" }, { 0x2422, "TESetRuler(rulerDesc,rulerRef/4,teH)" }, { 0x2522, "TEScroll(scrDesc,vertAmt/4,horAmt/4,teH):Offset/4" }, + { 0x2622, "TEGetInternalProc():@proc" }, { 0x2722, "TEGetLastError(clearFlag,teH):lastError" }, { 0x2822, "TECompactRecord(teH)" }, { 0x0123, "MSBootInit()" }, + { 0x0223, "MSStartUp()" }, { 0x0323, "MSShutDown()" }, { 0x0423, "MSVersion():Vers" }, { 0x0523, "MSReset()" }, { 0x0623, "MSStatus():ActFlg" },{ 0x0923, "SetBasicChannel(Channel)" }, + { 0x0A23, "SetMIDIMode(Mode)" }, { 0x0B23, "PlayNote(Channel,NoteNum,KeyVel)" }, { 0x0C23, "StopNote(Channel,NoteNum)" }, { 0x0D23, "KillAllNotes()" }, + { 0x0E23, "SetRecTrack(TrackNum)" }, { 0x0F23, "SetPlayTrack(TrackNum,State)" }, { 0x1023, "TrackToChannel(TrackNum,ChannelNum)" }, { 0x1123, "Locate(TimeStamp/4,@SeqBuff):@SeqItem" }, + { 0x1223, "SetVelComp(VelocityOffset)" }, { 0x1323, "SetMIDIPort(EnabInput,EnabOutput)" }, { 0x1423, "SetInstrument(@InstRec,InstNum)" }, { 0x1523, "SeqPlayer(@SeqPlayerRec)" }, + { 0x1623, "SetTempo(Tempo)" }, { 0x1723, "SetCallBack(@CallBackRec)" }, { 0x1823, "SysExOut(@Msg,Delay,@MonRoutine)" }, { 0x1923, "SetBeat(BeatDuration)" }, + { 0x1A23, "MIDIMessage(Dest,nBytes,Message,Byte1,Byte2)" }, { 0x1B23, "LocateEnd(@seqBuffer):@End" }, { 0x1C23, "Merge(@Buffer1,@Buffer2)" }, { 0x1D23, "DeleteTrack(TrackNum,@Seq)" }, + { 0x1E23, "SetMetro(Volume,Freq,@Wave)" }, { 0x1F23, "GetMSData():Reserved/4,@DirPage" }, { 0x2023, "ConvertToTime(TkPerBt,BtPerMsr,BeatNum,MsrNum):Ticks/4" }, { 0x2123, "ConvertToMeasure(TkPerBt,BtPerMsr,Ticks/4):Ticks,Beat,Msr" }, + { 0x2223, "MSSuspend()" }, { 0x2323, "MSResume()" }, { 0x2423, "SetTuningTable(@Table)" }, { 0x2523, "GetTuningTable(@Buffer)" }, { 0x2623, "SetTrackOut(TrackNum,PathVal)" }, + { 0x2723, "InitMIDIDriver(Slot,Internal,UserID,@Driver)" }, { 0x2823, "RemoveMIDIDriver()" }, { 0x0125, "AnimBootInit()" }, { 0x0225, "AnimStartUp(MemID,DPage,ModeFlag,@PatchTbl)" }, + { 0x0325, "AnimShutDown()" }, { 0x0425, "AnimVersion():Vers" }, { 0x0525, "AnimReset()" }, { 0x0625, "AnimStatus():Status" }, + { 0x0725, "CleanExit() "}, { 0x0825, "AnimIdleDebug()" }, { 0x0925, "StartScene(Mode, @Rect)" }, { 0x0A25, "StopScene()" }, { 0x0B25, "StartFrameTimer(Interval)" }, + { 0x0C25, "StopFrameTimer()" }, { 0x0D25, "SetBackGndPort()" }, { 0x0E25, "RefreshBackCall()" }, { 0x0F25, "StartCharCall(PassX, PassY, PassMaxP/PassFlag, PassMinP/PassDir, LPassChar)" }, + { 0x1025, "MoveCharCall(PassIter, PassDY/PassIter, PassDX/PassFlag, LPassChar)" }, { 0x1125, "GetCharRecPtr(CharNum):CharRecPtr" }, + { 0x1225, "KillCharCall(CharNum)" }, { 0x1325, "LoadActor(@ActorPtr, CharNum)" }, { 0x1425, "SetCharScript(@theScript, CharNum)" }, { 0x1525, "RunAnimScripts()" }, + { 0x1625, "FillAddressTbl(@TablePtr)" }, { 0x1725, "CreateReblitCode(@RectPtr, GenFlags)" }, { 0x1825, "StartTockTask(thePtr, theData, theID, theCount)" }, { 0x1925, "FireTockTask()" }, + { 0x0126, "MCBootInit()" }, { 0x0226, "MCStartUp(MemID)" }, { 0x0326, "MCShutDown()" }, { 0x0426, "MCVersion():Vers" }, { 0x0526, "MCReset()" }, { 0x0626, "MCStatus():ActFlg" }, + { 0x0926, "MCGetErrorMsg(mcErrorNo,@PStringBuff)" }, { 0x0A26, "MCLoadDriver(mcChannelNo)" }, { 0x0B26, "MCUnLoadDriver(mcChannelNo)" }, { 0x0C26, "MCTimeToBin(mcTimeValue/4):result/4" }, + { 0x0D26, "MCBinToTime(mcBinVal/4):result/4" }, { 0x0E26, "MCGetTrackTitle(mcDiskID/4,mcTrackNo,@PStringBuff)" }, + { 0x0F26, "MCSetTrackTitle(mcDiskID/4,TrackNum,@title)" }, { 0x1026, "MCGetProgram(mcDiskID/4,@resultBuff)" }, { 0x1126, "MCSetProgram(mcDiskID/4,@mcProg)" }, + { 0x1226, "MCGetDiscTitle(mcDiskID/4,@PStringBuff)" }, { 0x1326, "MCSetDiscTitle(mcDiskID/4,@title)" }, { 0x1426, "MCDStartUp(mcChannelNo,@portName,userID)" }, + { 0x1526, "MCDShutDown(mcChannelNo)" }, { 0x1626, "MCGetFeatures(mcChannelNo,mcFeatSel):result/4" }, { 0x1726, "MCPlay(mcChannelNo)" }, { 0x1826, "MCPause(mcChannelNo)" }, + { 0x1926, "MCSendRawData(mcChannelNo,@mcNative)" }, { 0x1A26, "MCGetStatus(mcChannelNo,mcStatusSel):result" }, { 0x1B26, "MCControl(mcChannelNo,ctlCommand)" }, + { 0x1C26, "MCScan(mcChannelNo,mcDirection)" }, { 0x1D26, "MCGetSpeeds(mcChannelNo,@PStringBuff)" }, { 0x1E26, "MCSpeed(mcChannelNo,mcFPS)" }, + { 0x1F26, "MCStopAt(mcChannelNo,mcUnitType,mcStopLoc/4)" }, { 0x2026, "MCJog(mcChannelNo,mcUnitType,mcNJog/4,mcJogRepeat)" }, { 0x2126, "MCSearchTo(mcChannelNo,mcUnitType,searchLoc/4)" }, + { 0x2226, "MCSearchDone(mcChannelNo):result" }, { 0x2326, "MCSearchWait(mcChannelNo)" }, { 0x2426, "MCGetPosition(mcChannelNo,mcUnitType):result/4" },{ 0x2526, "MCSetAudio(mcChannelNo,mcAudioCtl)" }, + { 0x2626, "MCGetTimes(mcChannelNo,mctimesSel):result/4" }, { 0x2726, "MCGetDiscTOC(mcChannelNo,mcTrackNo):result/4" }, { 0x2826, "MCGetDiscID(mcChannelNo):result/4" }, + { 0x2926, "MCGetNoTracks(mcChannelNo):result" }, { 0x2A26, "MCRecord(mcChannelNo)" }, { 0x2B26, "MCStop(mcChannelNo)" }, { 0x2C26, "MCWaitRawData(mcChannelNo,@result,tickWait,termMask)" }, + { 0x2D26, "MCGetName(mcChannelNo,@PStringBuff)" }, { 0x2E26, "MCSetVolume(mcChannelNo,mcLeftVol,mcRightVol)" }, { 0x0136, "TCPIPBootInit()" }, { 0x0236, "TCPIPStartUp()" }, + { 0x0336, "TCPIPShutDown()" }, { 0x0436, "TCPIPVersion():Vers" }, { 0x0536, "TCPIPReset()" }, { 0x0636, "TCPIPStatus():ActFlg" }, { 0x0836, "TCPIPLongVersion():rVersion/4" }, + { 0x0936, "TCPIPGetConnectStatus():connectedFlag" }, { 0x0A36, "TCPIPGetErrorTable():@errTablePtr" },{ 0x0B36, "TCPIPGetReconnectStatus():reconnectFlag" },{ 0x0C36, "TCPIPReconnect(@displayPtr)" }, + { 0x0D36, "TCPIPConvertIPToHex(@cvtRecPtr,@ddippstring)" }, { 0x0E36, "TCPIPConvertIPToASCII(ipaddress/4,@ddpstring,flags):strlen" }, { 0x0F36, "TCPIPGetMyIPAddress():ipaddress/4" }, + { 0x1036, "TCPIPGetConnectMethod():method" }, { 0x1136, "TCPIPSetConnectMethod(method)" }, { 0x1236, "TCPIPConnect(@displayPtr)" }, { 0x1336, "TCPIPDisconnect(forceflag,@displayPtr)" }, + { 0x1436, "TCPIPGetMTU():mtu" }, { 0x1536, "TCPIPValidateIPCString(@cstringPtr):validFlag" }, { 0x1636, "TCPIPGetConnectData(userid,method):H" }, { 0x1736, "TCPIPSetConnectData(method,H)" }, + { 0x1836, "TCPIPGetDisconnectData(userid,method):H" }, { 0x1936, "TCPIPSetDisconnectData(method,H)" }, { 0x1A36, "TCPIPLoadPreferences()" }, { 0x1B36, "TCPIPSavePreferences()" }, + { 0x1C36, "TCPIPGetDNS(@DNSRecPtr)" }, { 0x1D36, "TCPIPSetDNS(@DNSRecPtr)" }, { 0x1E36, "TCPIPGetTuningTable(@tunePtr)" }, { 0x1F36, "TCPIPSetTuningTable(@tunePtr)" }, + { 0x2036, "TCPIPCancelDNR(@dnrBufferPtr)" }, { 0x2136, "TCPIPDNRNameToIP(@nameptr,@dnrBufferPtr)" }, { 0x2236, "TCPIPPoll()" }, { 0x2336, "TCPIPLogin(userid,destip/4,destport,defaultTOS,defaultTTL):ipid" }, + { 0x2436, "TCPIPLogout(ipid)" }, { 0x2536, "TCPIPSendICMP(ipid,@messagePtr,messageLen)" }, { 0x2636, "TCPIPSendUDP(ipid,@udpPtr,udpLen)" }, { 0x2736, "TCPIPGetDatagramCount(ipid,protocol):dgmCount" }, + { 0x2836, "TCPIPGetNextDatagram(ipid,protocol,flags):H" }, { 0x2936, "TCPIPGetLoginCount():loginCount" }, { 0x2A36, "TCPIPSendICMPEcho(ipid,seqNum)" }, + { 0x2B36, "TCPIPReceiveICMPEcho(ipid):seqNum" }, { 0x2C36, "TCPIPOpenTCP(ipid):tcpError" }, { 0x2D36, "TCPIPWriteTCP(ipid,@dataPtr,dataLength/4,pushFlag,urgentFlag):tcpError" }, + { 0x2E36, "TCPIPReadTCP(ipid,buffType,buffData/4,buffLen/4,@rrBuffPtr):tcpError" }, { 0x2F36, "TCPIPCloseTCP(ipid):tcpError" }, { 0x3036, "TCPIPAbortTCP(ipid):tcpError" }, + { 0x3136, "TCPIPStatusTCP(ipid,@srBuffPtr):tcpError" }, { 0x3236, "TCPIPGetSourcePort(ipid):sourcePort" }, { 0x3336, "TCPIPGetTOS(ipid):TOS" }, { 0x3436, "TCPIPSetTOS(ipid,TOS)" }, + { 0x3536, "TCPIPGetTTL(ipid):TTL" }, { 0x3636, "TCPIPSetTTL(ipid,TTL)" }, { 0x3736, "TCPIPSetSourcePort(ipid,sourcePort)" }, { 0x3836, "TCPIPSetMyIPAddress(ipaddress/4)" }, + { 0x3936, "TCPIPGetDP():dp" }, { 0x3A36, "TCPIPGetDebugHex():debugFlag" }, { 0x3B36, "TCPIPDebugHex(debugFlag)" }, { 0x3C36, "TCPIPGetDebugTCP():debugFlag" }, + { 0x3D36, "TCPIPDebugTCP(debugFlag)" }, { 0x3E36, "TCPIPGetUserRecord(ipid):userRecEntry/4" }, { 0x3F36, "TCPIPConvertIPCToHex(@cvtRecPtr,@ddipcstring)" }, + { 0x4036, "TCPIPSendIPDatagram(@datagramPtr)" }, { 0x4136, "TCPIPConvertIPToClass(ipaddress/4):class" }, { 0x4236, "TCPIPGetConnectMsgFlag():conMsgFlag" }, + { 0x4336, "TCPIPSetConnectMsgFlag(conMsgFlag)" }, { 0x4436, "TCPIPGetUsername(@unBuffPtr)" }, { 0x4536, "TCPIPSetUsername(@usernamePtr)" }, { 0x4636, "TCPIPGetPassword(@pwBuffPtr)" }, + { 0x4736, "TCPIPSetPassword(@passwordPtr)" }, { 0x4836, "TCPIPValidateIPString(@pstringPtr):validFlag" }, { 0x4936, "TCPIPGetUserStatistic(ipid,statisticNum):statistic/4" },{ 0x4A36, "TCPIPGetLinkVariables():@variablesPtr" }, + { 0x4B36, "TCPIPEditLinkConfig(connectHandle/4,disconnectHandle/4)" }, { 0x4C36, "TCPIPGetModuleNames():@moduleListPtr" }, { 0x4D36, "TCPIPRebuildModuleList()" }, + { 0x4E36, "TCPIPListenTCP(ipid):tcpError" }, { 0x4F36, "TCPIPAcceptTCP(ipid,reserved):newipid" }, { 0x5036, "TCPIPSetNewDestination(ipid,destip/4,destport)" },{ 0x5136, "TCPIPGetHostName(@hnBuffPtr)" }, + { 0x5236, "TCPIPSetHostName(@hostNamePtr)" }, { 0x5336, "TCPIPStatusUDP(ipid,@udpVarsPtr)" }, { 0x5436, "TCPIPGetLinkLayer(@linkInfoBlkPtr)" }, { 0x5536, "TCPIPPtrToPtr(@from,@to,len/4)" }, + { 0x5636, "TCPIPPtrToPtrNeg(@fromend,@toend,len/4)" },{ 0x5736, "TCPIPGetAuthMessage(userid):authMsgHandle/4" }, + { 0x5836, "TCPIPConvertIPToCASCII(ipaddress/4,@ddcstring,flags):strlen" },{ 0x5936, "TCPIPMangleDomainName(flags,@dnPstringPtr):port" }, + { 0x5A36, "TCPIPGetAliveFlag():aliveFlag" },{ 0x5B36, "TCPIPSetAliveFlag(aliveFlag)" },{ 0x5C36, "TCPIPGetAliveMinutes():aliveMinutes" }, + { 0x5D36, "TCPIPSetAliveMinutes(aliveMinutes)" },{ 0x5E36, "TCPIPReadLineTCP(ipid,@delimitStrPtr,buffType,buffData/4,buffLen/4,@rrBuffPtr):tcpError" }, + { 0x5F36, "TCPIPGetBootConnectFlag():bootConnectFlag" }, { 0x6036, "TCPIPSetBootConnectFlag(bootConnectFlag)" }, { 0x6136, "TCPIPSetUDPDispatch(ipid,dispatchFlag)" }, + { 0x6236, "TCPIPGetDestination(ipid,@destRecPtr)" }, { 0x6336, "TCPIPGetUserEventTrigger(triggerNumber,ipid):triggerProcPtr/4" }, { 0x6436, "TCPIPSetUserEventTrigger(triggerNumber,ipid,@triggerProcPtr)" }, + { 0x6536, "TCPIPGetSysEventTrigger(triggerNumber):triggerProcPtr/4" }, { 0x6636, "TCPIPSetSysEventTrigger(triggerNumber,@triggerProcPtr)" }, { 0x6736, "TCPIPGetDNRTimeouts(@dnrTimeoutsBuffPtr)" }, + { 0x6836, "TCPIPSetDNRTimeouts(@dnrTimeoutsBuffPtr)" }, + + { 0xffff, "" } +}; + +static const struct dasm_data gsos_calls[] = +{ + { 0x0001, "CREATE" }, { 0x0002, "DESTROY" }, { 0x0004, "CHANGE_PATH" }, { 0x0005, "SET_FILE_INFO" }, + { 0x0006, "GET_FILE_INFO" }, { 0x0008, "VOLUME" }, { 0x0009, "SET_PREFIX" }, { 0x000A, "GET_PREFIX" }, + { 0x000B, "CLEAR_BACKUP_BIT" }, { 0x0010, "OPEN" }, { 0x0011, "NEWLINE" }, { 0x0012, "READ" }, + { 0x0013, "WRITE" }, { 0x0014, "CLOSE" }, { 0x0015, "FLUSH" }, { 0x0016, "SET_MARK" }, + { 0x0017, "GET_MARK" }, { 0x0018, "SET_EOF" }, { 0x0019, "GET_EOF" }, { 0x001A, "SET_LEVEL" }, + { 0x001B, "GET_LEVEL" }, { 0x001C, "GET_DIR_ENTRY" }, { 0x0020, "GET_DEV_NUM" }, { 0x0021, "GET_LAST_DEV" }, + { 0x0022, "READ_BLOCK" }, { 0x0023, "WRITE_BLOCK" }, { 0x0024, "FORMAT" }, { 0x0025, "ERASE_DISK" }, + { 0x0027, "GET_NAME" }, { 0x0028, "GET_BOOT_VOL" }, { 0x0029, "QUIT" }, { 0x002A, "GET_VERSION" }, + { 0x002C, "D_INFO" }, { 0x0031, "ALLOC_INTERRUPT" }, { 0x0032, "DEALLOC_INTERRUPT" }, { 0x2001, "CreateGS" }, + { 0x2002, "DestroyGS" }, { 0x2003, "OSShutdownGS" }, { 0x2004, "ChangePathGS" }, { 0x2005, "SetFileInfoGS" }, + { 0x2006, "GetFileInfoGS" }, { 0x2007, "JudgeNameGS" }, { 0x2008, "VolumeGS" }, { 0x2009, "SetPrefixGS" }, + { 0x200A, "GetPrefixGS" }, { 0x200B, "ClearBackupGS" }, { 0x200C, "SetSysPrefsGS" }, { 0x200D, "NullGS" }, + { 0x200E, "ExpandPathGS" }, { 0x200F, "GetSysPrefsGS" }, { 0x2010, "OpenGS" }, { 0x2011, "NewLineGS" }, + { 0x2012, "ReadGS" }, { 0x2013, "WriteGS" }, { 0x2014, "CloseGS" }, { 0x2015, "FlushGS" }, + { 0x2016, "SetMarkGS" }, { 0x2017, "GetMarkGS" }, { 0x2018, "SetEOFGS" }, { 0x2019, "GetEOFGS" }, + { 0x201A, "SetLevelGS" }, { 0x201B, "GetLevelGS" }, { 0x201C, "GetDirEntryGS" }, { 0x201D, "BeginSessionGS" }, + { 0x201E, "EndSessionGS" }, { 0x201F, "SessionStatusGS" }, { 0x2020, "GetDevNumberGS" }, { 0x2024, "FormatGS" }, + { 0x2025, "EraseDiskGS" }, { 0x2026, "ResetCacheGS" }, { 0x2027, "GetNameGS" }, { 0x2028, "GetBootvolGS" }, + { 0x2029, "QuitGS" }, { 0x202A, "GetVersionGS" }, { 0x202B, "GetFSTInfoGS" }, { 0x202C, "DInfoGS" }, + { 0x202D, "DStatusGS" }, { 0x202E, "DControlGS" }, { 0x202F, "DReadGS" }, { 0x2030, "DWriteGS" }, + { 0x2031, "BindIntGS" }, { 0x2032, "UnbindIntGS" }, { 0x2033, "FSTSpecificGS" }, { 0x2034, "AddNotifyProcGS" }, + { 0x2035, "DelNotifyProcGS" }, { 0x2036, "DRenameGS" }, { 0x2037, "GetStdRefNumGS" }, { 0x2038, "GetRefNumGS" }, + { 0x2039, "GetRefInfoGS" }, { 0x203A, "SetStdRefNumGS" }, + + { 0xffff, "" } +}; + +static const struct dasm_data32 gs_vectors[] = +{ + { 0xE10000, "System Tool dispatcher" }, { 0xE10004, "System Tool dispatcher, glue entry" }, { 0xE10008, "User Tool dispatcher" }, { 0xE1000C, "User Tool dispatcher, glue entry" }, + { 0xE10010, "Interrupt mgr" }, { 0xE10014, "COP mgr" }, { 0xE10018, "Abort mgr" }, { 0xE1001C, "System Death mgr" }, { 0xE10020, "AppleTalk interrupt" }, + { 0xE10024, "Serial interrupt" }, { 0xE10028, "Scanline interrupt" }, { 0xE1002C, "Sound interrupt" }, { 0xE10030, "VertBlank interrupt" }, { 0xE10034, "Mouse interrupt" }, + { 0xE10038, "1/4 sec interrupt" }, { 0xE1003C, "Keyboard interrupt" }, { 0xE10040, "ADB Response byte int" }, { 0xE10044, "ADB SRQ int" }, { 0xE10048, "Desk Acc mgr" }, + { 0xE1004C, "FlushBuffer handler" }, { 0xE10050, "KbdMicro interrupt" }, { 0xE10054, "1 sec interrupt" }, { 0xE10058, "External VGC int" }, { 0xE1005C, "other interrupt" }, + { 0xE10060, "Cursor update" }, { 0xE10064, "IncBusy" }, { 0xE10068, "DecBusy" }, { 0xE1006C, "Bell vector" }, { 0xE10070, "Break vector" }, { 0xE10074, "Trace vector" }, + { 0xE10078, "Step vector" }, { 0xE1007C, "[install ROMdisk]" }, { 0xE10080, "ToWriteBram" }, { 0xE10084, "ToReadBram" }, { 0xE10088, "ToWriteTime" }, + { 0xE1008C, "ToReadTime" }, { 0xE10090, "ToCtrlPanel" }, { 0xE10094, "ToBramSetup" }, { 0xE10098, "ToPrintMsg8" }, { 0xE1009C, "ToPrintMsg16" }, { 0xE100A0, "Native Ctrl-Y" }, + { 0xE100A4, "ToAltDispCDA" }, { 0xE100A8, "ProDOS 16 [inline parms]" }, { 0xE100AC, "OS vector" }, { 0xE100B0, "GS/OS(@parms,call) [stack parms]" }, + { 0xE100B4, "OS_P8_Switch" }, { 0xE100B8, "OS_Public_Flags" }, { 0xE100BC, "OS_KIND (byte: 0=P8,1=P16)" }, { 0xE100BD, "OS_BOOT (byte)" }, { 0xE100BE, "OS_BUSY (bit 15=busy)" }, + { 0xE100C0, "MsgPtr" }, { 0xe10135, "CURSOR" }, { 0xe10136, "NXTCUR" }, + { 0xE10180, "ToBusyStrip" }, { 0xE10184, "ToStrip" }, { 0xe10198, "MDISPATCH" }, { 0xe1019c, "MAINSIDEPATCH" }, + { 0xE101B2, "MidiInputPoll" }, { 0xE10200, "Memory Mover" }, { 0xE10204, "Set System Speed" }, + { 0xE10208, "Slot Arbiter" }, { 0xE10220, "HyperCard IIgs callback" }, { 0xE10224, "WordForRTL" }, { 0xE11004, "ATLK: BASIC" }, { 0xE11008, "ATLK: Pascal" }, + { 0xE1100C, "ATLK: RamGoComp" }, { 0xE11010, "ATLK: SoftReset" }, { 0xE11014, "ATLK: RamDispatch" }, { 0xE11018, "ATLK: RamForbid" }, { 0xE1101C, "ATLK: RamPermit" }, + { 0xE11020, "ATLK: ProEntry" }, { 0xE11022, "ATLK: ProDOS" }, { 0xE11026, "ATLK: SerStatus" }, { 0xE1102A, "ATLK: SerWrite" }, { 0xE1102E, "ATLK: SerRead" }, + { 0xE1103A, "ATLK: InitFileHook" }, { 0xE1103E, "ATLK: PFI Vector" }, { 0xE1D600, "ATLK: CmdTable" }, { 0xE1DA00, "ATLK: TickCount" }, + { 0xE01D00, "BRegSave" }, { 0xE01D02, "IntStatus" }, { 0xE01D03, "SVStateReg" }, { 0xE01D04, "80ColSave" }, { 0xE01D05, "LoXClampSave" }, + { 0xE01D07, "LoYClampSave" }, { 0xE01D09, "HiXClampSave" }, { 0xE01D0B, "HiYClampSave" }, { 0xE01D0D, "OutGlobals" }, { 0xE01D14, "Want40" }, + { 0xE01D16, "CursorSave" }, { 0xE01D18, "NEWVIDSave" }, { 0xE01D1A, "TXTSave" }, { 0xE01D1B, "MIXSave" }, { 0xE01D1C, "PAGE2Save" }, + { 0xE01D1D, "HIRESSave" }, { 0xE01D1E, "ALTCHARSave" }, { 0xE01D1F, "VID80Save" }, { 0xE01D20, "Int1AY" }, { 0xE01D2D, "Int1BY" }, + { 0xE01D39, "Int2AY" }, { 0xE01D4C, "Int2BY" }, { 0xE01D61, "MOUSVBLSave" }, { 0xE01D63, "DirPgSave" }, { 0xE01D65, "C3ROMSave" }, + { 0xE01D66, "Save4080" }, { 0xE01D67, "NumInts" }, { 0xE01D68, "MMode" }, { 0xE01D6A, "MyMSLOT" }, { 0xE01D6C, "Slot" }, + { 0xE01D6E, "EntryCount" }, { 0xE01D70, "BottomLine" }, { 0xE01D72, "HPos" }, { 0xE01D74, "VPos" }, { 0xE01D76, "CurScreenLoc" }, + { 0xE01D7C, "NumDAs" }, { 0xE01D7E, "LeftBorder" }, { 0xE01D80, "FirstMenuItem" }, { 0xE01D82, "IDNum" }, { 0xE01D84, "CDATabHndl" }, + { 0xE01D88, "RoomLeft" }, { 0xE01D8A, "KeyInput" }, { 0xE01D8C, "EvntRec" }, { 0xE01D8E, "Message" }, { 0xE01D92, "When" }, + { 0xE01D96, "Where" }, { 0xE01D9A, "Mods" }, { 0xE01D9C, "StackSave" }, { 0xE01D9E, "OldOutGlobals" }, { 0xE01DA2, "OldOutDevice" }, + { 0xE01DA8, "CDataBPtr" }, { 0xE01DAC, "DAStrPtr" }, { 0xE01DB0, "CurCDA" }, { 0xE01DB2, "OldOutHook" }, { 0xE01DB4, "OldInDev" }, + { 0xE01DBA, "OldInGlob" }, { 0xE01DBE, "RealDeskStat" }, { 0xE01DC0, "Next" }, { 0xE01DDE, "SchActive" }, { 0xE01DDF, "TaskQueue" }, + { 0xE01DDF, "FirstTask" }, { 0xE01DE3, "SecondTask" }, { 0xE01DED, "Scheduler" }, { 0xE01DEF, "Offset" }, { 0xE01DFF, "Lastbyte" }, + { 0xE01E04, "QD:StdText" }, { 0xE01E08, "QD:StdLine" }, { 0xE01E0C, "QD:StdRect" }, { 0xE01E10, "QD:StdRRect" }, { 0xE01E14, "QD:StdOval" }, { 0xE01E18, "QD:StdArc" }, { 0xE01E1C, "QD:StdPoly" }, + { 0xE01E20, "QD:StdRgn" }, { 0xE01E24, "QD:StdPixels" }, { 0xE01E28, "QD:StdComment" }, { 0xE01E2C, "QD:StdTxMeas" }, { 0xE01E30, "QD:StdTxBnds" }, { 0xE01E34, "QD:StdGetPic" }, + { 0xE01E38, "QD:StdPutPic" }, { 0xE01E98, "QD:ShieldCursor" }, { 0xE01E9C, "QD:UnShieldCursor" }, + { 0x010100, "MNEMSTKPTR" }, { 0x010101, "ALEMSTKPTR" }, { 0x01FC00, "SysSrv:DEV_DISPATCHER" }, { 0x01FC04, "SysSrv:CACHE_FIND_BLK" }, { 0x01FC08, "SysSrv:CACHE_ADD_BLK" }, + { 0x01FC0C, "SysSrv:CACHE_INIT" }, { 0x01FC10, "SysSrv:CACHE_SHUTDN" }, { 0x01FC14, "SysSrv:CACHE_DEL_BLK" }, { 0x01FC18, "SysSrv:CACHE_DEL_VOL" }, + { 0x01FC1C, "SysSrv:ALLOC_SEG" }, { 0x01FC20, "SysSrv:RELEASE_SEG" }, { 0x01FC24, "SysSrv:ALLOC_VCR" }, { 0x01FC28, "SysSrv:RELEASE_VCR" }, + { 0x01FC2C, "SysSrv:ALLOC_FCR" }, { 0x01FC30, "SysSrv:RELEASE_FCR" }, { 0x01FC34, "SysSrv:SWAP_OUT" }, { 0x01FC38, "SysSrv:DEREF" }, + { 0x01FC3C, "SysSrv:GET_SYS_GBUF" }, { 0x01FC40, "SysSrv:SYS_EXIT" }, { 0x01FC44, "SysSrv:SYS_DEATH" }, { 0x01FC48, "SysSrv:FIND_VCR" }, + { 0x01FC4C, "SysSrv:FIND_FCR" }, { 0x01FC50, "SysSrv:SET_SYS_SPEED" }, { 0x01FC54, "SysSrv:CACHE_FLSH_DEF" }, { 0x01FC58, "SysSrv:RENAME_VCR" }, + { 0x01FC5C, "SysSrv:RENAME_FCR" }, { 0x01FC60, "SysSrv:GET_VCR" }, { 0x01FC64, "SysSrv:GET_FCR" }, { 0x01FC68, "SysSrv:LOCK_MEM" }, + { 0x01FC6C, "SysSrv:UNLOCK_MEM" }, { 0x01FC70, "SysSrv:MOVE_INFO" }, { 0x01FC74, "SysSrv:CVT_0TO1" }, { 0x01FC78, "SysSrv:CVT_1TO0" }, + { 0x01FC7C, "SysSrv:REPLACE80" }, { 0x01FC80, "SysSrv:TO_B0_CORE" }, { 0x01FC84, "SysSrv:G_DISPATCH" }, { 0x01FC88, "SysSrv:SIGNAL" }, + { 0x01FC8C, "SysSrv:GET_SYS_BUFF" }, { 0x01FC90, "SysSrv:SET_DISK_SW" }, { 0x01FC94, "SysSrv:REPORT_ERROR" }, { 0x01FC98, "SysSrv:MOUNT_MESSAGE" }, + { 0x01FC9C, "SysSrv:FULL_ERROR" }, { 0x01FCA0, "SysSrv:RESERVED_07" }, { 0x01FCA4, "SysSrv:SUP_DRVR_DISP" }, { 0x01FCA8, "SysSrv:INSTALL_DRIVER" }, + { 0x01FCAC, "SysSrv:S_GET_BOOT_PFX" }, { 0x01FCB0, "SysSrv:S_SET_BOOT_PFX" }, { 0x01FCB4, "SysSrv:LOW_ALLOCATE" }, + { 0x01FCB8, "SysSrv:GET_STACKED_ID" }, { 0x01FCBC, "SysSrv:DYN_SLOT_ARBITER" }, { 0x01FCC0, "SysSrv:PARSE_PATH" }, + { 0x01FCC4, "SysSrv:OS_EVENT" }, { 0x01FCC8, "SysSrv:INSERT_DRIVER" }, { 0x01FCCC, "SysSrv:(device manager?)" }, + { 0x01FCD0, "SysSrv:Old Device Dispatcher" }, { 0x01FCD4, "SysSrv:INIT_PARSE_PATH" }, { 0x01FCD8, "SysSrv:UNBIND_INT_VEC" }, + { 0x01FCDC, "SysSrv:DO_INSERT_SCAN" }, { 0x01FCE0, "SysSrv:TOOLBOX_MSG" }, + + { 0xffff, "" } +}; + +offs_t apple2_common_device::com_2byte_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname) +{ + int item = 0; + + if (m_GScpu) + { + if (m_GScpu->g65816_get_reg(g65816_device::G65816_D) != 0) + { + return 0; + } + } + + u16 operand = (u16)opcodes.r8(pc+1); + while ((a2_stuff[item].addr & 0xff00) == 0) + { + if (a2_stuff[item].addr == operand) + { + stream << opname << " <" << a2_stuff[item].name; + return 2 | util::disasm_interface::SUPPORTED; + } + item++; + } + + return 0; +} + +offs_t apple2_common_device::com_3byte_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname) +{ + int item = 0; + u16 operand = opcodes.r16(pc+1); + + // check for GS-specific stores with the databank set + if (m_GScpu) + { + u32 bank = m_GScpu->g65816_get_reg(g65816_device::G65816_DB) << 16; + bank |= operand; + + int item = 0; + while (gs_vectors[item].addr != 0xffff) + { + if (gs_vectors[item].addr == bank) + { + stream << opname << " " << gs_vectors[item].name; + return 3 | util::disasm_interface::SUPPORTED; + } + item++; + } + + // if we failed the GS stuff and the DB isn't a special bank, don't match the classic A2 switches. + bank >>= 16; + bank &= 0xff; + if ((bank != 0) && (bank != 1) && (bank != 0xe0) && (bank != 0xe1)) + { + return 0; + } + } + + while (a2_stuff[item].addr != 0xffff) + { + if (a2_stuff[item].addr == operand) + { + stream << opname << " " << a2_stuff[item].name; + return 3 | util::disasm_interface::SUPPORTED; + } + item++; + } + + return 0; +} + +offs_t apple2_common_device::com_long_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname) +{ + int item = 0; + u32 operand = opcodes.r32(pc) >> 8; + while (gs_vectors[item].addr != 0xffff) + { + if (gs_vectors[item].addr == operand) + { + stream << opname << " >" << gs_vectors[item].name; + return 4 | util::disasm_interface::SUPPORTED; + } + item++; + } + + return 0; +} + +offs_t apple2_common_device::dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms) +{ + u8 opcode; + unsigned result = 0; + + opcode = opcodes.r8(pc); + + switch (opcode) + { + case 0x0d: // ORA + return com_3byte_op(stream, pc, opcodes, "ora"); + + case 0xad: // LDA + return com_3byte_op(stream, pc, opcodes, "lda"); + + case 0x8d: // STA + return com_3byte_op(stream, pc, opcodes, "sta"); + + case 0x2c: // BIT + return com_3byte_op(stream, pc, opcodes, "bit"); + + case 0x9c: // STZ + return com_3byte_op(stream, pc, opcodes, "stz"); + + case 0x20: // JSR + { + u16 operand = opcodes.r16(pc + 1); + if (operand == 0xbf00) + { + u8 p8call = opcodes.r8(pc + 3); + u16 p8params = opcodes.r16(pc + 4); + int item = 0; + + while (p8_calls[item].addr != 0xffff) + { + if (p8_calls[item].addr == p8call) + { + util::stream_format(stream, "jsr ProDOS 8: %s ($%04x)", p8_calls[item].name, p8params); + return 6 | util::disasm_interface::SUPPORTED | util::disasm_interface::STEP_OVER; + } + item++; + } + } + else + { + offs_t rv = com_3byte_op(stream, pc, opcodes, "jsr"); + + if (rv > 0) + { + rv |= util::disasm_interface::STEP_OVER; + } + return rv; + } + } + break; + + case 0x4c: // JMP + return com_3byte_op(stream, pc, opcodes, "jmp"); + + case 0x84: // STY ZP + return com_2byte_op(stream, pc, opcodes, "sty"); + + case 0x85: // STA ZP + return com_2byte_op(stream, pc, opcodes, "sta"); + + case 0xa4: // LDY ZP + return com_2byte_op(stream, pc, opcodes, "ldy"); + + case 0xa5: // LDA ZP + return com_2byte_op(stream, pc, opcodes, "lda"); + + case 0x65: // ADC ZP + return com_2byte_op(stream, pc, opcodes, "adc"); + + case 0xc5: // CMP ZP + return com_2byte_op(stream, pc, opcodes, "cmp"); + + case 0xc6: // DEC ZP + return com_2byte_op(stream, pc, opcodes, "dec"); + + case 0xe6: // INC ZP + return com_2byte_op(stream, pc, opcodes, "inc"); + + default: + break; + } + + return result; +} + +offs_t apple2_common_device::dasm_override_GS(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms) +{ + u8 opcode; + unsigned result = 0; + + assert(m_GScpu); // ensure the IIgs CPU was configured if we're using this with a IIgs + + opcode = opcodes.r8(pc); + + switch (opcode) + { + case 0x0c: // TSB + return com_3byte_op(stream, pc, opcodes, "tsb"); + + case 0xa2: // LDX + if (opcodes.r32(pc + 3) == 0xe1000022) // JSL E10000 + { + u16 toolcall = opcodes.r16(pc + 1); + int item = 0; + while (gs_tools[item].addr != 0xffff) + { + if (gs_tools[item].addr == toolcall) + { + util::stream_format(stream, "_%s (%04x)", gs_tools[item].name, toolcall); + return 7 | util::disasm_interface::SUPPORTED | util::disasm_interface::STEP_OVER; + } + item++; + } + } + break; + + case 0x22: // JSL + { + u32 operand = opcodes.r32(pc) >> 8; + if (operand == 0xe100a8) + { + u16 call = opcodes.r8(pc + 4); + u32 params = opcodes.r16(pc + 6) & 0xffffff; + int item = 0; + + while (gsos_calls[item].addr != 0xffff) + { + if (gsos_calls[item].addr == call) + { + util::stream_format(stream, "_%s %06x", gsos_calls[item].name, params); + return 10 | util::disasm_interface::SUPPORTED | util::disasm_interface::STEP_OVER; + } + item++; + } + } + offs_t rv = com_long_op(stream, pc, opcodes, "jsl"); + + if (rv > 0) + return rv | util::disasm_interface::STEP_OVER; + + // jsl to inline debug name? + if (opcodes.r8(operand) == 0x82 && opcodes.r16(operand + 3) == 0x7771) + { + int n = opcodes.r8(operand + 5); + std::string name; + for (int i = 0; i < n; ++i) + name.push_back(opcodes.r8(operand + 6 + i)); + + util::stream_format(stream, "jsl %s (%06x)", name.c_str(), operand); + return 4 | util::disasm_interface::SUPPORTED | util::disasm_interface::STEP_OVER; + } + } + break; + case 0x5c: // JML + return com_long_op(stream, pc, opcodes, "jml"); + + case 0x8f: // STA long + return com_long_op(stream, pc, opcodes, "sta"); + + case 0xaf: // LDA long + return com_long_op(stream, pc, opcodes, "lda"); + + // on IIgs, this is more likely to refer to some non-Monitor direct page, so don't do these that way + // (we need a m_maincpu so we can check the D register for a smarter version of this) + case 0x84: // STY ZP + case 0x85: // STA ZP + case 0xa4: // LDY ZP + case 0xa5: // LDA ZP + case 0x65: // ADC ZP + case 0xc5: // CMP ZP + case 0xc6: // DEC ZP + case 0xe6: // INC ZP + return dasm_override(stream, pc, opcodes, params); + + + case 0x82: // BRL + if (opcodes.r16(pc + 3) == 0x7771) + { + // inline debug name format: + // 82 xx xx brl past name + // 71 77 signature + // nn xx xx xxx pascal string + // pastname + s16 operand = opcodes.r16(pc + 1); + int n = opcodes.r8(pc + 5); + if (operand >= n) + { + std::string name; + for (int i = 0; i < n; ++i) + name.push_back(opcodes.r8(pc + 6 + i)); + + stream << name; + return (operand + 3) | util::disasm_interface::SUPPORTED; + } + } + break; + + default: + break; + } + + if (!result) + { + return dasm_override(stream, pc, opcodes, params); + } + + return result; +} diff --git a/src/mame/shared/apple2common.h b/src/mame/shared/apple2common.h new file mode 100644 index 00000000000..ba179a30ad9 --- /dev/null +++ b/src/mame/shared/apple2common.h @@ -0,0 +1,54 @@ +// license:BSD-3-Clause +// copyright-holders:R. Belmont +/********************************************************************* + + apple2common.h + + Apple II stuff shared between apple2/apple2e/apple2gs. + +*********************************************************************/ +#ifndef MAME_MACHINE_APPLE2_COMMON_H +#define MAME_MACHINE_APPLE2_COMMON_H + +#pragma once + +#include "cpu/g65816/g65816.h" + +// ======================> apple2_common_device + +class apple2_common_device : public device_t +{ +public: + // construction/destruction + apple2_common_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + template void set_GS_cputag(T &&tag) { m_GScpu.set_tag(std::forward(tag)); } + + offs_t dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); + offs_t dasm_override_GS(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_validity_check(validity_checker &valid) const override; + +private: + optional_device m_GScpu; + + double m_x_calibration = 0, m_y_calibration = 0; + double m_joystick_x1_time = 0; + double m_joystick_y1_time = 0; + double m_joystick_x2_time = 0; + double m_joystick_y2_time = 0; + + offs_t com_2byte_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname); + offs_t com_3byte_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname); + offs_t com_long_op(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const char *opname); +}; + + +// device type definition +DECLARE_DEVICE_TYPE(APPLE2_COMMON, apple2_common_device) + + +#endif // MAME_MACHINE_APPLE2_COMMON_H diff --git a/src/mame/shared/apple2video.cpp b/src/mame/shared/apple2video.cpp new file mode 100644 index 00000000000..f96b1fde45d --- /dev/null +++ b/src/mame/shared/apple2video.cpp @@ -0,0 +1,1645 @@ +// license:BSD-3-Clause +// copyright-holders:R. Belmont +/*************************************************************************** + + video/apple2.cpp + +***************************************************************************/ + +#include "emu.h" +#include "apple2video.h" + +#include "machine/ram.h" + +#include "screen.h" + +/***************************************************************************/ + + +#define BLACK 0 +#define DKRED 1 +#define DKBLUE 2 +#define PURPLE 3 +#define DKGREEN 4 +#define DKGRAY 5 +#define BLUE 6 +#define LTBLUE 7 +#define BROWN 8 +#define ORANGE 9 +#define GRAY 10 +#define PINK 11 +#define GREEN 12 +#define YELLOW 13 +#define AQUA 14 +#define WHITE 15 + +DEFINE_DEVICE_TYPE(APPLE2_VIDEO, a2_video_device, "a2video", "Apple II video") + +//------------------------------------------------- +// a2_video_device - constructor +//------------------------------------------------- + +a2_video_device::a2_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, APPLE2_VIDEO, tag, owner, clock) + , device_palette_interface(mconfig, *this) + , device_video_interface(mconfig, *this) +{ +} + +void a2_video_device::device_start() +{ + static const uint8_t hires_artifact_color_table[] = + { + BLACK, PURPLE, GREEN, WHITE, + BLACK, BLUE, ORANGE, WHITE + }; + static const uint8_t dhires_artifact_color_table[] = + { + BLACK, DKGREEN, BROWN, GREEN, + DKRED, DKGRAY, ORANGE, YELLOW, + DKBLUE, BLUE, GRAY, AQUA, + PURPLE, LTBLUE, PINK, WHITE + }; + + // generate hi-res artifact data + int i, j; + uint16_t c; + + /* 2^3 dependent pixels * 2 color sets * 2 offsets */ + m_hires_artifact_map = std::make_unique(8 * 2 * 2); + + /* build hires artifact map */ + for (i = 0; i < 8; i++) + { + for (j = 0; j < 2; j++) + { + if (i & 0x02) + { + if ((i & 0x05) != 0) + c = 3; + else + c = j ? 2 : 1; + } + else + { + if ((i & 0x05) == 0x05) + c = j ? 1 : 2; + else + c = 0; + } + m_hires_artifact_map[ 0 + j*8 + i] = hires_artifact_color_table[(c + 0) % 8]; + m_hires_artifact_map[16 + j*8 + i] = hires_artifact_color_table[(c + 4) % 8]; + } + } + + /* 2^4 dependent pixels */ + m_dhires_artifact_map = std::make_unique(16); + + /* build double hires artifact map */ + for (i = 0; i < 16; i++) + { + m_dhires_artifact_map[i] = dhires_artifact_color_table[i]; + } + + // initialise for device_palette_interface + init_palette(); + + save_item(NAME(m_page2)); + save_item(NAME(m_flash)); + save_item(NAME(m_mix)); + save_item(NAME(m_graphics)); + save_item(NAME(m_hires)); + save_item(NAME(m_dhires)); + save_item(NAME(m_80col)); + save_item(NAME(m_altcharset)); + save_item(NAME(m_an2)); + save_item(NAME(m_80store)); + save_item(NAME(m_monohgr)); + save_item(NAME(m_GSfg)); + save_item(NAME(m_GSbg)); + save_item(NAME(m_GSborder)); + save_item(NAME(m_newvideo)); + save_item(NAME(m_monochrome)); + save_item(NAME(m_rgbmode)); + save_item(NAME(m_shr_palette)); +} + +void a2_video_device::device_reset() +{ + m_page2 = false; + m_graphics = false; + m_hires = false; + m_80col = false; + m_altcharset = false; + m_dhires = false; + m_flash = false; + m_mix = false; + m_sysconfig = 0; + m_an2 = false; + m_80store = false; + m_monohgr = false; + m_newvideo = 0x01; + m_rgbmode = 3; // default to color DHGR + m_monochrome = 0; // TODO: never set, but if left uninitialized could cause the emulation to start in monochrome by accident. Default to color for now +} + +WRITE_LINE_MEMBER(a2_video_device::txt_w) +{ + if (m_graphics == state) // avoid flickering from II+ refresh polling + { + // select graphics or text mode + screen().update_now(); + m_graphics = !state; + } +} + +WRITE_LINE_MEMBER(a2_video_device::mix_w) +{ + // select mixed mode or nomix + screen().update_now(); + m_mix = state; +} + +WRITE_LINE_MEMBER(a2_video_device::scr_w) +{ + // select primary or secondary page + if (!m_80col) + screen().update_now(); + m_page2 = state; +} + +WRITE_LINE_MEMBER(a2_video_device::res_w) +{ + // select lo-res or hi-res + screen().update_now(); + m_hires = state; +} + +WRITE_LINE_MEMBER(a2_video_device::dhires_w) +{ + // select double hi-res + screen().update_now(); + + // RGB cards shift in a mode bit on the rising edge + if ((m_dhires) && (state)) + { + m_rgbmode = (m_rgbmode << 1) & 3; + m_rgbmode |= m_80col ? 1 : 0; + } + + m_dhires = !state; +} + +WRITE_LINE_MEMBER(a2_video_device::an2_w) +{ + m_an2 = state; +} + +template +void a2_video_device::plot_text_character(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg) +{ + if (iie) // IIe/IIc/IIgs + { + if (!m_altcharset) + { + if ((code >= 0x40) && (code <= 0x7f)) + { + code &= 0x3f; + + if (m_flash) + { + using std::swap; + swap(fg, bg); + } + } + } + else + { + if ((code >= 0x60) && (code <= 0x7f)) + { + code |= 0x80; // map to lowercase normal + using std::swap; // and flip the color + std::swap(fg, bg); + } + } + } + else // original II and II Plus + { + if ((code >= 0x40) && (code <= 0x7f)) + { + if (m_flash) + { + using std::swap; + swap(fg, bg); + } + } + else if (code < 0x40) // inverse: flip FG and BG + { + using std::swap; + swap(fg, bg); + } + } + + /* look up the character data */ + u8 const *const chardata = &m_char_ptr[(code * 8)]; + + for (int y = 0; y < 8; y++) + { + for (int x = 0; x < 7; x++) + { + u16 color; + // flip and invert are template parameters, so the compiler will boil this down appropriately + if (flip) + { + if (invert) + { + color = (chardata[y] & (1 << (6 - x))) ? fg : bg; + } + else + { + color = (chardata[y] & (1 << (6 - x))) ? bg : fg; + } + } + else + { + if (invert) + { + color = (chardata[y] & (1 << x)) ? fg : bg; + } + else + { + color = (chardata[y] & (1 << x)) ? bg : fg; + } + } + + for (int i = 0; i < xscale; i++) + { + bitmap.pix(ypos + y, xpos + (x * xscale) + i) = color; + } + } + } +} + +void a2_video_device::plot_text_character_jplus(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg) +{ + if ((code >= 0x40) && (code <= 0x7f)) + { + code &= 0x3f; + if (m_flash) + { + using std::swap; + swap(fg, bg); + } + } + else if (code < 0x40) // inverse: flip FG and BG + { + using std::swap; + swap(fg, bg); + } + + if (m_an2) + { + code |= 0x80; + } + + /* look up the character data */ + uint8_t const *const chardata = &m_char_ptr[(code * 8)]; + + for (int y = 0; y < 8; y++) + { + for (int x = 0; x < 7; x++) + { + uint16_t const color = (chardata[y] & (1 << (6-x))) ? fg : bg; + + for (int i = 0; i < xscale; i++) + { + bitmap.pix(ypos + y, xpos + (x * xscale) + i) = color; + } + } + } +} + +void a2_video_device::plot_text_character_ultr(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg) +{ + if ((code >= 0x40) && (code <= 0x7f)) + { + if (m_flash) + { + using std::swap; + swap(fg, bg); + } + } + + /* look up the character data */ + uint8_t const *const chardata = &m_char_ptr[(code * 8)]; + + for (int y = 0; y < 8; y++) + { + for (int x = 1; x < 8; x++) + { + uint16_t const color = (chardata[y] & (1 << x)) ? fg : bg; + + for (int i = 0; i < xscale; i++) + { + bitmap.pix(ypos + y, xpos + ((x-1) * xscale) + i) = color; + } + } + } +} + +void a2_video_device::plot_text_characterGS(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg) +{ + if (!m_altcharset) + { + if ((code >= 0x40) && (code <= 0x7f)) + { + code &= 0x3f; + + if (m_flash) + { + using std::swap; + swap(fg, bg); + } + } + } + else + { + code |= 0x100; + } + + /* look up the character data */ + uint8_t const *const chardata = &m_char_ptr[(code * 8)]; + + for (int y = 0; y < 8; y++) + { + for (int x = 0; x < 7; x++) + { + uint16_t const color = (chardata[y] & (1 << x)) ? bg : fg; + + for (int i = 0; i < xscale; i++) + { + bitmap.pix(ypos + y, xpos + (x * xscale) + i) = color; + } + } + } +} + +void a2_video_device::lores_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) +{ + uint32_t const start_address = m_80store ? 0x400 : m_page2 ? 0x0800 : 0x0400; + int fg = 0; + + switch (m_sysconfig & 0x03) + { + case 0: case 4: fg = WHITE; break; + case 1: fg = WHITE; break; + case 2: fg = GREEN; break; + case 3: fg = ORANGE; break; + } + + /* perform adjustments */ + beginrow = (std::max)(beginrow, cliprect.top()); + endrow = (std::min)(endrow, cliprect.bottom()); + const int startrow = (beginrow / 8) * 8; + const int stoprow = ((endrow / 8) + 1) * 8; + const int startcol = (cliprect.left() / 14); + const int stopcol = ((cliprect.right() / 14) + 1); + + //printf("GR: row %d startcol %d stopcol %d left %d right %d\n", beginrow, startcol, stopcol, cliprect.left(), cliprect.right()); + + if (!(m_sysconfig & 0x03)) // color + { + for (int row = startrow; row <= stoprow; row += 8) + { + for (int col = startcol; col < stopcol; col++) + { + /* calculate adderss */ + uint32_t const address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); + + /* perform the lookup */ + uint8_t const code = m_ram_ptr[address]; + + /* and now draw */ + for (int y = 0; y < 4; y++) + { + if (((row + y) >= beginrow) && ((row + y) <= endrow)) + { + for (int x = 0; x < 14; x++) + { + bitmap.pix(row + y, col * 14 + x) = (code >> 0) & 0x0F; + } + } + } + for (int y = 4; y < 8; y++) + { + if (((row + y) >= beginrow) && ((row + y) <= endrow)) + { + for (int x = 0; x < 14; x++) + { + bitmap.pix(row + y, col * 14 + x) = (code >> 4) & 0x0F; + } + } + } + } + } + } + else + { + for (int row = startrow; row <= stoprow; row += 8) + { + for (int col = startcol; col < stopcol; col++) + { + uint8_t bits; + + /* calculate adderss */ + uint32_t const address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); + + /* perform the lookup */ + uint8_t const code = m_ram_ptr[address]; + + bits = (code >> 0) & 0x0F; + /* and now draw */ + for (int y = 0; y < 4; y++) + { + if (((row + y) >= beginrow) && ((row + y) <= endrow)) + { + for (int x = 0; x < 14; x++) + { + if (col & 1) + { + bitmap.pix(row + y, col * 14 + x) = bits & (1 << ((x+2) % 4)) ? fg : 0; + } + else + { + bitmap.pix(row + y, col * 14 + x) = bits & (1 << (x % 4)) ? fg : 0; + } + } + } + } + + bits = (code >> 4) & 0x0F; + for (int y = 4; y < 8; y++) + { + if (((row + y) >= beginrow) && ((row + y) <= endrow)) + { + for (int x = 0; x < 14; x++) + { + if (col & 1) + { + bitmap.pix(row + y, col * 14 + x) = bits & (1 << ((x+2) % 4)) ? fg : 0; + } + else + { + bitmap.pix(row + y, col * 14 + x) = bits & (1 << (x % 4)) ? fg : 0; + } + } + } + } + } + } + } +} + +void a2_video_device::dlores_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) +{ + uint32_t const start_address = m_page2 ? 0x0800 : 0x0400; + static const int aux_colors[16] = { 0, 2, 4, 6, 8, 0xa, 0xc, 0xe, 1, 3, 5, 7, 9, 0xb, 0xd, 0xf }; + int fg = 0; + + switch (m_sysconfig & 0x03) + { + case 0: case 4: fg = WHITE; break; + case 1: fg = WHITE; break; + case 2: fg = GREEN; break; + case 3: fg = ORANGE; break; + } + + /* perform adjustments */ + beginrow = (std::max)(beginrow, cliprect.top() - (cliprect.top() % 8)); + endrow = (std::min)(endrow, cliprect.bottom() - (cliprect.bottom() % 8) + 7); + + const int startrow = (beginrow / 8) * 8; + const int stoprow = ((endrow / 8) + 1) * 8; + const int startcol = (cliprect.left() / 14); + const int stopcol = ((cliprect.right() / 14) + 1); + + if (!(m_sysconfig & 0x03)) + { + for (int row = startrow; row <= stoprow; row += 8) + { + for (int col = startcol; col < stopcol; col++) + { + /* calculate adderss */ + uint32_t const address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); + + /* perform the lookup */ + uint8_t const code = m_ram_ptr[address]; + uint8_t const auxcode = m_aux_ptr[address]; + + /* and now draw */ + for (int y = 0; y < 4; y++) + { + if (((row + y) >= beginrow) && ((row + y) <= endrow)) + { + uint16_t *vram = &bitmap.pix(row + y, (col * 14)); + + *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 0) & 0x0F]; + *vram++ = (code >> 0) & 0x0F; + *vram++ = (code >> 0) & 0x0F; + *vram++ = (code >> 0) & 0x0F; + *vram++ = (code >> 0) & 0x0F; + *vram++ = (code >> 0) & 0x0F; + *vram++ = (code >> 0) & 0x0F; + *vram++ = (code >> 0) & 0x0F; + } + } + for (int y = 4; y < 8; y++) + { + if (((row + y) >= beginrow) && ((row + y) <= endrow)) + { + uint16_t *vram = &bitmap.pix(row + y, (col * 14)); + + *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; + *vram++ = aux_colors[(auxcode >> 4) & 0x0F]; + *vram++ = (code >> 4) & 0x0F; + *vram++ = (code >> 4) & 0x0F; + *vram++ = (code >> 4) & 0x0F; + *vram++ = (code >> 4) & 0x0F; + *vram++ = (code >> 4) & 0x0F; + *vram++ = (code >> 4) & 0x0F; + *vram++ = (code >> 4) & 0x0F; + } + } + } + } + } + else + { + for (int row = startrow; row < stoprow; row += 8) + { + for (int col = 0; col < 40; col++) + { + uint8_t bits, abits; + + /* calculate adderss */ + uint32_t const address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); + + /* perform the lookup */ + uint8_t const code = m_ram_ptr[address]; + uint8_t const auxcode = m_aux_ptr[address]; + + bits = (code >> 0) & 0x0F; + abits = (auxcode >> 0) & 0x0F; + + /* and now draw */ + for (int y = 0; y < 4; y++) + { + if (((row + y) >= beginrow) && ((row + y) <= endrow)) + { + uint16_t *vram = &bitmap.pix(row + y, (col * 14)); + + if (col & 1) + { + *vram++ = abits & (1 << 2) ? fg : 0; + *vram++ = abits & (1 << 3) ? fg : 0; + *vram++ = abits & (1 << 0) ? fg : 0; + *vram++ = abits & (1 << 1) ? fg : 0; + *vram++ = abits & (1 << 2) ? fg : 0; + *vram++ = abits & (1 << 3) ? fg : 0; + *vram++ = abits & (1 << 0) ? fg : 0; + *vram++ = bits & (1 << 1) ? fg : 0; + *vram++ = bits & (1 << 2) ? fg : 0; + *vram++ = bits & (1 << 3) ? fg : 0; + *vram++ = bits & (1 << 0) ? fg : 0; + *vram++ = bits & (1 << 1) ? fg : 0; + *vram++ = bits & (1 << 2) ? fg : 0; + *vram++ = bits & (1 << 3) ? fg : 0; + } + else + { + *vram++ = abits & (1 << 0) ? fg : 0; + *vram++ = abits & (1 << 1) ? fg : 0; + *vram++ = abits & (1 << 2) ? fg : 0; + *vram++ = abits & (1 << 3) ? fg : 0; + *vram++ = abits & (1 << 0) ? fg : 0; + *vram++ = abits & (1 << 1) ? fg : 0; + *vram++ = abits & (1 << 2) ? fg : 0; + *vram++ = bits & (1 << 0) ? fg : 0; + *vram++ = bits & (1 << 1) ? fg : 0; + *vram++ = bits & (1 << 2) ? fg : 0; + *vram++ = bits & (1 << 3) ? fg : 0; + *vram++ = bits & (1 << 0) ? fg : 0; + *vram++ = bits & (1 << 1) ? fg : 0; + *vram++ = bits & (1 << 2) ? fg : 0; + } + } + } + + bits = (code >> 4) & 0x0F; + abits = (auxcode >> 4) & 0x0F; + + for (int y = 4; y < 8; y++) + { + if (((row + y) >= beginrow) && ((row + y) <= endrow)) + { + uint16_t *vram = &bitmap.pix(row + y, (col * 14)); + + if (col & 1) + { + *vram++ = abits & (1 << 2) ? fg : 0; + *vram++ = abits & (1 << 3) ? fg : 0; + *vram++ = abits & (1 << 0) ? fg : 0; + *vram++ = abits & (1 << 1) ? fg : 0; + *vram++ = abits & (1 << 2) ? fg : 0; + *vram++ = abits & (1 << 3) ? fg : 0; + *vram++ = abits & (1 << 0) ? fg : 0; + *vram++ = bits & (1 << 1) ? fg : 0; + *vram++ = bits & (1 << 2) ? fg : 0; + *vram++ = bits & (1 << 3) ? fg : 0; + *vram++ = bits & (1 << 0) ? fg : 0; + *vram++ = bits & (1 << 1) ? fg : 0; + *vram++ = bits & (1 << 2) ? fg : 0; + *vram++ = bits & (1 << 3) ? fg : 0; + } + else + { + *vram++ = abits & (1 << 0) ? fg : 0; + *vram++ = abits & (1 << 1) ? fg : 0; + *vram++ = abits & (1 << 2) ? fg : 0; + *vram++ = abits & (1 << 3) ? fg : 0; + *vram++ = abits & (1 << 0) ? fg : 0; + *vram++ = abits & (1 << 1) ? fg : 0; + *vram++ = abits & (1 << 2) ? fg : 0; + *vram++ = bits & (1 << 0) ? fg : 0; + *vram++ = bits & (1 << 1) ? fg : 0; + *vram++ = bits & (1 << 2) ? fg : 0; + *vram++ = bits & (1 << 3) ? fg : 0; + *vram++ = bits & (1 << 0) ? fg : 0; + *vram++ = bits & (1 << 1) ? fg : 0; + *vram++ = bits & (1 << 2) ? fg : 0; + } + } + } + } + } + } +} + +template +void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) +{ + uint8_t const *const aux_page = m_aux_ptr ? m_aux_ptr : m_ram_ptr; + + uint32_t const start_address = m_page2 ? 0x800 : 0x400; + + beginrow = (std::max)(beginrow, cliprect.top() - (cliprect.top() % 8)); + endrow = (std::min)(endrow, cliprect.bottom() - (cliprect.bottom() % 8) + 7); + + const int startrow = (beginrow / 8) * 8; + const int stoprow = ((endrow / 8) + 1) * 8; + const int startcol = (cliprect.left() / 14); + const int stopcol = ((cliprect.right() / 14) + 1); + + // printf("TXT: row %d startcol %d stopcol %d left %d right %d\n", beginrow, startcol, stopcol, cliprect.left(), cliprect.right()); + + int fg = 0; + int bg = 0; + switch (m_sysconfig & 0x03) + { + case 0: + case 4: + fg = WHITE; + break; + case 1: + fg = WHITE; + break; + case 2: + fg = GREEN; + break; + case 3: + fg = ORANGE; + break; + } + + for (int row = startrow; row < stoprow; row += 8) + { + if ((iie) && (m_80col)) + { + for (int col = startcol; col < stopcol; col++) + { + /* calculate address */ + uint32_t const address = start_address + ((((row / 8) & 0x07) << 7) | (((row / 8) & 0x18) * 5 + col)); + + plot_text_character(bitmap, col * 14, row, 1, aux_page[address], + fg, bg); + plot_text_character(bitmap, col * 14 + 7, row, 1, m_ram_ptr[address], + fg, bg); + } + } + else + { + for (int col = startcol; col < stopcol; col++) + { + /* calculate address */ + uint32_t const address = start_address + ((((row / 8) & 0x07) << 7) | (((row / 8) & 0x18) * 5 + col)); + if (((m_sysconfig & 7) == 4) && (m_dhires)) + { + u8 tmp = aux_page[address]; + fg = tmp >> 4; + bg = tmp & 0xf; + } + + plot_text_character(bitmap, col * 14, row, 2, m_ram_ptr[address], fg, bg); + } + } + } +} + +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); +template void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); + +void a2_video_device::text_update_jplus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) +{ + int row, col; + uint32_t start_address = m_page2 ? 0x800 : 0x400; + uint32_t address; + int fg = 0; + int bg = 0; + + beginrow = (std::max)(beginrow, cliprect.top() - (cliprect.top() % 8)); + endrow = (std::min)(endrow, cliprect.bottom() - (cliprect.bottom() % 8) + 7); + + const int startrow = (beginrow / 8) * 8; + const int stoprow = ((endrow / 8) + 1) * 8; + + switch (m_sysconfig & 0x03) + { + case 0: fg = WHITE; break; + case 1: fg = WHITE; break; + case 2: fg = GREEN; break; + case 3: fg = ORANGE; break; + } + + for (row = startrow; row <= stoprow; row += 8) + { + for (col = 0; col < 40; col++) + { + /* calculate address */ + address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); + plot_text_character_jplus(bitmap, col * 14, row, 2, m_ram_ptr[address], fg, bg); + } + } +} + +void a2_video_device::text_update_ultr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) +{ + int row, col; + uint32_t start_address = m_page2 ? 0x800 : 0x400; + uint32_t address; + int fg = 0; + int bg = 0; + + beginrow = (std::max)(beginrow, cliprect.top() - (cliprect.top() % 8)); + endrow = (std::min)(endrow, cliprect.bottom() - (cliprect.bottom() % 8) + 7); + + const int startrow = (beginrow / 8) * 8; + const int stoprow = ((endrow / 8) + 1) * 8; + + switch (m_sysconfig & 0x03) + { + case 0: fg = WHITE; break; + case 1: fg = WHITE; break; + case 2: fg = GREEN; break; + case 3: fg = ORANGE; break; + } + + for (row = startrow; row <= stoprow; row += 8) + { + for (col = 0; col < 40; col++) + { + /* calculate address */ + address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)); + plot_text_character_ultr(bitmap, col * 14, row, 2, m_ram_ptr[address], fg, bg); + } + } +} + +void a2_video_device::hgr_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) +{ + int mon_type = m_sysconfig & 0x03; + + /* sanity checks */ + if (beginrow < cliprect.top()) + beginrow = cliprect.top(); + if (endrow > cliprect.bottom()) + endrow = cliprect.bottom(); + if (endrow < beginrow) + return; + + uint8_t const *const vram = &m_ram_ptr[(m_page2 ? 0x4000 : 0x2000)]; + uint8_t vram_row[42]; + vram_row[0] = 0; + vram_row[41] = 0; + + for (int row = beginrow; row <= endrow; row++) + { + for (int col = 0; col < 40; col++) + { + int const offset = ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)) | ((row & 7) << 10); + vram_row[1+col] = vram[offset]; + } + + uint16_t *p = &bitmap.pix(row); + + for (int col = 0; col < 40; col++) + { + uint32_t w = (((uint32_t) vram_row[col+0] & 0x7f) << 0) + | (((uint32_t) vram_row[col+1] & 0x7f) << 7) + | (((uint32_t) vram_row[col+2] & 0x7f) << 14); + + // verified on h/w: setting dhires w/o 80col emulates a rev. 0 Apple ][ with no orange/blue + uint16_t const *artifact_map_ptr; + if (m_dhires) + { + artifact_map_ptr = m_hires_artifact_map.get(); + } + else + { + artifact_map_ptr = &m_hires_artifact_map[((vram_row[col + 1] & 0x80) >> 7) * 16]; + } + + // CEC mono HGR mode + if ((m_monohgr) && (mon_type == 0)) + { + mon_type = 1; + } + + // IIgs $C021 monochrome HGR + if (m_monochrome & 0x80) + { + mon_type = 1; + } + + switch (mon_type) + { + case 0: + for (int b = 0; b < 7; b++) + { + if ((((col*14) + b) >= cliprect.left()) && (((col*14) + b) <= cliprect.right())) + { + uint16_t const v = artifact_map_ptr[((w >> (b + 7-1)) & 0x07) | (((b ^ col) & 0x01) << 3)]; + *(p++) = v; + *(p++) = v; + } + else + { + p++; + p++; + } + } + break; + + case 1: + w >>= 7; + if (vram_row[col+1] & 0x80) + { + p++; + } + for (int b = 0; b < 7; b++) + { + uint16_t const v = (w & 1); + w >>= 1; + if ((((col*14) + b) >= cliprect.left()) && (((col*14) + b) <= cliprect.right())) + { + *(p++) = v ? WHITE : BLACK; + *(p++) = v ? WHITE : BLACK; + } + else + { + p++; + p++; + } + } + if (vram_row[col+1] & 0x80) + { + p--; + } + break; + + case 2: + w >>= 7; + if (vram_row[col+1] & 0x80) + { + p++; + } + for (int b = 0; b < 7; b++) + { + uint16_t const v = (w & 1); + w >>= 1; + if ((((col*14) + b) >= cliprect.left()) && (((col*14) + b) <= cliprect.right())) + { + *(p++) = v ? GREEN : BLACK; + *(p++) = v ? GREEN : BLACK; + } + else + { + p++; + p++; + } + } + if (vram_row[col+1] & 0x80) + { + p--; + } + break; + + case 3: + w >>= 7; + if (vram_row[col+1] & 0x80) + { + p++; + } + for (int b = 0; b < 7; b++) + { + uint16_t const v = (w & 1); + w >>= 1; + if ((((col*14) + b) >= cliprect.left()) && (((col*14) + b) <= cliprect.right())) + { + *(p++) = v ? ORANGE : BLACK; + *(p++) = v ? ORANGE : BLACK; + } + else + { + p++; + p++; + } + } + if (vram_row[col+1] & 0x80) + { + p--; + } + break; + + } + } + } +} + +// similar to regular A2 except page 2 is at $A000 +void a2_video_device::hgr_update_tk2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) +{ + int const mon_type = m_sysconfig & 0x03; + + /* sanity checks */ + if (beginrow < cliprect.top()) + beginrow = cliprect.top(); + if (endrow > cliprect.bottom()) + endrow = cliprect.bottom(); + if (endrow < beginrow) + return; + + uint8_t const *const vram = &m_ram_ptr[(m_page2 ? 0xa000 : 0x2000)]; + + uint8_t vram_row[42]; + vram_row[0] = 0; + vram_row[41] = 0; + + for (int row = beginrow; row <= endrow; row++) + { + for (int col = 0; col < 40; col++) + { + int const offset = ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)) | ((row & 7) << 10); + vram_row[1+col] = vram[offset]; + } + + uint16_t *p = &bitmap.pix(row); + + for (int col = 0; col < 40; col++) + { + uint32_t w = (((uint32_t) vram_row[col+0] & 0x7f) << 0) + | (((uint32_t) vram_row[col+1] & 0x7f) << 7) + | (((uint32_t) vram_row[col+2] & 0x7f) << 14); + + uint16_t const *artifact_map_ptr; + switch (mon_type) + { + case 0: + artifact_map_ptr = &m_hires_artifact_map[((vram_row[col+1] & 0x80) >> 7) * 16]; + for (int b = 0; b < 7; b++) + { + uint16_t const v = artifact_map_ptr[((w >> (b + 7-1)) & 0x07) | (((b ^ col) & 0x01) << 3)]; + *(p++) = v; + *(p++) = v; + } + break; + + case 1: + w >>= 7; + if (vram_row[col] & 0x80) + { + p--; + } + for (int b = 0; b < 7; b++) + { + uint16_t const v = (w & 1); + w >>= 1; + *(p++) = v ? WHITE : BLACK; + *(p++) = v ? WHITE : BLACK; + } + if (vram_row[col] & 0x80) + { + p++; + } + break; + + case 2: + w >>= 7; + if (vram_row[col] & 0x80) + { + p--; + } + for (int b = 0; b < 7; b++) + { + uint16_t const v = (w & 1); + w >>= 1; + *(p++) = v ? GREEN : BLACK; + *(p++) = v ? GREEN : BLACK; + } + if (vram_row[col] & 0x80) + { + p++; + } + break; + + case 3: + w >>= 7; + if (vram_row[col] & 0x80) + { + p--; + } + for (int b = 0; b < 7; b++) + { + uint16_t const v = (w & 1); + w >>= 1; + *(p++) = v ? ORANGE : BLACK; + *(p++) = v ? ORANGE : BLACK; + } + if (vram_row[col] & 0x80) + { + p++; + } + break; + } + } + } +} + +void a2_video_device::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) +{ + uint16_t v; + int const page = m_page2 ? 0x4000 : 0x2000; + int mon_type = m_sysconfig & 0x03; + bool const bIsRGB = ((m_sysconfig & 7) == 4); + bool const bIsRGBMixed = ((bIsRGB) && (m_rgbmode == 1)); + + // IIgs force-monochrome-DHR setting + if (m_newvideo & 0x20) + { + mon_type = 1; + } + + // IIe RGB card monochrome DHR + if ((bIsRGB) && (m_rgbmode == 0)) + { + mon_type = 1; + } + + /* sanity checks */ + if (beginrow < cliprect.top()) + beginrow = cliprect.top(); + if (endrow > cliprect.bottom()) + endrow = cliprect.bottom(); + if (endrow < beginrow) + return; + + uint8_t const *const vram = &m_ram_ptr[page]; + uint8_t const *const vaux = (m_aux_ptr ? m_aux_ptr : vram) + page; + + uint8_t vram_row[82]; + vram_row[0] = 0; + vram_row[81] = 0; + + for (int row = beginrow; row <= endrow; row++) + { + for (int col = 0; col < 40; col++) + { + int const offset = ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)) | ((row & 7) << 10); + vram_row[1+(col*2)+0] = vaux[offset]; + vram_row[1+(col*2)+1] = vram[offset]; + } + + uint16_t *p = &bitmap.pix(row); + + // RGB DHR 160-wide mode + if ((bIsRGB) && (m_rgbmode == 2)) + { + mon_type = 4; + } + + for (int col = 0; col < 80; col++) + { + uint32_t w = (((uint32_t) vram_row[col+0] & 0x7f) << 0) + | (((uint32_t) vram_row[col+1] & 0x7f) << 7) + | (((uint32_t) vram_row[col+2] & 0x7f) << 14); + + /* + DHGR pixel layout: + column & 3 = 0 1 2 3 + nBBBAAAA nDDCCCCB nFEEEEDD nGGGGFFF + + n is don't care on the stock hardware's NTSC output. + + On RGB cards, in mixed mode (DHGR with special mode value == 1), n + controls if a pixel quad starting in that byte is color or monochrome. + Pixel quads A&B are controlled by n in byte 0, C&D by n in byte 1, + E&F by n in byte 2, and G by n in byte 3. + */ + + switch (mon_type) + { + case 0: + // every 3rd column, the first pixel quad is controlled by the previous + // byte's MSB, because we always draw 2 quads per column. + if ((bIsRGBMixed) && ((col & 3) == 3)) + { + uint32_t tw = (w >> 6); + + if (!(vram_row[col-1] & 0x80)) + { + for (int b = 0; b < 4; b++) + { + v = (tw & 1); + tw >>= 1; + *(p++) = v ? WHITE : BLACK; + } + } + else + { + for (int b = 0; b < 4; b++) + { + v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F]; + *(p++) = v; + } + } + + if (!(vram_row[col] & 0x80)) + { + for (int b = 4; b < 7; b++) + { + v = (tw & 1); + tw >>= 1; + *(p++) = v ? WHITE : BLACK; + } + } + else + { + for (int b = 4; b < 7; b++) + { + v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F]; + *(p++) = v; + } + } + } + else + { + if ((bIsRGBMixed) && !(vram_row[col] & 0x80)) + { + uint32_t tw = (w >> 6); + for (int b = 0; b < 7; b++) + { + v = (tw & 1); + tw >>= 1; + *(p++) = v ? WHITE : BLACK; + } + } + else + { + for (int b = 0; b < 7; b++) + { + v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F]; + *(p++) = v; + } + } + } + break; + + case 1: + w >>= 6; + for (int b = 0; b < 7; b++) + { + v = (w & 1); + w >>= 1; + *(p++) = v ? WHITE : BLACK; + } + break; + + case 2: + w >>= 6; + for (int b = 0; b < 7; b++) + { + v = (w & 1); + w >>= 1; + *(p++) = v ? GREEN : BLACK; + } + break; + + case 3: + w >>= 6; + for (int b = 0; b < 7; b++) + { + v = (w & 1); + w >>= 1; + *(p++) = v ? ORANGE : BLACK; + } + break; + + // RGB 160-wide mode (which has a much simpler VRAM layout) + case 4: + if (col == 0) + { + // Center the 480-wide image in the 560-wide display. + // Aspect ratio won't be perfect, but it's in range. + for (int b = 0; b < 40; b++) + { + *(p++) = BLACK; + } + } + v = vram_row[col]; + *(p++) = v & 0xf; + *(p++) = v & 0xf; + *(p++) = v & 0xf; + v >>= 4; + *(p++) = v & 0xf; + *(p++) = v & 0xf; + *(p++) = v & 0xf; + break; + } + } + + if (mon_type == 4) + { + for (int b = 0; b < 40; b++) + { + *(p++) = BLACK; + } + } + } +} + +/* + Latest Apple II NTSC palette from "Apple II Video Display Theory" + https://docs.google.com/spreadsheets/d/1rKR6A_bVniSCtIP_rrv8QLWJdj4h6jEU1jJj0AebWwg/ +*/ +static const rgb_t apple2_palette[] = +{ + rgb_t::black(), + rgb_t(0xa7, 0x0b, 0x40), /* Dark Red */ + rgb_t(0x40, 0x1c, 0xf7), /* Dark Blue */ + rgb_t(0xe6, 0x28, 0xff), /* Purple */ + rgb_t(0x00, 0x74, 0x40), /* Dark Green */ + rgb_t(0x80, 0x80, 0x80), /* Dark Gray */ + rgb_t(0x19, 0x90, 0xff), /* Medium Blue */ + rgb_t(0xbf, 0x9c, 0xff), /* Light Blue */ + rgb_t(0x40, 0x63, 0x00), /* Brown */ + rgb_t(0xe6, 0x6f, 0x00), /* Orange */ + rgb_t(0x80, 0x80, 0x80), /* Light Grey */ + rgb_t(0xff, 0x8b, 0xbf), /* Pink */ + rgb_t(0x19, 0xd7, 0x00), /* Light Green */ + rgb_t(0xbf, 0xe3, 0x08), /* Yellow */ + rgb_t(0x58, 0xf4, 0xbf), /* Aquamarine */ + rgb_t(0xff, 0xff, 0xff) /* White */ +}; + +void a2_video_device::init_palette() +{ + for (int i = 0; i < std::size(apple2_palette); i++) + set_pen_color(i, apple2_palette[i]); +} + +uint32_t a2_video_device::palette_entries() const +{ + return std::size(apple2_palette); +} + +uint32_t a2_video_device::screen_update_GS(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + int const beamy = cliprect.top(); + + if (m_newvideo & 0x80) + { + // in top or bottom border? + if ((beamy < BORDER_TOP) || (beamy >= 200+BORDER_TOP)) + { + // don't draw past the bottom border + if (beamy >= 231+BORDER_TOP) + { + return 0; + } + + uint32_t *const scanline = &bitmap.pix(beamy); + for (int col = 0; col < BORDER_LEFT+BORDER_RIGHT+640; col++) + { + scanline[col] = m_GSborder_colors[m_GSborder]; + } + } + else // regular screen area + { + int const shrline = beamy - BORDER_TOP; + + uint8_t scb; + if (shrline & 1) + { + scb = m_aux_ptr[0x9e80 + (shrline >> 1)]; + } + else + { + scb = m_aux_ptr[0x5e80 + (shrline >> 1)]; + } + int const palette = ((scb & 0x0f) << 4); + + uint8_t const *const vram = &m_aux_ptr[0x2000 + (shrline * 80)]; + uint8_t const *const vram2 = &m_aux_ptr[0x6000 + (shrline * 80)]; + + uint32_t *const scanline = &bitmap.pix(beamy); + + // draw left and right borders + for (int col = 0; col < BORDER_LEFT; col++) + { + scanline[col] = m_GSborder_colors[m_GSborder]; + scanline[col+BORDER_LEFT+640] = m_GSborder_colors[m_GSborder]; + } + + if (scb & 0x80) // 640 mode + { + for (int col = 0; col < 80; col++) + { + uint8_t b = vram[col]; + scanline[col * 8 + 0 + BORDER_LEFT] = m_shr_palette[palette + 0 + ((b >> 6) & 0x03)]; + scanline[col * 8 + 1 + BORDER_LEFT] = m_shr_palette[palette + 4 + ((b >> 4) & 0x03)]; + scanline[col * 8 + 2 + BORDER_LEFT] = m_shr_palette[palette + 8 + ((b >> 2) & 0x03)]; + scanline[col * 8 + 3 + BORDER_LEFT] = m_shr_palette[palette + 12 + ((b >> 0) & 0x03)]; + + b = vram2[col]; + scanline[col * 8 + 4 + BORDER_LEFT] = m_shr_palette[palette + 0 + ((b >> 6) & 0x03)]; + scanline[col * 8 + 5 + BORDER_LEFT] = m_shr_palette[palette + 4 + ((b >> 4) & 0x03)]; + scanline[col * 8 + 6 + BORDER_LEFT] = m_shr_palette[palette + 8 + ((b >> 2) & 0x03)]; + scanline[col * 8 + 7 + BORDER_LEFT] = m_shr_palette[palette + 12 + ((b >> 0) & 0x03)]; + } + } + else // 320 mode + { + // the low 5 bits of the SCB determine the initial fillmode color + // for the scanline (hardware testing by John Brooks) + static const uint32_t fillmode_init[32] = + { + 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, + }; + + uint32_t last_pixel = fillmode_init[scb & 0x1f]; + for (int col = 0; col < 80; col++) + { + uint8_t b; + uint32_t pixel; + + b = vram[col]; + pixel = (b >> 4) & 0x0f; + + if ((scb & 0x20) && !pixel) + pixel = last_pixel; + else + last_pixel = pixel; + pixel += palette; + scanline[col * 8 + 0 + BORDER_LEFT] = m_shr_palette[pixel]; + scanline[col * 8 + 1 + BORDER_LEFT] = m_shr_palette[pixel]; + + pixel = (b >> 0) & 0x0f; + + if ((scb & 0x20) && !pixel) + pixel = last_pixel; + else + last_pixel = pixel; + pixel += palette; + scanline[col * 8 + 2 + BORDER_LEFT] = m_shr_palette[pixel]; + scanline[col * 8 + 3 + BORDER_LEFT] = m_shr_palette[pixel]; + + b = vram2[col]; + pixel = (b >> 4) & 0x0f; + + if ((scb & 0x20) && !pixel) + pixel = last_pixel; + else + last_pixel = pixel; + pixel += palette; + scanline[col * 8 + 4 + BORDER_LEFT] = m_shr_palette[pixel]; + scanline[col * 8 + 5 + BORDER_LEFT] = m_shr_palette[pixel]; + + pixel = (b >> 0) & 0x0f; + + if ((scb & 0x20) && !pixel) + pixel = last_pixel; + else + last_pixel = pixel; + pixel += palette; + scanline[col * 8 + 6 + BORDER_LEFT] = m_shr_palette[pixel]; + scanline[col * 8 + 7 + BORDER_LEFT] = m_shr_palette[pixel]; + } + } + } + } + else + { + if (beamy >= BORDER_TOP) + { + rectangle const new_cliprect(0, 559, cliprect.top() - BORDER_TOP, cliprect.bottom() - BORDER_TOP); + screen_update_GS_8bit(screen, *m_8bit_graphics, new_cliprect); + } + + if ((beamy < (BORDER_TOP+4)) || (beamy >= (192+4+BORDER_TOP))) + { + if (beamy >= (231+BORDER_TOP)) + { + return 0; + } + + uint32_t *const scanline = &bitmap.pix(beamy); + for (int col = 0; col < BORDER_LEFT+BORDER_RIGHT+640; col++) + { + scanline[col] = m_GSborder_colors[m_GSborder]; + } + } + else + { + uint32_t *const scanline = &bitmap.pix(beamy); + + // draw left and right borders + for (int col = 0; col < BORDER_LEFT + 40; col++) + { + scanline[col] = m_GSborder_colors[m_GSborder]; + scanline[col+BORDER_LEFT+600] = m_GSborder_colors[m_GSborder]; + } + + uint16_t *a2pixel = &m_8bit_graphics->pix(beamy-(BORDER_TOP+4)); + for (int x = 0; x < 560; x++) + { + scanline[40 + BORDER_LEFT + x] = m_GSborder_colors[*a2pixel++]; + } + } + } + return 0; +} + +uint32_t a2_video_device::screen_update_GS_8bit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + bool old_page2 = m_page2; + + if (cliprect.bottom() > 191) + { + return 0; + } + + // don't display page2 if 80store is set (we just saved the previous value, don't worry) + if (m_80store) + { + m_page2 = false; + } + + // always update the flash timer here so it's smooth regardless of mode switches + m_flash = ((machine().time() * 4).seconds() & 1) ? true : false; + + if (m_graphics) + { + if (m_hires) + { + if (m_mix) + { + if ((m_dhires) && (m_80col)) + { + dhgr_update(screen, bitmap, cliprect, 0, 159); + } + else + { + hgr_update(screen, bitmap, cliprect, 0, 159); + } + text_updateGS(screen, bitmap, cliprect, 160, 191); + } + else + { + if ((m_dhires) && (m_80col)) + { + dhgr_update(screen, bitmap, cliprect, cliprect.top(), cliprect.bottom()); + } + else + { + hgr_update(screen, bitmap, cliprect, cliprect.top(), cliprect.bottom()); + } + } + } + else // lo-res + { + if (m_mix) + { + if ((m_dhires) && (m_80col)) + { + dlores_update(screen, bitmap, cliprect, 0, 159); + } + else + { + lores_update(screen, bitmap, cliprect, 0, 159); + } + + text_updateGS(screen, bitmap, cliprect, 160, 191); + } + else + { + if ((m_dhires) && (m_80col)) + { + dlores_update(screen, bitmap, cliprect, cliprect.top(), cliprect.bottom()); + } + else + { + lores_update(screen, bitmap, cliprect, cliprect.top(), cliprect.bottom()); + } + } + } + } + else + { + text_updateGS(screen, bitmap, cliprect, cliprect.top(), cliprect.bottom()); + } + + m_page2 = old_page2; + + return 0; +} + +void a2_video_device::text_updateGS(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow) +{ + uint8_t const *const aux_page = m_aux_ptr ? m_aux_ptr : m_ram_ptr; + + uint32_t const start_address = m_page2 ? 0x800 : 0x400; + + beginrow = (std::max)(beginrow, cliprect.top() - (cliprect.top() % 8)); + endrow = (std::min)(endrow, cliprect.bottom() - (cliprect.bottom() % 8) + 7); + + const int startrow = (beginrow / 8) * 8; + const int stoprow = ((endrow / 8) + 1) * 8; + const int startcol = (cliprect.left() / 14); + const int stopcol = ((cliprect.right() / 14) + 1); + + //printf("TXT: row %d startcol %d stopcol %d left %d right %d\n", beginrow, startcol, stopcol, cliprect.left(), cliprect.right()); + + for (int row = startrow; row < stoprow; row += 8) + { + if (m_80col) + { + for (int col = startcol; col < stopcol; col++) + { + /* calculate address */ + uint32_t const address = start_address + ((((row / 8) & 0x07) << 7) | (((row / 8) & 0x18) * 5 + col)); + + plot_text_characterGS(bitmap, col * 14, row, 1, aux_page[address], + m_GSfg, m_GSbg); + plot_text_characterGS(bitmap, col * 14 + 7, row, 1, m_ram_ptr[address], + m_GSfg, m_GSbg); + } + } + else + { + for (int col = startcol; col < stopcol; col++) + { + /* calculate address */ + uint32_t const address = start_address + ((((row / 8) & 0x07) << 7) | (((row / 8) & 0x18) * 5 + col)); + + plot_text_characterGS(bitmap, col * 14, row, 2, m_ram_ptr[address], m_GSfg, m_GSbg); + } + } + } +} diff --git a/src/mame/shared/apple2video.h b/src/mame/shared/apple2video.h new file mode 100644 index 00000000000..c57d60f013e --- /dev/null +++ b/src/mame/shared/apple2video.h @@ -0,0 +1,86 @@ +// license:BSD-3-Clause +// copyright-holders:R. Belmont +/********************************************************************* + + video/apple2.h - Video handling for Apple II and IIgs + +*********************************************************************/ + +#ifndef MAME_SHARED_APPLE2VIDEO_H +#define MAME_SHARED_APPLE2VIDEO_H + +#include "emupal.h" + +#define BORDER_LEFT (32) +#define BORDER_RIGHT (32) +#define BORDER_TOP (16) // (plus bottom) + +class a2_video_device : public device_t, public device_palette_interface, public device_video_interface +{ +public: + // construction/destruction + a2_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + bool m_page2 = false; + bool m_flash = false; + bool m_mix = false; + bool m_graphics = false; + bool m_hires = false; + bool m_dhires = false; + bool m_80col = false; + bool m_altcharset = false; + bool m_an2 = false; + bool m_80store = false; + bool m_monohgr = false; + u8 m_GSfg = 0, m_GSbg = 0, m_GSborder = 0, m_newvideo = 0, m_monochrome = 0, m_rgbmode = 0; + u32 m_GSborder_colors[16]{}, m_shr_palette[256]{}; + std::unique_ptr m_8bit_graphics; + std::unique_ptr m_hires_artifact_map; + std::unique_ptr m_dhires_artifact_map; + + uint8_t *m_ram_ptr = nullptr, *m_aux_ptr = nullptr, *m_char_ptr = nullptr; + int m_char_size = 0; + + int m_sysconfig = 0; + + DECLARE_WRITE_LINE_MEMBER(txt_w); + DECLARE_WRITE_LINE_MEMBER(mix_w); + DECLARE_WRITE_LINE_MEMBER(scr_w); + DECLARE_WRITE_LINE_MEMBER(res_w); + DECLARE_WRITE_LINE_MEMBER(dhires_w); + DECLARE_WRITE_LINE_MEMBER(an2_w); + + template + void text_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); + + void text_update_ultr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); + void text_update_jplus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); + void text_updateGS(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); + void lores_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); + void dlores_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); + void hgr_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); + void hgr_update_tk2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); + void dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); + + uint32_t screen_update_GS(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update_GS_8bit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + +protected: + virtual void device_reset() override; + virtual void device_start() override; + + virtual uint32_t palette_entries() const override; + void init_palette(); + +private: + template + void plot_text_character(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); + void plot_text_character_ultr(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); + void plot_text_character_jplus(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); + void plot_text_characterGS(bitmap_ind16 &bitmap, int xpos, int ypos, int xscale, uint32_t code, int fg, int bg); +}; + +// device type definition +DECLARE_DEVICE_TYPE(APPLE2_VIDEO, a2_video_device) + +#endif // MAME_SHARED_APPLE2VIDEO_H diff --git a/src/mame/shared/bally.cpp b/src/mame/shared/bally.cpp deleted file mode 100644 index 61f7bf89d56..00000000000 --- a/src/mame/shared/bally.cpp +++ /dev/null @@ -1,890 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Mike Harris, Quench -/*************************************************************************** - - bally.cpp - - Functions to emulate the various Bally pinball sound boards. - -***************************************************************************/ - -#include "emu.h" -#include "audio/bally.h" - - -//************************************************************************** -// GLOBAL VARIABLES -//************************************************************************** - -DEFINE_DEVICE_TYPE(BALLY_AS2888, bally_as2888_device, "as2888", "Bally AS2888 Sound Board") -DEFINE_DEVICE_TYPE(BALLY_AS3022, bally_as3022_device, "as3022", "Bally AS3022 Sound Board") -DEFINE_DEVICE_TYPE(BALLY_SOUNDS_PLUS, bally_sounds_plus_device, "sounds_plus", "Bally Sounds Plus w/ Vocalizer Board") -DEFINE_DEVICE_TYPE(BALLY_CHEAP_SQUEAK, bally_cheap_squeak_device, "cheap_squeak", "Bally Cheap Squeak Board") -DEFINE_DEVICE_TYPE(BALLY_SQUAWK_N_TALK, bally_squawk_n_talk_device, "squawk_n_talk", "Bally Squawk & Talk Board") -DEFINE_DEVICE_TYPE(BALLY_SQUAWK_N_TALK_AY, bally_squawk_n_talk_ay_device, "squawk_n_talk_ay", "Bally Squawk & Talk w/ AY8910 Board") - - -//************************************************************************** -// AS2888 -//************************************************************************** -static const discrete_mixer_desc as2888_digital_mixer_info = -{ - DISC_MIXER_IS_RESISTOR, /* type */ - {RES_K(33), RES_K(3.9)}, /* r{} */ - {0, 0, 0, 0}, /* r_node */ - {0, 0}, /* c{} */ - 0, /* rI */ -// RES_VOLTAGE_DIVIDER(RES_K(10), RES_R(360)), /* rF */ - RES_K(10), /* rF */ // not really - CAP_U(0.01), /* cF */ - 0, /* cAmp */ - 0, /* vRef */ - 0.00002 /* gain */ -}; - -static const discrete_op_amp_filt_info as2888_preamp_info = { - RES_K(10), 0, RES_R(470), 0, /* r1 .. r4 */ - RES_K(10), /* rF */ - CAP_U(1), /* C1 */ - 0, /* C2 */ - 0, /* C3 */ - 0.0, /* vRef */ - 12.0, /* vP */ - -12.0, /* vN */ -}; - -static DISCRETE_SOUND_START(as2888_discrete) - - DISCRETE_INPUT_DATA(NODE_08) // Start Sustain Attenuation from 555 circuit - DISCRETE_INPUT_LOGIC(NODE_01) // Binary Counter B output (divide by 1) T2 - DISCRETE_INPUT_LOGIC(NODE_04) // Binary Counter D output (divide by 4) T3 - - DISCRETE_DIVIDE(NODE_11, 1, NODE_01, 1) // 2 - DISCRETE_DIVIDE(NODE_14, 1, NODE_04, 1) - - - DISCRETE_RCFILTER(NODE_06, NODE_14, RES_K(15), CAP_U(0.1)) // T4 filter -#if 0 - DISCRETE_RCFILTER(NODE_05, NODE_11, RES_K(33), CAP_U(0.01)) // T1 filter - DISCRETE_ADDER2(NODE_07, 1, NODE_05, NODE_06) -#else - - DISCRETE_MIXER2(NODE_07, 1, NODE_11, NODE_06, &as2888_digital_mixer_info) // Mix and filter T1 and T4 together -#endif - DISCRETE_RCDISC5(NODE_87, 1, NODE_08, RES_K(150), CAP_U(1.0)) - - DISCRETE_RCFILTER_VREF(NODE_88,NODE_87,RES_M(1),CAP_U(0.01),2) - DISCRETE_MULTIPLY(NODE_09, NODE_07, NODE_88) // Apply sustain - - DISCRETE_OP_AMP_FILTER(NODE_20, 1, NODE_09, 0, DISC_OP_AMP_FILTER_IS_HIGH_PASS_1, &as2888_preamp_info) - - DISCRETE_CRFILTER(NODE_25, NODE_20, RES_M(100), CAP_U(0.05)) // Resistor is fake. Capacitor in series between pre-amp and output amp. - - DISCRETE_GAIN(NODE_30, NODE_25, 50) // Output amplifier LM380 fixed inbuilt gain of 50 - - DISCRETE_OUTPUT(NODE_30, 10000000) // 17000000 -DISCRETE_SOUND_END - -//------------------------------------------------- -// sound_select - handle an external write to the board -//------------------------------------------------- - -void bally_as2888_device::sound_select(uint8_t data) -{ - machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_as2888_device::sound_select_sync), this), data); -} - - -TIMER_CALLBACK_MEMBER(bally_as2888_device::sound_select_sync) -{ - m_sound_select = param ^ 0x10; -} - -//------------------------------------------------- -// sound_int - handle an external sound interrupt to the board -//------------------------------------------------- - -WRITE_LINE_MEMBER(bally_as2888_device::sound_int) -{ - machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_as2888_device::sound_int_sync), this), state); -} - -TIMER_CALLBACK_MEMBER(bally_as2888_device::sound_int_sync) -{ - if (param) - { - m_snd_sustain_timer->adjust(attotime::from_msec(5)); - m_discrete->write(NODE_08, 11); // 11 volt pulse - } -} - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void bally_as2888_device::device_add_mconfig(machine_config &config) -{ - DISCRETE(config, m_discrete, as2888_discrete); - m_discrete->add_route(ALL_OUTPUTS, *this, 1.00, AUTO_ALLOC_INPUT, 0); - - TIMER(config, "timer_s_freq").configure_periodic(FUNC(bally_as2888_device::timer_s), attotime::from_hz(353000)); // Inverter clock on AS-2888 sound board - TIMER(config, m_snd_sustain_timer).configure_generic(FUNC(bally_as2888_device::timer_as2888)); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void bally_as2888_device::device_start() -{ - save_item(NAME(m_sound_select)); - save_item(NAME(m_snd_sel)); - save_item(NAME(m_snd_tone_gen)); - save_item(NAME(m_snd_div)); -} - -TIMER_DEVICE_CALLBACK_MEMBER(bally_as2888_device::timer_s) -{ - m_snd_tone_gen--; - - if ((m_snd_tone_gen == 0) && (m_snd_sel != 0x01)) - { - m_snd_tone_gen = m_snd_sel; - m_snd_div++; - - m_discrete->write(NODE_04, BIT(m_snd_div, 2) * 1); - m_discrete->write(NODE_01, BIT(m_snd_div, 0) * 1); - } -} - -TIMER_DEVICE_CALLBACK_MEMBER(bally_as2888_device::timer_as2888) -{ - m_snd_sel = m_snd_prom[m_sound_select]; - m_snd_sel = bitswap<8>(m_snd_sel,0,1,2,3,4,5,6,7); - m_snd_tone_gen = m_snd_sel; - - m_discrete->write(NODE_08, 0); - m_snd_sustain_timer->adjust(attotime::never); -} - - -//************************************************************************** -// AS3022 -//************************************************************************** - -//-------------------------------------------------------------------------- -// IO ports -//-------------------------------------------------------------------------- - -static INPUT_PORTS_START(as3022) - PORT_START("SW1") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Sound Test") PORT_CHANGED_MEMBER(DEVICE_SELF, bally_as3022_device, sw1, 0) -INPUT_PORTS_END - -ioport_constructor bally_as3022_device::device_input_ports() const -{ - return INPUT_PORTS_NAME(as3022); -} - -INPUT_CHANGED_MEMBER(bally_as3022_device::sw1) -{ - if (newval != oldval) - m_cpu->set_input_line(INPUT_LINE_NMI, (newval ? ASSERT_LINE : CLEAR_LINE)); -} - -//------------------------------------------------- -// sound_select - handle an external write to the board -//------------------------------------------------- - -void bally_as3022_device::sound_select(uint8_t data) -{ - machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_as3022_device::sound_select_sync), this), data); -} - - -TIMER_CALLBACK_MEMBER(bally_as3022_device::sound_select_sync) -{ - m_sound_select = param; -} - -//------------------------------------------------- -// sound_int - handle an external sound interrupt to the board -//------------------------------------------------- - -WRITE_LINE_MEMBER(bally_as3022_device::sound_int) -{ - machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_as3022_device::sound_int_sync), this), state); -} - -TIMER_CALLBACK_MEMBER(bally_as3022_device::sound_int_sync) -{ - m_pia->ca1_w(param); -} - -//------------------------------------------------- -// pia_irq_w - IRQ line state changes -//------------------------------------------------- - -WRITE_LINE_MEMBER(bally_as3022_device::pia_irq_w) -{ - int combined_state = m_pia->irq_a_state() | m_pia->irq_b_state(); - m_cpu->set_input_line(M6802_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); -} - -//------------------------------------------------- -// CPU map, from schematics -//------------------------------------------------- - -void bally_as3022_device::as3022_map(address_map &map) -{ - map.unmap_value_high(); - map.global_mask(0x1fff); // A13-15 are unconnected - map(0x0000, 0x007f).mirror(0x0f00).ram(); - map(0x0080, 0x0083).mirror(0x0f7c).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x1fff).rom(); // 4k RAM space, but could be jumpered for 2k -} - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void bally_as3022_device::device_add_mconfig(machine_config &config) -{ - M6808(config, m_cpu, DERIVED_CLOCK(1, 1)); - m_cpu->set_addrmap(AS_PROGRAM, &bally_as3022_device::as3022_map); - - PIA6821(config, m_pia, 0); - m_pia->readpa_handler().set(FUNC(bally_as3022_device::pia_porta_r)); - m_pia->writepa_handler().set(FUNC(bally_as3022_device::pia_porta_w)); - m_pia->writepb_handler().set(FUNC(bally_as3022_device::pia_portb_w)); - m_pia->cb2_handler().set(FUNC(bally_as3022_device::pia_cb2_w)); - m_pia->irqa_handler().set(FUNC(bally_as3022_device::pia_irq_w)); - m_pia->irqb_handler().set(FUNC(bally_as3022_device::pia_irq_w)); - - for (required_device &filter : m_ay_filters) - // TODO: Calculate exact filter values. An AC filter is good enough for now - // and required as the chip likes to output a DC offset at idle. - FILTER_RC(config, filter).set_ac().add_route(ALL_OUTPUTS, *this, 1.0); - AY8910(config, m_ay, DERIVED_CLOCK(1, 4)); - m_ay->add_route(0, "ay_filter0", 0.33); - m_ay->add_route(1, "ay_filter1", 0.33); - m_ay->add_route(2, "ay_filter2", 0.33); - m_ay->port_a_read_callback().set(FUNC(bally_as3022_device::ay_io_r)); - m_ay->add_route(ALL_OUTPUTS, *this, 0.33, AUTO_ALLOC_INPUT, 0); -} - - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void bally_as3022_device::device_start() -{ - // Set volumes to a sane default. - m_ay->set_volume(0, 0); - m_ay->set_volume(1, 0); - m_ay->set_volume(2, 0); - - save_item(NAME(m_bc1)); - save_item(NAME(m_bdir)); - save_item(NAME(m_sound_select)); - save_item(NAME(m_ay_data)); -} - -//------------------------------------------------- -// pia_porta_r - PIA port A reads -//------------------------------------------------- - -uint8_t bally_as3022_device::pia_porta_r() -{ - if (m_bc1 && !m_bdir) - { - m_ay_data = m_ay->data_r(); - return m_ay_data; - } - else - { - // Nothing is active on the bus, so return open bus. - return 0xff; - } -} - -//------------------------------------------------- -// pia_porta_w - PIA port A writes -//------------------------------------------------- - -void bally_as3022_device::pia_porta_w(uint8_t data) -{ - if (m_bc1 && !m_bdir) - { - logerror("PIA port A bus contention!\n"); - } - m_ay_data = data; - update_ay_bus(); -} - -//------------------------------------------------- -// pia_portb_w - PIA port B writes -//------------------------------------------------- - -void bally_as3022_device::pia_portb_w(uint8_t data) -{ - m_bc1 = BIT(data, 0); - m_bdir = BIT(data, 1); - if (m_bc1 && !m_bdir) - { - m_ay_data = m_ay->data_r(); - } - update_ay_bus(); -} - -//------------------------------------------------- -// pia_cb2_w - PIA CB2 writes -//------------------------------------------------- - -WRITE_LINE_MEMBER(bally_as3022_device::pia_cb2_w) -{ - // This pin is hooked up to the amp, and disables sounds when hi - if (state) - { - m_ay->set_volume(0, 0); - m_ay->set_volume(1, 0); - m_ay->set_volume(2, 0); - } - else - { - m_ay->set_volume(0, 0xff); - m_ay->set_volume(1, 0xff); - m_ay->set_volume(2, 0xff); - } -} - -//------------------------------------------------- -// ay_io_r - AY8912 IO A reads (B is unconnected) -//------------------------------------------------- - -uint8_t bally_as3022_device::ay_io_r() -{ - // The two high bits are unconnected, the others are inverted. - return ~m_sound_select & 0x3f; -} - -void bally_as3022_device::update_ay_bus() -{ - if (m_bc1 && m_bdir) - { - m_ay->address_w(m_ay_data); - } - else if (!m_bc1 && m_bdir) - { - m_ay->data_w(m_ay_data); - } -} - - -//************************************************************************** -// SOUNDS PLUS WITH VOCALIZER -//************************************************************************** - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void bally_sounds_plus_device::device_add_mconfig(machine_config &config) -{ - bally_as3022_device::device_add_mconfig(config); - - m_cpu->set_addrmap(AS_PROGRAM, &bally_sounds_plus_device::sounds_plus_map); - m_pia->writepb_handler().set(FUNC(bally_sounds_plus_device::vocalizer_pia_portb_w)); - - // TODO: Calculate exact filter values. An AC filter is good enough for now - // and required as the chip likes to output a DC offset at idle. - FILTER_RC(config, m_mc3417_filter).set_ac(); - m_mc3417_filter->add_route(ALL_OUTPUTS, *this, 1.0); - MC3417(config, m_mc3417, 0); - // A gain of 2.2 is a guess. It sounds about loud enough and doesn't clip. - m_mc3417->add_route(ALL_OUTPUTS, "mc3417_filter", 2.2); -} - -//------------------------------------------------- -// CPU map, from schematics -//------------------------------------------------- - -void bally_sounds_plus_device::sounds_plus_map(address_map &map) -{ - map.unmap_value_high(); - map(0x0000, 0x007f).mirror(0x7f00).ram(); - map(0x0080, 0x0083).mirror(0x7f7c).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x8000, 0xffff).rom(); -} - -//------------------------------------------------- -// pia_portb_w - PIA port B writes -//------------------------------------------------- - -void bally_sounds_plus_device::vocalizer_pia_portb_w(uint8_t data) -{ - bool speech_clock = BIT(data, 6); - bool speech_data = BIT(data, 7); - m_mc3417->clock_w(speech_clock ? 1 : 0); - m_mc3417->digit_w(speech_data ? 1 : 0); - pia_portb_w(data); -} - - -//************************************************************************** -// Cheap Squeak -//************************************************************************** - -//-------------------------------------------------------------------------- -// IO ports -//-------------------------------------------------------------------------- -static INPUT_PORTS_START(cheap_squeak) - PORT_START("SW1") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Sound Test") PORT_CHANGED_MEMBER(DEVICE_SELF, bally_cheap_squeak_device, sw1, 0) -INPUT_PORTS_END - -bally_cheap_squeak_device::bally_cheap_squeak_device( - const machine_config &mconfig, - const char *tag, - device_t *owner, - uint32_t clock) : - bally_cheap_squeak_device(mconfig, BALLY_CHEAP_SQUEAK, tag, owner, clock) -{ } - -bally_cheap_squeak_device::bally_cheap_squeak_device( - const machine_config &mconfig, - device_type type, - const char *tag, - device_t *owner, - uint32_t clock) : - device_t(mconfig, type, tag, owner, clock), - device_mixer_interface(mconfig, *this), - m_cpu(*this, "cpu"), - m_dac(*this, "dac"), - m_sound_ack_w_handler(*this), - m_leds(*this, "sound_led%u", 0U) -{ } - -ioport_constructor bally_cheap_squeak_device::device_input_ports() const -{ - return INPUT_PORTS_NAME(cheap_squeak); -} - -INPUT_CHANGED_MEMBER(bally_cheap_squeak_device::sw1) -{ - m_cpu->set_input_line(INPUT_LINE_NMI, (newval ? ASSERT_LINE : CLEAR_LINE)); -} - -//------------------------------------------------- -// sound_select - handle an external write to the board -//------------------------------------------------- - -void bally_cheap_squeak_device::sound_select(uint8_t data) -{ - machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_cheap_squeak_device::sound_select_sync), this), data); -} - -TIMER_CALLBACK_MEMBER(bally_cheap_squeak_device::sound_select_sync) -{ - m_sound_select = param; -} - -//------------------------------------------------- -// sound_int - handle an external sound interrupt to the board -//------------------------------------------------- -WRITE_LINE_MEMBER(bally_cheap_squeak_device::sound_int) -{ - machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_cheap_squeak_device::sound_int_sync), this), state); -} - -TIMER_CALLBACK_MEMBER(bally_cheap_squeak_device::sound_int_sync) -{ - m_sound_int = param; - m_cpu->set_input_line(M6801_TIN_LINE, (m_sound_int ? ASSERT_LINE : CLEAR_LINE)); - update_led(); -} - -//------------------------------------------------- -// CPU map, from schematics -//------------------------------------------------- - -void bally_cheap_squeak_device::cheap_squeak_map(address_map &map) -{ - map.unmap_value_high(); - map(0x8000, 0x9fff).mirror(0x2000).rom(); - map(0xc000, 0xdfff).mirror(0x2000).rom(); -} - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void bally_cheap_squeak_device::device_add_mconfig(machine_config &config) -{ - M6803(config, m_cpu, DERIVED_CLOCK(1, 1)); - m_cpu->set_addrmap(AS_PROGRAM, &bally_cheap_squeak_device::cheap_squeak_map); - m_cpu->out_p1_cb().set(FUNC(bally_cheap_squeak_device::out_p1_cb)); - m_cpu->in_p2_cb().set(FUNC(bally_cheap_squeak_device::in_p2_cb)); - m_cpu->out_p2_cb().set(FUNC(bally_cheap_squeak_device::out_p2_cb)); - - ZN429E(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 1.00, AUTO_ALLOC_INPUT, 0); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void bally_cheap_squeak_device::device_start() -{ - m_sound_ack_w_handler.resolve(); - m_leds.resolve(); - - save_item(NAME(m_sound_select)); - save_item(NAME(m_sound_int)); -} - -//------------------------------------------------- -// out_p1_cb - IO port 1 write -//------------------------------------------------- - -void bally_cheap_squeak_device::out_p1_cb(uint8_t data) -{ - m_dac->write(data); -} - -//------------------------------------------------- -// in_p2_cb - IO port 2 read -//------------------------------------------------- - -uint8_t bally_cheap_squeak_device::in_p2_cb() -{ - int sound_int_bit = m_sound_int ? 1 : 0; - return 0x40 | (m_sound_select & 0x0f) << 1 | sound_int_bit; -} - -//------------------------------------------------- -// out_p2_cb - IO port 2 write -//------------------------------------------------- - -void bally_cheap_squeak_device::out_p2_cb(uint8_t data) -{ - m_sound_ack = BIT(data, 0); - if (!m_sound_ack_w_handler.isnull()) - { - m_sound_ack_w_handler(m_sound_ack); - } - update_led(); -} - -void bally_cheap_squeak_device::update_led() -{ - // Either input or output can pull the led line high - m_leds[0] = m_sound_int || m_sound_ack; -} - - -//************************************************************************** -// Squawk & Talk -//************************************************************************** - -bally_squawk_n_talk_device::bally_squawk_n_talk_device( - const machine_config &mconfig, - const char *tag, - device_t *owner, - uint32_t clock) : - bally_squawk_n_talk_device(mconfig, BALLY_SQUAWK_N_TALK, tag, owner, clock) -{ } - -bally_squawk_n_talk_device::bally_squawk_n_talk_device( - const machine_config &mconfig, - device_type type, - const char *tag, - device_t *owner, - uint32_t clock) : - device_t(mconfig, type, tag, owner, clock), - device_mixer_interface(mconfig, *this), - m_cpu(*this, "cpu"), - m_pia1(*this, "pia1"), - m_pia2(*this, "pia2"), - m_dac_filter(*this, "dac_filter"), - m_dac(*this, "dac"), - m_speech_filter(*this, "speech_filter"), - m_tms5200(*this, "tms5200") -{ } - -bally_squawk_n_talk_ay_device::bally_squawk_n_talk_ay_device( - const machine_config &mconfig, - const char *tag, - device_t *owner, - uint32_t clock) : - bally_squawk_n_talk_device(mconfig, BALLY_SQUAWK_N_TALK_AY, tag, owner, clock), - m_ay_filters(*this, "ay_filter%u", 0), - m_ay(*this, "ay") -{ } - -//-------------------------------------------------------------------------- -// IO ports -//-------------------------------------------------------------------------- -static INPUT_PORTS_START(squawk_n_talk) - PORT_START("SW1") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("SW1") PORT_CHANGED_MEMBER(DEVICE_SELF, bally_squawk_n_talk_device, sw1, 0) -INPUT_PORTS_END - -ioport_constructor bally_squawk_n_talk_device::device_input_ports() const -{ - return INPUT_PORTS_NAME(squawk_n_talk); -} - -INPUT_CHANGED_MEMBER(bally_squawk_n_talk_device::sw1) -{ - if (newval != oldval) - m_cpu->set_input_line(INPUT_LINE_NMI, (newval ? ASSERT_LINE : CLEAR_LINE)); -} - -//------------------------------------------------- -// sound_select - handle an external write to the board -//------------------------------------------------- - -void bally_squawk_n_talk_device::sound_select(uint8_t data) -{ - machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_squawk_n_talk_device::sound_select_sync), this), data); -} - -TIMER_CALLBACK_MEMBER(bally_squawk_n_talk_device::sound_select_sync) -{ - m_sound_select = param; -} - -//------------------------------------------------- -// sound_int - handle an external sound interrupt to the board -//------------------------------------------------- - -WRITE_LINE_MEMBER(bally_squawk_n_talk_device::sound_int) -{ - machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_squawk_n_talk_device::sound_int_sync), this), state); -} - -TIMER_CALLBACK_MEMBER(bally_squawk_n_talk_device::sound_int_sync) -{ - // the line runs though in inverter - m_pia2->cb1_w(!param); -} - -//------------------------------------------------- -// CPU map, from schematics -//------------------------------------------------- - -void bally_squawk_n_talk_device::squawk_n_talk_map(address_map &map) -{ - map.unmap_value_high(); - map(0x0080, 0x0083).mirror(0x4f6c).rw("pia2", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x0090, 0x0093).mirror(0x4f6c).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x1000, 0x1000).mirror(0x40ff).w("dac", FUNC(dac_byte_interface::data_w)); - map(0x8000, 0x8fff).mirror(0x4000).rom(); // U2 - map(0x9000, 0x9fff).mirror(0x4000).rom(); // U3 - map(0xa000, 0xafff).mirror(0x4000).rom(); // U4 - map(0xb000, 0xbfff).mirror(0x4000).rom(); // U5 -} - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void bally_squawk_n_talk_device::device_add_mconfig(machine_config &config) -{ - M6802(config, m_cpu, DERIVED_CLOCK(1, 1)); // could also be jumpered to use a 6808 - m_cpu->set_addrmap(AS_PROGRAM, &bally_squawk_n_talk_device::squawk_n_talk_map); - - PIA6821(config, m_pia1, 0); - m_pia1->readpa_handler().set(m_tms5200, FUNC(tms5220_device::status_r)); - m_pia1->writepa_handler().set(m_tms5200, FUNC(tms5220_device::data_w)); - m_pia1->writepb_handler().set(FUNC(bally_squawk_n_talk_device::pia1_portb_w)); - m_pia1->irqa_handler().set(FUNC(bally_squawk_n_talk_device::pia_irq_w)); - m_pia1->irqb_handler().set(FUNC(bally_squawk_n_talk_device::pia_irq_w)); - - PIA6821(config, m_pia2, 0); - m_pia2->readpa_handler().set(FUNC(bally_squawk_n_talk_device::pia2_porta_r)); - m_pia2->ca2_handler().set_output("sound_led0"); - m_pia2->irqa_handler().set(FUNC(bally_squawk_n_talk_device::pia_irq_w)); - m_pia2->irqb_handler().set(FUNC(bally_squawk_n_talk_device::pia_irq_w)); - - FILTER_RC(config, m_dac_filter); - m_dac_filter->add_route(ALL_OUTPUTS, *this, 1.0); - m_dac_filter->set_rc(filter_rc_device::HIGHPASS, 2000, 0, 0, CAP_U(2)); - AD558(config, "dac", 0).add_route(ALL_OUTPUTS, "dac_filter", 0.75); - - // TODO: Calculate exact filter values. An AC filter is good enough for now - // and required as the chip likes to output a DC offset at idle. - FILTER_RC(config, m_speech_filter).set_ac(); - m_speech_filter->add_route(ALL_OUTPUTS, *this, 1.0); - TMS5200(config, m_tms5200, 640000); - m_tms5200->add_route(ALL_OUTPUTS, "speech_filter", 1.0); - m_tms5200->ready_cb().set(m_pia1, FUNC(pia6821_device::ca2_w)); - m_tms5200->irq_cb().set(m_pia1, FUNC(pia6821_device::cb1_w)); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void bally_squawk_n_talk_device::device_start() -{ - save_item(NAME(m_sound_select)); -} - -//------------------------------------------------- -// pia1_portb_w - PIA 1 port B write -//------------------------------------------------- - -void bally_squawk_n_talk_device::pia1_portb_w(uint8_t data) -{ - m_tms5200->rsq_w(BIT(data, 0)); - m_tms5200->wsq_w(BIT(data, 1)); -} - -//------------------------------------------------- -// pia2_porta_r - PIA 2 port A reads -//------------------------------------------------- - -uint8_t bally_squawk_n_talk_device::pia2_porta_r() -{ - // 5 lines and they go through inverters - return ~m_sound_select & 0x1f; -} - -//------------------------------------------------- -// pia_irq_w - IRQ line state changes -//------------------------------------------------- -WRITE_LINE_MEMBER(bally_squawk_n_talk_device::pia_irq_w) -{ - int combined_state = m_pia1->irq_a_state() | m_pia1->irq_b_state() | m_pia2->irq_a_state() | m_pia2->irq_b_state(); - m_cpu->set_input_line(M6802_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); -} - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- -void bally_squawk_n_talk_ay_device::device_add_mconfig(machine_config &config) -{ - bally_squawk_n_talk_device::device_add_mconfig(config); - - m_pia2->writepa_handler().set(FUNC(bally_squawk_n_talk_ay_device::pia2_porta_w)); - m_pia2->readpa_handler().set(FUNC(bally_squawk_n_talk_ay_device::pia2_porta_r)); - m_pia2->writepb_handler().set(FUNC(bally_squawk_n_talk_ay_device::pia2_portb_w)); - m_pia2->cb2_handler().set(FUNC(bally_squawk_n_talk_ay_device::pia2_cb2_w)); - - // TODO: Calculate exact filter values. An AC filter is good enough for now - // and required as the chip likes to output a DC offset at idle. - for (auto &filter : m_ay_filters) - FILTER_RC(config, filter).set_ac().add_route(ALL_OUTPUTS, *this, 1.0); - - AY8910(config, m_ay, DERIVED_CLOCK(1, 4)); - m_ay->add_route(0, "ay_filter0", 0.33); - m_ay->add_route(1, "ay_filter1", 0.33); - m_ay->add_route(2, "ay_filter2", 0.33); - m_ay->port_a_read_callback().set(FUNC(bally_squawk_n_talk_ay_device::ay_io_r)); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- -void bally_squawk_n_talk_ay_device::device_start() -{ - bally_squawk_n_talk_device::device_start(); - - // Set volumes to a sane default. - m_ay->set_volume(0, 0); - m_ay->set_volume(1, 0); - m_ay->set_volume(2, 0); - - save_item(NAME(m_bc1)); - save_item(NAME(m_bdir)); - save_item(NAME(m_ay_data)); -} - -//------------------------------------------------- -// pia2_porta_r - PIA 2 port A reads -//------------------------------------------------- - -uint8_t bally_squawk_n_talk_ay_device::pia2_porta_r() -{ - if (m_bc1 && !m_bdir) - { - m_ay_data = m_ay->data_r(); - } - // This should return the open bus, but this method is called even if the PIA - // is in output mode. Self test expects to see the same value. - return m_ay_data; -} - -//------------------------------------------------- -// pia2_porta_w - PIA 2 port A writes -//------------------------------------------------- - -void bally_squawk_n_talk_ay_device::pia2_porta_w(uint8_t data) -{ - if (m_bc1 && !m_bdir) - { - logerror("PIA2 port A bus contention!\n"); - } - m_ay_data = data; - update_ay_bus(); -} - -//------------------------------------------------- -// pia2_portb_w - PIA 2 port B writes -//------------------------------------------------- - -void bally_squawk_n_talk_ay_device::pia2_portb_w(uint8_t data) -{ - m_bc1 = BIT(data, 0); - m_bdir = BIT(data, 1); - if (m_bc1 && !m_bdir) - { - m_ay_data = m_ay->data_r(); - } - update_ay_bus(); -} - -//------------------------------------------------- -// pia2_cb2_w - PIA 2 CB2 writes -//------------------------------------------------- -WRITE_LINE_MEMBER(bally_squawk_n_talk_ay_device::pia2_cb2_w) -{ - // This pin is hooked up to the amp, and disables sounds when hi - if (state) - { - m_ay->set_volume(0, 0); - m_ay->set_volume(1, 0); - m_ay->set_volume(2, 0); - } - else - { - m_ay->set_volume(0, 0xff); - m_ay->set_volume(1, 0xff); - m_ay->set_volume(2, 0xff); - } -} - -//------------------------------------------------- -// ay_io_r - AY8910 read -//------------------------------------------------- - -uint8_t bally_squawk_n_talk_ay_device::ay_io_r() -{ - // 5 lines and they go through inverters - return ~m_sound_select & 0x1f; -} - -void bally_squawk_n_talk_ay_device::update_ay_bus() -{ - if (m_bc1 && m_bdir) - { - m_ay->address_w(m_ay_data); - } - else if (!m_bc1 && m_bdir) - { - m_ay->data_w(m_ay_data); - } -} diff --git a/src/mame/shared/bally.h b/src/mame/shared/bally.h deleted file mode 100644 index 094c577b755..00000000000 --- a/src/mame/shared/bally.h +++ /dev/null @@ -1,342 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Mike Harris -/*************************************************************************** - - bally.h - - Functions to emulate the various Bally pinball sound boards. - -***************************************************************************/ -#ifndef MAME_AUDIO_BALLY_H -#define MAME_AUDIO_BALLY_H - -#pragma once - - -#include "cpu/m6800/m6800.h" -#include "cpu/m6800/m6801.h" -#include "cpu/m6809/m6809.h" -#include "machine/6821pia.h" -#include "machine/timer.h" -#include "sound/ay8910.h" -#include "sound/dac.h" -#include "sound/discrete.h" -#include "sound/flt_rc.h" -#include "sound/hc55516.h" -#include "sound/tms5220.h" - - - -//************************************************************************** -// GLOBAL VARIABLES -//************************************************************************** - -DECLARE_DEVICE_TYPE(BALLY_AS2888, bally_as2888_device) -DECLARE_DEVICE_TYPE(BALLY_AS3022, bally_as3022_device) -DECLARE_DEVICE_TYPE(BALLY_SOUNDS_PLUS, bally_sounds_plus_device) -DECLARE_DEVICE_TYPE(BALLY_CHEAP_SQUEAK, bally_cheap_squeak_device) -DECLARE_DEVICE_TYPE(BALLY_SQUAWK_N_TALK, bally_squawk_n_talk_device) -DECLARE_DEVICE_TYPE(BALLY_SQUAWK_N_TALK_AY, bally_squawk_n_talk_ay_device) - - -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - -// ======================> bally_as2888_device - -class bally_as2888_device : public device_t, public device_mixer_interface -{ -public: - bally_as2888_device( - const machine_config &mconfig, - const char *tag, - device_t *owner, - uint32_t clock = 0) : - bally_as2888_device(mconfig, BALLY_AS2888, tag, owner) - { } - - // read/write - void sound_select(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_int); - - void as2888_map(address_map &map); - -protected: - bally_as2888_device( - const machine_config &mconfig, - device_type type, - const char *tag, - device_t *owner) : - device_t(mconfig, type, tag, owner, 0), - device_mixer_interface(mconfig, *this), - m_snd_prom(*this, "sound"), - m_discrete(*this, "discrete"), - m_timer_s_freq(*this, "timer_s_freq"), - m_snd_sustain_timer(*this, "timer_as2888") - { } - - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - -private: - uint8_t m_sound_select = 0; - uint8_t m_snd_sel = 0; - uint8_t m_snd_tone_gen = 0; - uint8_t m_snd_div = 1; - required_region_ptr m_snd_prom; - required_device m_discrete; - required_device m_timer_s_freq; - required_device m_snd_sustain_timer; - - - // internal communications - TIMER_CALLBACK_MEMBER(sound_select_sync); - TIMER_CALLBACK_MEMBER(sound_int_sync); - TIMER_DEVICE_CALLBACK_MEMBER(timer_s); - TIMER_DEVICE_CALLBACK_MEMBER(timer_as2888); -}; - - -// ======================> bally_as3022_device - -class bally_as3022_device : public device_t, public device_mixer_interface -{ -public: - bally_as3022_device( - const machine_config &mconfig, - const char *tag, - device_t *owner, - uint32_t clock = 3'579'545) : - bally_as3022_device(mconfig, BALLY_AS3022, tag, owner, clock) - { } - - // read/write - DECLARE_INPUT_CHANGED_MEMBER(sw1); - void sound_select(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_int); - - void as3022_map(address_map &map); - -protected: - bally_as3022_device( - const machine_config &mconfig, - device_type type, - const char *tag, - device_t *owner, - uint32_t clock) : - device_t(mconfig, type, tag, owner, clock), - device_mixer_interface(mconfig, *this), - m_cpu(*this, "cpu"), - m_pia(*this, "pia"), - m_ay_filters(*this, "ay_filter%u", 0), - m_ay(*this, "ay"), - m_mc3417_filter(*this, "mc3417_filter"), - m_mc3417(*this, "mc3417") - { } - - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - virtual ioport_constructor device_input_ports() const override; - - // devices - // The schematics list an optional 555, but it never seemed to be used - required_device m_cpu; - required_device m_pia; - required_device_array m_ay_filters; - required_device m_ay; - optional_device m_mc3417_filter; - optional_device m_mc3417; - - // overwridden by children - void pia_portb_w(uint8_t data); - -private: - bool m_bc1 = false; - bool m_bdir = false; - uint8_t m_sound_select = 0; - uint8_t m_ay_data = 0; - - // internal communications - TIMER_CALLBACK_MEMBER(sound_select_sync); - TIMER_CALLBACK_MEMBER(sound_int_sync); - uint8_t pia_porta_r(); - void pia_porta_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); - DECLARE_WRITE_LINE_MEMBER(pia_irq_w); - uint8_t ay_io_r(); - - void update_ay_bus(); -}; - - -// ======================> bally_sounds_plus_device -class bally_sounds_plus_device : public bally_as3022_device -{ -public: - bally_sounds_plus_device( - const machine_config &mconfig, - const char *tag, - device_t *owner, - uint32_t clock = 3'579'545) : - bally_as3022_device(mconfig, BALLY_SOUNDS_PLUS, tag, owner, clock) - { } - - void sounds_plus_map(address_map &map); - -protected: - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - -private: - // internal communications - void vocalizer_pia_portb_w(uint8_t data); -}; - - -// ======================> bally_cheap_squeak_device - -class bally_cheap_squeak_device : public device_t, public device_mixer_interface -{ -public: - bally_cheap_squeak_device( - const machine_config &mconfig, - const char *tag, - device_t *owner, - uint32_t clock = 3'579'545); - - auto sound_ack_w_handler() { return m_sound_ack_w_handler.bind(); } - - // read/write - DECLARE_INPUT_CHANGED_MEMBER(sw1); - void sound_select(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_int); - - void cheap_squeak_map(address_map &map); - -protected: - bally_cheap_squeak_device( - const machine_config &mconfig, - device_type type, - const char *tag, - device_t *owner, - uint32_t clock); - - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - virtual ioport_constructor device_input_ports() const override; - - // devices - required_device m_cpu; - required_device m_dac; - -private: - uint8_t m_sound_select = 0; - bool m_sound_int = 0; - bool m_sound_ack = 0; - - devcb_write_line m_sound_ack_w_handler; - output_finder<1> m_leds; - - // internal communications - TIMER_CALLBACK_MEMBER(sound_select_sync); - TIMER_CALLBACK_MEMBER(sound_int_sync); - void out_p1_cb(uint8_t data); - uint8_t in_p2_cb(); - void out_p2_cb(uint8_t data); - - void update_led(); -}; - -// ======================> bally_squawk_n_talk_device - -// This board comes in different configurations, with or without the DAC and/or AY8910. - -class bally_squawk_n_talk_device : public device_t, public device_mixer_interface -{ -public: - bally_squawk_n_talk_device( - const machine_config &mconfig, - const char *tag, - device_t *owner, - uint32_t clock = 3'579'545); - - // read/write - DECLARE_INPUT_CHANGED_MEMBER(sw1); - void sound_select(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(sound_int); - - void squawk_n_talk_map(address_map &map); - -protected: - bally_squawk_n_talk_device( - const machine_config &mconfig, - device_type type, - const char *tag, - device_t *owner, - uint32_t clock); - - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - virtual ioport_constructor device_input_ports() const override; - - // devices - required_device m_cpu; - required_device m_pia1; - required_device m_pia2; - required_device m_dac_filter; - required_device m_dac; - required_device m_speech_filter; - required_device m_tms5200; - - uint8_t m_sound_select = 0; - - uint8_t pia2_porta_r(); - -private: - // internal communications - TIMER_CALLBACK_MEMBER(sound_select_sync); - TIMER_CALLBACK_MEMBER(sound_int_sync); - void pia1_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia_irq_w); -}; - - -class bally_squawk_n_talk_ay_device : public bally_squawk_n_talk_device -{ -public: - bally_squawk_n_talk_ay_device( - const machine_config &mconfig, - const char *tag, - device_t *owner, - uint32_t clock = 3'579'545); - -protected: - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - - uint8_t pia2_porta_r(); - -private: - bool m_bc1 = false; - bool m_bdir = false; - uint8_t m_ay_data = 0; - - required_device_array m_ay_filters; - required_device m_ay; - - void pia2_porta_w(uint8_t data); - void pia2_portb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(pia2_cb2_w); - uint8_t ay_io_r(); - - void update_ay_bus(); -}; - - -#endif // MAME_AUDIO_BALLY_H diff --git a/src/mame/shared/ballysound.cpp b/src/mame/shared/ballysound.cpp new file mode 100644 index 00000000000..e937f922e04 --- /dev/null +++ b/src/mame/shared/ballysound.cpp @@ -0,0 +1,890 @@ +// license:BSD-3-Clause +// copyright-holders:Mike Harris, Quench +/*************************************************************************** + + bally.cpp + + Functions to emulate the various Bally pinball sound boards. + +***************************************************************************/ + +#include "emu.h" +#include "ballysound.h" + + +//************************************************************************** +// GLOBAL VARIABLES +//************************************************************************** + +DEFINE_DEVICE_TYPE(BALLY_AS2888, bally_as2888_device, "as2888", "Bally AS2888 Sound Board") +DEFINE_DEVICE_TYPE(BALLY_AS3022, bally_as3022_device, "as3022", "Bally AS3022 Sound Board") +DEFINE_DEVICE_TYPE(BALLY_SOUNDS_PLUS, bally_sounds_plus_device, "sounds_plus", "Bally Sounds Plus w/ Vocalizer Board") +DEFINE_DEVICE_TYPE(BALLY_CHEAP_SQUEAK, bally_cheap_squeak_device, "cheap_squeak", "Bally Cheap Squeak Board") +DEFINE_DEVICE_TYPE(BALLY_SQUAWK_N_TALK, bally_squawk_n_talk_device, "squawk_n_talk", "Bally Squawk & Talk Board") +DEFINE_DEVICE_TYPE(BALLY_SQUAWK_N_TALK_AY, bally_squawk_n_talk_ay_device, "squawk_n_talk_ay", "Bally Squawk & Talk w/ AY8910 Board") + + +//************************************************************************** +// AS2888 +//************************************************************************** +static const discrete_mixer_desc as2888_digital_mixer_info = +{ + DISC_MIXER_IS_RESISTOR, /* type */ + {RES_K(33), RES_K(3.9)}, /* r{} */ + {0, 0, 0, 0}, /* r_node */ + {0, 0}, /* c{} */ + 0, /* rI */ +// RES_VOLTAGE_DIVIDER(RES_K(10), RES_R(360)), /* rF */ + RES_K(10), /* rF */ // not really + CAP_U(0.01), /* cF */ + 0, /* cAmp */ + 0, /* vRef */ + 0.00002 /* gain */ +}; + +static const discrete_op_amp_filt_info as2888_preamp_info = { + RES_K(10), 0, RES_R(470), 0, /* r1 .. r4 */ + RES_K(10), /* rF */ + CAP_U(1), /* C1 */ + 0, /* C2 */ + 0, /* C3 */ + 0.0, /* vRef */ + 12.0, /* vP */ + -12.0, /* vN */ +}; + +static DISCRETE_SOUND_START(as2888_discrete) + + DISCRETE_INPUT_DATA(NODE_08) // Start Sustain Attenuation from 555 circuit + DISCRETE_INPUT_LOGIC(NODE_01) // Binary Counter B output (divide by 1) T2 + DISCRETE_INPUT_LOGIC(NODE_04) // Binary Counter D output (divide by 4) T3 + + DISCRETE_DIVIDE(NODE_11, 1, NODE_01, 1) // 2 + DISCRETE_DIVIDE(NODE_14, 1, NODE_04, 1) + + + DISCRETE_RCFILTER(NODE_06, NODE_14, RES_K(15), CAP_U(0.1)) // T4 filter +#if 0 + DISCRETE_RCFILTER(NODE_05, NODE_11, RES_K(33), CAP_U(0.01)) // T1 filter + DISCRETE_ADDER2(NODE_07, 1, NODE_05, NODE_06) +#else + + DISCRETE_MIXER2(NODE_07, 1, NODE_11, NODE_06, &as2888_digital_mixer_info) // Mix and filter T1 and T4 together +#endif + DISCRETE_RCDISC5(NODE_87, 1, NODE_08, RES_K(150), CAP_U(1.0)) + + DISCRETE_RCFILTER_VREF(NODE_88,NODE_87,RES_M(1),CAP_U(0.01),2) + DISCRETE_MULTIPLY(NODE_09, NODE_07, NODE_88) // Apply sustain + + DISCRETE_OP_AMP_FILTER(NODE_20, 1, NODE_09, 0, DISC_OP_AMP_FILTER_IS_HIGH_PASS_1, &as2888_preamp_info) + + DISCRETE_CRFILTER(NODE_25, NODE_20, RES_M(100), CAP_U(0.05)) // Resistor is fake. Capacitor in series between pre-amp and output amp. + + DISCRETE_GAIN(NODE_30, NODE_25, 50) // Output amplifier LM380 fixed inbuilt gain of 50 + + DISCRETE_OUTPUT(NODE_30, 10000000) // 17000000 +DISCRETE_SOUND_END + +//------------------------------------------------- +// sound_select - handle an external write to the board +//------------------------------------------------- + +void bally_as2888_device::sound_select(uint8_t data) +{ + machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_as2888_device::sound_select_sync), this), data); +} + + +TIMER_CALLBACK_MEMBER(bally_as2888_device::sound_select_sync) +{ + m_sound_select = param ^ 0x10; +} + +//------------------------------------------------- +// sound_int - handle an external sound interrupt to the board +//------------------------------------------------- + +WRITE_LINE_MEMBER(bally_as2888_device::sound_int) +{ + machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_as2888_device::sound_int_sync), this), state); +} + +TIMER_CALLBACK_MEMBER(bally_as2888_device::sound_int_sync) +{ + if (param) + { + m_snd_sustain_timer->adjust(attotime::from_msec(5)); + m_discrete->write(NODE_08, 11); // 11 volt pulse + } +} + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void bally_as2888_device::device_add_mconfig(machine_config &config) +{ + DISCRETE(config, m_discrete, as2888_discrete); + m_discrete->add_route(ALL_OUTPUTS, *this, 1.00, AUTO_ALLOC_INPUT, 0); + + TIMER(config, "timer_s_freq").configure_periodic(FUNC(bally_as2888_device::timer_s), attotime::from_hz(353000)); // Inverter clock on AS-2888 sound board + TIMER(config, m_snd_sustain_timer).configure_generic(FUNC(bally_as2888_device::timer_as2888)); +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void bally_as2888_device::device_start() +{ + save_item(NAME(m_sound_select)); + save_item(NAME(m_snd_sel)); + save_item(NAME(m_snd_tone_gen)); + save_item(NAME(m_snd_div)); +} + +TIMER_DEVICE_CALLBACK_MEMBER(bally_as2888_device::timer_s) +{ + m_snd_tone_gen--; + + if ((m_snd_tone_gen == 0) && (m_snd_sel != 0x01)) + { + m_snd_tone_gen = m_snd_sel; + m_snd_div++; + + m_discrete->write(NODE_04, BIT(m_snd_div, 2) * 1); + m_discrete->write(NODE_01, BIT(m_snd_div, 0) * 1); + } +} + +TIMER_DEVICE_CALLBACK_MEMBER(bally_as2888_device::timer_as2888) +{ + m_snd_sel = m_snd_prom[m_sound_select]; + m_snd_sel = bitswap<8>(m_snd_sel,0,1,2,3,4,5,6,7); + m_snd_tone_gen = m_snd_sel; + + m_discrete->write(NODE_08, 0); + m_snd_sustain_timer->adjust(attotime::never); +} + + +//************************************************************************** +// AS3022 +//************************************************************************** + +//-------------------------------------------------------------------------- +// IO ports +//-------------------------------------------------------------------------- + +static INPUT_PORTS_START(as3022) + PORT_START("SW1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Sound Test") PORT_CHANGED_MEMBER(DEVICE_SELF, bally_as3022_device, sw1, 0) +INPUT_PORTS_END + +ioport_constructor bally_as3022_device::device_input_ports() const +{ + return INPUT_PORTS_NAME(as3022); +} + +INPUT_CHANGED_MEMBER(bally_as3022_device::sw1) +{ + if (newval != oldval) + m_cpu->set_input_line(INPUT_LINE_NMI, (newval ? ASSERT_LINE : CLEAR_LINE)); +} + +//------------------------------------------------- +// sound_select - handle an external write to the board +//------------------------------------------------- + +void bally_as3022_device::sound_select(uint8_t data) +{ + machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_as3022_device::sound_select_sync), this), data); +} + + +TIMER_CALLBACK_MEMBER(bally_as3022_device::sound_select_sync) +{ + m_sound_select = param; +} + +//------------------------------------------------- +// sound_int - handle an external sound interrupt to the board +//------------------------------------------------- + +WRITE_LINE_MEMBER(bally_as3022_device::sound_int) +{ + machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_as3022_device::sound_int_sync), this), state); +} + +TIMER_CALLBACK_MEMBER(bally_as3022_device::sound_int_sync) +{ + m_pia->ca1_w(param); +} + +//------------------------------------------------- +// pia_irq_w - IRQ line state changes +//------------------------------------------------- + +WRITE_LINE_MEMBER(bally_as3022_device::pia_irq_w) +{ + int combined_state = m_pia->irq_a_state() | m_pia->irq_b_state(); + m_cpu->set_input_line(M6802_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); +} + +//------------------------------------------------- +// CPU map, from schematics +//------------------------------------------------- + +void bally_as3022_device::as3022_map(address_map &map) +{ + map.unmap_value_high(); + map.global_mask(0x1fff); // A13-15 are unconnected + map(0x0000, 0x007f).mirror(0x0f00).ram(); + map(0x0080, 0x0083).mirror(0x0f7c).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x1000, 0x1fff).rom(); // 4k RAM space, but could be jumpered for 2k +} + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void bally_as3022_device::device_add_mconfig(machine_config &config) +{ + M6808(config, m_cpu, DERIVED_CLOCK(1, 1)); + m_cpu->set_addrmap(AS_PROGRAM, &bally_as3022_device::as3022_map); + + PIA6821(config, m_pia, 0); + m_pia->readpa_handler().set(FUNC(bally_as3022_device::pia_porta_r)); + m_pia->writepa_handler().set(FUNC(bally_as3022_device::pia_porta_w)); + m_pia->writepb_handler().set(FUNC(bally_as3022_device::pia_portb_w)); + m_pia->cb2_handler().set(FUNC(bally_as3022_device::pia_cb2_w)); + m_pia->irqa_handler().set(FUNC(bally_as3022_device::pia_irq_w)); + m_pia->irqb_handler().set(FUNC(bally_as3022_device::pia_irq_w)); + + for (required_device &filter : m_ay_filters) + // TODO: Calculate exact filter values. An AC filter is good enough for now + // and required as the chip likes to output a DC offset at idle. + FILTER_RC(config, filter).set_ac().add_route(ALL_OUTPUTS, *this, 1.0); + AY8910(config, m_ay, DERIVED_CLOCK(1, 4)); + m_ay->add_route(0, "ay_filter0", 0.33); + m_ay->add_route(1, "ay_filter1", 0.33); + m_ay->add_route(2, "ay_filter2", 0.33); + m_ay->port_a_read_callback().set(FUNC(bally_as3022_device::ay_io_r)); + m_ay->add_route(ALL_OUTPUTS, *this, 0.33, AUTO_ALLOC_INPUT, 0); +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void bally_as3022_device::device_start() +{ + // Set volumes to a sane default. + m_ay->set_volume(0, 0); + m_ay->set_volume(1, 0); + m_ay->set_volume(2, 0); + + save_item(NAME(m_bc1)); + save_item(NAME(m_bdir)); + save_item(NAME(m_sound_select)); + save_item(NAME(m_ay_data)); +} + +//------------------------------------------------- +// pia_porta_r - PIA port A reads +//------------------------------------------------- + +uint8_t bally_as3022_device::pia_porta_r() +{ + if (m_bc1 && !m_bdir) + { + m_ay_data = m_ay->data_r(); + return m_ay_data; + } + else + { + // Nothing is active on the bus, so return open bus. + return 0xff; + } +} + +//------------------------------------------------- +// pia_porta_w - PIA port A writes +//------------------------------------------------- + +void bally_as3022_device::pia_porta_w(uint8_t data) +{ + if (m_bc1 && !m_bdir) + { + logerror("PIA port A bus contention!\n"); + } + m_ay_data = data; + update_ay_bus(); +} + +//------------------------------------------------- +// pia_portb_w - PIA port B writes +//------------------------------------------------- + +void bally_as3022_device::pia_portb_w(uint8_t data) +{ + m_bc1 = BIT(data, 0); + m_bdir = BIT(data, 1); + if (m_bc1 && !m_bdir) + { + m_ay_data = m_ay->data_r(); + } + update_ay_bus(); +} + +//------------------------------------------------- +// pia_cb2_w - PIA CB2 writes +//------------------------------------------------- + +WRITE_LINE_MEMBER(bally_as3022_device::pia_cb2_w) +{ + // This pin is hooked up to the amp, and disables sounds when hi + if (state) + { + m_ay->set_volume(0, 0); + m_ay->set_volume(1, 0); + m_ay->set_volume(2, 0); + } + else + { + m_ay->set_volume(0, 0xff); + m_ay->set_volume(1, 0xff); + m_ay->set_volume(2, 0xff); + } +} + +//------------------------------------------------- +// ay_io_r - AY8912 IO A reads (B is unconnected) +//------------------------------------------------- + +uint8_t bally_as3022_device::ay_io_r() +{ + // The two high bits are unconnected, the others are inverted. + return ~m_sound_select & 0x3f; +} + +void bally_as3022_device::update_ay_bus() +{ + if (m_bc1 && m_bdir) + { + m_ay->address_w(m_ay_data); + } + else if (!m_bc1 && m_bdir) + { + m_ay->data_w(m_ay_data); + } +} + + +//************************************************************************** +// SOUNDS PLUS WITH VOCALIZER +//************************************************************************** + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void bally_sounds_plus_device::device_add_mconfig(machine_config &config) +{ + bally_as3022_device::device_add_mconfig(config); + + m_cpu->set_addrmap(AS_PROGRAM, &bally_sounds_plus_device::sounds_plus_map); + m_pia->writepb_handler().set(FUNC(bally_sounds_plus_device::vocalizer_pia_portb_w)); + + // TODO: Calculate exact filter values. An AC filter is good enough for now + // and required as the chip likes to output a DC offset at idle. + FILTER_RC(config, m_mc3417_filter).set_ac(); + m_mc3417_filter->add_route(ALL_OUTPUTS, *this, 1.0); + MC3417(config, m_mc3417, 0); + // A gain of 2.2 is a guess. It sounds about loud enough and doesn't clip. + m_mc3417->add_route(ALL_OUTPUTS, "mc3417_filter", 2.2); +} + +//------------------------------------------------- +// CPU map, from schematics +//------------------------------------------------- + +void bally_sounds_plus_device::sounds_plus_map(address_map &map) +{ + map.unmap_value_high(); + map(0x0000, 0x007f).mirror(0x7f00).ram(); + map(0x0080, 0x0083).mirror(0x7f7c).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x8000, 0xffff).rom(); +} + +//------------------------------------------------- +// pia_portb_w - PIA port B writes +//------------------------------------------------- + +void bally_sounds_plus_device::vocalizer_pia_portb_w(uint8_t data) +{ + bool speech_clock = BIT(data, 6); + bool speech_data = BIT(data, 7); + m_mc3417->clock_w(speech_clock ? 1 : 0); + m_mc3417->digit_w(speech_data ? 1 : 0); + pia_portb_w(data); +} + + +//************************************************************************** +// Cheap Squeak +//************************************************************************** + +//-------------------------------------------------------------------------- +// IO ports +//-------------------------------------------------------------------------- +static INPUT_PORTS_START(cheap_squeak) + PORT_START("SW1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Sound Test") PORT_CHANGED_MEMBER(DEVICE_SELF, bally_cheap_squeak_device, sw1, 0) +INPUT_PORTS_END + +bally_cheap_squeak_device::bally_cheap_squeak_device( + const machine_config &mconfig, + const char *tag, + device_t *owner, + uint32_t clock) : + bally_cheap_squeak_device(mconfig, BALLY_CHEAP_SQUEAK, tag, owner, clock) +{ } + +bally_cheap_squeak_device::bally_cheap_squeak_device( + const machine_config &mconfig, + device_type type, + const char *tag, + device_t *owner, + uint32_t clock) : + device_t(mconfig, type, tag, owner, clock), + device_mixer_interface(mconfig, *this), + m_cpu(*this, "cpu"), + m_dac(*this, "dac"), + m_sound_ack_w_handler(*this), + m_leds(*this, "sound_led%u", 0U) +{ } + +ioport_constructor bally_cheap_squeak_device::device_input_ports() const +{ + return INPUT_PORTS_NAME(cheap_squeak); +} + +INPUT_CHANGED_MEMBER(bally_cheap_squeak_device::sw1) +{ + m_cpu->set_input_line(INPUT_LINE_NMI, (newval ? ASSERT_LINE : CLEAR_LINE)); +} + +//------------------------------------------------- +// sound_select - handle an external write to the board +//------------------------------------------------- + +void bally_cheap_squeak_device::sound_select(uint8_t data) +{ + machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_cheap_squeak_device::sound_select_sync), this), data); +} + +TIMER_CALLBACK_MEMBER(bally_cheap_squeak_device::sound_select_sync) +{ + m_sound_select = param; +} + +//------------------------------------------------- +// sound_int - handle an external sound interrupt to the board +//------------------------------------------------- +WRITE_LINE_MEMBER(bally_cheap_squeak_device::sound_int) +{ + machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_cheap_squeak_device::sound_int_sync), this), state); +} + +TIMER_CALLBACK_MEMBER(bally_cheap_squeak_device::sound_int_sync) +{ + m_sound_int = param; + m_cpu->set_input_line(M6801_TIN_LINE, (m_sound_int ? ASSERT_LINE : CLEAR_LINE)); + update_led(); +} + +//------------------------------------------------- +// CPU map, from schematics +//------------------------------------------------- + +void bally_cheap_squeak_device::cheap_squeak_map(address_map &map) +{ + map.unmap_value_high(); + map(0x8000, 0x9fff).mirror(0x2000).rom(); + map(0xc000, 0xdfff).mirror(0x2000).rom(); +} + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void bally_cheap_squeak_device::device_add_mconfig(machine_config &config) +{ + M6803(config, m_cpu, DERIVED_CLOCK(1, 1)); + m_cpu->set_addrmap(AS_PROGRAM, &bally_cheap_squeak_device::cheap_squeak_map); + m_cpu->out_p1_cb().set(FUNC(bally_cheap_squeak_device::out_p1_cb)); + m_cpu->in_p2_cb().set(FUNC(bally_cheap_squeak_device::in_p2_cb)); + m_cpu->out_p2_cb().set(FUNC(bally_cheap_squeak_device::out_p2_cb)); + + ZN429E(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 1.00, AUTO_ALLOC_INPUT, 0); +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void bally_cheap_squeak_device::device_start() +{ + m_sound_ack_w_handler.resolve(); + m_leds.resolve(); + + save_item(NAME(m_sound_select)); + save_item(NAME(m_sound_int)); +} + +//------------------------------------------------- +// out_p1_cb - IO port 1 write +//------------------------------------------------- + +void bally_cheap_squeak_device::out_p1_cb(uint8_t data) +{ + m_dac->write(data); +} + +//------------------------------------------------- +// in_p2_cb - IO port 2 read +//------------------------------------------------- + +uint8_t bally_cheap_squeak_device::in_p2_cb() +{ + int sound_int_bit = m_sound_int ? 1 : 0; + return 0x40 | (m_sound_select & 0x0f) << 1 | sound_int_bit; +} + +//------------------------------------------------- +// out_p2_cb - IO port 2 write +//------------------------------------------------- + +void bally_cheap_squeak_device::out_p2_cb(uint8_t data) +{ + m_sound_ack = BIT(data, 0); + if (!m_sound_ack_w_handler.isnull()) + { + m_sound_ack_w_handler(m_sound_ack); + } + update_led(); +} + +void bally_cheap_squeak_device::update_led() +{ + // Either input or output can pull the led line high + m_leds[0] = m_sound_int || m_sound_ack; +} + + +//************************************************************************** +// Squawk & Talk +//************************************************************************** + +bally_squawk_n_talk_device::bally_squawk_n_talk_device( + const machine_config &mconfig, + const char *tag, + device_t *owner, + uint32_t clock) : + bally_squawk_n_talk_device(mconfig, BALLY_SQUAWK_N_TALK, tag, owner, clock) +{ } + +bally_squawk_n_talk_device::bally_squawk_n_talk_device( + const machine_config &mconfig, + device_type type, + const char *tag, + device_t *owner, + uint32_t clock) : + device_t(mconfig, type, tag, owner, clock), + device_mixer_interface(mconfig, *this), + m_cpu(*this, "cpu"), + m_pia1(*this, "pia1"), + m_pia2(*this, "pia2"), + m_dac_filter(*this, "dac_filter"), + m_dac(*this, "dac"), + m_speech_filter(*this, "speech_filter"), + m_tms5200(*this, "tms5200") +{ } + +bally_squawk_n_talk_ay_device::bally_squawk_n_talk_ay_device( + const machine_config &mconfig, + const char *tag, + device_t *owner, + uint32_t clock) : + bally_squawk_n_talk_device(mconfig, BALLY_SQUAWK_N_TALK_AY, tag, owner, clock), + m_ay_filters(*this, "ay_filter%u", 0), + m_ay(*this, "ay") +{ } + +//-------------------------------------------------------------------------- +// IO ports +//-------------------------------------------------------------------------- +static INPUT_PORTS_START(squawk_n_talk) + PORT_START("SW1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("SW1") PORT_CHANGED_MEMBER(DEVICE_SELF, bally_squawk_n_talk_device, sw1, 0) +INPUT_PORTS_END + +ioport_constructor bally_squawk_n_talk_device::device_input_ports() const +{ + return INPUT_PORTS_NAME(squawk_n_talk); +} + +INPUT_CHANGED_MEMBER(bally_squawk_n_talk_device::sw1) +{ + if (newval != oldval) + m_cpu->set_input_line(INPUT_LINE_NMI, (newval ? ASSERT_LINE : CLEAR_LINE)); +} + +//------------------------------------------------- +// sound_select - handle an external write to the board +//------------------------------------------------- + +void bally_squawk_n_talk_device::sound_select(uint8_t data) +{ + machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_squawk_n_talk_device::sound_select_sync), this), data); +} + +TIMER_CALLBACK_MEMBER(bally_squawk_n_talk_device::sound_select_sync) +{ + m_sound_select = param; +} + +//------------------------------------------------- +// sound_int - handle an external sound interrupt to the board +//------------------------------------------------- + +WRITE_LINE_MEMBER(bally_squawk_n_talk_device::sound_int) +{ + machine().scheduler().synchronize(timer_expired_delegate(FUNC(bally_squawk_n_talk_device::sound_int_sync), this), state); +} + +TIMER_CALLBACK_MEMBER(bally_squawk_n_talk_device::sound_int_sync) +{ + // the line runs though in inverter + m_pia2->cb1_w(!param); +} + +//------------------------------------------------- +// CPU map, from schematics +//------------------------------------------------- + +void bally_squawk_n_talk_device::squawk_n_talk_map(address_map &map) +{ + map.unmap_value_high(); + map(0x0080, 0x0083).mirror(0x4f6c).rw("pia2", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x0090, 0x0093).mirror(0x4f6c).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x1000, 0x1000).mirror(0x40ff).w("dac", FUNC(dac_byte_interface::data_w)); + map(0x8000, 0x8fff).mirror(0x4000).rom(); // U2 + map(0x9000, 0x9fff).mirror(0x4000).rom(); // U3 + map(0xa000, 0xafff).mirror(0x4000).rom(); // U4 + map(0xb000, 0xbfff).mirror(0x4000).rom(); // U5 +} + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void bally_squawk_n_talk_device::device_add_mconfig(machine_config &config) +{ + M6802(config, m_cpu, DERIVED_CLOCK(1, 1)); // could also be jumpered to use a 6808 + m_cpu->set_addrmap(AS_PROGRAM, &bally_squawk_n_talk_device::squawk_n_talk_map); + + PIA6821(config, m_pia1, 0); + m_pia1->readpa_handler().set(m_tms5200, FUNC(tms5220_device::status_r)); + m_pia1->writepa_handler().set(m_tms5200, FUNC(tms5220_device::data_w)); + m_pia1->writepb_handler().set(FUNC(bally_squawk_n_talk_device::pia1_portb_w)); + m_pia1->irqa_handler().set(FUNC(bally_squawk_n_talk_device::pia_irq_w)); + m_pia1->irqb_handler().set(FUNC(bally_squawk_n_talk_device::pia_irq_w)); + + PIA6821(config, m_pia2, 0); + m_pia2->readpa_handler().set(FUNC(bally_squawk_n_talk_device::pia2_porta_r)); + m_pia2->ca2_handler().set_output("sound_led0"); + m_pia2->irqa_handler().set(FUNC(bally_squawk_n_talk_device::pia_irq_w)); + m_pia2->irqb_handler().set(FUNC(bally_squawk_n_talk_device::pia_irq_w)); + + FILTER_RC(config, m_dac_filter); + m_dac_filter->add_route(ALL_OUTPUTS, *this, 1.0); + m_dac_filter->set_rc(filter_rc_device::HIGHPASS, 2000, 0, 0, CAP_U(2)); + AD558(config, "dac", 0).add_route(ALL_OUTPUTS, "dac_filter", 0.75); + + // TODO: Calculate exact filter values. An AC filter is good enough for now + // and required as the chip likes to output a DC offset at idle. + FILTER_RC(config, m_speech_filter).set_ac(); + m_speech_filter->add_route(ALL_OUTPUTS, *this, 1.0); + TMS5200(config, m_tms5200, 640000); + m_tms5200->add_route(ALL_OUTPUTS, "speech_filter", 1.0); + m_tms5200->ready_cb().set(m_pia1, FUNC(pia6821_device::ca2_w)); + m_tms5200->irq_cb().set(m_pia1, FUNC(pia6821_device::cb1_w)); +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void bally_squawk_n_talk_device::device_start() +{ + save_item(NAME(m_sound_select)); +} + +//------------------------------------------------- +// pia1_portb_w - PIA 1 port B write +//------------------------------------------------- + +void bally_squawk_n_talk_device::pia1_portb_w(uint8_t data) +{ + m_tms5200->rsq_w(BIT(data, 0)); + m_tms5200->wsq_w(BIT(data, 1)); +} + +//------------------------------------------------- +// pia2_porta_r - PIA 2 port A reads +//------------------------------------------------- + +uint8_t bally_squawk_n_talk_device::pia2_porta_r() +{ + // 5 lines and they go through inverters + return ~m_sound_select & 0x1f; +} + +//------------------------------------------------- +// pia_irq_w - IRQ line state changes +//------------------------------------------------- +WRITE_LINE_MEMBER(bally_squawk_n_talk_device::pia_irq_w) +{ + int combined_state = m_pia1->irq_a_state() | m_pia1->irq_b_state() | m_pia2->irq_a_state() | m_pia2->irq_b_state(); + m_cpu->set_input_line(M6802_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); +} + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- +void bally_squawk_n_talk_ay_device::device_add_mconfig(machine_config &config) +{ + bally_squawk_n_talk_device::device_add_mconfig(config); + + m_pia2->writepa_handler().set(FUNC(bally_squawk_n_talk_ay_device::pia2_porta_w)); + m_pia2->readpa_handler().set(FUNC(bally_squawk_n_talk_ay_device::pia2_porta_r)); + m_pia2->writepb_handler().set(FUNC(bally_squawk_n_talk_ay_device::pia2_portb_w)); + m_pia2->cb2_handler().set(FUNC(bally_squawk_n_talk_ay_device::pia2_cb2_w)); + + // TODO: Calculate exact filter values. An AC filter is good enough for now + // and required as the chip likes to output a DC offset at idle. + for (auto &filter : m_ay_filters) + FILTER_RC(config, filter).set_ac().add_route(ALL_OUTPUTS, *this, 1.0); + + AY8910(config, m_ay, DERIVED_CLOCK(1, 4)); + m_ay->add_route(0, "ay_filter0", 0.33); + m_ay->add_route(1, "ay_filter1", 0.33); + m_ay->add_route(2, "ay_filter2", 0.33); + m_ay->port_a_read_callback().set(FUNC(bally_squawk_n_talk_ay_device::ay_io_r)); +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- +void bally_squawk_n_talk_ay_device::device_start() +{ + bally_squawk_n_talk_device::device_start(); + + // Set volumes to a sane default. + m_ay->set_volume(0, 0); + m_ay->set_volume(1, 0); + m_ay->set_volume(2, 0); + + save_item(NAME(m_bc1)); + save_item(NAME(m_bdir)); + save_item(NAME(m_ay_data)); +} + +//------------------------------------------------- +// pia2_porta_r - PIA 2 port A reads +//------------------------------------------------- + +uint8_t bally_squawk_n_talk_ay_device::pia2_porta_r() +{ + if (m_bc1 && !m_bdir) + { + m_ay_data = m_ay->data_r(); + } + // This should return the open bus, but this method is called even if the PIA + // is in output mode. Self test expects to see the same value. + return m_ay_data; +} + +//------------------------------------------------- +// pia2_porta_w - PIA 2 port A writes +//------------------------------------------------- + +void bally_squawk_n_talk_ay_device::pia2_porta_w(uint8_t data) +{ + if (m_bc1 && !m_bdir) + { + logerror("PIA2 port A bus contention!\n"); + } + m_ay_data = data; + update_ay_bus(); +} + +//------------------------------------------------- +// pia2_portb_w - PIA 2 port B writes +//------------------------------------------------- + +void bally_squawk_n_talk_ay_device::pia2_portb_w(uint8_t data) +{ + m_bc1 = BIT(data, 0); + m_bdir = BIT(data, 1); + if (m_bc1 && !m_bdir) + { + m_ay_data = m_ay->data_r(); + } + update_ay_bus(); +} + +//------------------------------------------------- +// pia2_cb2_w - PIA 2 CB2 writes +//------------------------------------------------- +WRITE_LINE_MEMBER(bally_squawk_n_talk_ay_device::pia2_cb2_w) +{ + // This pin is hooked up to the amp, and disables sounds when hi + if (state) + { + m_ay->set_volume(0, 0); + m_ay->set_volume(1, 0); + m_ay->set_volume(2, 0); + } + else + { + m_ay->set_volume(0, 0xff); + m_ay->set_volume(1, 0xff); + m_ay->set_volume(2, 0xff); + } +} + +//------------------------------------------------- +// ay_io_r - AY8910 read +//------------------------------------------------- + +uint8_t bally_squawk_n_talk_ay_device::ay_io_r() +{ + // 5 lines and they go through inverters + return ~m_sound_select & 0x1f; +} + +void bally_squawk_n_talk_ay_device::update_ay_bus() +{ + if (m_bc1 && m_bdir) + { + m_ay->address_w(m_ay_data); + } + else if (!m_bc1 && m_bdir) + { + m_ay->data_w(m_ay_data); + } +} diff --git a/src/mame/shared/ballysound.h b/src/mame/shared/ballysound.h new file mode 100644 index 00000000000..19f7d867b30 --- /dev/null +++ b/src/mame/shared/ballysound.h @@ -0,0 +1,342 @@ +// license:BSD-3-Clause +// copyright-holders:Mike Harris +/*************************************************************************** + + bally.h + + Functions to emulate the various Bally pinball sound boards. + +***************************************************************************/ +#ifndef MAME_SHARED_BALLYSOUND_H +#define MAME_SHARED_BALLYSOUND_H + +#pragma once + + +#include "cpu/m6800/m6800.h" +#include "cpu/m6800/m6801.h" +#include "cpu/m6809/m6809.h" +#include "machine/6821pia.h" +#include "machine/timer.h" +#include "sound/ay8910.h" +#include "sound/dac.h" +#include "sound/discrete.h" +#include "sound/flt_rc.h" +#include "sound/hc55516.h" +#include "sound/tms5220.h" + + + +//************************************************************************** +// GLOBAL VARIABLES +//************************************************************************** + +DECLARE_DEVICE_TYPE(BALLY_AS2888, bally_as2888_device) +DECLARE_DEVICE_TYPE(BALLY_AS3022, bally_as3022_device) +DECLARE_DEVICE_TYPE(BALLY_SOUNDS_PLUS, bally_sounds_plus_device) +DECLARE_DEVICE_TYPE(BALLY_CHEAP_SQUEAK, bally_cheap_squeak_device) +DECLARE_DEVICE_TYPE(BALLY_SQUAWK_N_TALK, bally_squawk_n_talk_device) +DECLARE_DEVICE_TYPE(BALLY_SQUAWK_N_TALK_AY, bally_squawk_n_talk_ay_device) + + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +// ======================> bally_as2888_device + +class bally_as2888_device : public device_t, public device_mixer_interface +{ +public: + bally_as2888_device( + const machine_config &mconfig, + const char *tag, + device_t *owner, + uint32_t clock = 0) : + bally_as2888_device(mconfig, BALLY_AS2888, tag, owner) + { } + + // read/write + void sound_select(uint8_t data); + DECLARE_WRITE_LINE_MEMBER(sound_int); + + void as2888_map(address_map &map); + +protected: + bally_as2888_device( + const machine_config &mconfig, + device_type type, + const char *tag, + device_t *owner) : + device_t(mconfig, type, tag, owner, 0), + device_mixer_interface(mconfig, *this), + m_snd_prom(*this, "sound"), + m_discrete(*this, "discrete"), + m_timer_s_freq(*this, "timer_s_freq"), + m_snd_sustain_timer(*this, "timer_as2888") + { } + + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + +private: + uint8_t m_sound_select = 0; + uint8_t m_snd_sel = 0; + uint8_t m_snd_tone_gen = 0; + uint8_t m_snd_div = 1; + required_region_ptr m_snd_prom; + required_device m_discrete; + required_device m_timer_s_freq; + required_device m_snd_sustain_timer; + + + // internal communications + TIMER_CALLBACK_MEMBER(sound_select_sync); + TIMER_CALLBACK_MEMBER(sound_int_sync); + TIMER_DEVICE_CALLBACK_MEMBER(timer_s); + TIMER_DEVICE_CALLBACK_MEMBER(timer_as2888); +}; + + +// ======================> bally_as3022_device + +class bally_as3022_device : public device_t, public device_mixer_interface +{ +public: + bally_as3022_device( + const machine_config &mconfig, + const char *tag, + device_t *owner, + uint32_t clock = 3'579'545) : + bally_as3022_device(mconfig, BALLY_AS3022, tag, owner, clock) + { } + + // read/write + DECLARE_INPUT_CHANGED_MEMBER(sw1); + void sound_select(uint8_t data); + DECLARE_WRITE_LINE_MEMBER(sound_int); + + void as3022_map(address_map &map); + +protected: + bally_as3022_device( + const machine_config &mconfig, + device_type type, + const char *tag, + device_t *owner, + uint32_t clock) : + device_t(mconfig, type, tag, owner, clock), + device_mixer_interface(mconfig, *this), + m_cpu(*this, "cpu"), + m_pia(*this, "pia"), + m_ay_filters(*this, "ay_filter%u", 0), + m_ay(*this, "ay"), + m_mc3417_filter(*this, "mc3417_filter"), + m_mc3417(*this, "mc3417") + { } + + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + virtual ioport_constructor device_input_ports() const override; + + // devices + // The schematics list an optional 555, but it never seemed to be used + required_device m_cpu; + required_device m_pia; + required_device_array m_ay_filters; + required_device m_ay; + optional_device m_mc3417_filter; + optional_device m_mc3417; + + // overwridden by children + void pia_portb_w(uint8_t data); + +private: + bool m_bc1 = false; + bool m_bdir = false; + uint8_t m_sound_select = 0; + uint8_t m_ay_data = 0; + + // internal communications + TIMER_CALLBACK_MEMBER(sound_select_sync); + TIMER_CALLBACK_MEMBER(sound_int_sync); + uint8_t pia_porta_r(); + void pia_porta_w(uint8_t data); + DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); + DECLARE_WRITE_LINE_MEMBER(pia_irq_w); + uint8_t ay_io_r(); + + void update_ay_bus(); +}; + + +// ======================> bally_sounds_plus_device +class bally_sounds_plus_device : public bally_as3022_device +{ +public: + bally_sounds_plus_device( + const machine_config &mconfig, + const char *tag, + device_t *owner, + uint32_t clock = 3'579'545) : + bally_as3022_device(mconfig, BALLY_SOUNDS_PLUS, tag, owner, clock) + { } + + void sounds_plus_map(address_map &map); + +protected: + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + +private: + // internal communications + void vocalizer_pia_portb_w(uint8_t data); +}; + + +// ======================> bally_cheap_squeak_device + +class bally_cheap_squeak_device : public device_t, public device_mixer_interface +{ +public: + bally_cheap_squeak_device( + const machine_config &mconfig, + const char *tag, + device_t *owner, + uint32_t clock = 3'579'545); + + auto sound_ack_w_handler() { return m_sound_ack_w_handler.bind(); } + + // read/write + DECLARE_INPUT_CHANGED_MEMBER(sw1); + void sound_select(uint8_t data); + DECLARE_WRITE_LINE_MEMBER(sound_int); + + void cheap_squeak_map(address_map &map); + +protected: + bally_cheap_squeak_device( + const machine_config &mconfig, + device_type type, + const char *tag, + device_t *owner, + uint32_t clock); + + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + virtual ioport_constructor device_input_ports() const override; + + // devices + required_device m_cpu; + required_device m_dac; + +private: + uint8_t m_sound_select = 0; + bool m_sound_int = 0; + bool m_sound_ack = 0; + + devcb_write_line m_sound_ack_w_handler; + output_finder<1> m_leds; + + // internal communications + TIMER_CALLBACK_MEMBER(sound_select_sync); + TIMER_CALLBACK_MEMBER(sound_int_sync); + void out_p1_cb(uint8_t data); + uint8_t in_p2_cb(); + void out_p2_cb(uint8_t data); + + void update_led(); +}; + +// ======================> bally_squawk_n_talk_device + +// This board comes in different configurations, with or without the DAC and/or AY8910. + +class bally_squawk_n_talk_device : public device_t, public device_mixer_interface +{ +public: + bally_squawk_n_talk_device( + const machine_config &mconfig, + const char *tag, + device_t *owner, + uint32_t clock = 3'579'545); + + // read/write + DECLARE_INPUT_CHANGED_MEMBER(sw1); + void sound_select(uint8_t data); + DECLARE_WRITE_LINE_MEMBER(sound_int); + + void squawk_n_talk_map(address_map &map); + +protected: + bally_squawk_n_talk_device( + const machine_config &mconfig, + device_type type, + const char *tag, + device_t *owner, + uint32_t clock); + + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + virtual ioport_constructor device_input_ports() const override; + + // devices + required_device m_cpu; + required_device m_pia1; + required_device m_pia2; + required_device m_dac_filter; + required_device m_dac; + required_device m_speech_filter; + required_device m_tms5200; + + uint8_t m_sound_select = 0; + + uint8_t pia2_porta_r(); + +private: + // internal communications + TIMER_CALLBACK_MEMBER(sound_select_sync); + TIMER_CALLBACK_MEMBER(sound_int_sync); + void pia1_portb_w(uint8_t data); + DECLARE_WRITE_LINE_MEMBER(pia_irq_w); +}; + + +class bally_squawk_n_talk_ay_device : public bally_squawk_n_talk_device +{ +public: + bally_squawk_n_talk_ay_device( + const machine_config &mconfig, + const char *tag, + device_t *owner, + uint32_t clock = 3'579'545); + +protected: + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + + uint8_t pia2_porta_r(); + +private: + bool m_bc1 = false; + bool m_bdir = false; + uint8_t m_ay_data = 0; + + required_device_array m_ay_filters; + required_device m_ay; + + void pia2_porta_w(uint8_t data); + void pia2_portb_w(uint8_t data); + DECLARE_WRITE_LINE_MEMBER(pia2_cb2_w); + uint8_t ay_io_r(); + + void update_ay_bus(); +}; + + +#endif // MAME_SHARED_BALLYSOUND_H diff --git a/src/mame/shared/cclimber_a.cpp b/src/mame/shared/cclimber_a.cpp new file mode 100644 index 00000000000..2ee26394eff --- /dev/null +++ b/src/mame/shared/cclimber_a.cpp @@ -0,0 +1,123 @@ +// license:BSD-3-Clause +// copyright-holders:Nicola Salmoria, hap +/*************************************************************************** + +Crazy Climber sound hardware + +It has an AY-3-8910. +And 8KB ROM for voice samples, done with TTL chips. + +***************************************************************************/ + +#include "emu.h" +#include "cclimber_a.h" + +#include "sound/ay8910.h" + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE(CCLIMBER_AUDIO, cclimber_audio_device, "cclimber_audio", "Crazy Climber Sound Board") + + +//------------------------------------------------- +// cclimber_audio_device: Constructor +//------------------------------------------------- + +cclimber_audio_device::cclimber_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : + device_t(mconfig, CCLIMBER_AUDIO, tag, owner, clock), + m_dac(*this, "dac"), + m_volume(*this, "volume"), + m_rom(*this, "samples"), + m_sample_clockdiv(2) +{ } + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void cclimber_audio_device::device_start() +{ + assert(m_rom.bytes() == 0x2000); + + m_address = 0; + m_start_address = 0; + m_loop_address = 0; + m_sample_rate = 0; + m_sample_trigger = 0; + + m_sample_timer = timer_alloc(FUNC(cclimber_audio_device::sample_tick), this); + m_sample_timer->adjust(attotime::zero); + + // register for savestates + save_item(NAME(m_address)); + save_item(NAME(m_start_address)); + save_item(NAME(m_loop_address)); + save_item(NAME(m_sample_rate)); + save_item(NAME(m_sample_trigger)); +} + + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void cclimber_audio_device::device_add_mconfig(machine_config &config) +{ + ay8910_device &aysnd(AY8910(config, "aysnd", DERIVED_CLOCK(1, 1))); + aysnd.port_a_write_callback().set(FUNC(cclimber_audio_device::start_address_w)); + aysnd.port_b_write_callback().set(FUNC(cclimber_audio_device::loop_address_w)); + aysnd.add_route(ALL_OUTPUTS, ":speaker", 0.5); + + DAC_4BIT_R2R(config, m_dac).add_route(ALL_OUTPUTS, "volume", 0.5); + + FILTER_VOLUME(config, m_volume).add_route(ALL_OUTPUTS, ":speaker", 1.0); +} + + +//------------------------------------------------- +// handlers +//------------------------------------------------- + +void cclimber_audio_device::sample_rate_w(u8 data) +{ + m_sample_rate = data; +} + +void cclimber_audio_device::sample_volume_w(u8 data) +{ + m_volume->flt_volume_set_volume(double(data & 0x1f) / 31.0); // range 0-31 +} + +void cclimber_audio_device::sample_trigger(int state) +{ + // start playing on rising edge + if (state && !m_sample_trigger) + m_address = m_start_address * 64; + + m_sample_trigger = state; +} + +void cclimber_audio_device::sample_trigger_w(u8 data) +{ + sample_trigger(data != 0); +} + +TIMER_CALLBACK_MEMBER(cclimber_audio_device::sample_tick) +{ + u8 data = m_rom[m_address >> 1 & 0x1fff]; + + m_dac->write((m_address & 1) ? (data & 0xf) : (data >> 4)); + + if (m_sample_trigger) + m_address++; + + // sample end marker, continue from loop point + if (data == 0x70) + m_address = m_loop_address * 64; + + m_sample_timer->adjust(attotime::from_ticks(256 - m_sample_rate, clock() / m_sample_clockdiv)); +} diff --git a/src/mame/shared/cclimber_a.h b/src/mame/shared/cclimber_a.h new file mode 100644 index 00000000000..1f6d56703cb --- /dev/null +++ b/src/mame/shared/cclimber_a.h @@ -0,0 +1,61 @@ +// license:BSD-3-Clause +// copyright-holders:Nicola Salmoria, hap +/*************************************************************************** + + Crazy Climber sound hardware + +***************************************************************************/ + +#ifndef MAME_AUDIO_CCLIMBER_H +#define MAME_AUDIO_CCLIMBER_H + +#pragma once + +#include "sound/dac.h" +#include "sound/flt_vol.h" + +DECLARE_DEVICE_TYPE(CCLIMBER_AUDIO, cclimber_audio_device) + +// ======================> cclimber_audio_device + +class cclimber_audio_device : public device_t +{ +public: + // construction/destruction + cclimber_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + + auto &set_sample_clockdiv(u8 div) { m_sample_clockdiv = div; return *this; } // determines base sound pitch (default 2) + + void sample_trigger(int state); + void sample_trigger_w(u8 data); + void sample_rate_w(u8 data); + void sample_volume_w(u8 data); + +protected: + // device level overrides + virtual void device_start() override; + virtual void device_reset() override { sample_volume_w(0); } + virtual void device_add_mconfig(machine_config &config) override; + +private: + required_device m_dac; + required_device m_volume; + required_region_ptr m_rom; + + void start_address_w(u8 data) { m_start_address = data; } + void loop_address_w(u8 data) { m_loop_address = data; } + + u8 m_sample_clockdiv; + + emu_timer *m_sample_timer; + TIMER_CALLBACK_MEMBER(sample_tick); + + u16 m_address; + u8 m_start_address; + u8 m_loop_address; + u8 m_sample_rate; + int m_sample_trigger; +}; + + +#endif // MAME_AUDIO_CCLIMBER_H diff --git a/src/mame/shared/dc.cpp b/src/mame/shared/dc.cpp index c0faebb7673..9e97c847294 100644 --- a/src/mame/shared/dc.cpp +++ b/src/mame/shared/dc.cpp @@ -9,13 +9,14 @@ */ #include "emu.h" -//#include "debugger.h" -#include "includes/dc.h" +#include "dc.h" + +#include "mie.h" + #include "cpu/sh/sh4.h" #include "cpu/arm7/arm7core.h" -#include "machine/mie.h" -#include "machine/naomig1.h" -#include "video/powervr2.h" + +//#include "debugger.h" #define DEBUG_REGISTERS (1) diff --git a/src/mame/shared/dc.h b/src/mame/shared/dc.h index bb1cac0e0e7..cf2eb344f42 100644 --- a/src/mame/shared/dc.h +++ b/src/mame/shared/dc.h @@ -6,15 +6,16 @@ #pragma once -#include "cpu/sh/sh4.h" -#include "cpu/arm7/arm7core.h" +#include "dc_g2if.h" +#include "maple-dc.h" +#include "naomig1.h" +#include "powervr2.h" + #include "cpu/arm7/arm7.h" -#include "machine/naomig1.h" -#include "machine/dc_g2if.h" -#include "machine/maple-dc.h" +#include "cpu/arm7/arm7core.h" +#include "cpu/sh/sh4.h" #include "machine/timer.h" #include "sound/aica.h" -#include "video/powervr2.h" class dc_state : public driver_device { diff --git a/src/mame/shared/decobsmt.cpp b/src/mame/shared/decobsmt.cpp index 5f748800d29..d4f3ff2182d 100644 --- a/src/mame/shared/decobsmt.cpp +++ b/src/mame/shared/decobsmt.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "audio/decobsmt.h" +#include "decobsmt.h" #include "speaker.h" #define M6809_TAG "soundcpu" diff --git a/src/mame/shared/efo_zsu.cpp b/src/mame/shared/efo_zsu.cpp index db397b191da..11b570e6de6 100644 --- a/src/mame/shared/efo_zsu.cpp +++ b/src/mame/shared/efo_zsu.cpp @@ -34,7 +34,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/efo_zsu.h" +#include "efo_zsu.h" #include "machine/input_merger.h" #include "speaker.h" diff --git a/src/mame/shared/efo_zsu.h b/src/mame/shared/efo_zsu.h index ca53f3cfc8f..66fa927a3e8 100644 --- a/src/mame/shared/efo_zsu.h +++ b/src/mame/shared/efo_zsu.h @@ -1,11 +1,13 @@ // license:BSD-3-Clause // copyright-holders:David Haywood,AJR -#ifndef MAME_AUDIO_EFO_ZSU_H -#define MAME_AUDIO_EFO_ZSU_H +#ifndef MAME_SHARED_EFO_ZSU_H +#define MAME_SHARED_EFO_ZSU_H #pragma once +#include "cedar_magnet_board.h" + #include "cpu/z80/z80.h" #include "machine/z80daisy.h" #include "machine/z80ctc.h" @@ -13,7 +15,6 @@ #include "machine/40105.h" #include "sound/ay8910.h" #include "sound/msm5205.h" -#include "machine/cedar_magnet_board.h" DECLARE_DEVICE_TYPE(EFO_ZSU, efo_zsu_device) DECLARE_DEVICE_TYPE(EFO_ZSU1, efo_zsu1_device) @@ -95,4 +96,4 @@ private: void ay0_porta_w(u8 data); }; -#endif // MAME_AUDIO_EFO_ZSU_H +#endif // MAME_SHARED_EFO_ZSU_H diff --git a/src/mame/shared/exidysound.cpp b/src/mame/shared/exidysound.cpp new file mode 100644 index 00000000000..5fa970a7292 --- /dev/null +++ b/src/mame/shared/exidysound.cpp @@ -0,0 +1,1046 @@ +// license:BSD-3-Clause +// copyright-holders:Aaron Giles +/************************************************************************* + + Exidy 6502 hardware + +*************************************************************************/ + +#include "emu.h" +#include "exidysound.h" + +#include "cpu/z80/z80.h" +#include "machine/input_merger.h" +#include "machine/rescap.h" +#include "cpu/m6502/m6502.h" + +#include "speaker.h" + + + +/************************************* + * + * Constants + * + *************************************/ + +#define CRYSTAL_OSC (XTAL(3'579'545)) +#define SH8253_CLOCK (CRYSTAL_OSC / 2) +#define SH6840_CLOCK (CRYSTAL_OSC / 4) +#define SH6532_CLOCK (CRYSTAL_OSC / 4) +#define CVSD_CLOCK (1.0 / (0.693 * (RES_K(2.4) + 2.0 * RES_K(20)) * CAP_P(2200))) +#define CVSD_Z80_CLOCK (CRYSTAL_OSC / 2) +#define BASE_VOLUME (32767 / 6) + + +/************************************* + * + * 6840 clock counting helper + * + *************************************/ + +inline void exidy_sound_device::sh6840_apply_clock(exidy_sound_device::sh6840_timer_channel *t, int clocks) +{ + /* dual 8-bit case */ + if (t->cr & 0x04) + { + /* handle full decrements */ + while (clocks > t->counter.b.l) + { + clocks -= t->counter.b.l + 1; + t->counter.b.l = t->timer; + + /* decrement MSB */ + if (!t->counter.b.h--) + { + t->state = 0; + t->counter.w = t->timer; + } + + /* state goes high when MSB is 0 */ + else if (!t->counter.b.h) + { + t->state = 1; + t->clocks++; + } + } + + /* subtract off the remainder */ + t->counter.b.l -= clocks; + } + + /* 16-bit case */ + else + { + /* handle full decrements */ + while (clocks > t->counter.w) + { + clocks -= t->counter.w + 1; + t->state ^= 1; + t->clocks += t->state; + t->counter.w = t->timer; + } + + /* subtract off the remainder */ + t->counter.w -= clocks; + } +} + + + +/************************************* + * + * Noise generation helper + * + *************************************/ + +inline int exidy_sound_device::sh6840_update_noise(int clocks) +{ + uint32_t newxor; + int noise_clocks = 0; + int i; + + /* loop over clocks */ + for (i = 0; i < clocks; i++) + { + /* shift the LFSR. its a LOOOONG LFSR, so we need + * four longs to hold it all! + * first we grab new sample, then shift the high bits, + * then the low ones; finally or in the result and see if we've + * had a 0->1 transition */ + newxor = (m_sh6840_LFSR_3 ^ m_sh6840_LFSR_2) >> 31; /* high bits of 3 and 2 xored is new xor */ + m_sh6840_LFSR_3 <<= 1; + m_sh6840_LFSR_3 |= m_sh6840_LFSR_2 >> 31; + m_sh6840_LFSR_2 <<= 1; + m_sh6840_LFSR_2 |= m_sh6840_LFSR_1 >> 31; + m_sh6840_LFSR_1 <<= 1; + m_sh6840_LFSR_1 |= m_sh6840_LFSR_0 >> 31; + m_sh6840_LFSR_0 <<= 1; + m_sh6840_LFSR_0 |= newxor ^ m_sh6840_LFSR_oldxor; + m_sh6840_LFSR_oldxor = newxor; + /*printf("LFSR: %4x, %4x, %4x, %4x\n", sh6840_LFSR_3, sh6840_LFSR_2, sh6840_LFSR_1, sh6840_LFSR_0);*/ + /* if we clocked 0->1, that will serve as an external clock */ + if ((m_sh6840_LFSR_2 & 0x03) == 0x01) /* tap is at 96th bit */ + { + noise_clocks++; + } + } + return noise_clocks; +} + + + +/************************************* + * + * 6840 state saving + * + *************************************/ + +void exidy_sound_device::sh6840_register_state_globals() +{ + save_item(NAME(m_sh6840_volume)); + save_item(NAME(m_sh6840_MSB_latch)); + save_item(NAME(m_sh6840_LSB_latch)); + save_item(NAME(m_sh6840_LFSR_oldxor)); + save_item(NAME(m_sh6840_LFSR_0)); + save_item(NAME(m_sh6840_LFSR_1)); + save_item(NAME(m_sh6840_LFSR_2)); + save_item(NAME(m_sh6840_LFSR_3)); + save_item(NAME(m_sh6840_clock_count)); + save_item(NAME(m_sfxctrl)); + save_item(NAME(m_sh6840_timer[0].cr)); + save_item(NAME(m_sh6840_timer[0].state)); + save_item(NAME(m_sh6840_timer[0].leftovers)); + save_item(NAME(m_sh6840_timer[0].timer)); + save_item(NAME(m_sh6840_timer[0].clocks)); + save_item(NAME(m_sh6840_timer[0].counter.w)); + save_item(NAME(m_sh6840_timer[1].cr)); + save_item(NAME(m_sh6840_timer[1].state)); + save_item(NAME(m_sh6840_timer[1].leftovers)); + save_item(NAME(m_sh6840_timer[1].timer)); + save_item(NAME(m_sh6840_timer[1].clocks)); + save_item(NAME(m_sh6840_timer[1].counter.w)); + save_item(NAME(m_sh6840_timer[2].cr)); + save_item(NAME(m_sh6840_timer[2].state)); + save_item(NAME(m_sh6840_timer[2].leftovers)); + save_item(NAME(m_sh6840_timer[2].timer)); + save_item(NAME(m_sh6840_timer[2].clocks)); + save_item(NAME(m_sh6840_timer[2].counter.w)); +} + +/************************************* + * + * Audio startup routines + * + *************************************/ + +void exidy_sound_device::common_sh_start() +{ + int sample_rate = SH8253_CLOCK.value(); + + m_sh6840_clocks_per_sample = (int)(SH6840_CLOCK.dvalue() / (double)sample_rate * (double)(1 << 24)); + + /* allocate the stream */ + m_stream = stream_alloc(0, 1, sample_rate); + + sh6840_register_state_globals(); +} + +DEFINE_DEVICE_TYPE(EXIDY, exidy_sound_device, "exidy_sfx", "Exidy SFX") + +exidy_sound_device::exidy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : exidy_sound_device(mconfig, EXIDY, tag, owner, clock) +{ +} + +exidy_sh8253_sound_device::exidy_sh8253_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) + : exidy_sound_device(mconfig, type, tag, owner, clock), + m_riot(*this, "riot"), + m_cvsd(*this, "cvsd"), + m_cvsd_filter(*this, "cvsd_filter"), + m_cvsd_filter2(*this, "cvsd_filter2"), + m_cvsdcpu(*this, "cvsdcpu"), + m_tms(*this, "tms"), + m_pia(*this, "pia") +{ +} + +exidy_sound_device::exidy_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, type, tag, owner, clock), + device_sound_interface(mconfig, *this), + m_stream(nullptr), + m_freq_to_step(0), + m_sh6840_MSB_latch(0), + m_sh6840_LSB_latch(0), + m_sh6840_LFSR_oldxor(0), + m_sh6840_LFSR_0(0xffffffff), + m_sh6840_LFSR_1(0xffffffff), + m_sh6840_LFSR_2(0xffffffff), + m_sh6840_LFSR_3(0xffffffff), + m_sh6840_clocks_per_sample(0), + m_sh6840_clock_count(0), + m_sfxctrl(0) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void exidy_sound_device::device_start() +{ + common_sh_start(); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void exidy_sound_device::device_reset() +{ + common_sh_reset(); +} + +//------------------------------------------------- +// sound_stream_update - handle a stream update +//------------------------------------------------- + +void exidy_sound_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) +{ + sh6840_timer_channel *sh6840_timer = m_sh6840_timer; + + /* hack to skip the expensive lfsr noise generation unless at least one of the 3 channels actually depends on it being generated */ + int noisy = ((sh6840_timer[0].cr & sh6840_timer[1].cr & sh6840_timer[2].cr & 0x02) == 0); + auto &buffer = outputs[0]; + + /* loop over samples */ + for (int sampindex = 0; sampindex < buffer.samples(); sampindex++) + { + sh6840_timer_channel *t; + int clocks; + s32 sample = 0; + + /* determine how many 6840 clocks this sample */ + m_sh6840_clock_count += m_sh6840_clocks_per_sample; + int clocks_this_sample = m_sh6840_clock_count >> 24; + m_sh6840_clock_count &= (1 << 24) - 1; + + /* skip if nothing enabled */ + if ((sh6840_timer[0].cr & 0x01) == 0) + { + int noise_clocks_this_sample = 0; + uint32_t chan0_clocks; + + /* generate E-clocked noise if configured to do so */ + if (noisy && !(m_sfxctrl & 0x01)) + noise_clocks_this_sample = sh6840_update_noise(clocks_this_sample); + + /* handle timer 0 if enabled */ + t = &sh6840_timer[0]; + chan0_clocks = t->clocks; + clocks = (t->cr & 0x02) ? clocks_this_sample : noise_clocks_this_sample; + sh6840_apply_clock(t, clocks); + if (t->state && !(m_sfxctrl & 0x02) && (t->cr & 0x80)) + sample += m_sh6840_volume[0]; + + /* generate channel 0-clocked noise if configured to do so */ + if (noisy && (m_sfxctrl & 0x01)) + noise_clocks_this_sample = sh6840_update_noise(t->clocks - chan0_clocks); + + /* handle timer 1 if enabled */ + t = &sh6840_timer[1]; + clocks = (t->cr & 0x02) ? clocks_this_sample : noise_clocks_this_sample; + sh6840_apply_clock(t, clocks); + if (t->state && (t->cr & 0x80)) + sample += m_sh6840_volume[1]; + + /* handle timer 2 if enabled */ + t = &sh6840_timer[2]; + clocks = (t->cr & 0x02) ? clocks_this_sample : noise_clocks_this_sample; + /* prescale */ + if (t->cr & 0x01) + { + clocks += t->leftovers; + t->leftovers = clocks % 8; + clocks /= 8; + } + sh6840_apply_clock(t, clocks); + if (t->state && (t->cr & 0x80)) + sample += m_sh6840_volume[2]; + } + + /* music (if present) */ + sample += generate_music_sample(); + + /* stash */ + buffer.put_int(sampindex, sample, 32768); + } +} + +s32 exidy_sound_device::generate_music_sample() +{ + return 0; +} + +s32 exidy_sh8253_sound_device::generate_music_sample() +{ + sh8253_timer_channel *c; + s32 sample = 0; + + /* music channel 0 */ + c = &m_sh8253_timer[0]; + if (c->enable) + { + c->fraction += c->step; + if (c->fraction & 0x0800000) + sample += BASE_VOLUME; + } + + /* music channel 1 */ + c = &m_sh8253_timer[1]; + if (c->enable) + { + c->fraction += c->step; + if (c->fraction & 0x0800000) + sample += BASE_VOLUME; + } + + /* music channel 2 */ + c = &m_sh8253_timer[2]; + if (c->enable) + { + c->fraction += c->step; + if (c->fraction & 0x0800000) + sample += BASE_VOLUME; + } + + return sample; +} + + + +/************************************* + * + * Audio reset routines + * + *************************************/ + +void exidy_sound_device::common_sh_reset() +{ + /* 6840 */ + memset(m_sh6840_timer, 0, sizeof(m_sh6840_timer)); + m_sh6840_MSB_latch = 0; + m_sh6840_LSB_latch = 0; + m_sh6840_volume[0] = 0; + m_sh6840_volume[1] = 0; + m_sh6840_volume[2] = 0; + m_sh6840_clock_count = 0; + m_sfxctrl = 0; + + /* LFSR */ + m_sh6840_LFSR_oldxor = 0; + m_sh6840_LFSR_0 = 0xffffffff; + m_sh6840_LFSR_1 = 0xffffffff; + m_sh6840_LFSR_2 = 0xffffffff; + m_sh6840_LFSR_3 = 0xffffffff; +} + + +/************************************* + * + * 6532 interface + * + *************************************/ + +void exidy_sh8253_sound_device::r6532_porta_w(uint8_t data) +{ + if (m_cvsd.found()) + m_cvsdcpu->set_input_line(INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + + if (m_tms.found()) + { + logerror("(%f)%s:TMS5220 data write = %02X\n", machine().time().as_double(), machine().describe_context(), m_riot->porta_out_get()); + m_tms->data_w(data); + } +} + +uint8_t exidy_sh8253_sound_device::r6532_porta_r() +{ + uint8_t status = 0xff; + if (m_tms.found()) + { + status = m_tms->status_r(); + logerror("(%f)%s:TMS5220 status read = %02X\n", machine().time().as_double(), machine().describe_context(), status); + } + return status; +} + +void exidy_sh8253_sound_device::r6532_portb_w(uint8_t data) +{ + if (m_tms.found()) + { + m_tms->rsq_w(BIT(data, 0)); + m_tms->wsq_w(BIT(data, 1)); + } +} + + +uint8_t exidy_sh8253_sound_device::r6532_portb_r() +{ + uint8_t newdata = m_riot->portb_in_get(); + if (m_tms.found()) + { + newdata &= ~0x0c; + if (m_tms->readyq_r()) newdata |= 0x04; + if (m_tms->intq_r()) newdata |= 0x08; + } + return newdata; +} + + +/************************************* + * + * 8253 state saving + * + *************************************/ + + +void exidy_sh8253_sound_device::sh8253_register_state_globals() +{ + save_item(NAME(m_sh8253_timer[0].clstate)); + save_item(NAME(m_sh8253_timer[0].enable)); + save_item(NAME(m_sh8253_timer[0].count)); + save_item(NAME(m_sh8253_timer[0].step)); + save_item(NAME(m_sh8253_timer[0].fraction)); + save_item(NAME(m_sh8253_timer[1].clstate)); + save_item(NAME(m_sh8253_timer[1].enable)); + save_item(NAME(m_sh8253_timer[1].count)); + save_item(NAME(m_sh8253_timer[1].step)); + save_item(NAME(m_sh8253_timer[1].fraction)); + save_item(NAME(m_sh8253_timer[2].clstate)); + save_item(NAME(m_sh8253_timer[2].enable)); + save_item(NAME(m_sh8253_timer[2].count)); + save_item(NAME(m_sh8253_timer[2].step)); + save_item(NAME(m_sh8253_timer[2].fraction)); +} + +/************************************* + * + * 8253 timer handlers + * + *************************************/ + +void exidy_sh8253_sound_device::sh8253_w(offs_t offset, uint8_t data) +{ + int chan; + + m_stream->update(); + + switch (offset) + { + case 0: + case 1: + case 2: + chan = offset; + if (!m_sh8253_timer[chan].clstate) + { + m_sh8253_timer[chan].clstate = 1; + m_sh8253_timer[chan].count = (m_sh8253_timer[chan].count & 0xff00) | (data & 0x00ff); + } + else + { + m_sh8253_timer[chan].clstate = 0; + m_sh8253_timer[chan].count = (m_sh8253_timer[chan].count & 0x00ff) | ((data << 8) & 0xff00); + if (m_sh8253_timer[chan].count) + m_sh8253_timer[chan].step = m_freq_to_step * SH8253_CLOCK.dvalue() / m_sh8253_timer[chan].count; + else + m_sh8253_timer[chan].step = 0; + } + break; + + case 3: + chan = (data & 0xc0) >> 6; + m_sh8253_timer[chan].enable = ((data & 0x0e) != 0); + break; + } +} + + + +/************************************* + * + * 6840 timer handlers + * + *************************************/ + +uint8_t exidy_sound_device::sh6840_r(offs_t offset) +{ + /* force an update of the stream */ + m_stream->update(); + + switch (offset) + { + /* offset 0: Motorola datasheet says it isn't used, Hitachi datasheet says it reads as 0s always*/ + case 0: + return 0; + /* offset 1 reads the status register: bits 2 1 0 correspond to ints on channels 2,1,0, and bit 7 is an 'OR' of bits 2,1,0 */ + case 1: + logerror("%s:exidy_sh6840_r - unexpected read, status register is TODO!\n", machine().describe_context()); + return 0; + /* offsets 2,4,6 read channel 0,1,2 MSBs and latch the LSB*/ + case 2: case 4: case 6: + m_sh6840_LSB_latch = m_sh6840_timer[((offset>>1)-1)].counter.b.l; + return m_sh6840_timer[((offset>>1)-1)].counter.b.h; + /* offsets 3,5,7 read the LSB latch*/ + default: /* case 3,5,7 */ + return m_sh6840_LSB_latch; + } +} + + +void exidy_sound_device::sh6840_w(offs_t offset, uint8_t data) +{ + sh6840_timer_channel *sh6840_timer = m_sh6840_timer; + + /* force an update of the stream */ + m_stream->update(); + + switch (offset) + { + /* offset 0 writes to either channel 0 control or channel 2 control */ + case 0: + if (sh6840_timer[1].cr & 0x01) + sh6840_timer[0].cr = data; + else + sh6840_timer[2].cr = data; + + /* only support mode 0 and 2 */ + if (((data >> 3) & 5) != 0) + fatalerror("exidy_sh6840_w - channel %d configured for mode %d\n", (sh6840_timer[1].cr & 0x01) ? 0 : 2, (data >> 3) & 7); + break; + + /* offset 1 writes to channel 1 control */ + case 1: + sh6840_timer[1].cr = data; + + /* only support mode 0 and 2 */ + if (((data >> 3) & 5) != 0) + fatalerror("exidy_sh6840_w - channel 1 configured for mode %d\n", (data >> 3) & 7); + break; + + /* offsets 2/4/6 write to the common MSB latch */ + case 2: + case 4: + case 6: + m_sh6840_MSB_latch = data; + break; + + /* offsets 3/5/7 write to the LSB controls */ + case 3: + case 5: + case 7: + { + /* latch the timer value */ + int ch = (offset - 3) / 2; + sh6840_timer[ch].timer = (m_sh6840_MSB_latch << 8) | (data & 0xff); + + /* if CR4 is clear, the value is loaded immediately */ + if (!(sh6840_timer[ch].cr & 0x10)) + sh6840_timer[ch].counter.w = sh6840_timer[ch].timer; + break; + } + } +} + + + +/************************************* + * + * External sound effect controls + * + *************************************/ + +void exidy_sound_device::sfxctrl_w(offs_t offset, uint8_t data) +{ + m_stream->update(); + + switch (offset) + { + case 0: + m_sfxctrl = data; + break; + + case 1: + case 2: + case 3: + m_sh6840_volume[offset - 1] = ((data & 7) * BASE_VOLUME) / 7; + break; + } +} + + + +/************************************* + * + * Sound filter control + * + *************************************/ + +void venture_sound_device::filter_w(uint8_t data) +{ + logerror("exidy_sound_filter_w = %02X\n", data); +} + + + +/************************************* + * + * Venture, etc. + * + *************************************/ + + +DEFINE_DEVICE_TYPE(EXIDY_VENTURE, venture_sound_device, "venture_sound", "Exidy SFX+PSG") + +venture_sound_device::venture_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : venture_sound_device(mconfig, EXIDY_VENTURE, tag, owner, clock) +{ +} + +venture_sound_device::venture_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) + : exidy_sh8253_sound_device(mconfig, type, tag, owner, clock) + , m_pa_callback(*this) + , m_pb_callback(*this) + , m_ca2_callback(*this) + , m_cb2_callback(*this) +{ +} + +void venture_sound_device::device_resolve_objects() +{ + m_pa_callback.resolve_safe(); + m_pb_callback.resolve_safe(); + m_ca2_callback.resolve_safe(); + m_cb2_callback.resolve_safe(); +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void exidy_sh8253_sound_device::device_start() +{ + common_sh_start(); + + /* 8253 */ + m_freq_to_step = (1 << 24) / SH8253_CLOCK; + + sh8253_register_state_globals(); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void exidy_sh8253_sound_device::device_reset() +{ + common_sh_reset(); + + /* 8253 */ + memset(m_sh8253_timer, 0, sizeof(m_sh8253_timer)); +} + + +void venture_sound_device::pa_w(uint8_t data) +{ + m_pia->porta_w(data); +} + + +void venture_sound_device::pb_w(uint8_t data) +{ + m_pia->portb_w(data); +} + + +WRITE_LINE_MEMBER(venture_sound_device::ca_w) +{ + m_pia->ca1_w(state); +} + + +WRITE_LINE_MEMBER(venture_sound_device::cb_w) +{ + m_pia->cb1_w(state); +} + + +void venture_sound_device::pia_pa_w(uint8_t data) +{ + m_pa_callback(data); +} + + +void venture_sound_device::pia_pb_w(uint8_t data) +{ + m_pb_callback(data); +} + + +WRITE_LINE_MEMBER(venture_sound_device::pia_ca2_w) +{ + m_ca2_callback(state); +} + + +WRITE_LINE_MEMBER(venture_sound_device::pia_cb2_w) +{ + m_cb2_callback(state); +} + + +void venture_sound_device::venture_audio_map(address_map &map) +{ + map.global_mask(0x7fff); + map(0x0000, 0x007f).mirror(0x0780).ram(); + map(0x0800, 0x087f).mirror(0x0780).rw("riot", FUNC(riot6532_device::read), FUNC(riot6532_device::write)); + map(0x1000, 0x1003).mirror(0x07fc).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x1800, 0x1803).mirror(0x07fc).w(FUNC(venture_sound_device::sh8253_w)); + map(0x2000, 0x27ff).w(FUNC(venture_sound_device::filter_w)); + map(0x2800, 0x2807).mirror(0x07f8).rw(FUNC(venture_sound_device::sh6840_r), FUNC(venture_sound_device::sh6840_w)); + map(0x3000, 0x3003).mirror(0x07fc).w(FUNC(venture_sound_device::sfxctrl_w)); + map(0x5800, 0x7fff).rom(); +} + + +void venture_sound_device::device_add_mconfig(machine_config &config) +{ + m6502_device &audiocpu(M6502(config, "audiocpu", 3579545/4)); + audiocpu.set_addrmap(AS_PROGRAM, &venture_sound_device::venture_audio_map); + + RIOT6532(config, m_riot, SH6532_CLOCK); + m_riot->in_pa_callback().set(FUNC(venture_sound_device::r6532_porta_r)); + m_riot->out_pa_callback().set(FUNC(venture_sound_device::r6532_porta_w)); + m_riot->in_pb_callback().set(FUNC(venture_sound_device::r6532_portb_r)); + m_riot->out_pb_callback().set(FUNC(venture_sound_device::r6532_portb_w)); + m_riot->irq_callback().set("audioirq", FUNC(input_merger_device::in_w<0>)); + + PIA6821(config, m_pia, 0); + m_pia->writepa_handler().set(FUNC(venture_sound_device::pia_pa_w)); + m_pia->writepb_handler().set(FUNC(venture_sound_device::pia_pb_w)); + m_pia->ca2_handler().set(FUNC(venture_sound_device::pia_ca2_w)); + m_pia->cb2_handler().set(FUNC(venture_sound_device::pia_cb2_w)); + m_pia->irqb_handler().set("audioirq", FUNC(input_merger_device::in_w<1>)); + + INPUT_MERGER_ANY_HIGH(config, "audioirq").output_handler().set_inputline("audiocpu", m6502_device::IRQ_LINE); // open collector + + SPEAKER(config, "mono").front_center(); + + this->add_route(ALL_OUTPUTS, "mono", 0.50); +} + + + +/************************************* + * + * CVSD sound for Mouse Trap + * + *************************************/ + +DEFINE_DEVICE_TYPE(EXIDY_MTRAP, mtrap_sound_device, "mtrap_sound", "Exidy SFX+PSG+CVSD") + +mtrap_sound_device::mtrap_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : venture_sound_device(mconfig, EXIDY_MTRAP, tag, owner, clock) + , m_cvsd_timer(*this,"cvsd_timer") + , m_cvsd_clk(false) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void mtrap_sound_device::device_start() +{ + common_sh_start(); + + /* 8253 */ + m_freq_to_step = (1 << 24) / SH8253_CLOCK; + + sh8253_register_state_globals(); + + save_item(NAME(m_cvsd_clk)); +} + +TIMER_DEVICE_CALLBACK_MEMBER(mtrap_sound_device::cvsd_timer) +{ + m_cvsd_clk = !m_cvsd_clk; + m_cvsd->clock_w(m_cvsd_clk); +} + +void mtrap_sound_device::voiceio_w(offs_t offset, uint8_t data) +{ + if (!(offset & 0x10)) + m_cvsd->digit_w(data & 1); + + if (!(offset & 0x20)) + m_riot->portb_in_set(data & 1, 0xff); +} + + +uint8_t mtrap_sound_device::voiceio_r(offs_t offset) +{ + uint8_t retval = 0xff; // this should probably be open bus + if (!(offset & 0x80)) + { + retval &= 0xf0; + uint8_t porta = m_riot->porta_out_get(); + uint8_t data = (porta & 0x06) >> 1; + data |= (porta & 0x01) << 2; + data |= (porta & 0x08); + retval |= data; + } + + if (!(offset & 0x40)) + { + retval &= 0x7f; + retval |= (m_cvsd_clk << 7); + } + + return retval; +} + + +void mtrap_sound_device::cvsd_map(address_map &map) +{ + map.global_mask(0x3fff); + map(0x0000, 0x3fff).rom().region("cvsdcpu", 0); +} + + +void mtrap_sound_device::cvsd_iomap(address_map &map) +{ + map.global_mask(0xff); + map(0x00, 0xff).rw(FUNC(mtrap_sound_device::voiceio_r), FUNC(mtrap_sound_device::voiceio_w)); +} + + +void mtrap_sound_device::device_add_mconfig(machine_config &config) +{ + venture_sound_device::device_add_mconfig(config); + + Z80(config, m_cvsdcpu, CVSD_Z80_CLOCK); + m_cvsdcpu->set_addrmap(AS_PROGRAM, &mtrap_sound_device::cvsd_map); + m_cvsdcpu->set_addrmap(AS_IO, &mtrap_sound_device::cvsd_iomap); + + TIMER(config, m_cvsd_timer).configure_periodic(FUNC(mtrap_sound_device::cvsd_timer), attotime::from_hz(CVSD_CLOCK*2.0)); // this is a 555 timer with 53% duty cycle, within margin of error of 50% duty cycle; the handler clocks on both clock edges, hence * 2.0 + + /* audio hardware */ + FILTER_BIQUAD(config, m_cvsd_filter2).opamp_mfb_lowpass_setup(RES_K(10), RES_K(3.9), RES_K(18), CAP_N(20), CAP_N(2.2)); + m_cvsd_filter2->add_route(ALL_OUTPUTS, "mono", 1.0); + FILTER_BIQUAD(config, m_cvsd_filter).opamp_mfb_lowpass_setup(RES_K(10), RES_K(3.9), RES_K(18), CAP_N(20), CAP_N(2.2)); + m_cvsd_filter->add_route(ALL_OUTPUTS, m_cvsd_filter2, 1.0); + MC3417(config, m_cvsd, 0).add_route(ALL_OUTPUTS, m_cvsd_filter, 0.3086); // each filter has gain of 1.8 for total gain of 3.24, 0.3086 cancels this out. was 0.8 + +} + + +/************************************* + * + * Victory + * + *************************************/ + +#define VICTORY_AUDIO_CPU_CLOCK (XTAL(3'579'545) / 4) +#define VICTORY_LOG_SOUND 0 + + + +uint8_t victory_sound_device::response_r() +{ + uint8_t ret = m_pia->b_output(); + + if (!machine().side_effects_disabled()) + { + if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound response read = %02X\n", machine().describe_context(), ret); + + m_pia_cb1 = 0; + m_pia->cb1_w(m_pia_cb1); + } + + return ret; +} + + +uint8_t victory_sound_device::status_r() +{ + uint8_t ret = (m_pia_ca1 << 7) | (m_pia_cb1 << 6); + + if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound status read = %02X\n", machine().describe_context(), ret); + + return ret; +} + + +TIMER_CALLBACK_MEMBER(victory_sound_device::delayed_command_w) +{ + m_pia->porta_w(param); + m_pia_ca1 = 0; + m_pia->ca1_w(m_pia_ca1); +} + +void victory_sound_device::command_w(uint8_t data) +{ + if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound command = %02X\n", machine().describe_context(), data); + + machine().scheduler().synchronize(timer_expired_delegate(FUNC(victory_sound_device::delayed_command_w), this), data); +} + + +WRITE_LINE_MEMBER(victory_sound_device::irq_clear_w) +{ + if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound IRQ clear = %02X\n", machine().describe_context(), state); + + if (!state) + { + m_pia_ca1 = 1; + m_pia->ca1_w(m_pia_ca1); + } +} + + +WRITE_LINE_MEMBER(victory_sound_device::main_ack_w) +{ + if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound Main ACK W = %02X\n", machine().describe_context(), state); + + if (m_victory_sound_response_ack_clk && !state) + { + m_pia_cb1 = 1; + m_pia->cb1_w(m_pia_cb1); + } + + m_victory_sound_response_ack_clk = state; +} + + +DEFINE_DEVICE_TYPE(EXIDY_VICTORY, victory_sound_device, "victory_sound", "Exidy SFX+PSG+Speech") + +victory_sound_device::victory_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : exidy_sh8253_sound_device(mconfig, EXIDY_VICTORY, tag, owner, clock) + , m_victory_sound_response_ack_clk(0) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void victory_sound_device::device_start() +{ + save_item(NAME(m_victory_sound_response_ack_clk)); + save_item(NAME(m_pia_ca1)); + save_item(NAME(m_pia_cb1)); + + exidy_sh8253_sound_device::device_start(); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void victory_sound_device::device_reset() +{ + exidy_sh8253_sound_device::device_reset(); + + /* the flip-flop @ F4 is reset */ + m_victory_sound_response_ack_clk = 0; + m_pia_cb1 = 1; + m_pia->cb1_w(m_pia_cb1); + + /* these two lines shouldn't be needed, but it avoids the log entry + as the sound CPU checks port A before the main CPU ever writes to it */ + m_pia->porta_w(0); + m_pia_ca1 = 1; + m_pia->ca1_w(m_pia_ca1); +} + + +void victory_sound_device::victory_audio_map(address_map &map) +{ + map(0x0000, 0x00ff).mirror(0x0f00).ram(); + map(0x1000, 0x107f).mirror(0x0f80).rw("riot", FUNC(riot6532_device::read), FUNC(riot6532_device::write)); + map(0x2000, 0x2003).mirror(0x0ffc).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x3000, 0x3003).mirror(0x0ffc).w(FUNC(victory_sound_device::sh8253_w)); + map(0x4000, 0x4fff).noprw(); + map(0x5000, 0x5007).mirror(0x0ff8).rw(FUNC(victory_sound_device::sh6840_r), FUNC(victory_sound_device::sh6840_w)); + map(0x6000, 0x6003).mirror(0x0ffc).w(FUNC(victory_sound_device::sfxctrl_w)); + map(0x7000, 0xafff).noprw(); + map(0xb000, 0xffff).rom(); +} + + +void victory_sound_device::device_add_mconfig(machine_config &config) +{ + m6502_device &audiocpu(M6502(config, "audiocpu", VICTORY_AUDIO_CPU_CLOCK)); + audiocpu.set_addrmap(AS_PROGRAM, &victory_sound_device::victory_audio_map); + + RIOT6532(config, m_riot, SH6532_CLOCK); + m_riot->in_pa_callback().set(FUNC(victory_sound_device::r6532_porta_r)); + m_riot->out_pa_callback().set(FUNC(victory_sound_device::r6532_porta_w)); + m_riot->in_pb_callback().set(FUNC(victory_sound_device::r6532_portb_r)); + m_riot->out_pb_callback().set(FUNC(victory_sound_device::r6532_portb_w)); + m_riot->irq_callback().set("audioirq", FUNC(input_merger_device::in_w<0>)); + + PIA6821(config, m_pia, 0); + m_pia->ca2_handler().set(FUNC(victory_sound_device::irq_clear_w)); + m_pia->cb2_handler().set(FUNC(victory_sound_device::main_ack_w)); + m_pia->irqb_handler().set("audioirq", FUNC(input_merger_device::in_w<1>)); + + INPUT_MERGER_ANY_HIGH(config, "audioirq").output_handler().set_inputline("audiocpu", m6502_device::IRQ_LINE); // open collector + + SPEAKER(config, "mono").front_center(); + + this->add_route(ALL_OUTPUTS, "mono", 1.0); + + TMS5220(config, m_tms, 640000).add_route(ALL_OUTPUTS, "mono", 1.0); +} diff --git a/src/mame/shared/exidysound.h b/src/mame/shared/exidysound.h new file mode 100644 index 00000000000..ce66b0e33fd --- /dev/null +++ b/src/mame/shared/exidysound.h @@ -0,0 +1,233 @@ +// license:BSD-3-Clause +// copyright-holders:Aaron Giles +#ifndef MAME_SHARED_EXIDYSOUND_H +#define MAME_SHARED_EXIDYSOUND_H + +#pragma once + +#include "machine/6532riot.h" +#include "machine/6821pia.h" +#include "machine/timer.h" +#include "sound/flt_biquad.h" +#include "sound/hc55516.h" +#include "sound/tms5220.h" + + +class exidy_sound_device : public device_t, + public device_sound_interface +{ + /* 6840 variables */ + struct sh6840_timer_channel + { + uint8_t cr = 0; + uint8_t state = 0; + uint8_t leftovers = 0; + uint16_t timer = 0; + uint32_t clocks = 0; + union + { +#ifdef LSB_FIRST + struct { uint8_t l, h; } b; +#else + struct { uint8_t h, l; } b; +#endif + uint16_t w; + } counter; + }; + +public: + exidy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ~exidy_sound_device() {} + + uint8_t sh6840_r(offs_t offset); + void sh6840_w(offs_t offset, uint8_t data); + void sfxctrl_w(offs_t offset, uint8_t data); + +protected: + exidy_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + void common_sh_start(); + void common_sh_reset(); + + void sh6840_register_state_globals(); + + // sound stream update overrides + virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; + virtual s32 generate_music_sample(); + + static inline void sh6840_apply_clock(sh6840_timer_channel *t, int clocks); + + /* sound streaming variables */ + sound_stream *m_stream; + double m_freq_to_step; + +private: + // internal state + sh6840_timer_channel m_sh6840_timer[3]; + int16_t m_sh6840_volume[3]; + uint8_t m_sh6840_MSB_latch; + uint8_t m_sh6840_LSB_latch; + uint8_t m_sh6840_LFSR_oldxor; + uint32_t m_sh6840_LFSR_0; + uint32_t m_sh6840_LFSR_1; + uint32_t m_sh6840_LFSR_2; + uint32_t m_sh6840_LFSR_3; + uint32_t m_sh6840_clocks_per_sample; + uint32_t m_sh6840_clock_count; + + uint8_t m_sfxctrl; + + inline int sh6840_update_noise(int clocks); +}; + +DECLARE_DEVICE_TYPE(EXIDY, exidy_sound_device) + +class exidy_sh8253_sound_device : public exidy_sound_device +{ + struct sh8253_timer_channel + { + uint8_t clstate = 0; + uint8_t enable = 0; + uint16_t count = 0; + uint32_t step = 0; + uint32_t fraction = 0; + }; + +protected: + exidy_sh8253_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + virtual s32 generate_music_sample() override; + + void r6532_porta_w(uint8_t data); + uint8_t r6532_porta_r(); + void r6532_portb_w(uint8_t data); + uint8_t r6532_portb_r(); + + void sh8253_w(offs_t offset, uint8_t data); + + void sh8253_register_state_globals(); + + /* 8253 variables */ + sh8253_timer_channel m_sh8253_timer[3]; + + /* 6532 variables */ + required_device m_riot; + + /* 5220/CVSD variables */ + optional_device m_cvsd; + optional_device m_cvsd_filter; + optional_device m_cvsd_filter2; + optional_device m_cvsdcpu; + optional_device m_tms; + required_device m_pia; +}; + +class venture_sound_device : public exidy_sh8253_sound_device +{ +public: + venture_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + // configuration access + auto pa_callback() { return m_pa_callback.bind(); } + auto pb_callback() { return m_pb_callback.bind(); } + auto ca2_callback() { return m_ca2_callback.bind(); } + auto cb2_callback() { return m_cb2_callback.bind(); } + + // external access + void pa_w(uint8_t data); + void pb_w(uint8_t data); + DECLARE_WRITE_LINE_MEMBER(ca_w); + DECLARE_WRITE_LINE_MEMBER(cb_w); + +protected: + venture_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + // device-level overrides + virtual void device_resolve_objects() override; + virtual void device_add_mconfig(machine_config &config) override; + + void venture_audio_map(address_map &map); + +private: + void filter_w(uint8_t data); + + void pia_pa_w(uint8_t data); + void pia_pb_w(uint8_t data); + DECLARE_WRITE_LINE_MEMBER(pia_ca2_w); + DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); + + void venture_audio(machine_config &config); + + devcb_write8 m_pa_callback; + devcb_write8 m_pb_callback; + devcb_write_line m_ca2_callback; + devcb_write_line m_cb2_callback; +}; + +DECLARE_DEVICE_TYPE(EXIDY_VENTURE, venture_sound_device) + +class mtrap_sound_device : public venture_sound_device +{ +public: + mtrap_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_add_mconfig(machine_config &config) override; + +private: + required_device m_cvsd_timer; + TIMER_DEVICE_CALLBACK_MEMBER(cvsd_timer); + void voiceio_w(offs_t offset, uint8_t data); + uint8_t voiceio_r(offs_t offset); + bool m_cvsd_clk; + + void cvsd_map(address_map &map); + void cvsd_iomap(address_map &map); +}; + +DECLARE_DEVICE_TYPE(EXIDY_MTRAP, mtrap_sound_device) + +class victory_sound_device : public exidy_sh8253_sound_device +{ +public: + victory_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + // external access + uint8_t response_r(); + uint8_t status_r(); + void command_w(uint8_t data); + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_add_mconfig(machine_config &config) override; + +private: + DECLARE_WRITE_LINE_MEMBER(irq_clear_w); + DECLARE_WRITE_LINE_MEMBER(main_ack_w); + + void victory_audio_map(address_map &map); + + // internal state + uint8_t m_victory_sound_response_ack_clk; /* 7474 @ F4 */ + + TIMER_CALLBACK_MEMBER( delayed_command_w ); + + int m_pia_ca1 = 0; + int m_pia_cb1 = 0; +}; + +DECLARE_DEVICE_TYPE(EXIDY_VICTORY, victory_sound_device) + +#endif // MAME_SHARED_EXIDYSOUND_H diff --git a/src/mame/shared/gottlieb_a.cpp b/src/mame/shared/gottlieb_a.cpp index eee39b1ce51..3a7a3f1385a 100644 --- a/src/mame/shared/gottlieb_a.cpp +++ b/src/mame/shared/gottlieb_a.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/gottlieb.h" +#include "gottlieb_a.h" #include "machine/input_merger.h" diff --git a/src/mame/shared/inder_vid.cpp b/src/mame/shared/inder_vid.cpp index d080159a77c..c4ad7a7f299 100644 --- a/src/mame/shared/inder_vid.cpp +++ b/src/mame/shared/inder_vid.cpp @@ -3,7 +3,7 @@ /* Inder / Dinamic Video */ #include "emu.h" -#include "machine/inder_vid.h" +#include "inder_vid.h" #include "screen.h" diff --git a/src/mame/shared/megadriv.cpp b/src/mame/shared/megadriv.cpp new file mode 100644 index 00000000000..80a238bf9b9 --- /dev/null +++ b/src/mame/shared/megadriv.cpp @@ -0,0 +1,1108 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood +/* + +Megadrive / Genesis support + +this could probably do with a complete rewrite at this point to take into +account all new information discovered since this was created, it's looking +rather old now. + + + +Cleanup / Rewrite notes: + + + +Known Non-Issues (confirmed on Real Genesis) + Castlevania - Bloodlines (U) [!] - Pause text is missing on upside down level + Blood Shot (E) (M4) [!] - corrupt texture in level 1 is correct... + + + +*/ + + +#include "emu.h" +#include "megadriv.h" +#include "speaker.h" + +#define LOG_AUDIOBANK (1U << 1) // z80 to 68k space window access at $8000-$ffff +#define LOG_AUDIOBUS (1U << 2) // z80 bus grants +#define LOG_AUDIORESET (1U << 3) // z80 reset line + +#define VERBOSE (0) + +#include "logmacro.h" + +#define LOGAUDIOBANK(...) LOGMASKED(LOG_AUDIOBANK, __VA_ARGS__) +#define LOGAUDIOBUS(...) LOGMASKED(LOG_AUDIOBUS, __VA_ARGS__) +#define LOGAUDIORESET(...) LOGMASKED(LOG_AUDIORESET, __VA_ARGS__) + + +void md_base_state::megadriv_z80_bank_w(uint16_t data) +{ + // TODO: menghu crashes here + // Tries to setup a bank of 0xff0000 from z80 side (PC=1131) after you talk with the cashier twice. + // Without a guard over it game will trash 68k memory causing a crash, works on real HW with everdrive + // so not coming from a cart copy protection. + // Update: it breaks cfodder BGM on character select at least, therefore we current don't guard against it + // Apparently reading 68k RAM from z80 is not recommended by Sega, so *writing* isn't possible lacking bus grant? + m_genz80.z80_bank_addr = ((m_genz80.z80_bank_addr >> 1) | (data << 23)) & 0xff8000; +} + +void md_base_state::megadriv_68k_z80_bank_write(uint16_t data) +{ + megadriv_z80_bank_w(data & 0x01); +} + +void md_base_state::megadriv_z80_z80_bank_w(uint8_t data) +{ + LOGAUDIOBANK("%s: port $6000 write 0x%02x ", machine().describe_context(), data); + megadriv_z80_bank_w(data & 0x01); + LOGAUDIOBANK("Current bank %08x\n", m_genz80.z80_bank_addr); +} + +uint8_t md_base_state::megadriv_68k_YM2612_read(offs_t offset, uint8_t mem_mask) +{ + //osd_printf_debug("megadriv_68k_YM2612_read %02x %04x\n",offset,mem_mask); + if ((m_genz80.z80_has_bus == 0) && (m_genz80.z80_is_reset == 0)) + { + return m_ymsnd->read(offset); + } + else + { + LOG("%s: 68000 attempting to access YM2612 (read) without bus\n", machine().describe_context()); + return 0; + } + + // never executed + //return -1; +} + + +void md_base_state::megadriv_68k_YM2612_write(offs_t offset, uint8_t data, uint8_t mem_mask) +{ + //osd_printf_debug("megadriv_68k_YM2612_write %02x %04x %04x\n",offset,data,mem_mask); + if ((m_genz80.z80_has_bus == 0) && (m_genz80.z80_is_reset == 0)) + { + m_ymsnd->write(offset, data); + } + else + { + LOG("%s: 68000 attempting to access YM2612 (write) without bus\n", machine().describe_context()); + } +} + +// this is used by 6 button pads and gets installed in machine_start for drivers requiring it +TIMER_CALLBACK_MEMBER(md_base_state::io_timeout_timer_callback) +{ + m_io_stage[(int)param] = -1; +} + + +/* + + A10001h = A0 Version register + + A10003h = 7F Data register for port A + A10005h = 7F Data register for port B + A10007h = 7F Data register for port C + + A10009h = 00 Ctrl register for port A + A1000Bh = 00 Ctrl register for port B + A1000Dh = 00 Ctrl register for port C + + A1000Fh = FF TxData register for port A + A10011h = 00 RxData register for port A + A10013h = 00 S-Ctrl register for port A + + A10015h = FF TxData register for port B + A10017h = 00 RxData register for port B + A10019h = 00 S-Ctrl register for port B + + A1001Bh = FF TxData register for port C + A1001Dh = 00 RxData register for port C + A1001Fh = 00 S-Ctrl register for port C + + + + + Bit 7 - (Not connected) + Bit 6 - TH + Bit 5 - TL + Bit 4 - TR + Bit 3 - RIGHT + Bit 2 - LEFT + Bit 1 - DOWN + Bit 0 - UP + + +*/ + +INPUT_PORTS_START( md_common ) + PORT_START("PAD1") /* Joypad 1 (3 button + start) NOT READ DIRECTLY */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 B") // b + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 C") // c + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 A") // a + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME("P1 START") // start + + PORT_START("PAD2") /* Joypad 2 (3 button + start) NOT READ DIRECTLY */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 B") // b + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 C") // c + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 A") // a + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("P2 START") // start +INPUT_PORTS_END + + +INPUT_PORTS_START( megadriv ) + PORT_INCLUDE( md_common ) + + PORT_START("RESET") /* Buttons on Genesis Console */ + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Reset Button") PORT_IMPULSE(1) // reset, resets 68k (and..?) +INPUT_PORTS_END + +INPUT_PORTS_START( megadri6 ) + PORT_INCLUDE( megadriv ) + + PORT_START("EXTRA1") /* Extra buttons for Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1) PORT_NAME("P1 Z") // z + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) PORT_NAME("P1 Y") // y + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_NAME("P1 X") // x + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_PLAYER(1) PORT_NAME("P1 MODE") // mode + + PORT_START("EXTRA2") /* Extra buttons for Joypad 2 (6 button + start + mode) NOT READ DIRECTLY */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(2) PORT_NAME("P2 Z") // z + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) PORT_NAME("P2 Y") // y + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) PORT_NAME("P2 X") // x + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_PLAYER(2) PORT_NAME("P2 MODE") // mode +INPUT_PORTS_END + +void md_base_state::megadrive_reset_io() +{ + int i; + + m_megadrive_io_data_regs[0] = 0x7f; + m_megadrive_io_data_regs[1] = 0x7f; + m_megadrive_io_data_regs[2] = 0x7f; + m_megadrive_io_ctrl_regs[0] = 0x00; + m_megadrive_io_ctrl_regs[1] = 0x00; + m_megadrive_io_ctrl_regs[2] = 0x00; + m_megadrive_io_tx_regs[0] = 0xff; + m_megadrive_io_tx_regs[1] = 0xff; + m_megadrive_io_tx_regs[2] = 0xff; + + for (i=0; i<3; i++) + { + m_io_stage[i] = -1; + } +} + +/************* 6 buttons version **************************/ +uint8_t md_base_state::megadrive_io_read_data_port_6button(offs_t offset) +{ + int portnum = offset; + uint8_t retdata, helper = (m_megadrive_io_ctrl_regs[portnum] & 0x3f) | 0xc0; // bits 6 & 7 always come from m_megadrive_io_data_regs + + if (m_megadrive_io_data_regs[portnum] & 0x40) + { + if (m_io_stage[portnum] == 2) + { + /* here we read B, C & the additional buttons */ + retdata = (m_megadrive_io_data_regs[portnum] & helper) | + ((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0x30) | + ((m_io_pad_6b[portnum] ? m_io_pad_6b[portnum]->read() : 0) & 0x0f)) & ~helper); + } + else + { + /* here we read B, C & the directional buttons */ + retdata = (m_megadrive_io_data_regs[portnum] & helper) | + (((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0x3f) & ~helper); + } + } + else + { + if (m_io_stage[portnum] == 1) + { + /* here we read ((Start & A) >> 2) | 0x00 */ + retdata = (m_megadrive_io_data_regs[portnum] & helper) | + ((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0xc0) >> 2) & ~helper); + } + else if (m_io_stage[portnum]==2) + { + /* here we read ((Start & A) >> 2) | 0x0f */ + retdata = (m_megadrive_io_data_regs[portnum] & helper) | + (((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0xc0) >> 2) | 0x0f) & ~helper); + } + else + { + /* here we read ((Start & A) >> 2) | Up and Down */ + retdata = (m_megadrive_io_data_regs[portnum] & helper) | + (((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0xc0) >> 2) | + ((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0x03)) & ~helper); + } + } + +// osd_printf_debug("read io data port stage %d port %d %02x\n",m_io_stage[portnum],portnum,retdata); + + return retdata | (retdata << 8); +} + + +/************* 3 buttons version **************************/ +uint8_t md_base_state::megadrive_io_read_data_port_3button(offs_t offset) +{ + int portnum = offset; + uint8_t retdata, helper = (m_megadrive_io_ctrl_regs[portnum] & 0x7f) | 0x80; // bit 7 always comes from m_megadrive_io_data_regs + + if (m_megadrive_io_data_regs[portnum] & 0x40) + { + /* here we read B, C & the directional buttons */ + retdata = (m_megadrive_io_data_regs[portnum] & helper) | + ((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0x3f) | 0x40) & ~helper); + } + else + { + /* here we read ((Start & A) >> 2) | Up and Down */ + retdata = (m_megadrive_io_data_regs[portnum] & helper) | + (((((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0xc0) >> 2) | + ((m_io_pad_3b[portnum] ? m_io_pad_3b[portnum]->read() : 0) & 0x03) | 0x40) & ~helper); + } + + return retdata; +} + +uint8_t md_base_state::megadrive_io_read_ctrl_port(int portnum) +{ + uint8_t retdata; + retdata = m_megadrive_io_ctrl_regs[portnum]; + //osd_printf_debug("read io ctrl port %d %02x\n",portnum,retdata); + + return retdata | (retdata << 8); +} + +uint8_t md_base_state::megadrive_io_read_tx_port(int portnum) +{ + uint8_t retdata; + retdata = m_megadrive_io_tx_regs[portnum]; + return retdata | (retdata << 8); +} + +uint8_t md_base_state::megadrive_io_read_rx_port(int portnum) +{ + return 0x00; +} + +uint8_t md_base_state::megadrive_io_read_sctrl_port(int portnum) +{ + return 0x00; +} + + +uint16_t md_base_state::megadriv_68k_io_read(offs_t offset) +{ + uint8_t retdata; + + retdata = 0; + /* Charles MacDonald ( http://cgfm2.emuviews.com/ ) + D7 : Console is 1= Export (USA, Europe, etc.) 0= Domestic (Japan) + D6 : Video type is 1= PAL, 0= NTSC + D5 : Sega CD unit is 1= not present, 0= connected. + D4 : Unused (always returns zero) + D3 : Bit 3 of version number + D2 : Bit 2 of version number + D1 : Bit 1 of version number + D0 : Bit 0 of version number + */ + + //return (machine().rand()&0x0f0f)|0xf0f0;//0x0000; + switch (offset) + { + case 0: + LOG("%06x read version register\n", m_maincpu->pc()); + // Version number contained in bits 3-0 + // TODO: non-TMSS BIOSes must return 0 here + retdata = m_version_hi_nibble | 0x01; + break; + + /* Joystick Port Registers */ + + case 0x1: + case 0x2: + case 0x3: + retdata = m_megadrive_io_read_data_port_ptr(offset-1); + break; + + case 0x4: + case 0x5: + case 0x6: + retdata = megadrive_io_read_ctrl_port(offset-4); + break; + + /* Serial I/O Registers */ + + case 0x7: retdata = megadrive_io_read_tx_port(0); break; + case 0x8: retdata = megadrive_io_read_rx_port(0); break; + case 0x9: retdata = megadrive_io_read_sctrl_port(0); break; + + case 0xa: retdata = megadrive_io_read_tx_port(1); break; + case 0xb: retdata = megadrive_io_read_rx_port(1); break; + case 0xc: retdata = megadrive_io_read_sctrl_port(1); break; + + case 0xd: retdata = megadrive_io_read_tx_port(2); break; + case 0xe: retdata = megadrive_io_read_rx_port(2); break; + case 0xf: retdata = megadrive_io_read_sctrl_port(2); break; + + } + + return retdata | (retdata << 8); +} + + +void md_base_state::megadrive_io_write_data_port_3button(offs_t offset, uint16_t data) +{ + int portnum = offset; + m_megadrive_io_data_regs[portnum] = data; + //osd_printf_debug("Writing IO Data Register #%d data %04x\n",portnum,data); + +} + + +/****************************** 6 buttons version*****************************/ + +void md_base_state::megadrive_io_write_data_port_6button(offs_t offset, uint16_t data) +{ + int portnum = offset; + if (m_megadrive_io_ctrl_regs[portnum]&0x40) + { + if (((m_megadrive_io_data_regs[portnum]&0x40)==0x00) && ((data&0x40) == 0x40)) + { + m_io_stage[portnum]++; + m_io_timeout[portnum]->adjust(m_maincpu->cycles_to_attotime(8192), portnum); + } + + } + + m_megadrive_io_data_regs[portnum] = data; + //osd_printf_debug("Writing IO Data Register #%d data %04x\n",portnum,data); + +} + + +/*************************** 3 buttons version ****************************/ + +void md_base_state::megadrive_io_write_ctrl_port(int portnum, uint16_t data) +{ + m_megadrive_io_ctrl_regs[portnum] = data; +// osd_printf_debug("Setting IO Control Register #%d data %04x\n",portnum,data); +} + +void md_base_state::megadrive_io_write_tx_port(int portnum, uint16_t data) +{ + m_megadrive_io_tx_regs[portnum] = data; +} + +void md_base_state::megadrive_io_write_rx_port(int portnum, uint16_t data) +{ +} + +void md_base_state::megadrive_io_write_sctrl_port(int portnum, uint16_t data) +{ +} + + +void md_base_state::megadriv_68k_io_write(offs_t offset, uint16_t data, uint16_t mem_mask) +{ +// osd_printf_debug("IO Write #%02x data %04x mem_mask %04x\n",offset,data,mem_mask); + + + switch (offset) + { + case 0x0: + osd_printf_debug("Write to Version Register?!\n"); + break; + + /* Joypad Port Registers */ + + case 0x1: + case 0x2: + case 0x3: + m_megadrive_io_write_data_port_ptr(offset-1,data); + break; + + case 0x4: + case 0x5: + case 0x6: + megadrive_io_write_ctrl_port(offset-4,data); + break; + + /* Serial I/O Registers */ + + case 0x7: megadrive_io_write_tx_port(0,data); break; + case 0x8: megadrive_io_write_rx_port(0,data); break; + case 0x9: megadrive_io_write_sctrl_port(0,data); break; + + case 0xa: megadrive_io_write_tx_port(1,data); break; + case 0xb: megadrive_io_write_rx_port(1,data); break; + case 0xc: megadrive_io_write_sctrl_port(1,data); break; + + case 0xd: megadrive_io_write_tx_port(2,data); break; + case 0xe: megadrive_io_write_rx_port(2,data); break; + case 0xf: megadrive_io_write_sctrl_port(2,data); break; + } +} + + + +void md_base_state::megadriv_map(address_map &map) +{ + map(0x000000, 0x3fffff).rom(); + /* (0x000000 - 0x3fffff) == GAME ROM (4Meg Max, Some games have special banking too) */ + + map(0xa00000, 0xa01fff).rw(FUNC(md_base_state::megadriv_68k_read_z80_ram), FUNC(md_base_state::megadriv_68k_write_z80_ram)); + map(0xa02000, 0xa03fff).w(FUNC(md_base_state::megadriv_68k_write_z80_ram)); + map(0xa04000, 0xa04003).rw(FUNC(md_base_state::megadriv_68k_YM2612_read), FUNC(md_base_state::megadriv_68k_YM2612_write)); + + map(0xa06000, 0xa06001).w(FUNC(md_base_state::megadriv_68k_z80_bank_write)); + + map(0xa10000, 0xa1001f).rw(FUNC(md_base_state::megadriv_68k_io_read), FUNC(md_base_state::megadriv_68k_io_write)); + + map(0xa11100, 0xa11101).rw(FUNC(md_base_state::megadriv_68k_check_z80_bus), FUNC(md_base_state::megadriv_68k_req_z80_bus)); + map(0xa11200, 0xa11201).w(FUNC(md_base_state::megadriv_68k_req_z80_reset)); + + map(0xc00000, 0xc0001f).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); + map(0xd00000, 0xd0001f).rw(m_vdp, FUNC(sega315_5313_device::vdp_r), FUNC(sega315_5313_device::vdp_w)); // the earth defend + map(0xe00000, 0xe0ffff).ram().mirror(0x1f0000).share("megadrive_ram"); +// map(0xff0000, 0xffffff).readonly(); + /* 0xe00000 - 0xffffff) == MAIN RAM (64kb, Mirrored, most games use ff0000 - ffffff) */ +} + + +void md_base_state::dcat16_megadriv_map(address_map &map) +{ + megadriv_map(map); + map(0x000000, 0x7fffff).rom(); +} + + +/* z80 sounds/sub CPU */ + + +uint16_t md_base_state::megadriv_68k_read_z80_ram(offs_t offset, uint16_t mem_mask) +{ + //osd_printf_debug("read z80 ram %04x\n",mem_mask); + + if ((m_genz80.z80_has_bus == 0) && (m_genz80.z80_is_reset == 0)) + { + return m_genz80.z80_prgram[(offset<<1)^1] | (m_genz80.z80_prgram[(offset<<1)]<<8); + } + else + { + LOG("%06x: 68000 attempting to access Z80 (read) address space without bus\n", m_maincpu->pc()); + return machine().rand(); + } +} + +void md_base_state::megadriv_68k_write_z80_ram(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + if ((m_genz80.z80_has_bus == 0) && (m_genz80.z80_is_reset == 0)) + { + if (!ACCESSING_BITS_0_7) // byte (MSB) access + { + m_genz80.z80_prgram[(offset<<1)] = (data & 0xff00) >> 8; + } + else if (!ACCESSING_BITS_8_15) + { + m_genz80.z80_prgram[(offset<<1)^1] = (data & 0x00ff); + } + else + { + // for WORD access only the MSB is used, LSB is ignored + m_genz80.z80_prgram[(offset<<1)] = (data & 0xff00) >> 8; + } + } + else + { + LOG("%06x: 68000 attempting to access Z80 (write) address space without bus\n", m_maincpu->pc()); + } +} + +/* + * ddragon, beast, superoff, and timekill have buggy sound programs. + * They request the bus, then have a loop which waits for the bus + * to be unavailable, checking for a 0 value due to bad coding. The real hardware + * appears to return bits of the next instruction in the unused bits, thus meaning + * the value is never zero. Time Killers is the most fussy, and doesn't like the + * read_next_instruction function from system16, so I just return a random value + * in the unused bits + */ +uint16_t md_base_state::megadriv_68k_check_z80_bus(offs_t offset, uint16_t mem_mask) +{ + uint16_t retvalue; + + + uint16_t nextvalue = machine().rand(); //read_next_instruction(space)&0xff00; + + + /* Check if the 68k has the z80 bus */ + if (!ACCESSING_BITS_0_7) // byte (MSB) access + { + if (m_genz80.z80_has_bus || m_genz80.z80_is_reset) retvalue = nextvalue | 0x0100; + else retvalue = (nextvalue & 0xfeff); + + LOGAUDIOBUS("%06x: 68000 check z80 Bus (byte MSB access) returning %04x mask %04x\n", m_maincpu->pc(),retvalue, mem_mask); + return retvalue; + + } + else if (!ACCESSING_BITS_8_15) // is this valid? + { + LOGAUDIOBUS("%06x: 68000 check z80 Bus (byte LSB access) %04x\n", m_maincpu->pc(), mem_mask); + if (m_genz80.z80_has_bus || m_genz80.z80_is_reset) retvalue = 0x0001; + else retvalue = 0x0000; + + return retvalue; + } + else + { + LOGAUDIOBUS("%06x: 68000 check z80 Bus (word access) %04x\n", m_maincpu->pc(),mem_mask); + if (m_genz80.z80_has_bus || m_genz80.z80_is_reset) retvalue = nextvalue | 0x0100; + else retvalue = (nextvalue & 0xfeff); + + // osd_printf_debug("%06x: 68000 check z80 Bus (word access) %04x %04x\n", m_maincpu->pc(),mem_mask, retvalue); + return retvalue; + } +} + + +TIMER_CALLBACK_MEMBER(md_base_state::megadriv_z80_run_state) +{ + /* Is the z80 RESET line pulled? */ + // TODO: Z80 /RESET + if (m_genz80.z80_is_reset) + { + m_z80snd->reset(); + m_z80snd->suspend(SUSPEND_REASON_HALT, 1); + m_ymsnd->reset(); + } + else + { + /* Check if z80 has the bus */ + // TODO: Z80 /BUSREQ + if (m_genz80.z80_has_bus) + m_z80snd->resume(SUSPEND_REASON_HALT); + else + m_z80snd->suspend(SUSPEND_REASON_HALT, 1); + } +} + + +void md_base_state::megadriv_68k_req_z80_bus(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + /* Request the Z80 bus, allows 68k to read/write Z80 address space */ + if (!ACCESSING_BITS_0_7) // byte access + { + if (data & 0x0100) + { + LOGAUDIOBUS("%06x: 68000 request z80 Bus (byte MSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_has_bus = 0; + } + else + { + LOGAUDIOBUS("%06x: 68000 return z80 Bus (byte MSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_has_bus = 1; + } + } + else if (!ACCESSING_BITS_8_15) // is this valid? + { + if (data & 0x0001) + { + LOGAUDIOBUS("%06x: 68000 request z80 Bus (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_has_bus = 0; + } + else + { + LOGAUDIOBUS("%06x: 68000 return z80 Bus (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_has_bus = 1; + } + } + else // word access + { + if (data & 0x0100) + { + LOGAUDIOBUS("%06x: 68000 request z80 Bus (word access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_has_bus = 0; + } + else + { + LOGAUDIOBUS("%06x: 68000 return z80 Bus (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_has_bus = 1; + } + } + + /* If the z80 is running, sync the z80 execution state */ + if (!m_genz80.z80_is_reset) + m_genz80.z80_run_timer->adjust(attotime::zero); +} + +void md_base_state::megadriv_68k_req_z80_reset(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + if (!ACCESSING_BITS_0_7) // byte access + { + if (data & 0x0100) + { + LOGAUDIORESET("%06x: 68000 clear z80 reset (byte MSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_is_reset = 0; + } + else + { + LOGAUDIORESET("%06x: 68000 start z80 reset (byte MSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_is_reset = 1; + } + } + else if (!ACCESSING_BITS_8_15) // is this valid? + { + if (data & 0x0001) + { + LOGAUDIORESET("%06x: 68000 clear z80 reset (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_is_reset = 0; + } + else + { + LOGAUDIORESET("%06x: 68000 start z80 reset (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_is_reset = 1; + } + } + else // word access + { + if (data & 0x0100) + { + LOGAUDIORESET("%06x: 68000 clear z80 reset (word access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_is_reset = 0; + } + else + { + LOGAUDIORESET("%06x: 68000 start z80 reset (byte LSB access) %04x %04x\n", m_maincpu->pc(),data,mem_mask); + m_genz80.z80_is_reset = 1; + } + } + m_genz80.z80_run_timer->adjust(attotime::zero); +} + + +// just directly access the 68k space, this makes it easier to deal with +// add-on hardware which changes the cpu mapping like the 32x and SegaCD. +// - we might need to add exceptions for example, z80 reading / writing the +// z80 area of the 68k if games misbehave +uint8_t md_base_state::z80_read_68k_banked_data(offs_t offset) +{ + address_space &space68k = m_maincpu->space(); + uint8_t ret = space68k.read_byte(m_genz80.z80_bank_addr+offset); + return ret; +} + +void md_base_state::z80_write_68k_banked_data(offs_t offset, uint8_t data) +{ + address_space &space68k = m_maincpu->space(); + space68k.write_byte(m_genz80.z80_bank_addr+offset,data); +} + +void md_base_state::megadriv_z80_vdp_write(offs_t offset, uint8_t data) +{ + switch (offset) + { + case 0x11: + case 0x13: + case 0x15: + case 0x17: + // accessed by either segapsg_device or sn76496_device + m_vdp->vdp_w(offset >> 1, data, 0x00ff); + break; + + default: + osd_printf_debug("unhandled z80 vdp write %02x %02x\n",offset,data); + } +} + + +uint8_t md_base_state::megadriv_z80_vdp_read(offs_t offset) +{ + u8 ret = 0; + u8 shift = ((~offset & 1) << 3); + switch (offset & ~1) + { + case 0x04: // ctrl_port_r + case 0x06: + case 0x08: // H/V counter + case 0x0a: + case 0x0c: + case 0x0e: + ret = m_vdp->vdp_r(offset >> 1, 0xff << shift) >> shift; + break; + + default: + if (!machine().side_effects_disabled()) + osd_printf_debug("unhandled z80 vdp read %02x\n",offset); + ret = machine().rand(); + break; + } + return ret; +} + +uint8_t md_base_state::megadriv_z80_unmapped_read() +{ + return 0xff; +} + +void md_base_state::megadriv_z80_map(address_map &map) +{ + map(0x0000, 0x1fff).bankrw("bank1").mirror(0x2000); // RAM can be accessed by the 68k + map(0x4000, 0x4003).rw(m_ymsnd, FUNC(ym_generic_device::read), FUNC(ym_generic_device::write)); + + map(0x6000, 0x6000).w(FUNC(md_base_state::megadriv_z80_z80_bank_w)); + map(0x6001, 0x6001).w(FUNC(md_base_state::megadriv_z80_z80_bank_w)); // wacky races uses this address + + map(0x6100, 0x7eff).r(FUNC(md_base_state::megadriv_z80_unmapped_read)); + + map(0x7f00, 0x7fff).rw(FUNC(md_base_state::megadriv_z80_vdp_read), FUNC(md_base_state::megadriv_z80_vdp_write)); + + map(0x8000, 0xffff).rw(FUNC(md_base_state::z80_read_68k_banked_data), FUNC(md_base_state::z80_write_68k_banked_data)); // The Z80 can read the 68k address space this way +} + +void md_base_state::megadriv_z80_io_map(address_map &map) +{ + map.global_mask(0xff); + map(0x00, 0xff).noprw(); +} + +uint32_t md_base_state::screen_update_megadriv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + /* Copy our screen buffer here */ + for (int y = cliprect.min_y; y <= cliprect.max_y; y++) + { + uint32_t *const desty = &bitmap.pix(y, 0); + uint32_t const *srcy; + + if (!m_vdp->m_use_alt_timing) + srcy = &m_vdp->m_render_bitmap->pix(y, 0); + else + srcy = m_vdp->m_render_line.get(); + + for (int x = cliprect.min_x; x <= cliprect.max_x; x++) + { + desty[x] = srcy[x]; + } + } + + return 0; +} + + + +/*****************************************************************************************/ + +void md_base_state::video_start() +{ + // nothing? +} + +void md_base_state::machine_start() +{ + m_io_pad_3b[0] = ioport("PAD1"); + m_io_pad_3b[1] = ioport("PAD2"); + m_io_pad_3b[2] = ioport("IN0"); + m_io_pad_3b[3] = ioport("UNK"); + + save_item(NAME(m_io_stage)); + save_item(NAME(m_megadrive_io_data_regs)); + save_item(NAME(m_megadrive_io_ctrl_regs)); + save_item(NAME(m_megadrive_io_tx_regs)); + + if (m_z80snd) + m_genz80.z80_run_timer = timer_alloc(FUNC(md_base_state::megadriv_z80_run_state), this); +} + +void md_base_state::machine_reset() +{ + /* default state of z80 = reset, with bus */ + osd_printf_debug("Resetting Megadrive / Genesis\n"); + + if (m_z80snd) + { + m_genz80.z80_is_reset = 1; + m_genz80.z80_has_bus = 1; + m_genz80.z80_bank_addr = 0; + m_vdp->set_scanline_counter(-1); + m_genz80.z80_run_timer->adjust(attotime::zero); + } + + megadrive_reset_io(); + + if (!m_vdp->m_use_alt_timing) + { + m_vdp->m_megadriv_scanline_timer = m_scan_timer; + m_vdp->m_megadriv_scanline_timer->adjust(attotime::zero); + } + + if (m_megadrive_ram) + memset(m_megadrive_ram, 0x00, 0x10000); + + m_vdp->device_reset_old(); +} + +void md_base_state::megadriv_stop_scanline_timer() +{ + if (!m_vdp->m_use_alt_timing) + m_vdp->m_megadriv_scanline_timer->reset(); +} + + + +// this comes from the VDP on lines 240 (on) 241 (off) and is connected to the z80 irq 0 +WRITE_LINE_MEMBER(md_base_state::vdp_sndirqline_callback_genesis_z80) +{ + if (m_z80snd) + { + if (state == ASSERT_LINE) + { + if ((m_genz80.z80_has_bus == 1) && (m_genz80.z80_is_reset == 0)) + m_z80snd->set_input_line(0, HOLD_LINE); + } + else if (state == CLEAR_LINE) + { + m_z80snd->set_input_line(0, CLEAR_LINE); + } + } +} + +// this comes from the vdp, and is connected to 68k irq level 6 (main vbl interrupt) +WRITE_LINE_MEMBER(md_base_state::vdp_lv6irqline_callback_genesis_68k) +{ + if (state == ASSERT_LINE) + m_maincpu->set_input_line(6, HOLD_LINE); + else + m_maincpu->set_input_line(6, CLEAR_LINE); +} + +// this comes from the vdp, and is connected to 68k irq level 4 (raster interrupt) +WRITE_LINE_MEMBER(md_base_state::vdp_lv4irqline_callback_genesis_68k) +{ + if (state == ASSERT_LINE) + m_maincpu->set_input_line(4, HOLD_LINE); + else + m_maincpu->set_input_line(4, CLEAR_LINE); +} + +/* Callback when the 68k takes an IRQ */ +IRQ_CALLBACK_MEMBER(md_base_state::genesis_int_callback) +{ + if (irqline==4) + { + m_vdp->vdp_clear_irq4_pending(); + } + + if (irqline==6) + { + m_vdp->vdp_clear_irq6_pending(); + } + + return (0x60+irqline*4)/4; // vector address +} + +void md_base_state::megadriv_timers(machine_config &config) +{ + TIMER(config, m_scan_timer).configure_generic("gen_vdp", FUNC(sega315_5313_device::megadriv_scanline_timer_callback)); +} + + +void md_base_state::md_ntsc(machine_config &config) +{ + M68000(config, m_maincpu, MASTER_CLOCK_NTSC / 7); /* 7.67 MHz */ + m_maincpu->set_addrmap(AS_PROGRAM, &md_base_state::megadriv_map); + m_maincpu->set_irq_acknowledge_callback(FUNC(md_base_state::genesis_int_callback)); + + /* IRQs are handled via the timers */ + + Z80(config, m_z80snd, MASTER_CLOCK_NTSC / 15); /* 3.58 MHz */ + m_z80snd->set_addrmap(AS_PROGRAM, &md_base_state::megadriv_z80_map); + m_z80snd->set_addrmap(AS_IO, &md_base_state::megadriv_z80_io_map); + /* IRQ handled via the timers */ + + megadriv_timers(config); + + SEGA315_5313(config, m_vdp, MASTER_CLOCK_NTSC, m_maincpu); + m_vdp->set_is_pal(false); + m_vdp->snd_irq().set(FUNC(md_base_state::vdp_sndirqline_callback_genesis_z80)); + m_vdp->lv6_irq().set(FUNC(md_base_state::vdp_lv6irqline_callback_genesis_68k)); + m_vdp->lv4_irq().set(FUNC(md_base_state::vdp_lv4irqline_callback_genesis_68k)); + m_vdp->set_screen("megadriv"); + m_vdp->add_route(ALL_OUTPUTS, "lspeaker", 0.50); + m_vdp->add_route(ALL_OUTPUTS, "rspeaker", 0.50); + + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_refresh_hz(double(MASTER_CLOCK_NTSC) / 10.0 / 262.0 / 342.0); // same as SMS? +// m_screen->set_refresh_hz(double(MASTER_CLOCK_NTSC) / 8.0 / 262.0 / 427.0); // or 427 Htotal? + m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); // Vblank handled manually. + m_screen->set_size(64*8, 620); + m_screen->set_visarea(0, 32*8-1, 0, 28*8-1); + m_screen->set_screen_update(FUNC(md_base_state::screen_update_megadriv)); /* Copies a bitmap */ + m_screen->screen_vblank().set(FUNC(md_base_state::screen_vblank_megadriv)); /* Used to Sync the timing */ + + /* sound hardware */ + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); + + YM2612(config, m_ymsnd, MASTER_CLOCK_NTSC/7); /* 7.67 MHz */ + m_ymsnd->add_route(0, "lspeaker", 0.50); + m_ymsnd->add_route(1, "rspeaker", 0.50); +} + +void md_base_state::md2_ntsc(machine_config &config) +{ + md_ntsc(config); + + // Internalized YM3438 in VDP ASIC + YM3438(config.replace(), m_ymsnd, MASTER_CLOCK_NTSC/7); /* 7.67 MHz */ + m_ymsnd->add_route(0, "lspeaker", 0.50); + m_ymsnd->add_route(1, "rspeaker", 0.50); +} + +/************ PAL hardware has a different master clock *************/ + +void md_base_state::md_pal(machine_config &config) +{ + M68000(config, m_maincpu, MASTER_CLOCK_PAL / 7); /* 7.67 MHz */ + m_maincpu->set_addrmap(AS_PROGRAM, &md_base_state::megadriv_map); + m_maincpu->set_irq_acknowledge_callback(FUNC(md_base_state::genesis_int_callback)); + /* IRQs are handled via the timers */ + + Z80(config, m_z80snd, MASTER_CLOCK_PAL / 15); /* 3.58 MHz */ + m_z80snd->set_addrmap(AS_PROGRAM, &md_base_state::megadriv_z80_map); + m_z80snd->set_addrmap(AS_IO, &md_base_state::megadriv_z80_io_map); + /* IRQ handled via the timers */ + + megadriv_timers(config); + + SEGA315_5313(config, m_vdp, MASTER_CLOCK_PAL, m_maincpu); + m_vdp->set_is_pal(true); + m_vdp->snd_irq().set(FUNC(md_base_state::vdp_sndirqline_callback_genesis_z80)); + m_vdp->lv6_irq().set(FUNC(md_base_state::vdp_lv6irqline_callback_genesis_68k)); + m_vdp->lv4_irq().set(FUNC(md_base_state::vdp_lv4irqline_callback_genesis_68k)); + m_vdp->set_screen("megadriv"); + m_vdp->add_route(ALL_OUTPUTS, "lspeaker", 0.50); + m_vdp->add_route(ALL_OUTPUTS, "rspeaker", 0.50); + + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_refresh_hz(double(MASTER_CLOCK_PAL) / 10.0 / 313.0 / 342.0); // same as SMS? +// m_screen->set_refresh_hz(double(MASTER_CLOCK_PAL) / 8.0 / 313.0 / 423.0); // or 423 Htotal? + m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); // Vblank handled manually. + m_screen->set_size(64*8, 620); + m_screen->set_visarea(0, 32*8-1, 0, 28*8-1); + m_screen->set_screen_update(FUNC(md_base_state::screen_update_megadriv)); /* Copies a bitmap */ + m_screen->screen_vblank().set(FUNC(md_base_state::screen_vblank_megadriv)); /* Used to Sync the timing */ + + /* sound hardware */ + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); + + YM2612(config, m_ymsnd, MASTER_CLOCK_PAL / 7); /* 7.67 MHz */ + m_ymsnd->add_route(0, "lspeaker", 0.50); + m_ymsnd->add_route(1, "rspeaker", 0.50); +} + +void md_base_state::md2_pal(machine_config &config) +{ + md_pal(config); + + // Internalized YM3438 in VDP ASIC + YM3438(config.replace(), m_ymsnd, MASTER_CLOCK_PAL / 7); /* 7.67 MHz */ + m_ymsnd->add_route(0, "lspeaker", 0.50); + m_ymsnd->add_route(1, "rspeaker", 0.50); +} + + +void md_base_state::megadriv_tas_callback(offs_t offset, uint8_t data) +{ + // writeback not allowed +} + +void md_base_state::megadriv_init_common() +{ + /* Look to see if this system has the standard Sound Z80 */ + if (m_z80snd) + { + m_genz80.z80_prgram = std::make_unique(0x2000); + membank("bank1")->set_base(m_genz80.z80_prgram.get()); + save_item(NAME(m_genz80.z80_is_reset)); + save_item(NAME(m_genz80.z80_has_bus)); + save_item(NAME(m_genz80.z80_bank_addr)); + save_pointer(NAME(m_genz80.z80_prgram), 0x2000); + } + + m_maincpu->set_tas_write_callback(*this, FUNC(md_base_state::megadriv_tas_callback)); + + m_megadrive_io_read_data_port_ptr = read8sm_delegate(*this, FUNC(md_base_state::megadrive_io_read_data_port_3button)); + m_megadrive_io_write_data_port_ptr = write16sm_delegate(*this, FUNC(md_base_state::megadrive_io_write_data_port_3button)); +} + +void md_base_state::init_megadriv() +{ + megadriv_init_common(); + + // todo: move this to the device interface? + m_vdp->set_use_cram(1); + m_vdp->set_vdp_pal(false); + m_vdp->set_framerate(60); + m_vdp->set_total_scanlines(262); + + m_version_hi_nibble = 0xa0; // Export NTSC no-SCD +} + +void md_base_state::init_megadrij() +{ + megadriv_init_common(); + + // todo: move this to the device interface? + m_vdp->set_use_cram(1); + m_vdp->set_vdp_pal(false); + m_vdp->set_framerate(60); + m_vdp->set_total_scanlines(262); + + m_version_hi_nibble = 0x20; // JPN NTSC no-SCD +} + +void md_base_state::init_megadrie() +{ + megadriv_init_common(); + + // todo: move this to the device interface? + m_vdp->set_use_cram(1); + m_vdp->set_vdp_pal(true); + m_vdp->set_framerate(50); + m_vdp->set_total_scanlines(313); + + m_version_hi_nibble = 0xe0; // Export PAL no-SCD +} + +WRITE_LINE_MEMBER(md_base_state::screen_vblank_megadriv) +{ + if (m_io_reset.read_safe(0) & 0x01) + m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); + + // rising edge + if (state) + { + if (!m_vdp->m_use_alt_timing) + { + m_vdp->vdp_handle_eof(); + m_vdp->m_megadriv_scanline_timer->adjust(attotime::zero); + } + } +} diff --git a/src/mame/shared/megadriv.h b/src/mame/shared/megadriv.h new file mode 100644 index 00000000000..eb95bc8eedc --- /dev/null +++ b/src/mame/shared/megadriv.h @@ -0,0 +1,151 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood +#ifndef MAME_SHARED_MEGADRIV_H +#define MAME_SHARED_MEGADRIV_H + +#pragma once + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "sound/sn76496.h" +#include "sound/ymopn.h" +#include "video/315_5313.h" + +#define MASTER_CLOCK_NTSC 53693175 +#define MASTER_CLOCK_PAL 53203424 + +#define MD_CPU_REGION_SIZE 0x800000 + + +/*----------- defined in machine/megadriv.cpp -----------*/ + +INPUT_PORTS_EXTERN( md_common ); +INPUT_PORTS_EXTERN( megadriv ); +INPUT_PORTS_EXTERN( megadri6 ); +INPUT_PORTS_EXTERN( ssf2mdb ); +INPUT_PORTS_EXTERN( mk3mdb ); + + +class md_base_state : public driver_device +{ +public: + md_base_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this,"maincpu"), + m_z80snd(*this,"genesis_snd_z80"), + m_ymsnd(*this,"ymsnd"), + m_scan_timer(*this, "md_scan_timer"), + m_vdp(*this,"gen_vdp"), + m_megadrive_ram(*this,"megadrive_ram"), + m_screen(*this,"megadriv"), + m_io_reset(*this, "RESET"), + m_megadrive_io_read_data_port_ptr(*this), + m_megadrive_io_write_data_port_ptr(*this) + { } + + required_device m_maincpu; + optional_device m_z80snd; + optional_device m_ymsnd; + optional_device m_scan_timer; + required_device m_vdp; + optional_shared_ptr m_megadrive_ram; + optional_device m_screen; + + optional_ioport m_io_reset; + ioport_port *m_io_pad_3b[4]; + ioport_port *m_io_pad_6b[4]; + + struct genesis_z80_vars + { + int z80_is_reset = 0; + int z80_has_bus = 0; + uint32_t z80_bank_addr = 0; + std::unique_ptr z80_prgram; + emu_timer *z80_run_timer = nullptr; + }; + + genesis_z80_vars m_genz80; + int m_version_hi_nibble; + + void init_megadrie(); + void init_megadriv(); + void init_megadrij(); + + uint8_t megadriv_68k_YM2612_read(offs_t offset, uint8_t mem_mask = ~0); + void megadriv_68k_YM2612_write(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + IRQ_CALLBACK_MEMBER(genesis_int_callback); + void megadriv_init_common(); + + void megadriv_z80_bank_w(uint16_t data); + void megadriv_68k_z80_bank_write(uint16_t data); + void megadriv_z80_z80_bank_w(uint8_t data); + uint16_t megadriv_68k_io_read(offs_t offset); + void megadriv_68k_io_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t megadriv_68k_read_z80_ram(offs_t offset, uint16_t mem_mask = ~0); + void megadriv_68k_write_z80_ram(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t megadriv_68k_check_z80_bus(offs_t offset, uint16_t mem_mask = ~0); + void megadriv_68k_req_z80_bus(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void megadriv_68k_req_z80_reset(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint8_t z80_read_68k_banked_data(offs_t offset); + void z80_write_68k_banked_data(offs_t offset, uint8_t data); + void megadriv_z80_vdp_write(offs_t offset, uint8_t data); + uint8_t megadriv_z80_vdp_read(offs_t offset); + uint8_t megadriv_z80_unmapped_read(); + TIMER_CALLBACK_MEMBER(megadriv_z80_run_state); + + /* Megadrive / Genesis has 3 I/O ports */ + emu_timer *m_io_timeout[3]; + int m_io_stage[3]; + uint8_t m_megadrive_io_data_regs[3]; + uint8_t m_megadrive_io_ctrl_regs[3]; + uint8_t m_megadrive_io_tx_regs[3]; + read8sm_delegate m_megadrive_io_read_data_port_ptr; + write16sm_delegate m_megadrive_io_write_data_port_ptr; + + WRITE_LINE_MEMBER(vdp_sndirqline_callback_genesis_z80); + WRITE_LINE_MEMBER(vdp_lv6irqline_callback_genesis_68k); + WRITE_LINE_MEMBER(vdp_lv4irqline_callback_genesis_68k); + + TIMER_CALLBACK_MEMBER( io_timeout_timer_callback ); + void megadrive_reset_io(); + uint8_t megadrive_io_read_data_port_6button(offs_t offset); + uint8_t megadrive_io_read_data_port_3button(offs_t offset); + uint8_t megadrive_io_read_ctrl_port(int portnum); + uint8_t megadrive_io_read_tx_port(int portnum); + uint8_t megadrive_io_read_rx_port(int portnum); + uint8_t megadrive_io_read_sctrl_port(int portnum); + + void megadrive_io_write_data_port_3button(offs_t offset, uint16_t data); + void megadrive_io_write_data_port_6button(offs_t offset, uint16_t data); + void megadrive_io_write_ctrl_port(int portnum, uint16_t data); + void megadrive_io_write_tx_port(int portnum, uint16_t data); + void megadrive_io_write_rx_port(int portnum, uint16_t data); + void megadrive_io_write_sctrl_port(int portnum, uint16_t data); + + void megadriv_stop_scanline_timer(); + + uint32_t screen_update_megadriv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + DECLARE_WRITE_LINE_MEMBER(screen_vblank_megadriv); + + void megadriv_tas_callback(offs_t offset, uint8_t data); + + void megadriv_timers(machine_config &config); + void md_ntsc(machine_config &config); + void md2_ntsc(machine_config &config); + void md_pal(machine_config &config); + void md2_pal(machine_config &config); + void md_bootleg(machine_config &config); + + void dcat16_megadriv_base(machine_config &config); + void dcat16_megadriv_map(address_map &map); + void megadriv_map(address_map &map); + void megadriv_z80_io_map(address_map &map); + void megadriv_z80_map(address_map &map); + +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; +}; + +#endif // MAME_SHARED_MEGADRIV_H diff --git a/src/mame/shared/mie.h b/src/mame/shared/mie.h index 17dc7ddad8d..57792269ec0 100644 --- a/src/mame/shared/mie.h +++ b/src/mame/shared/mie.h @@ -5,7 +5,7 @@ #pragma once -#include "machine/mapledev.h" +#include "mapledev.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" diff --git a/src/mame/shared/namco_c355spr.cpp b/src/mame/shared/namco_c355spr.cpp new file mode 100644 index 00000000000..ea2780abaf9 --- /dev/null +++ b/src/mame/shared/namco_c355spr.cpp @@ -0,0 +1,802 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood, Phil Stroffolino, Bryan McPhail + +/* + Namco 186/187 Zooming Sprites + Namco C355 Zooming sprites + + used by + namcofl.cpp (all games) + namconb1.cpp (all games) + gal3.cpp (all games) + namcos21.cpp (Driver's Eyes, Solvalou, Starblade, Air Combat, Cyber Sled) (everything except Winning Run series) + namcos2.cpp (Steel Gunner, Steel Gunner 2, Lucky & Wild, Suzuka 8 Hours, Suzuka 8 Hours 2) + deco32.cpp (Dragon Gun, Lock 'n' Loaded) + + earlier titles use the 186/187 pair (eg. Steel Gunner, Dragon Gun) while later boards appear to implement the + same functionality in a single C355 custom (NB1 hardware, Final Lap R etc.) It is not known if there are any + differences in capability. + + TODO: verify which boards use which chips + + + dragongun does a masking trick on the dragon during the attract intro, it should not be visible but rather + cause the fire to be invisible in the shape of the dragon + dragongun 'waterfall' prior to one of the bosses also needs correct priority + + + relative to the start of the sprite area these offets are typically used + it is not clear if this is implemented in a single RAM chip, or multiple on some boards + + * 0x00000 sprite attr (page0) (solvalou service mode) + * 0x02000 sprite list (page0) (solvalou service mode) + * + * 0x02400 window attributes + * 0x04000 format + * 0x08000 tile + * 0x10000 sprite attr (page1) + * 0x14000 sprite list (page1) + + TODO: solvalou service mode wants lists / attributes at 0x02000/2 & 0x00000/2 + Drawing this is what causes the bad tile in vshoot + + Do any games need 2 lists at the same time or should 1 list be configurable? + + It seems unlikely there are really 2 lists + + Maybe the list written by solvalou's service mode is where data gets copied for + rendering by the sprite DMA trigger, but solvalou is choosing to write it there + directly rather than trigger the DMA? + +*/ + +#include "emu.h" +#include "namco_c355spr.h" + +#include + +DEFINE_DEVICE_TYPE(NAMCO_C355SPR, namco_c355spr_device, "namco_c355spr", "Namco 186/187 or C355 (Sprites)") + +namco_c355spr_device::namco_c355spr_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) : + device_t(mconfig, type, tag, owner, clock), + device_gfx_interface(mconfig, *this, nullptr), + device_video_interface(mconfig, *this), + m_pri_cb(*this, DEVICE_SELF, FUNC(namco_c355spr_device::default_priority)), + m_read_spritetile(*this, DEVICE_SELF, FUNC(namco_c355spr_device::read_spritetile)), + m_read_spriteformat(*this, DEVICE_SELF, FUNC(namco_c355spr_device::read_spriteformat)), + m_read_spritetable(*this, DEVICE_SELF, FUNC(namco_c355spr_device::read_spritetable)), + m_read_cliptable(*this, DEVICE_SELF, FUNC(namco_c355spr_device::read_cliptable)), + m_read_spritelist(*this, DEVICE_SELF, FUNC(namco_c355spr_device::read_spritelist)), + m_palxor(0), + m_buffer(0), + m_external_prifill(false), + m_gfx_region(*this, DEVICE_SELF), + m_colbase(0), + m_colors(16), + m_granularity(256), + m_draw_2_lists(true), + m_device_allocates_spriteram_and_bitmaps(true) +{ + std::fill(std::begin(m_position), std::end(m_position), 0); + std::fill(std::begin(m_scrolloffs), std::end(m_scrolloffs), 0); + for (int i = 0; i < 2; i++) + m_spriteram[i] = nullptr; +} + +namco_c355spr_device::namco_c355spr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : + namco_c355spr_device(mconfig, NAMCO_C355SPR, tag, owner, clock) +{ +} + +/**************************************************************************************/ + +template +void namco_c355spr_device::zdrawgfxzoom( + BitmapClass *dest_bmp, const rectangle &clip, gfx_element *gfx, + u32 code, u32 color, bool flipx, bool flipy, int hpos, int vpos, + int hsize, int vsize, u8 prival, + + bitmap_ind8 *pri_buffer, + int sprite_screen_width, int sprite_screen_height, + bitmap_ind8 *pri_bitmap) +{ + if (!hsize || !vsize) return; + if (!gfx) return; + + const u32 pal = gfx->colorbase() + gfx->granularity() * (color % gfx->colors()); + const pen_t *palpen = &gfx->palette().pen(pal); + + const u8 *source_base = gfx->get_data(code % gfx->elements()); + if (sprite_screen_width && sprite_screen_height) + { + /* compute sprite increment per screen pixel */ + int dx = (gfx->width() << 16) / sprite_screen_width; + int dy = (gfx->height() << 16) / sprite_screen_height; + + int ex = hpos + sprite_screen_width; + int ey = vpos + sprite_screen_height; + + int x_index_base; + int y_index; + + if (flipx) + { + x_index_base = (sprite_screen_width - 1) * dx; + dx = -dx; + } + else + { + x_index_base = 0; + } + + if (flipy) + { + y_index = (sprite_screen_height - 1) * dy; + dy = -dy; + } + else + { + y_index = 0; + } + + if (hpos < clip.min_x) + { /* clip left */ + int pixels = clip.min_x - hpos; + hpos += pixels; + x_index_base += pixels * dx; + } + if (vpos < clip.min_y) + { /* clip top */ + int pixels = clip.min_y - vpos; + vpos += pixels; + y_index += pixels * dy; + } + if (ex > clip.max_x + 1) + { /* clip right */ + int pixels = ex - clip.max_x - 1; + ex -= pixels; + } + if (ey > clip.max_y + 1) + { /* clip bottom */ + int pixels = ey - clip.max_y - 1; + ey -= pixels; + } + + if (ex > hpos) + { /* skip if inner loop doesn't draw anything */ + for (int y = vpos; y < ey; y++) + { + u8 const *const source = source_base + (y_index >> 16) * gfx->rowbytes(); + auto *const dest = &dest_bmp->pix(y); + int x_index = x_index_base; + u8 *pri = nullptr; + + if (dest_bmp->bpp() == 32) + pri = &pri_bitmap->pix(y); + + for (int x = hpos; x < ex; x++) + { + if (dest_bmp->bpp() == 16) + { + const u8 c = source[x_index >> 16]; + if (c != 0xff) + { + dest[x] = ((prival & 0xf) << 12) | ((pal + c) & 0xfff); + } + x_index += dx; + } + else if (dest_bmp->bpp() == 32) + { + int c = source[x_index >> 16]; + if (c != 15) + { + if (prival >= pri[x]) + { + dest[x] = palpen[c]; + dest[x] |= 0xff000000; + } + else // sprites can have a 'masking' effect on other sprites + { + dest[x] = 0x00000000; + } + } + + x_index += dx; + } + } + y_index += dy; + } + } + } +} + +void namco_c355spr_device::copybitmap(bitmap_ind16 &dest_bmp, const rectangle &clip, u8 pri) +{ + if (m_palxor) + { + for (int y = clip.min_y; y <= clip.max_y; y++) + { + u16 *const src = &m_renderbitmap.pix(y); + u16 *const dest = &dest_bmp.pix(y); + for (int x = clip.min_x; x <= clip.max_x; x++) + { + if (src[x] != 0xffff) + { + u8 srcpri = (src[x] >> 12) & 0xf; + u16 c = src[x] & 0xfff; + if (srcpri == pri) + { + if ((c & 0xff) != 0xff) + { + switch (c & 0xff) + { + case 0: + dest[x] = 0x4000|(dest[x] & 0x1fff); + break; + case 1: + dest[x] = 0x6000|(dest[x] & 0x1fff); + break; + default: + dest[x] = gfx(0)->colorbase() + c; + break; + } + } + } + } + } + } + } + else + { + for (int y = clip.min_y; y <= clip.max_y; y++) + { + u16 *const src = &m_renderbitmap.pix(y); + u16 *const dest = &dest_bmp.pix(y); + for (int x = clip.min_x; x <= clip.max_x; x++) + { + if (src[x] != 0xffff) + { + u8 srcpri = (src[x] >> 12) & 0xf; + u16 c = src[x] & 0xfff; + if (srcpri == pri) + { + if ((c & 0xff) != 0xff) + { + if (c == 0xffe) + { + dest[x] |= 0x800; + } + else + { + dest[x] = gfx(0)->colorbase() + c; + } + } + } + } + } + } + } +} + +void namco_c355spr_device::copybitmap(bitmap_rgb32 &dest_bmp, const rectangle &clip, u8 pri) +{ + device_palette_interface &palette = gfx(0)->palette(); + const pen_t *pal = &palette.pen(gfx(0)->colorbase()); + if (m_palxor) + { + for (int y = clip.min_y; y <= clip.max_y; y++) + { + u16 *const src = &m_renderbitmap.pix(y); + u16 *const srcrender = &m_screenbitmap.pix(y); + u32 *const dest = &dest_bmp.pix(y); + for (int x = clip.min_x; x <= clip.max_x; x++) + { + if (src[x] != 0xffff) + { + u8 srcpri = (src[x] >> 12) & 0xf; + u16 c = src[x] & 0xfff; + if (srcpri == pri) + { + if ((c & 0xff) != 0xff) + { + switch (c & 0xff) + { + case 0: + srcrender[x] = 0x4000|(srcrender[x] & 0x1fff); + break; + case 1: + srcrender[x] = 0x6000|(srcrender[x] & 0x1fff); + break; + default: + srcrender[x] = c; + break; + } + dest[x] = pal[srcrender[x]]; + } + } + } + else if (srcrender[x] != 0xffff) + dest[x] = pal[srcrender[x]]; + } + } + } + else + { + for (int y = clip.min_y; y <= clip.max_y; y++) + { + u16 *const src = &m_renderbitmap.pix(y); + u16 *const srcrender = &m_screenbitmap.pix(y); + u32 *const dest = &dest_bmp.pix(y); + for (int x = clip.min_x; x <= clip.max_x; x++) + { + if (src[x] != 0xffff) + { + u8 srcpri = (src[x] >> 12) & 0xf; + u16 c = src[x] & 0xfff; + if (srcpri == pri) + { + if ((c & 0xff) != 0xff) + { + if (c == 0xffe) + { + srcrender[x] |= 0x800; + } + else + { + srcrender[x] = c; + } + dest[x] = pal[srcrender[x]]; + } + } + } + else if (srcrender[x] != 0xffff) + dest[x] = pal[srcrender[x]]; + } + } + } +} + +void namco_c355spr_device::device_start() +{ + m_pri_cb.resolve(); + + gfx_layout obj_layout = + { + 16,16, + 0, + 8, /* bits per pixel */ + { STEP8(0,1) }, + { STEP16(0,8) }, + { STEP16(0,8*16) }, + 16*16*8 + }; + obj_layout.total = m_gfx_region->bytes() / (16*16*8 / 8); + + std::fill(std::begin(m_position), std::end(m_position), 0x0000); + + for (int i = 0; i < 2; i++) + { + m_spritelist[i] = std::make_unique(0x100); + m_sprite_end[i] = m_spritelist[i].get(); + } + + if (m_device_allocates_spriteram_and_bitmaps) + { + for (int i = 0; i < 2; i++) + { + m_spriteram[i] = std::make_unique(0x20000 / 2); + std::fill_n(m_spriteram[i].get(), 0x20000 / 2, 0); + save_pointer(NAME(m_spriteram[i]), 0x20000 / 2, i); + } + + screen().register_screen_bitmap(m_renderbitmap); + screen().register_screen_bitmap(m_screenbitmap); + } + + set_gfx(0, std::make_unique(&palette(), obj_layout, m_gfx_region->base(), 0, m_colors, m_colbase)); + gfx(0)->set_granularity(m_granularity); + + m_read_spritetile.resolve(); + m_read_spriteformat.resolve(); + m_read_spritetable.resolve(); + m_read_cliptable.resolve(); + m_read_spritelist.resolve(); + + save_item(NAME(m_position)); + +} + +void namco_c355spr_device::device_stop() +{ + for (auto &spritelist : m_spritelist) + spritelist.reset(); + for (auto &spriteram : m_spriteram) + spriteram.reset(); + + device_t::device_stop(); +} + +/**************************************************************************************/ + +void namco_c355spr_device::position_w(offs_t offset, u16 data, u16 mem_mask) +{ + COMBINE_DATA(&m_position[offset]); +} + +u16 namco_c355spr_device::position_r(offs_t offset) +{ + return m_position[offset]; +} + +/**************************************************************************************************************/ + +template +void namco_c355spr_device::draw_sprites(BitmapClass &bitmap, const rectangle &cliprect, int pri) +{ + if (pri == 0) + { + if (!m_external_prifill) + { + if (m_buffer == 0) // not buffered sprites + build_sprite_list_and_render_sprites(cliprect); + } + } + copybitmap(bitmap, cliprect, pri); +} + +void namco_c355spr_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri) +{ + draw_sprites(bitmap, cliprect, pri); +} + +void namco_c355spr_device::draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int pri) +{ + draw_sprites( bitmap, cliprect, pri); +} + +void namco_c355spr_device::spriteram_w(offs_t offset, u16 data, u16 mem_mask) +{ + COMBINE_DATA(&m_spriteram[0][offset]); +} + +u16 namco_c355spr_device::spriteram_r(offs_t offset) +{ + return m_spriteram[0][offset]; +} + +WRITE_LINE_MEMBER(namco_c355spr_device::vblank) +{ + if (state) + { + if (m_buffer > 0) + build_sprite_list_and_render_sprites(screen().visible_area()); + + if (m_buffer > 1) + std::copy_n(m_spriteram[0].get(), 0x20000/2, m_spriteram[1].get()); + } +} + +/******************************************************************************/ + +u16 namco_c355spr_device::read_spriteformat(int entry, u8 attr) +{ + u16 *spriteram16 = &m_spriteram[std::max(0, m_buffer - 1)][0]; + const u16 *spriteformat = &spriteram16[0x4000 / 2]; + return spriteformat[(entry << 2) + attr]; +} + +u16 namco_c355spr_device::read_spritetile(int entry) +{ + u16 *spriteram16 = &m_spriteram[std::max(0, m_buffer - 1)][0]; + const u16 *spritetile = &spriteram16[0x8000 / 2]; + return spritetile[entry]; +} + +u16 namco_c355spr_device::read_spritetable(int entry, u8 attr, int whichlist) +{ + u16 *ram; + int buffer = std::max(0, m_buffer - 1); + if (whichlist == 0) + ram = &m_spriteram[buffer][0x00000 / 2]; + else + ram = &m_spriteram[buffer][0x10000 / 2]; + + return ram[(entry << 3) + attr]; +} + +u16 namco_c355spr_device::read_cliptable(int entry, u8 attr) +{ + u16 *spriteram16 = &m_spriteram[std::max(0, m_buffer - 1)][0]; + const u16 *ram = &spriteram16[0x2400 / 2]; + return ram[(entry << 2) + attr]; +} + +u16 namco_c355spr_device::read_spritelist(int entry, int whichlist) +{ + u16 *ram; + int buffer = std::max(0, m_buffer - 1); + if (whichlist == 0) + ram = &m_spriteram[buffer][0x02000 / 2]; + else + ram = &m_spriteram[buffer][0x14000 / 2]; + + return ram[entry]; +} + + +int namco_c355spr_device::default_code2tile(int code) +{ + return code; +} + +void namco_c355spr_device::build_sprite_list(int no) +{ + /* draw the sprites */ + c355_sprite *sprite_ptr = m_spritelist[no].get(); + for (int i = 0; i < 256; i++) + { + sprite_ptr->disable = false; + const u16 which = m_read_spritelist(i, no); + get_single_sprite(which & 0xff, sprite_ptr, no); + sprite_ptr++; + if (which & 0x100) break; + } + m_sprite_end[no] = sprite_ptr; +} + +void namco_c355spr_device::build_sprite_list_and_render_sprites(const rectangle cliprect) +{ + if (m_draw_2_lists) + build_sprite_list(0); + + build_sprite_list(1); + + render_sprites(cliprect, nullptr, m_renderbitmap, 0); +} + +template +void namco_c355spr_device::render_sprites(const rectangle cliprect, bitmap_ind8 *pri_bitmap, BitmapClass &temp_bitmap, int alt_precision) +{ + temp_bitmap.fill(0xffff, cliprect); + for (int no = 0; no < 2; no++) + { + int i = 0; + c355_sprite *sprite_ptr = m_spritelist[no].get(); + + while (sprite_ptr != m_sprite_end[no]) + { + if (sprite_ptr->disable == false) + { + rectangle clip = sprite_ptr->clip; + clip &= cliprect; + for (int ind = 0; ind < sprite_ptr->size; ind++) + { + if ((sprite_ptr->tile[ind] & 0x8000) == 0) + { + int sprite_screen_height; + int sprite_screen_width; + + if (alt_precision) + { + sprite_screen_width = ((sprite_ptr->x[ind] + (sprite_ptr->zoomx[ind] << 4)) >> 16) - (sprite_ptr->x[ind] >> 16); + sprite_screen_height = ((sprite_ptr->y[ind] + (sprite_ptr->zoomy[ind] << 4)) >> 16) - (sprite_ptr->y[ind] >> 16); + } + else + { + sprite_screen_height = (sprite_ptr->zoomy[ind] * 16 + 0x8000) >> 16; + sprite_screen_width = (sprite_ptr->zoomx[ind] * 16 + 0x8000) >> 16; + } + + zdrawgfxzoom( + &temp_bitmap, + clip, + gfx(0), + m_code2tile(sprite_ptr->tile[ind]) + sprite_ptr->offset, + sprite_ptr->color, + sprite_ptr->flipx, sprite_ptr->flipy, + sprite_ptr->x[ind] >> 16, sprite_ptr->y[ind] >> 16, + sprite_ptr->zoomx[ind], sprite_ptr->zoomy[ind], sprite_ptr->pri, + nullptr, + sprite_screen_width, sprite_screen_height, + pri_bitmap); + } + } + } + i++; + sprite_ptr++; + } + } +} + +void namco_c355spr_device::copybitmap(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &pri_bitmap, bitmap_rgb32 &temp_bitmap) +{ + for (int y = cliprect.top(); y <= cliprect.bottom(); y++) + { + u32 const *const src = &temp_bitmap.pix(y); + u32 *const dst = &bitmap.pix(y); + + for (int x = cliprect.left(); x <= cliprect.right(); x++) + { + u32 const srcpix = src[x]; + + if ((srcpix & 0xff000000) == 0xff000000) + { + dst[x] = srcpix & 0x00ffffff; + } + } + } +} + +void namco_c355spr_device::draw_dg(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &pri_bitmap, bitmap_rgb32 &temp_bitmap) +{ + build_sprite_list(0); + + render_sprites(cliprect, &pri_bitmap, temp_bitmap, 1); + + copybitmap(screen, bitmap, cliprect, pri_bitmap, temp_bitmap); +} + +void namco_c355spr_device::get_single_sprite(u16 which, c355_sprite *sprite_ptr, int no) +{ + /** + * ----xxxx-------- window select + * --------xxxx---- priority + * ------------xxxx palette select + */ + const u16 palette = m_read_spritetable(which, 6, no); + + int priority = m_pri_cb(palette); + + if (priority == -1) + { + sprite_ptr->disable = true; + return; + } + + sprite_ptr->pri = priority; + + const u16 spriteformatram_offset = m_read_spritetable(which, 0, no) & 0x7ff; /* LINKNO 0x000..0x7ff for format table entries - finalapr code masks with 0x3ff, but vshoot requires 0x7ff */ + sprite_ptr->offset = m_read_spritetable(which, 1, no); /* OFFSET */ + int hpos = m_read_spritetable(which, 2, no); /* HPOS 0x000..0x7ff (signed) */ + int vpos = m_read_spritetable(which, 3, no); /* VPOS 0x000..0x7ff (signed) */ + u16 hsize = m_read_spritetable(which, 4, no); /* HSIZE max 0x3ff pixels */ + u16 vsize = m_read_spritetable(which, 5, no); /* VSIZE max 0x3ff pixels */ + /* m_read_spritetable(which, 6, no) contains priority/palette */ + /* m_read_spritetable(which, 7, no) is used in Lucky & Wild, possibly for sprite-road priority */ + + int xscroll = (s16)m_position[1]; + int yscroll = (s16)m_position[0]; + + xscroll &= 0x1ff; if (xscroll & 0x100) xscroll |= ~0x1ff; + yscroll &= 0x1ff; if (yscroll & 0x100) yscroll |= ~0x1ff; + + if (screen().height() > 384) + { /* Medium Resolution: system21 adjust */ + xscroll = (s16)m_position[1]; + xscroll &= 0x3ff; if (xscroll & 0x200) xscroll |= ~0x3ff; + if (yscroll < 0) + { /* solvalou */ + yscroll += 0x20; + } + yscroll += 0x10; + } + else + { + xscroll += m_scrolloffs[0]; + yscroll += m_scrolloffs[1]; + } + + hpos -= xscroll; + vpos -= yscroll; + + int clipentry = (palette >> 8) & 0xf; + rectangle clip; + clip.set(m_read_cliptable(clipentry, 0) - xscroll, m_read_cliptable(clipentry, 1) - xscroll, m_read_cliptable(clipentry, 2) - yscroll, m_read_cliptable(clipentry, 3) - yscroll); + sprite_ptr->clip = clip; + + hpos &= 0x7ff; if (hpos & 0x400) hpos |= ~0x7ff; /* sign extend */ + vpos &= 0x7ff; if (vpos & 0x400) vpos |= ~0x7ff; /* sign extend */ + + int tile_index = m_read_spriteformat(spriteformatram_offset, 0); + const u16 format = m_read_spriteformat(spriteformatram_offset, 1); + const int dx = m_read_spriteformat(spriteformatram_offset, 2) & 0x1ff; + const int dy = m_read_spriteformat(spriteformatram_offset, 3) & 0x1ff; + int num_cols = (format >> 4) & 0xf; + int num_rows = (format) & 0xf; + + if (num_cols == 0) num_cols = 0x10; + const bool flipx = (hsize & 0x8000); + hsize &= 0x3ff; + if (hsize == 0) + { + sprite_ptr->disable = true; + return; + } + u32 zoomx = (hsize << 16) / (num_cols * 16); + s32 dx_zoomed = ((dx & 0xff) * zoomx + 0x8000) >> 16; + if (dx & 0x100) dx_zoomed = -dx_zoomed; + + if (!flipx) + { + hpos -= dx_zoomed; + } + else + { + hpos += dx_zoomed; + } + + if (num_rows == 0) num_rows = 0x10; + const bool flipy = (vsize & 0x8000); + vsize &= 0x3ff; + if (vsize == 0) + { + sprite_ptr->disable = true; + return; + } + u32 zoomy = (vsize << 16) / (num_rows * 16); + s32 dy_zoomed = ((dy & 0xff) * zoomy + 0x8000) >> 16; + if (dy & 0x100) dy_zoomed = -dy_zoomed; + + if (!flipy) + { + vpos -= dy_zoomed; + } + else + { + vpos += dy_zoomed; + } + + sprite_ptr->flipx = flipx; + sprite_ptr->flipy = flipy; + sprite_ptr->size = num_rows * num_cols; + sprite_ptr->color = (palette & (m_colors-1)) ^ m_palxor; + + u32 source_height_remaining = num_rows * 16; + u32 screen_height_remaining = vsize; + int y = vpos; + int ind = 0; + for (int row = 0; row < num_rows; row++) + { + int tile_screen_height = 16 * screen_height_remaining / source_height_remaining; + zoomy = (screen_height_remaining << 16) / source_height_remaining; + if (flipy) + { + y -= tile_screen_height; + } + u32 source_width_remaining = num_cols * 16; + u32 screen_width_remaining = hsize; + int x = hpos; + for (int col = 0; col < num_cols; col++) + { + int tile_screen_width = 16 * screen_width_remaining / source_width_remaining; + zoomx = (screen_width_remaining << 16) / source_width_remaining; + if (flipx) + { + x -= tile_screen_width; + } + const u16 tile = m_read_spritetile(tile_index++); + sprite_ptr->tile[ind] = tile; + if ((tile & 0x8000) == 0) + { + sprite_ptr->x[ind] = x << 16; + sprite_ptr->y[ind] = y << 16; + sprite_ptr->zoomx[ind] = zoomx; + sprite_ptr->zoomy[ind] = zoomy; + } + if (!flipx) + { + x += tile_screen_width; + } + screen_width_remaining -= tile_screen_width; + source_width_remaining -= 16; + ind++; + } /* next col */ + if (!flipy) + { + y += tile_screen_height; + } + screen_height_remaining -= tile_screen_height; + source_height_remaining -= 16; + } /* next row */ +} + diff --git a/src/mame/shared/namco_c355spr.h b/src/mame/shared/namco_c355spr.h new file mode 100644 index 00000000000..33aed939a36 --- /dev/null +++ b/src/mame/shared/namco_c355spr.h @@ -0,0 +1,166 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood + +#ifndef MAME_VIDEO_NAMCO_C355SPR_H +#define MAME_VIDEO_NAMCO_C355SPR_H + +#pragma once + +#include "screen.h" + +class namco_c355spr_device : public device_t, public device_gfx_interface, public device_video_interface +{ +public: + // construction/destruction + namco_c355spr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + + void set_color_base(u16 base) { m_colbase = base; } + void set_scroll_offsets(int x, int y) { m_scrolloffs[0] = x; m_scrolloffs[1] = y; } + //void set_ram_words(u32 size) { m_ramsize = size; } + void set_palxor(int palxor) { m_palxor = palxor; } + void set_buffer(int buffer) { m_buffer = buffer; } + void set_external_prifill(bool external) { m_external_prifill = external; } + void set_colors(int colors) { m_colors = colors; } + void set_granularity(int granularity) { m_granularity = granularity; } + void set_draw_2_lists(bool draw_2_lists) { m_draw_2_lists = draw_2_lists; } + + // the Namco code currently requires us to allocate memory in the device, the Data East hookup uses access callbacks + void set_device_allocates_spriteram_and_bitmaps(bool allocate_memory) { m_device_allocates_spriteram_and_bitmaps = allocate_memory; } + + + template void set_priority_callback(T &&... args) { m_pri_cb.set(std::forward(args)...); } + template void set_read_spritetile(T &&... args) { m_read_spritetile.set(std::forward(args)...); } + template void set_read_spriteformat(T &&... args) { m_read_spriteformat.set(std::forward(args)...); } + template void set_read_spritetable(T &&... args) { m_read_spritetable.set(std::forward(args)...); } + template void set_read_cliptable(T &&... args) { m_read_cliptable.set(std::forward(args)...); } + template void set_read_spritelist(T &&... args) { m_read_spritelist.set(std::forward(args)...); } + + u16 spriteram_r(offs_t offset); + void spriteram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 position_r(offs_t offset); + void position_w(offs_t offset, u16 data, u16 mem_mask = ~0); + DECLARE_WRITE_LINE_MEMBER(vblank); + + typedef delegate c355_obj_code2tile_delegate; + typedef device_delegate c355_obj_entry_attr_delegate; + typedef device_delegate c355_obj_entry_attr_which_delegate; + typedef device_delegate c355_obj_entry_delegate; + typedef device_delegate c355_obj_entry_which_delegate; + typedef device_delegate c355_priority_delegate; + + void set_tile_callback(c355_obj_code2tile_delegate cb) + { + if (!cb.isnull()) + m_code2tile = cb; + else + m_code2tile = c355_obj_code2tile_delegate(&namco_c355spr_device::default_code2tile, this); + } + + + void draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri); + void draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int pri); + + void draw_dg(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &pri_bitmap, bitmap_rgb32 &temp_bitmap); + + void build_sprite_list_and_render_sprites(const rectangle cliprect); + + template + void render_sprites(const rectangle cliprect, bitmap_ind8 *pri_bitmap, BitmapClass &temp_bitmap, int alt_precision); + + void clear_screen_bitmap() { m_screenbitmap.fill(0xffff); } + void clear_screen_bitmap(const rectangle cliprect) { m_screenbitmap.fill(0xffff, cliprect); } + bitmap_ind16 &screen_bitmap() { return m_screenbitmap; } + +protected: + namco_c355spr_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock = 0); + + // device-level overrides + virtual void device_start() override; + virtual void device_stop() override; + + c355_obj_code2tile_delegate m_code2tile; + c355_priority_delegate m_pri_cb; + c355_obj_entry_delegate m_read_spritetile; + c355_obj_entry_attr_delegate m_read_spriteformat; + c355_obj_entry_attr_which_delegate m_read_spritetable; + c355_obj_entry_attr_delegate m_read_cliptable; + c355_obj_entry_which_delegate m_read_spritelist; + + u16 read_spritetile(int entry); + u16 read_spriteformat(int entry, u8 attr); + u16 read_spritetable(int entry, u8 attr, int whichlist); + u16 read_cliptable(int entry, u8 attr); + u16 read_spritelist(int entry, int whichlist); + + int default_priority(int pal_pri) { return ((pal_pri >> 4) & 0xf); } + + // general + template + void zdrawgfxzoom( + BitmapClass *dest_bmp, const rectangle &clip, gfx_element *gfx, + u32 code, u32 color, + bool flipx, bool flipy, + int sx, int sy, + int scalex, int scaley, + u8 prival, + bitmap_ind8 *pri_buffer, + int sprite_screen_width, int sprite_screen_height, + bitmap_ind8 *pri_bitmap); + + struct c355_sprite + { + bool disable; + int size; + rectangle clip; + int offset; + int color; + bool flipx,flipy; + int tile[16*16]; + int x[16*16],y[16*16]; + int zoomx[16*16],zoomy[16*16]; + int pri; + }; + + std::unique_ptr m_spritelist[2]; + const c355_sprite *m_sprite_end[2]{}; + int m_palxor; + u16 m_position[4]; + std::unique_ptr m_spriteram[2]; + bitmap_ind16 m_renderbitmap; + bitmap_ind16 m_screenbitmap; + + void build_sprite_list(int no); + +private: + + void copybitmap(bitmap_ind16 &dest_bmp, const rectangle &clip, u8 pri); + void copybitmap(bitmap_rgb32 &dest_bmp, const rectangle &clip, u8 pri); + + void copybitmap(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &pri_bitmap, bitmap_rgb32 &temp_bitmap); + + // C355 Motion Object Emulation + // for pal_xor, supply either 0x0 (normal) or 0xf (palette mapping reversed) + int default_code2tile(int code); + + // C355 Motion Object internals + void get_single_sprite(u16 which, c355_sprite *sprite_ptr, int no); + template void draw_sprites(BitmapClass &bitmap, const rectangle &cliprect, int pri); + + + int m_scrolloffs[2]; + //u32 m_ramsize; + int m_buffer; + bool m_external_prifill; + + required_memory_region m_gfx_region; + u16 m_colbase; + int m_colors; + int m_granularity; + bool m_draw_2_lists; + bool m_device_allocates_spriteram_and_bitmaps; +}; + +// device type definition +DECLARE_DEVICE_TYPE(NAMCO_C355SPR, namco_c355spr_device) + +#endif // MAME_VIDEO_NAMCO_C355SPR_H diff --git a/src/mame/shared/naomig1.cpp b/src/mame/shared/naomig1.cpp index 2b8ccab0845..059339e08ed 100644 --- a/src/mame/shared/naomig1.cpp +++ b/src/mame/shared/naomig1.cpp @@ -2,7 +2,7 @@ // copyright-holders:Olivier Galibert #include "emu.h" -#include "machine/naomig1.h" +#include "naomig1.h" void naomi_g1_device::amap(address_map &map) { diff --git a/src/mame/shared/pcshare.cpp b/src/mame/shared/pcshare.cpp index 281c1ead46c..d9d977c10ef 100644 --- a/src/mame/shared/pcshare.cpp +++ b/src/mame/shared/pcshare.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/pcshare.h" +#include "pcshare.h" #include "cpu/i86/i286.h" #include "bus/isa/trident.h" #include "video/pc_vga.h" diff --git a/src/mame/shared/pk8000_v.cpp b/src/mame/shared/pk8000_v.cpp index 4e53a91625e..3ba8f93ecff 100644 --- a/src/mame/shared/pk8000_v.cpp +++ b/src/mame/shared/pk8000_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Miodrag Milanovic #include "emu.h" -#include "pk8000.h" +#include "pk8000_v.h" uint8_t pk8000_base_state::video_color_r() { diff --git a/src/mame/shared/pk8000_v.h b/src/mame/shared/pk8000_v.h index 80882471569..b5abbd6039d 100644 --- a/src/mame/shared/pk8000_v.h +++ b/src/mame/shared/pk8000_v.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Miodrag Milanovic -#ifndef MAME_VIDEO_PK8000_H -#define MAME_VIDEO_PK8000_H +#ifndef MAME_INCLUDES_PK8000_V_H +#define MAME_INCLUDES_PK8000_V_H #pragma once @@ -9,12 +9,13 @@ class pk8000_base_state : public driver_device { -protected: +public: pk8000_base_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } +protected: uint8_t _84_porta_r(); void _84_porta_w(uint8_t data); void _84_portc_w(uint8_t data); @@ -47,4 +48,4 @@ protected: required_device m_maincpu; }; -#endif // MAME_VIDEO_PK8000_H +#endif // MAME_INCLUDES_PK8000_V_H diff --git a/src/mame/shared/powervr2.cpp b/src/mame/shared/powervr2.cpp index 3d6a215e070..476965b84f4 100644 --- a/src/mame/shared/powervr2.cpp +++ b/src/mame/shared/powervr2.cpp @@ -15,7 +15,7 @@ #include "emu.h" #include "powervr2.h" -#include "includes/dc.h" +#include "dc.h" #include "cpu/sh/sh4.h" #include "video/rgbutil.h" diff --git a/src/mame/shared/segam1audio.cpp b/src/mame/shared/segam1audio.cpp index 6b5e936e5b0..a908997bc5d 100644 --- a/src/mame/shared/segam1audio.cpp +++ b/src/mame/shared/segam1audio.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/segam1audio.h" +#include "segam1audio.h" #include "machine/clock.h" #include "speaker.h" diff --git a/src/mame/shared/seibu.cpp b/src/mame/shared/seibu.cpp deleted file mode 100644 index 7c1517e433b..00000000000 --- a/src/mame/shared/seibu.cpp +++ /dev/null @@ -1,489 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Bryan McPhail, R. Belmont -/*************************************************************************** - - Seibu Sound System v1.02, designed 1986 by Seibu Kaihatsu - - The Seibu sound system comprises of a Z80A, a YM3812, a YM3931*, and - an Oki MSM6295. As well as sound the Z80 can controls coins and pass - data to the main cpu. There are a few little quirks that make it - worthwhile emulating in a separate file: - - * The YM3812 generates interrupt RST10, by asserting the interrupt line, - and placing 0xd7 on the data bus. - - * The main cpu generates interrupt RST18, by asserting the interrupt line, - and placing 0xdf on the data bus. - - A problem can occur if both the YM3812 and the main cpu try to assert - the interrupt line at the same time. The effect in the old Mame - emulation would be for sound to stop playing - this is because a RST18 - cancelled out a RST10, and if a single RST10 is dropped sound stops - as the YM3812 timer is not reset. The problem occurs because even - if both interrupts happen at the same time, there can only be one value - on the data bus. Obviously the real hardware must have some circuit - to prevent this. It is emulated by user timers to control the z80 - interrupt vector. - - * The YM3931 is the main/sub cpu interface, similar to Konami's K054986A - or Taito's TC0140SYT. It also provides the Z80 memory map and - interrupt control. It's not a Yamaha chip :-) - - Emulation by Bryan McPhail, mish@tendril.co.uk - ADPCM by R. Belmont and Jarek Burczynski - -***************************************************************************/ - -#include "emu.h" -#include "audio/seibu.h" -#include "sound/okiadpcm.h" -#include "sound/okim6295.h" - - -/*************************************************************************** - Seibu Sound System -***************************************************************************/ - -/* - Games using encrypted sound cpu: - - Air Raid 1987 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - Cabal 1988 "Michel/Seibu sound 11/04/88" - Dead Angle 1988? "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - Dynamite Duke 1989 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - Toki 1989 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - Raiden (alt) 1990 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - - raiden and the decrypted raidena are not identical, there are vast sections of different data. - However, there are a few different bytes in the middle of identical data, suggesting a possible - error in the decryption scheme: they all require an additional XOR with 0x20 and are located at - similar addresses. - 00002422: 03 23 - 000024A1: 00 20 - 000024A2: 09 29 - 00002822: 48 68 - 000028A1: 06 26 - 00002A21: 17 37 - 00002A22: 00 20 - 00002AA1: 12 32 - 00002C21: 02 22 - 00002CA1: 02 22 - 00002CA2: 17 37 -*/ - -DEFINE_DEVICE_TYPE(SEIBU_SOUND, seibu_sound_device, "seibu_sound", "Seibu Sound System") - -seibu_sound_device::seibu_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, SEIBU_SOUND, tag, owner, clock), - m_int_cb(*this), - m_ym_read_cb(*this), - m_ym_write_cb(*this), - m_sound_rom(*this, finder_base::DUMMY_TAG), - m_rom_bank(*this, finder_base::DUMMY_TAG), - m_main2sub_pending(0), - m_sub2main_pending(0), - m_rst10_irq(false), - m_rst18_irq(false), - m_rst10_service(false), - m_rst18_service(false) -{ -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void seibu_sound_device::device_start() -{ - m_int_cb.resolve_safe(); - m_ym_read_cb.resolve_safe(0); - m_ym_write_cb.resolve_safe(); - - if (m_sound_rom.found() && m_rom_bank.found()) - { - if (m_sound_rom.length() > 0x10000) - { - m_rom_bank->configure_entries(0, (m_sound_rom.length() - 0x10000) / 0x8000, &m_sound_rom[0x10000], 0x8000); - - /* Denjin Makai definitely needs this at start-up, it never writes to the bankswitch */ - m_rom_bank->set_entry(0); - } else - m_rom_bank->set_base(&m_sound_rom[0x8000]); - } - - m_main2sub[0] = m_main2sub[1] = 0; - m_sub2main[0] = m_sub2main[1] = 0; - - save_item(NAME(m_main2sub)); - save_item(NAME(m_sub2main)); - save_item(NAME(m_main2sub_pending)); - save_item(NAME(m_sub2main_pending)); - save_item(NAME(m_rst10_irq)); - save_item(NAME(m_rst18_irq)); - save_item(NAME(m_rst10_service)); - save_item(NAME(m_rst18_service)); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void seibu_sound_device::device_reset() -{ - update_irq_lines(VECTOR_INIT); -} - -void seibu_sound_device::update_irq_lines(int param) -{ - machine().scheduler().synchronize(timer_expired_delegate(FUNC(seibu_sound_device::update_irq_synced), this), param); -} - -TIMER_CALLBACK_MEMBER(seibu_sound_device::update_irq_synced) -{ - switch (param) - { - case VECTOR_INIT: - m_rst10_irq = m_rst18_irq = false; - m_rst10_service = m_rst18_service = false; - break; - - case RST10_ASSERT: - m_rst10_irq = true; - break; - - case RST10_CLEAR: - m_rst10_irq = false; - break; - - case RST10_ACKNOWLEDGE: - m_rst10_service = true; - break; - - case RST10_EOI: - m_rst10_service = false; - break; - - case RST18_ASSERT: - m_rst18_irq = true; - break; - - case RST18_ACKNOWLEDGE: - m_rst18_service = true; - m_rst18_irq = false; - break; - - case RST18_EOI: - m_rst18_service = false; - break; - } - - m_int_cb((m_rst10_irq && !m_rst10_service) || (m_rst18_irq && !m_rst18_service) ? ASSERT_LINE : CLEAR_LINE); -} - -IRQ_CALLBACK_MEMBER(seibu_sound_device::im0_vector_cb) -{ - if (m_rst18_irq && !m_rst18_service) - { - update_irq_lines(RST18_ACKNOWLEDGE); - return 0xdf; - } - else if (m_rst10_irq && !m_rst10_service) - { - update_irq_lines(RST10_ACKNOWLEDGE); - return 0xd7; - } - else - { - logerror("Spurious interrupt taken\n"); - return 0x00; - } -} - - -void seibu_sound_device::irq_clear_w(u8) -{ - /* Denjin Makai and SD Gundam doesn't like this, it's tied to the rst18 ack ONLY so it could be related to it. */ - //update_irq_lines(VECTOR_INIT); - - update_irq_lines(RST18_EOI); -} - -void seibu_sound_device::rst10_ack_w(u8) -{ - update_irq_lines(RST10_EOI); -} - -void seibu_sound_device::rst18_ack_w(u8) -{ - update_irq_lines(RST18_EOI); -} - -WRITE_LINE_MEMBER( seibu_sound_device::fm_irqhandler ) -{ - update_irq_lines(state ? RST10_ASSERT : RST10_CLEAR); -} - -u8 seibu_sound_device::ym_r(offs_t offset) -{ - return m_ym_read_cb(offset); -} - -void seibu_sound_device::ym_w(offs_t offset, u8 data) -{ - m_ym_write_cb(offset, data); -} - -void seibu_sound_device::bank_w(u8 data) -{ - if (m_rom_bank.found()) - m_rom_bank->set_entry(data & 1); -} - -void seibu_sound_device::coin_w(u8 data) -{ - machine().bookkeeping().coin_counter_w(0, data & 1); - machine().bookkeeping().coin_counter_w(1, data & 2); -} - -u8 seibu_sound_device::soundlatch_r(offs_t offset) -{ - return m_main2sub[offset]; -} - -u8 seibu_sound_device::main_data_pending_r() -{ - return m_sub2main_pending ? 1 : 0; -} - -void seibu_sound_device::main_data_w(offs_t offset, u8 data) -{ - m_sub2main[offset] = data; -} - -void seibu_sound_device::pending_w(u8) -{ - /* just a guess */ - m_main2sub_pending = 0; - m_sub2main_pending = 1; -} - -u8 seibu_sound_device::main_r(offs_t offset) -{ - //logerror("%s: seibu_main_r(%x)\n",machine().describe_context(),offset); - switch (offset) - { - case 2: - case 3: - return m_sub2main[offset-2]; - case 5: - return m_main2sub_pending ? 1 : 0; - default: - //logerror("%s: seibu_main_r(%x)\n",machine().describe_context(),offset); - return 0xff; - } -} - -void seibu_sound_device::main_w(offs_t offset, u8 data) -{ - switch (offset) - { - case 0: - case 1: - m_main2sub[offset] = data; - break; - case 4: - update_irq_lines(RST18_ASSERT); - break; - case 2: //Sengoku Mahjong writes here - case 6: - /* just a guess */ - m_sub2main_pending = 0; - m_main2sub_pending = 1; - break; - default: - //logerror("%s: seibu_main_w(%x,%02x)\n",machine().describe_context(),offset,data); - break; - } -} - -// used only by NMK16 bootlegs -void seibu_sound_device::main_mustb_w(offs_t, u16 data, u16 mem_mask) -{ - if (ACCESSING_BITS_0_7) - m_main2sub[0] = data & 0xff; - if (ACCESSING_BITS_8_15) - m_main2sub[1] = data >> 8; - -// logerror("seibu_main_mustb_w: %x -> %x %x\n", data, main2sub[0], main2sub[1]); - - update_irq_lines(RST18_ASSERT); -} - -/***************************************************************************/ - -void seibu_sound_common::seibu_sound_map(address_map &map) -{ - map(0x0000, 0x1fff).rom(); - map(0x2000, 0x27ff).ram(); - map(0x4000, 0x4000).w("seibu_sound", FUNC(seibu_sound_device::pending_w)); - map(0x4001, 0x4001).w("seibu_sound", FUNC(seibu_sound_device::irq_clear_w)); - map(0x4002, 0x4002).w("seibu_sound", FUNC(seibu_sound_device::rst10_ack_w)); - map(0x4003, 0x4003).w("seibu_sound", FUNC(seibu_sound_device::rst18_ack_w)); - map(0x4007, 0x4007).w("seibu_sound", FUNC(seibu_sound_device::bank_w)); - map(0x4008, 0x4009).rw("seibu_sound", FUNC(seibu_sound_device::ym_r), FUNC(seibu_sound_device::ym_w)); - map(0x4010, 0x4011).r("seibu_sound", FUNC(seibu_sound_device::soundlatch_r)); - map(0x4012, 0x4012).r("seibu_sound", FUNC(seibu_sound_device::main_data_pending_r)); - map(0x4013, 0x4013).portr("COIN"); - map(0x4018, 0x4019).w("seibu_sound", FUNC(seibu_sound_device::main_data_w)); - map(0x401b, 0x401b).w("seibu_sound", FUNC(seibu_sound_device::coin_w)); - map(0x6000, 0x6000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x8000, 0xffff).bankr("seibu_bank1"); -} - -/***************************************************************************/ - -DEFINE_DEVICE_TYPE(SEI80BU, sei80bu_device, "sei80bu", "SEI80BU Encrypted Z80 Interface") - -sei80bu_device::sei80bu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, SEI80BU, tag, owner, clock), - device_rom_interface(mconfig, *this) -{ -} - -u8 sei80bu_device::data_r(offs_t offset) -{ - u16 a = offset; - u8 src = read_byte(offset); - - if ( BIT(a,9) & BIT(a,8)) src ^= 0x80; - if ( BIT(a,11) & BIT(a,4) & BIT(a,1)) src ^= 0x40; - if ( BIT(a,11) & ~BIT(a,8) & BIT(a,1)) src ^= 0x04; - if ( BIT(a,13) & ~BIT(a,6) & BIT(a,4)) src ^= 0x02; - if (~BIT(a,11) & BIT(a,9) & BIT(a,2)) src ^= 0x01; - - if (BIT(a,13) & BIT(a,4)) src = bitswap<8>(src,7,6,5,4,3,2,0,1); - if (BIT(a, 8) & BIT(a,4)) src = bitswap<8>(src,7,6,5,4,2,3,1,0); - - return src; -} - -u8 sei80bu_device::opcode_r(offs_t offset) -{ - u16 a = offset; - u8 src = read_byte(offset); - - if ( BIT(a,9) & BIT(a,8)) src ^= 0x80; - if ( BIT(a,11) & BIT(a,4) & BIT(a,1)) src ^= 0x40; - if (~BIT(a,13) & BIT(a,12)) src ^= 0x20; - if (~BIT(a,6) & BIT(a,1)) src ^= 0x10; - if (~BIT(a,12) & BIT(a,2)) src ^= 0x08; - if ( BIT(a,11) & ~BIT(a,8) & BIT(a,1)) src ^= 0x04; - if ( BIT(a,13) & ~BIT(a,6) & BIT(a,4)) src ^= 0x02; - if (~BIT(a,11) & BIT(a,9) & BIT(a,2)) src ^= 0x01; - - if (BIT(a,13) & BIT(a,4)) src = bitswap<8>(src,7,6,5,4,3,2,0,1); - if (BIT(a, 8) & BIT(a,4)) src = bitswap<8>(src,7,6,5,4,2,3,1,0); - if (BIT(a,12) & BIT(a,9)) src = bitswap<8>(src,7,6,4,5,3,2,1,0); - if (BIT(a,11) & ~BIT(a,6)) src = bitswap<8>(src,6,7,5,4,3,2,1,0); - - return src; -} - -/*************************************************************************** - Seibu ADPCM device - (MSM5205 with interface to sample ROM provided by YM3931) -***************************************************************************/ - -DEFINE_DEVICE_TYPE(SEIBU_ADPCM, seibu_adpcm_device, "seibu_adpcm", "Seibu ADPCM interface") - -seibu_adpcm_device::seibu_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, SEIBU_ADPCM, tag, owner, clock) - , m_msm(*this, finder_base::DUMMY_TAG) - , m_current(0) - , m_end(0) - , m_nibble(0) - , m_playing(0) - , m_base(*this, DEVICE_SELF) -{ -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void seibu_adpcm_device::device_start() -{ - save_item(NAME(m_current)); - save_item(NAME(m_end)); - save_item(NAME(m_nibble)); - save_item(NAME(m_playing)); -} - -void seibu_adpcm_device::device_reset() -{ - m_playing = 0; - m_msm->reset_w(1); -} - -// "decrypt" is a bit flowery here, as it's probably just line-swapping to -// simplify PCB layout/routing rather than intentional protection, but it -// still fits, especially since the Z80s for all these games are truly encrypted. - -void seibu_adpcm_device::decrypt() -{ - for (int i = 0; i < m_base.length(); i++) - { - m_base[i] = bitswap<8>(m_base[i], 7, 5, 3, 1, 6, 4, 2, 0); - } -} - -void seibu_adpcm_device::adr_w(offs_t offset, u8 data) -{ - if (offset) - { - m_end = data<<8; - } - else - { - m_current = data<<8; - m_nibble = 4; - } -} - -void seibu_adpcm_device::ctl_w(u8 data) -{ - // sequence is 00 02 01 each time. - switch (data) - { - case 0: - m_msm->reset_w(1); - m_playing = 0; - break; - case 2: - break; - case 1: - m_msm->reset_w(0); - m_playing = 1; - break; - } -} - -void seibu_adpcm_device::msm_int(int state) -{ - if (!state || !m_playing) - return; - - int val = (m_base[m_current] >> m_nibble) & 15; - m_msm->data_w(val); - - m_nibble ^= 4; - if (m_nibble == 4) - { - m_current++; - if (m_current >= m_end) - { - m_msm->reset_w(1); - m_playing = 0; - } - } -} diff --git a/src/mame/shared/seibu.h b/src/mame/shared/seibu.h deleted file mode 100644 index a95e780fa70..00000000000 --- a/src/mame/shared/seibu.h +++ /dev/null @@ -1,196 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Aaron Giles -/*************************************************************************** - - Seibu Sound System v1.02, games using this include: - - Cross Shooter 1987 * "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." (YM2151 substituted for YM3812) - Cabal 1988 * "Michel/Seibu sound 11/04/88" (YM2151 substituted for YM3812, MSM5205 ADPCM) - Dead Angle 1988 * "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." (2xYM2203 substituted for YM3812, MSM5205 ADPCM) - Dynamite Duke 1989 * "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - Toki 1989 * "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - Raiden 1990 * "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - Blood Brothers 1990 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - D-Con 1992 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - - Related sound programs (not implemented yet): - - Zero Team "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - Legionnaire "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - Raiden 2 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." (YM2151 substituted for YM3812, plus extra MSM6205) - Raiden DX "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." (YM2151 substituted for YM3812, plus extra MSM6205) - Cup Soccer "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." - SD Gundam Psycho Salamander "Copyright by King Bee Sol 1991" - * = encrypted - -***************************************************************************/ -#ifndef MAME_AUDIO_SEIBU_H -#define MAME_AUDIO_SEIBU_H - -#pragma once - -#include "cpu/z80/z80.h" -#include "sound/msm5205.h" -#include "dirom.h" - -class seibu_sound_common { -public: - virtual ~seibu_sound_common() = default; - -protected: - void seibu_sound_map(address_map &map); -}; - -class seibu_sound_device : public device_t -{ -public: - seibu_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - ~seibu_sound_device() { } - - // configuration - template void set_rom_tag(T &&tag) { m_sound_rom.set_tag(std::forward(tag)); } - template void set_rombank_tag(T &&tag) { m_rom_bank.set_tag(std::forward(tag)); } - auto int_callback() { return m_int_cb.bind(); } - auto ym_read_callback() { return m_ym_read_cb.bind(); } - auto ym_write_callback() { return m_ym_write_cb.bind(); } - - u8 main_r(offs_t offset); - void main_w(offs_t offset, u8 data); - void main_mustb_w(offs_t, u16 data, u16 mem_mask); - void irq_clear_w(u8); - void rst10_ack_w(u8); - void rst18_ack_w(u8); - u8 ym_r(offs_t offset); - void ym_w(offs_t offset, u8 data); - void bank_w(u8 data); - void coin_w(u8 data); - WRITE_LINE_MEMBER( fm_irqhandler ); - u8 soundlatch_r(offs_t offset); - u8 main_data_pending_r(); - void main_data_w(offs_t offset, u8 data); - void pending_w(u8); - - IRQ_CALLBACK_MEMBER(im0_vector_cb); - -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - -private: - void update_irq_lines(int param); - TIMER_CALLBACK_MEMBER(update_irq_synced); - - // device callbacks - devcb_write_line m_int_cb; - devcb_read8 m_ym_read_cb; - devcb_write8 m_ym_write_cb; - - // internal state - optional_region_ptr m_sound_rom; - optional_memory_bank m_rom_bank; - uint8_t m_main2sub[2]; - uint8_t m_sub2main[2]; - int m_main2sub_pending; - int m_sub2main_pending; - bool m_rst10_irq; - bool m_rst18_irq; - bool m_rst10_service; - bool m_rst18_service; - - enum - { - VECTOR_INIT, - RST10_ASSERT, - RST10_CLEAR, - RST10_ACKNOWLEDGE, - RST10_EOI, - RST18_ASSERT, - RST18_ACKNOWLEDGE, - RST18_EOI - }; -}; - -DECLARE_DEVICE_TYPE(SEIBU_SOUND, seibu_sound_device) - - -// SEI80BU (Z80 program decryption) - -class sei80bu_device : public device_t, public device_rom_interface<16> -{ -public: - sei80bu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - u8 data_r(offs_t offset); - u8 opcode_r(offs_t offset); - -protected: - // device-level overrides - virtual void device_start() override { } - virtual void rom_bank_updated() override { } -}; - -DECLARE_DEVICE_TYPE(SEI80BU, sei80bu_device) - -// Seibu ADPCM device - -class seibu_adpcm_device : public device_t -{ -public: - template seibu_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&msm5205_tag) - : seibu_adpcm_device(mconfig, tag, owner, clock) - { - m_msm.set_tag(std::forward(msm5205_tag)); - } - seibu_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - ~seibu_adpcm_device() { } - - void decrypt(); - void adr_w(offs_t offset, u8 data); - void ctl_w(u8 data); - void msm_int(int state); - -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - -private: - // internal state - required_device m_msm; - uint32_t m_current; - uint32_t m_end; - uint8_t m_nibble; - uint8_t m_playing; - required_region_ptr m_base; -}; - -DECLARE_DEVICE_TYPE(SEIBU_ADPCM, seibu_adpcm_device) - -/**************************************************************************/ - -#define SEIBU_COIN_INPUTS \ - PORT_START("COIN") \ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(4) \ - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(4) \ - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) \ - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) \ - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) \ - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) \ - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) \ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) - -#define SEIBU_COIN_INPUTS_INVERT \ - PORT_START("COIN") \ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(4) \ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(4) \ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) \ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) \ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) \ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - -/**************************************************************************/ - -#endif // MAME_AUDIO_SEIBU_H diff --git a/src/mame/shared/seibusound.cpp b/src/mame/shared/seibusound.cpp new file mode 100644 index 00000000000..c22aaac61d6 --- /dev/null +++ b/src/mame/shared/seibusound.cpp @@ -0,0 +1,490 @@ +// license:BSD-3-Clause +// copyright-holders:Bryan McPhail, R. Belmont +/*************************************************************************** + + Seibu Sound System v1.02, designed 1986 by Seibu Kaihatsu + + The Seibu sound system comprises of a Z80A, a YM3812, a YM3931*, and + an Oki MSM6295. As well as sound the Z80 can controls coins and pass + data to the main cpu. There are a few little quirks that make it + worthwhile emulating in a separate file: + + * The YM3812 generates interrupt RST10, by asserting the interrupt line, + and placing 0xd7 on the data bus. + + * The main cpu generates interrupt RST18, by asserting the interrupt line, + and placing 0xdf on the data bus. + + A problem can occur if both the YM3812 and the main cpu try to assert + the interrupt line at the same time. The effect in the old Mame + emulation would be for sound to stop playing - this is because a RST18 + cancelled out a RST10, and if a single RST10 is dropped sound stops + as the YM3812 timer is not reset. The problem occurs because even + if both interrupts happen at the same time, there can only be one value + on the data bus. Obviously the real hardware must have some circuit + to prevent this. It is emulated by user timers to control the z80 + interrupt vector. + + * The YM3931 is the main/sub cpu interface, similar to Konami's K054986A + or Taito's TC0140SYT. It also provides the Z80 memory map and + interrupt control. It's not a Yamaha chip :-) + + Emulation by Bryan McPhail, mish@tendril.co.uk + ADPCM by R. Belmont and Jarek Burczynski + +***************************************************************************/ + +#include "emu.h" +#include "seibusound.h" + +#include "sound/okiadpcm.h" +#include "sound/okim6295.h" + + +/*************************************************************************** + Seibu Sound System +***************************************************************************/ + +/* + Games using encrypted sound cpu: + + Air Raid 1987 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + Cabal 1988 "Michel/Seibu sound 11/04/88" + Dead Angle 1988? "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + Dynamite Duke 1989 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + Toki 1989 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + Raiden (alt) 1990 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + + raiden and the decrypted raidena are not identical, there are vast sections of different data. + However, there are a few different bytes in the middle of identical data, suggesting a possible + error in the decryption scheme: they all require an additional XOR with 0x20 and are located at + similar addresses. + 00002422: 03 23 + 000024A1: 00 20 + 000024A2: 09 29 + 00002822: 48 68 + 000028A1: 06 26 + 00002A21: 17 37 + 00002A22: 00 20 + 00002AA1: 12 32 + 00002C21: 02 22 + 00002CA1: 02 22 + 00002CA2: 17 37 +*/ + +DEFINE_DEVICE_TYPE(SEIBU_SOUND, seibu_sound_device, "seibu_sound", "Seibu Sound System") + +seibu_sound_device::seibu_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, SEIBU_SOUND, tag, owner, clock), + m_int_cb(*this), + m_ym_read_cb(*this), + m_ym_write_cb(*this), + m_sound_rom(*this, finder_base::DUMMY_TAG), + m_rom_bank(*this, finder_base::DUMMY_TAG), + m_main2sub_pending(0), + m_sub2main_pending(0), + m_rst10_irq(false), + m_rst18_irq(false), + m_rst10_service(false), + m_rst18_service(false) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void seibu_sound_device::device_start() +{ + m_int_cb.resolve_safe(); + m_ym_read_cb.resolve_safe(0); + m_ym_write_cb.resolve_safe(); + + if (m_sound_rom.found() && m_rom_bank.found()) + { + if (m_sound_rom.length() > 0x10000) + { + m_rom_bank->configure_entries(0, (m_sound_rom.length() - 0x10000) / 0x8000, &m_sound_rom[0x10000], 0x8000); + + /* Denjin Makai definitely needs this at start-up, it never writes to the bankswitch */ + m_rom_bank->set_entry(0); + } else + m_rom_bank->set_base(&m_sound_rom[0x8000]); + } + + m_main2sub[0] = m_main2sub[1] = 0; + m_sub2main[0] = m_sub2main[1] = 0; + + save_item(NAME(m_main2sub)); + save_item(NAME(m_sub2main)); + save_item(NAME(m_main2sub_pending)); + save_item(NAME(m_sub2main_pending)); + save_item(NAME(m_rst10_irq)); + save_item(NAME(m_rst18_irq)); + save_item(NAME(m_rst10_service)); + save_item(NAME(m_rst18_service)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void seibu_sound_device::device_reset() +{ + update_irq_lines(VECTOR_INIT); +} + +void seibu_sound_device::update_irq_lines(int param) +{ + machine().scheduler().synchronize(timer_expired_delegate(FUNC(seibu_sound_device::update_irq_synced), this), param); +} + +TIMER_CALLBACK_MEMBER(seibu_sound_device::update_irq_synced) +{ + switch (param) + { + case VECTOR_INIT: + m_rst10_irq = m_rst18_irq = false; + m_rst10_service = m_rst18_service = false; + break; + + case RST10_ASSERT: + m_rst10_irq = true; + break; + + case RST10_CLEAR: + m_rst10_irq = false; + break; + + case RST10_ACKNOWLEDGE: + m_rst10_service = true; + break; + + case RST10_EOI: + m_rst10_service = false; + break; + + case RST18_ASSERT: + m_rst18_irq = true; + break; + + case RST18_ACKNOWLEDGE: + m_rst18_service = true; + m_rst18_irq = false; + break; + + case RST18_EOI: + m_rst18_service = false; + break; + } + + m_int_cb((m_rst10_irq && !m_rst10_service) || (m_rst18_irq && !m_rst18_service) ? ASSERT_LINE : CLEAR_LINE); +} + +IRQ_CALLBACK_MEMBER(seibu_sound_device::im0_vector_cb) +{ + if (m_rst18_irq && !m_rst18_service) + { + update_irq_lines(RST18_ACKNOWLEDGE); + return 0xdf; + } + else if (m_rst10_irq && !m_rst10_service) + { + update_irq_lines(RST10_ACKNOWLEDGE); + return 0xd7; + } + else + { + logerror("Spurious interrupt taken\n"); + return 0x00; + } +} + + +void seibu_sound_device::irq_clear_w(u8) +{ + /* Denjin Makai and SD Gundam doesn't like this, it's tied to the rst18 ack ONLY so it could be related to it. */ + //update_irq_lines(VECTOR_INIT); + + update_irq_lines(RST18_EOI); +} + +void seibu_sound_device::rst10_ack_w(u8) +{ + update_irq_lines(RST10_EOI); +} + +void seibu_sound_device::rst18_ack_w(u8) +{ + update_irq_lines(RST18_EOI); +} + +WRITE_LINE_MEMBER( seibu_sound_device::fm_irqhandler ) +{ + update_irq_lines(state ? RST10_ASSERT : RST10_CLEAR); +} + +u8 seibu_sound_device::ym_r(offs_t offset) +{ + return m_ym_read_cb(offset); +} + +void seibu_sound_device::ym_w(offs_t offset, u8 data) +{ + m_ym_write_cb(offset, data); +} + +void seibu_sound_device::bank_w(u8 data) +{ + if (m_rom_bank.found()) + m_rom_bank->set_entry(data & 1); +} + +void seibu_sound_device::coin_w(u8 data) +{ + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); +} + +u8 seibu_sound_device::soundlatch_r(offs_t offset) +{ + return m_main2sub[offset]; +} + +u8 seibu_sound_device::main_data_pending_r() +{ + return m_sub2main_pending ? 1 : 0; +} + +void seibu_sound_device::main_data_w(offs_t offset, u8 data) +{ + m_sub2main[offset] = data; +} + +void seibu_sound_device::pending_w(u8) +{ + /* just a guess */ + m_main2sub_pending = 0; + m_sub2main_pending = 1; +} + +u8 seibu_sound_device::main_r(offs_t offset) +{ + //logerror("%s: seibu_main_r(%x)\n",machine().describe_context(),offset); + switch (offset) + { + case 2: + case 3: + return m_sub2main[offset-2]; + case 5: + return m_main2sub_pending ? 1 : 0; + default: + //logerror("%s: seibu_main_r(%x)\n",machine().describe_context(),offset); + return 0xff; + } +} + +void seibu_sound_device::main_w(offs_t offset, u8 data) +{ + switch (offset) + { + case 0: + case 1: + m_main2sub[offset] = data; + break; + case 4: + update_irq_lines(RST18_ASSERT); + break; + case 2: //Sengoku Mahjong writes here + case 6: + /* just a guess */ + m_sub2main_pending = 0; + m_main2sub_pending = 1; + break; + default: + //logerror("%s: seibu_main_w(%x,%02x)\n",machine().describe_context(),offset,data); + break; + } +} + +// used only by NMK16 bootlegs +void seibu_sound_device::main_mustb_w(offs_t, u16 data, u16 mem_mask) +{ + if (ACCESSING_BITS_0_7) + m_main2sub[0] = data & 0xff; + if (ACCESSING_BITS_8_15) + m_main2sub[1] = data >> 8; + +// logerror("seibu_main_mustb_w: %x -> %x %x\n", data, main2sub[0], main2sub[1]); + + update_irq_lines(RST18_ASSERT); +} + +/***************************************************************************/ + +void seibu_sound_common::seibu_sound_map(address_map &map) +{ + map(0x0000, 0x1fff).rom(); + map(0x2000, 0x27ff).ram(); + map(0x4000, 0x4000).w("seibu_sound", FUNC(seibu_sound_device::pending_w)); + map(0x4001, 0x4001).w("seibu_sound", FUNC(seibu_sound_device::irq_clear_w)); + map(0x4002, 0x4002).w("seibu_sound", FUNC(seibu_sound_device::rst10_ack_w)); + map(0x4003, 0x4003).w("seibu_sound", FUNC(seibu_sound_device::rst18_ack_w)); + map(0x4007, 0x4007).w("seibu_sound", FUNC(seibu_sound_device::bank_w)); + map(0x4008, 0x4009).rw("seibu_sound", FUNC(seibu_sound_device::ym_r), FUNC(seibu_sound_device::ym_w)); + map(0x4010, 0x4011).r("seibu_sound", FUNC(seibu_sound_device::soundlatch_r)); + map(0x4012, 0x4012).r("seibu_sound", FUNC(seibu_sound_device::main_data_pending_r)); + map(0x4013, 0x4013).portr("COIN"); + map(0x4018, 0x4019).w("seibu_sound", FUNC(seibu_sound_device::main_data_w)); + map(0x401b, 0x401b).w("seibu_sound", FUNC(seibu_sound_device::coin_w)); + map(0x6000, 0x6000).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0x8000, 0xffff).bankr("seibu_bank1"); +} + +/***************************************************************************/ + +DEFINE_DEVICE_TYPE(SEI80BU, sei80bu_device, "sei80bu", "SEI80BU Encrypted Z80 Interface") + +sei80bu_device::sei80bu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, SEI80BU, tag, owner, clock), + device_rom_interface(mconfig, *this) +{ +} + +u8 sei80bu_device::data_r(offs_t offset) +{ + u16 a = offset; + u8 src = read_byte(offset); + + if ( BIT(a,9) & BIT(a,8)) src ^= 0x80; + if ( BIT(a,11) & BIT(a,4) & BIT(a,1)) src ^= 0x40; + if ( BIT(a,11) & ~BIT(a,8) & BIT(a,1)) src ^= 0x04; + if ( BIT(a,13) & ~BIT(a,6) & BIT(a,4)) src ^= 0x02; + if (~BIT(a,11) & BIT(a,9) & BIT(a,2)) src ^= 0x01; + + if (BIT(a,13) & BIT(a,4)) src = bitswap<8>(src,7,6,5,4,3,2,0,1); + if (BIT(a, 8) & BIT(a,4)) src = bitswap<8>(src,7,6,5,4,2,3,1,0); + + return src; +} + +u8 sei80bu_device::opcode_r(offs_t offset) +{ + u16 a = offset; + u8 src = read_byte(offset); + + if ( BIT(a,9) & BIT(a,8)) src ^= 0x80; + if ( BIT(a,11) & BIT(a,4) & BIT(a,1)) src ^= 0x40; + if (~BIT(a,13) & BIT(a,12)) src ^= 0x20; + if (~BIT(a,6) & BIT(a,1)) src ^= 0x10; + if (~BIT(a,12) & BIT(a,2)) src ^= 0x08; + if ( BIT(a,11) & ~BIT(a,8) & BIT(a,1)) src ^= 0x04; + if ( BIT(a,13) & ~BIT(a,6) & BIT(a,4)) src ^= 0x02; + if (~BIT(a,11) & BIT(a,9) & BIT(a,2)) src ^= 0x01; + + if (BIT(a,13) & BIT(a,4)) src = bitswap<8>(src,7,6,5,4,3,2,0,1); + if (BIT(a, 8) & BIT(a,4)) src = bitswap<8>(src,7,6,5,4,2,3,1,0); + if (BIT(a,12) & BIT(a,9)) src = bitswap<8>(src,7,6,4,5,3,2,1,0); + if (BIT(a,11) & ~BIT(a,6)) src = bitswap<8>(src,6,7,5,4,3,2,1,0); + + return src; +} + +/*************************************************************************** + Seibu ADPCM device + (MSM5205 with interface to sample ROM provided by YM3931) +***************************************************************************/ + +DEFINE_DEVICE_TYPE(SEIBU_ADPCM, seibu_adpcm_device, "seibu_adpcm", "Seibu ADPCM interface") + +seibu_adpcm_device::seibu_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, SEIBU_ADPCM, tag, owner, clock) + , m_msm(*this, finder_base::DUMMY_TAG) + , m_current(0) + , m_end(0) + , m_nibble(0) + , m_playing(0) + , m_base(*this, DEVICE_SELF) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void seibu_adpcm_device::device_start() +{ + save_item(NAME(m_current)); + save_item(NAME(m_end)); + save_item(NAME(m_nibble)); + save_item(NAME(m_playing)); +} + +void seibu_adpcm_device::device_reset() +{ + m_playing = 0; + m_msm->reset_w(1); +} + +// "decrypt" is a bit flowery here, as it's probably just line-swapping to +// simplify PCB layout/routing rather than intentional protection, but it +// still fits, especially since the Z80s for all these games are truly encrypted. + +void seibu_adpcm_device::decrypt() +{ + for (int i = 0; i < m_base.length(); i++) + { + m_base[i] = bitswap<8>(m_base[i], 7, 5, 3, 1, 6, 4, 2, 0); + } +} + +void seibu_adpcm_device::adr_w(offs_t offset, u8 data) +{ + if (offset) + { + m_end = data<<8; + } + else + { + m_current = data<<8; + m_nibble = 4; + } +} + +void seibu_adpcm_device::ctl_w(u8 data) +{ + // sequence is 00 02 01 each time. + switch (data) + { + case 0: + m_msm->reset_w(1); + m_playing = 0; + break; + case 2: + break; + case 1: + m_msm->reset_w(0); + m_playing = 1; + break; + } +} + +void seibu_adpcm_device::msm_int(int state) +{ + if (!state || !m_playing) + return; + + int val = (m_base[m_current] >> m_nibble) & 15; + m_msm->data_w(val); + + m_nibble ^= 4; + if (m_nibble == 4) + { + m_current++; + if (m_current >= m_end) + { + m_msm->reset_w(1); + m_playing = 0; + } + } +} diff --git a/src/mame/shared/seibusound.h b/src/mame/shared/seibusound.h new file mode 100644 index 00000000000..a95e780fa70 --- /dev/null +++ b/src/mame/shared/seibusound.h @@ -0,0 +1,196 @@ +// license:BSD-3-Clause +// copyright-holders:Aaron Giles +/*************************************************************************** + + Seibu Sound System v1.02, games using this include: + + Cross Shooter 1987 * "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." (YM2151 substituted for YM3812) + Cabal 1988 * "Michel/Seibu sound 11/04/88" (YM2151 substituted for YM3812, MSM5205 ADPCM) + Dead Angle 1988 * "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." (2xYM2203 substituted for YM3812, MSM5205 ADPCM) + Dynamite Duke 1989 * "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + Toki 1989 * "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + Raiden 1990 * "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + Blood Brothers 1990 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + D-Con 1992 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + + Related sound programs (not implemented yet): + + Zero Team "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + Legionnaire "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + Raiden 2 "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." (YM2151 substituted for YM3812, plus extra MSM6205) + Raiden DX "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." (YM2151 substituted for YM3812, plus extra MSM6205) + Cup Soccer "START UP PROGRAM V1.02 (C)1986 SEIBU KAIHATSU INC." + SD Gundam Psycho Salamander "Copyright by King Bee Sol 1991" + * = encrypted + +***************************************************************************/ +#ifndef MAME_AUDIO_SEIBU_H +#define MAME_AUDIO_SEIBU_H + +#pragma once + +#include "cpu/z80/z80.h" +#include "sound/msm5205.h" +#include "dirom.h" + +class seibu_sound_common { +public: + virtual ~seibu_sound_common() = default; + +protected: + void seibu_sound_map(address_map &map); +}; + +class seibu_sound_device : public device_t +{ +public: + seibu_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ~seibu_sound_device() { } + + // configuration + template void set_rom_tag(T &&tag) { m_sound_rom.set_tag(std::forward(tag)); } + template void set_rombank_tag(T &&tag) { m_rom_bank.set_tag(std::forward(tag)); } + auto int_callback() { return m_int_cb.bind(); } + auto ym_read_callback() { return m_ym_read_cb.bind(); } + auto ym_write_callback() { return m_ym_write_cb.bind(); } + + u8 main_r(offs_t offset); + void main_w(offs_t offset, u8 data); + void main_mustb_w(offs_t, u16 data, u16 mem_mask); + void irq_clear_w(u8); + void rst10_ack_w(u8); + void rst18_ack_w(u8); + u8 ym_r(offs_t offset); + void ym_w(offs_t offset, u8 data); + void bank_w(u8 data); + void coin_w(u8 data); + WRITE_LINE_MEMBER( fm_irqhandler ); + u8 soundlatch_r(offs_t offset); + u8 main_data_pending_r(); + void main_data_w(offs_t offset, u8 data); + void pending_w(u8); + + IRQ_CALLBACK_MEMBER(im0_vector_cb); + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + +private: + void update_irq_lines(int param); + TIMER_CALLBACK_MEMBER(update_irq_synced); + + // device callbacks + devcb_write_line m_int_cb; + devcb_read8 m_ym_read_cb; + devcb_write8 m_ym_write_cb; + + // internal state + optional_region_ptr m_sound_rom; + optional_memory_bank m_rom_bank; + uint8_t m_main2sub[2]; + uint8_t m_sub2main[2]; + int m_main2sub_pending; + int m_sub2main_pending; + bool m_rst10_irq; + bool m_rst18_irq; + bool m_rst10_service; + bool m_rst18_service; + + enum + { + VECTOR_INIT, + RST10_ASSERT, + RST10_CLEAR, + RST10_ACKNOWLEDGE, + RST10_EOI, + RST18_ASSERT, + RST18_ACKNOWLEDGE, + RST18_EOI + }; +}; + +DECLARE_DEVICE_TYPE(SEIBU_SOUND, seibu_sound_device) + + +// SEI80BU (Z80 program decryption) + +class sei80bu_device : public device_t, public device_rom_interface<16> +{ +public: + sei80bu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + u8 data_r(offs_t offset); + u8 opcode_r(offs_t offset); + +protected: + // device-level overrides + virtual void device_start() override { } + virtual void rom_bank_updated() override { } +}; + +DECLARE_DEVICE_TYPE(SEI80BU, sei80bu_device) + +// Seibu ADPCM device + +class seibu_adpcm_device : public device_t +{ +public: + template seibu_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&msm5205_tag) + : seibu_adpcm_device(mconfig, tag, owner, clock) + { + m_msm.set_tag(std::forward(msm5205_tag)); + } + seibu_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ~seibu_adpcm_device() { } + + void decrypt(); + void adr_w(offs_t offset, u8 data); + void ctl_w(u8 data); + void msm_int(int state); + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + +private: + // internal state + required_device m_msm; + uint32_t m_current; + uint32_t m_end; + uint8_t m_nibble; + uint8_t m_playing; + required_region_ptr m_base; +}; + +DECLARE_DEVICE_TYPE(SEIBU_ADPCM, seibu_adpcm_device) + +/**************************************************************************/ + +#define SEIBU_COIN_INPUTS \ + PORT_START("COIN") \ + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(4) \ + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(4) \ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) \ + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) \ + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) \ + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) \ + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) \ + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) + +#define SEIBU_COIN_INPUTS_INVERT \ + PORT_START("COIN") \ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(4) \ + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(4) \ + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) \ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) \ + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) \ + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) \ + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) \ + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + +/**************************************************************************/ + +#endif // MAME_AUDIO_SEIBU_H diff --git a/src/mame/shared/specialsound.cpp b/src/mame/shared/specialsound.cpp new file mode 100644 index 00000000000..c6cdb0804ae --- /dev/null +++ b/src/mame/shared/specialsound.cpp @@ -0,0 +1,85 @@ +// license:BSD-3-Clause +// copyright-holders:Miodrag Milanovic +/*************************************************************************** + + audio/special.cpp + + Functions to emulate sound hardware of Specialist MX + ( based on code of DAI interface ) + +****************************************************************************/ + +#include "emu.h" +#include "specialsound.h" + + +// device type definition +DEFINE_DEVICE_TYPE(SPECIMX_SND, specimx_sound_device, "specimx_sound", "Specialist MX Custom Sound") + + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// specimx_sound_device - constructor +//------------------------------------------------- + +specimx_sound_device::specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, SPECIMX_SND, tag, owner, clock) + , device_sound_interface(mconfig, *this) + , m_mixer_channel(nullptr) + , m_specimx_input{ 0, 0, 0 } +{ +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void specimx_sound_device::device_start() +{ + m_specimx_input[0] = m_specimx_input[1] = m_specimx_input[2] = 0; + m_mixer_channel = stream_alloc(0, 1, machine().sample_rate()); +} + + +//------------------------------------------------- +// sound_stream_update - handle a stream update +//------------------------------------------------- + +void specimx_sound_device::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) +{ + auto &sample_left = outputs[0]; + + stream_buffer::sample_t channel_0_signal = m_specimx_input[0] ? 0.1 : -0.1; + stream_buffer::sample_t channel_1_signal = m_specimx_input[1] ? 0.1 : -0.1; + stream_buffer::sample_t channel_2_signal = m_specimx_input[2] ? 0.1 : -0.1; + stream_buffer::sample_t sum = channel_0_signal + channel_1_signal + channel_2_signal; + + sample_left.fill(sum); +} + + +//------------------------------------------------- +// PIT callbacks +//------------------------------------------------- + +WRITE_LINE_MEMBER(specimx_sound_device::set_input_ch0) +{ + m_mixer_channel->update(); + m_specimx_input[0] = state; +} + +WRITE_LINE_MEMBER(specimx_sound_device::set_input_ch1) +{ + m_mixer_channel->update(); + m_specimx_input[1] = state; +} + +WRITE_LINE_MEMBER(specimx_sound_device::set_input_ch2) +{ + m_mixer_channel->update(); + m_specimx_input[2] = state; +} diff --git a/src/mame/shared/specialsound.h b/src/mame/shared/specialsound.h new file mode 100644 index 00000000000..51dca82f12f --- /dev/null +++ b/src/mame/shared/specialsound.h @@ -0,0 +1,38 @@ +// license:BSD-3-Clause +// copyright-holders:Miodrag Milanovic +/***************************************************************************** + * + * audio/specimx.h + * + ****************************************************************************/ + +#ifndef MAME_AUDIO_SPECIAL_H +#define MAME_AUDIO_SPECIAL_H + +#pragma once + + +class specimx_sound_device : public device_t, public device_sound_interface +{ +public: + specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + DECLARE_WRITE_LINE_MEMBER(set_input_ch0); + DECLARE_WRITE_LINE_MEMBER(set_input_ch1); + DECLARE_WRITE_LINE_MEMBER(set_input_ch2); + +protected: + // device-level overrides + virtual void device_start() override; + + // sound stream update overrides + virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; + +private: + sound_stream *m_mixer_channel; + int m_specimx_input[3]; +}; + +DECLARE_DEVICE_TYPE(SPECIMX_SND, specimx_sound_device) + +#endif // MAME_AUDIO_SPECIAL_H diff --git a/src/mame/shared/taito68705.cpp b/src/mame/shared/taito68705.cpp new file mode 100644 index 00000000000..ad426357faf --- /dev/null +++ b/src/mame/shared/taito68705.cpp @@ -0,0 +1,356 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood, Vas Crabb +#include "emu.h" +#include "taito68705.h" + +#include "cpu/z80/z80.h" + +/* + Most Taito 68705s share a similar (often identical) hookup. + This file encapsulates that. + + used by: + 40love.cpp - 40love + bigevglf.cpp - bigevglf + bking.cpp - bking3 + bublbobl.cpp - tokio + buggychl.cpp - buggychl + flstory.cpp - flstory + lkage.cpp - lkage + lsasquad.cpp - lsasquad, daikaiju + matmania.cpp - maniach + nycaptor.cpp - nycaptor + renegade.cpp - renegade + retofinv.cpp - retofinv + slapfght.cpp - slapfght + xain.cpp - xsleena + + and the following with slight changes: + slapfght.cpp - tigerh (inverted status bits read on port C) + arkanoid.cpp - arkanoid (latch control on port C, inputs on port B) + taito_l.cpp - puzznic (latch control on port C) + + not hooked up here, but possible (needs investigating) + pitnrun.cpp - have more functionality on portB, currently using 'instant timers' for latches + taitosj.cpp - ^^ + + 68705 sets in Taito drivers that are NOT suitable for hookup here? + bublbobl.cpp - bub68705 - this is a bootleg, not an official Taito hookup + changela.cpp - changela - looks like an ancestor of arkanoid without automatic semaphores + mexico86.cpp - knightb, mexico86 - bootleg 68705s + sqix.cpp - hotsmash - kaneko hookup, different from Taito ones. + + there are other drivers (and games in existing drivers) that could hookup here, but currently lack MCU dumps. + +*/ + + +DEFINE_DEVICE_TYPE(TAITO68705_MCU, taito68705_mcu_device, "taito68705", "Taito MC68705 MCU Interface") +DEFINE_DEVICE_TYPE(TAITO68705_MCU_TIGER, taito68705_mcu_tiger_device, "taito68705tiger", "Taito MC68705 MCU Interface (Tiger-Heli)") +DEFINE_DEVICE_TYPE(ARKANOID_68705P3, arkanoid_68705p3_device, "arkanoid68705p3", "Arkanoid MC68705P3 Interface") +DEFINE_DEVICE_TYPE(ARKANOID_68705P5, arkanoid_68705p5_device, "arkanoid68705p5", "Arkanoid MC68705P5 Interface") + + +u8 taito68705_mcu_device_base::data_r() +{ + // clear MCU semaphore flag and return data + u8 const result(m_mcu_latch); + if (!machine().side_effects_disabled()) + { + m_mcu_flag = false; + m_semaphore_cb(CLEAR_LINE); + } + return result; +} + +void taito68705_mcu_device_base::data_w(u8 data) +{ + // set host semaphore flag and latch data + if (!m_reset_input) + m_host_flag = true; + m_host_latch = data; + if (m_latch_driven) + m_mcu->pa_w(data); + m_mcu->set_input_line(M68705_IRQ_LINE, m_host_flag ? ASSERT_LINE : CLEAR_LINE); +} + +WRITE_LINE_MEMBER(taito68705_mcu_device_base::reset_w) +{ + m_reset_input = ASSERT_LINE == state; + if (CLEAR_LINE != state) + { + m_host_flag = false; + m_mcu_flag = false; + m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE); + } + m_mcu->set_input_line(INPUT_LINE_RESET, state); +} + +taito68705_mcu_device_base::taito68705_mcu_device_base( + machine_config const &mconfig, + device_type type, + char const *tag, + device_t *owner, + u32 clock) + : device_t(mconfig, type, tag, owner, clock) + , m_mcu(*this, "mcu") + , m_semaphore_cb(*this) + , m_latch_driven(false) + , m_reset_input(false) + , m_host_flag(false) + , m_mcu_flag(false) + , m_host_latch(0xff) + , m_mcu_latch(0xff) + , m_pa_output(0xff) +{ +} + +void taito68705_mcu_device_base::mcu_pa_w(u8 data) +{ + m_pa_output = data; +} + +void taito68705_mcu_device_base::device_start() +{ + m_semaphore_cb.resolve_safe(); + + save_item(NAME(m_latch_driven)); + save_item(NAME(m_reset_input)); + save_item(NAME(m_host_flag)); + save_item(NAME(m_mcu_flag)); + save_item(NAME(m_host_latch)); + save_item(NAME(m_mcu_latch)); + save_item(NAME(m_pa_output)); + + m_latch_driven = false; + m_reset_input = false; + m_host_latch = 0xff; + m_mcu_latch = 0xff; + m_pa_output = 0xff; +} + +void taito68705_mcu_device_base::device_reset() +{ + m_host_flag = false; + m_mcu_flag = false; + + m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE); + m_semaphore_cb(CLEAR_LINE); +} + +void taito68705_mcu_device_base::latch_control(u8 data, u8 &value, unsigned host_bit, unsigned mcu_bit) +{ + // save this here to simulate latch propagation delays + u8 const old_pa_value(pa_value()); + + // rising edge clears the host semaphore flag + if (BIT(data, host_bit)) + { + m_latch_driven = false; + m_mcu->pa_w(0xff); + if (!BIT(value, host_bit)) + { + m_host_flag = false; + m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE); + } + } + else + { + m_latch_driven = true; + m_mcu->pa_w(m_host_latch); + } + + // PB2 sets the MCU semaphore when low + if (!BIT(data, mcu_bit)) + { + if (!m_reset_input) + m_mcu_flag = true; + + // data is latched on falling edge + if (BIT(value, mcu_bit)) + m_mcu_latch = old_pa_value; + } + + value = data; + if (!BIT(data, mcu_bit) && !m_reset_input) + m_semaphore_cb(ASSERT_LINE); +} + + +taito68705_mcu_device::taito68705_mcu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : taito68705_mcu_device(mconfig, TAITO68705_MCU, tag, owner, clock) +{ +} + +taito68705_mcu_device::taito68705_mcu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) + : taito68705_mcu_device_base(mconfig, type, tag, owner, clock) + , m_aux_out_cb(*this) + , m_aux_strobe_cb(*this) + , m_pb_output(0xff) +{ +} + +void taito68705_mcu_device::device_add_mconfig(machine_config &config) +{ + M68705P5(config, m_mcu, DERIVED_CLOCK(1, 1)); + m_mcu->porta_w().set(FUNC(taito68705_mcu_device::mcu_pa_w)); + m_mcu->portb_w().set(FUNC(taito68705_mcu_device::mcu_portb_w)); + m_mcu->portc_r().set(FUNC(taito68705_mcu_device::mcu_portc_r)); +} + +void taito68705_mcu_device::device_start() +{ + taito68705_mcu_device_base::device_start(); + + m_aux_out_cb.resolve_all_safe(); + m_aux_strobe_cb.resolve_safe(); + + save_item(NAME(m_pb_output)); + + m_pb_output = 0xff; +} + + +/* + * Port B connections: + * parts in [ ] are optional (not used by buggychl) + * + * all bits are logical 1 when read (+5V pullup) + * + * 0 n.c. + * 1 W IRQ ack and enable latch which holds data from main Z80 memory + * 2 W loads latch to Z80 + * 3 W to Z80 BUSRQ (put it on hold?) + * 4 W n.c. + * 5 W [selects Z80 memory access direction (0 = write 1 = read)] + * 6 W [loads the latch which holds the low 8 bits of the address of + * the main Z80 memory location to access] + * 7 W [loads the latch which holds the high 8 bits of the address of + * the main Z80 memory location to access] + */ + + +u8 taito68705_mcu_device::mcu_portc_r() +{ + // PC0 is the host semaphore flag (active high) + // PC1 is the MCU semaphore flag (active low) + return (host_flag() ? 0x01 : 0x00) | (mcu_flag() ? 0x00 : 0x02) | 0xfc; +} + +void taito68705_mcu_device::mcu_portb_w(offs_t offset, u8 data, u8 mem_mask) +{ + // some games have additional peripherals strobed on falling edge + u8 const old_pa_value(pa_value()); + u8 const aux_changed((data ^ m_pb_output) >> 2); + u8 const aux_strobes((mem_mask & ~data & m_pb_output) >> 2); + + // rising edge on PB1 clears the host semaphore flag + // PB2 sets the MCU semaphore when low + latch_control(data, m_pb_output, 1, 2); + + // callbacks for other peripherals + for (unsigned i = 0; i < 6; ++i) + { + if (BIT(aux_changed, i)) + m_aux_out_cb[i](BIT(data, i + 2)); + if (BIT(aux_strobes, i)) + m_aux_strobe_cb(i, old_pa_value, 0xff); + } +} + + +/* The Tiger-Heli interface has some extensions, handle them here */ + +taito68705_mcu_tiger_device::taito68705_mcu_tiger_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : taito68705_mcu_device(mconfig, TAITO68705_MCU_TIGER, tag, owner, clock) +{ +} + +u8 taito68705_mcu_tiger_device::mcu_portc_r() +{ + // Tiger-Heli has these status bits inverted MCU-side + return taito68705_mcu_device::mcu_portc_r() ^ 0x03; +} + + +// Arkanoid/Puzznic (latch control on PC2 and PC3 instead of PB1 and PB2) + +arkanoid_mcu_device_base::arkanoid_mcu_device_base( + machine_config const &mconfig, + device_type type, + char const *tag, + device_t *owner, + u32 clock) + : taito68705_mcu_device_base(mconfig, type, tag, owner, clock) + , m_portb_r_cb(*this) + , m_pc_output(0xff) +{ +} + +u8 arkanoid_mcu_device_base::mcu_pb_r() +{ + return m_portb_r_cb(); +} + +u8 arkanoid_mcu_device_base::mcu_pc_r() +{ + // PC0 is the host semaphore flag (active high) + // PC1 is the MCU semaphore flag (active low) + return (host_flag() ? 0x01 : 0x00) | (mcu_flag() ? 0x00 : 0x02) | 0xfc; +} + +void arkanoid_mcu_device_base::mcu_pc_w(u8 data) +{ + // rising edge on PC2 clears the host semaphore flag + // PC3 sets the MCU semaphore when low + latch_control(data, m_pc_output, 2, 3); +} + +void arkanoid_mcu_device_base::device_start() +{ + taito68705_mcu_device_base::device_start(); + + m_portb_r_cb.resolve_safe(0xff); + + save_item(NAME(m_pc_output)); + + m_pc_output = 0xff; +} + + +arkanoid_68705p3_device::arkanoid_68705p3_device( + machine_config const &mconfig, + char const *tag, + device_t *owner, + u32 clock) + : arkanoid_mcu_device_base(mconfig, ARKANOID_68705P3, tag, owner, clock) +{ +} + +void arkanoid_68705p3_device::device_add_mconfig(machine_config &config) +{ + M68705P3(config, m_mcu, DERIVED_CLOCK(1, 1)); + m_mcu->portb_r().set(FUNC(arkanoid_68705p3_device::mcu_pb_r)); + m_mcu->portc_r().set(FUNC(arkanoid_68705p3_device::mcu_pc_r)); + m_mcu->porta_w().set(FUNC(arkanoid_68705p3_device::mcu_pa_w)); + m_mcu->portc_w().set(FUNC(arkanoid_68705p3_device::mcu_pc_w)); +} + + +arkanoid_68705p5_device::arkanoid_68705p5_device( + machine_config const &mconfig, + char const *tag, + device_t *owner, + u32 clock) + : arkanoid_mcu_device_base(mconfig, ARKANOID_68705P5, tag, owner, clock) +{ +} + +void arkanoid_68705p5_device::device_add_mconfig(machine_config &config) +{ + M68705P5(config, m_mcu, DERIVED_CLOCK(1, 1)); + m_mcu->portb_r().set(FUNC(arkanoid_68705p5_device::mcu_pb_r)); + m_mcu->portc_r().set(FUNC(arkanoid_68705p5_device::mcu_pc_r)); + m_mcu->porta_w().set(FUNC(arkanoid_68705p5_device::mcu_pa_w)); + m_mcu->portc_w().set(FUNC(arkanoid_68705p5_device::mcu_pc_w)); +} diff --git a/src/mame/shared/taito68705.h b/src/mame/shared/taito68705.h new file mode 100644 index 00000000000..c9df56368d8 --- /dev/null +++ b/src/mame/shared/taito68705.h @@ -0,0 +1,143 @@ +// license:BSD-3-Clause +// copyright-holders:David Haywood, Vas Crabb +#ifndef MAME_MACHINE_TAITO68705INTERFACE_H +#define MAME_MACHINE_TAITO68705INTERFACE_H + +#pragma once + +#include "cpu/m6805/m68705.h" + + +DECLARE_DEVICE_TYPE(TAITO68705_MCU, taito68705_mcu_device) +DECLARE_DEVICE_TYPE(TAITO68705_MCU_TIGER, taito68705_mcu_tiger_device) +DECLARE_DEVICE_TYPE(ARKANOID_68705P3, arkanoid_68705p3_device) +DECLARE_DEVICE_TYPE(ARKANOID_68705P5, arkanoid_68705p5_device) + + +class taito68705_mcu_device_base : public device_t +{ +public: + // host interface + u8 data_r(); + void data_w(u8 data); + DECLARE_WRITE_LINE_MEMBER(reset_w); + DECLARE_READ_LINE_MEMBER(host_semaphore_r) { return m_host_flag ? 1 : 0; } + DECLARE_READ_LINE_MEMBER(mcu_semaphore_r) { return m_mcu_flag ? 1 : 0; } + +protected: + taito68705_mcu_device_base( + machine_config const &mconfig, + device_type type, + char const *tag, + device_t *owner, + u32 clock); + + auto semaphore_cb() { return m_semaphore_cb.bind(); } + + // MCU callbacks + void mcu_pa_w(u8 data); + + virtual void device_start() override; + virtual void device_reset() override; + + bool host_flag() const { return m_host_flag; } + bool mcu_flag() const { return m_mcu_flag; } + u8 pa_value() const { return m_pa_output & (m_latch_driven ? m_host_latch : 0xff); } + void latch_control(u8 data, u8 &value, unsigned host_bit, unsigned mcu_bit); + + required_device m_mcu; + +private: + devcb_write_line m_semaphore_cb; + + bool m_latch_driven; + bool m_reset_input; + bool m_host_flag; + bool m_mcu_flag; + u8 m_host_latch; + u8 m_mcu_latch; + u8 m_pa_output; +}; + + +class taito68705_mcu_device : public taito68705_mcu_device_base +{ +public: + template auto aux_out_cb() { return m_aux_out_cb[N].bind(); } + auto aux_strobe_cb() { return m_aux_strobe_cb.bind(); } + + taito68705_mcu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + +protected: + taito68705_mcu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + + virtual u8 mcu_portc_r(); + void mcu_portb_w(offs_t offset, u8 data, u8 mem_mask = ~0); + + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + + devcb_write_line::array<6> m_aux_out_cb; + devcb_write8 m_aux_strobe_cb; + + u8 m_pb_output; +}; + + +class taito68705_mcu_tiger_device : public taito68705_mcu_device +{ +public: + taito68705_mcu_tiger_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + +protected: + virtual u8 mcu_portc_r() override; +}; + + +class arkanoid_mcu_device_base : public taito68705_mcu_device_base +{ +public: + using taito68705_mcu_device_base::semaphore_cb; + auto portb_r_cb() { return m_portb_r_cb.bind(); } + +protected: + arkanoid_mcu_device_base( + machine_config const &mconfig, + device_type type, + char const *tag, + device_t *owner, + u32 clock); + + // MCU callbacks + u8 mcu_pb_r(); + u8 mcu_pc_r(); + void mcu_pc_w(u8 data); + + virtual void device_start() override; + + devcb_read8 m_portb_r_cb; + + u8 m_pc_output; +}; + + +class arkanoid_68705p3_device : public arkanoid_mcu_device_base +{ +public: + arkanoid_68705p3_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); + +protected: + virtual void device_add_mconfig(machine_config &config) override; +}; + + +class arkanoid_68705p5_device : public arkanoid_mcu_device_base +{ +public: + arkanoid_68705p5_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); + +protected: + virtual void device_add_mconfig(machine_config &config) override; +}; + +#endif // MAME_MACHINE_TAITO68705INTERFACE_H diff --git a/src/mame/shared/taito68705interface.cpp b/src/mame/shared/taito68705interface.cpp deleted file mode 100644 index 9c76b876410..00000000000 --- a/src/mame/shared/taito68705interface.cpp +++ /dev/null @@ -1,356 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood, Vas Crabb -#include "emu.h" -#include "machine/taito68705interface.h" - -#include "cpu/z80/z80.h" - -/* - Most Taito 68705s share a similar (often identical) hookup. - This file encapsulates that. - - used by: - 40love.cpp - 40love - bigevglf.cpp - bigevglf - bking.cpp - bking3 - bublbobl.cpp - tokio - buggychl.cpp - buggychl - flstory.cpp - flstory - lkage.cpp - lkage - lsasquad.cpp - lsasquad, daikaiju - matmania.cpp - maniach - nycaptor.cpp - nycaptor - renegade.cpp - renegade - retofinv.cpp - retofinv - slapfght.cpp - slapfght - xain.cpp - xsleena - - and the following with slight changes: - slapfght.cpp - tigerh (inverted status bits read on port C) - arkanoid.cpp - arkanoid (latch control on port C, inputs on port B) - taito_l.cpp - puzznic (latch control on port C) - - not hooked up here, but possible (needs investigating) - pitnrun.cpp - have more functionality on portB, currently using 'instant timers' for latches - taitosj.cpp - ^^ - - 68705 sets in Taito drivers that are NOT suitable for hookup here? - bublbobl.cpp - bub68705 - this is a bootleg, not an official Taito hookup - changela.cpp - changela - looks like an ancestor of arkanoid without automatic semaphores - mexico86.cpp - knightb, mexico86 - bootleg 68705s - sqix.cpp - hotsmash - kaneko hookup, different from Taito ones. - - there are other drivers (and games in existing drivers) that could hookup here, but currently lack MCU dumps. - -*/ - - -DEFINE_DEVICE_TYPE(TAITO68705_MCU, taito68705_mcu_device, "taito68705", "Taito MC68705 MCU Interface") -DEFINE_DEVICE_TYPE(TAITO68705_MCU_TIGER, taito68705_mcu_tiger_device, "taito68705tiger", "Taito MC68705 MCU Interface (Tiger-Heli)") -DEFINE_DEVICE_TYPE(ARKANOID_68705P3, arkanoid_68705p3_device, "arkanoid68705p3", "Arkanoid MC68705P3 Interface") -DEFINE_DEVICE_TYPE(ARKANOID_68705P5, arkanoid_68705p5_device, "arkanoid68705p5", "Arkanoid MC68705P5 Interface") - - -u8 taito68705_mcu_device_base::data_r() -{ - // clear MCU semaphore flag and return data - u8 const result(m_mcu_latch); - if (!machine().side_effects_disabled()) - { - m_mcu_flag = false; - m_semaphore_cb(CLEAR_LINE); - } - return result; -} - -void taito68705_mcu_device_base::data_w(u8 data) -{ - // set host semaphore flag and latch data - if (!m_reset_input) - m_host_flag = true; - m_host_latch = data; - if (m_latch_driven) - m_mcu->pa_w(data); - m_mcu->set_input_line(M68705_IRQ_LINE, m_host_flag ? ASSERT_LINE : CLEAR_LINE); -} - -WRITE_LINE_MEMBER(taito68705_mcu_device_base::reset_w) -{ - m_reset_input = ASSERT_LINE == state; - if (CLEAR_LINE != state) - { - m_host_flag = false; - m_mcu_flag = false; - m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE); - } - m_mcu->set_input_line(INPUT_LINE_RESET, state); -} - -taito68705_mcu_device_base::taito68705_mcu_device_base( - machine_config const &mconfig, - device_type type, - char const *tag, - device_t *owner, - u32 clock) - : device_t(mconfig, type, tag, owner, clock) - , m_mcu(*this, "mcu") - , m_semaphore_cb(*this) - , m_latch_driven(false) - , m_reset_input(false) - , m_host_flag(false) - , m_mcu_flag(false) - , m_host_latch(0xff) - , m_mcu_latch(0xff) - , m_pa_output(0xff) -{ -} - -void taito68705_mcu_device_base::mcu_pa_w(u8 data) -{ - m_pa_output = data; -} - -void taito68705_mcu_device_base::device_start() -{ - m_semaphore_cb.resolve_safe(); - - save_item(NAME(m_latch_driven)); - save_item(NAME(m_reset_input)); - save_item(NAME(m_host_flag)); - save_item(NAME(m_mcu_flag)); - save_item(NAME(m_host_latch)); - save_item(NAME(m_mcu_latch)); - save_item(NAME(m_pa_output)); - - m_latch_driven = false; - m_reset_input = false; - m_host_latch = 0xff; - m_mcu_latch = 0xff; - m_pa_output = 0xff; -} - -void taito68705_mcu_device_base::device_reset() -{ - m_host_flag = false; - m_mcu_flag = false; - - m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE); - m_semaphore_cb(CLEAR_LINE); -} - -void taito68705_mcu_device_base::latch_control(u8 data, u8 &value, unsigned host_bit, unsigned mcu_bit) -{ - // save this here to simulate latch propagation delays - u8 const old_pa_value(pa_value()); - - // rising edge clears the host semaphore flag - if (BIT(data, host_bit)) - { - m_latch_driven = false; - m_mcu->pa_w(0xff); - if (!BIT(value, host_bit)) - { - m_host_flag = false; - m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE); - } - } - else - { - m_latch_driven = true; - m_mcu->pa_w(m_host_latch); - } - - // PB2 sets the MCU semaphore when low - if (!BIT(data, mcu_bit)) - { - if (!m_reset_input) - m_mcu_flag = true; - - // data is latched on falling edge - if (BIT(value, mcu_bit)) - m_mcu_latch = old_pa_value; - } - - value = data; - if (!BIT(data, mcu_bit) && !m_reset_input) - m_semaphore_cb(ASSERT_LINE); -} - - -taito68705_mcu_device::taito68705_mcu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) - : taito68705_mcu_device(mconfig, TAITO68705_MCU, tag, owner, clock) -{ -} - -taito68705_mcu_device::taito68705_mcu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) - : taito68705_mcu_device_base(mconfig, type, tag, owner, clock) - , m_aux_out_cb(*this) - , m_aux_strobe_cb(*this) - , m_pb_output(0xff) -{ -} - -void taito68705_mcu_device::device_add_mconfig(machine_config &config) -{ - M68705P5(config, m_mcu, DERIVED_CLOCK(1, 1)); - m_mcu->porta_w().set(FUNC(taito68705_mcu_device::mcu_pa_w)); - m_mcu->portb_w().set(FUNC(taito68705_mcu_device::mcu_portb_w)); - m_mcu->portc_r().set(FUNC(taito68705_mcu_device::mcu_portc_r)); -} - -void taito68705_mcu_device::device_start() -{ - taito68705_mcu_device_base::device_start(); - - m_aux_out_cb.resolve_all_safe(); - m_aux_strobe_cb.resolve_safe(); - - save_item(NAME(m_pb_output)); - - m_pb_output = 0xff; -} - - -/* - * Port B connections: - * parts in [ ] are optional (not used by buggychl) - * - * all bits are logical 1 when read (+5V pullup) - * - * 0 n.c. - * 1 W IRQ ack and enable latch which holds data from main Z80 memory - * 2 W loads latch to Z80 - * 3 W to Z80 BUSRQ (put it on hold?) - * 4 W n.c. - * 5 W [selects Z80 memory access direction (0 = write 1 = read)] - * 6 W [loads the latch which holds the low 8 bits of the address of - * the main Z80 memory location to access] - * 7 W [loads the latch which holds the high 8 bits of the address of - * the main Z80 memory location to access] - */ - - -u8 taito68705_mcu_device::mcu_portc_r() -{ - // PC0 is the host semaphore flag (active high) - // PC1 is the MCU semaphore flag (active low) - return (host_flag() ? 0x01 : 0x00) | (mcu_flag() ? 0x00 : 0x02) | 0xfc; -} - -void taito68705_mcu_device::mcu_portb_w(offs_t offset, u8 data, u8 mem_mask) -{ - // some games have additional peripherals strobed on falling edge - u8 const old_pa_value(pa_value()); - u8 const aux_changed((data ^ m_pb_output) >> 2); - u8 const aux_strobes((mem_mask & ~data & m_pb_output) >> 2); - - // rising edge on PB1 clears the host semaphore flag - // PB2 sets the MCU semaphore when low - latch_control(data, m_pb_output, 1, 2); - - // callbacks for other peripherals - for (unsigned i = 0; i < 6; ++i) - { - if (BIT(aux_changed, i)) - m_aux_out_cb[i](BIT(data, i + 2)); - if (BIT(aux_strobes, i)) - m_aux_strobe_cb(i, old_pa_value, 0xff); - } -} - - -/* The Tiger-Heli interface has some extensions, handle them here */ - -taito68705_mcu_tiger_device::taito68705_mcu_tiger_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) - : taito68705_mcu_device(mconfig, TAITO68705_MCU_TIGER, tag, owner, clock) -{ -} - -u8 taito68705_mcu_tiger_device::mcu_portc_r() -{ - // Tiger-Heli has these status bits inverted MCU-side - return taito68705_mcu_device::mcu_portc_r() ^ 0x03; -} - - -// Arkanoid/Puzznic (latch control on PC2 and PC3 instead of PB1 and PB2) - -arkanoid_mcu_device_base::arkanoid_mcu_device_base( - machine_config const &mconfig, - device_type type, - char const *tag, - device_t *owner, - u32 clock) - : taito68705_mcu_device_base(mconfig, type, tag, owner, clock) - , m_portb_r_cb(*this) - , m_pc_output(0xff) -{ -} - -u8 arkanoid_mcu_device_base::mcu_pb_r() -{ - return m_portb_r_cb(); -} - -u8 arkanoid_mcu_device_base::mcu_pc_r() -{ - // PC0 is the host semaphore flag (active high) - // PC1 is the MCU semaphore flag (active low) - return (host_flag() ? 0x01 : 0x00) | (mcu_flag() ? 0x00 : 0x02) | 0xfc; -} - -void arkanoid_mcu_device_base::mcu_pc_w(u8 data) -{ - // rising edge on PC2 clears the host semaphore flag - // PC3 sets the MCU semaphore when low - latch_control(data, m_pc_output, 2, 3); -} - -void arkanoid_mcu_device_base::device_start() -{ - taito68705_mcu_device_base::device_start(); - - m_portb_r_cb.resolve_safe(0xff); - - save_item(NAME(m_pc_output)); - - m_pc_output = 0xff; -} - - -arkanoid_68705p3_device::arkanoid_68705p3_device( - machine_config const &mconfig, - char const *tag, - device_t *owner, - u32 clock) - : arkanoid_mcu_device_base(mconfig, ARKANOID_68705P3, tag, owner, clock) -{ -} - -void arkanoid_68705p3_device::device_add_mconfig(machine_config &config) -{ - M68705P3(config, m_mcu, DERIVED_CLOCK(1, 1)); - m_mcu->portb_r().set(FUNC(arkanoid_68705p3_device::mcu_pb_r)); - m_mcu->portc_r().set(FUNC(arkanoid_68705p3_device::mcu_pc_r)); - m_mcu->porta_w().set(FUNC(arkanoid_68705p3_device::mcu_pa_w)); - m_mcu->portc_w().set(FUNC(arkanoid_68705p3_device::mcu_pc_w)); -} - - -arkanoid_68705p5_device::arkanoid_68705p5_device( - machine_config const &mconfig, - char const *tag, - device_t *owner, - u32 clock) - : arkanoid_mcu_device_base(mconfig, ARKANOID_68705P5, tag, owner, clock) -{ -} - -void arkanoid_68705p5_device::device_add_mconfig(machine_config &config) -{ - M68705P5(config, m_mcu, DERIVED_CLOCK(1, 1)); - m_mcu->portb_r().set(FUNC(arkanoid_68705p5_device::mcu_pb_r)); - m_mcu->portc_r().set(FUNC(arkanoid_68705p5_device::mcu_pc_r)); - m_mcu->porta_w().set(FUNC(arkanoid_68705p5_device::mcu_pa_w)); - m_mcu->portc_w().set(FUNC(arkanoid_68705p5_device::mcu_pc_w)); -} diff --git a/src/mame/shared/taito68705interface.h b/src/mame/shared/taito68705interface.h deleted file mode 100644 index c9df56368d8..00000000000 --- a/src/mame/shared/taito68705interface.h +++ /dev/null @@ -1,143 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood, Vas Crabb -#ifndef MAME_MACHINE_TAITO68705INTERFACE_H -#define MAME_MACHINE_TAITO68705INTERFACE_H - -#pragma once - -#include "cpu/m6805/m68705.h" - - -DECLARE_DEVICE_TYPE(TAITO68705_MCU, taito68705_mcu_device) -DECLARE_DEVICE_TYPE(TAITO68705_MCU_TIGER, taito68705_mcu_tiger_device) -DECLARE_DEVICE_TYPE(ARKANOID_68705P3, arkanoid_68705p3_device) -DECLARE_DEVICE_TYPE(ARKANOID_68705P5, arkanoid_68705p5_device) - - -class taito68705_mcu_device_base : public device_t -{ -public: - // host interface - u8 data_r(); - void data_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(reset_w); - DECLARE_READ_LINE_MEMBER(host_semaphore_r) { return m_host_flag ? 1 : 0; } - DECLARE_READ_LINE_MEMBER(mcu_semaphore_r) { return m_mcu_flag ? 1 : 0; } - -protected: - taito68705_mcu_device_base( - machine_config const &mconfig, - device_type type, - char const *tag, - device_t *owner, - u32 clock); - - auto semaphore_cb() { return m_semaphore_cb.bind(); } - - // MCU callbacks - void mcu_pa_w(u8 data); - - virtual void device_start() override; - virtual void device_reset() override; - - bool host_flag() const { return m_host_flag; } - bool mcu_flag() const { return m_mcu_flag; } - u8 pa_value() const { return m_pa_output & (m_latch_driven ? m_host_latch : 0xff); } - void latch_control(u8 data, u8 &value, unsigned host_bit, unsigned mcu_bit); - - required_device m_mcu; - -private: - devcb_write_line m_semaphore_cb; - - bool m_latch_driven; - bool m_reset_input; - bool m_host_flag; - bool m_mcu_flag; - u8 m_host_latch; - u8 m_mcu_latch; - u8 m_pa_output; -}; - - -class taito68705_mcu_device : public taito68705_mcu_device_base -{ -public: - template auto aux_out_cb() { return m_aux_out_cb[N].bind(); } - auto aux_strobe_cb() { return m_aux_strobe_cb.bind(); } - - taito68705_mcu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - -protected: - taito68705_mcu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); - - virtual u8 mcu_portc_r(); - void mcu_portb_w(offs_t offset, u8 data, u8 mem_mask = ~0); - - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - - devcb_write_line::array<6> m_aux_out_cb; - devcb_write8 m_aux_strobe_cb; - - u8 m_pb_output; -}; - - -class taito68705_mcu_tiger_device : public taito68705_mcu_device -{ -public: - taito68705_mcu_tiger_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - -protected: - virtual u8 mcu_portc_r() override; -}; - - -class arkanoid_mcu_device_base : public taito68705_mcu_device_base -{ -public: - using taito68705_mcu_device_base::semaphore_cb; - auto portb_r_cb() { return m_portb_r_cb.bind(); } - -protected: - arkanoid_mcu_device_base( - machine_config const &mconfig, - device_type type, - char const *tag, - device_t *owner, - u32 clock); - - // MCU callbacks - u8 mcu_pb_r(); - u8 mcu_pc_r(); - void mcu_pc_w(u8 data); - - virtual void device_start() override; - - devcb_read8 m_portb_r_cb; - - u8 m_pc_output; -}; - - -class arkanoid_68705p3_device : public arkanoid_mcu_device_base -{ -public: - arkanoid_68705p3_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); - -protected: - virtual void device_add_mconfig(machine_config &config) override; -}; - - -class arkanoid_68705p5_device : public arkanoid_mcu_device_base -{ -public: - arkanoid_68705p5_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); - -protected: - virtual void device_add_mconfig(machine_config &config) override; -}; - -#endif // MAME_MACHINE_TAITO68705INTERFACE_H diff --git a/src/mame/shared/timeplt_a.cpp b/src/mame/shared/timeplt_a.cpp index 03d152d91fa..d55495efbf4 100644 --- a/src/mame/shared/timeplt_a.cpp +++ b/src/mame/shared/timeplt_a.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/timeplt.h" +#include "timeplt_a.h" #include "machine/gen_latch.h" #include "speaker.h" diff --git a/src/mame/shared/williams_a.cpp b/src/mame/shared/williams_a.cpp deleted file mode 100644 index 31bf48f279c..00000000000 --- a/src/mame/shared/williams_a.cpp +++ /dev/null @@ -1,1300 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Aaron Giles -/*************************************************************************** - - williams.h - - Functions to emulate general the various Williams/Midway sound cards. - -**************************************************************************** - - Midway/Williams Audio Boards - ---------------------------- - - 6809 MEMORY MAP - - Function Address R/W Data - --------------------------------------------------------------- - Program RAM 0000-07FF R/W D0-D7 - - Music (YM-2151) 2000-2001 R/W D0-D7 - - 6821 PIA 4000-4003 R/W D0-D7 - - HC55516 clock low, digit latch 6000 W D0 - HC55516 clock high 6800 W xx - - Bank select 7800 W D0-D2 - - Banked Program ROM 8000-FFFF R D0-D7 - -****************************************************************************/ - -#include "emu.h" -#include "williams.h" -#include "machine/6821pia.h" -#include "machine/rescap.h" -#include "cpu/m6809/m6809.h" -#include "cpu/m6800/m6800.h" -#include "sound/dac.h" -#include "sound/hc55516.h" -#include "sound/okim6295.h" -#include "sound/ymopm.h" - - -#define NARC_MASTER_CLOCK XTAL(8'000'000) -#define NARC_FM_CLOCK XTAL(3'579'545) - -#define CVSD_MASTER_CLOCK XTAL(8'000'000) -#define CVSD_FM_CLOCK XTAL(3'579'545) - -#define ADPCM_MASTER_CLOCK XTAL(8'000'000) -#define ADPCM_FM_CLOCK XTAL(3'579'545) - - - -//************************************************************************** -// GLOBAL VARIABLES -//************************************************************************** - -DEFINE_DEVICE_TYPE(WILLIAMS_CVSD_SOUND, williams_cvsd_sound_device, "wmscvsd", "Williams CVSD Sound Board") -DEFINE_DEVICE_TYPE(WILLIAMS_NARC_SOUND, williams_narc_sound_device, "wmsnarc", "Williams NARC Sound Board") -DEFINE_DEVICE_TYPE(WILLIAMS_ADPCM_SOUND, williams_adpcm_sound_device, "wmsadpcm", "Williams ADPCM Sound Board") -DEFINE_DEVICE_TYPE(WILLIAMS_S4_SOUND, williams_s4_sound_device, "wmss4", "Williams System 4 Sound Board") -DEFINE_DEVICE_TYPE(WILLIAMS_S6_SOUND, williams_s6_sound_device, "wmss6", "Williams System 6 Sound Board") -DEFINE_DEVICE_TYPE(WILLIAMS_S9_SOUND, williams_s9_sound_device, "wmss9", "Williams System 9 Sound Board") -DEFINE_DEVICE_TYPE(WILLIAMS_S11_SOUND, williams_s11_sound_device, "wmss11", "Williams System 11 Sound Board") - - - -//************************************************************************** -// CVSD SOUND BOARD -//************************************************************************** - -//------------------------------------------------- -// williams_cvsd_sound_device - constructor -//------------------------------------------------- - -williams_cvsd_sound_device::williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) - : device_t(mconfig, WILLIAMS_CVSD_SOUND, tag, owner, clock), - device_mixer_interface(mconfig, *this), - m_cpu(*this, "cpu"), - m_pia(*this, "pia"), - m_ym2151(*this, "ym2151"), - m_hc55516(*this, "cvsd"), - m_rombank(*this, "rombank"), - m_talkback(0) -{ -} - - -//------------------------------------------------- -// write - handle an external write to the input -// latch -//------------------------------------------------- - -void williams_cvsd_sound_device::write(u16 data) -{ - m_sync_write_timer->adjust(attotime::zero, data); -} - - -//------------------------------------------------- -// reset_write - write to the reset line -//------------------------------------------------- - -WRITE_LINE_MEMBER(williams_cvsd_sound_device::reset_write) -{ - // going high halts the CPU - if (state) - { - bank_select_w(0); - device_reset(); - m_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - } - - // going low resets and reactivates the CPU - else - m_cpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); -} - - -//------------------------------------------------- -// bank_select_w - change memory banks -//------------------------------------------------- - -void williams_cvsd_sound_device::bank_select_w(u8 data) -{ - m_rombank->set_entry(data & 0x0f); -} - - -//------------------------------------------------- -// talkback_w - write to the talkback latch -//------------------------------------------------- - -void williams_cvsd_sound_device::talkback_w(u8 data) -{ - m_talkback = data; - logerror("CVSD Talkback = %02X\n", data); -} - - -//------------------------------------------------- -// cvsd_digit_clock_clear_w - clear the clock on -// the HC55516 and clock the data -//------------------------------------------------- - -void williams_cvsd_sound_device::cvsd_digit_clock_clear_w(u8 data) -{ - m_hc55516->clock_w(0); - m_hc55516->digit_w(data&1); -} - - -//------------------------------------------------- -// cvsd_clock_set_w - set the clock on the HC55516 -//------------------------------------------------- - -void williams_cvsd_sound_device::cvsd_clock_set_w(u8 data) -{ - m_hc55516->clock_w(1); -} - - -//------------------------------------------------- -// audio CPU map -//------------------------------------------------- - -void williams_cvsd_sound_device::williams_cvsd_map(address_map &map) -{ - map(0x0000, 0x07ff).mirror(0x1800).ram(); - map(0x2000, 0x2001).mirror(0x1ffe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x4000, 0x4003).mirror(0x1ffc).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x6000, 0x6000).mirror(0x07ff).w(FUNC(williams_cvsd_sound_device::cvsd_digit_clock_clear_w)); - map(0x6800, 0x6800).mirror(0x07ff).w(FUNC(williams_cvsd_sound_device::cvsd_clock_set_w)); - map(0x7800, 0x7800).mirror(0x07ff).w(FUNC(williams_cvsd_sound_device::bank_select_w)); - map(0x8000, 0xffff).bankr("rombank"); -} - - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void williams_cvsd_sound_device::device_add_mconfig(machine_config &config) -{ - MC6809E(config, m_cpu, CVSD_MASTER_CLOCK / 4); - m_cpu->set_addrmap(AS_PROGRAM, &williams_cvsd_sound_device::williams_cvsd_map); - - PIA6821(config, m_pia, 0); - m_pia->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w)); - m_pia->writepb_handler().set(FUNC(williams_cvsd_sound_device::talkback_w)); - m_pia->ca2_handler().set(m_ym2151, FUNC(ym2151_device::reset_w)); - m_pia->irqa_handler().set_inputline(m_cpu, M6809_FIRQ_LINE); - m_pia->irqb_handler().set_inputline(m_cpu, INPUT_LINE_NMI); - - YM2151(config, m_ym2151, CVSD_FM_CLOCK); - m_ym2151->irq_handler().set(m_pia, FUNC(pia6821_device::ca1_w)).invert(); // IRQ is not true state - m_ym2151->add_route(ALL_OUTPUTS, *this, 0.10); - - MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.25); - - HC55516(config, m_hc55516, 0); - m_hc55516->add_route(ALL_OUTPUTS, *this, 0.60); -} - - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void williams_cvsd_sound_device::device_start() -{ - // configure master CPU banks - u8 *rom = memregion("cpu")->base(); - for (int bank = 0; bank < 16; bank++) - { - // - // D0/D1 -> selects: 0=U4 1=U19 2=U20 3=n/c - // D2 -> A15 - // D3 -> A16 - // - offs_t offset = 0x8000 * ((bank >> 2) & 3) + 0x20000 * (bank & 3); - m_rombank->configure_entry(bank, &rom[0x10000 + offset]); - } - m_rombank->set_entry(0); - - // reset the IRQ state - m_pia->ca1_w(1); - - // register for save states - save_item(NAME(m_talkback)); - - // allocate timers - m_sync_write_timer = timer_alloc(FUNC(williams_cvsd_sound_device::sync_write), this); -} - - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void williams_cvsd_sound_device::device_reset() -{ - // reset interrupt states - m_cpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); - m_cpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); - m_cpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); -} - - -//------------------------------------------------- -// sync_write -//------------------------------------------------- - -TIMER_CALLBACK_MEMBER(williams_cvsd_sound_device::sync_write) -{ - // process incoming data write - m_pia->portb_w(param & 0xff); - m_pia->cb1_w((param >> 8) & 1); - m_pia->cb2_w((param >> 9) & 1); -} - - - -//************************************************************************** -// NARC SOUND BOARD -//************************************************************************** - -//------------------------------------------------- -// williams_narc_sound_device - constructor -//------------------------------------------------- - -williams_narc_sound_device::williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) - : device_t(mconfig, WILLIAMS_NARC_SOUND, tag, owner, clock), - device_mixer_interface(mconfig, *this), - m_cpu(*this, "cpu%u", 0U), - m_hc55516(*this, "cvsd"), - m_masterbank(*this, "masterbank"), - m_slavebank(*this, "slavebank"), - m_latch(0), - m_latch2(0), - m_talkback(0), - m_audio_sync(0), - m_sound_int_state(0) -{ -} - - -//------------------------------------------------- -// read - return the talkback register with the -// SYNC bits in bits 8 and 9 -//------------------------------------------------- - -u16 williams_narc_sound_device::read() -{ - return m_talkback | (m_audio_sync << 8); -} - - -//------------------------------------------------- -// write - handle an external write to the input -// latch -//------------------------------------------------- - -void williams_narc_sound_device::write(u16 data) -{ - m_sync_master_timer->adjust(attotime::zero, data); -} - - -//------------------------------------------------- -// reset_write - write to the reset line -//------------------------------------------------- - -WRITE_LINE_MEMBER(williams_narc_sound_device::reset_write) -{ - // going high halts the CPU - if (state) - { - master_bank_select_w(0); - slave_bank_select_w(0); - device_reset(); - m_cpu[0]->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - m_cpu[1]->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - } - - // going low resets and reactivates the CPU - else - { - m_cpu[0]->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); - m_cpu[1]->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); - } -} - - -//------------------------------------------------- -// master_bank_select_w - select the bank for the -// master CPU -//------------------------------------------------- - -void williams_narc_sound_device::master_bank_select_w(u8 data) -{ - m_masterbank->set_entry(data & 0x0f); -} - - -//------------------------------------------------- -// slave_bank_select_w - select the bank for the -// slave CPU -//------------------------------------------------- - -void williams_narc_sound_device::slave_bank_select_w(u8 data) -{ - m_slavebank->set_entry(data & 0x0f); -} - - -//------------------------------------------------- -// command_r - read command written by external -// agent -//------------------------------------------------- - -u8 williams_narc_sound_device::command_r() -{ - m_cpu[0]->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); - m_sound_int_state = 0; - return m_latch; -} - - -//------------------------------------------------- -// command2_w - write command from master CPU to -// slave CPU -//------------------------------------------------- - -void williams_narc_sound_device::command2_w(u8 data) -{ - m_sync_slave_timer->adjust(attotime::zero, data); -} - - -//------------------------------------------------- -// command2_r - read command written by master -// CPU -//------------------------------------------------- - -u8 williams_narc_sound_device::command2_r() -{ - m_cpu[1]->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); - return m_latch2; -} - - -//------------------------------------------------- -// master_talkback_w - handle writes to the -// talkback latch from the master CPU -//------------------------------------------------- - -void williams_narc_sound_device::master_talkback_w(u8 data) -{ - m_talkback = data; - logerror("Master Talkback = %02X\n", data); -} - - -//------------------------------------------------- -// master_sync_w - handle writes to the master -// SYNC register -//------------------------------------------------- - -void williams_narc_sound_device::master_sync_w(u8 data) -{ - m_sync_clear_timer->adjust(attotime::from_double(TIME_OF_74LS123(180000, 0.000001)), 0x01); - m_audio_sync |= 0x01; - logerror("Master sync = %02X\n", data); -} - - -//------------------------------------------------- -// slave_talkback_w - handle writes to the -// talkback latch from the slave CPU -//------------------------------------------------- - -void williams_narc_sound_device::slave_talkback_w(u8 data) -{ - logerror("Slave Talkback = %02X\n", data); -} - - -//------------------------------------------------- -// slave_sync_w - handle writes to the slave -// SYNC register -//------------------------------------------------- - -void williams_narc_sound_device::slave_sync_w(u8 data) -{ - m_sync_clear_timer->adjust(attotime::from_double(TIME_OF_74LS123(180000, 0.000001)), 0x02); - m_audio_sync |= 0x02; - logerror("Slave sync = %02X\n", data); -} - - -//------------------------------------------------- -// cvsd_digit_clock_clear_w - clear the clk pin on -// the HC555xx and clock the data latch -//------------------------------------------------- - -void williams_narc_sound_device::cvsd_digit_clock_clear_w(u8 data) -{ - m_hc55516->clock_w(0); - m_hc55516->digit_w(data&1); -} - - -//--------------------------------------------------- -// cvsd_clock_set_w - set the clk pin on the HC555xx -//--------------------------------------------------- - -void williams_narc_sound_device::cvsd_clock_set_w(u8 data) -{ - m_hc55516->clock_w(1); -} - - -//------------------------------------------------- -// master CPU map -//------------------------------------------------- - -void williams_narc_sound_device::williams_narc_master_map(address_map &map) -{ - map(0x0000, 0x1fff).ram(); - map(0x2000, 0x2001).mirror(0x03fe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x2800, 0x2800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::master_talkback_w)); - map(0x2c00, 0x2c00).mirror(0x03ff).w(FUNC(williams_narc_sound_device::command2_w)); - map(0x3000, 0x3000).mirror(0x03ff).w("dac1", FUNC(dac_byte_interface::data_w)); - map(0x3400, 0x3400).mirror(0x03ff).r(FUNC(williams_narc_sound_device::command_r)); - map(0x3800, 0x3800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::master_bank_select_w)); - map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(williams_narc_sound_device::master_sync_w)); - map(0x4000, 0xbfff).bankr("masterbank"); - map(0xc000, 0xffff).bankr("masterupper"); -} - - -//------------------------------------------------- -// slave CPU map -//------------------------------------------------- - -void williams_narc_sound_device::williams_narc_slave_map(address_map &map) -{ - map(0x0000, 0x1fff).ram(); - map(0x2000, 0x2000).mirror(0x03ff).w(FUNC(williams_narc_sound_device::cvsd_clock_set_w)); - map(0x2400, 0x2400).mirror(0x03ff).w(FUNC(williams_narc_sound_device::cvsd_digit_clock_clear_w)); - map(0x2800, 0x2800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::slave_talkback_w)); - map(0x3000, 0x3000).mirror(0x03ff).w("dac2", FUNC(dac_byte_interface::data_w)); - map(0x3400, 0x3400).mirror(0x03ff).r(FUNC(williams_narc_sound_device::command2_r)); - map(0x3800, 0x3800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::slave_bank_select_w)); - map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(williams_narc_sound_device::slave_sync_w)); - map(0x4000, 0xbfff).bankr("slavebank"); - map(0xc000, 0xffff).bankr("slaveupper"); -} - - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - - -void williams_narc_sound_device::device_add_mconfig(machine_config &config) -{ - MC6809E(config, m_cpu[0], NARC_MASTER_CLOCK / 4); - m_cpu[0]->set_addrmap(AS_PROGRAM, &williams_narc_sound_device::williams_narc_master_map); - - MC6809E(config, m_cpu[1], NARC_MASTER_CLOCK / 4); - m_cpu[1]->set_addrmap(AS_PROGRAM, &williams_narc_sound_device::williams_narc_slave_map); - - ym2151_device &ym2151(YM2151(config, "ym2151", NARC_FM_CLOCK)); - ym2151.irq_handler().set_inputline("cpu0", M6809_FIRQ_LINE); - ym2151.add_route(ALL_OUTPUTS, *this, 0.10); - - AD7224(config, "dac1", 0).add_route(ALL_OUTPUTS, *this, 0.25); - AD7224(config, "dac2", 0).add_route(ALL_OUTPUTS, *this, 0.25); - - HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, *this, 0.60); -} - - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void williams_narc_sound_device::device_start() -{ - // configure master CPU banks - u8 *rom = memregion("cpu0")->base(); - for (int bank = 0; bank < 16; bank++) - { - // - // D0 -> A15 - // D1/D2 -> selects: 0=n/c 1=U3 2=U4 3=U5 - // D3 -> A16 - // - offs_t offset = 0x8000 * (bank & 1) + 0x10000 * ((bank >> 3) & 1) + 0x20000 * ((bank >> 1) & 3); - m_masterbank->configure_entry(bank, &rom[0x10000 + offset]); - } - membank("masterupper")->set_base(&rom[0x10000 + 0x4000 + 0x8000 + 0x10000 + 0x20000 * 3]); - - // configure slave CPU banks - rom = memregion("cpu1")->base(); - for (int bank = 0; bank < 16; bank++) - { - // - // D0 -> A15 - // D1/D2 -> selects: 0=U35 1=U36 2=U37 3=U38 - // D3 -> A16 - // - offs_t offset = 0x8000 * (bank & 1) + 0x10000 * ((bank >> 3) & 1) + 0x20000 * ((bank >> 1) & 3); - m_slavebank->configure_entry(bank, &rom[0x10000 + offset]); - } - membank("slaveupper")->set_base(&rom[0x10000 + 0x4000 + 0x8000 + 0x10000 + 0x20000 * 3]); - - // register for save states - save_item(NAME(m_latch)); - save_item(NAME(m_latch2)); - save_item(NAME(m_talkback)); - save_item(NAME(m_audio_sync)); - save_item(NAME(m_sound_int_state)); - - // allocate timers - m_sync_master_timer = timer_alloc(FUNC(williams_narc_sound_device::sync_master_command), this); - m_sync_slave_timer = timer_alloc(FUNC(williams_narc_sound_device::sync_slave_command), this); - m_sync_clear_timer = timer_alloc(FUNC(williams_narc_sound_device::sync_clear), this); -} - - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void williams_narc_sound_device::device_reset() -{ - // reset interrupt states - m_sound_int_state = 0; - m_cpu[0]->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); - m_cpu[0]->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); - m_cpu[0]->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); - m_cpu[1]->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); - m_cpu[1]->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); - m_cpu[1]->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); -} - - -//------------------------------------------------- -// timer callbacks -//------------------------------------------------- - -TIMER_CALLBACK_MEMBER(williams_narc_sound_device::sync_master_command) -{ - m_latch = param & 0xff; - m_cpu[0]->set_input_line(INPUT_LINE_NMI, (param & 0x100) ? CLEAR_LINE : ASSERT_LINE); - if ((param & 0x200) == 0) - { - m_cpu[0]->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); - m_sound_int_state = 1; - } -} - -TIMER_CALLBACK_MEMBER(williams_narc_sound_device::sync_slave_command) -{ - m_latch2 = param & 0xff; - m_cpu[1]->set_input_line(M6809_FIRQ_LINE, ASSERT_LINE); -} - -TIMER_CALLBACK_MEMBER(williams_narc_sound_device::sync_clear) -{ - m_audio_sync &= ~param; -} - - -//************************************************************************** -// ADPCM SOUND BOARD -//************************************************************************** - -//------------------------------------------------- -// williams_adpcm_sound_device - constructor -//------------------------------------------------- - -williams_adpcm_sound_device::williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) - : device_t(mconfig, WILLIAMS_ADPCM_SOUND, tag, owner, clock), - device_mixer_interface(mconfig, *this), - m_cpu(*this, "cpu"), - m_rombank(*this, "rombank"), - m_okibank(*this, "okibank"), - m_latch(0), - m_talkback(0), - m_sound_int_state(0) -{ -} - - -//------------------------------------------------- -// write - handle an external write to the input -// latch -//------------------------------------------------- - -void williams_adpcm_sound_device::write(u16 data) -{ - m_sync_command_timer->adjust(attotime::zero, data); -} - - -//------------------------------------------------- -// reset_write - write to the reset line -//------------------------------------------------- - -WRITE_LINE_MEMBER(williams_adpcm_sound_device::reset_write) -{ - // going high halts the CPU - if (state) - { - bank_select_w(0); - device_reset(); - m_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - } - - // going low resets and reactivates the CPU - else - m_cpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); -} - - -//------------------------------------------------- -// irq_read - read the sound IRQ state -//------------------------------------------------- - -READ_LINE_MEMBER(williams_adpcm_sound_device::irq_read) -{ - return m_sound_int_state; -} - - -//------------------------------------------------- -// bank_select_w - select the sound CPU memory -// bank -//------------------------------------------------- - -void williams_adpcm_sound_device::bank_select_w(u8 data) -{ - m_rombank->set_entry(data & 0x07); -} - - -//------------------------------------------------- -// oki6295_bank_select_w - select the OKI6295 -// memory bank -//------------------------------------------------- - -void williams_adpcm_sound_device::oki6295_bank_select_w(u8 data) -{ - m_okibank->set_entry(data & 7); -} - - -//------------------------------------------------- -// command_r - read the command from the external -// latch -//------------------------------------------------- - -u8 williams_adpcm_sound_device::command_r() -{ - m_cpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); - - // don't clear the external IRQ state for a short while; this allows the - // self-tests to pass - m_irq_clear_timer->adjust(attotime::from_usec(10)); - return m_latch; -} - - -//------------------------------------------------- -// talkback_w - write to the talkback latch -//------------------------------------------------- - -void williams_adpcm_sound_device::talkback_w(u8 data) -{ - m_talkback = data; - logerror("ADPCM Talkback = %02X\n", data); -} - - -//------------------------------------------------- -// audio CPU map -//------------------------------------------------- - -void williams_adpcm_sound_device::williams_adpcm_map(address_map &map) -{ - map(0x0000, 0x1fff).ram(); - map(0x2000, 0x2000).mirror(0x03ff).w(FUNC(williams_adpcm_sound_device::bank_select_w)); - map(0x2400, 0x2401).mirror(0x03fe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0x2800, 0x2800).mirror(0x03ff).w("dac", FUNC(dac_byte_interface::data_w)); - map(0x2c00, 0x2c00).mirror(0x03ff).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x3000, 0x3000).mirror(0x03ff).r(FUNC(williams_adpcm_sound_device::command_r)); - map(0x3400, 0x3400).mirror(0x03ff).w(FUNC(williams_adpcm_sound_device::oki6295_bank_select_w)); - map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(williams_adpcm_sound_device::talkback_w)); - map(0x4000, 0xbfff).bankr("rombank"); - map(0xc000, 0xffff).bankr("romupper"); -} - - -//------------------------------------------------- -// OKI6295 map -//------------------------------------------------- - -void williams_adpcm_sound_device::williams_adpcm_oki_map(address_map &map) -{ - map(0x00000, 0x1ffff).bankr("okibank"); - map(0x20000, 0x3ffff).rom().region("oki", 0x60000); -} - - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- - -void williams_adpcm_sound_device::device_add_mconfig(machine_config &config) -{ - MC6809E(config, m_cpu, ADPCM_MASTER_CLOCK / 4); - m_cpu->set_addrmap(AS_PROGRAM, &williams_adpcm_sound_device::williams_adpcm_map); - - ym2151_device &ym2151(YM2151(config, "ym2151", ADPCM_FM_CLOCK)); - ym2151.irq_handler().set_inputline("cpu", M6809_FIRQ_LINE); - ym2151.add_route(ALL_OUTPUTS, *this, 0.10); - - AD7524(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.10); - - okim6295_device &oki(OKIM6295(config, "oki", ADPCM_MASTER_CLOCK/8, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified - oki.set_addrmap(0, &williams_adpcm_sound_device::williams_adpcm_oki_map); - oki.add_route(ALL_OUTPUTS, *this, 0.15); -} - - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void williams_adpcm_sound_device::device_start() -{ - // configure banks - u8 *rom = memregion("cpu")->base(); - m_rombank->configure_entries(0, 8, &rom[0x10000], 0x8000); - membank("romupper")->set_base(&rom[0x10000 + 0x4000 + 7 * 0x8000]); - - // expand ADPCM data - rom = memregion("oki")->base(); - // it is assumed that U12 is loaded @ 0x00000 and U13 is loaded @ 0x40000 - m_okibank->configure_entry(0, &rom[0x40000]); - m_okibank->configure_entry(1, &rom[0x40000]); - m_okibank->configure_entry(2, &rom[0x20000]); - m_okibank->configure_entry(3, &rom[0x00000]); - m_okibank->configure_entry(4, &rom[0xe0000]); - m_okibank->configure_entry(5, &rom[0xc0000]); - m_okibank->configure_entry(6, &rom[0xa0000]); - m_okibank->configure_entry(7, &rom[0x80000]); - - // register for save states - save_item(NAME(m_latch)); - save_item(NAME(m_talkback)); - save_item(NAME(m_sound_int_state)); - - m_sync_command_timer = timer_alloc(FUNC(williams_adpcm_sound_device::sync_command), this); - m_irq_clear_timer = timer_alloc(FUNC(williams_adpcm_sound_device::irq_clear), this); -} - - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void williams_adpcm_sound_device::device_reset() -{ - // reset interrupt states - m_sound_int_state = 0; - m_cpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); - m_cpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); - m_cpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); - - m_sync_command_timer->adjust(attotime::never); - m_irq_clear_timer->adjust(attotime::never); -} - - -//------------------------------------------------- -// timer callbacks -//------------------------------------------------- - -TIMER_CALLBACK_MEMBER(williams_adpcm_sound_device::sync_command) -{ - m_latch = param & 0xff; - if (!(param & 0x200)) - { - m_cpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); - m_sound_int_state = 1; - machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(100)); - } -} - -TIMER_CALLBACK_MEMBER(williams_adpcm_sound_device::irq_clear) -{ - m_sound_int_state = 0; -} - - - -//************************************************************************** -// S4 SOUND BOARD (simple sound card used in system 3/4 pinballs) -//************************************************************************** - -//------------------------------------------------- -// williams_s4_sound_device - constructor -//------------------------------------------------- -williams_s4_sound_device::williams_s4_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) - : device_t(mconfig, WILLIAMS_S4_SOUND, tag, owner, clock) - , device_mixer_interface(mconfig, *this) - , m_cpu(*this, "cpu") - , m_pia(*this, "pia") -{ -} - -//------------------------------------------------- -// write - handle an external write -//------------------------------------------------- -void williams_s4_sound_device::write(u8 data) -{ - // Handle S2 (electronic or tones) - data &= ioport("S4")->read(); - if ((data & 0x9f) != 0x9f) - { - m_pia->portb_w(data); - m_pia->cb1_w(0); - } - m_pia->cb1_w(1); -} - -//------------------------------------------------- -// audio CPU map -//------------------------------------------------- -void williams_s4_sound_device::williams_s4_map(address_map &map) -{ - map.global_mask(0x0fff); - map(0x0000, 0x00ff).ram(); - map(0x0400, 0x0403).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x0800, 0x0fff).rom().region("audiocpu", 0); -} - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- -void williams_s4_sound_device::device_add_mconfig(machine_config &config) -{ - M6808(config, m_cpu, 3580000); - m_cpu->set_addrmap(AS_PROGRAM, &williams_s4_sound_device::williams_s4_map); - - MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.5); - - PIA6821(config, m_pia, 0); - m_pia->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w)); - m_pia->irqa_handler().set_inputline(m_cpu, M6808_IRQ_LINE); - m_pia->irqb_handler().set_inputline(m_cpu, M6808_IRQ_LINE); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- -void williams_s4_sound_device::device_start() -{ - // register for save states - save_item(NAME(m_dummy)); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- -void williams_s4_sound_device::device_reset() -{ - // reset interrupt states - m_cpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE); -} - -INPUT_PORTS_START( williams_s4 ) - PORT_START("S4") - PORT_BIT( 0xbf, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_DIPNAME( 0x40, 0x00, "Sounds" ) - PORT_DIPSETTING( 0x00, "Set 1" ) - PORT_DIPSETTING( 0x40, "Set 2" ) - PORT_BIT( 0x100, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s4_sound_device, audio_nmi, 1) -INPUT_PORTS_END - -INPUT_CHANGED_MEMBER( williams_s4_sound_device::audio_nmi ) -{ - // Diagnostic button sends a pulse to NMI pin - if (newval==CLEAR_LINE) - m_cpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); -} - -//------------------------------------------------- -// device_input_ports - return a pointer to -// the device's I/O ports -//------------------------------------------------- -ioport_constructor williams_s4_sound_device::device_input_ports() const -{ - return INPUT_PORTS_NAME( williams_s4 ); -} - - - -//************************************************************************** -// S6 SOUND BOARD (s4 with speech, used in system 6/6a/7 pinballs) -//************************************************************************** - -//------------------------------------------------- -// williams_s6_sound_device - constructor -//------------------------------------------------- -williams_s6_sound_device::williams_s6_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) - : device_t(mconfig, WILLIAMS_S6_SOUND, tag, owner, clock) - , device_mixer_interface(mconfig, *this) - , m_cpu(*this, "cpu") - , m_pia(*this, "pia") - , m_hc(*this, "hc") -{ -} - -//------------------------------------------------- -// write - handle an external write -//------------------------------------------------- -void williams_s6_sound_device::write(u8 data) -{ - data = bitswap<8>(data, 6, 7, 5, 4, 3, 2, 1, 0) | 0x40; - // Handle dips - data &= ioport("S6")->read(); - if ((data & 0x9f) != 0x9f) - { - m_pia->portb_w(data); - m_pia->cb1_w(0); - } - m_pia->cb1_w(1); -} - -//------------------------------------------------- -// pb_w - acknowledge interrupt -//------------------------------------------------- -void williams_s6_sound_device::pb_w(u8 data) -{ - m_pia->cb1_w(1); -} - -//------------------------------------------------- -// audio CPU map -//------------------------------------------------- -void williams_s6_sound_device::williams_s6_map(address_map &map) -{ - map.global_mask(0x7fff); - map(0x0000, 0x00ff).ram(); - map(0x0400, 0x0403).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x3000, 0x7fff).rom().region("audiocpu", 0); -} - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- -void williams_s6_sound_device::device_add_mconfig(machine_config &config) -{ - M6802(config, m_cpu, 3580000); - m_cpu->set_addrmap(AS_PROGRAM, &williams_s6_sound_device::williams_s6_map); - - MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.5); - - HC55516(config, m_hc, 0).add_route(ALL_OUTPUTS, *this, 1.00); - - PIA6821(config, m_pia, 0); - m_pia->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w)); - m_pia->writepb_handler().set(FUNC(williams_s6_sound_device::pb_w)); - m_pia->ca2_handler().set(m_hc, FUNC(hc55516_device::digit_w)); - m_pia->cb2_handler().set(m_hc, FUNC(hc55516_device::clock_w)); - m_pia->irqa_handler().set_inputline(m_cpu, M6802_IRQ_LINE); - m_pia->irqb_handler().set_inputline(m_cpu, M6802_IRQ_LINE); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- -void williams_s6_sound_device::device_start() -{ - // register for save states - save_item(NAME(m_dummy)); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- -void williams_s6_sound_device::device_reset() -{ - // reset interrupt states - m_cpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE); -} - -INPUT_PORTS_START( williams_s6 ) - PORT_START("S6") - PORT_BIT( 0x9f, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_DIPNAME( 0x20, 0x00, "Speech" ) - PORT_DIPSETTING( 0x20, "Off" ) - PORT_DIPSETTING( 0x00, "On" ) - PORT_DIPNAME( 0x40, 0x40, "Sounds" ) - PORT_DIPSETTING( 0x00, "Tones" ) - PORT_DIPSETTING( 0x40, "Synth" ) - PORT_BIT( 0x100, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s6_sound_device, audio_nmi, 1) -INPUT_PORTS_END - -INPUT_CHANGED_MEMBER( williams_s6_sound_device::audio_nmi ) -{ - // Diagnostic button sends a pulse to NMI pin - if (newval==CLEAR_LINE) - m_cpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); -} - -//------------------------------------------------- -// device_input_ports - return a pointer to -// the device's I/O ports -//------------------------------------------------- -ioport_constructor williams_s6_sound_device::device_input_ports() const -{ - return INPUT_PORTS_NAME( williams_s6 ); -} - - - -//************************************************************************** -// S9 SOUND BOARD (s6 with different interface, used in system 9 pinballs) -//************************************************************************** - -//------------------------------------------------- -// williams_s9_sound_device - constructor -//------------------------------------------------- -williams_s9_sound_device::williams_s9_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) - : device_t(mconfig, WILLIAMS_S9_SOUND, tag, owner, clock) - , device_mixer_interface(mconfig, *this) - , m_cpu(*this, "cpu") - , m_pia(*this, "pia") - , m_hc(*this, "hc") -{ -} - -//------------------------------------------------- -// write - handle an external write -//------------------------------------------------- -void williams_s9_sound_device::write(u8 data) -{ - m_pia->porta_w(data); -} - -//------------------------------------------------- -// strobe - tell PIA to process the input -//------------------------------------------------- -WRITE_LINE_MEMBER(williams_s9_sound_device::strobe) -{ - m_pia->ca1_w(state); -} - -//------------------------------------------------- -// audio CPU map -//------------------------------------------------- -void williams_s9_sound_device::williams_s9_map(address_map &map) -{ - map(0x0000, 0x07ff).ram(); - map(0x2000, 0x2003).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x8000, 0xffff).rom().region("audiocpu", 0 ); -} - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- -void williams_s9_sound_device::device_add_mconfig(machine_config &config) -{ - M6802(config, m_cpu, XTAL(4'000'000)); - m_cpu->set_addrmap(AS_PROGRAM, &williams_s9_sound_device::williams_s9_map); - - MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.5); - - HC55516(config, m_hc, 0).add_route(ALL_OUTPUTS, *this, 1.00); - - PIA6821(config, m_pia, 0); - m_pia->set_port_a_input_overrides_output_mask(0xff); - m_pia->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w)); - m_pia->ca2_handler().set(m_hc, FUNC(hc55516_device::clock_w)); - m_pia->cb2_handler().set(m_hc, FUNC(hc55516_device::digit_w)); - m_pia->irqa_handler().set_inputline(m_cpu, M6802_IRQ_LINE); - m_pia->irqb_handler().set_inputline(m_cpu, M6802_IRQ_LINE); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- -void williams_s9_sound_device::device_start() -{ - // register for save states - save_item(NAME(m_dummy)); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- -void williams_s9_sound_device::device_reset() -{ - // reset interrupt states - m_cpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE); -} - -INPUT_PORTS_START( williams_s9 ) - PORT_START("S9") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s9_sound_device, audio_nmi, 1) -INPUT_PORTS_END - -INPUT_CHANGED_MEMBER( williams_s9_sound_device::audio_nmi ) -{ - // Diagnostic button sends a pulse to NMI pin - if (newval==CLEAR_LINE) - m_cpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); -} - -//------------------------------------------------- -// device_input_ports - return a pointer to -// the device's I/O ports -//------------------------------------------------- -ioport_constructor williams_s9_sound_device::device_input_ports() const -{ - return INPUT_PORTS_NAME( williams_s9 ); -} - - - -//************************************************************************** -// S11 SOUND BOARD (s9 with banked roms, used in system 11/a/b/c pinballs) -//************************************************************************** - -//------------------------------------------------- -// williams_s11_sound_device - constructor -//------------------------------------------------- -williams_s11_sound_device::williams_s11_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) - : device_t(mconfig, WILLIAMS_S11_SOUND, tag, owner, clock) - , device_mixer_interface(mconfig, *this) - , m_cpu(*this, "cpu") - , m_pia(*this, "pia") - , m_hc(*this, "hc") -{ -} - -//------------------------------------------------- -// write - handle an external write -//------------------------------------------------- -void williams_s11_sound_device::write(u8 data) -{ - m_pia->porta_w(data); -} - -//------------------------------------------------- -// strobe - tell PIA to process the input -//------------------------------------------------- -WRITE_LINE_MEMBER(williams_s11_sound_device::strobe) -{ - m_pia->ca1_w(state); -} - -//------------------------------------------------- -// bank_w - bankswitch -//------------------------------------------------- -void williams_s11_sound_device::bank_w(u8 data) -{ - membank("bank0")->set_entry(BIT(data, 1)); - membank("bank1")->set_entry(BIT(data, 0)); -} - -//------------------------------------------------- -// audio CPU map -//------------------------------------------------- -void williams_s11_sound_device::williams_s11_map(address_map &map) -{ - map(0x0000, 0x07ff).mirror(0x0800).ram(); - map(0x1000, 0x1fff).w(FUNC(williams_s11_sound_device::bank_w)); - map(0x2000, 0x2003).mirror(0x0ffc).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); - map(0x8000, 0xbfff).bankr("bank0"); - map(0xc000, 0xffff).bankr("bank1"); -} - -//------------------------------------------------- -// device_add_mconfig - add device configuration -//------------------------------------------------- -void williams_s11_sound_device::device_add_mconfig(machine_config &config) -{ - M6802(config, m_cpu, XTAL(4'000'000)); - m_cpu->set_addrmap(AS_PROGRAM, &williams_s11_sound_device::williams_s11_map); - - MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.5); - - HC55516(config, m_hc, 0).add_route(ALL_OUTPUTS, *this, 1.00); - - PIA6821(config, m_pia, 0); - m_pia->set_port_a_input_overrides_output_mask(0xff); - m_pia->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w)); - m_pia->ca2_handler().set(m_hc, FUNC(hc55516_device::clock_w)); - m_pia->cb2_handler().set(m_hc, FUNC(hc55516_device::digit_w)); - m_pia->irqa_handler().set_inputline(m_cpu, M6802_IRQ_LINE); - m_pia->irqb_handler().set_inputline(m_cpu, M6802_IRQ_LINE); -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- -void williams_s11_sound_device::device_start() -{ - u8 *ROM = memregion("audiocpu")->base(); - membank("bank0")->configure_entries(0, 2, &ROM[0x0000], 0x4000); - membank("bank1")->configure_entries(0, 2, &ROM[0x8000], 0x4000); - - // register for save states - save_item(NAME(m_dummy)); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- -void williams_s11_sound_device::device_reset() -{ - membank("bank0")->set_entry(0); - membank("bank1")->set_entry(0); - - // reset interrupt states - m_cpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE); -} - -INPUT_PORTS_START( williams_s11 ) - PORT_START("S11") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s11_sound_device, audio_nmi, 1) -INPUT_PORTS_END - -INPUT_CHANGED_MEMBER( williams_s11_sound_device::audio_nmi ) -{ - // Diagnostic button sends a pulse to NMI pin - if (newval==CLEAR_LINE) - m_cpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); -} - -//------------------------------------------------- -// device_input_ports - return a pointer to -// the device's I/O ports -//------------------------------------------------- -ioport_constructor williams_s11_sound_device::device_input_ports() const -{ - return INPUT_PORTS_NAME( williams_s11 ); -} - - diff --git a/src/mame/shared/williams_a.h b/src/mame/shared/williams_a.h deleted file mode 100644 index 8f499b803d8..00000000000 --- a/src/mame/shared/williams_a.h +++ /dev/null @@ -1,317 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Aaron Giles -/*************************************************************************** - - williams.h - - Functions to emulate general the various Williams/Midway sound cards. - -****************************************************************************/ - -#include "machine/6821pia.h" -#include "cpu/m6800/m6800.h" -#include "cpu/m6809/m6809.h" -#include "sound/hc55516.h" -#include "sound/okim6295.h" -#include "sound/ymopm.h" - - - -//************************************************************************** -// GLOBAL VARIABLES -//************************************************************************** - -DECLARE_DEVICE_TYPE(WILLIAMS_CVSD_SOUND, williams_cvsd_sound_device) -DECLARE_DEVICE_TYPE(WILLIAMS_NARC_SOUND, williams_narc_sound_device) -DECLARE_DEVICE_TYPE(WILLIAMS_ADPCM_SOUND, williams_adpcm_sound_device) -DECLARE_DEVICE_TYPE(WILLIAMS_S4_SOUND, williams_s4_sound_device) -DECLARE_DEVICE_TYPE(WILLIAMS_S6_SOUND, williams_s6_sound_device) -DECLARE_DEVICE_TYPE(WILLIAMS_S9_SOUND, williams_s9_sound_device) -DECLARE_DEVICE_TYPE(WILLIAMS_S11_SOUND, williams_s11_sound_device) - - - -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - -// ======================> williams_cvsd_sound_device - -class williams_cvsd_sound_device : public device_t, - public device_mixer_interface -{ -public: - // construction/destruction - williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - - // read/write - void write(u16 data); - DECLARE_WRITE_LINE_MEMBER(reset_write); - - // internal communications - void bank_select_w(u8 data); - void cvsd_digit_clock_clear_w(u8 data); - void cvsd_clock_set_w(u8 data); - - void williams_cvsd_map(address_map &map); - - mc6809e_device *get_cpu() { return m_cpu; } - -protected: - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - virtual void device_reset() override; - - TIMER_CALLBACK_MEMBER(sync_write); - -private: - // devices - required_device m_cpu; - required_device m_pia; - required_device m_ym2151; - required_device m_hc55516; - - required_memory_bank m_rombank; - - // internal state - emu_timer *m_sync_write_timer; - u8 m_talkback; - - void talkback_w(u8 data); -}; - - -// ======================> williams_narc_sound_device - -class williams_narc_sound_device : public device_t, - public device_mixer_interface -{ -public: - // construction/destruction - williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - - // read/write - u16 read(); - void write(u16 data); - DECLARE_WRITE_LINE_MEMBER(reset_write); - - // internal communications - void master_bank_select_w(u8 data); - void slave_bank_select_w(u8 data); - u8 command_r(); - void command2_w(u8 data); - u8 command2_r(); - void master_talkback_w(u8 data); - void master_sync_w(u8 data); - void slave_talkback_w(u8 data); - void slave_sync_w(u8 data); - void cvsd_digit_clock_clear_w(u8 data); - void cvsd_clock_set_w(u8 data); - - void williams_narc_master_map(address_map &map); - void williams_narc_slave_map(address_map &map); - - mc6809e_device *get_cpu() { return m_cpu[0]; } - -protected: - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - virtual void device_reset() override; - - TIMER_CALLBACK_MEMBER(sync_master_command); - TIMER_CALLBACK_MEMBER(sync_slave_command); - TIMER_CALLBACK_MEMBER(sync_clear); - -private: - // devices - required_device_array m_cpu; - required_device m_hc55516; - - required_memory_bank m_masterbank; - required_memory_bank m_slavebank; - - // internal state - emu_timer *m_sync_master_timer; - emu_timer *m_sync_slave_timer; - emu_timer *m_sync_clear_timer; - u8 m_latch; - u8 m_latch2; - u8 m_talkback; - u8 m_audio_sync; - u8 m_sound_int_state; -}; - - -// ======================> williams_adpcm_sound_device - -class williams_adpcm_sound_device : public device_t, - public device_mixer_interface -{ -public: - // construction/destruction - williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - - // read/write - void write(u16 data); - DECLARE_WRITE_LINE_MEMBER(reset_write); - DECLARE_READ_LINE_MEMBER(irq_read); - - // internal communications - void bank_select_w(u8 data); - void oki6295_bank_select_w(u8 data); - u8 command_r(); - void talkback_w(u8 data); - - void williams_adpcm_map(address_map &map); - void williams_adpcm_oki_map(address_map &map); - - mc6809e_device *get_cpu() { return m_cpu; } - -protected: - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - virtual void device_reset() override; - - TIMER_CALLBACK_MEMBER(sync_command); - TIMER_CALLBACK_MEMBER(irq_clear); - -private: - // devices - required_device m_cpu; - - required_memory_bank m_rombank; - required_memory_bank m_okibank; - - // internal state - emu_timer *m_sync_command_timer; - emu_timer *m_irq_clear_timer; - u8 m_latch; - u8 m_talkback; - u8 m_sound_int_state; -}; - - -// ======================> williams_s4_sound_device - -class williams_s4_sound_device : public device_t, public device_mixer_interface -{ -public: - // construction/destruction - williams_s4_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - - // read/write - void write(u8 data); - DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - -protected: - - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual ioport_constructor device_input_ports() const override; - virtual void device_start() override; - virtual void device_reset() override; - -private: - // devices - void williams_s4_map(address_map &map); - required_device m_cpu; - required_device m_pia; - u8 m_dummy = 0; // needed for save-state support -}; - - -// ======================> williams_s6_sound_device - -class williams_s6_sound_device : public device_t, public device_mixer_interface -{ -public: - // construction/destruction - williams_s6_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - - // read/write - void write(u8 data); - DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - -protected: - - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual ioport_constructor device_input_ports() const override; - virtual void device_start() override; - virtual void device_reset() override; - -private: - void pb_w(u8 data); - // devices - void williams_s6_map(address_map &map); - required_device m_cpu; - required_device m_pia; - required_device m_hc; - u8 m_dummy = 0; // needed for save-state support -}; - - -// ======================> williams_s9_sound_device - -class williams_s9_sound_device : public device_t, public device_mixer_interface -{ -public: - // construction/destruction - williams_s9_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - - // read/write - void write(u8 data); - DECLARE_WRITE_LINE_MEMBER(strobe); - DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - -protected: - - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual ioport_constructor device_input_ports() const override; - virtual void device_start() override; - virtual void device_reset() override; - -private: - // devices - void williams_s9_map(address_map &map); - required_device m_cpu; - required_device m_pia; - required_device m_hc; - u8 m_dummy = 0; // needed for save-state support -}; - - -// ======================> williams_s11_sound_device - -class williams_s11_sound_device : public device_t, public device_mixer_interface -{ -public: - // construction/destruction - williams_s11_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); - - // read/write - void write(u8 data); - DECLARE_WRITE_LINE_MEMBER(strobe); - DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); - -protected: - - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual ioport_constructor device_input_ports() const override; - virtual void device_start() override; - virtual void device_reset() override; - -private: - void bank_w(u8); - // devices - void williams_s11_map(address_map &map); - required_device m_cpu; - required_device m_pia; - required_device m_hc; - u8 m_dummy = 0; // needed for save-state support -}; diff --git a/src/mame/shared/williamssound.cpp b/src/mame/shared/williamssound.cpp new file mode 100644 index 00000000000..2df5fcea499 --- /dev/null +++ b/src/mame/shared/williamssound.cpp @@ -0,0 +1,1301 @@ +// license:BSD-3-Clause +// copyright-holders:Aaron Giles +/*************************************************************************** + + williams.h + + Functions to emulate general the various Williams/Midway sound cards. + +**************************************************************************** + + Midway/Williams Audio Boards + ---------------------------- + + 6809 MEMORY MAP + + Function Address R/W Data + --------------------------------------------------------------- + Program RAM 0000-07FF R/W D0-D7 + + Music (YM-2151) 2000-2001 R/W D0-D7 + + 6821 PIA 4000-4003 R/W D0-D7 + + HC55516 clock low, digit latch 6000 W D0 + HC55516 clock high 6800 W xx + + Bank select 7800 W D0-D2 + + Banked Program ROM 8000-FFFF R D0-D7 + +****************************************************************************/ + +#include "emu.h" +#include "williamssound.h" + +#include "machine/6821pia.h" +#include "machine/rescap.h" +#include "cpu/m6809/m6809.h" +#include "cpu/m6800/m6800.h" +#include "sound/dac.h" +#include "sound/hc55516.h" +#include "sound/okim6295.h" +#include "sound/ymopm.h" + + +#define NARC_MASTER_CLOCK XTAL(8'000'000) +#define NARC_FM_CLOCK XTAL(3'579'545) + +#define CVSD_MASTER_CLOCK XTAL(8'000'000) +#define CVSD_FM_CLOCK XTAL(3'579'545) + +#define ADPCM_MASTER_CLOCK XTAL(8'000'000) +#define ADPCM_FM_CLOCK XTAL(3'579'545) + + + +//************************************************************************** +// GLOBAL VARIABLES +//************************************************************************** + +DEFINE_DEVICE_TYPE(WILLIAMS_CVSD_SOUND, williams_cvsd_sound_device, "wmscvsd", "Williams CVSD Sound Board") +DEFINE_DEVICE_TYPE(WILLIAMS_NARC_SOUND, williams_narc_sound_device, "wmsnarc", "Williams NARC Sound Board") +DEFINE_DEVICE_TYPE(WILLIAMS_ADPCM_SOUND, williams_adpcm_sound_device, "wmsadpcm", "Williams ADPCM Sound Board") +DEFINE_DEVICE_TYPE(WILLIAMS_S4_SOUND, williams_s4_sound_device, "wmss4", "Williams System 4 Sound Board") +DEFINE_DEVICE_TYPE(WILLIAMS_S6_SOUND, williams_s6_sound_device, "wmss6", "Williams System 6 Sound Board") +DEFINE_DEVICE_TYPE(WILLIAMS_S9_SOUND, williams_s9_sound_device, "wmss9", "Williams System 9 Sound Board") +DEFINE_DEVICE_TYPE(WILLIAMS_S11_SOUND, williams_s11_sound_device, "wmss11", "Williams System 11 Sound Board") + + + +//************************************************************************** +// CVSD SOUND BOARD +//************************************************************************** + +//------------------------------------------------- +// williams_cvsd_sound_device - constructor +//------------------------------------------------- + +williams_cvsd_sound_device::williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, WILLIAMS_CVSD_SOUND, tag, owner, clock), + device_mixer_interface(mconfig, *this), + m_cpu(*this, "cpu"), + m_pia(*this, "pia"), + m_ym2151(*this, "ym2151"), + m_hc55516(*this, "cvsd"), + m_rombank(*this, "rombank"), + m_talkback(0) +{ +} + + +//------------------------------------------------- +// write - handle an external write to the input +// latch +//------------------------------------------------- + +void williams_cvsd_sound_device::write(u16 data) +{ + m_sync_write_timer->adjust(attotime::zero, data); +} + + +//------------------------------------------------- +// reset_write - write to the reset line +//------------------------------------------------- + +WRITE_LINE_MEMBER(williams_cvsd_sound_device::reset_write) +{ + // going high halts the CPU + if (state) + { + bank_select_w(0); + device_reset(); + m_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); + } + + // going low resets and reactivates the CPU + else + m_cpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); +} + + +//------------------------------------------------- +// bank_select_w - change memory banks +//------------------------------------------------- + +void williams_cvsd_sound_device::bank_select_w(u8 data) +{ + m_rombank->set_entry(data & 0x0f); +} + + +//------------------------------------------------- +// talkback_w - write to the talkback latch +//------------------------------------------------- + +void williams_cvsd_sound_device::talkback_w(u8 data) +{ + m_talkback = data; + logerror("CVSD Talkback = %02X\n", data); +} + + +//------------------------------------------------- +// cvsd_digit_clock_clear_w - clear the clock on +// the HC55516 and clock the data +//------------------------------------------------- + +void williams_cvsd_sound_device::cvsd_digit_clock_clear_w(u8 data) +{ + m_hc55516->clock_w(0); + m_hc55516->digit_w(data&1); +} + + +//------------------------------------------------- +// cvsd_clock_set_w - set the clock on the HC55516 +//------------------------------------------------- + +void williams_cvsd_sound_device::cvsd_clock_set_w(u8 data) +{ + m_hc55516->clock_w(1); +} + + +//------------------------------------------------- +// audio CPU map +//------------------------------------------------- + +void williams_cvsd_sound_device::williams_cvsd_map(address_map &map) +{ + map(0x0000, 0x07ff).mirror(0x1800).ram(); + map(0x2000, 0x2001).mirror(0x1ffe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); + map(0x4000, 0x4003).mirror(0x1ffc).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x6000, 0x6000).mirror(0x07ff).w(FUNC(williams_cvsd_sound_device::cvsd_digit_clock_clear_w)); + map(0x6800, 0x6800).mirror(0x07ff).w(FUNC(williams_cvsd_sound_device::cvsd_clock_set_w)); + map(0x7800, 0x7800).mirror(0x07ff).w(FUNC(williams_cvsd_sound_device::bank_select_w)); + map(0x8000, 0xffff).bankr("rombank"); +} + + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void williams_cvsd_sound_device::device_add_mconfig(machine_config &config) +{ + MC6809E(config, m_cpu, CVSD_MASTER_CLOCK / 4); + m_cpu->set_addrmap(AS_PROGRAM, &williams_cvsd_sound_device::williams_cvsd_map); + + PIA6821(config, m_pia, 0); + m_pia->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w)); + m_pia->writepb_handler().set(FUNC(williams_cvsd_sound_device::talkback_w)); + m_pia->ca2_handler().set(m_ym2151, FUNC(ym2151_device::reset_w)); + m_pia->irqa_handler().set_inputline(m_cpu, M6809_FIRQ_LINE); + m_pia->irqb_handler().set_inputline(m_cpu, INPUT_LINE_NMI); + + YM2151(config, m_ym2151, CVSD_FM_CLOCK); + m_ym2151->irq_handler().set(m_pia, FUNC(pia6821_device::ca1_w)).invert(); // IRQ is not true state + m_ym2151->add_route(ALL_OUTPUTS, *this, 0.10); + + MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.25); + + HC55516(config, m_hc55516, 0); + m_hc55516->add_route(ALL_OUTPUTS, *this, 0.60); +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void williams_cvsd_sound_device::device_start() +{ + // configure master CPU banks + u8 *rom = memregion("cpu")->base(); + for (int bank = 0; bank < 16; bank++) + { + // + // D0/D1 -> selects: 0=U4 1=U19 2=U20 3=n/c + // D2 -> A15 + // D3 -> A16 + // + offs_t offset = 0x8000 * ((bank >> 2) & 3) + 0x20000 * (bank & 3); + m_rombank->configure_entry(bank, &rom[0x10000 + offset]); + } + m_rombank->set_entry(0); + + // reset the IRQ state + m_pia->ca1_w(1); + + // register for save states + save_item(NAME(m_talkback)); + + // allocate timers + m_sync_write_timer = timer_alloc(FUNC(williams_cvsd_sound_device::sync_write), this); +} + + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void williams_cvsd_sound_device::device_reset() +{ + // reset interrupt states + m_cpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); + m_cpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); + m_cpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); +} + + +//------------------------------------------------- +// sync_write +//------------------------------------------------- + +TIMER_CALLBACK_MEMBER(williams_cvsd_sound_device::sync_write) +{ + // process incoming data write + m_pia->portb_w(param & 0xff); + m_pia->cb1_w((param >> 8) & 1); + m_pia->cb2_w((param >> 9) & 1); +} + + + +//************************************************************************** +// NARC SOUND BOARD +//************************************************************************** + +//------------------------------------------------- +// williams_narc_sound_device - constructor +//------------------------------------------------- + +williams_narc_sound_device::williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, WILLIAMS_NARC_SOUND, tag, owner, clock), + device_mixer_interface(mconfig, *this), + m_cpu(*this, "cpu%u", 0U), + m_hc55516(*this, "cvsd"), + m_masterbank(*this, "masterbank"), + m_slavebank(*this, "slavebank"), + m_latch(0), + m_latch2(0), + m_talkback(0), + m_audio_sync(0), + m_sound_int_state(0) +{ +} + + +//------------------------------------------------- +// read - return the talkback register with the +// SYNC bits in bits 8 and 9 +//------------------------------------------------- + +u16 williams_narc_sound_device::read() +{ + return m_talkback | (m_audio_sync << 8); +} + + +//------------------------------------------------- +// write - handle an external write to the input +// latch +//------------------------------------------------- + +void williams_narc_sound_device::write(u16 data) +{ + m_sync_master_timer->adjust(attotime::zero, data); +} + + +//------------------------------------------------- +// reset_write - write to the reset line +//------------------------------------------------- + +WRITE_LINE_MEMBER(williams_narc_sound_device::reset_write) +{ + // going high halts the CPU + if (state) + { + master_bank_select_w(0); + slave_bank_select_w(0); + device_reset(); + m_cpu[0]->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); + m_cpu[1]->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); + } + + // going low resets and reactivates the CPU + else + { + m_cpu[0]->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); + m_cpu[1]->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); + } +} + + +//------------------------------------------------- +// master_bank_select_w - select the bank for the +// master CPU +//------------------------------------------------- + +void williams_narc_sound_device::master_bank_select_w(u8 data) +{ + m_masterbank->set_entry(data & 0x0f); +} + + +//------------------------------------------------- +// slave_bank_select_w - select the bank for the +// slave CPU +//------------------------------------------------- + +void williams_narc_sound_device::slave_bank_select_w(u8 data) +{ + m_slavebank->set_entry(data & 0x0f); +} + + +//------------------------------------------------- +// command_r - read command written by external +// agent +//------------------------------------------------- + +u8 williams_narc_sound_device::command_r() +{ + m_cpu[0]->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); + m_sound_int_state = 0; + return m_latch; +} + + +//------------------------------------------------- +// command2_w - write command from master CPU to +// slave CPU +//------------------------------------------------- + +void williams_narc_sound_device::command2_w(u8 data) +{ + m_sync_slave_timer->adjust(attotime::zero, data); +} + + +//------------------------------------------------- +// command2_r - read command written by master +// CPU +//------------------------------------------------- + +u8 williams_narc_sound_device::command2_r() +{ + m_cpu[1]->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); + return m_latch2; +} + + +//------------------------------------------------- +// master_talkback_w - handle writes to the +// talkback latch from the master CPU +//------------------------------------------------- + +void williams_narc_sound_device::master_talkback_w(u8 data) +{ + m_talkback = data; + logerror("Master Talkback = %02X\n", data); +} + + +//------------------------------------------------- +// master_sync_w - handle writes to the master +// SYNC register +//------------------------------------------------- + +void williams_narc_sound_device::master_sync_w(u8 data) +{ + m_sync_clear_timer->adjust(attotime::from_double(TIME_OF_74LS123(180000, 0.000001)), 0x01); + m_audio_sync |= 0x01; + logerror("Master sync = %02X\n", data); +} + + +//------------------------------------------------- +// slave_talkback_w - handle writes to the +// talkback latch from the slave CPU +//------------------------------------------------- + +void williams_narc_sound_device::slave_talkback_w(u8 data) +{ + logerror("Slave Talkback = %02X\n", data); +} + + +//------------------------------------------------- +// slave_sync_w - handle writes to the slave +// SYNC register +//------------------------------------------------- + +void williams_narc_sound_device::slave_sync_w(u8 data) +{ + m_sync_clear_timer->adjust(attotime::from_double(TIME_OF_74LS123(180000, 0.000001)), 0x02); + m_audio_sync |= 0x02; + logerror("Slave sync = %02X\n", data); +} + + +//------------------------------------------------- +// cvsd_digit_clock_clear_w - clear the clk pin on +// the HC555xx and clock the data latch +//------------------------------------------------- + +void williams_narc_sound_device::cvsd_digit_clock_clear_w(u8 data) +{ + m_hc55516->clock_w(0); + m_hc55516->digit_w(data&1); +} + + +//--------------------------------------------------- +// cvsd_clock_set_w - set the clk pin on the HC555xx +//--------------------------------------------------- + +void williams_narc_sound_device::cvsd_clock_set_w(u8 data) +{ + m_hc55516->clock_w(1); +} + + +//------------------------------------------------- +// master CPU map +//------------------------------------------------- + +void williams_narc_sound_device::williams_narc_master_map(address_map &map) +{ + map(0x0000, 0x1fff).ram(); + map(0x2000, 0x2001).mirror(0x03fe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); + map(0x2800, 0x2800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::master_talkback_w)); + map(0x2c00, 0x2c00).mirror(0x03ff).w(FUNC(williams_narc_sound_device::command2_w)); + map(0x3000, 0x3000).mirror(0x03ff).w("dac1", FUNC(dac_byte_interface::data_w)); + map(0x3400, 0x3400).mirror(0x03ff).r(FUNC(williams_narc_sound_device::command_r)); + map(0x3800, 0x3800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::master_bank_select_w)); + map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(williams_narc_sound_device::master_sync_w)); + map(0x4000, 0xbfff).bankr("masterbank"); + map(0xc000, 0xffff).bankr("masterupper"); +} + + +//------------------------------------------------- +// slave CPU map +//------------------------------------------------- + +void williams_narc_sound_device::williams_narc_slave_map(address_map &map) +{ + map(0x0000, 0x1fff).ram(); + map(0x2000, 0x2000).mirror(0x03ff).w(FUNC(williams_narc_sound_device::cvsd_clock_set_w)); + map(0x2400, 0x2400).mirror(0x03ff).w(FUNC(williams_narc_sound_device::cvsd_digit_clock_clear_w)); + map(0x2800, 0x2800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::slave_talkback_w)); + map(0x3000, 0x3000).mirror(0x03ff).w("dac2", FUNC(dac_byte_interface::data_w)); + map(0x3400, 0x3400).mirror(0x03ff).r(FUNC(williams_narc_sound_device::command2_r)); + map(0x3800, 0x3800).mirror(0x03ff).w(FUNC(williams_narc_sound_device::slave_bank_select_w)); + map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(williams_narc_sound_device::slave_sync_w)); + map(0x4000, 0xbfff).bankr("slavebank"); + map(0xc000, 0xffff).bankr("slaveupper"); +} + + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + + +void williams_narc_sound_device::device_add_mconfig(machine_config &config) +{ + MC6809E(config, m_cpu[0], NARC_MASTER_CLOCK / 4); + m_cpu[0]->set_addrmap(AS_PROGRAM, &williams_narc_sound_device::williams_narc_master_map); + + MC6809E(config, m_cpu[1], NARC_MASTER_CLOCK / 4); + m_cpu[1]->set_addrmap(AS_PROGRAM, &williams_narc_sound_device::williams_narc_slave_map); + + ym2151_device &ym2151(YM2151(config, "ym2151", NARC_FM_CLOCK)); + ym2151.irq_handler().set_inputline("cpu0", M6809_FIRQ_LINE); + ym2151.add_route(ALL_OUTPUTS, *this, 0.10); + + AD7224(config, "dac1", 0).add_route(ALL_OUTPUTS, *this, 0.25); + AD7224(config, "dac2", 0).add_route(ALL_OUTPUTS, *this, 0.25); + + HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, *this, 0.60); +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void williams_narc_sound_device::device_start() +{ + // configure master CPU banks + u8 *rom = memregion("cpu0")->base(); + for (int bank = 0; bank < 16; bank++) + { + // + // D0 -> A15 + // D1/D2 -> selects: 0=n/c 1=U3 2=U4 3=U5 + // D3 -> A16 + // + offs_t offset = 0x8000 * (bank & 1) + 0x10000 * ((bank >> 3) & 1) + 0x20000 * ((bank >> 1) & 3); + m_masterbank->configure_entry(bank, &rom[0x10000 + offset]); + } + membank("masterupper")->set_base(&rom[0x10000 + 0x4000 + 0x8000 + 0x10000 + 0x20000 * 3]); + + // configure slave CPU banks + rom = memregion("cpu1")->base(); + for (int bank = 0; bank < 16; bank++) + { + // + // D0 -> A15 + // D1/D2 -> selects: 0=U35 1=U36 2=U37 3=U38 + // D3 -> A16 + // + offs_t offset = 0x8000 * (bank & 1) + 0x10000 * ((bank >> 3) & 1) + 0x20000 * ((bank >> 1) & 3); + m_slavebank->configure_entry(bank, &rom[0x10000 + offset]); + } + membank("slaveupper")->set_base(&rom[0x10000 + 0x4000 + 0x8000 + 0x10000 + 0x20000 * 3]); + + // register for save states + save_item(NAME(m_latch)); + save_item(NAME(m_latch2)); + save_item(NAME(m_talkback)); + save_item(NAME(m_audio_sync)); + save_item(NAME(m_sound_int_state)); + + // allocate timers + m_sync_master_timer = timer_alloc(FUNC(williams_narc_sound_device::sync_master_command), this); + m_sync_slave_timer = timer_alloc(FUNC(williams_narc_sound_device::sync_slave_command), this); + m_sync_clear_timer = timer_alloc(FUNC(williams_narc_sound_device::sync_clear), this); +} + + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void williams_narc_sound_device::device_reset() +{ + // reset interrupt states + m_sound_int_state = 0; + m_cpu[0]->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); + m_cpu[0]->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); + m_cpu[0]->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); + m_cpu[1]->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); + m_cpu[1]->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); + m_cpu[1]->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); +} + + +//------------------------------------------------- +// timer callbacks +//------------------------------------------------- + +TIMER_CALLBACK_MEMBER(williams_narc_sound_device::sync_master_command) +{ + m_latch = param & 0xff; + m_cpu[0]->set_input_line(INPUT_LINE_NMI, (param & 0x100) ? CLEAR_LINE : ASSERT_LINE); + if ((param & 0x200) == 0) + { + m_cpu[0]->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); + m_sound_int_state = 1; + } +} + +TIMER_CALLBACK_MEMBER(williams_narc_sound_device::sync_slave_command) +{ + m_latch2 = param & 0xff; + m_cpu[1]->set_input_line(M6809_FIRQ_LINE, ASSERT_LINE); +} + +TIMER_CALLBACK_MEMBER(williams_narc_sound_device::sync_clear) +{ + m_audio_sync &= ~param; +} + + +//************************************************************************** +// ADPCM SOUND BOARD +//************************************************************************** + +//------------------------------------------------- +// williams_adpcm_sound_device - constructor +//------------------------------------------------- + +williams_adpcm_sound_device::williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, WILLIAMS_ADPCM_SOUND, tag, owner, clock), + device_mixer_interface(mconfig, *this), + m_cpu(*this, "cpu"), + m_rombank(*this, "rombank"), + m_okibank(*this, "okibank"), + m_latch(0), + m_talkback(0), + m_sound_int_state(0) +{ +} + + +//------------------------------------------------- +// write - handle an external write to the input +// latch +//------------------------------------------------- + +void williams_adpcm_sound_device::write(u16 data) +{ + m_sync_command_timer->adjust(attotime::zero, data); +} + + +//------------------------------------------------- +// reset_write - write to the reset line +//------------------------------------------------- + +WRITE_LINE_MEMBER(williams_adpcm_sound_device::reset_write) +{ + // going high halts the CPU + if (state) + { + bank_select_w(0); + device_reset(); + m_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); + } + + // going low resets and reactivates the CPU + else + m_cpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); +} + + +//------------------------------------------------- +// irq_read - read the sound IRQ state +//------------------------------------------------- + +READ_LINE_MEMBER(williams_adpcm_sound_device::irq_read) +{ + return m_sound_int_state; +} + + +//------------------------------------------------- +// bank_select_w - select the sound CPU memory +// bank +//------------------------------------------------- + +void williams_adpcm_sound_device::bank_select_w(u8 data) +{ + m_rombank->set_entry(data & 0x07); +} + + +//------------------------------------------------- +// oki6295_bank_select_w - select the OKI6295 +// memory bank +//------------------------------------------------- + +void williams_adpcm_sound_device::oki6295_bank_select_w(u8 data) +{ + m_okibank->set_entry(data & 7); +} + + +//------------------------------------------------- +// command_r - read the command from the external +// latch +//------------------------------------------------- + +u8 williams_adpcm_sound_device::command_r() +{ + m_cpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); + + // don't clear the external IRQ state for a short while; this allows the + // self-tests to pass + m_irq_clear_timer->adjust(attotime::from_usec(10)); + return m_latch; +} + + +//------------------------------------------------- +// talkback_w - write to the talkback latch +//------------------------------------------------- + +void williams_adpcm_sound_device::talkback_w(u8 data) +{ + m_talkback = data; + logerror("ADPCM Talkback = %02X\n", data); +} + + +//------------------------------------------------- +// audio CPU map +//------------------------------------------------- + +void williams_adpcm_sound_device::williams_adpcm_map(address_map &map) +{ + map(0x0000, 0x1fff).ram(); + map(0x2000, 0x2000).mirror(0x03ff).w(FUNC(williams_adpcm_sound_device::bank_select_w)); + map(0x2400, 0x2401).mirror(0x03fe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); + map(0x2800, 0x2800).mirror(0x03ff).w("dac", FUNC(dac_byte_interface::data_w)); + map(0x2c00, 0x2c00).mirror(0x03ff).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0x3000, 0x3000).mirror(0x03ff).r(FUNC(williams_adpcm_sound_device::command_r)); + map(0x3400, 0x3400).mirror(0x03ff).w(FUNC(williams_adpcm_sound_device::oki6295_bank_select_w)); + map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(williams_adpcm_sound_device::talkback_w)); + map(0x4000, 0xbfff).bankr("rombank"); + map(0xc000, 0xffff).bankr("romupper"); +} + + +//------------------------------------------------- +// OKI6295 map +//------------------------------------------------- + +void williams_adpcm_sound_device::williams_adpcm_oki_map(address_map &map) +{ + map(0x00000, 0x1ffff).bankr("okibank"); + map(0x20000, 0x3ffff).rom().region("oki", 0x60000); +} + + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void williams_adpcm_sound_device::device_add_mconfig(machine_config &config) +{ + MC6809E(config, m_cpu, ADPCM_MASTER_CLOCK / 4); + m_cpu->set_addrmap(AS_PROGRAM, &williams_adpcm_sound_device::williams_adpcm_map); + + ym2151_device &ym2151(YM2151(config, "ym2151", ADPCM_FM_CLOCK)); + ym2151.irq_handler().set_inputline("cpu", M6809_FIRQ_LINE); + ym2151.add_route(ALL_OUTPUTS, *this, 0.10); + + AD7524(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.10); + + okim6295_device &oki(OKIM6295(config, "oki", ADPCM_MASTER_CLOCK/8, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified + oki.set_addrmap(0, &williams_adpcm_sound_device::williams_adpcm_oki_map); + oki.add_route(ALL_OUTPUTS, *this, 0.15); +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void williams_adpcm_sound_device::device_start() +{ + // configure banks + u8 *rom = memregion("cpu")->base(); + m_rombank->configure_entries(0, 8, &rom[0x10000], 0x8000); + membank("romupper")->set_base(&rom[0x10000 + 0x4000 + 7 * 0x8000]); + + // expand ADPCM data + rom = memregion("oki")->base(); + // it is assumed that U12 is loaded @ 0x00000 and U13 is loaded @ 0x40000 + m_okibank->configure_entry(0, &rom[0x40000]); + m_okibank->configure_entry(1, &rom[0x40000]); + m_okibank->configure_entry(2, &rom[0x20000]); + m_okibank->configure_entry(3, &rom[0x00000]); + m_okibank->configure_entry(4, &rom[0xe0000]); + m_okibank->configure_entry(5, &rom[0xc0000]); + m_okibank->configure_entry(6, &rom[0xa0000]); + m_okibank->configure_entry(7, &rom[0x80000]); + + // register for save states + save_item(NAME(m_latch)); + save_item(NAME(m_talkback)); + save_item(NAME(m_sound_int_state)); + + m_sync_command_timer = timer_alloc(FUNC(williams_adpcm_sound_device::sync_command), this); + m_irq_clear_timer = timer_alloc(FUNC(williams_adpcm_sound_device::irq_clear), this); +} + + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void williams_adpcm_sound_device::device_reset() +{ + // reset interrupt states + m_sound_int_state = 0; + m_cpu->set_input_line(M6809_FIRQ_LINE, CLEAR_LINE); + m_cpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); + m_cpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); + + m_sync_command_timer->adjust(attotime::never); + m_irq_clear_timer->adjust(attotime::never); +} + + +//------------------------------------------------- +// timer callbacks +//------------------------------------------------- + +TIMER_CALLBACK_MEMBER(williams_adpcm_sound_device::sync_command) +{ + m_latch = param & 0xff; + if (!(param & 0x200)) + { + m_cpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); + m_sound_int_state = 1; + machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(100)); + } +} + +TIMER_CALLBACK_MEMBER(williams_adpcm_sound_device::irq_clear) +{ + m_sound_int_state = 0; +} + + + +//************************************************************************** +// S4 SOUND BOARD (simple sound card used in system 3/4 pinballs) +//************************************************************************** + +//------------------------------------------------- +// williams_s4_sound_device - constructor +//------------------------------------------------- +williams_s4_sound_device::williams_s4_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, WILLIAMS_S4_SOUND, tag, owner, clock) + , device_mixer_interface(mconfig, *this) + , m_cpu(*this, "cpu") + , m_pia(*this, "pia") +{ +} + +//------------------------------------------------- +// write - handle an external write +//------------------------------------------------- +void williams_s4_sound_device::write(u8 data) +{ + // Handle S2 (electronic or tones) + data &= ioport("S4")->read(); + if ((data & 0x9f) != 0x9f) + { + m_pia->portb_w(data); + m_pia->cb1_w(0); + } + m_pia->cb1_w(1); +} + +//------------------------------------------------- +// audio CPU map +//------------------------------------------------- +void williams_s4_sound_device::williams_s4_map(address_map &map) +{ + map.global_mask(0x0fff); + map(0x0000, 0x00ff).ram(); + map(0x0400, 0x0403).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x0800, 0x0fff).rom().region("audiocpu", 0); +} + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- +void williams_s4_sound_device::device_add_mconfig(machine_config &config) +{ + M6808(config, m_cpu, 3580000); + m_cpu->set_addrmap(AS_PROGRAM, &williams_s4_sound_device::williams_s4_map); + + MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.5); + + PIA6821(config, m_pia, 0); + m_pia->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w)); + m_pia->irqa_handler().set_inputline(m_cpu, M6808_IRQ_LINE); + m_pia->irqb_handler().set_inputline(m_cpu, M6808_IRQ_LINE); +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- +void williams_s4_sound_device::device_start() +{ + // register for save states + save_item(NAME(m_dummy)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- +void williams_s4_sound_device::device_reset() +{ + // reset interrupt states + m_cpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE); +} + +INPUT_PORTS_START( williams_s4 ) + PORT_START("S4") + PORT_BIT( 0xbf, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_DIPNAME( 0x40, 0x00, "Sounds" ) + PORT_DIPSETTING( 0x00, "Set 1" ) + PORT_DIPSETTING( 0x40, "Set 2" ) + PORT_BIT( 0x100, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s4_sound_device, audio_nmi, 1) +INPUT_PORTS_END + +INPUT_CHANGED_MEMBER( williams_s4_sound_device::audio_nmi ) +{ + // Diagnostic button sends a pulse to NMI pin + if (newval==CLEAR_LINE) + m_cpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); +} + +//------------------------------------------------- +// device_input_ports - return a pointer to +// the device's I/O ports +//------------------------------------------------- +ioport_constructor williams_s4_sound_device::device_input_ports() const +{ + return INPUT_PORTS_NAME( williams_s4 ); +} + + + +//************************************************************************** +// S6 SOUND BOARD (s4 with speech, used in system 6/6a/7 pinballs) +//************************************************************************** + +//------------------------------------------------- +// williams_s6_sound_device - constructor +//------------------------------------------------- +williams_s6_sound_device::williams_s6_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, WILLIAMS_S6_SOUND, tag, owner, clock) + , device_mixer_interface(mconfig, *this) + , m_cpu(*this, "cpu") + , m_pia(*this, "pia") + , m_hc(*this, "hc") +{ +} + +//------------------------------------------------- +// write - handle an external write +//------------------------------------------------- +void williams_s6_sound_device::write(u8 data) +{ + data = bitswap<8>(data, 6, 7, 5, 4, 3, 2, 1, 0) | 0x40; + // Handle dips + data &= ioport("S6")->read(); + if ((data & 0x9f) != 0x9f) + { + m_pia->portb_w(data); + m_pia->cb1_w(0); + } + m_pia->cb1_w(1); +} + +//------------------------------------------------- +// pb_w - acknowledge interrupt +//------------------------------------------------- +void williams_s6_sound_device::pb_w(u8 data) +{ + m_pia->cb1_w(1); +} + +//------------------------------------------------- +// audio CPU map +//------------------------------------------------- +void williams_s6_sound_device::williams_s6_map(address_map &map) +{ + map.global_mask(0x7fff); + map(0x0000, 0x00ff).ram(); + map(0x0400, 0x0403).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x3000, 0x7fff).rom().region("audiocpu", 0); +} + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- +void williams_s6_sound_device::device_add_mconfig(machine_config &config) +{ + M6802(config, m_cpu, 3580000); + m_cpu->set_addrmap(AS_PROGRAM, &williams_s6_sound_device::williams_s6_map); + + MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.5); + + HC55516(config, m_hc, 0).add_route(ALL_OUTPUTS, *this, 1.00); + + PIA6821(config, m_pia, 0); + m_pia->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w)); + m_pia->writepb_handler().set(FUNC(williams_s6_sound_device::pb_w)); + m_pia->ca2_handler().set(m_hc, FUNC(hc55516_device::digit_w)); + m_pia->cb2_handler().set(m_hc, FUNC(hc55516_device::clock_w)); + m_pia->irqa_handler().set_inputline(m_cpu, M6802_IRQ_LINE); + m_pia->irqb_handler().set_inputline(m_cpu, M6802_IRQ_LINE); +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- +void williams_s6_sound_device::device_start() +{ + // register for save states + save_item(NAME(m_dummy)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- +void williams_s6_sound_device::device_reset() +{ + // reset interrupt states + m_cpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE); +} + +INPUT_PORTS_START( williams_s6 ) + PORT_START("S6") + PORT_BIT( 0x9f, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_DIPNAME( 0x20, 0x00, "Speech" ) + PORT_DIPSETTING( 0x20, "Off" ) + PORT_DIPSETTING( 0x00, "On" ) + PORT_DIPNAME( 0x40, 0x40, "Sounds" ) + PORT_DIPSETTING( 0x00, "Tones" ) + PORT_DIPSETTING( 0x40, "Synth" ) + PORT_BIT( 0x100, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s6_sound_device, audio_nmi, 1) +INPUT_PORTS_END + +INPUT_CHANGED_MEMBER( williams_s6_sound_device::audio_nmi ) +{ + // Diagnostic button sends a pulse to NMI pin + if (newval==CLEAR_LINE) + m_cpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); +} + +//------------------------------------------------- +// device_input_ports - return a pointer to +// the device's I/O ports +//------------------------------------------------- +ioport_constructor williams_s6_sound_device::device_input_ports() const +{ + return INPUT_PORTS_NAME( williams_s6 ); +} + + + +//************************************************************************** +// S9 SOUND BOARD (s6 with different interface, used in system 9 pinballs) +//************************************************************************** + +//------------------------------------------------- +// williams_s9_sound_device - constructor +//------------------------------------------------- +williams_s9_sound_device::williams_s9_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, WILLIAMS_S9_SOUND, tag, owner, clock) + , device_mixer_interface(mconfig, *this) + , m_cpu(*this, "cpu") + , m_pia(*this, "pia") + , m_hc(*this, "hc") +{ +} + +//------------------------------------------------- +// write - handle an external write +//------------------------------------------------- +void williams_s9_sound_device::write(u8 data) +{ + m_pia->porta_w(data); +} + +//------------------------------------------------- +// strobe - tell PIA to process the input +//------------------------------------------------- +WRITE_LINE_MEMBER(williams_s9_sound_device::strobe) +{ + m_pia->ca1_w(state); +} + +//------------------------------------------------- +// audio CPU map +//------------------------------------------------- +void williams_s9_sound_device::williams_s9_map(address_map &map) +{ + map(0x0000, 0x07ff).ram(); + map(0x2000, 0x2003).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x8000, 0xffff).rom().region("audiocpu", 0 ); +} + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- +void williams_s9_sound_device::device_add_mconfig(machine_config &config) +{ + M6802(config, m_cpu, XTAL(4'000'000)); + m_cpu->set_addrmap(AS_PROGRAM, &williams_s9_sound_device::williams_s9_map); + + MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.5); + + HC55516(config, m_hc, 0).add_route(ALL_OUTPUTS, *this, 1.00); + + PIA6821(config, m_pia, 0); + m_pia->set_port_a_input_overrides_output_mask(0xff); + m_pia->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w)); + m_pia->ca2_handler().set(m_hc, FUNC(hc55516_device::clock_w)); + m_pia->cb2_handler().set(m_hc, FUNC(hc55516_device::digit_w)); + m_pia->irqa_handler().set_inputline(m_cpu, M6802_IRQ_LINE); + m_pia->irqb_handler().set_inputline(m_cpu, M6802_IRQ_LINE); +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- +void williams_s9_sound_device::device_start() +{ + // register for save states + save_item(NAME(m_dummy)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- +void williams_s9_sound_device::device_reset() +{ + // reset interrupt states + m_cpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE); +} + +INPUT_PORTS_START( williams_s9 ) + PORT_START("S9") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s9_sound_device, audio_nmi, 1) +INPUT_PORTS_END + +INPUT_CHANGED_MEMBER( williams_s9_sound_device::audio_nmi ) +{ + // Diagnostic button sends a pulse to NMI pin + if (newval==CLEAR_LINE) + m_cpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); +} + +//------------------------------------------------- +// device_input_ports - return a pointer to +// the device's I/O ports +//------------------------------------------------- +ioport_constructor williams_s9_sound_device::device_input_ports() const +{ + return INPUT_PORTS_NAME( williams_s9 ); +} + + + +//************************************************************************** +// S11 SOUND BOARD (s9 with banked roms, used in system 11/a/b/c pinballs) +//************************************************************************** + +//------------------------------------------------- +// williams_s11_sound_device - constructor +//------------------------------------------------- +williams_s11_sound_device::williams_s11_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, WILLIAMS_S11_SOUND, tag, owner, clock) + , device_mixer_interface(mconfig, *this) + , m_cpu(*this, "cpu") + , m_pia(*this, "pia") + , m_hc(*this, "hc") +{ +} + +//------------------------------------------------- +// write - handle an external write +//------------------------------------------------- +void williams_s11_sound_device::write(u8 data) +{ + m_pia->porta_w(data); +} + +//------------------------------------------------- +// strobe - tell PIA to process the input +//------------------------------------------------- +WRITE_LINE_MEMBER(williams_s11_sound_device::strobe) +{ + m_pia->ca1_w(state); +} + +//------------------------------------------------- +// bank_w - bankswitch +//------------------------------------------------- +void williams_s11_sound_device::bank_w(u8 data) +{ + membank("bank0")->set_entry(BIT(data, 1)); + membank("bank1")->set_entry(BIT(data, 0)); +} + +//------------------------------------------------- +// audio CPU map +//------------------------------------------------- +void williams_s11_sound_device::williams_s11_map(address_map &map) +{ + map(0x0000, 0x07ff).mirror(0x0800).ram(); + map(0x1000, 0x1fff).w(FUNC(williams_s11_sound_device::bank_w)); + map(0x2000, 0x2003).mirror(0x0ffc).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x8000, 0xbfff).bankr("bank0"); + map(0xc000, 0xffff).bankr("bank1"); +} + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- +void williams_s11_sound_device::device_add_mconfig(machine_config &config) +{ + M6802(config, m_cpu, XTAL(4'000'000)); + m_cpu->set_addrmap(AS_PROGRAM, &williams_s11_sound_device::williams_s11_map); + + MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.5); + + HC55516(config, m_hc, 0).add_route(ALL_OUTPUTS, *this, 1.00); + + PIA6821(config, m_pia, 0); + m_pia->set_port_a_input_overrides_output_mask(0xff); + m_pia->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w)); + m_pia->ca2_handler().set(m_hc, FUNC(hc55516_device::clock_w)); + m_pia->cb2_handler().set(m_hc, FUNC(hc55516_device::digit_w)); + m_pia->irqa_handler().set_inputline(m_cpu, M6802_IRQ_LINE); + m_pia->irqb_handler().set_inputline(m_cpu, M6802_IRQ_LINE); +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- +void williams_s11_sound_device::device_start() +{ + u8 *ROM = memregion("audiocpu")->base(); + membank("bank0")->configure_entries(0, 2, &ROM[0x0000], 0x4000); + membank("bank1")->configure_entries(0, 2, &ROM[0x8000], 0x4000); + + // register for save states + save_item(NAME(m_dummy)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- +void williams_s11_sound_device::device_reset() +{ + membank("bank0")->set_entry(0); + membank("bank1")->set_entry(0); + + // reset interrupt states + m_cpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE); +} + +INPUT_PORTS_START( williams_s11 ) + PORT_START("S11") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s11_sound_device, audio_nmi, 1) +INPUT_PORTS_END + +INPUT_CHANGED_MEMBER( williams_s11_sound_device::audio_nmi ) +{ + // Diagnostic button sends a pulse to NMI pin + if (newval==CLEAR_LINE) + m_cpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); +} + +//------------------------------------------------- +// device_input_ports - return a pointer to +// the device's I/O ports +//------------------------------------------------- +ioport_constructor williams_s11_sound_device::device_input_ports() const +{ + return INPUT_PORTS_NAME( williams_s11 ); +} + + diff --git a/src/mame/shared/williamssound.h b/src/mame/shared/williamssound.h new file mode 100644 index 00000000000..8f499b803d8 --- /dev/null +++ b/src/mame/shared/williamssound.h @@ -0,0 +1,317 @@ +// license:BSD-3-Clause +// copyright-holders:Aaron Giles +/*************************************************************************** + + williams.h + + Functions to emulate general the various Williams/Midway sound cards. + +****************************************************************************/ + +#include "machine/6821pia.h" +#include "cpu/m6800/m6800.h" +#include "cpu/m6809/m6809.h" +#include "sound/hc55516.h" +#include "sound/okim6295.h" +#include "sound/ymopm.h" + + + +//************************************************************************** +// GLOBAL VARIABLES +//************************************************************************** + +DECLARE_DEVICE_TYPE(WILLIAMS_CVSD_SOUND, williams_cvsd_sound_device) +DECLARE_DEVICE_TYPE(WILLIAMS_NARC_SOUND, williams_narc_sound_device) +DECLARE_DEVICE_TYPE(WILLIAMS_ADPCM_SOUND, williams_adpcm_sound_device) +DECLARE_DEVICE_TYPE(WILLIAMS_S4_SOUND, williams_s4_sound_device) +DECLARE_DEVICE_TYPE(WILLIAMS_S6_SOUND, williams_s6_sound_device) +DECLARE_DEVICE_TYPE(WILLIAMS_S9_SOUND, williams_s9_sound_device) +DECLARE_DEVICE_TYPE(WILLIAMS_S11_SOUND, williams_s11_sound_device) + + + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +// ======================> williams_cvsd_sound_device + +class williams_cvsd_sound_device : public device_t, + public device_mixer_interface +{ +public: + // construction/destruction + williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + + // read/write + void write(u16 data); + DECLARE_WRITE_LINE_MEMBER(reset_write); + + // internal communications + void bank_select_w(u8 data); + void cvsd_digit_clock_clear_w(u8 data); + void cvsd_clock_set_w(u8 data); + + void williams_cvsd_map(address_map &map); + + mc6809e_device *get_cpu() { return m_cpu; } + +protected: + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + virtual void device_reset() override; + + TIMER_CALLBACK_MEMBER(sync_write); + +private: + // devices + required_device m_cpu; + required_device m_pia; + required_device m_ym2151; + required_device m_hc55516; + + required_memory_bank m_rombank; + + // internal state + emu_timer *m_sync_write_timer; + u8 m_talkback; + + void talkback_w(u8 data); +}; + + +// ======================> williams_narc_sound_device + +class williams_narc_sound_device : public device_t, + public device_mixer_interface +{ +public: + // construction/destruction + williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + + // read/write + u16 read(); + void write(u16 data); + DECLARE_WRITE_LINE_MEMBER(reset_write); + + // internal communications + void master_bank_select_w(u8 data); + void slave_bank_select_w(u8 data); + u8 command_r(); + void command2_w(u8 data); + u8 command2_r(); + void master_talkback_w(u8 data); + void master_sync_w(u8 data); + void slave_talkback_w(u8 data); + void slave_sync_w(u8 data); + void cvsd_digit_clock_clear_w(u8 data); + void cvsd_clock_set_w(u8 data); + + void williams_narc_master_map(address_map &map); + void williams_narc_slave_map(address_map &map); + + mc6809e_device *get_cpu() { return m_cpu[0]; } + +protected: + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + virtual void device_reset() override; + + TIMER_CALLBACK_MEMBER(sync_master_command); + TIMER_CALLBACK_MEMBER(sync_slave_command); + TIMER_CALLBACK_MEMBER(sync_clear); + +private: + // devices + required_device_array m_cpu; + required_device m_hc55516; + + required_memory_bank m_masterbank; + required_memory_bank m_slavebank; + + // internal state + emu_timer *m_sync_master_timer; + emu_timer *m_sync_slave_timer; + emu_timer *m_sync_clear_timer; + u8 m_latch; + u8 m_latch2; + u8 m_talkback; + u8 m_audio_sync; + u8 m_sound_int_state; +}; + + +// ======================> williams_adpcm_sound_device + +class williams_adpcm_sound_device : public device_t, + public device_mixer_interface +{ +public: + // construction/destruction + williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + + // read/write + void write(u16 data); + DECLARE_WRITE_LINE_MEMBER(reset_write); + DECLARE_READ_LINE_MEMBER(irq_read); + + // internal communications + void bank_select_w(u8 data); + void oki6295_bank_select_w(u8 data); + u8 command_r(); + void talkback_w(u8 data); + + void williams_adpcm_map(address_map &map); + void williams_adpcm_oki_map(address_map &map); + + mc6809e_device *get_cpu() { return m_cpu; } + +protected: + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + virtual void device_reset() override; + + TIMER_CALLBACK_MEMBER(sync_command); + TIMER_CALLBACK_MEMBER(irq_clear); + +private: + // devices + required_device m_cpu; + + required_memory_bank m_rombank; + required_memory_bank m_okibank; + + // internal state + emu_timer *m_sync_command_timer; + emu_timer *m_irq_clear_timer; + u8 m_latch; + u8 m_talkback; + u8 m_sound_int_state; +}; + + +// ======================> williams_s4_sound_device + +class williams_s4_sound_device : public device_t, public device_mixer_interface +{ +public: + // construction/destruction + williams_s4_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + + // read/write + void write(u8 data); + DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); + +protected: + + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + +private: + // devices + void williams_s4_map(address_map &map); + required_device m_cpu; + required_device m_pia; + u8 m_dummy = 0; // needed for save-state support +}; + + +// ======================> williams_s6_sound_device + +class williams_s6_sound_device : public device_t, public device_mixer_interface +{ +public: + // construction/destruction + williams_s6_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + + // read/write + void write(u8 data); + DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); + +protected: + + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + +private: + void pb_w(u8 data); + // devices + void williams_s6_map(address_map &map); + required_device m_cpu; + required_device m_pia; + required_device m_hc; + u8 m_dummy = 0; // needed for save-state support +}; + + +// ======================> williams_s9_sound_device + +class williams_s9_sound_device : public device_t, public device_mixer_interface +{ +public: + // construction/destruction + williams_s9_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + + // read/write + void write(u8 data); + DECLARE_WRITE_LINE_MEMBER(strobe); + DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); + +protected: + + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + +private: + // devices + void williams_s9_map(address_map &map); + required_device m_cpu; + required_device m_pia; + required_device m_hc; + u8 m_dummy = 0; // needed for save-state support +}; + + +// ======================> williams_s11_sound_device + +class williams_s11_sound_device : public device_t, public device_mixer_interface +{ +public: + // construction/destruction + williams_s11_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + + // read/write + void write(u8 data); + DECLARE_WRITE_LINE_MEMBER(strobe); + DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); + +protected: + + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + +private: + void bank_w(u8); + // devices + void williams_s11_map(address_map &map); + required_device m_cpu; + required_device m_pia; + required_device m_hc; + u8 m_dummy = 0; // needed for save-state support +}; diff --git a/src/mame/shared/xbox.cpp b/src/mame/shared/xbox.cpp new file mode 100644 index 00000000000..04a430121f3 --- /dev/null +++ b/src/mame/shared/xbox.cpp @@ -0,0 +1,993 @@ +// license:BSD-3-Clause +// copyright-holders:Samuele Zannoli + +#include "emu.h" + +#include "xbox.h" +#include "xbox_pci.h" + +#include "machine/pci.h" +#include "machine/idectrl.h" + +#include "cpu/i386/i386.h" +#include "debug/debugcon.h" +#include "debug/debugcmd.h" + +#include "debugger.h" +#include "romload.h" +#include "screen.h" + +#include + +const xbox_base_state::debugger_constants xbox_base_state::debugp[] = { + { 0x66232714, {0x8003aae0, 0x5c, 0x1c, 0x28, 0x210, 8, 0x28, 0x1c} }, + { 0x49d8055a, {0x8003aae0, 0x5c, 0x1c, 0x28, 0x210, 8, 0x28, 0x1c} } +}; + +const struct { + const char *name; + const int value; +} vertex_format_names[] = { + {"NONE", 0x02}, {"NORMSHORT1", 0x11}, {"FLOAT1", 0x12}, {"PBYTE1", 0x14}, + {"SHORT1", 0x15}, {"NORMPACKED3", 0x16}, {"NORMSHORT2", 0x21}, + {"FLOAT2", 0x22}, {"PBYTE2", 0x24}, {"SHORT2", 0x25}, {"NORMSHORT3", 0x31}, + {"FLOAT3", 0x32}, {"PBYTE3", 0x34}, {"SHORT3", 0x35}, {"D3DCOLOR", 0x40}, + {"FLOAT4", 0x42}, {"NORMSHORT4", 0x41}, {"PBYTE4", 0x44}, {"SHORT4", 0x45}, + {"FLOAT2H", 0x72}, { nullptr, 0} +}; + +int xbox_base_state::find_bios_index() +{ + u8 sb = system_bios(); + return sb; +} + +bool xbox_base_state::find_bios_hash(int bios, uint32_t &crc32) +{ + uint32_t crc = 0; + const std::vector &rev = rom_region_vector(); + + for (rom_entry const &re : rev) + { + if (ROMENTRY_ISFILE(re)) + { + if (ROM_GETBIOSFLAGS(re) == (uint32_t)(bios + 1)) + { + const std::string &h = re.hashdata(); + util::hash_collection hc(h.c_str()); + if (hc.crc(crc) == true) + { + crc32 = crc; + return true; + } + } + } + } + return false; +} + +void xbox_base_state::find_debug_params() +{ + uint32_t crc; + int sb; + + sb = (int)find_bios_index(); + debugc_bios = debugp; + if (find_bios_hash(sb - 1, crc) == true) + { + for (int n = 0; n < 2; n++) + if (debugp[n].id == crc) + { + debugc_bios = &debugp[n]; + break; + } + } +} + +void xbox_base_state::dump_string_command(const std::vector ¶ms) +{ + debugger_console &con = machine().debugger().console(); + address_space &space = m_maincpu->space(); + uint64_t addr; + offs_t address; + + if (params.size() < 2) + return; + + if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) + return; + + address = (offs_t)addr; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + { + con.printf("Address is unmapped.\n"); + return; + } + + uint32_t length = space.read_word_unaligned(address); + uint32_t maximumlength = space.read_word_unaligned(address + 2); + offs_t buffer = space.read_dword_unaligned(address + 4); + con.printf("Length %d word\n", length); + con.printf("MaximumLength %d word\n", maximumlength); + con.printf("Buffer %08X byte* ", buffer); + + // limit the number of characters to avoid flooding + if (length > 256) + length = 256; + + if (m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, buffer)) + { + for (int a = 0; a < length; a++) + { + uint8_t c = space.read_byte(buffer + a); + con.printf("%c", c); + } + } + con.printf("\n"); +} + +void xbox_base_state::dump_process_command(const std::vector ¶ms) +{ + debugger_console &con = machine().debugger().console(); + address_space &space = m_maincpu->space(); + uint64_t addr; + offs_t address; + + if (params.size() < 2) + return; + + if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) + return; + + address = (offs_t)addr; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + { + con.printf("Address is unmapped.\n"); + return; + } + + con.printf("ReadyListHead {%08X,%08X} _LIST_ENTRY\n", space.read_dword(address), space.read_dword_unaligned(address + 4)); + con.printf("ThreadListHead {%08X,%08X} _LIST_ENTRY\n", space.read_dword(address + 8), space.read_dword_unaligned(address + 12)); + con.printf("StackCount %d dword\n", space.read_dword_unaligned(address + 16)); + con.printf("ThreadQuantum %d dword\n", space.read_dword_unaligned(address + 20)); + con.printf("BasePriority %d byte\n", space.read_byte(address + 24)); + con.printf("DisableBoost %d byte\n", space.read_byte(address + 25)); + con.printf("DisableQuantum %d byte\n", space.read_byte(address + 26)); + con.printf("_padding %d byte\n", space.read_byte(address + 27)); +} + +void xbox_base_state::dump_list_command(const std::vector ¶ms) +{ + debugger_console &con = machine().debugger().console(); + address_space &space = m_maincpu->space(); + uint64_t addr; + offs_t address; + + if (params.size() < 2) + return; + + if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) + return; + + uint64_t offs = 0; + offs_t offset = 0; + if (params.size() >= 3) + { + if (!machine().debugger().commands().validate_number_parameter(params[2], offs)) + return; + offset = (offs_t)offs; + } + + uint64_t start = addr; + address = (offs_t)addr; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + { + con.printf("Address is unmapped.\n"); + return; + } + if (params.size() >= 3) + con.printf("Entry Object\n"); + else + con.printf("Entry\n"); + + uint64_t old; + for (int num = 0; num < 32; num++) + { + if (params.size() >= 3) + con.printf("%08X %08X\n", (uint32_t)addr, (offs_t)addr - offset); + else + con.printf("%08X\n", (uint32_t)addr); + old = addr; + addr = space.read_dword_unaligned(address); + if (addr == start) + break; + if (addr == old) + break; + address = (offs_t)addr; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + break; + } +} + +void xbox_base_state::dump_dpc_command(const std::vector ¶ms) +{ + debugger_console &con = machine().debugger().console(); + address_space &space = m_maincpu->space(); + uint64_t addr; + offs_t address; + + if (params.size() < 2) + return; + + if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) + return; + + address = (offs_t)addr; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + { + con.printf("Address is unmapped.\n"); + return; + } + con.printf("Type %d word\n", space.read_word_unaligned(address)); + con.printf("Inserted %d byte\n", space.read_byte(address + 2)); + con.printf("Padding %d byte\n", space.read_byte(address + 3)); + con.printf("DpcListEntry {%08X,%08X} _LIST_ENTRY\n", space.read_dword_unaligned(address + 4), space.read_dword_unaligned(address + 8, true)); + con.printf("DeferredRoutine %08X dword\n", space.read_dword_unaligned(address + 12)); + con.printf("DeferredContext %08X dword\n", space.read_dword_unaligned(address + 16)); + con.printf("SystemArgument1 %08X dword\n", space.read_dword_unaligned(address + 20)); + con.printf("SystemArgument2 %08X dword\n", space.read_dword_unaligned(address + 24)); +} + +void xbox_base_state::dump_timer_command(const std::vector ¶ms) +{ + debugger_console &con = machine().debugger().console(); + address_space &space = m_maincpu->space(); + uint64_t addr; + offs_t address; + + if (params.size() < 2) + return; + + if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) + return; + + address = (offs_t)addr; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + { + con.printf("Address is unmapped.\n"); + return; + } + con.printf("Header.Type %d byte\n", space.read_byte(address)); + con.printf("Header.Absolute %d byte\n", space.read_byte(address + 1)); + con.printf("Header.Size %d byte\n", space.read_byte(address + 2)); + con.printf("Header.Inserted %d byte\n", space.read_byte(address + 3)); + con.printf("Header.SignalState %08X dword\n", space.read_dword_unaligned(address + 4)); + con.printf("Header.WaitListEntry {%08X,%08X} _LIST_ENTRY\n", space.read_dword_unaligned(address + 8), space.read_dword_unaligned(address + 12)); + con.printf("%s", string_format("DueTime %x qword\n", (int64_t)space.read_qword_unaligned(address + 16)).c_str()); + con.printf("TimerListEntry {%08X,%08X} _LIST_ENTRY\n", space.read_dword_unaligned(address + 24), space.read_dword_unaligned(address + 28)); + con.printf("Dpc %08X dword\n", space.read_dword_unaligned(address + 32)); + con.printf("Period %d dword\n", space.read_dword_unaligned(address + 36)); +} + +void xbox_base_state::curthread_command(const std::vector ¶ms) +{ + debugger_console &con = machine().debugger().console(); + address_space &space = m_maincpu->space(); + offs_t address; + + uint64_t fsbase = m_maincpu->state_int(44); // base of FS register + address = (offs_t)fsbase + (offs_t)debugc_bios->parameter[7-1]; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + { + con.printf("Address is unmapped.\n"); + return; + } + + uint32_t kthrd = space.read_dword_unaligned(address); + con.printf("Current thread is %08X\n", kthrd); + address = (offs_t)(kthrd + debugc_bios->parameter[8-1]); + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + return; + uint32_t topstack = space.read_dword_unaligned(address); + con.printf("Current thread stack top is %08X\n", topstack); + address = (offs_t)(kthrd + debugc_bios->parameter[4-1]); + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + return; + uint32_t tlsdata = space.read_dword_unaligned(address); + if (tlsdata == 0) + address = (offs_t)(topstack - debugc_bios->parameter[5-1] - debugc_bios->parameter[6-1]); + else + address = (offs_t)(tlsdata - debugc_bios->parameter[6-1]); + if (m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + con.printf("Current thread function is %08X\n", space.read_dword_unaligned(address)); +} + +void xbox_base_state::threadlist_command(const std::vector ¶ms) +{ + address_space &space = m_maincpu->space(); + debugger_console &con = machine().debugger().console(); + + con.printf("Pri. _KTHREAD Stack Function\n"); + con.printf("-------------------------------\n"); + for (int pri = 0; pri < 16; pri++) + { + uint32_t curr = debugc_bios->parameter[1 - 1] + pri * 8; + uint32_t addr = curr; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, addr)) + continue; + uint32_t next = space.read_dword_unaligned(addr); + + while ((next != curr) && (next != 0)) + { + uint32_t kthrd = next - debugc_bios->parameter[2 - 1]; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, kthrd)) + break; + uint32_t topstack = space.read_dword_unaligned(kthrd + debugc_bios->parameter[3 - 1]); + uint32_t tlsdata = space.read_dword_unaligned(kthrd + debugc_bios->parameter[4 - 1]); + uint32_t function = 0; + if (tlsdata == 0) + addr = topstack - debugc_bios->parameter[5 - 1] - debugc_bios->parameter[6 - 1]; + else + addr = tlsdata - debugc_bios->parameter[6 - 1]; + if (m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, addr)) + function = space.read_dword_unaligned(addr); + con.printf(" %02d %08x %08x %08x\n", pri, kthrd, topstack, function); + addr = next; + if (m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, addr)) + next = space.read_dword_unaligned(addr); + else + break; + } + } +} + +void xbox_base_state::generate_irq_command(const std::vector ¶ms) +{ + uint64_t irq; + + if (params.size() < 2) + return; + if (!machine().debugger().commands().validate_number_parameter(params[1], irq)) + return; + if (irq > 15) + return; + if (irq == 2) + return; + debug_generate_irq((int)irq, true); +} + +void xbox_base_state::nv2a_combiners_command(const std::vector ¶ms) +{ + debugger_console &con = machine().debugger().console(); + bool en = nvidia_nv2a->toggle_register_combiners_usage(); + if (en == true) + con.printf("Register combiners enabled\n"); + else + con.printf("Register combiners disabled\n"); +} + +void xbox_base_state::nv2a_wclipping_command(const std::vector ¶ms) +{ + debugger_console &con = machine().debugger().console(); + bool en = nvidia_nv2a->toggle_clipping_w_support(); + if (en == true) + con.printf("W clipping enabled\n"); + else + con.printf("W clipping disabled\n"); +} + +void xbox_base_state::waitvblank_command(const std::vector ¶ms) +{ + debugger_console &con = machine().debugger().console(); + bool en = nvidia_nv2a->toggle_wait_vblank_support(); + if (en == true) + con.printf("Vblank method enabled\n"); + else + con.printf("Vblank method disabled\n"); +} + +void xbox_base_state::grab_texture_command(const std::vector ¶ms) +{ + uint64_t type; + + if (params.size() < 3) + return; + if (!machine().debugger().commands().validate_number_parameter(params[1], type)) + return; + if (params[2].empty() || params[2].length() > 127) + return; + nvidia_nv2a->debug_grab_texture((int)type, params[2].c_str()); +} + +void xbox_base_state::grab_vprog_command(const std::vector ¶ms) +{ + uint32_t instruction[4]; + FILE *fil; + + if (params.size() < 2) + return; + if (params[1].empty() || params[1].length() > 127) + return; + if ((fil = fopen(params[1].c_str(), "wb")) == nullptr) + return; + for (int n = 0; n < 136; n++) + { + nvidia_nv2a->debug_grab_vertex_program_slot(n, instruction); + fwrite(instruction, sizeof(uint32_t), 4, fil); + } + fclose(fil); +} + +void xbox_base_state::vprogdis_command(const std::vector ¶ms) +{ + address_space &space = m_maincpu->space(); + + if (params.size() < 3) + return; + + uint64_t addr; + if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) + return; + + uint64_t length; + if (!machine().debugger().commands().validate_number_parameter(params[2], length)) + return; + + uint64_t type = 0; + if (params.size() > 3) + if (!machine().debugger().commands().validate_number_parameter(params[3], type)) + return; + + vertex_program_disassembler vd; + while (length > 0) + { + uint32_t instruction[4]; + if (type == 1) + { + offs_t address = (offs_t)addr; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + return; + instruction[0] = space.read_dword_unaligned(address); + instruction[1] = space.read_dword_unaligned(address + 4); + instruction[2] = space.read_dword_unaligned(address + 8); + instruction[3] = space.read_dword_unaligned(address + 12); + } + else + { + nvidia_nv2a->debug_grab_vertex_program_slot((int)addr, instruction); + } + + char line[64]; + while (vd.disassemble(instruction, line) != 0) + machine().debugger().console().printf("%s\n", line); + + if (type == 1) + addr = addr + 4 * 4; + else + addr++; + + length--; + } +} + +void xbox_base_state::vdeclaration_command(const std::vector ¶ms) +{ + address_space &space = m_maincpu->space(); + + if (params.size() < 1) + return; + + uint64_t addr; + if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) + return; + + debugger_console &con = machine().debugger().console(); + for (int n = 128; n > 0; n--) + { + offs_t address = (offs_t)addr; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + return; + uint32_t w = space.read_dword_unaligned(address); + + if (w == 0xffffffff) + { + con.printf("D3DVSD_END()\n"); + break; + } + switch ((w >> 29) & 7) + { + case 0: + con.printf("D3DVSD_NOP()\n"); + break; + case 1: + if (w & (1 << 28)) + con.printf("D3DVSD_STREAM_TESS()\n"); + else + con.printf("D3DVSD_STREAM(%d)\n", w & 0x1fffffff); + break; + case 2: + if (w & 0x18000000) + con.printf("D3DVSD_SKIPBYTES(%d)\n", (w >> 16) & 0xfff); + else if (w & 0x10000000) + con.printf("D3DVSD_SKIP(%d)\n", (w >> 16) & 0xfff); + else + { + const char *t = "???"; + + for (int s = 0; vertex_format_names[s].value != 0; s++) + { + if (vertex_format_names[s].value == ((w >> 16) & 0xfff)) + { + t = vertex_format_names[s].name; + break; + } + } + con.printf("D3DVSD_REG(%d, D3DVSDT_%s)\n", w & 0xffff, t); + } + break; + case 3: + if (w & 0x10000000) + con.printf("D3DVSD_TESSUV(%d)\n", w & 0xf); + else + con.printf("D3DVSD_TESSNORMAL(%d, %d)\n", (w >> 20) & 0xf, w & 0xf); + break; + case 4: + con.printf("D3DVSD_CONST(%d, %d)\n", (w & 0xff) - 96, (w >> 25) & 0xf); + for (int n = 0; n < ((w >> 23) & 0x3c); n++) + { + addr += 4; + address = (offs_t)addr; + if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) + return; + w = space.read_dword_unaligned(address); + con.printf("%08x\n", w); + } + break; + default: + con.printf("??? %08x\n", w); + n = 0; + } + addr += 4; + } +} + +void xbox_base_state::help_command(const std::vector ¶ms) +{ + debugger_console &con = machine().debugger().console(); + + con.printf("Available Xbox commands:\n"); + con.printf(" xbox dump_string,
-- Dump _STRING object at
\n"); + con.printf(" xbox dump_process,
-- Dump _PROCESS object at
\n"); + con.printf(" xbox dump_list,
[,] -- Dump _LIST_ENTRY chain starting at
\n"); + con.printf(" xbox dump_dpc,
-- Dump _KDPC object at
\n"); + con.printf(" xbox dump_timer,
-- Dump _KTIMER object at
\n"); + con.printf(" xbox curthread -- Print information about current thread\n"); + con.printf(" xbox threadlist -- list of currently active threads\n"); + con.printf(" xbox irq, -- Generate interrupt with irq number 0-15\n"); + con.printf(" xbox nv2a_combiners -- Toggle use of register combiners\n"); + con.printf(" xbox nv2a_wclipping -- Toggle use of negative w vertex clipping\n"); + con.printf(" xbox waitvblank -- Toggle support for wait vblank method\n"); + con.printf(" xbox grab_texture,, -- Save to the next used texture of type \n"); + con.printf(" xbox grab_vprog, -- save current vertex program instruction slots to \n"); + con.printf(" xbox vprogdis,
,[,] -- disassemble vertex program instructions at
of \n"); + con.printf(" xbox vdeclaration,
-- decode vertex program declaration at
\n"); + con.printf(" xbox help -- this list\n"); +} + +void xbox_base_state::xbox_debug_commands(const std::vector ¶ms) +{ + if (params.size() < 1) + return; + if (params[0] == "dump_string") + dump_string_command(params); + else if (params[0] == "dump_process") + dump_process_command(params); + else if (params[0] == "dump_list") + dump_list_command(params); + else if (params[0] == "dump_dpc") + dump_dpc_command(params); + else if (params[0] == "dump_timer") + dump_timer_command(params); + else if (params[0] == "curthread") + curthread_command(params); + else if (params[0] == "threadlist") + threadlist_command(params); + else if (params[0] == "irq") + generate_irq_command(params); + else if (params[0] == "nv2a_combiners") + nv2a_combiners_command(params); + else if (params[0] == "nv2a_wclipping") + nv2a_wclipping_command(params); + else if (params[0] == "waitvblank") + waitvblank_command(params); + else if (params[0] == "grab_texture") + grab_texture_command(params); + else if (params[0] == "grab_vprog") + grab_vprog_command(params); + else if (params[0] == "vprogdis") + vprogdis_command(params); + else if (params[0] == "vdeclaration") + vdeclaration_command(params); + else + help_command(params); +} + +void xbox_base_state::debug_generate_irq(int irq, bool active) +{ + int state; + + if (active) + { + debug_irq_active = true; + debug_irq_number = irq; + state = 1; + } + else + { + debug_irq_active = false; + state = 0; + } + mcpxlpc->debug_generate_irq(irq, state); +} + +WRITE_LINE_MEMBER(xbox_base_state::vblank_callback) +{ + nvidia_nv2a->vblank_callback(state); +} + +uint32_t xbox_base_state::screen_update_callback(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +{ + return nvidia_nv2a->screen_update_callback(screen, bitmap, cliprect); +} + +/* + * PIC & PIT + */ + +WRITE_LINE_MEMBER(xbox_base_state::maincpu_interrupt) +{ + m_maincpu->set_input_line(0, state ? HOLD_LINE : CLEAR_LINE); +} + +IRQ_CALLBACK_MEMBER(xbox_base_state::irq_callback) +{ + int r; + r = mcpxlpc->acknowledge(); + if (debug_irq_active) + debug_generate_irq(debug_irq_number, false); + return r; +} + +/* + * SMbus devices + */ + +/* + * PIC16LC + */ + +DEFINE_DEVICE_TYPE(XBOX_PIC16LC, xbox_pic16lc_device, "pic16lc", "XBOX PIC16LC") + +xbox_pic16lc_device::xbox_pic16lc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, XBOX_PIC16LC, tag, owner, clock) +{ +} + +int xbox_pic16lc_device::execute_command(int command, int rw, int data) +{ + if (rw == 1) { // read + if (command == 0) + { + if (buffer[0] == 'D') + buffer[0] = 'X'; + else if (buffer[0] == 'X') + buffer[0] = 'B'; + else if (buffer[0] == 'B') + buffer[0] = 'D'; + } + logerror("pic16lc: %d %d %d\n", command, rw, buffer[command]); + return buffer[command]; + } + else + if (command == 0) + buffer[0] = 'B'; + else + buffer[command] = (uint8_t)data; + logerror("pic16lc: %d %d %d\n", command, rw, data); + return 0; +} + +void xbox_pic16lc_device::device_start() +{ + memset(buffer, 0, sizeof(buffer)); + buffer[0] = 'B'; + buffer[4] = 0; // A/V connector, 0=scart 2=vga 4=svideo 7=none + // PIC challenge handshake data + buffer[0x1c] = 0x0c; + buffer[0x1d] = 0x0d; + buffer[0x1e] = 0x0e; + buffer[0x1f] = 0x0f; +} + +void xbox_pic16lc_device::device_reset() +{ +} + +/* + * CX25871 + */ + +DEFINE_DEVICE_TYPE(XBOX_CX25871, xbox_cx25871_device, "cx25871", "XBOX CX25871") + +xbox_cx25871_device::xbox_cx25871_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, XBOX_CX25871, tag, owner, clock) +{ +} + +int xbox_cx25871_device::execute_command(int command, int rw, int data) +{ + logerror("cx25871: %d %d %d\n", command, rw, data); + return 0; +} + +void xbox_cx25871_device::device_start() +{ +} + +void xbox_cx25871_device::device_reset() +{ +} + +/* + * EEPROM + */ + +// let's try to fake the missing eeprom, make sure its ntsc, otherwise chihiro will show an error +static int dummyeeprom[256] = { + 0x39, 0xe3, 0xcc, 0x81, 0xb0, 0xa9, 0x97, 0x09, 0x57, 0xac, 0x57, 0x12, 0xf7, 0xc2, 0xc0, 0x21, 0xce, 0x0d, 0x0a, 0xdb, 0x20, 0x7a, 0xf3, 0xff, + 0xdf, 0x67, 0xed, 0xf4, 0xf8, 0x95, 0x5c, 0xd0, 0x9b, 0xef, 0x7b, 0x81, 0xda, 0xd5, 0x98, 0xc1, 0xb1, 0xb3, 0x74, 0x18, 0x86, 0x05, 0xe2, 0x7c, + 0xd1, 0xad, 0xc9, 0x90, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x41, 0x42, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x00, 0x00, + 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xab, 0xcd, 0xef, 0xba, 0xdc, 0xfe, 0xa1, 0xb2, 0xc3, 0xd3, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +DEFINE_DEVICE_TYPE(XBOX_EEPROM, xbox_eeprom_device, "eeprom", "XBOX EEPROM") + +xbox_eeprom_device::xbox_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, XBOX_EEPROM, tag, owner, clock) +{ +} + +int xbox_eeprom_device::execute_command(int command, int rw, int data) +{ + if (command >= 112) + return 0; + if (rw == 1) // if reading + { + // hack to avoid hanging if eeprom contents are not correct + // removing this would need dumping the serial eeprom on the chihiro xbox board + if (command == 0) + { + hack_eeprom(); + } + data = dummyeeprom[command] + dummyeeprom[command + 1] * 256; + logerror("eeprom: %d %d %d\n", command, rw, data); + return data; + } + logerror("eeprom: %d %d %d\n", command, rw, data); + dummyeeprom[command] = data; + return 0; +} + +void xbox_eeprom_device::device_start() +{ +} + +void xbox_eeprom_device::device_reset() +{ +} + +/* + * Super-io connected to lpc bus + */ + +DEFINE_DEVICE_TYPE(XBOX_SUPERIO, xbox_superio_device, "superio_device", "XBOX debug SuperIO") + +xbox_superio_device::xbox_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, XBOX_SUPERIO, tag, owner, clock) + , configuration_mode(false) + , index(0) + , selected(0) +{ + +} + +void xbox_superio_device::internal_io_map(address_map &map) +{ + map(0x002e, 0x002f).rw(FUNC(xbox_superio_device::read), FUNC(xbox_superio_device::write)); + map(0x03f8, 0x03ff).rw(FUNC(xbox_superio_device::read_rs232), FUNC(xbox_superio_device::write_rs232)); +} + +void xbox_superio_device::map_extra(address_space *memory_space, address_space *io_space) +{ + memspace = memory_space; + iospace = io_space; + io_space->install_device(0, 0xffff, *this, &xbox_superio_device::internal_io_map); +} + +void xbox_superio_device::set_host(int index, lpcbus_host_interface *host) +{ + lpchost = host; + lpcindex = index; +} + +void xbox_superio_device::device_start() +{ + memset(registers, 0, sizeof(registers)); + registers[0][0x26] = 0x2e; // Configuration port address byte 0 +} + +uint8_t xbox_superio_device::read(offs_t offset) +{ + if (configuration_mode == false) + return 0; + if (offset == 0) // index port 0x2e + return index; + if (offset == 1) + { + // data port 0x2f + if (index < 0x30) + return registers[0][index]; + return registers[selected][index]; + } + return 0; +} + +void xbox_superio_device::write(offs_t offset, uint8_t data) +{ + if (configuration_mode == false) + { + // config port 0x2e + if ((offset == 0) && (data == 0x55)) + configuration_mode = true; + return; + } + if ((offset == 0) && (data == 0xaa)) + { + // config port 0x2e + configuration_mode = false; + return; + } + if (offset == 0) + { + // index port 0x2e + index = data; + } + if (offset == 1) + { + // data port 0x2f + if (index < 0x30) + { + registers[0][index] = data; + selected = registers[0][7]; + } + else + { + registers[selected][index] = data; + //if ((superiost.selected == 4) && (superiost.index == 0x30) && (data != 0)) + // ; // add handlers 0x3f8- +7 + } + } +} + +uint8_t xbox_superio_device::read_rs232(offs_t offset) +{ + if (offset == 5) + return 0x20; + return 0; +} + +void xbox_superio_device::write_rs232(offs_t offset, uint8_t data) +{ + if (offset == 0) + { + printf("%c", data); + } +} + +void xbox_base_state::machine_start() +{ + find_debug_params(); + nvidia_nv2a = subdevice("pci:1e.0:00.0")->debug_get_renderer(); + if (machine().debug_flags & DEBUG_FLAG_ENABLED) + { + using namespace std::placeholders; + machine().debugger().console().register_command("xbox", CMDFLAG_CUSTOM_HELP, 1, 4, std::bind(&xbox_base_state::xbox_debug_commands, this, _1)); + } + subdevice("pci:01.1:154")->hack_eeprom = + [&](void) + { + hack_eeprom(); + }; + subdevice("pci:02.0")->set_hack_callback( + [&](void) + { + hack_usb(); + } + ); + // savestates + save_item(NAME(debug_irq_active)); + save_item(NAME(debug_irq_number)); +} + +#if 0 +void xbox_base_state::xbox_base_map(address_map &map) +{ + map(0x00000000, 0x07ffffff).ram(); // 128 megabytes + map(0xf0000000, 0xf7ffffff).ram().share("nv2a_share"); // 3d accelerator wants this + map(0xfd000000, 0xfdffffff).ram().rw(FUNC(xbox_base_state::geforce_r), FUNC(xbox_base_state::geforce_w)); + map(0xfed00000, 0xfed003ff).rw(FUNC(xbox_base_state::ohci_usb_r), FUNC(xbox_base_state::ohci_usb_w)); + map(0xfed08000, 0xfed083ff).rw(FUNC(xbox_base_state::ohci_usb2_r), FUNC(xbox_base_state::ohci_usb2_w)); + map(0xfe800000, 0xfe87ffff).rw(FUNC(xbox_base_state::audio_apu_r), FUNC(xbox_base_state::audio_apu_w)); + map(0xfec00000, 0xfec00fff).rw(FUNC(xbox_base_state::audio_ac93_r), FUNC(xbox_base_state::audio_ac93_w)); + map(0xfef00000, 0xfef003ff).rw(FUNC(xbox_base_state::network_r), FUNC(xbox_base_state::network_w)); +} + +void xbox_base_state::xbox_base_map_io(address_map &map) +{ + map(0x01f0, 0x01f7).rw("pci:09.0:ide1", FUNC(bus_master_ide_controller_device::cs0_r), FUNC(bus_master_ide_controller_device::cs0_w)); + map(0x002e, 0x002f).rw(FUNC(xbox_base_state::superio_read), FUNC(xbox_base_state::superio_write)); + map(0x03f8, 0x03ff).rw(FUNC(xbox_base_state::superiors232_read), FUNC(xbox_base_state::superiors232_write)); + map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); + map(0x8000, 0x80ff).rw(FUNC(xbox_base_state::dummy_r), FUNC(xbox_base_state::dummy_w)); // lpc bridge + map(0xc000, 0xc00f).rw(FUNC(xbox_base_state::smbus_r), FUNC(xbox_base_state::smbus_w)); + map(0xc200, 0xc21f).rw(FUNC(xbox_base_state::smbus2_r), FUNC(xbox_base_state::smbus2_w)); + map(0xd000, 0xd0ff).noprw(); // ac97 + map(0xd200, 0xd27f).noprw(); // ac97 + map(0xe000, 0xe007).rw(FUNC(xbox_base_state::networkio_r), FUNC(xbox_base_state::networkio_w)); + map(0xff60, 0xff6f).rw("ide", FUNC(bus_master_ide_controller_device::bmdma_r), FUNC(bus_master_ide_controller_device::bmdma_w)); +} +#endif + +void xbox_base_state::xbox_base(machine_config &config) +{ + /* basic machine hardware */ + PENTIUM3(config, m_maincpu, 733333333); /* Wrong! family 6 model 8 stepping 10 */ + m_maincpu->set_irq_acknowledge_callback(FUNC(xbox_base_state::irq_callback)); + + config.set_maximum_quantum(attotime::from_hz(6000)); + + PCI_ROOT(config, "pci", 0); + NV2A_HOST(config, "pci:00.0", 0, m_maincpu); + NV2A_RAM(config, "pci:00.3", 0, 128); // 128 megabytes + MCPX_ISALPC(config, "pci:01.0", 0, 0).interrupt_output().set(FUNC(xbox_base_state::maincpu_interrupt)); + XBOX_SUPERIO(config, "pci:01.0:0", 0); + MCPX_SMBUS(config, "pci:01.1", 0, 0).interrupt_handler().set("pci:01.0", FUNC(mcpx_isalpc_device::irq11)); //.set(FUNC(xbox_base_state::smbus_interrupt_changed)); + XBOX_PIC16LC(config, "pci:01.1:110", 0); // these 3 are on smbus number 1 + XBOX_CX25871(config, "pci:01.1:145", 0); + XBOX_EEPROM(config, "pci:01.1:154", 0); + MCPX_OHCI(config, "pci:02.0", 0, 0).interrupt_handler().set("pci:01.0", FUNC(mcpx_isalpc_device::irq1)); //.set(FUNC(xbox_base_state::ohci_usb_interrupt_changed)); + MCPX_OHCI(config, "pci:03.0", 0, 0); + MCPX_ETH(config, "pci:04.0", 0); + MCPX_APU(config, "pci:05.0", 0, 0, m_maincpu); + MCPX_AC97_AUDIO(config, "pci:06.0", 0, 0); + MCPX_AC97_MODEM(config, "pci:06.1", 0); + PCI_BRIDGE(config, "pci:08.0", 0, 0x10de01b8, 0); + MCPX_IDE(config, "pci:09.0", 0, 0).pri_interrupt_handler().set("pci:01.0", FUNC(mcpx_isalpc_device::irq14)); //.set(FUNC(xbox_base_state::ide_interrupt_changed)); + NV2A_AGP(config, "pci:1e.0", 0, 0x10de01b7, 0); + NV2A_GPU(config, "pci:1e.0:00.0", 0, m_maincpu).interrupt_handler().set("pci:01.0", FUNC(mcpx_isalpc_device::irq3)); //.set(FUNC(xbox_base_state::nv2a_interrupt_changed)); + + /* video hardware */ + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_refresh_hz(60); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ + screen.set_size(640, 480); + screen.set_visarea(0, 639, 0, 479); + screen.set_screen_update(FUNC(xbox_base_state::screen_update_callback)); + screen.screen_vblank().set(FUNC(xbox_base_state::vblank_callback)); +} diff --git a/src/mame/shared/xbox.h b/src/mame/shared/xbox.h new file mode 100644 index 00000000000..6bf33ee417b --- /dev/null +++ b/src/mame/shared/xbox.h @@ -0,0 +1,176 @@ +// license:BSD-3-Clause +// copyright-holders:Samuele Zannoli +#ifndef MAME_SHARED_XBOX_H +#define MAME_SHARED_XBOX_H + +#pragma once + +#include "xbox_nv2a.h" +#include "xbox_pci.h" +#include "xbox_usb.h" + +#include "machine/idectrl.h" +#include "machine/pic8259.h" + +/* + * PIC16LC connected to SMBus + */ + +class xbox_pic16lc_device : public device_t, public smbus_interface +{ +public: + xbox_pic16lc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + virtual int execute_command(int command, int rw, int data) override; + +protected: + virtual void device_start() override; + virtual void device_reset() override; + +private: + uint8_t buffer[0xff]; +}; + +DECLARE_DEVICE_TYPE(XBOX_PIC16LC, xbox_pic16lc_device) + +/* + * CX25871 connected to SMBus + */ + +class xbox_cx25871_device : public device_t, public smbus_interface +{ +public: + xbox_cx25871_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + virtual int execute_command(int command, int rw, int data) override; + +protected: + virtual void device_start() override; + virtual void device_reset() override; + +private: +}; + +DECLARE_DEVICE_TYPE(XBOX_CX25871, xbox_cx25871_device) + +/* + * EEPROM connected to SMBus + */ + +class xbox_eeprom_device : public device_t, public smbus_interface +{ +public: + xbox_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + virtual int execute_command(int command, int rw, int data) override; + + std::function hack_eeprom; + +protected: + virtual void device_start() override; + virtual void device_reset() override; + +private: +}; + +DECLARE_DEVICE_TYPE(XBOX_EEPROM, xbox_eeprom_device) + +/* + * Super-io connected to lpc bus used as a rs232 debug port + */ + +class xbox_superio_device : public device_t, public lpcbus_device_interface +{ +public: + xbox_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + virtual void map_extra(address_space *memory_space, address_space *io_space) override; + virtual void set_host(int index, lpcbus_host_interface *host) override; + + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + uint8_t read_rs232(offs_t offset); + void write_rs232(offs_t offset, uint8_t data); + +protected: + virtual void device_start() override; + +private: + void internal_io_map(address_map &map); + + lpcbus_host_interface *lpchost = nullptr; + int lpcindex = 0; + address_space *memspace = nullptr; + address_space *iospace = nullptr; + bool configuration_mode; + int index; + int selected; + uint8_t registers[16][256]{}; // 256 registers for up to 16 devices, registers 0-0x2f common to all +}; + +DECLARE_DEVICE_TYPE(XBOX_SUPERIO, xbox_superio_device) + +/* + * Base + */ + +class xbox_base_state : public driver_device +{ +public: + xbox_base_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + nvidia_nv2a(nullptr), + debug_irq_active(false), + debug_irq_number(0), + m_maincpu(*this, "maincpu"), + mcpxlpc(*this, ":pci:01.0"), + ide(*this, ":pci:09.0:ide1"), + debugc_bios(nullptr) { } + + void xbox_base(machine_config &config); + +protected: + void debug_generate_irq(int irq, bool active); + virtual void hack_eeprom() {} + virtual void hack_usb() {} + + DECLARE_WRITE_LINE_MEMBER(vblank_callback); + uint32_t screen_update_callback(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + + virtual void machine_start() override; + DECLARE_WRITE_LINE_MEMBER(maincpu_interrupt); + IRQ_CALLBACK_MEMBER(irq_callback); + + nv2a_renderer *nvidia_nv2a; + bool debug_irq_active; + int debug_irq_number; + required_device m_maincpu; + required_device mcpxlpc; + required_device ide; + static const struct debugger_constants + { + uint32_t id; + uint32_t parameter[8]; // c c c ? ? ? x x + } debugp[]; + const debugger_constants *debugc_bios; + +private: + void dump_string_command(const std::vector ¶ms); + void dump_process_command(const std::vector ¶ms); + void dump_list_command(const std::vector ¶ms); + void dump_dpc_command(const std::vector ¶ms); + void dump_timer_command(const std::vector ¶ms); + void curthread_command(const std::vector ¶ms); + void threadlist_command(const std::vector ¶ms); + void generate_irq_command(const std::vector ¶ms); + void nv2a_combiners_command(const std::vector ¶ms); + void nv2a_wclipping_command(const std::vector ¶ms); + void waitvblank_command(const std::vector ¶ms); + void grab_texture_command(const std::vector ¶ms); + void grab_vprog_command(const std::vector ¶ms); + void vprogdis_command(const std::vector ¶ms); + void vdeclaration_command(const std::vector ¶ms); + void help_command(const std::vector ¶ms); + void xbox_debug_commands(const std::vector ¶ms); + int find_bios_index(); + bool find_bios_hash(int bios, uint32_t &crc32); + void find_debug_params(); +}; + +#endif // MAME_SHARED_XBOX_H diff --git a/src/mame/shared/xbox_m.cpp b/src/mame/shared/xbox_m.cpp deleted file mode 100644 index a4e4b6e35a7..00000000000 --- a/src/mame/shared/xbox_m.cpp +++ /dev/null @@ -1,991 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Samuele Zannoli - -#include "emu.h" -#include "machine/pci.h" -#include "machine/idectrl.h" -#include "machine/xbox_pci.h" -#include "machine/xbox.h" - -#include "cpu/i386/i386.h" -#include "debug/debugcon.h" -#include "debug/debugcmd.h" - -#include "debugger.h" -#include "romload.h" -#include "screen.h" - -#include - -const xbox_base_state::debugger_constants xbox_base_state::debugp[] = { - { 0x66232714, {0x8003aae0, 0x5c, 0x1c, 0x28, 0x210, 8, 0x28, 0x1c} }, - { 0x49d8055a, {0x8003aae0, 0x5c, 0x1c, 0x28, 0x210, 8, 0x28, 0x1c} } -}; - -const struct { - const char *name; - const int value; -} vertex_format_names[] = { - {"NONE", 0x02}, {"NORMSHORT1", 0x11}, {"FLOAT1", 0x12}, {"PBYTE1", 0x14}, - {"SHORT1", 0x15}, {"NORMPACKED3", 0x16}, {"NORMSHORT2", 0x21}, - {"FLOAT2", 0x22}, {"PBYTE2", 0x24}, {"SHORT2", 0x25}, {"NORMSHORT3", 0x31}, - {"FLOAT3", 0x32}, {"PBYTE3", 0x34}, {"SHORT3", 0x35}, {"D3DCOLOR", 0x40}, - {"FLOAT4", 0x42}, {"NORMSHORT4", 0x41}, {"PBYTE4", 0x44}, {"SHORT4", 0x45}, - {"FLOAT2H", 0x72}, { nullptr, 0} -}; - -int xbox_base_state::find_bios_index() -{ - u8 sb = system_bios(); - return sb; -} - -bool xbox_base_state::find_bios_hash(int bios, uint32_t &crc32) -{ - uint32_t crc = 0; - const std::vector &rev = rom_region_vector(); - - for (rom_entry const &re : rev) - { - if (ROMENTRY_ISFILE(re)) - { - if (ROM_GETBIOSFLAGS(re) == (uint32_t)(bios + 1)) - { - const std::string &h = re.hashdata(); - util::hash_collection hc(h.c_str()); - if (hc.crc(crc) == true) - { - crc32 = crc; - return true; - } - } - } - } - return false; -} - -void xbox_base_state::find_debug_params() -{ - uint32_t crc; - int sb; - - sb = (int)find_bios_index(); - debugc_bios = debugp; - if (find_bios_hash(sb - 1, crc) == true) - { - for (int n = 0; n < 2; n++) - if (debugp[n].id == crc) - { - debugc_bios = &debugp[n]; - break; - } - } -} - -void xbox_base_state::dump_string_command(const std::vector ¶ms) -{ - debugger_console &con = machine().debugger().console(); - address_space &space = m_maincpu->space(); - uint64_t addr; - offs_t address; - - if (params.size() < 2) - return; - - if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) - return; - - address = (offs_t)addr; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - { - con.printf("Address is unmapped.\n"); - return; - } - - uint32_t length = space.read_word_unaligned(address); - uint32_t maximumlength = space.read_word_unaligned(address + 2); - offs_t buffer = space.read_dword_unaligned(address + 4); - con.printf("Length %d word\n", length); - con.printf("MaximumLength %d word\n", maximumlength); - con.printf("Buffer %08X byte* ", buffer); - - // limit the number of characters to avoid flooding - if (length > 256) - length = 256; - - if (m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, buffer)) - { - for (int a = 0; a < length; a++) - { - uint8_t c = space.read_byte(buffer + a); - con.printf("%c", c); - } - } - con.printf("\n"); -} - -void xbox_base_state::dump_process_command(const std::vector ¶ms) -{ - debugger_console &con = machine().debugger().console(); - address_space &space = m_maincpu->space(); - uint64_t addr; - offs_t address; - - if (params.size() < 2) - return; - - if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) - return; - - address = (offs_t)addr; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - { - con.printf("Address is unmapped.\n"); - return; - } - - con.printf("ReadyListHead {%08X,%08X} _LIST_ENTRY\n", space.read_dword(address), space.read_dword_unaligned(address + 4)); - con.printf("ThreadListHead {%08X,%08X} _LIST_ENTRY\n", space.read_dword(address + 8), space.read_dword_unaligned(address + 12)); - con.printf("StackCount %d dword\n", space.read_dword_unaligned(address + 16)); - con.printf("ThreadQuantum %d dword\n", space.read_dword_unaligned(address + 20)); - con.printf("BasePriority %d byte\n", space.read_byte(address + 24)); - con.printf("DisableBoost %d byte\n", space.read_byte(address + 25)); - con.printf("DisableQuantum %d byte\n", space.read_byte(address + 26)); - con.printf("_padding %d byte\n", space.read_byte(address + 27)); -} - -void xbox_base_state::dump_list_command(const std::vector ¶ms) -{ - debugger_console &con = machine().debugger().console(); - address_space &space = m_maincpu->space(); - uint64_t addr; - offs_t address; - - if (params.size() < 2) - return; - - if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) - return; - - uint64_t offs = 0; - offs_t offset = 0; - if (params.size() >= 3) - { - if (!machine().debugger().commands().validate_number_parameter(params[2], offs)) - return; - offset = (offs_t)offs; - } - - uint64_t start = addr; - address = (offs_t)addr; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - { - con.printf("Address is unmapped.\n"); - return; - } - if (params.size() >= 3) - con.printf("Entry Object\n"); - else - con.printf("Entry\n"); - - uint64_t old; - for (int num = 0; num < 32; num++) - { - if (params.size() >= 3) - con.printf("%08X %08X\n", (uint32_t)addr, (offs_t)addr - offset); - else - con.printf("%08X\n", (uint32_t)addr); - old = addr; - addr = space.read_dword_unaligned(address); - if (addr == start) - break; - if (addr == old) - break; - address = (offs_t)addr; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - break; - } -} - -void xbox_base_state::dump_dpc_command(const std::vector ¶ms) -{ - debugger_console &con = machine().debugger().console(); - address_space &space = m_maincpu->space(); - uint64_t addr; - offs_t address; - - if (params.size() < 2) - return; - - if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) - return; - - address = (offs_t)addr; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - { - con.printf("Address is unmapped.\n"); - return; - } - con.printf("Type %d word\n", space.read_word_unaligned(address)); - con.printf("Inserted %d byte\n", space.read_byte(address + 2)); - con.printf("Padding %d byte\n", space.read_byte(address + 3)); - con.printf("DpcListEntry {%08X,%08X} _LIST_ENTRY\n", space.read_dword_unaligned(address + 4), space.read_dword_unaligned(address + 8, true)); - con.printf("DeferredRoutine %08X dword\n", space.read_dword_unaligned(address + 12)); - con.printf("DeferredContext %08X dword\n", space.read_dword_unaligned(address + 16)); - con.printf("SystemArgument1 %08X dword\n", space.read_dword_unaligned(address + 20)); - con.printf("SystemArgument2 %08X dword\n", space.read_dword_unaligned(address + 24)); -} - -void xbox_base_state::dump_timer_command(const std::vector ¶ms) -{ - debugger_console &con = machine().debugger().console(); - address_space &space = m_maincpu->space(); - uint64_t addr; - offs_t address; - - if (params.size() < 2) - return; - - if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) - return; - - address = (offs_t)addr; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - { - con.printf("Address is unmapped.\n"); - return; - } - con.printf("Header.Type %d byte\n", space.read_byte(address)); - con.printf("Header.Absolute %d byte\n", space.read_byte(address + 1)); - con.printf("Header.Size %d byte\n", space.read_byte(address + 2)); - con.printf("Header.Inserted %d byte\n", space.read_byte(address + 3)); - con.printf("Header.SignalState %08X dword\n", space.read_dword_unaligned(address + 4)); - con.printf("Header.WaitListEntry {%08X,%08X} _LIST_ENTRY\n", space.read_dword_unaligned(address + 8), space.read_dword_unaligned(address + 12)); - con.printf("%s", string_format("DueTime %x qword\n", (int64_t)space.read_qword_unaligned(address + 16)).c_str()); - con.printf("TimerListEntry {%08X,%08X} _LIST_ENTRY\n", space.read_dword_unaligned(address + 24), space.read_dword_unaligned(address + 28)); - con.printf("Dpc %08X dword\n", space.read_dword_unaligned(address + 32)); - con.printf("Period %d dword\n", space.read_dword_unaligned(address + 36)); -} - -void xbox_base_state::curthread_command(const std::vector ¶ms) -{ - debugger_console &con = machine().debugger().console(); - address_space &space = m_maincpu->space(); - offs_t address; - - uint64_t fsbase = m_maincpu->state_int(44); // base of FS register - address = (offs_t)fsbase + (offs_t)debugc_bios->parameter[7-1]; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - { - con.printf("Address is unmapped.\n"); - return; - } - - uint32_t kthrd = space.read_dword_unaligned(address); - con.printf("Current thread is %08X\n", kthrd); - address = (offs_t)(kthrd + debugc_bios->parameter[8-1]); - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - return; - uint32_t topstack = space.read_dword_unaligned(address); - con.printf("Current thread stack top is %08X\n", topstack); - address = (offs_t)(kthrd + debugc_bios->parameter[4-1]); - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - return; - uint32_t tlsdata = space.read_dword_unaligned(address); - if (tlsdata == 0) - address = (offs_t)(topstack - debugc_bios->parameter[5-1] - debugc_bios->parameter[6-1]); - else - address = (offs_t)(tlsdata - debugc_bios->parameter[6-1]); - if (m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - con.printf("Current thread function is %08X\n", space.read_dword_unaligned(address)); -} - -void xbox_base_state::threadlist_command(const std::vector ¶ms) -{ - address_space &space = m_maincpu->space(); - debugger_console &con = machine().debugger().console(); - - con.printf("Pri. _KTHREAD Stack Function\n"); - con.printf("-------------------------------\n"); - for (int pri = 0; pri < 16; pri++) - { - uint32_t curr = debugc_bios->parameter[1 - 1] + pri * 8; - uint32_t addr = curr; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, addr)) - continue; - uint32_t next = space.read_dword_unaligned(addr); - - while ((next != curr) && (next != 0)) - { - uint32_t kthrd = next - debugc_bios->parameter[2 - 1]; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, kthrd)) - break; - uint32_t topstack = space.read_dword_unaligned(kthrd + debugc_bios->parameter[3 - 1]); - uint32_t tlsdata = space.read_dword_unaligned(kthrd + debugc_bios->parameter[4 - 1]); - uint32_t function = 0; - if (tlsdata == 0) - addr = topstack - debugc_bios->parameter[5 - 1] - debugc_bios->parameter[6 - 1]; - else - addr = tlsdata - debugc_bios->parameter[6 - 1]; - if (m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, addr)) - function = space.read_dword_unaligned(addr); - con.printf(" %02d %08x %08x %08x\n", pri, kthrd, topstack, function); - addr = next; - if (m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, addr)) - next = space.read_dword_unaligned(addr); - else - break; - } - } -} - -void xbox_base_state::generate_irq_command(const std::vector ¶ms) -{ - uint64_t irq; - - if (params.size() < 2) - return; - if (!machine().debugger().commands().validate_number_parameter(params[1], irq)) - return; - if (irq > 15) - return; - if (irq == 2) - return; - debug_generate_irq((int)irq, true); -} - -void xbox_base_state::nv2a_combiners_command(const std::vector ¶ms) -{ - debugger_console &con = machine().debugger().console(); - bool en = nvidia_nv2a->toggle_register_combiners_usage(); - if (en == true) - con.printf("Register combiners enabled\n"); - else - con.printf("Register combiners disabled\n"); -} - -void xbox_base_state::nv2a_wclipping_command(const std::vector ¶ms) -{ - debugger_console &con = machine().debugger().console(); - bool en = nvidia_nv2a->toggle_clipping_w_support(); - if (en == true) - con.printf("W clipping enabled\n"); - else - con.printf("W clipping disabled\n"); -} - -void xbox_base_state::waitvblank_command(const std::vector ¶ms) -{ - debugger_console &con = machine().debugger().console(); - bool en = nvidia_nv2a->toggle_wait_vblank_support(); - if (en == true) - con.printf("Vblank method enabled\n"); - else - con.printf("Vblank method disabled\n"); -} - -void xbox_base_state::grab_texture_command(const std::vector ¶ms) -{ - uint64_t type; - - if (params.size() < 3) - return; - if (!machine().debugger().commands().validate_number_parameter(params[1], type)) - return; - if (params[2].empty() || params[2].length() > 127) - return; - nvidia_nv2a->debug_grab_texture((int)type, params[2].c_str()); -} - -void xbox_base_state::grab_vprog_command(const std::vector ¶ms) -{ - uint32_t instruction[4]; - FILE *fil; - - if (params.size() < 2) - return; - if (params[1].empty() || params[1].length() > 127) - return; - if ((fil = fopen(params[1].c_str(), "wb")) == nullptr) - return; - for (int n = 0; n < 136; n++) - { - nvidia_nv2a->debug_grab_vertex_program_slot(n, instruction); - fwrite(instruction, sizeof(uint32_t), 4, fil); - } - fclose(fil); -} - -void xbox_base_state::vprogdis_command(const std::vector ¶ms) -{ - address_space &space = m_maincpu->space(); - - if (params.size() < 3) - return; - - uint64_t addr; - if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) - return; - - uint64_t length; - if (!machine().debugger().commands().validate_number_parameter(params[2], length)) - return; - - uint64_t type = 0; - if (params.size() > 3) - if (!machine().debugger().commands().validate_number_parameter(params[3], type)) - return; - - vertex_program_disassembler vd; - while (length > 0) - { - uint32_t instruction[4]; - if (type == 1) - { - offs_t address = (offs_t)addr; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - return; - instruction[0] = space.read_dword_unaligned(address); - instruction[1] = space.read_dword_unaligned(address + 4); - instruction[2] = space.read_dword_unaligned(address + 8); - instruction[3] = space.read_dword_unaligned(address + 12); - } - else - { - nvidia_nv2a->debug_grab_vertex_program_slot((int)addr, instruction); - } - - char line[64]; - while (vd.disassemble(instruction, line) != 0) - machine().debugger().console().printf("%s\n", line); - - if (type == 1) - addr = addr + 4 * 4; - else - addr++; - - length--; - } -} - -void xbox_base_state::vdeclaration_command(const std::vector ¶ms) -{ - address_space &space = m_maincpu->space(); - - if (params.size() < 1) - return; - - uint64_t addr; - if (!machine().debugger().commands().validate_number_parameter(params[1], addr)) - return; - - debugger_console &con = machine().debugger().console(); - for (int n = 128; n > 0; n--) - { - offs_t address = (offs_t)addr; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - return; - uint32_t w = space.read_dword_unaligned(address); - - if (w == 0xffffffff) - { - con.printf("D3DVSD_END()\n"); - break; - } - switch ((w >> 29) & 7) - { - case 0: - con.printf("D3DVSD_NOP()\n"); - break; - case 1: - if (w & (1 << 28)) - con.printf("D3DVSD_STREAM_TESS()\n"); - else - con.printf("D3DVSD_STREAM(%d)\n", w & 0x1fffffff); - break; - case 2: - if (w & 0x18000000) - con.printf("D3DVSD_SKIPBYTES(%d)\n", (w >> 16) & 0xfff); - else if (w & 0x10000000) - con.printf("D3DVSD_SKIP(%d)\n", (w >> 16) & 0xfff); - else - { - const char *t = "???"; - - for (int s = 0; vertex_format_names[s].value != 0; s++) - { - if (vertex_format_names[s].value == ((w >> 16) & 0xfff)) - { - t = vertex_format_names[s].name; - break; - } - } - con.printf("D3DVSD_REG(%d, D3DVSDT_%s)\n", w & 0xffff, t); - } - break; - case 3: - if (w & 0x10000000) - con.printf("D3DVSD_TESSUV(%d)\n", w & 0xf); - else - con.printf("D3DVSD_TESSNORMAL(%d, %d)\n", (w >> 20) & 0xf, w & 0xf); - break; - case 4: - con.printf("D3DVSD_CONST(%d, %d)\n", (w & 0xff) - 96, (w >> 25) & 0xf); - for (int n = 0; n < ((w >> 23) & 0x3c); n++) - { - addr += 4; - address = (offs_t)addr; - if (!m_maincpu->translate(AS_PROGRAM, TRANSLATE_READ_DEBUG, address)) - return; - w = space.read_dword_unaligned(address); - con.printf("%08x\n", w); - } - break; - default: - con.printf("??? %08x\n", w); - n = 0; - } - addr += 4; - } -} - -void xbox_base_state::help_command(const std::vector ¶ms) -{ - debugger_console &con = machine().debugger().console(); - - con.printf("Available Xbox commands:\n"); - con.printf(" xbox dump_string,
-- Dump _STRING object at
\n"); - con.printf(" xbox dump_process,
-- Dump _PROCESS object at
\n"); - con.printf(" xbox dump_list,
[,] -- Dump _LIST_ENTRY chain starting at
\n"); - con.printf(" xbox dump_dpc,
-- Dump _KDPC object at
\n"); - con.printf(" xbox dump_timer,
-- Dump _KTIMER object at
\n"); - con.printf(" xbox curthread -- Print information about current thread\n"); - con.printf(" xbox threadlist -- list of currently active threads\n"); - con.printf(" xbox irq, -- Generate interrupt with irq number 0-15\n"); - con.printf(" xbox nv2a_combiners -- Toggle use of register combiners\n"); - con.printf(" xbox nv2a_wclipping -- Toggle use of negative w vertex clipping\n"); - con.printf(" xbox waitvblank -- Toggle support for wait vblank method\n"); - con.printf(" xbox grab_texture,, -- Save to the next used texture of type \n"); - con.printf(" xbox grab_vprog, -- save current vertex program instruction slots to \n"); - con.printf(" xbox vprogdis,
,[,] -- disassemble vertex program instructions at
of \n"); - con.printf(" xbox vdeclaration,
-- decode vertex program declaration at
\n"); - con.printf(" xbox help -- this list\n"); -} - -void xbox_base_state::xbox_debug_commands(const std::vector ¶ms) -{ - if (params.size() < 1) - return; - if (params[0] == "dump_string") - dump_string_command(params); - else if (params[0] == "dump_process") - dump_process_command(params); - else if (params[0] == "dump_list") - dump_list_command(params); - else if (params[0] == "dump_dpc") - dump_dpc_command(params); - else if (params[0] == "dump_timer") - dump_timer_command(params); - else if (params[0] == "curthread") - curthread_command(params); - else if (params[0] == "threadlist") - threadlist_command(params); - else if (params[0] == "irq") - generate_irq_command(params); - else if (params[0] == "nv2a_combiners") - nv2a_combiners_command(params); - else if (params[0] == "nv2a_wclipping") - nv2a_wclipping_command(params); - else if (params[0] == "waitvblank") - waitvblank_command(params); - else if (params[0] == "grab_texture") - grab_texture_command(params); - else if (params[0] == "grab_vprog") - grab_vprog_command(params); - else if (params[0] == "vprogdis") - vprogdis_command(params); - else if (params[0] == "vdeclaration") - vdeclaration_command(params); - else - help_command(params); -} - -void xbox_base_state::debug_generate_irq(int irq, bool active) -{ - int state; - - if (active) - { - debug_irq_active = true; - debug_irq_number = irq; - state = 1; - } - else - { - debug_irq_active = false; - state = 0; - } - mcpxlpc->debug_generate_irq(irq, state); -} - -WRITE_LINE_MEMBER(xbox_base_state::vblank_callback) -{ - nvidia_nv2a->vblank_callback(state); -} - -uint32_t xbox_base_state::screen_update_callback(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ - return nvidia_nv2a->screen_update_callback(screen, bitmap, cliprect); -} - -/* - * PIC & PIT - */ - -WRITE_LINE_MEMBER(xbox_base_state::maincpu_interrupt) -{ - m_maincpu->set_input_line(0, state ? HOLD_LINE : CLEAR_LINE); -} - -IRQ_CALLBACK_MEMBER(xbox_base_state::irq_callback) -{ - int r; - r = mcpxlpc->acknowledge(); - if (debug_irq_active) - debug_generate_irq(debug_irq_number, false); - return r; -} - -/* - * SMbus devices - */ - -/* - * PIC16LC - */ - -DEFINE_DEVICE_TYPE(XBOX_PIC16LC, xbox_pic16lc_device, "pic16lc", "XBOX PIC16LC") - -xbox_pic16lc_device::xbox_pic16lc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, XBOX_PIC16LC, tag, owner, clock) -{ -} - -int xbox_pic16lc_device::execute_command(int command, int rw, int data) -{ - if (rw == 1) { // read - if (command == 0) - { - if (buffer[0] == 'D') - buffer[0] = 'X'; - else if (buffer[0] == 'X') - buffer[0] = 'B'; - else if (buffer[0] == 'B') - buffer[0] = 'D'; - } - logerror("pic16lc: %d %d %d\n", command, rw, buffer[command]); - return buffer[command]; - } - else - if (command == 0) - buffer[0] = 'B'; - else - buffer[command] = (uint8_t)data; - logerror("pic16lc: %d %d %d\n", command, rw, data); - return 0; -} - -void xbox_pic16lc_device::device_start() -{ - memset(buffer, 0, sizeof(buffer)); - buffer[0] = 'B'; - buffer[4] = 0; // A/V connector, 0=scart 2=vga 4=svideo 7=none - // PIC challenge handshake data - buffer[0x1c] = 0x0c; - buffer[0x1d] = 0x0d; - buffer[0x1e] = 0x0e; - buffer[0x1f] = 0x0f; -} - -void xbox_pic16lc_device::device_reset() -{ -} - -/* - * CX25871 - */ - -DEFINE_DEVICE_TYPE(XBOX_CX25871, xbox_cx25871_device, "cx25871", "XBOX CX25871") - -xbox_cx25871_device::xbox_cx25871_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, XBOX_CX25871, tag, owner, clock) -{ -} - -int xbox_cx25871_device::execute_command(int command, int rw, int data) -{ - logerror("cx25871: %d %d %d\n", command, rw, data); - return 0; -} - -void xbox_cx25871_device::device_start() -{ -} - -void xbox_cx25871_device::device_reset() -{ -} - -/* - * EEPROM - */ - -// let's try to fake the missing eeprom, make sure its ntsc, otherwise chihiro will show an error -static int dummyeeprom[256] = { - 0x39, 0xe3, 0xcc, 0x81, 0xb0, 0xa9, 0x97, 0x09, 0x57, 0xac, 0x57, 0x12, 0xf7, 0xc2, 0xc0, 0x21, 0xce, 0x0d, 0x0a, 0xdb, 0x20, 0x7a, 0xf3, 0xff, - 0xdf, 0x67, 0xed, 0xf4, 0xf8, 0x95, 0x5c, 0xd0, 0x9b, 0xef, 0x7b, 0x81, 0xda, 0xd5, 0x98, 0xc1, 0xb1, 0xb3, 0x74, 0x18, 0x86, 0x05, 0xe2, 0x7c, - 0xd1, 0xad, 0xc9, 0x90, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x41, 0x42, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x00, 0x00, - 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xab, 0xcd, 0xef, 0xba, 0xdc, 0xfe, 0xa1, 0xb2, 0xc3, 0xd3, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - -DEFINE_DEVICE_TYPE(XBOX_EEPROM, xbox_eeprom_device, "eeprom", "XBOX EEPROM") - -xbox_eeprom_device::xbox_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, XBOX_EEPROM, tag, owner, clock) -{ -} - -int xbox_eeprom_device::execute_command(int command, int rw, int data) -{ - if (command >= 112) - return 0; - if (rw == 1) // if reading - { - // hack to avoid hanging if eeprom contents are not correct - // removing this would need dumping the serial eeprom on the chihiro xbox board - if (command == 0) - { - hack_eeprom(); - } - data = dummyeeprom[command] + dummyeeprom[command + 1] * 256; - logerror("eeprom: %d %d %d\n", command, rw, data); - return data; - } - logerror("eeprom: %d %d %d\n", command, rw, data); - dummyeeprom[command] = data; - return 0; -} - -void xbox_eeprom_device::device_start() -{ -} - -void xbox_eeprom_device::device_reset() -{ -} - -/* - * Super-io connected to lpc bus - */ - -DEFINE_DEVICE_TYPE(XBOX_SUPERIO, xbox_superio_device, "superio_device", "XBOX debug SuperIO") - -xbox_superio_device::xbox_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, XBOX_SUPERIO, tag, owner, clock) - , configuration_mode(false) - , index(0) - , selected(0) -{ - -} - -void xbox_superio_device::internal_io_map(address_map &map) -{ - map(0x002e, 0x002f).rw(FUNC(xbox_superio_device::read), FUNC(xbox_superio_device::write)); - map(0x03f8, 0x03ff).rw(FUNC(xbox_superio_device::read_rs232), FUNC(xbox_superio_device::write_rs232)); -} - -void xbox_superio_device::map_extra(address_space *memory_space, address_space *io_space) -{ - memspace = memory_space; - iospace = io_space; - io_space->install_device(0, 0xffff, *this, &xbox_superio_device::internal_io_map); -} - -void xbox_superio_device::set_host(int index, lpcbus_host_interface *host) -{ - lpchost = host; - lpcindex = index; -} - -void xbox_superio_device::device_start() -{ - memset(registers, 0, sizeof(registers)); - registers[0][0x26] = 0x2e; // Configuration port address byte 0 -} - -uint8_t xbox_superio_device::read(offs_t offset) -{ - if (configuration_mode == false) - return 0; - if (offset == 0) // index port 0x2e - return index; - if (offset == 1) - { - // data port 0x2f - if (index < 0x30) - return registers[0][index]; - return registers[selected][index]; - } - return 0; -} - -void xbox_superio_device::write(offs_t offset, uint8_t data) -{ - if (configuration_mode == false) - { - // config port 0x2e - if ((offset == 0) && (data == 0x55)) - configuration_mode = true; - return; - } - if ((offset == 0) && (data == 0xaa)) - { - // config port 0x2e - configuration_mode = false; - return; - } - if (offset == 0) - { - // index port 0x2e - index = data; - } - if (offset == 1) - { - // data port 0x2f - if (index < 0x30) - { - registers[0][index] = data; - selected = registers[0][7]; - } - else - { - registers[selected][index] = data; - //if ((superiost.selected == 4) && (superiost.index == 0x30) && (data != 0)) - // ; // add handlers 0x3f8- +7 - } - } -} - -uint8_t xbox_superio_device::read_rs232(offs_t offset) -{ - if (offset == 5) - return 0x20; - return 0; -} - -void xbox_superio_device::write_rs232(offs_t offset, uint8_t data) -{ - if (offset == 0) - { - printf("%c", data); - } -} - -void xbox_base_state::machine_start() -{ - find_debug_params(); - nvidia_nv2a = subdevice("pci:1e.0:00.0")->debug_get_renderer(); - if (machine().debug_flags & DEBUG_FLAG_ENABLED) - { - using namespace std::placeholders; - machine().debugger().console().register_command("xbox", CMDFLAG_CUSTOM_HELP, 1, 4, std::bind(&xbox_base_state::xbox_debug_commands, this, _1)); - } - subdevice("pci:01.1:154")->hack_eeprom = - [&](void) - { - hack_eeprom(); - }; - subdevice("pci:02.0")->set_hack_callback( - [&](void) - { - hack_usb(); - } - ); - // savestates - save_item(NAME(debug_irq_active)); - save_item(NAME(debug_irq_number)); -} - -#if 0 -void xbox_base_state::xbox_base_map(address_map &map) -{ - map(0x00000000, 0x07ffffff).ram(); // 128 megabytes - map(0xf0000000, 0xf7ffffff).ram().share("nv2a_share"); // 3d accelerator wants this - map(0xfd000000, 0xfdffffff).ram().rw(FUNC(xbox_base_state::geforce_r), FUNC(xbox_base_state::geforce_w)); - map(0xfed00000, 0xfed003ff).rw(FUNC(xbox_base_state::ohci_usb_r), FUNC(xbox_base_state::ohci_usb_w)); - map(0xfed08000, 0xfed083ff).rw(FUNC(xbox_base_state::ohci_usb2_r), FUNC(xbox_base_state::ohci_usb2_w)); - map(0xfe800000, 0xfe87ffff).rw(FUNC(xbox_base_state::audio_apu_r), FUNC(xbox_base_state::audio_apu_w)); - map(0xfec00000, 0xfec00fff).rw(FUNC(xbox_base_state::audio_ac93_r), FUNC(xbox_base_state::audio_ac93_w)); - map(0xfef00000, 0xfef003ff).rw(FUNC(xbox_base_state::network_r), FUNC(xbox_base_state::network_w)); -} - -void xbox_base_state::xbox_base_map_io(address_map &map) -{ - map(0x01f0, 0x01f7).rw("pci:09.0:ide1", FUNC(bus_master_ide_controller_device::cs0_r), FUNC(bus_master_ide_controller_device::cs0_w)); - map(0x002e, 0x002f).rw(FUNC(xbox_base_state::superio_read), FUNC(xbox_base_state::superio_write)); - map(0x03f8, 0x03ff).rw(FUNC(xbox_base_state::superiors232_read), FUNC(xbox_base_state::superiors232_write)); - map(0x0cf8, 0x0cff).rw("pcibus", FUNC(pci_bus_legacy_device::read), FUNC(pci_bus_legacy_device::write)); - map(0x8000, 0x80ff).rw(FUNC(xbox_base_state::dummy_r), FUNC(xbox_base_state::dummy_w)); // lpc bridge - map(0xc000, 0xc00f).rw(FUNC(xbox_base_state::smbus_r), FUNC(xbox_base_state::smbus_w)); - map(0xc200, 0xc21f).rw(FUNC(xbox_base_state::smbus2_r), FUNC(xbox_base_state::smbus2_w)); - map(0xd000, 0xd0ff).noprw(); // ac97 - map(0xd200, 0xd27f).noprw(); // ac97 - map(0xe000, 0xe007).rw(FUNC(xbox_base_state::networkio_r), FUNC(xbox_base_state::networkio_w)); - map(0xff60, 0xff6f).rw("ide", FUNC(bus_master_ide_controller_device::bmdma_r), FUNC(bus_master_ide_controller_device::bmdma_w)); -} -#endif - -void xbox_base_state::xbox_base(machine_config &config) -{ - /* basic machine hardware */ - PENTIUM3(config, m_maincpu, 733333333); /* Wrong! family 6 model 8 stepping 10 */ - m_maincpu->set_irq_acknowledge_callback(FUNC(xbox_base_state::irq_callback)); - - config.set_maximum_quantum(attotime::from_hz(6000)); - - PCI_ROOT(config, "pci", 0); - NV2A_HOST(config, "pci:00.0", 0, m_maincpu); - NV2A_RAM(config, "pci:00.3", 0, 128); // 128 megabytes - MCPX_ISALPC(config, "pci:01.0", 0, 0).interrupt_output().set(FUNC(xbox_base_state::maincpu_interrupt)); - XBOX_SUPERIO(config, "pci:01.0:0", 0); - MCPX_SMBUS(config, "pci:01.1", 0, 0).interrupt_handler().set("pci:01.0", FUNC(mcpx_isalpc_device::irq11)); //.set(FUNC(xbox_base_state::smbus_interrupt_changed)); - XBOX_PIC16LC(config, "pci:01.1:110", 0); // these 3 are on smbus number 1 - XBOX_CX25871(config, "pci:01.1:145", 0); - XBOX_EEPROM(config, "pci:01.1:154", 0); - MCPX_OHCI(config, "pci:02.0", 0, 0).interrupt_handler().set("pci:01.0", FUNC(mcpx_isalpc_device::irq1)); //.set(FUNC(xbox_base_state::ohci_usb_interrupt_changed)); - MCPX_OHCI(config, "pci:03.0", 0, 0); - MCPX_ETH(config, "pci:04.0", 0); - MCPX_APU(config, "pci:05.0", 0, 0, m_maincpu); - MCPX_AC97_AUDIO(config, "pci:06.0", 0, 0); - MCPX_AC97_MODEM(config, "pci:06.1", 0); - PCI_BRIDGE(config, "pci:08.0", 0, 0x10de01b8, 0); - MCPX_IDE(config, "pci:09.0", 0, 0).pri_interrupt_handler().set("pci:01.0", FUNC(mcpx_isalpc_device::irq14)); //.set(FUNC(xbox_base_state::ide_interrupt_changed)); - NV2A_AGP(config, "pci:1e.0", 0, 0x10de01b7, 0); - NV2A_GPU(config, "pci:1e.0:00.0", 0, m_maincpu).interrupt_handler().set("pci:01.0", FUNC(mcpx_isalpc_device::irq3)); //.set(FUNC(xbox_base_state::nv2a_interrupt_changed)); - - /* video hardware */ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(60); - screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ - screen.set_size(640, 480); - screen.set_visarea(0, 639, 0, 479); - screen.set_screen_update(FUNC(xbox_base_state::screen_update_callback)); - screen.screen_vblank().set(FUNC(xbox_base_state::vblank_callback)); -} diff --git a/src/mame/shared/xbox_m.h b/src/mame/shared/xbox_m.h deleted file mode 100644 index 66870c5bca8..00000000000 --- a/src/mame/shared/xbox_m.h +++ /dev/null @@ -1,175 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Samuele Zannoli -#ifndef MAME_INCLUDES_XBOX_H -#define MAME_INCLUDES_XBOX_H - -#pragma once - -#include "machine/xbox_usb.h" -#include "video/xbox_nv2a.h" - -#include "machine/idectrl.h" -#include "machine/pic8259.h" - -/* - * PIC16LC connected to SMBus - */ - -class xbox_pic16lc_device : public device_t, public smbus_interface -{ -public: - xbox_pic16lc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual int execute_command(int command, int rw, int data) override; - -protected: - virtual void device_start() override; - virtual void device_reset() override; - -private: - uint8_t buffer[0xff]; -}; - -DECLARE_DEVICE_TYPE(XBOX_PIC16LC, xbox_pic16lc_device) - -/* - * CX25871 connected to SMBus - */ - -class xbox_cx25871_device : public device_t, public smbus_interface -{ -public: - xbox_cx25871_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual int execute_command(int command, int rw, int data) override; - -protected: - virtual void device_start() override; - virtual void device_reset() override; - -private: -}; - -DECLARE_DEVICE_TYPE(XBOX_CX25871, xbox_cx25871_device) - -/* - * EEPROM connected to SMBus - */ - -class xbox_eeprom_device : public device_t, public smbus_interface -{ -public: - xbox_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual int execute_command(int command, int rw, int data) override; - - std::function hack_eeprom; - -protected: - virtual void device_start() override; - virtual void device_reset() override; - -private: -}; - -DECLARE_DEVICE_TYPE(XBOX_EEPROM, xbox_eeprom_device) - -/* - * Super-io connected to lpc bus used as a rs232 debug port - */ - -class xbox_superio_device : public device_t, public lpcbus_device_interface -{ -public: - xbox_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual void map_extra(address_space *memory_space, address_space *io_space) override; - virtual void set_host(int index, lpcbus_host_interface *host) override; - - uint8_t read(offs_t offset); - void write(offs_t offset, uint8_t data); - uint8_t read_rs232(offs_t offset); - void write_rs232(offs_t offset, uint8_t data); - -protected: - virtual void device_start() override; - -private: - void internal_io_map(address_map &map); - - lpcbus_host_interface *lpchost = nullptr; - int lpcindex = 0; - address_space *memspace = nullptr; - address_space *iospace = nullptr; - bool configuration_mode; - int index; - int selected; - uint8_t registers[16][256]{}; // 256 registers for up to 16 devices, registers 0-0x2f common to all -}; - -DECLARE_DEVICE_TYPE(XBOX_SUPERIO, xbox_superio_device) - -/* - * Base - */ - -class xbox_base_state : public driver_device -{ -public: - xbox_base_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device(mconfig, type, tag), - nvidia_nv2a(nullptr), - debug_irq_active(false), - debug_irq_number(0), - m_maincpu(*this, "maincpu"), - mcpxlpc(*this, ":pci:01.0"), - ide(*this, ":pci:09.0:ide1"), - debugc_bios(nullptr) { } - - void xbox_base(machine_config &config); - -protected: - void debug_generate_irq(int irq, bool active); - virtual void hack_eeprom() {} - virtual void hack_usb() {} - - DECLARE_WRITE_LINE_MEMBER(vblank_callback); - uint32_t screen_update_callback(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - - virtual void machine_start() override; - DECLARE_WRITE_LINE_MEMBER(maincpu_interrupt); - IRQ_CALLBACK_MEMBER(irq_callback); - - nv2a_renderer *nvidia_nv2a; - bool debug_irq_active; - int debug_irq_number; - required_device m_maincpu; - required_device mcpxlpc; - required_device ide; - static const struct debugger_constants - { - uint32_t id; - uint32_t parameter[8]; // c c c ? ? ? x x - } debugp[]; - const debugger_constants *debugc_bios; - -private: - void dump_string_command(const std::vector ¶ms); - void dump_process_command(const std::vector ¶ms); - void dump_list_command(const std::vector ¶ms); - void dump_dpc_command(const std::vector ¶ms); - void dump_timer_command(const std::vector ¶ms); - void curthread_command(const std::vector ¶ms); - void threadlist_command(const std::vector ¶ms); - void generate_irq_command(const std::vector ¶ms); - void nv2a_combiners_command(const std::vector ¶ms); - void nv2a_wclipping_command(const std::vector ¶ms); - void waitvblank_command(const std::vector ¶ms); - void grab_texture_command(const std::vector ¶ms); - void grab_vprog_command(const std::vector ¶ms); - void vprogdis_command(const std::vector ¶ms); - void vdeclaration_command(const std::vector ¶ms); - void help_command(const std::vector ¶ms); - void xbox_debug_commands(const std::vector ¶ms); - int find_bios_index(); - bool find_bios_hash(int bios, uint32_t &crc32); - void find_debug_params(); -}; - -#endif // MAME_INCLUDES_XBOX_H diff --git a/src/mame/shared/xbox_nv2a.cpp b/src/mame/shared/xbox_nv2a.cpp index 9eb2bf67f34..52e1d784df8 100644 --- a/src/mame/shared/xbox_nv2a.cpp +++ b/src/mame/shared/xbox_nv2a.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "video/poly.h" #include "bitmap.h" -#include "video/xbox_nv2a.h" +#include "xbox_nv2a.h" #include #include diff --git a/src/mame/shared/xbox_pci.cpp b/src/mame/shared/xbox_pci.cpp index ea84afd414c..23149e53e96 100644 --- a/src/mame/shared/xbox_pci.cpp +++ b/src/mame/shared/xbox_pci.cpp @@ -2,10 +2,12 @@ // copyright-holders:Samuele Zannoli #include "emu.h" +#include "xbox_pci.h" + +#include "xbox.h" + #include "machine/pci.h" #include "machine/idectrl.h" -#include "machine/xbox_pci.h" -#include "machine/xbox.h" #include "machine/ds128x.h" #include diff --git a/src/mame/shared/xbox_pci.h b/src/mame/shared/xbox_pci.h index f9d0b0d9916..23c1cb43c37 100644 --- a/src/mame/shared/xbox_pci.h +++ b/src/mame/shared/xbox_pci.h @@ -1,13 +1,15 @@ // license:BSD-3-Clause // copyright-holders:Samuele Zannoli -#ifndef MAME_INCLUDES_XBOX_PCI_H -#define MAME_INCLUDES_XBOX_PCI_H +#ifndef MAME_SHARED_XBOX_PCI_H +#define MAME_SHARED_XBOX_PCI_H #pragma once -#include "machine/xbox_usb.h" -#include "video/xbox_nv2a.h" +#include "xbox_nv2a.h" +#include "xbox_usb.h" +#include "machine/pci.h" +#include "machine/pci-ide.h" #include "machine/pit8253.h" /* @@ -490,4 +492,4 @@ private: DECLARE_DEVICE_TYPE(NV2A_GPU, nv2a_gpu_device) -#endif // MAME_INCLUDES_XBOX_PCI_H +#endif // MAME_SHARED_XBOX_PCI_H diff --git a/src/mame/shared/xbox_usb.cpp b/src/mame/shared/xbox_usb.cpp index d07577eacb4..48be6a458b7 100644 --- a/src/mame/shared/xbox_usb.cpp +++ b/src/mame/shared/xbox_usb.cpp @@ -2,11 +2,12 @@ // copyright-holders:Samuele Zannoli #include "emu.h" +#include "xbox_pci.h" +#include "xbox_usb.h" +#include "xbox.h" + #include "machine/pci.h" #include "machine/idectrl.h" -#include "machine/xbox_pci.h" -#include "machine/xbox_usb.h" -#include "machine/xbox.h" //#define LOG_OHCI diff --git a/src/mame/sharp/mz2500.cpp b/src/mame/sharp/mz2500.cpp index 7dd492da0b4..6af6040f257 100644 --- a/src/mame/sharp/mz2500.cpp +++ b/src/mame/sharp/mz2500.cpp @@ -37,7 +37,7 @@ ********************************************************************************************************************************/ #include "emu.h" -#include "includes/mz2500.h" +#include "mz2500.h" #include "softlist_dev.h" diff --git a/src/mame/sharp/mz700.cpp b/src/mame/sharp/mz700.cpp index d1d7a832023..92375129941 100644 --- a/src/mame/sharp/mz700.cpp +++ b/src/mame/sharp/mz700.cpp @@ -80,7 +80,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/mz700.h" +#include "mz700.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" diff --git a/src/mame/sharp/mz700_m.cpp b/src/mame/sharp/mz700_m.cpp index 49182df4202..088843c7740 100644 --- a/src/mame/sharp/mz700_m.cpp +++ b/src/mame/sharp/mz700_m.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/mz700.h" +#include "mz700.h" #include "cpu/z80/z80.h" #include "machine/74145.h" diff --git a/src/mame/sharp/mz700_v.cpp b/src/mame/sharp/mz700_v.cpp index e110e986185..f7180e3016e 100644 --- a/src/mame/sharp/mz700_v.cpp +++ b/src/mame/sharp/mz700_v.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mz700.h" +#include "mz700.h" uint32_t mz_state::screen_update_mz700(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/sharp/mz80.cpp b/src/mame/sharp/mz80.cpp index afb6868c794..c8980acffda 100644 --- a/src/mame/sharp/mz80.cpp +++ b/src/mame/sharp/mz80.cpp @@ -29,7 +29,7 @@ MZ80B ****************************************************************************/ #include "emu.h" -#include "includes/mz80.h" +#include "mz80.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/sharp/mz80_m.cpp b/src/mame/sharp/mz80_m.cpp index d1a5a42c174..128bc96bb70 100644 --- a/src/mame/sharp/mz80_m.cpp +++ b/src/mame/sharp/mz80_m.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/mz80.h" +#include "mz80.h" /* Driver initialization */ diff --git a/src/mame/sharp/mz80_v.cpp b/src/mame/sharp/mz80_v.cpp index e4ae83a5311..fef6e0b0060 100644 --- a/src/mame/sharp/mz80_v.cpp +++ b/src/mame/sharp/mz80_v.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/mz80.h" +#include "mz80.h" const gfx_layout mz80k_charlayout = { diff --git a/src/mame/sharp/pc1251.cpp b/src/mame/sharp/pc1251.cpp index 454ed3dad4e..c05ecb508ea 100644 --- a/src/mame/sharp/pc1251.cpp +++ b/src/mame/sharp/pc1251.cpp @@ -2,8 +2,8 @@ // copyright-holders:Peter Trauner #include "emu.h" -#include "includes/pocketc.h" -#include "includes/pc1251.h" +#include "pocketc.h" +#include "pc1251.h" // TODO: Convert to SVG rendering or internal layout diff --git a/src/mame/sharp/pc1251_m.cpp b/src/mame/sharp/pc1251_m.cpp index cd9fcf7fa1c..ee97a813363 100644 --- a/src/mame/sharp/pc1251_m.cpp +++ b/src/mame/sharp/pc1251_m.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "cpu/sc61860/sc61860.h" -#include "includes/pocketc.h" -#include "includes/pc1251.h" +#include "pocketc.h" +#include "pc1251.h" /* C-CE while reset, program will not be destroyed! */ diff --git a/src/mame/sharp/pc1350.cpp b/src/mame/sharp/pc1350.cpp index d8a60d178a9..da7b0fb7f04 100644 --- a/src/mame/sharp/pc1350.cpp +++ b/src/mame/sharp/pc1350.cpp @@ -2,8 +2,8 @@ // copyright-holders:Peter Trauner #include "emu.h" -#include "includes/pocketc.h" -#include "includes/pc1350.h" +#include "pocketc.h" +#include "pc1350.h" // TODO: Convert to SVG rendering or internal layout diff --git a/src/mame/sharp/pc1350_m.cpp b/src/mame/sharp/pc1350_m.cpp index 07357f19062..f32429f7d7f 100644 --- a/src/mame/sharp/pc1350_m.cpp +++ b/src/mame/sharp/pc1350_m.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "cpu/sc61860/sc61860.h" -#include "includes/pocketc.h" -#include "includes/pc1350.h" +#include "pocketc.h" +#include "pc1350.h" #include "machine/ram.h" void pc1350_state::out_b_w(uint8_t data) diff --git a/src/mame/sharp/pc1401.cpp b/src/mame/sharp/pc1401.cpp index 9fffbe75374..05aa0fed163 100644 --- a/src/mame/sharp/pc1401.cpp +++ b/src/mame/sharp/pc1401.cpp @@ -2,8 +2,8 @@ // copyright-holders:Peter Trauner #include "emu.h" -#include "includes/pocketc.h" -#include "includes/pc1401.h" +#include "pocketc.h" +#include "pc1401.h" // TODO: Convert to SVG rendering or internal layout diff --git a/src/mame/sharp/pc1401_m.cpp b/src/mame/sharp/pc1401_m.cpp index 66508b4c1d4..5b783687972 100644 --- a/src/mame/sharp/pc1401_m.cpp +++ b/src/mame/sharp/pc1401_m.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "cpu/sc61860/sc61860.h" -#include "includes/pocketc.h" -#include "includes/pc1401.h" +#include "pocketc.h" +#include "pc1401.h" #include "machine/ram.h" /* C-CE while reset, program will not be destroyed! */ diff --git a/src/mame/sharp/pc1403.cpp b/src/mame/sharp/pc1403.cpp index f9c23cd9bec..4e70ecff97b 100644 --- a/src/mame/sharp/pc1403.cpp +++ b/src/mame/sharp/pc1403.cpp @@ -23,8 +23,8 @@ #include "emu.h" -#include "includes/pocketc.h" -#include "includes/pc1403.h" +#include "pocketc.h" +#include "pc1403.h" void pc1403_state::video_start() diff --git a/src/mame/sharp/pc1403_m.cpp b/src/mame/sharp/pc1403_m.cpp index 5d8fb61b7a4..3c514430a56 100644 --- a/src/mame/sharp/pc1403_m.cpp +++ b/src/mame/sharp/pc1403_m.cpp @@ -3,8 +3,8 @@ #include "emu.h" #include "cpu/sc61860/sc61860.h" -#include "includes/pocketc.h" -#include "includes/pc1403.h" +#include "pocketc.h" +#include "pc1403.h" #include "machine/ram.h" #define LOG_ASIC (1 << 0) diff --git a/src/mame/sharp/pce220.cpp b/src/mame/sharp/pce220.cpp index 9c3ae1f23cf..7d925240456 100644 --- a/src/mame/sharp/pce220.cpp +++ b/src/mame/sharp/pce220.cpp @@ -26,7 +26,7 @@ #include "cpu/z80/z80.h" #include "machine/input_merger.h" #include "machine/nvram.h" -#include "machine/pce220_ser.h" +#include "pce220_ser.h" #include "machine/ram.h" #include "machine/timer.h" #include "sound/beep.h" diff --git a/src/mame/sharp/pocketc.cpp b/src/mame/sharp/pocketc.cpp index 32248a0cbf2..e568bb000b0 100644 --- a/src/mame/sharp/pocketc.cpp +++ b/src/mame/sharp/pocketc.cpp @@ -11,11 +11,11 @@ ******************************************************************************/ #include "emu.h" -#include "includes/pocketc.h" -#include "includes/pc1401.h" -#include "includes/pc1251.h" -#include "includes/pc1350.h" -#include "includes/pc1403.h" +#include "pocketc.h" +#include "pc1401.h" +#include "pc1251.h" +#include "pc1350.h" +#include "pc1403.h" #include "machine/ram.h" diff --git a/src/mame/sharp/pocketc_m.cpp b/src/mame/sharp/pocketc_m.cpp index e16ee649c90..2807bdd3911 100644 --- a/src/mame/sharp/pocketc_m.cpp +++ b/src/mame/sharp/pocketc_m.cpp @@ -2,7 +2,7 @@ // copyright-holders:Peter Trauner #include "emu.h" -#include "includes/pocketc.h" +#include "pocketc.h" void pocketc_state::out_a_w(uint8_t data) { diff --git a/src/mame/sharp/pocketc_v.cpp b/src/mame/sharp/pocketc_v.cpp index 0f2044ad79a..60f8cf83da1 100644 --- a/src/mame/sharp/pocketc_v.cpp +++ b/src/mame/sharp/pocketc_v.cpp @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Peter Trauner #include "emu.h" -#include "includes/pocketc.h" +#include "pocketc.h" // TODO: Convert to SVG rendering or internal layout diff --git a/src/mame/sharp/x1.cpp b/src/mame/sharp/x1.cpp index a454d4b3124..034fd3e4fb6 100644 --- a/src/mame/sharp/x1.cpp +++ b/src/mame/sharp/x1.cpp @@ -206,7 +206,7 @@ ************************************************************************************************/ #include "emu.h" -#include "includes/x1.h" +#include "x1.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/sharp/x1_m.cpp b/src/mame/sharp/x1_m.cpp index 47ec52abdeb..94d02ea0a96 100644 --- a/src/mame/sharp/x1_m.cpp +++ b/src/mame/sharp/x1_m.cpp @@ -10,7 +10,7 @@ ***************************************************/ #include "emu.h" -#include "includes/x1.h" +#include "x1.h" //************************************************************************** diff --git a/src/mame/sharp/x1_v.cpp b/src/mame/sharp/x1_v.cpp index e9946209f01..3a206d09a28 100644 --- a/src/mame/sharp/x1_v.cpp +++ b/src/mame/sharp/x1_v.cpp @@ -15,7 +15,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/x1.h" +#include "x1.h" /************************************* * diff --git a/src/mame/sharp/x1twin.cpp b/src/mame/sharp/x1twin.cpp index 0db55cf63cc..80bed757305 100644 --- a/src/mame/sharp/x1twin.cpp +++ b/src/mame/sharp/x1twin.cpp @@ -15,15 +15,21 @@ ************************************************************************************************/ #include "emu.h" -#include "includes/x1.h" -#include "includes/pce.h" +#include "x1.h" +//#include "nec/pce.h" FIXME: turn necessary parts of PCE into a device that can be put somewhere common + +#include "video/huc6260.h" #include "layout/generic.h" #include "screen.h" #include "softlist.h" +#include "softlist_dev.h" #include "speaker.h" +// copied from pce.h until it's turned into a device properly +#define MAIN_CLOCK 21477270 + namespace { class x1twin_state : public x1_state diff --git a/src/mame/sharp/x68k.cpp b/src/mame/sharp/x68k.cpp index ea060b0599d..cb8514be833 100644 --- a/src/mame/sharp/x68k.cpp +++ b/src/mame/sharp/x68k.cpp @@ -116,9 +116,9 @@ */ #include "emu.h" -#include "includes/x68k.h" -#include "machine/x68k_hdc.h" -#include "machine/x68k_kbd.h" +#include "x68k.h" +#include "x68k_hdc.h" +#include "x68k_kbd.h" #include "machine/nvram.h" diff --git a/src/mame/sharp/x68k.h b/src/mame/sharp/x68k.h index e4b98390125..157131bfcf1 100644 --- a/src/mame/sharp/x68k.h +++ b/src/mame/sharp/x68k.h @@ -26,7 +26,7 @@ #include "sound/flt_vol.h" #include "sound/okim6258.h" #include "sound/ymopm.h" -#include "video/x68k_crtc.h" +#include "x68k_crtc.h" #include "bus/x68k/x68kexp.h" #include "emupal.h" diff --git a/src/mame/sharp/x68k_crtc.cpp b/src/mame/sharp/x68k_crtc.cpp index 92480bc35ef..37e263066ad 100644 --- a/src/mame/sharp/x68k_crtc.cpp +++ b/src/mame/sharp/x68k_crtc.cpp @@ -2,7 +2,7 @@ // copyright-holders:Barry Rodewald,Carl #include "emu.h" -#include "video/x68k_crtc.h" +#include "x68k_crtc.h" #include "screen.h" //#define VERBOSE 1 diff --git a/src/mame/sharp/x68k_kbd.cpp b/src/mame/sharp/x68k_kbd.cpp index 6835e2e24b2..1b1301237a8 100644 --- a/src/mame/sharp/x68k_kbd.cpp +++ b/src/mame/sharp/x68k_kbd.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Barry Rodewald,Vas Crabb #include "emu.h" -#include "machine/x68k_kbd.h" +#include "x68k_kbd.h" #include "machine/keyboard.ipp" diff --git a/src/mame/sharp/x68k_v.cpp b/src/mame/sharp/x68k_v.cpp index bcfe47c6f15..11448792883 100644 --- a/src/mame/sharp/x68k_v.cpp +++ b/src/mame/sharp/x68k_v.cpp @@ -34,7 +34,7 @@ */ #include "emu.h" -#include "includes/x68k.h" +#include "x68k.h" //#define VERBOSE 0 #include "logmacro.h" diff --git a/src/mame/siemens/pcd.cpp b/src/mame/siemens/pcd.cpp index e66ac334991..1f48b74e1d9 100644 --- a/src/mame/siemens/pcd.cpp +++ b/src/mame/siemens/pcd.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "emu.h" -#include "machine/pcd_kbd.h" -#include "video/pcd.h" +#include "pcd_kbd.h" +#include "pcd.h" #include "bus/rs232/rs232.h" #include "bus/scsi/omti5100.h" diff --git a/src/mame/siemens/pcd.h b/src/mame/siemens/pcd.h new file mode 100644 index 00000000000..69b58b8c84c --- /dev/null +++ b/src/mame/siemens/pcd.h @@ -0,0 +1,125 @@ +// license:BSD-3-Clause +// copyright-holders:Carl +#ifndef MAME_VIDEO_PCD_H +#define MAME_VIDEO_PCD_H + +#pragma once + +#include "machine/pic8259.h" +#include "machine/timer.h" +#include "video/scn2674.h" +#include "emupal.h" + +#include "diserial.h" + + +class pcdx_video_device : public device_t, public device_gfx_interface +{ +public: + virtual void map(address_map &map) = 0; + uint8_t detect_r(); + void detect_w(uint8_t data); + +protected: + pcdx_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + void pcdx_palette(palette_device &palette) const; + + required_device m_maincpu; + required_device m_mcu; + required_device m_pic2; +}; + +class pcd_video_device : public pcdx_video_device +{ +public: + pcd_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + virtual void map(address_map &map) override; + void vram_sw_w(uint8_t data); + uint8_t vram_r(offs_t offset); + void vram_w(offs_t offset, uint8_t data); + +protected: + void device_start() override; + void device_reset() override; + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + +private: + required_device m_crtc; + required_ioport m_mouse_btn; + required_ioport m_mouse_x; + required_ioport m_mouse_y; + + std::vector m_vram; + std::vector m_charram; + uint8_t m_vram_sw, m_t1, m_p2; + + struct + { + int phase; + int x; + int y; + int prev_x; + int prev_y; + int xa; + int xb; + int ya; + int yb; + } m_mouse; + + uint8_t t1_r(); + uint8_t p1_r(); + void p2_w(uint8_t data); + TIMER_DEVICE_CALLBACK_MEMBER(mouse_timer); + + SCN2674_DRAW_CHARACTER_MEMBER(display_pixels); +}; + +class pcx_video_device : public pcdx_video_device, + public device_serial_interface +{ +public: + pcx_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + auto txd_handler() { return m_txd_handler.bind(); } + + virtual void map(address_map &map) override; + uint8_t term_r(offs_t offset); + void term_w(offs_t offset, uint8_t data); + uint8_t term_mcu_r(offs_t offset); + void term_mcu_w(offs_t offset, uint8_t data); + uint8_t unk_r(); + void p1_w(uint8_t data); + + void pcx_vid_io(address_map &map); + void pcx_vid_map(address_map &map); + void pcx_char_ram(address_map &map); + void pcx_attr_ram(address_map &map); +protected: + void device_start() override; + void device_reset() override; + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + + void tra_callback() override; + void rcv_complete() override; + +private: + required_device m_crtc; + + required_region_ptr m_charrom; + devcb_write_line m_txd_handler; + uint8_t m_term_key, m_term_char, m_term_stat, m_p1; + + uint8_t rx_callback(); + void tx_callback(uint8_t data); + + SCN2672_DRAW_CHARACTER_MEMBER(display_pixels); +}; + +DECLARE_DEVICE_TYPE(PCD_VIDEO, pcd_video_device) +DECLARE_DEVICE_TYPE(PCX_VIDEO, pcx_video_device) + +#endif // MAME_VIDEO_PCD_H diff --git a/src/mame/siemens/pcd_v.h b/src/mame/siemens/pcd_v.h deleted file mode 100644 index 69b58b8c84c..00000000000 --- a/src/mame/siemens/pcd_v.h +++ /dev/null @@ -1,125 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Carl -#ifndef MAME_VIDEO_PCD_H -#define MAME_VIDEO_PCD_H - -#pragma once - -#include "machine/pic8259.h" -#include "machine/timer.h" -#include "video/scn2674.h" -#include "emupal.h" - -#include "diserial.h" - - -class pcdx_video_device : public device_t, public device_gfx_interface -{ -public: - virtual void map(address_map &map) = 0; - uint8_t detect_r(); - void detect_w(uint8_t data); - -protected: - pcdx_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - void pcdx_palette(palette_device &palette) const; - - required_device m_maincpu; - required_device m_mcu; - required_device m_pic2; -}; - -class pcd_video_device : public pcdx_video_device -{ -public: - pcd_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - virtual void map(address_map &map) override; - void vram_sw_w(uint8_t data); - uint8_t vram_r(offs_t offset); - void vram_w(offs_t offset, uint8_t data); - -protected: - void device_start() override; - void device_reset() override; - virtual const tiny_rom_entry *device_rom_region() const override; - virtual void device_add_mconfig(machine_config &config) override; - virtual ioport_constructor device_input_ports() const override; - -private: - required_device m_crtc; - required_ioport m_mouse_btn; - required_ioport m_mouse_x; - required_ioport m_mouse_y; - - std::vector m_vram; - std::vector m_charram; - uint8_t m_vram_sw, m_t1, m_p2; - - struct - { - int phase; - int x; - int y; - int prev_x; - int prev_y; - int xa; - int xb; - int ya; - int yb; - } m_mouse; - - uint8_t t1_r(); - uint8_t p1_r(); - void p2_w(uint8_t data); - TIMER_DEVICE_CALLBACK_MEMBER(mouse_timer); - - SCN2674_DRAW_CHARACTER_MEMBER(display_pixels); -}; - -class pcx_video_device : public pcdx_video_device, - public device_serial_interface -{ -public: - pcx_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - auto txd_handler() { return m_txd_handler.bind(); } - - virtual void map(address_map &map) override; - uint8_t term_r(offs_t offset); - void term_w(offs_t offset, uint8_t data); - uint8_t term_mcu_r(offs_t offset); - void term_mcu_w(offs_t offset, uint8_t data); - uint8_t unk_r(); - void p1_w(uint8_t data); - - void pcx_vid_io(address_map &map); - void pcx_vid_map(address_map &map); - void pcx_char_ram(address_map &map); - void pcx_attr_ram(address_map &map); -protected: - void device_start() override; - void device_reset() override; - virtual const tiny_rom_entry *device_rom_region() const override; - virtual void device_add_mconfig(machine_config &config) override; - - void tra_callback() override; - void rcv_complete() override; - -private: - required_device m_crtc; - - required_region_ptr m_charrom; - devcb_write_line m_txd_handler; - uint8_t m_term_key, m_term_char, m_term_stat, m_p1; - - uint8_t rx_callback(); - void tx_callback(uint8_t data); - - SCN2672_DRAW_CHARACTER_MEMBER(display_pixels); -}; - -DECLARE_DEVICE_TYPE(PCD_VIDEO, pcd_video_device) -DECLARE_DEVICE_TYPE(PCX_VIDEO, pcx_video_device) - -#endif // MAME_VIDEO_PCD_H diff --git a/src/mame/sigma/spiders.cpp b/src/mame/sigma/spiders.cpp index e1f96bfe2d9..fd6453391fc 100644 --- a/src/mame/sigma/spiders.cpp +++ b/src/mame/sigma/spiders.cpp @@ -190,7 +190,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/spiders.h" +#include "spiders.h" #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/sigma/spiders_a.cpp b/src/mame/sigma/spiders_a.cpp index e1c90e3d0be..d50e2903ebf 100644 --- a/src/mame/sigma/spiders_a.cpp +++ b/src/mame/sigma/spiders_a.cpp @@ -9,7 +9,7 @@ To Do: add filters ***************************************************************************/ #include "emu.h" -#include "includes/spiders.h" +#include "spiders.h" #include "machine/6821pia.h" #include "sound/discrete.h" diff --git a/src/mame/sigma/sub.cpp b/src/mame/sigma/sub.cpp index 3e550dd7f32..1254e7e56fb 100644 --- a/src/mame/sigma/sub.cpp +++ b/src/mame/sigma/sub.cpp @@ -109,7 +109,7 @@ PCB2 (Top board, CPU board) *************************************************************************************/ #include "emu.h" -#include "includes/sub.h" +#include "sub.h" void sub_state::machine_start() { diff --git a/src/mame/sigma/sub_v.cpp b/src/mame/sigma/sub_v.cpp index 920947e4a33..9230f3bd198 100644 --- a/src/mame/sigma/sub_v.cpp +++ b/src/mame/sigma/sub_v.cpp @@ -9,7 +9,7 @@ Video functions *************************************************************************************/ #include "emu.h" -#include "includes/sub.h" +#include "sub.h" void sub_state::sub_palette(palette_device &palette) const { diff --git a/src/mame/sinclair/atm.cpp b/src/mame/sinclair/atm.cpp index ff511172945..f4a36e54f36 100644 --- a/src/mame/sinclair/atm.cpp +++ b/src/mame/sinclair/atm.cpp @@ -9,11 +9,12 @@ Not working because of banking issues. *******************************************************************************************/ #include "emu.h" -#include "includes/spec128.h" -#include "includes/specpls3.h" +#include "spec128.h" +#include "specpls3.h" + +#include "beta_m.h" #include "sound/ay8910.h" -#include "machine/beta.h" namespace { diff --git a/src/mame/sinclair/beta_m.cpp b/src/mame/sinclair/beta_m.cpp index 2d6d13a781c..a64778af78d 100644 --- a/src/mame/sinclair/beta_m.cpp +++ b/src/mame/sinclair/beta_m.cpp @@ -15,7 +15,7 @@ BUGS: */ #include "emu.h" -#include "machine/beta.h" +#include "beta_m.h" #include "formats/trd_dsk.h" diff --git a/src/mame/sinclair/elwro800.cpp b/src/mame/sinclair/elwro800.cpp index 3f2ff68b0dd..9e79d3dfbd1 100644 --- a/src/mame/sinclair/elwro800.cpp +++ b/src/mame/sinclair/elwro800.cpp @@ -15,7 +15,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/spectrum.h" +#include "spectrum.h" /* Components */ #include "cpu/z80/z80.h" diff --git a/src/mame/sinclair/pentagon.cpp b/src/mame/sinclair/pentagon.cpp index d2a176214e5..70f0c0e0bd7 100644 --- a/src/mame/sinclair/pentagon.cpp +++ b/src/mame/sinclair/pentagon.cpp @@ -1,9 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Miodrag Milanovic, MetalliC #include "emu.h" -#include "includes/spec128.h" +#include "spec128.h" + +#include "beta_m.h" -#include "machine/beta.h" #include "sound/ay8910.h" #include "screen.h" diff --git a/src/mame/sinclair/ql.cpp b/src/mame/sinclair/ql.cpp index 68297d309a8..1a443e048d1 100644 --- a/src/mame/sinclair/ql.cpp +++ b/src/mame/sinclair/ql.cpp @@ -79,11 +79,11 @@ #include "cpu/m68000/m68000.h" #include "cpu/mcs48/mcs48.h" #include "imagedev/microdrv.h" -#include "machine/qimi.h" +#include "qimi.h" #include "machine/ram.h" -#include "machine/zx8302.h" +#include "zx8302.h" #include "sound/spkrdev.h" -#include "video/zx8301.h" +#include "zx8301.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/sinclair/scorpion.cpp b/src/mame/sinclair/scorpion.cpp index a87b7314d29..397ed1b9ad3 100644 --- a/src/mame/sinclair/scorpion.cpp +++ b/src/mame/sinclair/scorpion.cpp @@ -2,9 +2,10 @@ // copyright-holders:Miodrag Milanovic #include "emu.h" -#include "includes/spec128.h" +#include "spec128.h" + +#include "beta_m.h" -#include "machine/beta.h" #include "machine/timer.h" #include "sound/ay8910.h" diff --git a/src/mame/sinclair/spec128.cpp b/src/mame/sinclair/spec128.cpp index c1ab6e53476..803231bb536 100644 --- a/src/mame/sinclair/spec128.cpp +++ b/src/mame/sinclair/spec128.cpp @@ -151,7 +151,7 @@ resulting mess can be seen in the F4 viewer display. *******************************************************************************/ #include "emu.h" -#include "includes/spec128.h" +#include "spec128.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/sinclair/spec_snqk.cpp b/src/mame/sinclair/spec_snqk.cpp index a854fd5409b..d137e1adcbc 100644 --- a/src/mame/sinclair/spec_snqk.cpp +++ b/src/mame/sinclair/spec_snqk.cpp @@ -30,12 +30,12 @@ #include "emu.h" #include "ui/uimain.h" #include "cpu/z80/z80.h" -#include "includes/spectrum.h" -#include "includes/spec128.h" -#include "includes/timex.h" -#include "includes/specpls3.h" +#include "spectrum.h" +#include "spec128.h" +#include "timex.h" +#include "specpls3.h" #include "sound/ay8910.h" -#include "machine/spec_snqk.h" +#include "spec_snqk.h" #include "corestr.h" #define EXEC_NA "N/A" diff --git a/src/mame/sinclair/specpls3.cpp b/src/mame/sinclair/specpls3.cpp index 952ac2eddb1..ee78067716b 100644 --- a/src/mame/sinclair/specpls3.cpp +++ b/src/mame/sinclair/specpls3.cpp @@ -147,7 +147,7 @@ http://www.z88forever.org.uk/zxplus3e/ *******************************************************************************/ #include "emu.h" -#include "includes/specpls3.h" +#include "specpls3.h" #include "sound/ay8910.h" diff --git a/src/mame/sinclair/spectrum.cpp b/src/mame/sinclair/spectrum.cpp index 4027e4d4bd8..5cfc5144725 100644 --- a/src/mame/sinclair/spectrum.cpp +++ b/src/mame/sinclair/spectrum.cpp @@ -276,10 +276,10 @@ SamRam *******************************************************************************/ #include "emu.h" -#include "includes/spectrum.h" +#include "spectrum.h" #include "cpu/z80/z80.h" -#include "machine/spec_snqk.h" +#include "spec_snqk.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/sinclair/spectrum.h b/src/mame/sinclair/spectrum.h index 10003c3f313..8ab83852296 100644 --- a/src/mame/sinclair/spectrum.h +++ b/src/mame/sinclair/spectrum.h @@ -11,7 +11,7 @@ #pragma once -#include "machine/spec_snqk.h" +#include "spec_snqk.h" #include "machine/bankdev.h" #include "bus/spectrum/exp.h" #include "imagedev/cassette.h" diff --git a/src/mame/sinclair/spectrum_v.cpp b/src/mame/sinclair/spectrum_v.cpp index 67bdb5a0422..32c4ce7dbfc 100644 --- a/src/mame/sinclair/spectrum_v.cpp +++ b/src/mame/sinclair/spectrum_v.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/spectrum.h" -#include "includes/spec128.h" +#include "spectrum.h" +#include "spec128.h" TIMER_CALLBACK_MEMBER(spectrum_state::finish_screen_update) { diff --git a/src/mame/sinclair/timex.cpp b/src/mame/sinclair/timex.cpp index b3b5c72e98a..50a59cd3df7 100644 --- a/src/mame/sinclair/timex.cpp +++ b/src/mame/sinclair/timex.cpp @@ -147,10 +147,11 @@ http://www.z88forever.org.uk/zxplus3e/ *******************************************************************************/ #include "emu.h" -#include "includes/timex.h" +#include "timex.h" + +#include "beta_m.h" #include "cpu/z80/z80.h" -#include "machine/beta.h" #include "sound/ay8910.h" #include "screen.h" diff --git a/src/mame/sinclair/timex_v.cpp b/src/mame/sinclair/timex_v.cpp index 5a124426bdb..428cff1e242 100644 --- a/src/mame/sinclair/timex_v.cpp +++ b/src/mame/sinclair/timex_v.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/timex.h" +#include "timex.h" #include "machine/ram.h" diff --git a/src/mame/sinclair/tsconf.cpp b/src/mame/sinclair/tsconf.cpp index ccbc863a6e5..d5efe0b2f0b 100644 --- a/src/mame/sinclair/tsconf.cpp +++ b/src/mame/sinclair/tsconf.cpp @@ -65,7 +65,7 @@ TODO: ****************************************************************************/ #include "emu.h" -#include "includes/tsconf.h" +#include "tsconf.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "speaker.h" diff --git a/src/mame/sinclair/tsconf.h b/src/mame/sinclair/tsconf.h index e69e11fc987..22bcfbfa5b7 100644 --- a/src/mame/sinclair/tsconf.h +++ b/src/mame/sinclair/tsconf.h @@ -12,7 +12,8 @@ #include "spec128.h" -#include "machine/beta.h" +#include "beta_m.h" + #include "machine/glukrs.h" #include "machine/pckeybrd.h" #include "machine/spi_sdcard.h" diff --git a/src/mame/sinclair/tsconf_m.cpp b/src/mame/sinclair/tsconf_m.cpp index 90034045bc2..fa6e956569e 100644 --- a/src/mame/sinclair/tsconf_m.cpp +++ b/src/mame/sinclair/tsconf_m.cpp @@ -2,7 +2,7 @@ // copyright-holders:Andrei I. Holub #include "emu.h" -#include "includes/tsconf.h" +#include "tsconf.h" #define PAGE4K(_r) ((_r) << 14) diff --git a/src/mame/sinclair/zx.cpp b/src/mame/sinclair/zx.cpp index c7c18c2623d..6b5d5192629 100644 --- a/src/mame/sinclair/zx.cpp +++ b/src/mame/sinclair/zx.cpp @@ -44,7 +44,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/zx.h" +#include "zx.h" #include "speaker.h" diff --git a/src/mame/sinclair/zx_m.cpp b/src/mame/sinclair/zx_m.cpp index cf08590c0fa..5d914f4c2dd 100644 --- a/src/mame/sinclair/zx_m.cpp +++ b/src/mame/sinclair/zx_m.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/zx.h" +#include "zx.h" void zx_state::init_zx() { diff --git a/src/mame/sinclair/zx_v.cpp b/src/mame/sinclair/zx_v.cpp index 6ec6545623b..0aea732383f 100644 --- a/src/mame/sinclair/zx_v.cpp +++ b/src/mame/sinclair/zx_v.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/zx.h" +#include "zx.h" TIMER_CALLBACK_MEMBER(zx_state::zx_ula_hsync) diff --git a/src/mame/skeleton/ampex210.cpp b/src/mame/skeleton/ampex210.cpp index ebcd0debc9b..12c76ff44fe 100644 --- a/src/mame/skeleton/ampex210.cpp +++ b/src/mame/skeleton/ampex210.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/ampex210_kbd.h" +#include "ampex210_kbd.h" #include "machine/mos6551.h" #include "machine/nvram.h" #include "machine/z80ctc.h" diff --git a/src/mame/skeleton/aussiebyte.cpp b/src/mame/skeleton/aussiebyte.cpp index 21cb2e96e82..3d452580ed7 100644 --- a/src/mame/skeleton/aussiebyte.cpp +++ b/src/mame/skeleton/aussiebyte.cpp @@ -31,7 +31,7 @@ ************************************************************/ #include "emu.h" -#include "includes/aussiebyte.h" +#include "aussiebyte.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/skeleton/aussiebyte_v.cpp b/src/mame/skeleton/aussiebyte_v.cpp index 65aceaa2cab..9348d7c96a3 100644 --- a/src/mame/skeleton/aussiebyte_v.cpp +++ b/src/mame/skeleton/aussiebyte_v.cpp @@ -13,7 +13,7 @@ ************************************************************/ #include "emu.h" -#include "includes/aussiebyte.h" +#include "aussiebyte.h" /*********************************************************** I/O Ports diff --git a/src/mame/skeleton/basf7100.cpp b/src/mame/skeleton/basf7100.cpp index 5e3f0238067..62859323228 100644 --- a/src/mame/skeleton/basf7100.cpp +++ b/src/mame/skeleton/basf7100.cpp @@ -58,7 +58,7 @@ #include "bus/centronics/ctronics.h" #include "bus/rs232/rs232.h" #include "imagedev/floppy.h" -#include "machine/basf7100_kbd.h" +#include "basf7100_kbd.h" #include "emupal.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/skeleton/busicom.cpp b/src/mame/skeleton/busicom.cpp index ceeac8df9f8..57fb6cd9dca 100644 --- a/src/mame/skeleton/busicom.cpp +++ b/src/mame/skeleton/busicom.cpp @@ -11,7 +11,7 @@ Multiply and divide work; addition and subtraction do not. ****************************************************************************/ #include "emu.h" -#include "includes/busicom.h" +#include "busicom.h" #include "screen.h" diff --git a/src/mame/skeleton/busicom_v.cpp b/src/mame/skeleton/busicom_v.cpp index 711d1917915..d74da5006dc 100644 --- a/src/mame/skeleton/busicom_v.cpp +++ b/src/mame/skeleton/busicom_v.cpp @@ -8,7 +8,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/busicom.h" +#include "busicom.h" // Printer font 34x44 as provided by MIT Media Lab diff --git a/src/mame/skeleton/cosmicos.cpp b/src/mame/skeleton/cosmicos.cpp index 01fc9b772d5..395e1b666ae 100644 --- a/src/mame/skeleton/cosmicos.cpp +++ b/src/mame/skeleton/cosmicos.cpp @@ -38,7 +38,7 @@ */ #include "emu.h" -#include "includes/cosmicos.h" +#include "cosmicos.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/skeleton/cxhumax.cpp b/src/mame/skeleton/cxhumax.cpp index 40123dbf8de..fedd4df2f73 100644 --- a/src/mame/skeleton/cxhumax.cpp +++ b/src/mame/skeleton/cxhumax.cpp @@ -13,7 +13,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/cxhumax.h" +#include "cxhumax.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/skeleton/digilog320.cpp b/src/mame/skeleton/digilog320.cpp index f23eeaad144..7d7f26e0d5c 100644 --- a/src/mame/skeleton/digilog320.cpp +++ b/src/mame/skeleton/digilog320.cpp @@ -57,7 +57,7 @@ #include "cpu/i86/i186.h" #include "cpu/z80/z80.h" #include "machine/am9519.h" -#include "machine/digilog_kbd.h" +#include "digilog_kbd.h" #include "machine/i8251.h" #include "machine/mc68681.h" #include "machine/nvram.h" diff --git a/src/mame/skeleton/digilog400.cpp b/src/mame/skeleton/digilog400.cpp index eafbd3fbd1d..de86b3cddcd 100644 --- a/src/mame/skeleton/digilog400.cpp +++ b/src/mame/skeleton/digilog400.cpp @@ -12,7 +12,7 @@ #include "emu.h" #include "cpu/i86/i186.h" -#include "machine/digilog_kbd.h" +#include "digilog_kbd.h" #include "emupal.h" diff --git a/src/mame/skeleton/dm7000.cpp b/src/mame/skeleton/dm7000.cpp index 6160394ee64..82031785b58 100644 --- a/src/mame/skeleton/dm7000.cpp +++ b/src/mame/skeleton/dm7000.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/dm7000.h" +#include "dm7000.h" #include "screen.h" #define VERBOSE_LEVEL ( 9 ) diff --git a/src/mame/skeleton/dmv.cpp b/src/mame/skeleton/dmv.cpp index 8ea2ee409e1..cd8b94c62be 100644 --- a/src/mame/skeleton/dmv.cpp +++ b/src/mame/skeleton/dmv.cpp @@ -16,7 +16,7 @@ #include "cpu/z80/z80.h" #include "imagedev/floppy.h" #include "machine/am9517a.h" -#include "machine/dmv_keyb.h" +#include "dmv_keyb.h" #include "machine/pit8253.h" #include "machine/upd765.h" #include "sound/spkrdev.h" diff --git a/src/mame/skeleton/hazeltin.cpp b/src/mame/skeleton/hazeltin.cpp index 6a0e59f61e3..89ab346bf79 100644 --- a/src/mame/skeleton/hazeltin.cpp +++ b/src/mame/skeleton/hazeltin.cpp @@ -32,7 +32,7 @@ References: #include "machine/input_merger.h" #include "machine/kb3600.h" #include "machine/netlist.h" -#include "machine/nl_hazelvid.h" +#include "nl_hazelvid.h" #include "netlist/devices/net_lib.h" #include "emupal.h" diff --git a/src/mame/skeleton/itt1700.cpp b/src/mame/skeleton/itt1700.cpp index f9d9cb41f04..52a05c16a75 100644 --- a/src/mame/skeleton/itt1700.cpp +++ b/src/mame/skeleton/itt1700.cpp @@ -18,7 +18,7 @@ This device may be related to the Intel 8251, but it is definitely not a SCN2651 #include "emu.h" #include "cpu/z80/z80.h" #include "cpu/mcs48/mcs48.h" -#include "machine/itt1700_kbd.h" +#include "itt1700_kbd.h" #include "video/mc6845.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/skeleton/itt1700_kbd.cpp b/src/mame/skeleton/itt1700_kbd.cpp index e8cfdb7c6e7..e24cb0c2a64 100644 --- a/src/mame/skeleton/itt1700_kbd.cpp +++ b/src/mame/skeleton/itt1700_kbd.cpp @@ -7,7 +7,7 @@ Preliminary ITT 1700 keyboard emulation. ***********************************************************************************************************************************/ #include "emu.h" -#include "machine/itt1700_kbd.h" +#include "itt1700_kbd.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/mame/skeleton/micronic.cpp b/src/mame/skeleton/micronic.cpp index 3d5ed1bdcb6..ee630def976 100644 --- a/src/mame/skeleton/micronic.cpp +++ b/src/mame/skeleton/micronic.cpp @@ -118,7 +118,7 @@ */ #include "emu.h" -#include "includes/micronic.h" +#include "micronic.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/skeleton/mod8.cpp b/src/mame/skeleton/mod8.cpp index 87604626d4c..004033feb57 100644 --- a/src/mame/skeleton/mod8.cpp +++ b/src/mame/skeleton/mod8.cpp @@ -55,8 +55,12 @@ While in 'space' mode, press a letter to increment CLP, or shift-delete ****************************************************************************/ #include "emu.h" + +#include "teleprinter.h" + #include "cpu/i8008/i8008.h" -#include "machine/teleprinter.h" + +namespace { class mod8_state : public driver_device { @@ -176,6 +180,8 @@ ROM_START( mod8 ) ROM_LOAD( "mon8.007", 0x0600, 0x0100, CRC(49a5c626) SHA1(66c1865db9151818d3b20ec3c68dd793cb98a221)) ROM_END +} // anonymous namespace + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/skeleton/ms0515.cpp b/src/mame/skeleton/ms0515.cpp index 3c7ccc25ef8..31a56a7e621 100644 --- a/src/mame/skeleton/ms0515.cpp +++ b/src/mame/skeleton/ms0515.cpp @@ -27,24 +27,25 @@ #include "emu.h" +#include "ms7004.h" + #include "bus/rs232/rs232.h" #include "cpu/t11/t11.h" #include "imagedev/floppy.h" #include "machine/clock.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/ms7004.h" #include "machine/pit8253.h" #include "machine/ram.h" #include "machine/wd_fdc.h" #include "sound/spkrdev.h" -#include "formats/ms0515_dsk.h" - #include "emupal.h" #include "screen.h" #include "speaker.h" +#include "formats/ms0515_dsk.h" + #include "ms0515.lh" diff --git a/src/mame/skeleton/ngen.cpp b/src/mame/skeleton/ngen.cpp index 5ebac210627..81af26b9a6f 100644 --- a/src/mame/skeleton/ngen.cpp +++ b/src/mame/skeleton/ngen.cpp @@ -70,7 +70,7 @@ #include "machine/am9517a.h" #include "machine/clock.h" #include "machine/i8251.h" -#include "machine/ngen_kb.h" +#include "ngen_kb.h" #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/wd2010.h" diff --git a/src/mame/skeleton/palestra.cpp b/src/mame/skeleton/palestra.cpp index dbf288043d8..cd66fb7f242 100644 --- a/src/mame/skeleton/palestra.cpp +++ b/src/mame/skeleton/palestra.cpp @@ -26,7 +26,7 @@ #include "machine/netlist.h" #include "netlist/devices/net_lib.h" -#include "machine/nl_palestra.h" +#include "nl_palestra.h" #include "video/fixfreq.h" #include "screen.h" diff --git a/src/mame/skeleton/softbox.cpp b/src/mame/skeleton/softbox.cpp index 4a4bbc1bd37..c892b276c07 100644 --- a/src/mame/skeleton/softbox.cpp +++ b/src/mame/skeleton/softbox.cpp @@ -94,7 +94,7 @@ */ #include "emu.h" -#include "includes/softbox.h" +#include "softbox.h" #include "bus/rs232/rs232.h" #include "softlist.h" diff --git a/src/mame/skeleton/testpat.cpp b/src/mame/skeleton/testpat.cpp index 46a6c69c96b..48f4eb1b484 100644 --- a/src/mame/skeleton/testpat.cpp +++ b/src/mame/skeleton/testpat.cpp @@ -18,8 +18,8 @@ Radio, 1985, N6 #include "machine/netlist.h" #include "netlist/devices/net_lib.h" -#include "machine/nl_tp1983.h" -#include "machine/nl_tp1985.h" +#include "nl_tp1983.h" +#include "nl_tp1985.h" #include "video/fixfreq.h" #include "screen.h" diff --git a/src/mame/skeleton/vp415.cpp b/src/mame/skeleton/vp415.cpp index d13d41c5153..78454b17225 100644 --- a/src/mame/skeleton/vp415.cpp +++ b/src/mame/skeleton/vp415.cpp @@ -39,7 +39,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/vp415.h" +#include "vp415.h" const char *const vp415_state::DATACPU_TAG = "datacpu"; const char *const vp415_state::DATAMCU_TAG = "datamcu"; diff --git a/src/mame/skeleton/xor100.cpp b/src/mame/skeleton/xor100.cpp index d681fc4e628..fe21a14871b 100644 --- a/src/mame/skeleton/xor100.cpp +++ b/src/mame/skeleton/xor100.cpp @@ -43,7 +43,7 @@ TODO: #include "emu.h" -#include "includes/xor100.h" +#include "xor100.h" #include "bus/rs232/rs232.h" /* Read/Write Handlers */ diff --git a/src/mame/skeleton/zorba.cpp b/src/mame/skeleton/zorba.cpp index 74f85779d4f..e0d40e09204 100644 --- a/src/mame/skeleton/zorba.cpp +++ b/src/mame/skeleton/zorba.cpp @@ -51,9 +51,9 @@ ToDo: *************************************************************************************************************/ #include "emu.h" -#include "includes/zorba.h" +#include "zorba.h" -#include "machine/zorbakbd.h" +#include "zorbakbd.h" #include "bus/centronics/ctronics.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/snk/bbusters.cpp b/src/mame/snk/bbusters.cpp index b4ecd9d8394..d7461c665ac 100644 --- a/src/mame/snk/bbusters.cpp +++ b/src/mame/snk/bbusters.cpp @@ -101,7 +101,7 @@ #include "emu.h" // src/mame -#include "video/snk_bbusters_spr.h" +#include "snk_bbusters_spr.h" // src/devices #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/snk/hng64.cpp b/src/mame/snk/hng64.cpp index 6baebd02c87..9681495607e 100644 --- a/src/mame/snk/hng64.cpp +++ b/src/mame/snk/hng64.cpp @@ -704,9 +704,10 @@ LVS-DG2 #include "emu.h" -#include "includes/hng64.h" +#include "hng64.h" #include "cpu/mips/mips3.h" +#include "cpu/z80/kl5c80a12.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" @@ -720,6 +721,58 @@ LVS-DG2 #include "logmacro.h" +// this is driven by a KL5C80A12CFP which is basically a super-charged Z80 +// MMU handling has been moved to the core; the rest is not implemented yet. + +// I believe this CPU is used for network only (the racing games) and not related to the I/O MCU + +/* +0x6010: tests RAM at [3]8000 + +*/ + +void hng64_state::hng_comm_map(address_map &map) +{ + map(0x00000, 0x7ffff).rom().region("user2", 0); + map(0xf0000, 0xfffff).ram(); +} + +void hng64_state::hng_comm_io_map(address_map &map) +{ + map.global_mask(0xff); + /* Reserved for the KL5C80 internal hardware */ +// map(0x00, 0x07).rw(FUNC(hng64_state::hng64_comm_mmu_r), FUNC(hng64_state::hng64_comm_mmu_w)); +// map(0x08, 0x1f).noprw(); /* Reserved */ +// map(0x20, 0x25).rw(hng64_state::)); /* Timer/Counter B */ /* hng64 writes here */ +// map(0x27, 0x27).noprw(); /* Reserved */ +// map(0x28, 0x2b).rw(hng64_state::)); /* Timer/Counter A */ /* hng64 writes here */ +// map(0x2c, 0x2f).rw(hng64_state::)); /* Parallel port A */ +// map(0x30, 0x33).rw(hng64_state::)); /* Parallel port B */ +// map(0x34, 0x37).rw(hng64_state::)); /* Interrupt controller */ /* hng64 writes here */ +// map(0x38, 0x39).rw(hng64_state::)); /* Serial port */ /* hng64 writes here */ +// map(0x3a, 0x3b).rw(hng64_state::)); /* System control register */ /* hng64 writes here */ +// map(0x3c, 0x3f).noprw(); /* Reserved */ + + /* General IO */ + map(0x50, 0x57).rw(FUNC(hng64_state::hng64_com_share_r), FUNC(hng64_state::hng64_com_share_w)); +// map(0x72, 0x72).w(hng64_state::)); /* dunno yet */ +} + + +void hng64_state::reset_net() +{ +// m_comm->pulse_input_line(INPUT_LINE_NMI, attotime::zero); // reset the CPU and let 'er rip +// m_comm->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); // hold on there pardner... +} + +void hng64_state::hng64_network(machine_config &config) +{ + KL5C80A12(config, m_comm, HNG64_MASTER_CLOCK / 4); /* KL5C80A12CFP - binary compatible with Z80. */ + m_comm->set_addrmap(AS_PROGRAM, &hng64_state::hng_comm_map); + m_comm->set_addrmap(AS_IO, &hng64_state::hng_comm_io_map); +} + + uint32_t hng64_state::hng64_com_r(offs_t offset, uint32_t mem_mask) { LOGMASKED(LOG_COMRW, "com read (PC=%08x): %08x %08x = %08x\n", m_maincpu->pc(), (offset*4)+0xc0000000, mem_mask, m_idt7133_dpram[offset]); diff --git a/src/mame/snk/hng64_a.cpp b/src/mame/snk/hng64_a.cpp index 74308bc6dea..2404023417c 100644 --- a/src/mame/snk/hng64_a.cpp +++ b/src/mame/snk/hng64_a.cpp @@ -40,7 +40,7 @@ so levels 0,1,2,5 are unmasked, vectors get set during the sound CPU init code. #include "emu.h" -#include "includes/hng64.h" +#include "hng64.h" #include "speaker.h" diff --git a/src/mame/snk/hng64_net.cpp b/src/mame/snk/hng64_net.cpp deleted file mode 100644 index 3d2993efbff..00000000000 --- a/src/mame/snk/hng64_net.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// license:LGPL-2.1+ -// copyright-holders:David Haywood, Angelo Salese, ElSemi, Andrew Gardner -/* HNG64 Communication / Network CPU */ - -// this is driven by a KL5C80A12CFP which is basically a super-charged Z80 -// MMU handling has been moved to the core; the rest is not implemented yet. - -// I believe this CPU is used for network only (the racing games) and not related to the I/O MCU - -/* -0x6010: tests RAM at [3]8000 - -*/ - -#include "emu.h" -#include "includes/hng64.h" -#include "cpu/z80/kl5c80a12.h" - -void hng64_state::hng_comm_map(address_map &map) -{ - map(0x00000, 0x7ffff).rom().region("user2", 0); - map(0xf0000, 0xfffff).ram(); -} - -void hng64_state::hng_comm_io_map(address_map &map) -{ - map.global_mask(0xff); - /* Reserved for the KL5C80 internal hardware */ -// map(0x00, 0x07).rw(FUNC(hng64_state::hng64_comm_mmu_r), FUNC(hng64_state::hng64_comm_mmu_w)); -// map(0x08, 0x1f).noprw(); /* Reserved */ -// map(0x20, 0x25).rw(hng64_state::)); /* Timer/Counter B */ /* hng64 writes here */ -// map(0x27, 0x27).noprw(); /* Reserved */ -// map(0x28, 0x2b).rw(hng64_state::)); /* Timer/Counter A */ /* hng64 writes here */ -// map(0x2c, 0x2f).rw(hng64_state::)); /* Parallel port A */ -// map(0x30, 0x33).rw(hng64_state::)); /* Parallel port B */ -// map(0x34, 0x37).rw(hng64_state::)); /* Interrupt controller */ /* hng64 writes here */ -// map(0x38, 0x39).rw(hng64_state::)); /* Serial port */ /* hng64 writes here */ -// map(0x3a, 0x3b).rw(hng64_state::)); /* System control register */ /* hng64 writes here */ -// map(0x3c, 0x3f).noprw(); /* Reserved */ - - /* General IO */ - map(0x50, 0x57).rw(FUNC(hng64_state::hng64_com_share_r), FUNC(hng64_state::hng64_com_share_w)); -// map(0x72, 0x72).w(hng64_state::)); /* dunno yet */ -} - - -void hng64_state::reset_net() -{ -// m_comm->pulse_input_line(INPUT_LINE_NMI, attotime::zero); // reset the CPU and let 'er rip -// m_comm->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); // hold on there pardner... -} - -void hng64_state::hng64_network(machine_config &config) -{ - KL5C80A12(config, m_comm, HNG64_MASTER_CLOCK / 4); /* KL5C80A12CFP - binary compatible with Z80. */ - m_comm->set_addrmap(AS_PROGRAM, &hng64_state::hng_comm_map); - m_comm->set_addrmap(AS_IO, &hng64_state::hng_comm_io_map); -} diff --git a/src/mame/snk/hng64_v.cpp b/src/mame/snk/hng64_v.cpp index 9c662991e03..49f9a15dc31 100644 --- a/src/mame/snk/hng64_v.cpp +++ b/src/mame/snk/hng64_v.cpp @@ -1,7 +1,7 @@ // license:LGPL-2.1+ // copyright-holders:David Haywood, Angelo Salese, ElSemi, Andrew Gardner #include "emu.h" -#include "includes/hng64.h" +#include "hng64.h" #define BLEND_TEST 0 @@ -1270,5 +1270,5 @@ void hng64_state::video_start() m_vertsrom_size = memregion("verts")->bytes(); } -#include "video/hng64_3d.ipp" -#include "video/hng64_sprite.ipp" +#include "hng64_3d.ipp" +#include "hng64_sprite.ipp" diff --git a/src/mame/snk/lasso.cpp b/src/mame/snk/lasso.cpp index f63457cef19..3317eb5b60d 100644 --- a/src/mame/snk/lasso.cpp +++ b/src/mame/snk/lasso.cpp @@ -31,7 +31,7 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" -#include "includes/lasso.h" +#include "lasso.h" #include "cpu/m6502/m6502.h" #include "cpu/z80/z80.h" diff --git a/src/mame/snk/lasso_v.cpp b/src/mame/snk/lasso_v.cpp index cd3c1d81cab..14f5159be99 100644 --- a/src/mame/snk/lasso_v.cpp +++ b/src/mame/snk/lasso_v.cpp @@ -30,7 +30,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lasso.h" +#include "lasso.h" /*************************************************************************** diff --git a/src/mame/snk/mainsnk.cpp b/src/mame/snk/mainsnk.cpp index ea53c4fed8e..6ec272523ac 100644 --- a/src/mame/snk/mainsnk.cpp +++ b/src/mame/snk/mainsnk.cpp @@ -110,7 +110,7 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k */ #include "emu.h" -#include "includes/mainsnk.h" +#include "mainsnk.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/snk/mainsnk_v.cpp b/src/mame/snk/mainsnk_v.cpp index 0eb25fbcadc..511a68d9cd8 100644 --- a/src/mame/snk/mainsnk_v.cpp +++ b/src/mame/snk/mainsnk_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Tomasz Slanina #include "emu.h" -#include "includes/mainsnk.h" +#include "mainsnk.h" void mainsnk_state::mainsnk_palette(palette_device &palette) const diff --git a/src/mame/snk/mechatt.cpp b/src/mame/snk/mechatt.cpp index 98e85ddf57f..5e5a9a96eba 100644 --- a/src/mame/snk/mechatt.cpp +++ b/src/mame/snk/mechatt.cpp @@ -132,7 +132,7 @@ #include "emu.h" // src/mame -#include "video/snk_bbusters_spr.h" +#include "snk_bbusters_spr.h" // src/devices #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/snk/munchmo.cpp b/src/mame/snk/munchmo.cpp index d01a949d22e..73b55527742 100644 --- a/src/mame/snk/munchmo.cpp +++ b/src/mame/snk/munchmo.cpp @@ -26,7 +26,7 @@ Stephh's notes (based on the game Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/munchmo.h" +#include "munchmo.h" #include "cpu/z80/z80.h" #include "screen.h" diff --git a/src/mame/snk/munchmo_v.cpp b/src/mame/snk/munchmo_v.cpp index 42f92b055fc..e3820948d9b 100644 --- a/src/mame/snk/munchmo_v.cpp +++ b/src/mame/snk/munchmo_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino #include "emu.h" -#include "includes/munchmo.h" +#include "munchmo.h" void munchmo_state::munchmo_palette(palette_device &palette) const diff --git a/src/mame/snk/neogeocd.cpp b/src/mame/snk/neogeocd.cpp deleted file mode 100644 index c07ce032b71..00000000000 --- a/src/mame/snk/neogeocd.cpp +++ /dev/null @@ -1,1124 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Bryan McPhail,Ernesto Corvi,Andrew Prime,Zsolt Vasvari -// thanks-to:Fuzz -/*************************************************************************** - - Neo-Geo CD hardware - - Thanks to: - * Jan Klaassen (of the former FBA team) for much of the CDC / CDD code and system details. - * Mirko Buffoni for a commented disassembly of the NeoCD bios rom. - - Current status: - - NeoCDZ runs, the original NeoCD does not - - Might think the tray is open? (check) - - Some unknown / unhandled CD commands, code is still a bit messy - - CDDA continues to play during loading, should stop it - - Games using Raster Effects are broken without a kludge - - CPU gets overloaded with IRQs from the timer callback... - - Double Dragon doesn't load, it erases the IRQ table - - might need better handling of the Vector Table Mapping, or better interrupts (see point above) - - Softlist are based on an old Tosec set and should be updated to the TruRip set once we can convert CCD - without throwing away gap data etc. - -****************************************************************************/ - -#include "emu.h" -#include "includes/neogeo.h" -#include "machine/nvram.h" -#include "imagedev/chd_cd.h" -#include "machine/74259.h" -#include "machine/megacdcd.h" -#include "softlist.h" - - -// was it actually released in eu / asia? -#define NEOCD_REGION_ASIA 3 // IronClad runs with a darkened screen (MVS has the same issue) -#define NEOCD_REGION_EUROPE 2 // ^ -#define NEOCD_REGION_US 1 -#define NEOCD_REGION_JAPAN 0 - - -class ngcd_state : public aes_base_state -{ -public: - ngcd_state(const machine_config &mconfig, device_type type, const char *tag) - : aes_base_state(mconfig, type, tag) - , m_tempcdc(*this, "tempcdc") - , m_z80_ram(*this, "z80_ram") - , m_adpcm_ram(*this, "adpcm_ram") - { - m_dma_address1 = 0; - m_dma_address2 = 0; - m_dma_value1 = 0; - m_dma_value2 = 0; - m_dma_count = 0; - m_dma_mode = 0; - m_irq_ack = ~0; - m_irq_vector_ack = 0; - m_irq_vector = 0; - m_has_sprite_bus = true; - m_has_text_bus = true; - m_has_ymrom_bus = true; - m_has_z80_bus = true; - } - - optional_device m_tempcdc; - required_shared_ptr m_z80_ram; - required_shared_ptr m_adpcm_ram; - - void do_dma(address_space& curr_space); - void set_dma_regs(int offset, uint16_t wordValue); - - uint16_t memcard_r(offs_t offset); - void memcard_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - uint16_t control_r(offs_t offset); - void control_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - uint8_t transfer_r(offs_t offset); - void transfer_w(offs_t offset, uint8_t data); - - DECLARE_INPUT_CHANGED_MEMBER(aes_jp1); - - // neoCD - uint8_t m_system_region = 0; - int32_t m_active_transfer_area = 0; - int32_t m_sprite_transfer_bank = 0; - int32_t m_adpcm_transfer_bank = 0; - int32_t m_dma_address1; - int32_t m_dma_address2; - int32_t m_dma_value1; - int32_t m_dma_value2; - int32_t m_dma_count; - int32_t m_dma_mode; - int32_t m_irq_ack; - int m_irq_vector_ack; - int m_irq_vector; - - bool m_has_sprite_bus; - bool m_has_text_bus; - bool m_has_ymrom_bus; - bool m_has_z80_bus; - - int get_irq_vector_ack(void) { return m_irq_vector_ack; } - void set_irq_vector_ack(int val) { m_irq_vector_ack = val; } - int get_irq_vector(void) { return m_irq_vector; } - void irq_update(uint8_t byteValue); - - // from the CDC - void interrupt_callback_type1(void); - void interrupt_callback_type2(void); - void interrupt_callback_type3(void); - - uint8_t m_transfer_write_enable = 0; - - bool prohibit_cdc_irq = false; // hack? - - uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - - void init_neocdz(); - void init_neocdzj(); - - uint8_t cdc_irq_ack(); - - std::unique_ptr m_meminternal_data; - std::unique_ptr m_sprite_ram; - std::unique_ptr m_fix_ram; - - void neocd_ntsc(machine_config &config); - void neocd_audio_io_map(address_map &map); - void neocd_audio_map(address_map &map); - void neocd_main_map(address_map &map); - void neocd_vector_map(address_map &map); - void neocd_ym_map(address_map &map); - -protected: - virtual void machine_start() override; - virtual void machine_reset() override; - - int32_t SekIdle(int32_t nCycles); -}; - - - -/************************************* - * - * Memory card - * - *************************************/ - -#define MEMCARD_SIZE 0x0800 - - -/* The NeoCD has an 8kB internal memory card, instead of memcard slots like the MVS and AES */ -uint16_t ngcd_state::memcard_r(offs_t offset) -{ - return m_meminternal_data[offset] | 0xff00; -} - - -void ngcd_state::memcard_w(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - if (ACCESSING_BITS_0_7) - { - m_meminternal_data[offset] = data; - } -} - - -/************************************* - * - * System control register - * - *************************************/ - -uint16_t ngcd_state::control_r(offs_t offset) -{ - uint32_t sekAddress = 0xff0000+ (offset*2); - - switch (sekAddress & 0xFFFF) { - case 0x0016: - return m_tempcdc->nff0016_r(); - - // LC8951 registers - case 0x0100: - return m_tempcdc->segacd_cdc_mode_address_r(); - case 0x0102: - return m_tempcdc->CDC_Reg_r(); - - // CD mechanism communication - case 0x0160: - return m_tempcdc->neocd_cdd_rx_r(); - - case 0x011C: // region - return ~((0x10 | (m_system_region & 3)) << 8); - } - - -// bprintf(PRINT_NORMAL, _T(" - NGCD port 0x%06X read (word, PC: 0x%06X)\n"), sekAddress, SekGetPC(-1)); - - return ~0; -} - - -void ngcd_state::control_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) -{ - uint32_t sekAddress = 0xff0000+ (offset*2); - uint16_t wordValue = data; - -// bprintf(PRINT_NORMAL, _T(" - NGCD port 0x%06X -> 0x%04X (PC: 0x%06X)\n"), sekAddress, wordValue, SekGetPC(-1)); - int byteValue = wordValue & 0xff; - - switch (sekAddress & 0xFFFE) { - case 0x0002: - - m_tempcdc->nff0002_set(wordValue); - - break; - - case 0x000E: - irq_update(wordValue); // irqack - break; - - case 0x0016: - m_tempcdc->nff0016_set(byteValue); - break; - - // DMA controller - case 0x0060: - if (byteValue & 0x40) { - do_dma(space); - } - break; - - case 0x0064: - case 0x0066: - case 0x0068: - case 0x006A: - case 0x006C: - case 0x006E: - case 0x0070: - case 0x0072: - case 0x007E: - set_dma_regs(sekAddress & 0xFFFE, wordValue); - break; - - // upload DMA controller program - - case 0x0080: - case 0x0082: - case 0x0084: - case 0x0086: - case 0x0088: - case 0x008A: - case 0x008C: - case 0x008E: -// bprintf(PRINT_NORMAL, _T(" - DMA controller program[%02i] -> 0x%04X (PC: 0x%06X)\n"), sekAddress & 0x0F, wordValue, SekGetPC(-1)); - break; - - // LC8951 registers - case 0x0100: - m_tempcdc->segacd_cdc_mode_address_w(0, byteValue, 0xffff); - break; - case 0x0102: - m_tempcdc->CDC_Reg_w(byteValue); - break; - - case 0x0104: -// bprintf(PRINT_NORMAL, _T(" - NGCD 0xE00000 area -> 0x%02X (PC: 0x%06X)\n"), byteValue, SekGetPC(-1)); - if (ACCESSING_BITS_0_7) - { - m_active_transfer_area = byteValue; - } - break; - - case 0x0120: -// bprintf(PRINT_NORMAL, _T(" - NGCD OBJ BUSREQ -> 1 (PC: 0x%06X)\n"), SekGetPC(-1)); - m_has_sprite_bus = false; - break; - case 0x0122: -// bprintf(PRINT_NORMAL, _T(" - NGCD PCM BUSREQ -> 1 (PC: 0x%06X) %x\n"), SekGetPC(-1), byteValue); - m_has_ymrom_bus = false; - break; - case 0x0126: -// bprintf(PRINT_NORMAL, _T(" - NGCD Z80 BUSREQ -> 1 (PC: 0x%06X)\n"), SekGetPC(-1)); - m_has_z80_bus = false; - machine().scheduler().synchronize(); - m_audiocpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); - break; - case 0x0128: -// bprintf(PRINT_NORMAL, _T(" - NGCD FIX BUSREQ -> 1 (PC: 0x%06X)\n"), SekGetPC(-1)); - m_has_text_bus = false; - break; - case 0x0140: -// bprintf(PRINT_NORMAL, _T(" - NGCD OBJ BUSREQ -> 0 (PC: 0x%06X)\n"), SekGetPC(-1)); - m_has_sprite_bus = true; - m_sprgen->optimize_sprite_data(); - break; - case 0x0142: -// bprintf(PRINT_NORMAL, _T(" - NGCD PCM BUSREQ -> 0 (PC: 0x%06X)\n"), SekGetPC(-1)); - m_has_ymrom_bus = true; - break; - case 0x0146: -// bprintf(PRINT_NORMAL, _T(" - NGCD Z80 BUSREQ -> 0 (PC: 0x%06X)\n"), SekGetPC(-1)); - m_has_z80_bus = true; - machine().scheduler().synchronize(); - m_audiocpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); - break; - case 0x0148: -// bprintf(PRINT_NORMAL, _T(" - NGCD FIX BUSREQ -> 0 (PC: 0x%06X)\n"), SekGetPC(-1)); - m_has_text_bus = true; - break; - - // CD mechanism communication - case 0x0162: - m_tempcdc->neocd_cdd_tx_w(byteValue); - break; - case 0x0164: - m_tempcdc->NeoCDCommsControl(byteValue & 1, byteValue & 2); - break; - - case 0x016c: -// bprintf(PRINT_ERROR, _T(" - NGCD port 0x%06X -> 0x%02X (PC: 0x%06X)\n"), sekAddress, byteValue, SekGetPC(-1)); - //MapVectorTable(!(byteValue == 0xFF)); - if (ACCESSING_BITS_0_7) - { - // even like this doubledr ends up mapping vectors in, then erasing them causing the loading to crash?? - // is there some way to enable write protection on the RAM vector area or is it some IRQ masking issue? - // the games still write to the normal address for this too? - // writes 00 / 01 / ff - printf("MapVectorTable? %04x %04x\n",data,mem_mask); - - //m_bank_vectors->set_entry(data == 0 ? 0 : 1); - m_use_cart_vectors = (data == 0 ? 0 : 1); - } - -//extern int32_t bRunPause; -//bRunPause = 1; - break; - - case 0x016e: -// bprintf(PRINT_IMPORTANT, _T(" - NGCD 0xE00000 area write access %s (0x%02X, PC: 0x%06X)\n"), byteValue ? _T("enabled") : _T("disabled"), byteValue, SekGetPC(-1)); - - m_transfer_write_enable = byteValue; - break; - - case 0x0180: { - // 1 during CD access, 0 otherwise, written frequently - //printf("reset cdc %04x %04x\n",data, mem_mask); - - if (ACCESSING_BITS_0_7) - { - if (data==0x00) - { - // not a good idea, causes hangs - // m_tempcdc->NeoCDCommsReset(); - - // I doubt this is correct either, but we need something to stop - // the interrupts during gameplay and I'm not sure what... - prohibit_cdc_irq = true; - } - else - { - prohibit_cdc_irq = false; - } - } - break; - } - case 0x0182: { - // printf("blah %02x\n", byteValue); - if (byteValue == 0x00) - { - m_ym->reset(); - m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - } - else m_audiocpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); - - break; - } - case 0x01A0: - m_sprite_transfer_bank = (byteValue & 3) << 20; - break; - case 0x01A2: - m_adpcm_transfer_bank = (byteValue & 1) << 19; - break; - - - default: { -// bprintf(PRINT_NORMAL, _T(" - NGCD port 0x%06X -> 0x%04X (PC: 0x%06X)\n"), sekAddress, wordValue, SekGetPC(-1)); - } - } - -} - - - - -/* - * Handling NeoCD banked RAM - * When the Z80 space is banked in to 0xe00000, only the low byte of each word is used - */ - - -uint8_t ngcd_state::transfer_r(offs_t offset) -{ - uint32_t sekAddress = 0xe00000+ (offset); - int address; - sekAddress ^= 1; - - switch (m_active_transfer_area) { - case 0: // Sprites - address = (m_sprite_transfer_bank + (sekAddress & 0x0FFFFF)); - - // address is swizzled a bit due to out sprite decoding - if ((address&3)==0) return m_sprite_ram[address]; - if ((address&3)==1) return m_sprite_ram[address^3]; - if ((address&3)==2) return m_sprite_ram[address^3]; - if ((address&3)==3) return m_sprite_ram[address]; - - return m_sprite_ram[m_sprite_transfer_bank + (sekAddress & 0x0FFFFF)]; - case 1: // ADPCM - return m_adpcm_ram[m_adpcm_transfer_bank + ((sekAddress & 0x0FFFFF) >> 1)]; - case 4: // Z80 - if ((sekAddress & 0xfffff) >= 0x20000) return ~0; - return m_z80_ram[(sekAddress & 0x1FFFF) >> 1]; - case 5: // Text - return m_fix_ram[(sekAddress & 0x3FFFF) >> 1]; - } - - return ~0; - -} - -void ngcd_state::transfer_w(offs_t offset, uint8_t data) -{ - uint8_t byteValue = data; - uint32_t sekAddress = 0xe00000+ (offset); - - if (!m_transfer_write_enable) { -// return; - } - int address; - - sekAddress ^= 1; - - switch (m_active_transfer_area) { - case 0: // Sprites - address = (m_sprite_transfer_bank + (sekAddress & 0x0FFFFF)); - - // address is swizzled a bit due to out sprite decoding - if ((address&3)==0) m_sprite_ram[address] = byteValue; - if ((address&3)==1) m_sprite_ram[address^3] = byteValue; - if ((address&3)==2) m_sprite_ram[address^3] = byteValue; - if ((address&3)==3) m_sprite_ram[address] = byteValue; - - break; - case 1: // ADPCM - m_adpcm_ram[m_adpcm_transfer_bank + ((sekAddress & 0x0FFFFF) >> 1)] = byteValue; - break; - case 4: // Z80 - - // kof98 and lresort attempt to write here when the system still has the z80 bank - // it seems they attempt to write regular samples (not even deltat) maybe there is - // some kind of fall-through behavior, or it shouldn't be allowed to select a - // transfer area without the bus? - this should really be checked on hw - if (m_has_z80_bus) - { - m_adpcm_ram[m_adpcm_transfer_bank + ((sekAddress & 0x0FFFFF) >> 1)] = byteValue; - } - else - { - // printf("sekAddress %08x %02x\n", sekAddress, data); - if ((sekAddress & 0xfffff) >= 0x20000) break; - m_z80_ram[(sekAddress & 0x1FFFF) >> 1] = byteValue; - } - break; - case 5: // Text - m_fix_ram[(sekAddress & 0x3FFFF) >> 1] = byteValue; - break; - } -} - - - -void ngcd_state::set_dma_regs(int offset, uint16_t wordValue) -{ - switch (offset) - { - case 0x0064: - m_dma_address1 &= 0x0000FFFF; - m_dma_address1 |= wordValue << 16; - break; - case 0x0066: - m_dma_address1 &= 0xFFFF0000; - m_dma_address1 |= wordValue; - break; - case 0x0068: - m_dma_address2 &= 0x0000FFFF; - m_dma_address2 |= wordValue << 16; - break; - case 0x006A: - m_dma_address2 &= 0xFFFF0000; - m_dma_address2 |= wordValue; - break; - case 0x006C: - m_dma_value1 = wordValue; - break; - case 0x006E: - m_dma_value2 = wordValue; - break; - case 0x0070: - m_dma_count &= 0x0000FFFF; - m_dma_count |= wordValue << 16; - break; - case 0x0072: - m_dma_count &= 0xFFFF0000; - m_dma_count |= wordValue; - break; - - case 0x007E: - m_dma_mode = wordValue; -// bprintf(PRINT_NORMAL, _T(" - DMA controller 0x%2X -> 0x%04X (PC: 0x%06X)\n"), sekAddress & 0xFF, wordValue, SekGetPC(-1)); - break; - - } -} - - - -int32_t ngcd_state::SekIdle(int32_t nCycles) -{ - return nCycles; -} - - - -/* - * CD-ROM / DMA control - * - * DMA - - FF0061 Write 0x40 means start DMA transfer - FF0064 Source address (in copy mode), Target address (in fill mode) - FF0068 Target address (in copy mode) - FF006C Fill word - FF0070 Words count - FF007E \ - ...... | DMA programming words? NeoGeoCD uses Sanyo Puppet LC8359 chip to - FF008E / interface with CD, and do DMA transfers - - Memory access control - - FF011C DIP SWITCH (Region code) - FF0105 Area Selector (5 = FIX, 0 = SPR, 4 = Z80, 1 = PCM) - FF01A1 Sprite bank selector - FF01A3 PCM bank selector - FF0120 Prepare sprite area for transfer - FF0122 Prepare PCM area for transfer - FF0126 Prepare Z80 area for transfer - FF0128 Prepare Fix area for transfer - FF0140 Terminate work on Spr Area (Sprites must be decoded here) - FF0142 Terminate work on Pcm Area - FF0146 Terminate work on Z80 Area (Z80 needs to be reset) - FF0148 Terminate work on Fix Area - - CD-ROM: - 0xff0102 == 0xF0 start cd transfer - int m=bcd(fast_r8(0x10f6c8)); - int s=bcd(fast_r8(0x10f6c9)); - int f=bcd(fast_r8(0x10f6ca)); - int seccount=fast_r16(0x10f688); - - inisec=((m*60)+s)*75+f; - inisec-=150; - dstaddr=0x111204; // this must come from somewhere - - the value @ 0x10f688 is decremented each time a sector is read until it's 0. - - * - */ - - -void ngcd_state::do_dma(address_space& curr_space) -{ - // The LC8953 chip has a programmable DMA controller, which is not properly emulated. - // Since the software only uses it in a limited way, we can apply a simple heuristic - // to determine the requested operation. - - // Additionally, we don't know how many cycles DMA operations take. - // Here, only bus access is used to get a rough approximation -- - // each read/write takes a single cycle, setup and everything else is ignored. - -// bprintf(PRINT_IMPORTANT, _T(" - DMA controller transfer started (PC: 0x%06X)\n"), SekGetPC(-1)); - - switch (m_dma_mode) { - case 0xCFFD: { -// bprintf(PRINT_NORMAL, _T(" adr : 0x%08X - 0x%08X <- address, skip odd bytes\n"), m_dma_address1, m_dma_address1 + m_dma_count * 8); - - // - DMA controller 0x7E -> 0xCFFD (PC: 0xC07CE2) - // - DMA controller program[00] -> 0xFCF5 (PC: 0xC07CE8) - // - DMA controller program[02] -> 0xE8DA (PC: 0xC07CEE) - // - DMA controller program[04] -> 0x92DA (PC: 0xC07CF4) - // - DMA controller program[06] -> 0x92DB (PC: 0xC07CFA) - // - DMA controller program[08] -> 0x96DB (PC: 0xC07D00) - // - DMA controller program[10] -> 0x96F6 (PC: 0xC07D06) - // - DMA controller program[12] -> 0x2E02 (PC: 0xC07D0C) - // - DMA controller program[14] -> 0xFDFF (PC: 0xC07D12) - - SekIdle(m_dma_count * 4); - - while (m_dma_count--) { - curr_space.write_word(m_dma_address1 + 0, m_dma_address1 >> 24); - curr_space.write_word(m_dma_address1 + 2, m_dma_address1 >> 16); - curr_space.write_word(m_dma_address1 + 4, m_dma_address1 >> 8); - curr_space.write_word(m_dma_address1 + 6, m_dma_address1 >> 0); - m_dma_address1 += 8; - } - - break; - } - - case 0xE2DD: { -// bprintf(PRINT_NORMAL, _T(" copy: 0x%08X - 0x%08X <- 0x%08X - 0x%08X, skip odd bytes\n"), m_dma_address2, m_dma_address2 + m_dma_count * 2, m_dma_address1, m_dma_address1 + m_dma_count * 4); - - // - DMA controller 0x7E -> 0xE2DD (PC: 0xC0A190) - // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0A192) - // - DMA controller program[02] -> 0x82BE (PC: 0xC0A194) - // - DMA controller program[04] -> 0x93DA (PC: 0xC0A196) - // - DMA controller program[06] -> 0xBE93 (PC: 0xC0A198) - // - DMA controller program[08] -> 0xDABE (PC: 0xC0A19A) - // - DMA controller program[10] -> 0xF62D (PC: 0xC0A19C) - // - DMA controller program[12] -> 0x02FD (PC: 0xC0A19E) - // - DMA controller program[14] -> 0xFFFF (PC: 0xC0A1A0) - - SekIdle(m_dma_count * 1); - - while (m_dma_count--) { - curr_space.write_word(m_dma_address2 + 0, curr_space.read_byte(m_dma_address1 + 0)); - curr_space.write_word(m_dma_address2 + 2, curr_space.read_byte(m_dma_address1 + 1)); - m_dma_address1 += 2; - m_dma_address2 += 4; - } - - break; - } - - case 0xFC2D: { -// bprintf(PRINT_NORMAL, _T(" copy: 0x%08X - 0x%08X <- LC8951 external buffer, skip odd bytes\n"), m_dma_address1, m_dma_address1 + m_dma_count * 4); - - // - DMA controller 0x7E -> 0xFC2D (PC: 0xC0A190) - // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0A192) - // - DMA controller program[02] -> 0x8492 (PC: 0xC0A194) - // - DMA controller program[04] -> 0xDA92 (PC: 0xC0A196) - // - DMA controller program[06] -> 0xDAF6 (PC: 0xC0A198) - // - DMA controller program[08] -> 0x2A02 (PC: 0xC0A19A) - // - DMA controller program[10] -> 0xFDFF (PC: 0xC0A19C) - // - DMA controller program[12] -> 0x48E7 (PC: 0xC0A19E) - // - DMA controller program[14] -> 0xFFFE (PC: 0xC0A1A0) - - char* data = m_tempcdc->LC8915InitTransfer(m_dma_count); - if (data == nullptr) { - break; - } - - SekIdle(m_dma_count * 4); - - while (m_dma_count--) { - curr_space.write_byte(m_dma_address1 + 0, data[0]); - curr_space.write_byte(m_dma_address1 + 2, data[1]); - m_dma_address1 += 4; - data += 2; - } - - m_tempcdc->LC8915EndTransfer(); - - break; - } - - case 0xFE3D: - - // - DMA controller 0x7E -> 0xFE3D (PC: 0xC0A190) - // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0A192) - // - DMA controller program[02] -> 0x82BF (PC: 0xC0A194) - // - DMA controller program[04] -> 0x93BF (PC: 0xC0A196) - // - DMA controller program[06] -> 0xF629 (PC: 0xC0A198) - // - DMA controller program[08] -> 0x02FD (PC: 0xC0A19A) - // - DMA controller program[10] -> 0xFFFF (PC: 0xC0A19C) - // - DMA controller program[12] -> 0xF17D (PC: 0xC0A19E) - // - DMA controller program[14] -> 0xFCF5 (PC: 0xC0A1A0) - - case 0xFE6D: { -// bprintf(PRINT_NORMAL, _T(" copy: 0x%08X - 0x%08X <- 0x%08X - 0x%08X\n"), m_dma_address2, m_dma_address2 + m_dma_count * 2, m_dma_address1, m_dma_address1 + m_dma_count * 2); - - // - DMA controller 0x7E -> 0xFE6D (PC: 0xC0FD7A) - // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0FD7C) - // - DMA controller program[02] -> 0x82BF (PC: 0xC0FD7E) - // - DMA controller program[04] -> 0xF693 (PC: 0xC0FD80) - // - DMA controller program[06] -> 0xBF29 (PC: 0xC0FD82) - // - DMA controller program[08] -> 0x02FD (PC: 0xC0FD84) - // - DMA controller program[10] -> 0xFFFF (PC: 0xC0FD86) - // - DMA controller program[12] -> 0xC515 (PC: 0xC0FD88) - // - DMA controller program[14] -> 0xFCF5 (PC: 0xC0FD8A) - - SekIdle(m_dma_count * 1); - - while (m_dma_count--) { - curr_space.write_word(m_dma_address2, curr_space.read_word(m_dma_address1)); - m_dma_address1 += 2; - m_dma_address2 += 2; - } - -if (m_dma_address2 == 0x0800) { -// MapVectorTable(false); -// bprintf(PRINT_ERROR, _T(" RAM vectors mapped (PC = 0x%08X\n"), SekGetPC(0)); -// extern int32_t bRunPause; -// bRunPause = 1; -} - break; - } - - case 0xFEF5: { -// bprintf(PRINT_NORMAL, _T(" adr : 0x%08X - 0x%08X <- address\n"), m_dma_address1, m_dma_address1 + m_dma_count * 4); - - // - DMA controller 0x7E -> 0xFEF5 (PC: 0xC07CE2) - // - DMA controller program[00] -> 0xFCF5 (PC: 0xC07CE8) - // - DMA controller program[02] -> 0x92E8 (PC: 0xC07CEE) - // - DMA controller program[04] -> 0xBE96 (PC: 0xC07CF4) - // - DMA controller program[06] -> 0xF629 (PC: 0xC07CFA) - // - DMA controller program[08] -> 0x02FD (PC: 0xC07D00) - // - DMA controller program[10] -> 0xFFFF (PC: 0xC07D06) - // - DMA controller program[12] -> 0xFC3D (PC: 0xC07D0C) - // - DMA controller program[14] -> 0xFCF5 (PC: 0xC07D12) - - SekIdle(m_dma_count * 2); - - while (m_dma_count--) { - curr_space.write_word(m_dma_address1 + 0, m_dma_address1 >> 16); - curr_space.write_word(m_dma_address1 + 2, m_dma_address1 >> 0); - m_dma_address1 += 4; - } - - break; - } - - case 0xFFC5: { -// bprintf(PRINT_NORMAL, _T(" copy: 0x%08X - 0x%08X <- LC8951 external buffer\n"), m_dma_address1, m_dma_address1 + m_dma_count * 2); - - // - DMA controller 0x7E -> 0xFFC5 (PC: 0xC0A190) - // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0A192) - // - DMA controller program[02] -> 0xA6F6 (PC: 0xC0A194) - // - DMA controller program[04] -> 0x2602 (PC: 0xC0A196) - // - DMA controller program[06] -> 0xFDFF (PC: 0xC0A198) - // - DMA controller program[08] -> 0xFC2D (PC: 0xC0A19A) - // - DMA controller program[10] -> 0xFCF5 (PC: 0xC0A19C) - // - DMA controller program[12] -> 0x8492 (PC: 0xC0A19E) - // - DMA controller program[14] -> 0xDA92 (PC: 0xC0A1A0) - - char* data = m_tempcdc->LC8915InitTransfer(m_dma_count); - if (data == nullptr) { - break; - } - - SekIdle(m_dma_count * 4); - - while (m_dma_count--) { - curr_space.write_byte(m_dma_address1 + 0, data[0]); - curr_space.write_byte(m_dma_address1 + 1, data[1]); - m_dma_address1 += 2; - data += 2; - } - - m_tempcdc->LC8915EndTransfer(); - - break; - } - - case 0xFFCD: - - // - DMA controller 0x7E -> 0xFFCD (PC: 0xC0A190) - // - DMA controller program[00] -> 0xFCF5 (PC: 0xC0A192) - // - DMA controller program[02] -> 0x92F6 (PC: 0xC0A194) - // - DMA controller program[04] -> 0x2602 (PC: 0xC0A196) - // - DMA controller program[06] -> 0xFDFF (PC: 0xC0A198) - // - DMA controller program[08] -> 0x7006 (PC: 0xC0A19A) - // - DMA controller program[10] -> 0x6100 (PC: 0xC0A19C) - // - DMA controller program[12] -> 0x2412 (PC: 0xC0A19E) - // - DMA controller program[14] -> 0x13FC (PC: 0xC0A1A0) - - case 0xFFDD: { -// bprintf(PRINT_NORMAL, _T(" Fill: 0x%08X - 0x%08X <- 0x%04X\n"), m_dma_address1, m_dma_address1 + m_dma_count * 2, m_dma_value1); - - // - DMA controller 0x7E -> 0xFFDD (PC: 0xC07CE2) - // - DMA controller program[00] -> 0xFCF5 (PC: 0xC07CE8) - // - DMA controller program[02] -> 0x92F6 (PC: 0xC07CEE) - // - DMA controller program[04] -> 0x2602 (PC: 0xC07CF4) - // - DMA controller program[06] -> 0xFDFF (PC: 0xC07CFA) - // - DMA controller program[08] -> 0xFFFF (PC: 0xC07D00) - // - DMA controller program[10] -> 0xFCF5 (PC: 0xC07D06) - // - DMA controller program[12] -> 0x8AF0 (PC: 0xC07D0C) - // - DMA controller program[14] -> 0x1609 (PC: 0xC07D12) - - SekIdle(m_dma_count * 1); - - while (m_dma_count--) { - curr_space.write_word(m_dma_address1, m_dma_value1); - m_dma_address1 += 2; - } - - break; - } - default: { - //bprintf(PRINT_ERROR, _T(" Unknown transfer type 0x%04X (PC: 0x%06X)\n"), m_dma_mode, SekGetPC(-1)); - //bprintf(PRINT_NORMAL, _T(" ??? : 0x%08X 0x%08X 0x%04X 0x%04X 0x%08X\n"), m_dma_address1, m_dma_address2, m_dma_value1, m_dma_value2, m_dma_count); - -//extern int32_t bRunPause; -//bRunPause = 1; - - } - } -} - - -/************************************* - * - * Machine initialization - * - *************************************/ - -void ngcd_state::machine_start() -{ - aes_base_state::machine_start(); - - // set curr_slot to 0, so to allow checking m_slots[m_curr_slot] != nullptr - m_curr_slot = 0; - - // initialize sprite to point to memory regions - m_sprite_ram = make_unique_clear(0x400000); - m_fix_ram = make_unique_clear(0x20000); - save_pointer(NAME(m_sprite_ram), 0x400000); - save_pointer(NAME(m_fix_ram), 0x20000); - - m_sprgen->set_sprite_region(m_sprite_ram.get(), 0x400000); - m_sprgen->set_fixed_regions(m_fix_ram.get(), 0x20000, nullptr); - m_sprgen->neogeo_set_fixed_layer_source(1); - - // irq levels for NEOCD (swapped compared to MVS / AES) - m_vblank_level = 2; - m_raster_level = 1; - - // initialize the memcard data structure - // NeoCD doesn't have memcard slots, rather, it has a larger internal memory which works the same - m_meminternal_data = make_unique_clear(0x2000); - subdevice("saveram")->set_base(m_meminternal_data.get(), 0x2000); - save_pointer(NAME(m_meminternal_data), 0x2000); - - m_tempcdc->reset_cd(); -} - - -/************************************* - * - * Machine reset - * - *************************************/ - -void ngcd_state::machine_reset() -{ - aes_base_state::machine_reset(); - - m_tempcdc->NeoCDCommsReset(); - - m_audiocpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); - m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); - - m_transfer_write_enable = 0; -} - - -/************************************* - * - * Main CPU memory handlers - * - *************************************/ - -void ngcd_state::neocd_main_map(address_map &map) -{ - aes_base_main_map(map); - - map(0x000000, 0x1fffff).ram().share("maincpu"); - map(0x000000, 0x00007f).r(FUNC(ngcd_state::banked_vectors_r)); // writes will fall through to area above - - map(0x800000, 0x803fff).rw(FUNC(ngcd_state::memcard_r), FUNC(ngcd_state::memcard_w)); - map(0xc00000, 0xc7ffff).mirror(0x080000).rom().region("mainbios", 0); - map(0xd00000, 0xdfffff).r(FUNC(ngcd_state::unmapped_r)); - map(0xe00000, 0xefffff).rw(FUNC(ngcd_state::transfer_r), FUNC(ngcd_state::transfer_w)); - map(0xf00000, 0xfeffff).r(FUNC(ngcd_state::unmapped_r)); - map(0xff0000, 0xff01ff).rw(FUNC(ngcd_state::control_r), FUNC(ngcd_state::control_w)); // CDROM / DMA - map(0xff0200, 0xffffff).r(FUNC(ngcd_state::unmapped_r)); -} - -void ngcd_state::neocd_vector_map(address_map &map) -{ - map(0xfffff0, 0xffffff).m(m_maincpu, FUNC(m68000_base_device::autovectors_map)); - map(0xfffff9, 0xfffff9).r(FUNC(ngcd_state::cdc_irq_ack)); -} - - -/************************************* - * - * Audio CPU port handlers - * - *************************************/ - - -void ngcd_state::neocd_audio_map(address_map &map) -{ - map(0x0000, 0xffff).ram().share("z80_ram"); -} - - -void ngcd_state::neocd_audio_io_map(address_map &map) -{ - map(0x00, 0x00).mirror(0xff00).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::clear_w)); - map(0x04, 0x07).mirror(0xff00).rw(m_ym, FUNC(ym2610_device::read), FUNC(ym2610_device::write)); - map(0x08, 0x08).mirror(0xff00).select(0x0010).w(FUNC(ngcd_state::audio_cpu_enable_nmi_w)); - // banking reads are actually NOP on NeoCD? but some games still access them -// map(0x08, 0x0b).mirror(0x00f0).select(0xff00).r(FUNC(ngcd_state::audio_cpu_bank_select_r)); - map(0x0c, 0x0c).mirror(0xff00).w(m_soundlatch2, FUNC(generic_latch_8_device::write)); - - // ?? - map(0x80, 0x80).mirror(0xff00).nopw(); - map(0xc0, 0xc0).mirror(0xff00).nopw(); - map(0xc1, 0xc1).mirror(0xff00).nopw(); -} - -void ngcd_state::neocd_ym_map(address_map &map) -{ - map(0x000000, 0x0fffff).ram().share("adpcm_ram"); -} - - -/************************************* - * - * Input port definitions - * - *************************************/ - -static INPUT_PORTS_START( neocd ) - PORT_INCLUDE( aes ) - - PORT_MODIFY("IN2") - PORT_BIT( 0x7000, IP_ACTIVE_HIGH, IPT_UNUSED ) // the NeoCD memcard is internal -INPUT_PORTS_END - - - -/************************************* - * - * Machine driver - * - *************************************/ - - -/* NeoCD uses custom vectors on IRQ4 to handle various events from the CDC */ - -uint8_t ngcd_state::cdc_irq_ack() -{ - if (get_irq_vector_ack()) { - set_irq_vector_ack(0); - return get_irq_vector(); - } - - return (0x60+4*4)/4; -} - -void ngcd_state::interrupt_callback_type1(void) -{ - m_irq_ack &= ~0x20; - irq_update(0); -} - -void ngcd_state::interrupt_callback_type2(void) -{ - m_irq_ack &= ~0x10; - irq_update(0); -} - -void ngcd_state::interrupt_callback_type3(void) -{ - m_irq_ack &= ~0x08; - irq_update(0); -} - - -void ngcd_state::irq_update(uint8_t byteValue) -{ - // do we also need to check the regular interrupts like FBA? - - m_irq_ack |= (byteValue & 0x38); - - if (!prohibit_cdc_irq) - { - if ((m_irq_ack & 0x08) == 0) { - m_irq_vector = 0x17; - m_irq_vector_ack = 1; - m_maincpu->set_input_line(4, HOLD_LINE); - return; - } - if ((m_irq_ack & 0x10) == 0) { - m_irq_vector = 0x16; - m_irq_vector_ack = 1; - m_maincpu->set_input_line(4, HOLD_LINE); - return; - } - if ((m_irq_ack & 0x20) == 0) { - m_irq_vector = 0x15; - m_irq_vector_ack = 1; - m_maincpu->set_input_line(4, HOLD_LINE); - return; - } - } -} - - -uint32_t ngcd_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ - // fill with background color first - bitmap.fill(*m_bg_pen, cliprect); - - if (m_has_sprite_bus) m_sprgen->draw_sprites(bitmap, cliprect.min_y); - - if (m_has_text_bus) m_sprgen->draw_fixed_layer(bitmap, cliprect.min_y); - - return 0; -} - -// NTSC region -void ngcd_state::neocd_ntsc(machine_config &config) -{ - neogeo_base(config); - neogeo_stereo(config); - - m_maincpu->set_addrmap(AS_PROGRAM, &ngcd_state::neocd_main_map); - m_maincpu->set_addrmap(m68000_base_device::AS_CPU_SPACE, &ngcd_state::neocd_vector_map); - - m_audiocpu->set_addrmap(AS_PROGRAM, &ngcd_state::neocd_audio_map); - m_audiocpu->set_addrmap(AS_IO, &ngcd_state::neocd_audio_io_map); - - subdevice("systemlatch")->q_out_cb<1>().set_log("NeoCD: write to regular vector change address?"); // what IS going on with "neocdz doubledr" and why do games write here if it's hooked up to nothing? - - m_screen->set_screen_update(FUNC(ngcd_state::screen_update)); - - // temporary until things are cleaned up - LC89510_TEMP(config, m_tempcdc, 0); // cd controller - m_tempcdc->set_cdrom_tag("cdrom"); - m_tempcdc->set_is_neoCD(true); - m_tempcdc->set_type1_interrupt_callback(FUNC(ngcd_state::interrupt_callback_type1)); - m_tempcdc->set_type2_interrupt_callback(FUNC(ngcd_state::interrupt_callback_type2)); - m_tempcdc->set_type3_interrupt_callback(FUNC(ngcd_state::interrupt_callback_type3)); - - NVRAM(config, "saveram", nvram_device::DEFAULT_ALL_0); - - NEOGEO_CONTROL_PORT(config, m_ctrl1, neogeo_controls, "joy", false); - NEOGEO_CONTROL_PORT(config, m_ctrl2, neogeo_controls, "joy", false); - - CDROM(config, "cdrom").set_interface("neocd_cdrom"); - SOFTWARE_LIST(config, "cd_list").set_original("neocd"); - - m_ym->set_addrmap(0, &ngcd_state::neocd_ym_map); -} - - - -/************************************* - * - * Driver initialization - * - *************************************/ - -ROM_START( neocd ) - ROM_REGION16_BE( 0x80000, "mainbios", 0 ) - ROM_SYSTEM_BIOS( 0, "top", "Top loading Neo-Geo CD" ) - ROMX_LOAD("top-sp1.bin", 0x00000, 0x80000, CRC(c36a47c0) SHA1(235f4d1d74364415910f73c10ae5482d90b4274f), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(0)) - ROM_SYSTEM_BIOS( 1, "front", "Front loading Neo-Geo CD" ) - ROMX_LOAD("front-sp1.bin", 0x00000, 0x80000, CRC(cac62307) SHA1(53bc1f283cdf00fa2efbb79f2e36d4c8038d743a), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(1)) - ROM_SYSTEM_BIOS( 2, "unibios32", "Universe Bios (Hack, Ver. 3.2)" ) - ROMX_LOAD("uni-bioscd32.rom", 0x00000, 0x80000, CRC(0ffb3127) SHA1(5158b728e62b391fb69493743dcf7abbc62abc82), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(2)) - ROM_SYSTEM_BIOS( 3, "unibios33", "Universe Bios (Hack, Ver. 3.3)" ) - ROMX_LOAD("uni-bioscd33.rom", 0x00000, 0x80000, CRC(ff3abc59) SHA1(5142f205912869b673a71480c5828b1eaed782a8), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(3)) - - ROM_REGION( 0x20000, "spritegen:zoomy", 0 ) - ROM_LOAD( "000-lo.lo", 0x00000, 0x20000, CRC(5a86cff2) SHA1(5992277debadeb64d1c1c64b0a92d9293eaf7e4a) ) -ROM_END - -ROM_START( neocdz ) - ROM_REGION16_BE( 0x80000, "mainbios", 0 ) - ROM_SYSTEM_BIOS( 0, "official", "Official BIOS" ) - ROMX_LOAD("neocd.bin", 0x00000, 0x80000, CRC(df9de490) SHA1(7bb26d1e5d1e930515219cb18bcde5b7b23e2eda), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(0)) - ROM_SYSTEM_BIOS( 1, "unibios32", "Universe Bios (Hack, Ver. 3.2)" ) - ROMX_LOAD("uni-bioscd32.rom", 0x00000, 0x80000, CRC(0ffb3127) SHA1(5158b728e62b391fb69493743dcf7abbc62abc82), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(1)) - ROM_SYSTEM_BIOS( 2, "unibios33", "Universe Bios (Hack, Ver. 3.3)" ) - ROMX_LOAD("uni-bioscd33.rom", 0x00000, 0x80000, CRC(ff3abc59) SHA1(5142f205912869b673a71480c5828b1eaed782a8), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(2)) - - ROM_REGION( 0x20000, "spritegen:zoomy", 0 ) - ROM_LOAD( "000-lo.lo", 0x00000, 0x20000, CRC(5a86cff2) SHA1(5992277debadeb64d1c1c64b0a92d9293eaf7e4a) ) -ROM_END - -#define rom_neocdzj rom_neocdz - -void ngcd_state::init_neocdz() -{ - m_system_region = NEOCD_REGION_US; -} - -void ngcd_state::init_neocdzj() -{ - m_system_region = NEOCD_REGION_JAPAN; -} - - -// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ -CONS( 1996, neocdz, 0, 0, neocd_ntsc, neocd, ngcd_state, init_neocdz, "SNK", "Neo-Geo CDZ (US)", 0 ) // the CDZ is the newer model -CONS( 1996, neocdzj, neocdz, 0, neocd_ntsc, neocd, ngcd_state, init_neocdzj, "SNK", "Neo-Geo CDZ (Japan)", 0 ) - -// NTSC region? -CONS( 1994, neocd, neocdz, 0, neocd_ntsc, neocd, ngcd_state, empty_init, "SNK", "Neo-Geo CD (NTSC?)", MACHINE_NOT_WORKING ) // older model, ignores disc protections? diff --git a/src/mame/snk/ngp.cpp b/src/mame/snk/ngp.cpp index a64738bbffd..fb1337406f1 100644 --- a/src/mame/snk/ngp.cpp +++ b/src/mame/snk/ngp.cpp @@ -104,7 +104,7 @@ the Neogeo Pocket. #include "cpu/z80/z80.h" #include "sound/t6w28.h" #include "sound/dac.h" -#include "video/k1ge.h" +#include "k1ge.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/snk/prehisle.cpp b/src/mame/snk/prehisle.cpp index 77c48a10d2f..aef6fcb8c1a 100644 --- a/src/mame/snk/prehisle.cpp +++ b/src/mame/snk/prehisle.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/prehisle.h" +#include "prehisle.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/snk/prehisle_v.cpp b/src/mame/snk/prehisle_v.cpp index 765f97a7095..32ff918f0af 100644 --- a/src/mame/snk/prehisle_v.cpp +++ b/src/mame/snk/prehisle_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/prehisle.h" +#include "prehisle.h" #include "screen.h" diff --git a/src/mame/snk/snk.cpp b/src/mame/snk/snk.cpp index c45e7175512..cf46480d8ee 100644 --- a/src/mame/snk/snk.cpp +++ b/src/mame/snk/snk.cpp @@ -681,7 +681,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/snk.h" +#include "snk.h" #include "cpu/z80/z80.h" #include "sound/snkwave.h" diff --git a/src/mame/snk/snk6502.cpp b/src/mame/snk/snk6502.cpp index ee743d1a375..11e31496647 100644 --- a/src/mame/snk/snk6502.cpp +++ b/src/mame/snk/snk6502.cpp @@ -280,8 +280,8 @@ Stephh's notes (based on the games M6502 code and some tests) : */ #include "emu.h" -#include "includes/snk6502.h" -#include "audio/snk6502.h" +#include "snk6502.h" +#include "snk6502_a.h" #include "cpu/m6502/m6502.h" #include "sound/samples.h" diff --git a/src/mame/snk/snk6502_a.cpp b/src/mame/snk/snk6502_a.cpp index 0dc3b1868a5..16aeee28691 100644 --- a/src/mame/snk/snk6502_a.cpp +++ b/src/mame/snk/snk6502_a.cpp @@ -13,7 +13,7 @@ #include "emu.h" -#include "audio/snk6502.h" +#include "snk6502_a.h" #include "speaker.h" diff --git a/src/mame/snk/snk6502_v.cpp b/src/mame/snk/snk6502_v.cpp index f679f34d6c9..8dd23ff3d02 100644 --- a/src/mame/snk/snk6502_v.cpp +++ b/src/mame/snk/snk6502_v.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/snk6502.h" -#include "audio/snk6502.h" +#include "snk6502.h" +#include "snk6502_a.h" #define TOTAL_COLORS(gfxn) (m_gfxdecode->gfx(gfxn)->colors() * m_gfxdecode->gfx(gfxn)->granularity()) diff --git a/src/mame/snk/snk68.cpp b/src/mame/snk/snk68.cpp index d5d4da77550..6913fac1b5a 100644 --- a/src/mame/snk/snk68.cpp +++ b/src/mame/snk/snk68.cpp @@ -43,7 +43,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/snk68.h" +#include "snk68.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/snk/snk68.h b/src/mame/snk/snk68.h index fe64cc89958..5b5d72eb040 100644 --- a/src/mame/snk/snk68.h +++ b/src/mame/snk/snk68.h @@ -1,10 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, Acho A. Tang, Nicola Salmoria +#ifndef MAME_SNK_SNK68K_H +#define MAME_SNK_SNK68K_H + +#include "alpha68k_palette.h" +#include "snk68_spr.h" #include "machine/gen_latch.h" #include "sound/upd7759.h" -#include "video/snk68_spr.h" -#include "video/alpha68k_palette.h" + #include "screen.h" #include "tilemap.h" @@ -116,3 +120,5 @@ private: void searchar_map(address_map &map); }; + +#endif // MAME_SNK_SNK68K_H diff --git a/src/mame/snk/snk68_v.cpp b/src/mame/snk/snk68_v.cpp index 01493476c0c..83e1c78181b 100644 --- a/src/mame/snk/snk68_v.cpp +++ b/src/mame/snk/snk68_v.cpp @@ -15,7 +15,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/snk68.h" +#include "snk68.h" /*************************************************************************** diff --git a/src/mame/snk/snk_v.cpp b/src/mame/snk/snk_v.cpp index a41026b6cb8..d2aa058b78f 100644 --- a/src/mame/snk/snk_v.cpp +++ b/src/mame/snk/snk_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ernesto Corvi,Tim Lindquist,Carlos A. Lozano,Bryan McPhail,Jarek Parchanski,Nicola Salmoria,Tomasz Slanina,Phil Stroffolino,Acho A. Tang,Victor Trucco // thanks-to:Marco Cassili #include "emu.h" -#include "includes/snk.h" +#include "snk.h" /******************************************************************************* Shadow Handling Notes diff --git a/src/mame/sony/psx.cpp b/src/mame/sony/psx.cpp index 4ca19326c7e..c65218eb2f3 100644 --- a/src/mame/sony/psx.cpp +++ b/src/mame/sony/psx.cpp @@ -17,7 +17,7 @@ #include "cpu/psx/psx.h" #include "imagedev/chd_cd.h" #include "imagedev/snapquik.h" -#include "machine/psxcd.h" +#include "psxcd.h" #include "machine/ram.h" #include "sound/spu.h" #include "video/psx.h" diff --git a/src/mame/sony/taitogn.cpp b/src/mame/sony/taitogn.cpp index 03fcbf3a9cf..8f57291b7f9 100644 --- a/src/mame/sony/taitogn.cpp +++ b/src/mame/sony/taitogn.cpp @@ -330,12 +330,14 @@ Type 3 (PCMCIA Compact Flash Adaptor + Compact Flash card, sealed together with */ #include "emu.h" -#include "includes/zn.h" +#include "zn.h" #include "machine/ataflash.h" #include "machine/intelfsh.h" #include "machine/rf5c296.h" +namespace { + // // Taito GNET specific // @@ -1085,6 +1087,8 @@ ROM_START(xiistag) DISK_IMAGE( "xiistag", 0, SHA1(586e37c8d926293b2bd928e5f0d693910cfb05a2)) ROM_END +} // aononymous namespace + /* A dummy driver, so that the bios can be debugged, and to serve as */ /* parent for the coh-3002t.353 file, so that we do not have to include */ diff --git a/src/mame/sony/zn.cpp b/src/mame/sony/zn.cpp index 429c73de7a4..82864629fcb 100644 --- a/src/mame/sony/zn.cpp +++ b/src/mame/sony/zn.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/zn.h" +#include "zn.h" #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/sony/zn.h b/src/mame/sony/zn.h index e38a74acad1..339487f0ba6 100644 --- a/src/mame/sony/zn.h +++ b/src/mame/sony/zn.h @@ -1,14 +1,16 @@ // license:BSD-3-Clause // copyright-holders:smf, R. Belmont -#ifndef MAME_INCLUDES_ZN_H -#define MAME_INCLUDES_ZN_H +#ifndef MAME_SONY_ZN_H +#define MAME_SONY_ZN_H #pragma once -#include "audio/rax.h" -#include "audio/taito_zm.h" -#include "audio/taitosnd.h" +#include "taito_zm.h" +#include "znmcu.h" + +#include "rax.h" +#include "taitosnd.h" #include "bus/ata/atadev.h" #include "bus/ata/ataintf.h" @@ -19,14 +21,13 @@ #include "machine/7200fifo.h" #include "machine/at28c16.h" #include "machine/bankdev.h" -#include "machine/cat702.h" +#include "cat702.h" #include "machine/gen_latch.h" #include "machine/mb3773.h" #include "machine/nvram.h" #include "machine/ram.h" #include "machine/vt83c461.h" #include "machine/watchdog.h" -#include "machine/znmcu.h" #include "sound/okim6295.h" #include "sound/qsound.h" #include "sound/spu.h" @@ -582,4 +583,4 @@ private: required_device_array m_fifo; }; -#endif // MAME_INCLUDES_ZN_H +#endif // MAME_SONY_ZN_H diff --git a/src/mame/sony_news/news_38xx.cpp b/src/mame/sony_news/news_38xx.cpp index 12dcfb5d463..780fd1f3b4a 100644 --- a/src/mame/sony_news/news_38xx.cpp +++ b/src/mame/sony_news/news_38xx.cpp @@ -27,8 +27,8 @@ #include "machine/z80scc.h" #include "machine/am79c90.h" #include "machine/upd765.h" -#include "machine/dmac_0266.h" -#include "machine/news_hid.h" +#include "dmac_0266.h" +#include "news_hid.h" #include "machine/ncr5380.h" // video diff --git a/src/mame/sony_news/news_68k.cpp b/src/mame/sony_news/news_68k.cpp index c35e0e7607b..9d94dcc85fb 100644 --- a/src/mame/sony_news/news_68k.cpp +++ b/src/mame/sony_news/news_68k.cpp @@ -24,8 +24,8 @@ #include "machine/z80scc.h" #include "machine/am79c90.h" #include "machine/upd765.h" -#include "machine/dmac_0266.h" -#include "machine/news_hid.h" +#include "dmac_0266.h" +#include "news_hid.h" #include "machine/ncr5380.h" // video diff --git a/src/mame/sony_news/news_r3k.cpp b/src/mame/sony_news/news_r3k.cpp index 16bd9971315..523bfbea5b5 100644 --- a/src/mame/sony_news/news_r3k.cpp +++ b/src/mame/sony_news/news_r3k.cpp @@ -28,8 +28,8 @@ #include "machine/z80scc.h" #include "machine/am79c90.h" #include "machine/upd765.h" -#include "machine/dmac_0448.h" -#include "machine/news_hid.h" +#include "dmac_0448.h" +#include "news_hid.h" #include "machine/cxd1185.h" // video diff --git a/src/mame/special/special.cpp b/src/mame/special/special.cpp index 4b95e28f94e..9b6fee5335c 100644 --- a/src/mame/special/special.cpp +++ b/src/mame/special/special.cpp @@ -53,7 +53,7 @@ ToDo: ****************************************************************************************************************/ #include "emu.h" -#include "includes/special.h" +#include "special.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/special/special.h b/src/mame/special/special.h index f4be45313a7..c53d4b8a30f 100644 --- a/src/mame/special/special.h +++ b/src/mame/special/special.h @@ -6,14 +6,15 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_SPECIAL_H -#define MAME_INCLUDES_SPECIAL_H +#ifndef MAME_SPECIAL_SPECIAL_H +#define MAME_SPECIAL_SPECIAL_H #pragma once +#include "specialsound.h" + #include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" -#include "audio/special.h" #include "sound/dac.h" #include "machine/i8255.h" #include "machine/pit8253.h" @@ -142,4 +143,4 @@ private: optional_device m_pit_timer; // specimx only }; -#endif // MAME_INCLUDES_SPECIAL_H +#endif // MAME_SPECIAL_SPECIAL_H diff --git a/src/mame/special/special_m.cpp b/src/mame/special/special_m.cpp index dd094edae31..f92a7d7ad0c 100644 --- a/src/mame/special/special_m.cpp +++ b/src/mame/special/special_m.cpp @@ -12,7 +12,7 @@ #include "emu.h" -#include "includes/special.h" +#include "special.h" /* Driver initialization */ diff --git a/src/mame/special/special_v.cpp b/src/mame/special/special_v.cpp index 8e4e52c34f7..3d91ee544e5 100644 --- a/src/mame/special/special_v.cpp +++ b/src/mame/special/special_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/special.h" +#include "special.h" uint32_t special_state::screen_update_special(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/stern/berzerk.cpp b/src/mame/stern/berzerk.cpp index 27f0de585b2..207719c6331 100644 --- a/src/mame/stern/berzerk.cpp +++ b/src/mame/stern/berzerk.cpp @@ -55,17 +55,21 @@ Game difference analysis by The Cutting Room Floor (tcrf.net) ***************************************************************************/ #include "emu.h" -#include "audio/exidy.h" + +#include "exidysound.h" #include "cpu/z80/z80.h" #include "machine/74181.h" #include "machine/nvram.h" #include "sound/s14001a.h" -#include "video/resnet.h" + #include "screen.h" #include "speaker.h" +#include "video/resnet.h" +namespace { + class berzerk_state : public driver_device { public: @@ -1431,6 +1435,9 @@ void berzerk_state::init_moonwarp() save_item(NAME(m_p2_direction)); } +} // anonymous namespace + + /************************************* * * Game drivers diff --git a/src/mame/stern/cliffhgr.cpp b/src/mame/stern/cliffhgr.cpp index 05bc7555b96..5360d0d1137 100644 --- a/src/mame/stern/cliffhgr.cpp +++ b/src/mame/stern/cliffhgr.cpp @@ -76,7 +76,7 @@ Side 2 = 0x8F7DDD (or 0x880000 | ( 0x77 << 12 ) | 0x0DDD) *********************************************************/ #include "emu.h" -#include "audio/cliffhgr.h" +#include "cliffhgr_a.h" #include "cpu/z80/z80.h" #include "machine/ldpr8210.h" diff --git a/src/mame/stern/cliffhgr_a.cpp b/src/mame/stern/cliffhgr_a.cpp index ac64627f5eb..0eb887f3a96 100644 --- a/src/mame/stern/cliffhgr_a.cpp +++ b/src/mame/stern/cliffhgr_a.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles,Ernesto Corvi #include "emu.h" -#include "audio/cliffhgr.h" +#include "cliffhgr_a.h" #define CLIFF_ENABLE_SND_1 NODE_01 diff --git a/src/mame/subsino/subsino.cpp b/src/mame/subsino/subsino.cpp index 91215a202e7..c064e7f3bcb 100644 --- a/src/mame/subsino/subsino.cpp +++ b/src/mame/subsino/subsino.cpp @@ -223,10 +223,11 @@ To Do: ***************************************************************************/ #include "emu.h" +#include "subsino_m.h" + #include "cpu/z180/hd647180x.h" #include "machine/i8255.h" #include "machine/nvram.h" -#include "machine/subsino.h" #include "machine/ticket.h" #include "sound/okim6295.h" #include "sound/ymopl.h" diff --git a/src/mame/subsino/subsino2.cpp b/src/mame/subsino/subsino2.cpp index a44d340e171..ff861ced60f 100644 --- a/src/mame/subsino/subsino2.cpp +++ b/src/mame/subsino/subsino2.cpp @@ -43,11 +43,12 @@ To do: ************************************************************************************************************/ #include "emu.h" +#include "subsino_m.h" + #include "cpu/h8/h83048.h" #include "cpu/i86/i186.h" #include "cpu/z180/z180.h" #include "machine/nvram.h" -#include "machine/subsino.h" #include "machine/ticket.h" #include "sound/okim6295.h" #include "sound/ymopl.h" diff --git a/src/mame/suna/suna16.cpp b/src/mame/suna/suna16.cpp index 63235cced64..920527cc161 100644 --- a/src/mame/suna/suna16.cpp +++ b/src/mame/suna/suna16.cpp @@ -25,7 +25,7 @@ Year + Game By Board Hardware ***************************************************************************/ #include "emu.h" -#include "includes/suna16.h" +#include "suna16.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/suna/suna16_v.cpp b/src/mame/suna/suna16_v.cpp index ee4869ef48f..e4d2ff1b216 100644 --- a/src/mame/suna/suna16_v.cpp +++ b/src/mame/suna/suna16_v.cpp @@ -60,7 +60,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/suna16.h" +#include "suna16.h" void suna16_state::flipscreen_w(offs_t offset, uint16_t data, uint16_t mem_mask) { diff --git a/src/mame/suna/suna8.cpp b/src/mame/suna/suna8.cpp index 0963262770e..0ca7f2385c5 100644 --- a/src/mame/suna/suna8.cpp +++ b/src/mame/suna/suna8.cpp @@ -36,7 +36,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/suna8.h" +#include "suna8.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/suna/suna8_a.cpp b/src/mame/suna/suna8_a.cpp index ccffc8b88e9..eaf65780bdc 100644 --- a/src/mame/suna/suna8_a.cpp +++ b/src/mame/suna/suna8_a.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "sound/samples.h" -#include "includes/suna8.h" +#include "suna8.h" #define FREQ_HZ 8000 #define SAMPLEN 0x1000 diff --git a/src/mame/suna/suna8_v.cpp b/src/mame/suna/suna8_v.cpp index ee1489e6781..57a8ef5c1c6 100644 --- a/src/mame/suna/suna8_v.cpp +++ b/src/mame/suna/suna8_v.cpp @@ -20,7 +20,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/suna8.h" +#include "suna8.h" #include "drawgfxt.ipp" uint8_t suna8_state::banked_paletteram_r(offs_t offset) diff --git a/src/mame/sunelect/arabian.cpp b/src/mame/sunelect/arabian.cpp index 60f4dd1ac98..97efe261706 100644 --- a/src/mame/sunelect/arabian.cpp +++ b/src/mame/sunelect/arabian.cpp @@ -45,7 +45,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/arabian.h" +#include "arabian.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/sunelect/arabian_v.cpp b/src/mame/sunelect/arabian_v.cpp index 79eba00ca0c..0e9c20b752f 100644 --- a/src/mame/sunelect/arabian_v.cpp +++ b/src/mame/sunelect/arabian_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/arabian.h" +#include "arabian.h" /* Constants */ #define BITMAP_WIDTH 256 diff --git a/src/mame/sunelect/ikki.cpp b/src/mame/sunelect/ikki.cpp index cc042e10a40..e202f222db3 100644 --- a/src/mame/sunelect/ikki.cpp +++ b/src/mame/sunelect/ikki.cpp @@ -16,7 +16,7 @@ TODO: *****************************************************************************/ #include "emu.h" -#include "includes/ikki.h" +#include "ikki.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" diff --git a/src/mame/sunelect/ikki_v.cpp b/src/mame/sunelect/ikki_v.cpp index f50ab80ac84..ba0ea644948 100644 --- a/src/mame/sunelect/ikki_v.cpp +++ b/src/mame/sunelect/ikki_v.cpp @@ -11,7 +11,7 @@ Video hardware driver by Uki ******************************************************************************/ #include "emu.h" -#include "includes/ikki.h" +#include "ikki.h" void ikki_state::ikki_palette(palette_device &palette) { diff --git a/src/mame/sunelect/markham.cpp b/src/mame/sunelect/markham.cpp index efb4f7bd124..21f2484b279 100644 --- a/src/mame/sunelect/markham.cpp +++ b/src/mame/sunelect/markham.cpp @@ -25,7 +25,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/markham.h" +#include "markham.h" #define MASTER_CLOCK (20_MHz_XTAL) #define PIXEL_CLOCK (MASTER_CLOCK/4) // guess diff --git a/src/mame/sunelect/markham_v.cpp b/src/mame/sunelect/markham_v.cpp index 380bd980cbc..c5b7d99bb69 100644 --- a/src/mame/sunelect/markham_v.cpp +++ b/src/mame/sunelect/markham_v.cpp @@ -10,7 +10,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/markham.h" +#include "markham.h" void markham_state::markham_palette(palette_device &palette) const { diff --git a/src/mame/sunelect/route16.cpp b/src/mame/sunelect/route16.cpp index 36f556df04e..7c43bb85aee 100644 --- a/src/mame/sunelect/route16.cpp +++ b/src/mame/sunelect/route16.cpp @@ -155,7 +155,7 @@ PL2 Button | 7A | 7B | PL1 Button ***************************************************************************/ #include "emu.h" -#include "includes/route16.h" +#include "route16.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/sunelect/route16_v.cpp b/src/mame/sunelect/route16_v.cpp index 97b71c584cd..79bec51ab6d 100644 --- a/src/mame/sunelect/route16_v.cpp +++ b/src/mame/sunelect/route16_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/route16.h" +#include "route16.h" void route16_state::video_start() { diff --git a/src/mame/sunelect/shangha3.cpp b/src/mame/sunelect/shangha3.cpp index 9fdb4d2f1e6..a1ef9ad3d69 100644 --- a/src/mame/sunelect/shangha3.cpp +++ b/src/mame/sunelect/shangha3.cpp @@ -42,7 +42,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/shangha3.h" +#include "shangha3.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/sunelect/shangha3_v.cpp b/src/mame/sunelect/shangha3_v.cpp index 727fd823260..ebceaa5ef05 100644 --- a/src/mame/sunelect/shangha3_v.cpp +++ b/src/mame/sunelect/shangha3_v.cpp @@ -61,7 +61,7 @@ Word | Bit(s) | Use ***************************************************************************/ #include "emu.h" -#include "includes/shangha3.h" +#include "shangha3.h" diff --git a/src/mame/sunelect/shanghai.cpp b/src/mame/sunelect/shanghai.cpp index 5cddfe8c473..c0fda2fbf31 100644 --- a/src/mame/sunelect/shanghai.cpp +++ b/src/mame/sunelect/shanghai.cpp @@ -22,11 +22,14 @@ displayed. ***************************************************************************/ #include "emu.h" + +#include "seibusound.h" + #include "cpu/nec/nec.h" #include "video/hd63484.h" -#include "audio/seibu.h" #include "sound/msm5205.h" #include "sound/ymopn.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/svision/svision.cpp b/src/mame/svision/svision.cpp index 98541f08d10..e3b5a4ce405 100644 --- a/src/mame/svision/svision.cpp +++ b/src/mame/svision/svision.cpp @@ -7,7 +7,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/svision.h" +#include "svision.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/svision/svision.h b/src/mame/svision/svision.h index 2ba13f3d3f7..1387991bb56 100644 --- a/src/mame/svision/svision.h +++ b/src/mame/svision/svision.h @@ -13,7 +13,7 @@ #include "cpu/m6502/m65c02.h" #include "machine/timer.h" -#include "audio/svis_snd.h" +#include "svis_snd.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "emupal.h" diff --git a/src/mame/swtpc/swtpc09.cpp b/src/mame/swtpc/swtpc09.cpp index f8fe4095fa8..0318dfdfe2f 100644 --- a/src/mame/swtpc/swtpc09.cpp +++ b/src/mame/swtpc/swtpc09.cpp @@ -22,7 +22,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/swtpc09.h" +#include "swtpc09.h" #include "bus/ss50/interface.h" #include "formats/flex_dsk.h" #include "formats/os9_dsk.h" diff --git a/src/mame/swtpc/swtpc09_m.cpp b/src/mame/swtpc/swtpc09_m.cpp index fe7b02b9d80..0ba07376a4a 100644 --- a/src/mame/swtpc/swtpc09_m.cpp +++ b/src/mame/swtpc/swtpc09_m.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/swtpc09.h" +#include "swtpc09.h" #define DMAC_IRQ 0x01 // interrupt handler IDs #define PTM_IRQ 0x04 diff --git a/src/mame/tab/tabe22.cpp b/src/mame/tab/tabe22.cpp index 3f306beea4e..03157aca83c 100644 --- a/src/mame/tab/tabe22.cpp +++ b/src/mame/tab/tabe22.cpp @@ -34,7 +34,7 @@ #include "emu.h" #include "cpu/i8085/i8085.h" #include "machine/bankdev.h" -#include "machine/e22_kbd.h" +#include "e22_kbd.h" #include "machine/i8251.h" #include "machine/mc68681.h" #include "machine/nvram.h" diff --git a/src/mame/taito/2mindril.cpp b/src/mame/taito/2mindril.cpp index 0a98e0c861f..675a62885bb 100644 --- a/src/mame/taito/2mindril.cpp +++ b/src/mame/taito/2mindril.cpp @@ -35,10 +35,10 @@ DAC -26.6860Mhz */ #include "emu.h" -#include "includes/taito_f3.h" +#include "taito_f3.h" #include "cpu/m68000/m68000.h" -#include "machine/taitoio.h" +#include "taitoio.h" #include "sound/ymopn.h" #include "speaker.h" diff --git a/src/mame/taito/40love.cpp b/src/mame/taito/40love.cpp index 58bce57d3b2..44f9f9d135e 100644 --- a/src/mame/taito/40love.cpp +++ b/src/mame/taito/40love.cpp @@ -222,7 +222,7 @@ Notes - Has jumper setting for 122HZ or 61HZ) */ #include "emu.h" -#include "includes/40love.h" +#include "40love.h" #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/40love.h b/src/mame/taito/40love.h index aeb1d896d9a..e14bee7cf98 100644 --- a/src/mame/taito/40love.h +++ b/src/mame/taito/40love.h @@ -1,15 +1,17 @@ // license:GPL-2.0+ // copyright-holders:Jarek Burczynski -#ifndef MAME_INCLUDES_40LOVE_H -#define MAME_INCLUDES_40LOVE_H +#ifndef MAME_TAITO_40LOVE_H +#define MAME_TAITO_40LOVE_H #pragma once -#include "machine/taito68705interface.h" +#include "taito68705.h" + #include "machine/gen_latch.h" #include "sound/msm5232.h" #include "sound/ay8910.h" #include "sound/ta7630.h" + #include "emupal.h" #include "tilemap.h" @@ -115,4 +117,4 @@ private: uint8_t m_snd_ctrl3 = 0U; }; -#endif // MAME_INCLUDES_40LOVE_H +#endif // MAME_TAITO_40LOVE_H diff --git a/src/mame/taito/40love_v.cpp b/src/mame/taito/40love_v.cpp index 005f02090b7..63663f83c5b 100644 --- a/src/mame/taito/40love_v.cpp +++ b/src/mame/taito/40love_v.cpp @@ -5,7 +5,7 @@ */ #include "emu.h" -#include "includes/40love.h" +#include "40love.h" /*************************************************************************** diff --git a/src/mame/taito/arkanoid.cpp b/src/mame/taito/arkanoid.cpp index 843c7a3e70c..e3e200a86f2 100644 --- a/src/mame/taito/arkanoid.cpp +++ b/src/mame/taito/arkanoid.cpp @@ -789,7 +789,7 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" -#include "includes/arkanoid.h" +#include "arkanoid.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/taito/arkanoid.h b/src/mame/taito/arkanoid.h index 58ae0c76e5b..93c9c6e5036 100644 --- a/src/mame/taito/arkanoid.h +++ b/src/mame/taito/arkanoid.h @@ -1,11 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Brad Oliver,Stephane Humbert -#ifndef MAME_INCLUDES_ARKANOID_H -#define MAME_INCLUDES_ARKANOID_H +#ifndef MAME_TAITO_ARKANOID_H +#define MAME_TAITO_ARKANOID_H #pragma once -#include "machine/taito68705interface.h" +#include "taito68705.h" + #include "emupal.h" #include "tilemap.h" @@ -120,4 +121,4 @@ private: void hexaa_sub_map(address_map &map); }; -#endif // MAME_INCLUDES_ARKANOID_H +#endif // MAME_TAITO_ARKANOID_H diff --git a/src/mame/taito/arkanoid_m.cpp b/src/mame/taito/arkanoid_m.cpp index 294acd3dd73..21095759640 100644 --- a/src/mame/taito/arkanoid_m.cpp +++ b/src/mame/taito/arkanoid_m.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/arkanoid.h" +#include "arkanoid.h" /* To log specific reads and writes of the bootlegs */ diff --git a/src/mame/taito/arkanoid_v.cpp b/src/mame/taito/arkanoid_v.cpp index df5984f9322..cffa81b9771 100644 --- a/src/mame/taito/arkanoid_v.cpp +++ b/src/mame/taito/arkanoid_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/arkanoid.h" +#include "arkanoid.h" void arkanoid_state::arkanoid_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/taito/ashnojoe.cpp b/src/mame/taito/ashnojoe.cpp index 0a0be11d0cd..b725e5d7dd2 100644 --- a/src/mame/taito/ashnojoe.cpp +++ b/src/mame/taito/ashnojoe.cpp @@ -75,7 +75,7 @@ Coin B is not used *************************************************************************/ #include "emu.h" -#include "includes/ashnojoe.h" +#include "ashnojoe.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/taito/ashnojoe_v.cpp b/src/mame/taito/ashnojoe_v.cpp index 756adff5e23..f59359e7919 100644 --- a/src/mame/taito/ashnojoe_v.cpp +++ b/src/mame/taito/ashnojoe_v.cpp @@ -8,7 +8,7 @@ *********************************************************************/ #include "emu.h" -#include "includes/ashnojoe.h" +#include "ashnojoe.h" TILE_GET_INFO_MEMBER(ashnojoe_state::get_tile_info_highest) diff --git a/src/mame/taito/asuka.cpp b/src/mame/taito/asuka.cpp index 051d8b703b5..7139119db7a 100644 --- a/src/mame/taito/asuka.cpp +++ b/src/mame/taito/asuka.cpp @@ -295,13 +295,13 @@ DIP locations verified for: #include "emu.h" -#include "audio/taitosnd.h" -#include "includes/taitoipt.h" -#include "machine/taitocchip.h" -#include "machine/taitoio.h" -#include "video/pc090oj.h" -#include "video/tc0100scn.h" -#include "video/tc0110pcr.h" +#include "taitosnd.h" +#include "taitoipt.h" +#include "taitocchip.h" +#include "taitoio.h" +#include "pc090oj.h" +#include "tc0100scn.h" +#include "tc0110pcr.h" #include "cpu/m68000/m68000.h" #include "cpu/z180/z180.h" diff --git a/src/mame/taito/bigevglf.cpp b/src/mame/taito/bigevglf.cpp index c9c585b8ed6..4f76d679fcf 100644 --- a/src/mame/taito/bigevglf.cpp +++ b/src/mame/taito/bigevglf.cpp @@ -58,7 +58,7 @@ J1100072A ***************************************************************************/ #include "emu.h" -#include "includes/bigevglf.h" +#include "bigevglf.h" #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/bigevglf.h b/src/mame/taito/bigevglf.h index 947ce8732be..be7ef903dd1 100644 --- a/src/mame/taito/bigevglf.h +++ b/src/mame/taito/bigevglf.h @@ -1,16 +1,23 @@ // license:GPL-2.0+ // copyright-holders:Jarek Burczynski, Tomasz Slanina +#ifndef MAME_TAITO_BIGEVGOLF_H +#define MAME_TAITO_BIGEVGOLF_H + +#pragma once + +#include "taito68705.h" + #include "sound/msm5232.h" #include "machine/gen_latch.h" -#include "machine/taito68705interface.h" + #include "emupal.h" #include "screen.h" class bigevglf_state : public driver_device { public: - bigevglf_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + bigevglf_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_paletteram(*this, "paletteram"), m_spriteram1(*this, "spriteram1"), m_spriteram2(*this, "spriteram2"), @@ -84,3 +91,5 @@ private: void sound_map(address_map &map); void sub_map(address_map &map); }; + +#endif // MAME_TAITO_BIGEVGOLF_H diff --git a/src/mame/taito/bigevglf_v.cpp b/src/mame/taito/bigevglf_v.cpp index 7b05c7443a2..275bc939b18 100644 --- a/src/mame/taito/bigevglf_v.cpp +++ b/src/mame/taito/bigevglf_v.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bigevglf.h" +#include "bigevglf.h" void bigevglf_state::bigevglf_palette_w(offs_t offset, uint8_t data) diff --git a/src/mame/taito/bingowav.cpp b/src/mame/taito/bingowav.cpp index ef8ebd0b3e2..ce8a7404240 100644 --- a/src/mame/taito/bingowav.cpp +++ b/src/mame/taito/bingowav.cpp @@ -45,7 +45,7 @@ #include "machine/te7750.h" #include "machine/tmp68301.h" #include "sound/ymopn.h" -#include "audio/taitosnd.h" +#include "taitosnd.h" class bingowav_state : public driver_device { diff --git a/src/mame/taito/bking.cpp b/src/mame/taito/bking.cpp index 38a2c18f3af..2bf211183cc 100644 --- a/src/mame/taito/bking.cpp +++ b/src/mame/taito/bking.cpp @@ -18,7 +18,7 @@ DIP Locations verified for: ***************************************************************************/ #include "emu.h" -#include "includes/bking.h" +#include "bking.h" #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/bking.h b/src/mame/taito/bking.h index 8cde7f0f0ce..61ffff48726 100644 --- a/src/mame/taito/bking.h +++ b/src/mame/taito/bking.h @@ -1,13 +1,15 @@ // license:BSD-3-Clause // copyright-holders:Mike Balfour, Zsolt Vasvari -#ifndef MAME_INCLUDES_BKING_H -#define MAME_INCLUDES_BKING_H +#ifndef MAME_TAITO_BKING_H +#define MAME_TAITO_BKING_H #pragma once -#include "machine/taito68705interface.h" +#include "taito68705.h" + #include "machine/gen_latch.h" #include "machine/input_merger.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" @@ -109,4 +111,4 @@ private: void bking_map(address_map &map); }; -#endif // MAME_INCLUDES_BKING_H +#endif // MAME_TAITO_BKING_H diff --git a/src/mame/taito/bking_v.cpp b/src/mame/taito/bking_v.cpp index 62cd0dd73d7..43194f90582 100644 --- a/src/mame/taito/bking_v.cpp +++ b/src/mame/taito/bking_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/bking.h" +#include "bking.h" /*************************************************************************** diff --git a/src/mame/taito/bublbobl.cpp b/src/mame/taito/bublbobl.cpp index 782d121a883..b55d7f37a52 100644 --- a/src/mame/taito/bublbobl.cpp +++ b/src/mame/taito/bublbobl.cpp @@ -268,12 +268,15 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/bublbobl.h" +#include "bublbobl.h" + +#include "taito68705.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" #include "sound/ymopn.h" #include "sound/ymopl.h" + #include "screen.h" #include "speaker.h" diff --git a/src/mame/taito/bublbobl.h b/src/mame/taito/bublbobl.h index 7c92f401812..29c0b44317b 100644 --- a/src/mame/taito/bublbobl.h +++ b/src/mame/taito/bublbobl.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Chris Moore, Nicola Salmoria -#ifndef MAME_INCLUDES_BUBLBOBL_H -#define MAME_INCLUDES_BUBLBOBL_H +#ifndef MAME_TAITO_BUBLBOBL_H +#define MAME_TAITO_BUBLBOBL_H #pragma once @@ -15,8 +15,6 @@ #include "emupal.h" #include "screen.h" -#include "machine/taito68705interface.h" - class bublbobl_state : public driver_device { @@ -185,4 +183,4 @@ protected: required_device m_mcu; }; -#endif // MAME_INCLUDES_BUBLBOBL_H +#endif // MAME_TAITO_BUBLBOBL_H diff --git a/src/mame/taito/bublbobl_m.cpp b/src/mame/taito/bublbobl_m.cpp index 659bcda1027..98930a97262 100644 --- a/src/mame/taito/bublbobl_m.cpp +++ b/src/mame/taito/bublbobl_m.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bublbobl.h" +#include "bublbobl.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/bublbobl_v.cpp b/src/mame/taito/bublbobl_v.cpp index 705a0a83e8f..072b4db8335 100644 --- a/src/mame/taito/bublbobl_v.cpp +++ b/src/mame/taito/bublbobl_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bublbobl.h" +#include "bublbobl.h" uint32_t bublbobl_state::screen_update_bublbobl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/taito/buggychl.cpp b/src/mame/taito/buggychl.cpp index 6ba7fd7fc3a..794f2132bb5 100644 --- a/src/mame/taito/buggychl.cpp +++ b/src/mame/taito/buggychl.cpp @@ -94,7 +94,7 @@ Schematics show the jumper set to the 6mhz setting. #include "emu.h" -#include "machine/taito68705interface.h" +#include "taito68705.h" #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/cchance.cpp b/src/mame/taito/cchance.cpp index 5675adc158f..8d469ae837d 100644 --- a/src/mame/taito/cchance.cpp +++ b/src/mame/taito/cchance.cpp @@ -35,7 +35,7 @@ cha3 $10d8 #include "emu.h" -#include "includes/tnzs.h" +#include "tnzs.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/taito/chaknpop.cpp b/src/mame/taito/chaknpop.cpp index 8cfe11e3899..b23a9aff955 100644 --- a/src/mame/taito/chaknpop.cpp +++ b/src/mame/taito/chaknpop.cpp @@ -110,7 +110,7 @@ Notes: */ #include "emu.h" -#include "includes/chaknpop.h" +#include "chaknpop.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" diff --git a/src/mame/taito/chaknpop.h b/src/mame/taito/chaknpop.h index a03dc076578..c62b9e44659 100644 --- a/src/mame/taito/chaknpop.h +++ b/src/mame/taito/chaknpop.h @@ -1,11 +1,12 @@ // license:BSD-3-Clause // copyright-holders:BUT -#ifndef MAME_INCLUDES_CHAKNPOP_H -#define MAME_INCLUDES_CHAKNPOP_H +#ifndef MAME_TAITO_CHAKNPOP_H +#define MAME_TAITO_CHAKNPOP_H #pragma once -#include "machine/taito68705interface.h" +#include "taito68705.h" + #include "emupal.h" #include "tilemap.h" @@ -73,4 +74,4 @@ private: void chaknpop_map(address_map &map); }; -#endif // MAME_INCLUDES_CHAKNPOP_H +#endif // MAME_TAITO_CHAKNPOP_H diff --git a/src/mame/taito/chaknpop_v.cpp b/src/mame/taito/chaknpop_v.cpp index 7c0ed3679f9..240a162c416 100644 --- a/src/mame/taito/chaknpop_v.cpp +++ b/src/mame/taito/chaknpop_v.cpp @@ -6,7 +6,7 @@ */ #include "emu.h" -#include "includes/chaknpop.h" +#include "chaknpop.h" #define GFX_FLIP_X 0x01 #define GFX_FLIP_Y 0x02 diff --git a/src/mame/taito/champbwl.cpp b/src/mame/taito/champbwl.cpp index 8b118354028..8a139a133cf 100644 --- a/src/mame/taito/champbwl.cpp +++ b/src/mame/taito/champbwl.cpp @@ -153,11 +153,14 @@ Notes: */ #include "emu.h" + +#include "seta001.h" + #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "machine/ticket.h" #include "sound/x1_010.h" -#include "video/seta001.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/taito/changela.cpp b/src/mame/taito/changela.cpp index 125204c0ed1..eb606614f0c 100644 --- a/src/mame/taito/changela.cpp +++ b/src/mame/taito/changela.cpp @@ -12,7 +12,7 @@ Tomasz Slanina ***************************************************************************/ #include "emu.h" -#include "includes/changela.h" +#include "changela.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/taito/changela_v.cpp b/src/mame/taito/changela_v.cpp index 5adc0a90218..47e8f5f524b 100644 --- a/src/mame/taito/changela_v.cpp +++ b/src/mame/taito/changela_v.cpp @@ -14,7 +14,7 @@ Todo: Priority between tree0 and tree1. ***************************************************************************/ #include "emu.h" -#include "includes/changela.h" +#include "changela.h" diff --git a/src/mame/taito/cpzodiac.cpp b/src/mame/taito/cpzodiac.cpp index 8824f9863e7..efc5f4c0962 100644 --- a/src/mame/taito/cpzodiac.cpp +++ b/src/mame/taito/cpzodiac.cpp @@ -30,7 +30,7 @@ TODO: #include "emu.h" #include "cpu/z80/z80.h" -#include "audio/taitosnd.h" +#include "taitosnd.h" #include "machine/te7750.h" #include "machine/z80ctc.h" #include "sound/ymopn.h" diff --git a/src/mame/taito/crbaloon.cpp b/src/mame/taito/crbaloon.cpp index 2e5fd0c5a26..f49f252be26 100644 --- a/src/mame/taito/crbaloon.cpp +++ b/src/mame/taito/crbaloon.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/crbaloon.h" +#include "crbaloon.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/taito/crbaloon_a.cpp b/src/mame/taito/crbaloon_a.cpp index aa6765362d5..df87052b8f9 100644 --- a/src/mame/taito/crbaloon_a.cpp +++ b/src/mame/taito/crbaloon_a.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/crbaloon.h" +#include "crbaloon.h" #include "speaker.h" diff --git a/src/mame/taito/crbaloon_v.cpp b/src/mame/taito/crbaloon_v.cpp index d1da8d7cc97..4a7a23dcf1a 100644 --- a/src/mame/taito/crbaloon_v.cpp +++ b/src/mame/taito/crbaloon_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/crbaloon.h" +#include "crbaloon.h" /*************************************************************************** diff --git a/src/mame/taito/cucaracha.cpp b/src/mame/taito/cucaracha.cpp index 7fd37e54ab1..cc4f3a75c53 100644 --- a/src/mame/taito/cucaracha.cpp +++ b/src/mame/taito/cucaracha.cpp @@ -19,7 +19,7 @@ #include "machine/te7750.h" #include "sound/okim6295.h" #include "sound/ymopn.h" -#include "audio/taitosnd.h" +#include "taitosnd.h" namespace { diff --git a/src/mame/taito/darius.cpp b/src/mame/taito/darius.cpp index aebc72a3068..e0ebc55a42f 100644 --- a/src/mame/taito/darius.cpp +++ b/src/mame/taito/darius.cpp @@ -130,8 +130,8 @@ sounds. ***************************************************************************/ #include "emu.h" -#include "includes/darius.h" -#include "audio/taitosnd.h" +#include "darius.h" +#include "taitosnd.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/darius.h b/src/mame/taito/darius.h index 90ecb7fa86f..ea66b46186b 100644 --- a/src/mame/taito/darius.h +++ b/src/mame/taito/darius.h @@ -12,7 +12,7 @@ #include "sound/flt_vol.h" #include "sound/msm5205.h" -#include "video/pc080sn.h" +#include "pc080sn.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/taito/darius_v.cpp b/src/mame/taito/darius_v.cpp index 0f701df8ae7..61184beae5e 100644 --- a/src/mame/taito/darius_v.cpp +++ b/src/mame/taito/darius_v.cpp @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:David Graves, Jarek Burczynski #include "emu.h" -#include "includes/darius.h" +#include "darius.h" #include "screen.h" /***************************************************************************/ diff --git a/src/mame/taito/exzisus.cpp b/src/mame/taito/exzisus.cpp index a76e16eb09e..0cfabe05562 100644 --- a/src/mame/taito/exzisus.cpp +++ b/src/mame/taito/exzisus.cpp @@ -37,8 +37,8 @@ TODO: #include "emu.h" -#include "audio/taitosnd.h" -#include "includes/taitoipt.h" +#include "taitosnd.h" +#include "taitoipt.h" #include "cpu/z80/z80.h" #include "sound/ymopm.h" diff --git a/src/mame/taito/fgoal.cpp b/src/mame/taito/fgoal.cpp index c43f5dd30a2..9f58d92e8e5 100644 --- a/src/mame/taito/fgoal.cpp +++ b/src/mame/taito/fgoal.cpp @@ -19,7 +19,7 @@ Differences between these sets include ***************************************************************************/ #include "emu.h" -#include "includes/fgoal.h" +#include "fgoal.h" #include "cpu/m6800/m6800.h" diff --git a/src/mame/taito/fgoal_v.cpp b/src/mame/taito/fgoal_v.cpp index 8152f58a0ad..e45d57a9a53 100644 --- a/src/mame/taito/fgoal_v.cpp +++ b/src/mame/taito/fgoal_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/fgoal.h" +#include "fgoal.h" void fgoal_state::color_w(uint8_t data) diff --git a/src/mame/taito/flstory.cpp b/src/mame/taito/flstory.cpp index a2d611ae1ba..61c1b860762 100644 --- a/src/mame/taito/flstory.cpp +++ b/src/mame/taito/flstory.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/flstory.h" +#include "flstory.h" #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/flstory.h b/src/mame/taito/flstory.h index 2630fb2cab4..3f9beec33d8 100644 --- a/src/mame/taito/flstory.h +++ b/src/mame/taito/flstory.h @@ -1,16 +1,18 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_FLSTORY_H -#define MAME_INCLUDES_FLSTORY_H +#ifndef MAME_TAITO_FLSTORY_H +#define MAME_TAITO_FLSTORY_H #pragma once +#include "taito68705.h" + #include "machine/gen_latch.h" #include "machine/input_merger.h" #include "sound/msm5232.h" -#include "machine/taito68705interface.h" #include "sound/ta7630.h" #include "sound/ay8910.h" + #include "emupal.h" #include "tilemap.h" @@ -124,4 +126,4 @@ private: void victnine_map(address_map &map); }; -#endif // MAME_INCLUDES_FLSTORY_H +#endif // MAME_TAITO_FLSTORY_H diff --git a/src/mame/taito/flstory_v.cpp b/src/mame/taito/flstory_v.cpp index 0ec9f74156f..20a92478e5e 100644 --- a/src/mame/taito/flstory_v.cpp +++ b/src/mame/taito/flstory_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/flstory.h" +#include "flstory.h" TILE_GET_INFO_MEMBER(flstory_state::get_tile_info) { diff --git a/src/mame/taito/galastrm.cpp b/src/mame/taito/galastrm.cpp index 37952dfeb31..bd09bb323e6 100644 --- a/src/mame/taito/galastrm.cpp +++ b/src/mame/taito/galastrm.cpp @@ -47,11 +47,11 @@ TODO: #include "cpu/m68000/m68000.h" #include "machine/adc0808.h" #include "machine/eepromser.h" -#include "machine/taitoio.h" +#include "taitoio.h" #include "sound/es5506.h" -#include "audio/taito_en.h" +#include "taito_en.h" #include "speaker.h" -#include "includes/galastrm.h" +#include "galastrm.h" /*********************************************************************/ diff --git a/src/mame/taito/galastrm.h b/src/mame/taito/galastrm.h index c200454d2d6..7b1813ec975 100644 --- a/src/mame/taito/galastrm.h +++ b/src/mame/taito/galastrm.h @@ -8,9 +8,9 @@ #include "machine/eepromser.h" #include "video/poly.h" -#include "video/tc0100scn.h" -#include "video/tc0110pcr.h" -#include "video/tc0480scp.h" +#include "tc0100scn.h" +#include "tc0110pcr.h" +#include "tc0480scp.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/taito/galastrm_v.cpp b/src/mame/taito/galastrm_v.cpp index 26794c430f5..2b8fbfaa9cb 100644 --- a/src/mame/taito/galastrm_v.cpp +++ b/src/mame/taito/galastrm_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Hau #include "emu.h" -#include "includes/galastrm.h" +#include "galastrm.h" #define X_OFFSET 96 #define Y_OFFSET 60 diff --git a/src/mame/taito/gladiatr.cpp b/src/mame/taito/gladiatr.cpp index 8e8f176fc20..b53e677cd39 100644 --- a/src/mame/taito/gladiatr.cpp +++ b/src/mame/taito/gladiatr.cpp @@ -190,7 +190,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/gladiatr.h" +#include "gladiatr.h" #include "machine/74259.h" #include "machine/clock.h" diff --git a/src/mame/taito/gladiatr_v.cpp b/src/mame/taito/gladiatr_v.cpp index bda3c5ed176..c413aaac375 100644 --- a/src/mame/taito/gladiatr_v.cpp +++ b/src/mame/taito/gladiatr_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gladiatr.h" +#include "gladiatr.h" /*************************************************************************** diff --git a/src/mame/taito/grchamp.cpp b/src/mame/taito/grchamp.cpp index 1212c698bd4..82a47717bfb 100644 --- a/src/mame/taito/grchamp.cpp +++ b/src/mame/taito/grchamp.cpp @@ -57,7 +57,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/grchamp.h" +#include "grchamp.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/taito/grchamp_a.cpp b/src/mame/taito/grchamp_a.cpp index 729fc9fe9d4..d1864c6dfb2 100644 --- a/src/mame/taito/grchamp_a.cpp +++ b/src/mame/taito/grchamp_a.cpp @@ -6,7 +6,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/grchamp.h" +#include "grchamp.h" /************************************************************************/ diff --git a/src/mame/taito/grchamp_v.cpp b/src/mame/taito/grchamp_v.cpp index c684ae199cb..7693c12f1fb 100644 --- a/src/mame/taito/grchamp_v.cpp +++ b/src/mame/taito/grchamp_v.cpp @@ -5,7 +5,7 @@ /* updated by Hans Andersson, dec 2005 */ #include "emu.h" #include "video/resnet.h" -#include "includes/grchamp.h" +#include "grchamp.h" #define FOG_SIZE 70 diff --git a/src/mame/taito/groundfx.cpp b/src/mame/taito/groundfx.cpp index 685dd184dec..73d33da7c61 100644 --- a/src/mame/taito/groundfx.cpp +++ b/src/mame/taito/groundfx.cpp @@ -65,9 +65,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/groundfx.h" -#include "audio/taito_en.h" -#include "machine/taitoio.h" +#include "groundfx.h" +#include "taito_en.h" +#include "taitoio.h" #include "cpu/m68000/m68000.h" #include "machine/adc0808.h" diff --git a/src/mame/taito/groundfx.h b/src/mame/taito/groundfx.h index 2b349c0f332..10f4e9ac63e 100644 --- a/src/mame/taito/groundfx.h +++ b/src/mame/taito/groundfx.h @@ -5,8 +5,8 @@ #pragma once -#include "video/tc0100scn.h" -#include "video/tc0480scp.h" +#include "tc0100scn.h" +#include "tc0480scp.h" #include "emupal.h" struct gfx_tempsprite diff --git a/src/mame/taito/groundfx_v.cpp b/src/mame/taito/groundfx_v.cpp index b418d9d8df8..3f6ba5f6ce9 100644 --- a/src/mame/taito/groundfx_v.cpp +++ b/src/mame/taito/groundfx_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Graves #include "emu.h" -#include "includes/groundfx.h" +#include "groundfx.h" #include "screen.h" /******************************************************************/ diff --git a/src/mame/taito/gsword.cpp b/src/mame/taito/gsword.cpp index 472c6a80550..58477591c90 100644 --- a/src/mame/taito/gsword.cpp +++ b/src/mame/taito/gsword.cpp @@ -336,7 +336,7 @@ protection subroutine and processing the command. ******************************************/ #include "emu.h" -#include "includes/gsword.h" +#include "gsword.h" #include "cpu/mcs48/mcs48.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/gsword_v.cpp b/src/mame/taito/gsword_v.cpp index 43795ac374d..5f14b773a4f 100644 --- a/src/mame/taito/gsword_v.cpp +++ b/src/mame/taito/gsword_v.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gsword.h" +#include "gsword.h" void gsword_state_base::videoram_w(offs_t offset, u8 data) diff --git a/src/mame/taito/gunbustr.cpp b/src/mame/taito/gunbustr.cpp index e6b7d0611cb..54b47927047 100644 --- a/src/mame/taito/gunbustr.cpp +++ b/src/mame/taito/gunbustr.cpp @@ -44,10 +44,10 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gunbustr.h" +#include "gunbustr.h" -#include "audio/taito_en.h" -#include "machine/taitoio.h" +#include "taito_en.h" +#include "taitoio.h" #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" diff --git a/src/mame/taito/gunbustr.h b/src/mame/taito/gunbustr.h index a51be91e5f7..21d33e9b788 100644 --- a/src/mame/taito/gunbustr.h +++ b/src/mame/taito/gunbustr.h @@ -6,7 +6,7 @@ #pragma once #include "machine/eepromser.h" -#include "video/tc0480scp.h" +#include "tc0480scp.h" #include "emupal.h" struct gb_tempsprite diff --git a/src/mame/taito/gunbustr_v.cpp b/src/mame/taito/gunbustr_v.cpp index 7bd787f80cf..b9520f11daa 100644 --- a/src/mame/taito/gunbustr_v.cpp +++ b/src/mame/taito/gunbustr_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Graves #include "emu.h" -#include "includes/gunbustr.h" +#include "gunbustr.h" #include "screen.h" /************************************************************/ diff --git a/src/mame/taito/halleys.cpp b/src/mame/taito/halleys.cpp index 9dc32c9da45..f2eb5444263 100644 --- a/src/mame/taito/halleys.cpp +++ b/src/mame/taito/halleys.cpp @@ -162,7 +162,7 @@ Video sync 6 F Video sync Post 6 F Post // Compiler Directives #include "emu.h" -#include "includes/taitoipt.h" +#include "taitoipt.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/heromem.cpp b/src/mame/taito/heromem.cpp index 362d5928770..32a95ac883a 100644 --- a/src/mame/taito/heromem.cpp +++ b/src/mame/taito/heromem.cpp @@ -37,7 +37,7 @@ TODO: #include "screen.h" #include "speaker.h" -#include "audio/taitosnd.h" +#include "taitosnd.h" namespace { diff --git a/src/mame/taito/kikikai.cpp b/src/mame/taito/kikikai.cpp index b5d38ec4a7d..44b8acbb836 100644 --- a/src/mame/taito/kikikai.cpp +++ b/src/mame/taito/kikikai.cpp @@ -140,7 +140,7 @@ A85_12 to 17 - 27C512 EPROM ***************************************************************************/ #include "emu.h" -#include "includes/kikikai.h" +#include "kikikai.h" #include "cpu/z80/z80.h" #include "screen.h" diff --git a/src/mame/taito/kikikai_m.cpp b/src/mame/taito/kikikai_m.cpp index 7c79653ff46..c981460c085 100644 --- a/src/mame/taito/kikikai_m.cpp +++ b/src/mame/taito/kikikai_m.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi #include "emu.h" -#include "includes/kikikai.h" +#include "kikikai.h" /* $f008 - write diff --git a/src/mame/taito/kikikai_v.cpp b/src/mame/taito/kikikai_v.cpp index 6e3f96011e7..5f872f48b23 100644 --- a/src/mame/taito/kikikai_v.cpp +++ b/src/mame/taito/kikikai_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi #include "emu.h" -#include "includes/kikikai.h" +#include "kikikai.h" void kikikai_state::main_bankswitch_w(uint8_t data) diff --git a/src/mame/taito/lkage.cpp b/src/mame/taito/lkage.cpp index bf4736ce7c3..7a00f0050e1 100644 --- a/src/mame/taito/lkage.cpp +++ b/src/mame/taito/lkage.cpp @@ -86,7 +86,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/lkage.h" +#include "lkage.h" #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/lkage.h b/src/mame/taito/lkage.h index 8bca81e7454..13d0551d386 100644 --- a/src/mame/taito/lkage.h +++ b/src/mame/taito/lkage.h @@ -1,13 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino -#ifndef MAME_INCLUDES_LKAGE_H -#define MAME_INCLUDES_LKAGE_H +#ifndef MAME_TAITO_LKAGE_H +#define MAME_TAITO_LKAGE_H #pragma once +#include "taito68705.h" + #include "machine/gen_latch.h" #include "machine/input_merger.h" -#include "machine/taito68705interface.h" #include "emupal.h" #include "tilemap.h" @@ -91,4 +92,4 @@ private: void lkage_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_LKAGE_H +#endif // MAME_TAITO_LKAGE_H diff --git a/src/mame/taito/lkage_v.cpp b/src/mame/taito/lkage_v.cpp index 1dbddf18823..45d065c9a3a 100644 --- a/src/mame/taito/lkage_v.cpp +++ b/src/mame/taito/lkage_v.cpp @@ -40,7 +40,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lkage.h" +#include "lkage.h" #include "screen.h" diff --git a/src/mame/taito/lsasquad.cpp b/src/mame/taito/lsasquad.cpp index cf0251ec079..501a2eec803 100644 --- a/src/mame/taito/lsasquad.cpp +++ b/src/mame/taito/lsasquad.cpp @@ -145,7 +145,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/lsasquad.h" +#include "lsasquad.h" #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/lsasquad.h b/src/mame/taito/lsasquad.h index a169a9aa442..fc66897da7f 100644 --- a/src/mame/taito/lsasquad.h +++ b/src/mame/taito/lsasquad.h @@ -1,9 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_TAITO_LSASQAD_H +#define MAME_TAITO_LSASQAD_H + +#pragma once + +#include "taito68705.h" #include "machine/gen_latch.h" #include "machine/input_merger.h" -#include "machine/taito68705interface.h" #include "emupal.h" class lsasquad_state : public driver_device @@ -75,3 +80,5 @@ private: void lsasquad_sound_map(address_map &map); void storming_map(address_map &map); }; + +#endif // MAME_TAITO_LSASQAD_H diff --git a/src/mame/taito/lsasquad_m.cpp b/src/mame/taito/lsasquad_m.cpp index b11ed937c40..a5ec6208107 100644 --- a/src/mame/taito/lsasquad_m.cpp +++ b/src/mame/taito/lsasquad_m.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "includes/lsasquad.h" +#include "lsasquad.h" /*************************************************************************** diff --git a/src/mame/taito/lsasquad_v.cpp b/src/mame/taito/lsasquad_v.cpp index 798cf60fb94..f2f652ef1f4 100644 --- a/src/mame/taito/lsasquad_v.cpp +++ b/src/mame/taito/lsasquad_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/lsasquad.h" +#include "lsasquad.h" void lsasquad_state::draw_layer(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *scrollram) { diff --git a/src/mame/taito/missb2.cpp b/src/mame/taito/missb2.cpp index a79c87d3182..899c2b1d532 100644 --- a/src/mame/taito/missb2.cpp +++ b/src/mame/taito/missb2.cpp @@ -15,7 +15,7 @@ written, so it may be normal behaviour. */ #include "emu.h" -#include "includes/bublbobl.h" +#include "bublbobl.h" #include "cpu/z80/z80.h" #include "sound/okim6295.h" diff --git a/src/mame/taito/mlanding.cpp b/src/mame/taito/mlanding.cpp index 964e56150ce..db54343245f 100644 --- a/src/mame/taito/mlanding.cpp +++ b/src/mame/taito/mlanding.cpp @@ -48,14 +48,14 @@ ****************************************************************************/ #include "emu.h" -#include "includes/taitoipt.h" -#include "audio/taitosnd.h" +#include "taitoipt.h" +#include "taitosnd.h" #include "cpu/m68000/m68000.h" #include "cpu/tms32025/tms32025.h" #include "cpu/z80/z80.h" #include "machine/z80ctc.h" -#include "machine/taitoio_yoke.h" +#include "taitoio_yoke.h" #include "sound/msm5205.h" #include "sound/ymopm.h" diff --git a/src/mame/taito/msisaac.cpp b/src/mame/taito/msisaac.cpp index f934e7857b8..785a6ce1c7c 100644 --- a/src/mame/taito/msisaac.cpp +++ b/src/mame/taito/msisaac.cpp @@ -15,7 +15,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/msisaac.h" +#include "msisaac.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" diff --git a/src/mame/taito/msisaac.h b/src/mame/taito/msisaac.h index 61235fb0e9f..d65f9e843b1 100644 --- a/src/mame/taito/msisaac.h +++ b/src/mame/taito/msisaac.h @@ -1,17 +1,20 @@ // license:GPL-2.0+ // copyright-holders:Jarek Burczynski -#ifndef MAME_INCLUDES_MSISAAC_H -#define MAME_INCLUDES_MSISAAC_H +#ifndef MAME_TAITO_MSISAAC_H +#define MAME_TAITO_MSISAAC_H #pragma once -#include "machine/taito68705interface.h" +#include "taito68705.h" + #include "machine/gen_latch.h" #include "sound/msm5232.h" #include "sound/ta7630.h" + #include "emupal.h" #include "tilemap.h" + /* Disabled because the mcu dump is currently unavailable. -AS */ //#define USE_MCU @@ -110,4 +113,4 @@ private: void msisaac_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_MSISAAC_H +#endif // MAME_TAITO_MSISAAC_H diff --git a/src/mame/taito/msisaac_v.cpp b/src/mame/taito/msisaac_v.cpp index 1836a164982..a75a57a3789 100644 --- a/src/mame/taito/msisaac_v.cpp +++ b/src/mame/taito/msisaac_v.cpp @@ -5,7 +5,7 @@ */ #include "emu.h" -#include "includes/msisaac.h" +#include "msisaac.h" /*************************************************************************** diff --git a/src/mame/taito/ninjaw.cpp b/src/mame/taito/ninjaw.cpp index 0928f5e6cd0..749cb233f38 100644 --- a/src/mame/taito/ninjaw.cpp +++ b/src/mame/taito/ninjaw.cpp @@ -316,8 +316,8 @@ rumbling on a subwoofer in the cabinet.) ***************************************************************************/ #include "emu.h" -#include "includes/ninjaw.h" -#include "includes/taitoipt.h" +#include "ninjaw.h" +#include "taitoipt.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/taito/ninjaw.h b/src/mame/taito/ninjaw.h index 7fde42e193c..148b4e3d3ae 100644 --- a/src/mame/taito/ninjaw.h +++ b/src/mame/taito/ninjaw.h @@ -10,11 +10,11 @@ #pragma once -#include "audio/taitosnd.h" -#include "machine/taitoio.h" +#include "taitosnd.h" +#include "taitoio.h" #include "sound/flt_vol.h" -#include "video/tc0100scn.h" -#include "video/tc0110pcr.h" +#include "tc0100scn.h" +#include "tc0110pcr.h" #include "emupal.h" diff --git a/src/mame/taito/ninjaw_v.cpp b/src/mame/taito/ninjaw_v.cpp index 9aa3ea9e5d1..a84982a070b 100644 --- a/src/mame/taito/ninjaw_v.cpp +++ b/src/mame/taito/ninjaw_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Graves #include "emu.h" -#include "includes/ninjaw.h" +#include "ninjaw.h" /************************************************************ SPRITE DRAW ROUTINE diff --git a/src/mame/taito/nycaptor.cpp b/src/mame/taito/nycaptor.cpp index d2675bad0fc..3e9a67904a8 100644 --- a/src/mame/taito/nycaptor.cpp +++ b/src/mame/taito/nycaptor.cpp @@ -191,8 +191,8 @@ Stephh's additional notes (based on the game Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/nycaptor.h" -#include "includes/taitoipt.h" +#include "nycaptor.h" +#include "taitoipt.h" #include "cpu/m6805/m6805.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/nycaptor.h b/src/mame/taito/nycaptor.h index 787cd4178cc..74c6ba2f5cd 100644 --- a/src/mame/taito/nycaptor.h +++ b/src/mame/taito/nycaptor.h @@ -1,17 +1,20 @@ // license:BSD-3-Clause // copyright-holders:Tomasz Slanina -#ifndef MAME_INCLUDES_NYCAPTOR_H -#define MAME_INCLUDES_NYCAPTOR_H +#ifndef MAME_TAITO_NYCAPTOR_H +#define MAME_TAITO_NYCAPTOR_H #pragma once +#include "taito68705.h" + #include "machine/gen_latch.h" #include "machine/input_merger.h" #include "sound/msm5232.h" -#include "machine/taito68705interface.h" + #include "emupal.h" #include "tilemap.h" + class nycaptor_state : public driver_device { public: @@ -119,4 +122,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_NYCAPTOR_H +#endif // MAME_TAITO_NYCAPTOR_H diff --git a/src/mame/taito/nycaptor_v.cpp b/src/mame/taito/nycaptor_v.cpp index 0cc4d7f62e3..0e17b6e8d10 100644 --- a/src/mame/taito/nycaptor_v.cpp +++ b/src/mame/taito/nycaptor_v.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/nycaptor.h" +#include "nycaptor.h" #define NYCAPTOR_DEBUG 0 diff --git a/src/mame/taito/opwolf.cpp b/src/mame/taito/opwolf.cpp index 041482976aa..4522de07852 100644 --- a/src/mame/taito/opwolf.cpp +++ b/src/mame/taito/opwolf.cpp @@ -273,11 +273,11 @@ register. So what is controlling priority. #include "emu.h" -#include "audio/taitosnd.h" -#include "includes/taitoipt.h" -#include "machine/taitocchip.h" -#include "video/pc080sn.h" -#include "video/pc090oj.h" +#include "taitosnd.h" +#include "taitoipt.h" +#include "taitocchip.h" +#include "pc080sn.h" +#include "pc090oj.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/othunder.cpp b/src/mame/taito/othunder.cpp index 127469ee132..28fd747168f 100644 --- a/src/mame/taito/othunder.cpp +++ b/src/mame/taito/othunder.cpp @@ -276,9 +276,9 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/othunder.h" -#include "includes/taitoipt.h" -#include "audio/taitosnd.h" +#include "othunder.h" +#include "taitoipt.h" +#include "taitosnd.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/othunder.h b/src/mame/taito/othunder.h index 2b00cdc056b..8ed0a2483ef 100644 --- a/src/mame/taito/othunder.h +++ b/src/mame/taito/othunder.h @@ -10,12 +10,12 @@ #pragma once -#include "audio/taitosnd.h" +#include "taitosnd.h" #include "machine/eepromser.h" -#include "machine/taitoio.h" +#include "taitoio.h" #include "sound/flt_vol.h" -#include "video/tc0100scn.h" -#include "video/tc0110pcr.h" +#include "tc0100scn.h" +#include "tc0110pcr.h" #include "emupal.h" diff --git a/src/mame/taito/othunder_v.cpp b/src/mame/taito/othunder_v.cpp index eccc701f064..195439ff836 100644 --- a/src/mame/taito/othunder_v.cpp +++ b/src/mame/taito/othunder_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Graves #include "emu.h" -#include "includes/othunder.h" +#include "othunder.h" #include "screen.h" diff --git a/src/mame/taito/pc080sn.cpp b/src/mame/taito/pc080sn.cpp index 2e1d6433c81..4de91c850cb 100644 --- a/src/mame/taito/pc080sn.cpp +++ b/src/mame/taito/pc080sn.cpp @@ -43,7 +43,7 @@ Control registers #include "emu.h" #include "pc080sn.h" -#include "video/taito_helper.h" +#include "taito_helper.h" #include "screen.h" #define PC080SN_RAM_SIZE 0x10000 diff --git a/src/mame/taito/pitnrun.cpp b/src/mame/taito/pitnrun.cpp index f050458529b..6e0c42fb097 100644 --- a/src/mame/taito/pitnrun.cpp +++ b/src/mame/taito/pitnrun.cpp @@ -67,7 +67,7 @@ K1000233A */ #include "emu.h" -#include "includes/pitnrun.h" +#include "pitnrun.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/pitnrun_m.cpp b/src/mame/taito/pitnrun_m.cpp index b2dff097218..a01934a59da 100644 --- a/src/mame/taito/pitnrun_m.cpp +++ b/src/mame/taito/pitnrun_m.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "cpu/m6805/m6805.h" -#include "includes/pitnrun.h" +#include "pitnrun.h" void pitnrun_state::machine_start() diff --git a/src/mame/taito/pitnrun_v.cpp b/src/mame/taito/pitnrun_v.cpp index 7ab1327869f..4df85ac9db4 100644 --- a/src/mame/taito/pitnrun_v.cpp +++ b/src/mame/taito/pitnrun_v.cpp @@ -19,7 +19,7 @@ In debug build press 'w' for spotlight and 'e' for lightning ***************************************************************************/ #include "emu.h" -#include "includes/pitnrun.h" +#include "pitnrun.h" diff --git a/src/mame/taito/qix.cpp b/src/mame/taito/qix.cpp index 9e8533fd9ba..b22560dde33 100644 --- a/src/mame/taito/qix.cpp +++ b/src/mame/taito/qix.cpp @@ -230,7 +230,7 @@ Interrupts: ***************************************************************************/ #include "emu.h" -#include "includes/qix.h" +#include "qix.h" #include "machine/nvram.h" diff --git a/src/mame/taito/qix_a.cpp b/src/mame/taito/qix_a.cpp index 505c419140b..0d91566498b 100644 --- a/src/mame/taito/qix_a.cpp +++ b/src/mame/taito/qix_a.cpp @@ -7,7 +7,7 @@ *************************************************************************/ #include "emu.h" -#include "includes/qix.h" +#include "qix.h" #include "cpu/m6800/m6800.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/taito/qix_m.cpp b/src/mame/taito/qix_m.cpp index 8479daabc6d..dd6b5d8d058 100644 --- a/src/mame/taito/qix_m.cpp +++ b/src/mame/taito/qix_m.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/qix.h" +#include "qix.h" #include "cpu/m6800/m6800.h" diff --git a/src/mame/taito/qix_v.cpp b/src/mame/taito/qix_v.cpp index 61eb6017f0b..dd05cb0b5da 100644 --- a/src/mame/taito/qix_v.cpp +++ b/src/mame/taito/qix_v.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/qix.h" +#include "qix.h" #include "cpu/m6809/m6809.h" #include "video/mc6845.h" diff --git a/src/mame/taito/rastan.cpp b/src/mame/taito/rastan.cpp index c1f6c549036..892e281497e 100644 --- a/src/mame/taito/rastan.cpp +++ b/src/mame/taito/rastan.cpp @@ -151,8 +151,8 @@ Note: The 'rastsagaa' set's ROM numbers were named as RSxx_37 through RSxx_42 #include "emu.h" -#include "audio/taitosnd.h" -#include "includes/taitoipt.h" +#include "taitosnd.h" +#include "taitoipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" @@ -160,8 +160,8 @@ Note: The 'rastsagaa' set's ROM numbers were named as RSxx_37 through RSxx_42 #include "machine/watchdog.h" #include "sound/msm5205.h" #include "sound/ymopm.h" -#include "video/pc080sn.h" -#include "video/pc090oj.h" +#include "pc080sn.h" +#include "pc090oj.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/taito/rbisland.cpp b/src/mame/taito/rbisland.cpp index 5ede9320e40..62d3bdfb28a 100644 --- a/src/mame/taito/rbisland.cpp +++ b/src/mame/taito/rbisland.cpp @@ -320,9 +320,9 @@ Stephh's notes (based on the game M68000 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/rbisland.h" -#include "includes/taitoipt.h" -#include "audio/taitosnd.h" +#include "rbisland.h" +#include "taitoipt.h" +#include "taitosnd.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/rbisland.h b/src/mame/taito/rbisland.h index b4e308805d2..a3d872ce27b 100644 --- a/src/mame/taito/rbisland.h +++ b/src/mame/taito/rbisland.h @@ -11,10 +11,10 @@ #pragma once -#include "machine/taitocchip.h" +#include "taitocchip.h" -#include "video/pc080sn.h" -#include "video/pc090oj.h" +#include "pc080sn.h" +#include "pc090oj.h" #include "machine/timer.h" #include "emupal.h" diff --git a/src/mame/taito/rbisland_v.cpp b/src/mame/taito/rbisland_v.cpp index 20a5fb47445..14f5b0fdf57 100644 --- a/src/mame/taito/rbisland_v.cpp +++ b/src/mame/taito/rbisland_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/rbisland.h" +#include "rbisland.h" #include "screen.h" /***************************************************************************/ diff --git a/src/mame/taito/retofinv.cpp b/src/mame/taito/retofinv.cpp index 3c2ad1539b2..75a8674e4e9 100644 --- a/src/mame/taito/retofinv.cpp +++ b/src/mame/taito/retofinv.cpp @@ -104,7 +104,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/retofinv.h" +#include "retofinv.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/taito/retofinv.h b/src/mame/taito/retofinv.h index 7d8bd476506..4bba2301fc0 100644 --- a/src/mame/taito/retofinv.h +++ b/src/mame/taito/retofinv.h @@ -1,15 +1,18 @@ // license:BSD-3-Clause // copyright-holders:Jarek Parchanski, Andrea Mazzoleni -#ifndef MAME_INCLUDES_RETOFINV_H -#define MAME_INCLUDES_RETOFINV_H +#ifndef MAME_TAITO_RETOFINV_H +#define MAME_TAITO_RETOFINV_H #pragma once +#include "taito68705.h" + #include "machine/74259.h" -#include "machine/taito68705interface.h" + #include "emupal.h" #include "tilemap.h" + class retofinv_state : public driver_device { public: @@ -89,4 +92,4 @@ private: tilemap_t *m_fg_tilemap = nullptr; }; -#endif // MAME_INCLUDES_RETOFINV_H +#endif // MAME_TAITO_RETOFINV_H diff --git a/src/mame/taito/retofinv_v.cpp b/src/mame/taito/retofinv_v.cpp index e481f781be7..315db23b9cc 100644 --- a/src/mame/taito/retofinv_v.cpp +++ b/src/mame/taito/retofinv_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/retofinv.h" +#include "retofinv.h" void retofinv_state::retofinv_palette(palette_device &palette) const diff --git a/src/mame/taito/rollrace.cpp b/src/mame/taito/rollrace.cpp index 37592dc3c45..5bef99eb690 100644 --- a/src/mame/taito/rollrace.cpp +++ b/src/mame/taito/rollrace.cpp @@ -10,7 +10,7 @@ Issues: ***************************************************************************/ #include "emu.h" -#include "includes/rollrace.h" +#include "rollrace.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/taito/rollrace_v.cpp b/src/mame/taito/rollrace_v.cpp index d6c83ea04f6..a96a6aa52fc 100644 --- a/src/mame/taito/rollrace_v.cpp +++ b/src/mame/taito/rollrace_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Pierpaolo Prazzoli #include "emu.h" -#include "includes/rollrace.h" +#include "rollrace.h" #define RA_FGCHAR_BASE 0 diff --git a/src/mame/taito/slapshot.cpp b/src/mame/taito/slapshot.cpp index d6df5ec23af..903b9094658 100644 --- a/src/mame/taito/slapshot.cpp +++ b/src/mame/taito/slapshot.cpp @@ -132,7 +132,7 @@ Region byte at offset 0x031: ***************************************************************************/ #include "emu.h" -#include "includes/slapshot.h" +#include "slapshot.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/slapshot.h b/src/mame/taito/slapshot.h index 995cf4fd3e3..bbf35e6b461 100644 --- a/src/mame/taito/slapshot.h +++ b/src/mame/taito/slapshot.h @@ -10,10 +10,10 @@ #pragma once -#include "audio/taitosnd.h" -#include "machine/taitoio.h" -#include "video/tc0360pri.h" -#include "video/tc0480scp.h" +#include "taitosnd.h" +#include "taitoio.h" +#include "tc0360pri.h" +#include "tc0480scp.h" #include "emupal.h" class slapshot_state : public driver_device diff --git a/src/mame/taito/slapshot_v.cpp b/src/mame/taito/slapshot_v.cpp index 37827d8d650..11e44c010a1 100644 --- a/src/mame/taito/slapshot_v.cpp +++ b/src/mame/taito/slapshot_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Graves #include "emu.h" -#include "includes/slapshot.h" +#include "slapshot.h" #include "screen.h" /**********************************************************/ diff --git a/src/mame/taito/spdheat.cpp b/src/mame/taito/spdheat.cpp index 256f0fe8384..361be000320 100644 --- a/src/mame/taito/spdheat.cpp +++ b/src/mame/taito/spdheat.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/spdheat.h" +#include "spdheat.h" #include "spdheat.lh" #include "speaker.h" diff --git a/src/mame/taito/ssrj.cpp b/src/mame/taito/ssrj.cpp index c5f8ab10e67..68700e0579b 100644 --- a/src/mame/taito/ssrj.cpp +++ b/src/mame/taito/ssrj.cpp @@ -31,7 +31,7 @@ HW info : ************************************/ #include "emu.h" -#include "includes/ssrj.h" +#include "ssrj.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/taito/ssrj_v.cpp b/src/mame/taito/ssrj_v.cpp index 22cc70efa3f..8ee4ddabc15 100644 --- a/src/mame/taito/ssrj_v.cpp +++ b/src/mame/taito/ssrj_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Tomasz Slanina #include "emu.h" -#include "includes/ssrj.h" +#include "ssrj.h" /* tilemap 1 */ diff --git a/src/mame/taito/superchs.cpp b/src/mame/taito/superchs.cpp index d109cfaa6ff..219c581369e 100644 --- a/src/mame/taito/superchs.cpp +++ b/src/mame/taito/superchs.cpp @@ -41,9 +41,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/superchs.h" -#include "audio/taito_en.h" -#include "machine/taitoio.h" +#include "superchs.h" +#include "taito_en.h" +#include "taitoio.h" #include "cpu/m68000/m68000.h" #include "machine/adc0808.h" diff --git a/src/mame/taito/superchs.h b/src/mame/taito/superchs.h index 8dc4f01df7d..320fd7dd665 100644 --- a/src/mame/taito/superchs.h +++ b/src/mame/taito/superchs.h @@ -6,7 +6,7 @@ #pragma once #include "machine/eepromser.h" -#include "video/tc0480scp.h" +#include "tc0480scp.h" #include "emupal.h" class superchs_state : public driver_device diff --git a/src/mame/taito/superchs_v.cpp b/src/mame/taito/superchs_v.cpp index 352018a83dd..48c26049081 100644 --- a/src/mame/taito/superchs_v.cpp +++ b/src/mame/taito/superchs_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Graves #include "emu.h" -#include "includes/superchs.h" +#include "superchs.h" #include "screen.h" void superchs_state::video_start() diff --git a/src/mame/taito/superqix.cpp b/src/mame/taito/superqix.cpp index 68730701d45..ff1982cad6f 100644 --- a/src/mame/taito/superqix.cpp +++ b/src/mame/taito/superqix.cpp @@ -170,7 +170,7 @@ code at z80:0093: ***************************************************************************/ #include "emu.h" -#include "includes/superqix.h" +#include "superqix.h" #include "cpu/z80/z80.h" #include "screen.h" diff --git a/src/mame/taito/superqix_v.cpp b/src/mame/taito/superqix_v.cpp index da863200d39..b8970d5f573 100644 --- a/src/mame/taito/superqix_v.cpp +++ b/src/mame/taito/superqix_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/superqix.h" +#include "superqix.h" diff --git a/src/mame/taito/taito_b.cpp b/src/mame/taito/taito_b.cpp index d1f11dc8dcd..2364396902f 100644 --- a/src/mame/taito/taito_b.cpp +++ b/src/mame/taito/taito_b.cpp @@ -246,9 +246,9 @@ TODO! ***************************************************************************/ #include "emu.h" -#include "includes/taito_b.h" -#include "includes/taitoipt.h" -#include "audio/taitosnd.h" +#include "taito_b.h" +#include "taitoipt.h" +#include "taitosnd.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/taito_b.h b/src/mame/taito/taito_b.h index 1a2cf6fa7ef..e41a325c216 100644 --- a/src/mame/taito/taito_b.h +++ b/src/mame/taito/taito_b.h @@ -6,9 +6,9 @@ #pragma once #include "machine/mb87078.h" -#include "machine/taitoio.h" +#include "taitoio.h" #include "video/hd63484.h" -#include "video/tc0180vcu.h" +#include "tc0180vcu.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/taito/taito_b_v.cpp b/src/mame/taito/taito_b_v.cpp index e5a6f90e5f4..ece5e0551c2 100644 --- a/src/mame/taito/taito_b_v.cpp +++ b/src/mame/taito/taito_b_v.cpp @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Jarek Burczynski #include "emu.h" -#include "includes/taito_b.h" +#include "taito_b.h" void hitice_state::pixelram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { diff --git a/src/mame/taito/taito_f2.cpp b/src/mame/taito/taito_f2.cpp index 5f6cfb1e0d2..3aac38bdff1 100644 --- a/src/mame/taito/taito_f2.cpp +++ b/src/mame/taito/taito_f2.cpp @@ -263,9 +263,9 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/taito_f2.h" -#include "includes/taitoipt.h" -#include "audio/taitosnd.h" +#include "taito_f2.h" +#include "taitoipt.h" +#include "taitosnd.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/taito_f2.h b/src/mame/taito/taito_f2.h index e722cfc8d2b..0afe7e742ae 100644 --- a/src/mame/taito/taito_f2.h +++ b/src/mame/taito/taito_f2.h @@ -5,15 +5,15 @@ #pragma once -#include "machine/taitocchip.h" -#include "machine/taitoio.h" +#include "taitocchip.h" +#include "taitoio.h" #include "sound/okim6295.h" -#include "video/tc0100scn.h" -#include "video/tc0110pcr.h" -#include "video/tc0280grd.h" -#include "video/tc0360pri.h" -#include "video/tc0480scp.h" +#include "tc0100scn.h" +#include "tc0110pcr.h" +#include "tc0280grd.h" +#include "tc0360pri.h" +#include "tc0480scp.h" #include "machine/timer.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/taito/taito_f2_v.cpp b/src/mame/taito/taito_f2_v.cpp index 2fac521ca13..ebbeeb5fbd9 100644 --- a/src/mame/taito/taito_f2_v.cpp +++ b/src/mame/taito/taito_f2_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Graves, Bryan McPhail, Brad Oliver, Andrew Prime, Brian Troha, Nicola Salmoria #include "emu.h" -#include "includes/taito_f2.h" +#include "taito_f2.h" #include "screen.h" /************************************************************ diff --git a/src/mame/taito/taito_f3.cpp b/src/mame/taito/taito_f3.cpp index f70d5a59b9f..0efb9f8c013 100644 --- a/src/mame/taito/taito_f3.cpp +++ b/src/mame/taito/taito_f3.cpp @@ -32,7 +32,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/taito_f3.h" +#include "taito_f3.h" #include "cpu/m68000/m68000.h" #include "sound/es5506.h" diff --git a/src/mame/taito/taito_f3.h b/src/mame/taito/taito_f3.h index 0f2c173822e..03a4c11d546 100644 --- a/src/mame/taito/taito_f3.h +++ b/src/mame/taito/taito_f3.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/taito_en.h" +#include "taito_en.h" #include "machine/eepromser.h" #include "machine/watchdog.h" #include "sound/okim6295.h" diff --git a/src/mame/taito/taito_f3_v.cpp b/src/mame/taito/taito_f3_v.cpp index f6ce5966929..95dcf29b4d7 100644 --- a/src/mame/taito/taito_f3_v.cpp +++ b/src/mame/taito/taito_f3_v.cpp @@ -208,7 +208,7 @@ Playfield tile info: ***************************************************************************/ #include "emu.h" -#include "includes/taito_f3.h" +#include "taito_f3.h" #include "render.h" #include diff --git a/src/mame/taito/taito_h.cpp b/src/mame/taito/taito_h.cpp index ad602336942..aebf6c0a9f4 100644 --- a/src/mame/taito/taito_h.cpp +++ b/src/mame/taito/taito_h.cpp @@ -144,9 +144,9 @@ some kind of zoom table? ****************************************************************************/ #include "emu.h" -#include "includes/taito_h.h" -#include "includes/taitoipt.h" -#include "audio/taitosnd.h" +#include "taito_h.h" +#include "taitoipt.h" +#include "taitosnd.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/taito/taito_h.h b/src/mame/taito/taito_h.h index ce4bba3ea88..80975d11d8c 100644 --- a/src/mame/taito/taito_h.h +++ b/src/mame/taito/taito_h.h @@ -10,8 +10,8 @@ #pragma once -#include "machine/taitoio.h" -#include "video/tc0080vco.h" +#include "taitoio.h" +#include "tc0080vco.h" #include "emupal.h" diff --git a/src/mame/taito/taito_h_v.cpp b/src/mame/taito/taito_h_v.cpp index 061cf4d6ac4..cec80d015a1 100644 --- a/src/mame/taito/taito_h_v.cpp +++ b/src/mame/taito/taito_h_v.cpp @@ -48,7 +48,7 @@ sprite RAM ***************************************************************************/ #include "emu.h" -#include "includes/taito_h.h" +#include "taito_h.h" /*************************************************************************** diff --git a/src/mame/taito/taito_l.cpp b/src/mame/taito/taito_l.cpp index 6a6a9d150c8..844632d67fb 100644 --- a/src/mame/taito/taito_l.cpp +++ b/src/mame/taito/taito_l.cpp @@ -54,18 +54,17 @@ puzznici note */ #include "emu.h" -#include "includes/taito_l.h" -#include "includes/taitoipt.h" -#include "machine/taito68705interface.h" -#include "machine/taitoio.h" +#include "taito_l.h" -#include "audio/taitosnd.h" +#include "taitoio.h" +#include "taitoipt.h" +#include "taitosnd.h" -#include "cpu/z80/z80.h" +#include "taito68705.h" +#include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/mb8421.h" - #include "sound/msm5205.h" #include "sound/ymopn.h" diff --git a/src/mame/taito/taito_l_v.cpp b/src/mame/taito/taito_l_v.cpp index be898e09ee5..22c597cf032 100644 --- a/src/mame/taito/taito_l_v.cpp +++ b/src/mame/taito/taito_l_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert #include "emu.h" -#include "includes/taito_l.h" +#include "taito_l.h" #include "screen.h" #include diff --git a/src/mame/taito/taito_o.cpp b/src/mame/taito/taito_o.cpp index 1e7cd943853..10efdcfaf17 100644 --- a/src/mame/taito/taito_o.cpp +++ b/src/mame/taito/taito_o.cpp @@ -32,7 +32,7 @@ TODO: #include "emu.h" -#include "video/tc0080vco.h" +#include "tc0080vco.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/taito_x.cpp b/src/mame/taito/taito_x.cpp index 139112ef3c9..d1470e95271 100644 --- a/src/mame/taito/taito_x.cpp +++ b/src/mame/taito/taito_x.cpp @@ -434,10 +434,11 @@ Stephh's notes (based on the game M68000 code and some tests) : #include "emu.h" -#include "includes/seta.h" -#include "includes/taitoipt.h" -#include "audio/taitosnd.h" -#include "machine/taitocchip.h" +#include "taitoipt.h" +#include "taitosnd.h" +#include "taitocchip.h" + +#include "seta001.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" @@ -445,17 +446,22 @@ Stephh's notes (based on the game M68000 code and some tests) : #include "sound/ymopm.h" #include "sound/ymopn.h" +#include "emupal.h" #include "screen.h" #include "speaker.h" namespace { -class taitox_state : public seta_state +class taitox_state : public driver_device { public: taitox_state(const machine_config &mconfig, device_type type, const char *tag) : - seta_state(mconfig, type, tag), + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), + m_audiocpu(*this, "audiocpu"), + m_seta001(*this, "spritegen"), + m_palette(*this, "palette"), m_z80bank(*this, "z80bank"), m_dswa_io(*this, "DSWA"), m_dswb_io(*this, "DSWB"), @@ -470,11 +476,18 @@ public: protected: virtual void machine_start() override; + u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + u16 dsw_input_r(offs_t offset); void taito_x_base_map(address_map &map); void sound_map(address_map &map); + required_device m_maincpu; + required_device m_audiocpu; + required_device m_seta001; + required_device m_palette; + private: u16 input_r(offs_t offset); void daisenpu_input_w(offs_t offset, u16 data); @@ -989,6 +1002,14 @@ TIMER_DEVICE_CALLBACK_MEMBER(taitox_cchip_state::cchip_irq_clear_cb) m_cchip->ext_interrupt(CLEAR_LINE); } +u32 taitox_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + bitmap.fill(0x1f0, cliprect); + + m_seta001->draw_sprites(screen, bitmap,cliprect,0x1000); + return 0; +} + /**************************************************************************/ @@ -1023,7 +1044,7 @@ void taitox_cchip_state::superman(machine_config &config) screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); screen.set_size(52*8, 32*8); screen.set_visarea(0*8, 48*8-1, 1*8, 31*8-1); - screen.set_screen_update(FUNC(taitox_cchip_state::screen_update_seta_no_layers)); + screen.set_screen_update(FUNC(taitox_cchip_state::screen_update)); screen.set_palette(m_palette); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 2048); @@ -1067,7 +1088,7 @@ void taitox_state::daisenpu(machine_config &config) screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); screen.set_size(52*8, 32*8); screen.set_visarea(0*8, 48*8-1, 2*8, 30*8-1); - screen.set_screen_update(FUNC(taitox_state::screen_update_seta_no_layers)); + screen.set_screen_update(FUNC(taitox_state::screen_update)); screen.set_palette(m_palette); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 2048); @@ -1108,7 +1129,7 @@ void taitox_state::gigandes(machine_config &config) screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); screen.set_size(52*8, 32*8); screen.set_visarea(0*8, 48*8-1, 1*8, 31*8-1); - screen.set_screen_update(FUNC(taitox_state::screen_update_seta_no_layers)); + screen.set_screen_update(FUNC(taitox_state::screen_update)); screen.set_palette(m_palette); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 2048); @@ -1152,7 +1173,7 @@ void taitox_state::ballbros(machine_config &config) screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); screen.set_size(52*8, 32*8); screen.set_visarea(0*8, 48*8-1, 1*8, 31*8-1); - screen.set_screen_update(FUNC(taitox_state::screen_update_seta_no_layers)); + screen.set_screen_update(FUNC(taitox_state::screen_update)); screen.set_palette(m_palette); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 2048); diff --git a/src/mame/taito/taito_z.cpp b/src/mame/taito/taito_z.cpp index 9b3cd1c26ca..1808837d65a 100644 --- a/src/mame/taito/taito_z.cpp +++ b/src/mame/taito/taito_z.cpp @@ -1267,8 +1267,8 @@ DIP switches are not verified ***************************************************************************/ #include "emu.h" -#include "includes/taito_z.h" -#include "includes/taitoipt.h" +#include "taito_z.h" +#include "taitoipt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/taito_z.h b/src/mame/taito/taito_z.h index a1352a6aca9..ea02325de27 100644 --- a/src/mame/taito/taito_z.h +++ b/src/mame/taito/taito_z.h @@ -10,14 +10,14 @@ #pragma once -#include "audio/taitosnd.h" +#include "taitosnd.h" #include "machine/eepromser.h" -#include "machine/taitoio.h" +#include "taitoio.h" #include "sound/flt_vol.h" -#include "video/tc0100scn.h" -#include "video/tc0110pcr.h" -#include "video/tc0150rod.h" -#include "video/tc0480scp.h" +#include "tc0100scn.h" +#include "tc0110pcr.h" +#include "tc0150rod.h" +#include "tc0480scp.h" #include "screen.h" diff --git a/src/mame/taito/taito_z_v.cpp b/src/mame/taito/taito_z_v.cpp index d3a1afa8219..c5267abb488 100644 --- a/src/mame/taito/taito_z_v.cpp +++ b/src/mame/taito/taito_z_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Graves #include "emu.h" -#include "includes/taito_z.h" +#include "taito_z.h" /**********************************************************/ diff --git a/src/mame/taito/taitoair.cpp b/src/mame/taito/taitoair.cpp index 60511720c17..bfea10fb5b3 100644 --- a/src/mame/taito/taitoair.cpp +++ b/src/mame/taito/taitoair.cpp @@ -195,9 +195,9 @@ perhaps? The two writes seem to take only two values. */ #include "emu.h" -#include "includes/taitoair.h" -#include "includes/taitoipt.h" -#include "audio/taitosnd.h" +#include "taitoair.h" +#include "taitoipt.h" +#include "taitosnd.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/taitoair.h b/src/mame/taito/taitoair.h index 51940544881..327833315bb 100644 --- a/src/mame/taito/taitoair.h +++ b/src/mame/taito/taitoair.h @@ -11,9 +11,9 @@ #pragma once #include "cpu/tms32025/tms32025.h" -#include "machine/taitoio.h" -#include "machine/taitoio_yoke.h" -#include "video/tc0080vco.h" +#include "taitoio.h" +#include "taitoio_yoke.h" +#include "tc0080vco.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/taito/taitoair_v.cpp b/src/mame/taito/taitoair_v.cpp index f4953002e38..e155929fb02 100644 --- a/src/mame/taito/taitoair_v.cpp +++ b/src/mame/taito/taitoair_v.cpp @@ -48,7 +48,7 @@ sprite RAM ***************************************************************************/ #include "emu.h" -#include "includes/taitoair.h" +#include "taitoair.h" /*************************************************************************** diff --git a/src/mame/taito/taitocchip.cpp b/src/mame/taito/taitocchip.cpp index cf3b546400a..2ed4694ea69 100644 --- a/src/mame/taito/taitocchip.cpp +++ b/src/mame/taito/taitocchip.cpp @@ -103,7 +103,7 @@ This chip *ALWAYS* has a bypass capacitor (ceramic, 104, 0.10 uF) soldered on to */ #include "emu.h" -#include "machine/taitocchip.h" +#include "taitocchip.h" #include "cpu/upd7810/upd7811.h" diff --git a/src/mame/taito/taitoio.cpp b/src/mame/taito/taitoio.cpp index cac89ce09ed..eb20b4bd0bf 100644 --- a/src/mame/taito/taitoio.cpp +++ b/src/mame/taito/taitoio.cpp @@ -54,7 +54,7 @@ Newer version of the I/O chip ? ***************************************************************************/ #include "emu.h" -#include "machine/taitoio.h" +#include "taitoio.h" #include diff --git a/src/mame/taito/taitojc.cpp b/src/mame/taito/taitojc.cpp index 4bb9a7e241c..3a8e282e6da 100644 --- a/src/mame/taito/taitojc.cpp +++ b/src/mame/taito/taitojc.cpp @@ -381,14 +381,14 @@ Notes: */ #include "emu.h" -#include "includes/taitojc.h" -#include "audio/taito_en.h" +#include "taitojc.h" +#include "taito_en.h" #include "cpu/m68000/m68000.h" #include "cpu/mc68hc11/mc68hc11.h" #include "cpu/tms32051/tms32051.h" #include "machine/eepromser.h" -#include "machine/taitoio.h" +#include "taitoio.h" #include "sound/es5506.h" #include "sound/okim6295.h" diff --git a/src/mame/taito/taitojc.h b/src/mame/taito/taitojc.h index 0aa4700caf5..88bc02e2287 100644 --- a/src/mame/taito/taitojc.h +++ b/src/mame/taito/taitojc.h @@ -6,8 +6,8 @@ *************************************************************************/ -#include "video/tc0780fpa.h" -#include "machine/taitoio.h" +#include "tc0780fpa.h" +#include "taitoio.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/taito/taitojc_v.cpp b/src/mame/taito/taitojc_v.cpp index 7a21426f408..4c884c11c74 100644 --- a/src/mame/taito/taitojc_v.cpp +++ b/src/mame/taito/taitojc_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/poly.h" -#include "includes/taitojc.h" +#include "taitojc.h" static const gfx_layout taitojc_char_layout = { diff --git a/src/mame/taito/taitopjc.cpp b/src/mame/taito/taitopjc.cpp index 3886abda756..ab096d89cfd 100644 --- a/src/mame/taito/taitopjc.cpp +++ b/src/mame/taito/taitopjc.cpp @@ -88,7 +88,7 @@ #include "cpu/tlcs900/tmp95c063.h" #include "cpu/mn10200/mn10200.h" #include "cpu/tms32051/tms32051.h" -#include "video/tc0780fpa.h" +#include "tc0780fpa.h" #include "machine/nvram.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/taito/taitosj.cpp b/src/mame/taito/taitosj.cpp index 590e7d2cb1b..793e6ceca67 100644 --- a/src/mame/taito/taitosj.cpp +++ b/src/mame/taito/taitosj.cpp @@ -166,7 +166,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/taitosj.h" +#include "taitosj.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/taito/taitosj.h b/src/mame/taito/taitosj.h index 3988c1dc619..f624b971813 100644 --- a/src/mame/taito/taitosj.h +++ b/src/mame/taito/taitosj.h @@ -7,7 +7,7 @@ #include "sound/dac.h" #include "sound/discrete.h" -#include "machine/taitosjsec.h" +#include "taitosjsec.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/taito/taitosj_m.cpp b/src/mame/taito/taitosj_m.cpp index 7fc9ee612e3..691e16b2309 100644 --- a/src/mame/taito/taitosj_m.cpp +++ b/src/mame/taito/taitosj_m.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "cpu/m6805/m6805.h" -#include "includes/taitosj.h" +#include "taitosj.h" #define VERBOSE 1 diff --git a/src/mame/taito/taitosj_v.cpp b/src/mame/taito/taitosj_v.cpp index 09df075c62d..10da31c56a1 100644 --- a/src/mame/taito/taitosj_v.cpp +++ b/src/mame/taito/taitosj_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/taitosj.h" +#include "taitosj.h" #define GLOBAL_FLIP_X (*m_video_mode & 0x01) diff --git a/src/mame/taito/taitowlf.cpp b/src/mame/taito/taitowlf.cpp index 339409a7c39..29dc6784e3e 100644 --- a/src/mame/taito/taitowlf.cpp +++ b/src/mame/taito/taitowlf.cpp @@ -62,9 +62,10 @@ Taito W Rom Board: #define TAITOWLF_ENABLE_VGA 0 +#include "pcshare.h" + #include "cpu/i386/i386.h" #include "machine/lpci.h" -#include "machine/pcshare.h" #include "machine/pckeybrd.h" #if TAITOWLF_ENABLE_VGA #include "video/pc_vga.h" diff --git a/src/mame/taito/tc0080vco.cpp b/src/mame/taito/tc0080vco.cpp index 91726187a2d..28c18d5ce30 100644 --- a/src/mame/taito/tc0080vco.cpp +++ b/src/mame/taito/tc0080vco.cpp @@ -62,7 +62,7 @@ this seems to be the only zoom feature actually used in the games. #include "emu.h" #include "tc0080vco.h" -#include "video/taito_helper.h" +#include "taito_helper.h" #include "drawgfxt.ipp" #include "screen.h" diff --git a/src/mame/taito/tc0150rod.cpp b/src/mame/taito/tc0150rod.cpp index 3f81ae26ada..b5c271d629f 100644 --- a/src/mame/taito/tc0150rod.cpp +++ b/src/mame/taito/tc0150rod.cpp @@ -8,7 +8,7 @@ Road generator. Two roads allow for forking. Gfx data fetched from ROM. Refer to #include "emu.h" #include "tc0150rod.h" -#include "video/taito_helper.h" +#include "taito_helper.h" #define TC0150ROD_RAM_SIZE 0x2000 diff --git a/src/mame/taito/tc0480scp.cpp b/src/mame/taito/tc0480scp.cpp index 081f918cc2e..b34c52fab91 100644 --- a/src/mame/taito/tc0480scp.cpp +++ b/src/mame/taito/tc0480scp.cpp @@ -143,7 +143,7 @@ Control registers #include "emu.h" #include "tc0480scp.h" -#include "video/taito_helper.h" +#include "taito_helper.h" #include "screen.h" #define TC0480SCP_RAM_SIZE 0x10000 diff --git a/src/mame/taito/tnzs.cpp b/src/mame/taito/tnzs.cpp index 6b85803913c..fdccd850f87 100644 --- a/src/mame/taito/tnzs.cpp +++ b/src/mame/taito/tnzs.cpp @@ -621,8 +621,8 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/11/06 ***************************************************************************/ #include "emu.h" -#include "includes/tnzs.h" -#include "includes/taitoipt.h" +#include "tnzs.h" +#include "taitoipt.h" #include "cpu/z80/z80.h" #include "sound/ymopm.h" diff --git a/src/mame/taito/tnzs.h b/src/mame/taito/tnzs.h index 922342504e8..747b4017eae 100644 --- a/src/mame/taito/tnzs.h +++ b/src/mame/taito/tnzs.h @@ -1,10 +1,11 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia, Mirko Buffoni, Takahiro Nogi -#ifndef MAME_INCLUDES_TNZS_H -#define MAME_INCLUDES_TNZS_H +#ifndef MAME_TAITO_TNZS_H +#define MAME_TAITO_TNZS_H #pragma once +#include "seta001.h" #include "cpu/mcs48/mcs48.h" #include "machine/bankdev.h" @@ -12,10 +13,11 @@ #include "machine/upd4701.h" #include "sound/dac.h" #include "sound/samples.h" -#include "video/seta001.h" + #include "emupal.h" #include "screen.h" + class tnzs_base_state : public driver_device { public: @@ -299,4 +301,4 @@ private: required_memory_bank m_audiobank; }; -#endif // MAME_INCLUDES_TNZS_H +#endif // MAME_TAITO_TNZS_H diff --git a/src/mame/taito/tnzs_m.cpp b/src/mame/taito/tnzs_m.cpp index e1246b052df..05d0b387a2c 100644 --- a/src/mame/taito/tnzs_m.cpp +++ b/src/mame/taito/tnzs_m.cpp @@ -16,7 +16,7 @@ #include "emu.h" #include "cpu/mcs48/mcs48.h" -#include "includes/tnzs.h" +#include "tnzs.h" uint8_t tnzs_mcu_state::mcu_r(offs_t offset) { diff --git a/src/mame/taito/tnzs_v.cpp b/src/mame/taito/tnzs_v.cpp index 865bb321d37..8b31c739d53 100644 --- a/src/mame/taito/tnzs_v.cpp +++ b/src/mame/taito/tnzs_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/tnzs.h" +#include "tnzs.h" /*************************************************************************** diff --git a/src/mame/taito/topspeed.cpp b/src/mame/taito/topspeed.cpp index f95cecbf611..5db76d9db57 100644 --- a/src/mame/taito/topspeed.cpp +++ b/src/mame/taito/topspeed.cpp @@ -154,13 +154,13 @@ From JP manual ***************************************************************************/ #include "emu.h" -#include "includes/topspeed.h" -#include "includes/taitoipt.h" -#include "audio/taitosnd.h" +#include "topspeed.h" +#include "taitoipt.h" +#include "taitosnd.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" -#include "machine/taitoio.h" +#include "taitoio.h" #include "machine/z80ctc.h" #include "sound/flt_vol.h" #include "sound/msm5205.h" diff --git a/src/mame/taito/topspeed.h b/src/mame/taito/topspeed.h index e3d2ed199cd..c8bb825e8dc 100644 --- a/src/mame/taito/topspeed.h +++ b/src/mame/taito/topspeed.h @@ -12,8 +12,8 @@ #include "sound/msm5205.h" #include "sound/flt_vol.h" -#include "machine/taitoio.h" -#include "video/pc080sn.h" +#include "taitoio.h" +#include "pc080sn.h" class topspeed_state : public driver_device { diff --git a/src/mame/taito/topspeed_v.cpp b/src/mame/taito/topspeed_v.cpp index 912e357f4fb..fd115b55ee8 100644 --- a/src/mame/taito/topspeed_v.cpp +++ b/src/mame/taito/topspeed_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Graves #include "emu.h" -#include "includes/topspeed.h" +#include "topspeed.h" #include "screen.h" diff --git a/src/mame/taito/tsamurai.cpp b/src/mame/taito/tsamurai.cpp index a65503afd82..b3b28a22ad2 100644 --- a/src/mame/taito/tsamurai.cpp +++ b/src/mame/taito/tsamurai.cpp @@ -39,7 +39,7 @@ the "America" release. ****************************************************************************/ #include "emu.h" -#include "includes/tsamurai.h" +#include "tsamurai.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/taito/tsamurai_v.cpp b/src/mame/taito/tsamurai_v.cpp index 3ff1fd57436..7ce8b37255c 100644 --- a/src/mame/taito/tsamurai_v.cpp +++ b/src/mame/taito/tsamurai_v.cpp @@ -5,7 +5,7 @@ */ #include "emu.h" -#include "includes/tsamurai.h" +#include "tsamurai.h" /*************************************************************************** diff --git a/src/mame/taito/undrfire.cpp b/src/mame/taito/undrfire.cpp index 0e708282336..a512c105061 100644 --- a/src/mame/taito/undrfire.cpp +++ b/src/mame/taito/undrfire.cpp @@ -191,13 +191,13 @@ Board contains only 29 ROMs and not much else. ***************************************************************************/ #include "emu.h" -#include "includes/undrfire.h" -#include "audio/taito_en.h" +#include "undrfire.h" +#include "taito_en.h" #include "cpu/m68000/m68000.h" #include "machine/adc0808.h" #include "machine/eepromser.h" -#include "machine/taitoio.h" +#include "taitoio.h" #include "machine/watchdog.h" #include "sound/es5506.h" #include "screen.h" diff --git a/src/mame/taito/undrfire.h b/src/mame/taito/undrfire.h index 1a25ce686c3..9fcf139fb15 100644 --- a/src/mame/taito/undrfire.h +++ b/src/mame/taito/undrfire.h @@ -6,9 +6,9 @@ #pragma once #include "machine/eepromser.h" -#include "video/tc0100scn.h" -#include "video/tc0360pri.h" -#include "video/tc0480scp.h" +#include "tc0100scn.h" +#include "tc0360pri.h" +#include "tc0480scp.h" #include "emupal.h" class undrfire_state : public driver_device diff --git a/src/mame/taito/undrfire_v.cpp b/src/mame/taito/undrfire_v.cpp index 91452d9e28c..7b273938705 100644 --- a/src/mame/taito/undrfire_v.cpp +++ b/src/mame/taito/undrfire_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Graves #include "emu.h" -#include "includes/undrfire.h" +#include "undrfire.h" #include "screen.h" diff --git a/src/mame/taito/volfied.cpp b/src/mame/taito/volfied.cpp index 45d4a7fe42e..5d9b71e1984 100644 --- a/src/mame/taito/volfied.cpp +++ b/src/mame/taito/volfied.cpp @@ -46,9 +46,9 @@ Stephh's notes (based on the game M68000 code and some tests) : ********************************************************************/ #include "emu.h" -#include "includes/volfied.h" -#include "includes/taitoipt.h" -#include "audio/taitosnd.h" +#include "volfied.h" +#include "taitoipt.h" +#include "taitosnd.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/taito/volfied.h b/src/mame/taito/volfied.h index 3dc0fa984d3..705213b7c50 100644 --- a/src/mame/taito/volfied.h +++ b/src/mame/taito/volfied.h @@ -10,8 +10,8 @@ #pragma once -#include "machine/taitocchip.h" -#include "video/pc090oj.h" +#include "taitocchip.h" +#include "pc090oj.h" #include "screen.h" #include "machine/timer.h" diff --git a/src/mame/taito/volfied_v.cpp b/src/mame/taito/volfied_v.cpp index d99365cadcb..b4d03171e14 100644 --- a/src/mame/taito/volfied_v.cpp +++ b/src/mame/taito/volfied_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, Nicola Salmoria #include "emu.h" -#include "includes/volfied.h" +#include "volfied.h" /****************************************************** INITIALISATION AND CLEAN-UP diff --git a/src/mame/taito/warriorb.cpp b/src/mame/taito/warriorb.cpp index dcd63392014..dcd2c19b2dc 100644 --- a/src/mame/taito/warriorb.cpp +++ b/src/mame/taito/warriorb.cpp @@ -147,8 +147,8 @@ Colscroll effects? ***************************************************************************/ #include "emu.h" -#include "includes/warriorb.h" -#include "includes/taitoipt.h" +#include "warriorb.h" +#include "taitoipt.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/taito/warriorb.h b/src/mame/taito/warriorb.h index 73d353f0cd2..90a8d61ec90 100644 --- a/src/mame/taito/warriorb.h +++ b/src/mame/taito/warriorb.h @@ -6,11 +6,11 @@ *************************************************************************/ -#include "audio/taitosnd.h" -#include "machine/taitoio.h" +#include "taitosnd.h" +#include "taitoio.h" #include "sound/flt_vol.h" -#include "video/tc0100scn.h" -#include "video/tc0110pcr.h" +#include "tc0100scn.h" +#include "tc0110pcr.h" #include "emupal.h" diff --git a/src/mame/taito/warriorb_v.cpp b/src/mame/taito/warriorb_v.cpp index c3f89c580bc..5ccf2594cf1 100644 --- a/src/mame/taito/warriorb_v.cpp +++ b/src/mame/taito/warriorb_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Graves #include "emu.h" -#include "includes/warriorb.h" +#include "warriorb.h" #include "screen.h" /************************************************************ diff --git a/src/mame/taito/wgp.cpp b/src/mame/taito/wgp.cpp index df65cec64f0..a79905f5aee 100644 --- a/src/mame/taito/wgp.cpp +++ b/src/mame/taito/wgp.cpp @@ -397,8 +397,8 @@ Stephh's notes (based on the game M68000 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/wgp.h" -#include "includes/taitoipt.h" +#include "wgp.h" +#include "taitoipt.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/taito/wgp.h b/src/mame/taito/wgp.h index ab6b77fabfa..a030258b07d 100644 --- a/src/mame/taito/wgp.h +++ b/src/mame/taito/wgp.h @@ -10,9 +10,9 @@ #pragma once -#include "audio/taitosnd.h" -#include "machine/taitoio.h" -#include "video/tc0100scn.h" +#include "taitosnd.h" +#include "taitoio.h" +#include "tc0100scn.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/taito/wgp_v.cpp b/src/mame/taito/wgp_v.cpp index f0e7b5c857d..9c5c44e33fe 100644 --- a/src/mame/taito/wgp_v.cpp +++ b/src/mame/taito/wgp_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Graves #include "emu.h" -#include "includes/wgp.h" +#include "wgp.h" #include "screen.h" diff --git a/src/mame/taito/wyvernf0.cpp b/src/mame/taito/wyvernf0.cpp index f71cfb2c158..de1e5f5b9d8 100644 --- a/src/mame/taito/wyvernf0.cpp +++ b/src/mame/taito/wyvernf0.cpp @@ -32,9 +32,11 @@ TODO: ***************************************************************************/ #include "emu.h" + +#include "taito68705.h" + #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" -#include "machine/taito68705interface.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" #include "sound/msm5232.h" @@ -45,6 +47,8 @@ TODO: #include "tilemap.h" +namespace { + class wyvernf0_state : public driver_device { public: @@ -754,5 +758,7 @@ ROM_START( wyvernf0a ) /* Possibly the first version or even an earlier developm ROM_LOAD( "sch_1.ic74", 0x6000, 0x2000, CRC(1cc389de) SHA1(4213484d3a82688f312811e7a5c4d128e40584c3) ) /* == a39_12.ic74 */ ROM_END +} // anonymous namespace + GAME( 1985, wyvernf0, 0, wyvernf0, wyvernf0, wyvernf0_state, empty_init, ROT270, "Taito Corporation", "Wyvern F-0 (Rev 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND) GAME( 1985, wyvernf0a, wyvernf0, wyvernf0, wyvernf0, wyvernf0_state, empty_init, ROT270, "Taito Corporation", "Wyvern F-0", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND) // First version or earlier dev version? diff --git a/src/mame/tandberg/tdv2324.cpp b/src/mame/tandberg/tdv2324.cpp index 1c83aa48648..272d1e68804 100644 --- a/src/mame/tandberg/tdv2324.cpp +++ b/src/mame/tandberg/tdv2324.cpp @@ -101,7 +101,7 @@ #include "emu.h" -#include "includes/tdv2324.h" +#include "tdv2324.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/tangerin/microtan.cpp b/src/mame/tangerin/microtan.cpp index 2e58ee51efa..f631a519921 100644 --- a/src/mame/tangerin/microtan.cpp +++ b/src/mame/tangerin/microtan.cpp @@ -58,7 +58,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/microtan.h" +#include "microtan.h" #include "emupal.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/tangerin/microtan_m.cpp b/src/mame/tangerin/microtan_m.cpp index 0a3c2f07feb..dca952e483a 100644 --- a/src/mame/tangerin/microtan_m.cpp +++ b/src/mame/tangerin/microtan_m.cpp @@ -15,7 +15,7 @@ *****************************************************************************/ #include "emu.h" -#include "includes/microtan.h" +#include "microtan.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/mame/tangerin/microtan_v.cpp b/src/mame/tangerin/microtan_v.cpp index 2a002cf04b9..d023f2ecffa 100644 --- a/src/mame/tangerin/microtan_v.cpp +++ b/src/mame/tangerin/microtan_v.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/microtan.h" +#include "microtan.h" void microtan_state::videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/tatsumi/lockon.cpp b/src/mame/tatsumi/lockon.cpp index 1b12d25f339..d005c782f1a 100644 --- a/src/mame/tatsumi/lockon.cpp +++ b/src/mame/tatsumi/lockon.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lockon.h" +#include "lockon.h" #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" diff --git a/src/mame/tatsumi/lockon_v.cpp b/src/mame/tatsumi/lockon_v.cpp index 7fcb470eb8d..76b22dfb911 100644 --- a/src/mame/tatsumi/lockon_v.cpp +++ b/src/mame/tatsumi/lockon_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lockon.h" +#include "lockon.h" #include "cpu/nec/nec.h" #include "video/resnet.h" diff --git a/src/mame/tatsumi/tatsumi.cpp b/src/mame/tatsumi/tatsumi.cpp index e11190ef44a..f607a9ead8b 100644 --- a/src/mame/tatsumi/tatsumi.cpp +++ b/src/mame/tatsumi/tatsumi.cpp @@ -153,7 +153,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/tatsumi.h" +#include "tatsumi.h" #include "cpu/nec/nec.h" #include "cpu/z80/z80.h" diff --git a/src/mame/tatsumi/tatsumi_m.cpp b/src/mame/tatsumi/tatsumi_m.cpp index a9837222f5f..ee69e99abc4 100644 --- a/src/mame/tatsumi/tatsumi_m.cpp +++ b/src/mame/tatsumi/tatsumi_m.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, Angelo Salese #include "emu.h" -#include "includes/tatsumi.h" +#include "tatsumi.h" #include "sound/okim6295.h" diff --git a/src/mame/tatsumi/tatsumi_v.cpp b/src/mame/tatsumi/tatsumi_v.cpp index 2a0d8b64556..4bdd6240b43 100644 --- a/src/mame/tatsumi/tatsumi_v.cpp +++ b/src/mame/tatsumi/tatsumi_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, Angelo Salese #include "emu.h" -#include "includes/tatsumi.h" +#include "tatsumi.h" #include "screen.h" diff --git a/src/mame/tatsumi/tx1.cpp b/src/mame/tatsumi/tx1.cpp index 32118b76d6b..fa7f27a1962 100644 --- a/src/mame/tatsumi/tx1.cpp +++ b/src/mame/tatsumi/tx1.cpp @@ -41,7 +41,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/tx1.h" +#include "tx1.h" #include "cpu/i86/i86.h" #include "cpu/z80/z80.h" diff --git a/src/mame/tatsumi/tx1.h b/src/mame/tatsumi/tx1.h index 39107c0fa95..76dd6e1182f 100644 --- a/src/mame/tatsumi/tx1.h +++ b/src/mame/tatsumi/tx1.h @@ -12,7 +12,7 @@ #include "emupal.h" #include "screen.h" -#include "audio/tx1.h" +#include "tx1_a.h" #define TX1_PIXEL_CLOCK (XTAL(18'000'000) / 3) #define TX1_HBSTART 256 diff --git a/src/mame/tatsumi/tx1_a.cpp b/src/mame/tatsumi/tx1_a.cpp index 22f3e23ec5b..429352cdb7d 100644 --- a/src/mame/tatsumi/tx1_a.cpp +++ b/src/mame/tatsumi/tx1_a.cpp @@ -8,9 +8,9 @@ #include "emu.h" -#include "audio/tx1.h" +#include "tx1_a.h" #include "cpu/z80/z80.h" -#include "includes/tx1.h" +#include "tx1.h" #include "video/resnet.h" #include "speaker.h" diff --git a/src/mame/tatsumi/tx1_m.cpp b/src/mame/tatsumi/tx1_m.cpp index bcda21afd20..5856ceb0a9a 100644 --- a/src/mame/tatsumi/tx1_m.cpp +++ b/src/mame/tatsumi/tx1_m.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "debugger.h" #include "cpu/i86/i86.h" -#include "includes/tx1.h" +#include "tx1.h" /* diff --git a/src/mame/tatsumi/tx1_v.cpp b/src/mame/tatsumi/tx1_v.cpp index 1581cc90320..a63c6d32d60 100644 --- a/src/mame/tatsumi/tx1_v.cpp +++ b/src/mame/tatsumi/tx1_v.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/tx1.h" +#include "tx1.h" #include "video/resnet.h" #include "cpu/i86/i86.h" diff --git a/src/mame/tch/kickgoal.cpp b/src/mame/tch/kickgoal.cpp index b043988fdf1..3250b613e8b 100644 --- a/src/mame/tch/kickgoal.cpp +++ b/src/mame/tch/kickgoal.cpp @@ -62,7 +62,7 @@ lev 7 : 0x7c : 0000 0000 - x */ #include "emu.h" -#include "includes/kickgoal.h" +#include "kickgoal.h" #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" diff --git a/src/mame/tch/kickgoal_v.cpp b/src/mame/tch/kickgoal_v.cpp index 4ab7273e150..0d417e86f67 100644 --- a/src/mame/tch/kickgoal_v.cpp +++ b/src/mame/tch/kickgoal_v.cpp @@ -3,7 +3,7 @@ /* Kick Goal - video */ #include "emu.h" -#include "includes/kickgoal.h" +#include "kickgoal.h" void kickgoal_state::fgram_w(offs_t offset, u16 data, u16 mem_mask) diff --git a/src/mame/tch/littlerb.cpp b/src/mame/tch/littlerb.cpp index f07765a6c0d..a50c37fa932 100644 --- a/src/mame/tch/littlerb.cpp +++ b/src/mame/tch/littlerb.cpp @@ -94,12 +94,17 @@ Dip sw.2 */ #include "emu.h" + +#include "inder_vid.h" + #include "cpu/m68000/m68000.h" -#include "machine/inder_vid.h" #include "machine/timer.h" #include "sound/dac.h" + #include "speaker.h" +namespace { + #define littlerb_printf logerror #define littlerb_alt_printf logerror @@ -332,4 +337,6 @@ void littlerb_state::init_littlerb() m_indervid->subdevice("tms")->set_clock_scale(1.2f); } +} // anonymous namespace + GAME( 1994, littlerb, 0, littlerb, littlerb, littlerb_state, init_littlerb, ROT0, "TCH", "Little Robin", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/tch/rltennis.cpp b/src/mame/tch/rltennis.cpp index 15ee5131c2f..7f09307a260 100644 --- a/src/mame/tch/rltennis.cpp +++ b/src/mame/tch/rltennis.cpp @@ -62,7 +62,7 @@ player - when there's nothing to play - first, empty 2k of ROMs are selected. ****************************************************************************************/ #include "emu.h" -#include "includes/rltennis.h" +#include "rltennis.h" #include "cpu/m68000/m68000.h" #include "machine/eeprompar.h" diff --git a/src/mame/tch/rltennis_v.cpp b/src/mame/tch/rltennis_v.cpp index 3b5c7bfdc7e..005d169b25b 100644 --- a/src/mame/tch/rltennis_v.cpp +++ b/src/mame/tch/rltennis_v.cpp @@ -72,7 +72,7 @@ Blitter registers description (reg/bit names selected arbitrary ) : ****************************************************************************************/ #include "emu.h" -#include "includes/rltennis.h" +#include "rltennis.h" enum { diff --git a/src/mame/tch/speedspn.cpp b/src/mame/tch/speedspn.cpp index b9f93e4f25a..dbc4385c880 100644 --- a/src/mame/tch/speedspn.cpp +++ b/src/mame/tch/speedspn.cpp @@ -22,7 +22,7 @@ TODO: ******************************************************************************/ #include "emu.h" -#include "includes/speedspn.h" +#include "speedspn.h" #include "cpu/z80/z80.h" #include "screen.h" diff --git a/src/mame/tch/speedspn_v.cpp b/src/mame/tch/speedspn_v.cpp index 6c42525f2d6..88481323c25 100644 --- a/src/mame/tch/speedspn_v.cpp +++ b/src/mame/tch/speedspn_v.cpp @@ -3,7 +3,7 @@ /* Speed Spin video, see driver file for notes */ #include "emu.h" -#include "includes/speedspn.h" +#include "speedspn.h" TILE_GET_INFO_MEMBER(speedspn_state::get_tile_info) diff --git a/src/mame/tecfri/holeland.cpp b/src/mame/tecfri/holeland.cpp index 5f78055e13c..a5df4bd8f08 100644 --- a/src/mame/tecfri/holeland.cpp +++ b/src/mame/tecfri/holeland.cpp @@ -17,7 +17,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/holeland.h" +#include "holeland.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" diff --git a/src/mame/tecfri/holeland_v.cpp b/src/mame/tecfri/holeland_v.cpp index 9e5d28af8d5..98bf0608111 100644 --- a/src/mame/tecfri/holeland_v.cpp +++ b/src/mame/tecfri/holeland_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/holeland.h" +#include "holeland.h" /*************************************************************************** diff --git a/src/mame/tecfri/sauro.cpp b/src/mame/tecfri/sauro.cpp index ed68f23bb1a..672ea8a5785 100644 --- a/src/mame/tecfri/sauro.cpp +++ b/src/mame/tecfri/sauro.cpp @@ -126,7 +126,7 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/sauro.h" +#include "sauro.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" diff --git a/src/mame/tecfri/sauro_v.cpp b/src/mame/tecfri/sauro_v.cpp index b88de8924db..2f2779efcd0 100644 --- a/src/mame/tecfri/sauro_v.cpp +++ b/src/mame/tecfri/sauro_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/sauro.h" +#include "sauro.h" /* General */ diff --git a/src/mame/tecfri/speedbal.cpp b/src/mame/tecfri/speedbal.cpp index e6972aae1b8..f25a1f94bf1 100644 --- a/src/mame/tecfri/speedbal.cpp +++ b/src/mame/tecfri/speedbal.cpp @@ -30,7 +30,7 @@ Interrupt frequency on audio CPU is not a periodical signal, but there are a lot ***************************************************************************/ #include "emu.h" -#include "includes/speedbal.h" +#include "speedbal.h" #include "cpu/z80/z80.h" #include "sound/ymopl.h" diff --git a/src/mame/tecfri/speedbal_v.cpp b/src/mame/tecfri/speedbal_v.cpp index 962760f2972..ad6ee09e803 100644 --- a/src/mame/tecfri/speedbal_v.cpp +++ b/src/mame/tecfri/speedbal_v.cpp @@ -9,7 +9,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/speedbal.h" +#include "speedbal.h" TILE_GET_INFO_MEMBER(speedbal_state::get_tile_info_bg) diff --git a/src/mame/technos/battlane.cpp b/src/mame/technos/battlane.cpp index ef559594320..a61a83302e7 100644 --- a/src/mame/technos/battlane.cpp +++ b/src/mame/technos/battlane.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/battlane.h" +#include "battlane.h" #include "cpu/m6809/m6809.h" #include "sound/ymopl.h" diff --git a/src/mame/technos/battlane_v.cpp b/src/mame/technos/battlane_v.cpp index b2370d742fc..5ce4c2e9e91 100644 --- a/src/mame/technos/battlane_v.cpp +++ b/src/mame/technos/battlane_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/battlane.h" +#include "battlane.h" void battlane_state::battlane_palette_w(offs_t offset, uint8_t data) diff --git a/src/mame/technos/blockout.cpp b/src/mame/technos/blockout.cpp index 447b305bb22..c8355cd51bd 100644 --- a/src/mame/technos/blockout.cpp +++ b/src/mame/technos/blockout.cpp @@ -67,7 +67,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/blockout.h" +#include "blockout.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/technos/blockout_v.cpp b/src/mame/technos/blockout_v.cpp index 1e84ca939e8..1261559d1fb 100644 --- a/src/mame/technos/blockout_v.cpp +++ b/src/mame/technos/blockout_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/blockout.h" +#include "blockout.h" rgb_t blockout_state::blockout_xBGR_444(u32 raw) diff --git a/src/mame/technos/bogeyman.cpp b/src/mame/technos/bogeyman.cpp index 85f4cb17038..6dea253b82e 100644 --- a/src/mame/technos/bogeyman.cpp +++ b/src/mame/technos/bogeyman.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bogeyman.h" +#include "bogeyman.h" #include "cpu/m6502/m6502.h" #include "screen.h" diff --git a/src/mame/technos/bogeyman_v.cpp b/src/mame/technos/bogeyman_v.cpp index 9f253793bc3..85e5efd0a24 100644 --- a/src/mame/technos/bogeyman_v.cpp +++ b/src/mame/technos/bogeyman_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail #include "emu.h" -#include "includes/bogeyman.h" +#include "bogeyman.h" void bogeyman_state::bogeyman_palette(palette_device &palette) const diff --git a/src/mame/technos/chinagat.cpp b/src/mame/technos/chinagat.cpp index 755719b8799..f93dac403bb 100644 --- a/src/mame/technos/chinagat.cpp +++ b/src/mame/technos/chinagat.cpp @@ -244,7 +244,7 @@ M2H - /% \_____/ duty 1:1, 1.5MHz */ #include "emu.h" -#include "includes/ddragon.h" +#include "ddragon.h" #include "cpu/m6809/hd6309.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/technos/ddragon.cpp b/src/mame/technos/ddragon.cpp index e8ef8aec315..ed50ab8cd5f 100644 --- a/src/mame/technos/ddragon.cpp +++ b/src/mame/technos/ddragon.cpp @@ -53,7 +53,7 @@ Dip locations verified with manual for ddragon & ddragon2 ***************************************************************************/ #include "emu.h" -#include "includes/ddragon.h" +#include "ddragon.h" #include "cpu/m6809/hd6309.h" #include "cpu/m6800/m6801.h" diff --git a/src/mame/technos/ddragon3.cpp b/src/mame/technos/ddragon3.cpp index 1831612443b..46b766507cc 100644 --- a/src/mame/technos/ddragon3.cpp +++ b/src/mame/technos/ddragon3.cpp @@ -183,7 +183,7 @@ ROMs (All ROMs are 27C010 EPROM. - means not populated) #include "emu.h" -#include "includes/ddragon3.h" +#include "ddragon3.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/technos/ddragon3_v.cpp b/src/mame/technos/ddragon3_v.cpp index 8cac741d536..2156df7dc42 100644 --- a/src/mame/technos/ddragon3_v.cpp +++ b/src/mame/technos/ddragon3_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ddragon3.h" +#include "ddragon3.h" void ddragon3_state::ddragon3_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) { diff --git a/src/mame/technos/ddragon_v.cpp b/src/mame/technos/ddragon_v.cpp index 19781087f13..f202ba9bf01 100644 --- a/src/mame/technos/ddragon_v.cpp +++ b/src/mame/technos/ddragon_v.cpp @@ -43,7 +43,7 @@ Sprite layout. ***************************************************************************/ #include "emu.h" -#include "includes/ddragon.h" +#include "ddragon.h" /*************************************************************************** diff --git a/src/mame/technos/dogfgt.cpp b/src/mame/technos/dogfgt.cpp index f46ead3e4ab..bdc0ee14595 100644 --- a/src/mame/technos/dogfgt.cpp +++ b/src/mame/technos/dogfgt.cpp @@ -10,7 +10,7 @@ driver by Nicola Salmoria ***************************************************************************/ #include "emu.h" -#include "includes/dogfgt.h" +#include "dogfgt.h" #include "cpu/m6502/m6502.h" #include "speaker.h" diff --git a/src/mame/technos/dogfgt_v.cpp b/src/mame/technos/dogfgt_v.cpp index a8e3ee9fa8f..6046644283d 100644 --- a/src/mame/technos/dogfgt_v.cpp +++ b/src/mame/technos/dogfgt_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/dogfgt.h" +#include "dogfgt.h" /*************************************************************************** diff --git a/src/mame/technos/matmania.cpp b/src/mame/technos/matmania.cpp index f8539866e8f..4bb134abb10 100644 --- a/src/mame/technos/matmania.cpp +++ b/src/mame/technos/matmania.cpp @@ -32,7 +32,7 @@ The driver has been updated accordingly. ***************************************************************************/ #include "emu.h" -#include "includes/matmania.h" +#include "matmania.h" #include "cpu/m6502/m6502.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/technos/matmania.h b/src/mame/technos/matmania.h index 57b1b9a792b..7c5ebfed2b8 100644 --- a/src/mame/technos/matmania.h +++ b/src/mame/technos/matmania.h @@ -1,13 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Brad Oliver -#ifndef MAME_INCLUDES_MATMANIA_H -#define MAME_INCLUDES_MATMANIA_H +#ifndef MAME_TECHNOS_MATMANIA_H +#define MAME_TECHNOS_MATMANIA_H #pragma once -#include "machine/taito68705interface.h" +#include "taito68705.h" #include "machine/gen_latch.h" + #include "emupal.h" #include "screen.h" @@ -80,4 +81,4 @@ private: void matmania_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_MATMANIA_H +#endif // MAME_TECHNOS_MATMANIA_H diff --git a/src/mame/technos/matmania_v.cpp b/src/mame/technos/matmania_v.cpp index 5040abaeec0..df9cc2a5d6f 100644 --- a/src/mame/technos/matmania_v.cpp +++ b/src/mame/technos/matmania_v.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/matmania.h" +#include "matmania.h" /*************************************************************************** diff --git a/src/mame/technos/mystston.cpp b/src/mame/technos/mystston.cpp index e671b1b3979..2015b186588 100644 --- a/src/mame/technos/mystston.cpp +++ b/src/mame/technos/mystston.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mystston.h" +#include "mystston.h" #include "cpu/m6502/m6502.h" #include "speaker.h" diff --git a/src/mame/technos/mystston_v.cpp b/src/mame/technos/mystston_v.cpp index c65b21799db..0afa9238386 100644 --- a/src/mame/technos/mystston_v.cpp +++ b/src/mame/technos/mystston_v.cpp @@ -16,7 +16,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/mystston.h" +#include "mystston.h" diff --git a/src/mame/technos/renegade.cpp b/src/mame/technos/renegade.cpp index 5eec5476e31..395bc3a42b4 100644 --- a/src/mame/technos/renegade.cpp +++ b/src/mame/technos/renegade.cpp @@ -115,7 +115,7 @@ $8000 - $ffff ROM ******************************************************************************/ #include "emu.h" -#include "includes/renegade.h" +#include "renegade.h" #include "cpu/m6502/m6502.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/technos/renegade.h b/src/mame/technos/renegade.h index 599ec5fde79..afd0aef71c2 100644 --- a/src/mame/technos/renegade.h +++ b/src/mame/technos/renegade.h @@ -1,15 +1,16 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino, Carlos A. Lozano, Rob Rosenbrock -#ifndef MAME_INCLUDES_RENEGADE_H -#define MAME_INCLUDES_RENEGADE_H +#ifndef MAME_TECHNOS_RENEGADE_H +#define MAME_TECHNOS_RENEGADE_H #pragma once -#include "machine/taito68705interface.h" +#include "taito68705.h" #include "machine/gen_latch.h" #include "machine/timer.h" #include "sound/msm5205.h" + #include "tilemap.h" #include "screen.h" @@ -96,4 +97,4 @@ private: void renegade_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_RENEGADE_H +#endif // MAME_TECHNOS_RENEGADE_H diff --git a/src/mame/technos/renegade_v.cpp b/src/mame/technos/renegade_v.cpp index 72e1d708fd1..7504957427d 100644 --- a/src/mame/technos/renegade_v.cpp +++ b/src/mame/technos/renegade_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/renegade.h" +#include "renegade.h" void renegade_state::bg_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/technos/shadfrce.cpp b/src/mame/technos/shadfrce.cpp index fd6188faad5..d4b9b22a78b 100644 --- a/src/mame/technos/shadfrce.cpp +++ b/src/mame/technos/shadfrce.cpp @@ -140,7 +140,7 @@ lev 7 : 0x7c : 0000 11d0 - just rte */ #include "emu.h" -#include "includes/shadfrce.h" +#include "shadfrce.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/technos/shadfrce_v.cpp b/src/mame/technos/shadfrce_v.cpp index d8973a8b78f..0095a7a4b16 100644 --- a/src/mame/technos/shadfrce_v.cpp +++ b/src/mame/technos/shadfrce_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood #include "emu.h" -#include "includes/shadfrce.h" +#include "shadfrce.h" TILE_GET_INFO_MEMBER(shadfrce_state::get_fgtile_info) { diff --git a/src/mame/technos/ssozumo.cpp b/src/mame/technos/ssozumo.cpp index 7d80fc34d19..b5eeac4858e 100644 --- a/src/mame/technos/ssozumo.cpp +++ b/src/mame/technos/ssozumo.cpp @@ -10,7 +10,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/10/04 ***************************************************************************/ #include "emu.h" -#include "includes/ssozumo.h" +#include "ssozumo.h" #include "cpu/m6502/m6502.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/technos/ssozumo_v.cpp b/src/mame/technos/ssozumo_v.cpp index 5c8d72fc6c8..36e45e4ae29 100644 --- a/src/mame/technos/ssozumo_v.cpp +++ b/src/mame/technos/ssozumo_v.cpp @@ -10,7 +10,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/10/04 ***************************************************************************/ #include "emu.h" -#include "includes/ssozumo.h" +#include "ssozumo.h" /**************************************************************************/ diff --git a/src/mame/technos/tagteam.cpp b/src/mame/technos/tagteam.cpp index 8c1276b1bba..64a8e68da39 100644 --- a/src/mame/technos/tagteam.cpp +++ b/src/mame/technos/tagteam.cpp @@ -27,7 +27,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/tagteam.h" +#include "tagteam.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" diff --git a/src/mame/technos/tagteam_v.cpp b/src/mame/technos/tagteam_v.cpp index aa763708efa..fd7b875b12d 100644 --- a/src/mame/technos/tagteam_v.cpp +++ b/src/mame/technos/tagteam_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/tagteam.h" +#include "tagteam.h" // TODO: fix or confirm resnet implementation // schematics say emitter circuit with 47 ohm pullup and 470 ohm pulldown but this results in a bad palette diff --git a/src/mame/technos/wwfsstar.cpp b/src/mame/technos/wwfsstar.cpp index 61276fbe0e9..27e80c0c782 100644 --- a/src/mame/technos/wwfsstar.cpp +++ b/src/mame/technos/wwfsstar.cpp @@ -154,7 +154,7 @@ Notes: *******************************************************************************/ #include "emu.h" -#include "includes/wwfsstar.h" +#include "wwfsstar.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/technos/wwfsstar_v.cpp b/src/mame/technos/wwfsstar_v.cpp index 63463a75eca..c6c3d54ed29 100644 --- a/src/mame/technos/wwfsstar_v.cpp +++ b/src/mame/technos/wwfsstar_v.cpp @@ -9,7 +9,7 @@ *******************************************************************************/ #include "emu.h" -#include "includes/wwfsstar.h" +#include "wwfsstar.h" /******************************************************************************* Write Handlers diff --git a/src/mame/technos/xain.cpp b/src/mame/technos/xain.cpp index f11ee9d9e0c..cb30dedbf8f 100644 --- a/src/mame/technos/xain.cpp +++ b/src/mame/technos/xain.cpp @@ -158,7 +158,7 @@ Updates by Bryan McPhail, 12/12/2004: ***************************************************************************/ #include "emu.h" -#include "includes/xain.h" +#include "xain.h" #include "cpu/m6809/m6809.h" #include "sound/ymopn.h" diff --git a/src/mame/technos/xain.h b/src/mame/technos/xain.h index 6ab95aaca3e..56ae8d600c5 100644 --- a/src/mame/technos/xain.h +++ b/src/mame/technos/xain.h @@ -1,11 +1,11 @@ // license:BSD-3-Clause // copyright-holders:Carlos A. Lozano, Rob Rosenbrock, Phil Stroffolino -#ifndef MAME_INCLUDES_XAIN_H -#define MAME_INCLUDES_XAIN_H +#ifndef MAME_TECHNOS_XAIN_H +#define MAME_TECHNOS_XAIN_H #pragma once -#include "machine/taito68705interface.h" +#include "taito68705.h" #include "machine/gen_latch.h" #include "machine/timer.h" @@ -100,4 +100,4 @@ private: u8 m_scrolly[2][2]{}; }; -#endif // MAME_INCLUDES_XAIN_H +#endif // MAME_TECHNOS_XAIN_H diff --git a/src/mame/technos/xain_v.cpp b/src/mame/technos/xain_v.cpp index 1aa9283a2d0..0fd63229d1a 100644 --- a/src/mame/technos/xain_v.cpp +++ b/src/mame/technos/xain_v.cpp @@ -33,7 +33,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/xain.h" +#include "xain.h" /*************************************************************************** diff --git a/src/mame/tehkan/bombjack.cpp b/src/mame/tehkan/bombjack.cpp index d1106f59f12..609024c93f8 100644 --- a/src/mame/tehkan/bombjack.cpp +++ b/src/mame/tehkan/bombjack.cpp @@ -98,7 +98,7 @@ Dip Locations and factory settings verified with manual ***************************************************************************/ #include "emu.h" -#include "includes/bombjack.h" +#include "bombjack.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/tehkan/bombjack_v.cpp b/src/mame/tehkan/bombjack_v.cpp index 49a0e4d0211..bcbcca551ed 100644 --- a/src/mame/tehkan/bombjack_v.cpp +++ b/src/mame/tehkan/bombjack_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bombjack.h" +#include "bombjack.h" void bombjack_state::bombjack_videoram_w(offs_t offset, uint8_t data) { diff --git a/src/mame/tehkan/gaiden.cpp b/src/mame/tehkan/gaiden.cpp index 03265ed513c..9e2bf350b67 100644 --- a/src/mame/tehkan/gaiden.cpp +++ b/src/mame/tehkan/gaiden.cpp @@ -137,7 +137,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/gaiden.h" +#include "gaiden.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/tehkan/gaiden.h b/src/mame/tehkan/gaiden.h index 1a5eb8eb0d0..7950e67ac08 100644 --- a/src/mame/tehkan/gaiden.h +++ b/src/mame/tehkan/gaiden.h @@ -15,8 +15,8 @@ #include "machine/74157.h" #include "sound/msm5205.h" #include "video/bufsprite.h" -#include "video/tecmo_spr.h" -#include "video/tecmo_mix.h" +#include "tecmo_spr.h" +#include "tecmo_mix.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/tehkan/gaiden_v.cpp b/src/mame/tehkan/gaiden_v.cpp index 2de50af39ef..488db27fd89 100644 --- a/src/mame/tehkan/gaiden_v.cpp +++ b/src/mame/tehkan/gaiden_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/gaiden.h" +#include "gaiden.h" /*************************************************************************** diff --git a/src/mame/tehkan/lvcards.cpp b/src/mame/tehkan/lvcards.cpp index 0c903b6c682..3fc28e78522 100644 --- a/src/mame/tehkan/lvcards.cpp +++ b/src/mame/tehkan/lvcards.cpp @@ -74,7 +74,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/lvcards.h" +#include "lvcards.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" diff --git a/src/mame/tehkan/lvcards_v.cpp b/src/mame/tehkan/lvcards_v.cpp index fc3b4dd0e32..af357355a70 100644 --- a/src/mame/tehkan/lvcards_v.cpp +++ b/src/mame/tehkan/lvcards_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/lvcards.h" +#include "lvcards.h" void lvcards_state::lvcards_palette(palette_device &palette) const//Ever so slightly different, but different enough. diff --git a/src/mame/tehkan/pbaction.cpp b/src/mame/tehkan/pbaction.cpp index 19b1afe1ab0..5484fa963ab 100644 --- a/src/mame/tehkan/pbaction.cpp +++ b/src/mame/tehkan/pbaction.cpp @@ -95,11 +95,12 @@ Stephh's notes (based on the game Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/pbaction.h" +#include "pbaction.h" + +#include "segacrpt_device.h" #include "machine/74259.h" #include "sound/ay8910.h" -#include "machine/segacrpt_device.h" #include "screen.h" #include "speaker.h" #include "pbactiont.lh" diff --git a/src/mame/tehkan/pbaction_v.cpp b/src/mame/tehkan/pbaction_v.cpp index 658d115bebb..b1a686a4ea3 100644 --- a/src/mame/tehkan/pbaction_v.cpp +++ b/src/mame/tehkan/pbaction_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/pbaction.h" +#include "pbaction.h" void pbaction_state::pbaction_videoram_w(offs_t offset, uint8_t data) { diff --git a/src/mame/tehkan/senjyo.cpp b/src/mame/tehkan/senjyo.cpp index dcd83f27ec4..c8854f5742a 100644 --- a/src/mame/tehkan/senjyo.cpp +++ b/src/mame/tehkan/senjyo.cpp @@ -78,11 +78,13 @@ I/O read/write /* 26.February 2012 Tsuyoshi Hasegawa fixed palette intensity */ #include "emu.h" -#include "includes/senjyo.h" +#include "senjyo.h" + +#include "segacrpt_device.h" #include "cpu/z80/z80.h" -#include "machine/segacrpt_device.h" #include "sound/sn76496.h" + #include "screen.h" #include "speaker.h" diff --git a/src/mame/tehkan/senjyo_a.cpp b/src/mame/tehkan/senjyo_a.cpp index aa9046524bc..1f72fcda63b 100644 --- a/src/mame/tehkan/senjyo_a.cpp +++ b/src/mame/tehkan/senjyo_a.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni #include "emu.h" -#include "includes/senjyo.h" +#include "senjyo.h" const z80_daisy_config senjyo_daisy_chain[] = diff --git a/src/mame/tehkan/senjyo_v.cpp b/src/mame/tehkan/senjyo_v.cpp index 78e587b8800..de0be29e693 100644 --- a/src/mame/tehkan/senjyo_v.cpp +++ b/src/mame/tehkan/senjyo_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/senjyo.h" +#include "senjyo.h" /*************************************************************************** diff --git a/src/mame/tehkan/solomon.cpp b/src/mame/tehkan/solomon.cpp index e6ea5bf8b55..270cd823c2e 100644 --- a/src/mame/tehkan/solomon.cpp +++ b/src/mame/tehkan/solomon.cpp @@ -9,7 +9,7 @@ driver by Mirko Buffoni ***************************************************************************/ #include "emu.h" -#include "includes/solomon.h" +#include "solomon.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/tehkan/solomon_v.cpp b/src/mame/tehkan/solomon_v.cpp index 1464e569183..0d64c4fa493 100644 --- a/src/mame/tehkan/solomon_v.cpp +++ b/src/mame/tehkan/solomon_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni #include "emu.h" -#include "includes/solomon.h" +#include "solomon.h" void solomon_state::solomon_videoram_w(offs_t offset, uint8_t data) { diff --git a/src/mame/tehkan/spbactn.cpp b/src/mame/tehkan/spbactn.cpp index 009a6f8c23e..d56cc62e0c6 100644 --- a/src/mame/tehkan/spbactn.cpp +++ b/src/mame/tehkan/spbactn.cpp @@ -132,7 +132,7 @@ cpu #0 (PC=00001A1A): unmapped memory word write to 00090030 = 00F7 & 00FF *******************************************************************************/ #include "emu.h" -#include "includes/spbactn.h" +#include "spbactn.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/tehkan/spbactn.h b/src/mame/tehkan/spbactn.h index 0c10ba46ba4..c0b93caf9d7 100644 --- a/src/mame/tehkan/spbactn.h +++ b/src/mame/tehkan/spbactn.h @@ -6,8 +6,8 @@ #pragma once #include "machine/gen_latch.h" -#include "video/tecmo_spr.h" -#include "video/tecmo_mix.h" +#include "tecmo_spr.h" +#include "tecmo_mix.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/tehkan/spbactn_v.cpp b/src/mame/tehkan/spbactn_v.cpp index f6d8e698f9a..93e45f5e8b4 100644 --- a/src/mame/tehkan/spbactn_v.cpp +++ b/src/mame/tehkan/spbactn_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" -#include "includes/spbactn.h" +#include "spbactn.h" diff --git a/src/mame/tehkan/tbowl.cpp b/src/mame/tehkan/tbowl.cpp index 6bb2b389a1a..ae05c334246 100644 --- a/src/mame/tehkan/tbowl.cpp +++ b/src/mame/tehkan/tbowl.cpp @@ -16,7 +16,7 @@ Might be some priority glitches #include "emu.h" -#include "video/tecmo_spr.h" +#include "tecmo_spr.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/tehkan/tecmo.cpp b/src/mame/tehkan/tecmo.cpp index a466861f1a1..e1f381c6bee 100644 --- a/src/mame/tehkan/tecmo.cpp +++ b/src/mame/tehkan/tecmo.cpp @@ -227,7 +227,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/tecmo.h" +#include "tecmo.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/tehkan/tecmo.h b/src/mame/tehkan/tecmo.h index c3a5e9e04b4..e5e21116b57 100644 --- a/src/mame/tehkan/tecmo.h +++ b/src/mame/tehkan/tecmo.h @@ -6,7 +6,7 @@ #pragma once #include "sound/msm5205.h" -#include "video/tecmo_spr.h" +#include "tecmo_spr.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/tehkan/tecmo16.cpp b/src/mame/tehkan/tecmo16.cpp index 453d046ed16..7f9535579b9 100644 --- a/src/mame/tehkan/tecmo16.cpp +++ b/src/mame/tehkan/tecmo16.cpp @@ -33,7 +33,7 @@ Notes: ******************************************************************************/ #include "emu.h" -#include "includes/tecmo16.h" +#include "tecmo16.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/tehkan/tecmo16.h b/src/mame/tehkan/tecmo16.h index 96df8017f10..630a312cbba 100644 --- a/src/mame/tehkan/tecmo16.h +++ b/src/mame/tehkan/tecmo16.h @@ -6,8 +6,8 @@ #pragma once #include "video/bufsprite.h" -#include "video/tecmo_spr.h" -#include "video/tecmo_mix.h" +#include "tecmo_spr.h" +#include "tecmo_mix.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/tehkan/tecmo16_v.cpp b/src/mame/tehkan/tecmo16_v.cpp index fc4e4aa4960..90a636871c3 100644 --- a/src/mame/tehkan/tecmo16_v.cpp +++ b/src/mame/tehkan/tecmo16_v.cpp @@ -11,7 +11,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/tecmo16.h" +#include "tecmo16.h" /******************************************************************************/ diff --git a/src/mame/tehkan/tecmo_v.cpp b/src/mame/tehkan/tecmo_v.cpp index 988467225b0..2d5c6ee87ae 100644 --- a/src/mame/tehkan/tecmo_v.cpp +++ b/src/mame/tehkan/tecmo_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/tecmo.h" +#include "tecmo.h" /* diff --git a/src/mame/tehkan/tecmosys.cpp b/src/mame/tehkan/tecmosys.cpp index 16162d81945..8f2cb2620df 100644 --- a/src/mame/tehkan/tecmosys.cpp +++ b/src/mame/tehkan/tecmosys.cpp @@ -187,7 +187,7 @@ ae500w07.ad1 - M6295 Samples (23c4001) */ #include "emu.h" -#include "includes/tecmosys.h" +#include "tecmosys.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/tehkan/tecmosys_m.cpp b/src/mame/tehkan/tecmosys_m.cpp index e824495d846..b69321557b9 100644 --- a/src/mame/tehkan/tecmosys_m.cpp +++ b/src/mame/tehkan/tecmosys_m.cpp @@ -31,7 +31,7 @@ */ #include "emu.h" -#include "includes/tecmosys.h" +#include "tecmosys.h" enum DEV_STATUS { diff --git a/src/mame/tehkan/tecmosys_v.cpp b/src/mame/tehkan/tecmosys_v.cpp index dafc73cbc82..d376c299175 100644 --- a/src/mame/tehkan/tecmosys_v.cpp +++ b/src/mame/tehkan/tecmosys_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/tecmosys.h" +#include "tecmosys.h" template diff --git a/src/mame/tehkan/tehkanwc.cpp b/src/mame/tehkan/tehkanwc.cpp index 806a3504016..ee2d3b22b3b 100644 --- a/src/mame/tehkan/tehkanwc.cpp +++ b/src/mame/tehkan/tehkanwc.cpp @@ -89,7 +89,7 @@ TO DO : */ #include "emu.h" -#include "includes/tehkanwc.h" +#include "tehkanwc.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/tehkan/tehkanwc_v.cpp b/src/mame/tehkan/tehkanwc_v.cpp index 975adf76023..09299c6ebfa 100644 --- a/src/mame/tehkan/tehkanwc_v.cpp +++ b/src/mame/tehkan/tehkanwc_v.cpp @@ -14,7 +14,7 @@ robbiex@rocketmail.com ***************************************************************************/ #include "emu.h" -#include "includes/tehkanwc.h" +#include "tehkanwc.h" void tehkanwc_state::videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/tehkan/wc90.cpp b/src/mame/tehkan/wc90.cpp index dc655b41bfb..0b49b28baa7 100644 --- a/src/mame/tehkan/wc90.cpp +++ b/src/mame/tehkan/wc90.cpp @@ -55,7 +55,7 @@ Press one of the start buttons to exit. #include "emu.h" -#include "video/tecmo_spr.h" +#include "tecmo_spr.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/tektroni/tek405x.cpp b/src/mame/tektroni/tek405x.cpp index 0bbfce34ea2..b03d1c76233 100644 --- a/src/mame/tektroni/tek405x.cpp +++ b/src/mame/tektroni/tek405x.cpp @@ -26,7 +26,7 @@ #include "emu.h" -#include "includes/tek405x.h" +#include "tek405x.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/tektroni/tek410x.cpp b/src/mame/tektroni/tek410x.cpp index 0008fc7a21e..8329a9729b8 100644 --- a/src/mame/tektroni/tek410x.cpp +++ b/src/mame/tektroni/tek410x.cpp @@ -12,7 +12,7 @@ #include "cpu/i86/i186.h" #include "machine/i8255.h" #include "machine/mc68681.h" -#include "machine/tek410x_kbd.h" +#include "tek410x_kbd.h" #include "video/crt9007.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/tektroni/tek440x.cpp b/src/mame/tektroni/tek440x.cpp index 4534d1e71d7..be815541d56 100644 --- a/src/mame/tektroni/tek440x.cpp +++ b/src/mame/tektroni/tek440x.cpp @@ -51,7 +51,7 @@ #include "machine/mc146818.h" #include "machine/mc68681.h" #include "machine/ncr5385.h" -#include "machine/tek410x_kbd.h" +#include "tek410x_kbd.h" #include "sound/sn76496.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/telenova/compis.cpp b/src/mame/telenova/compis.cpp index cd6bf025418..4643249e468 100644 --- a/src/mame/telenova/compis.cpp +++ b/src/mame/telenova/compis.cpp @@ -53,7 +53,7 @@ #include "cpu/i86/i186.h" #include "cpu/mcs48/mcs48.h" #include "imagedev/cassette.h" -#include "machine/compiskb.h" +#include "compiskb.h" #include "machine/i8251.h" #include "machine/i8255.h" #include "machine/i80130.h" diff --git a/src/mame/telercas/tmc1800.cpp b/src/mame/telercas/tmc1800.cpp index 9f361088f05..26b92dc1abd 100644 --- a/src/mame/telercas/tmc1800.cpp +++ b/src/mame/telercas/tmc1800.cpp @@ -179,7 +179,7 @@ Demo tape contents: */ #include "emu.h" -#include "includes/tmc1800.h" +#include "tmc1800.h" #include "sound/beep.h" #include "speaker.h" diff --git a/src/mame/telercas/tmc1800_v.cpp b/src/mame/telercas/tmc1800_v.cpp index f672d4d2c27..ee162c20f32 100644 --- a/src/mame/telercas/tmc1800_v.cpp +++ b/src/mame/telercas/tmc1800_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/tmc1800.h" +#include "tmc1800.h" #include "cpu/cosmac/cosmac.h" #include "machine/rescap.h" diff --git a/src/mame/telercas/tmc2000e.cpp b/src/mame/telercas/tmc2000e.cpp index 3cf5ea4cb9f..b023d7bc38c 100644 --- a/src/mame/telercas/tmc2000e.cpp +++ b/src/mame/telercas/tmc2000e.cpp @@ -32,7 +32,7 @@ */ #include "emu.h" -#include "includes/tmc2000e.h" +#include "tmc2000e.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/telercas/tmc600.cpp b/src/mame/telercas/tmc600.cpp index f42b5eea487..9bb07fb41f5 100644 --- a/src/mame/telercas/tmc600.cpp +++ b/src/mame/telercas/tmc600.cpp @@ -95,7 +95,7 @@ Notes: */ #include "emu.h" -#include "includes/tmc600.h" +#include "tmc600.h" uint8_t tmc600_state::rtc_r() { diff --git a/src/mame/telercas/tmc600_v.cpp b/src/mame/telercas/tmc600_v.cpp index 73bcd5c6412..d342cf56af5 100644 --- a/src/mame/telercas/tmc600_v.cpp +++ b/src/mame/telercas/tmc600_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/tmc600.h" +#include "tmc600.h" void tmc600_state::vismac_register_w(uint8_t data) { diff --git a/src/mame/televideo/tv950.cpp b/src/mame/televideo/tv950.cpp index defe4784e7f..b6dc2a4e8e3 100644 --- a/src/mame/televideo/tv950.cpp +++ b/src/mame/televideo/tv950.cpp @@ -42,7 +42,7 @@ #include "machine/input_merger.h" #include "machine/6522via.h" #include "machine/mos6551.h" -#include "machine/tv950kb.h" +#include "tv950kb.h" #include "video/mc6845.h" #include "screen.h" diff --git a/src/mame/televideo/tv950kb.cpp b/src/mame/televideo/tv950kb.cpp index ab92932b710..77614c30af3 100644 --- a/src/mame/televideo/tv950kb.cpp +++ b/src/mame/televideo/tv950kb.cpp @@ -7,7 +7,7 @@ TeleVideo 950 101-key serial keyboard emulation. ************************************************************************************************************************************/ #include "emu.h" -#include "machine/tv950kb.h" +#include "tv950kb.h" DEFINE_DEVICE_TYPE(TV950_KEYBOARD, tv950kb_device, "tv950kb", "TeleVideo 950 Keyboard") diff --git a/src/mame/televideo/tv955.cpp b/src/mame/televideo/tv955.cpp index b0f4f055bab..2196dcc9b17 100644 --- a/src/mame/televideo/tv955.cpp +++ b/src/mame/televideo/tv955.cpp @@ -7,7 +7,7 @@ Skeleton driver for "third generation" TeleVideo terminals (905, 955, 9220). ************************************************************************************************************************************/ #include "emu.h" -#include "machine/tv955kb.h" +#include "tv955kb.h" #include "bus/rs232/rs232.h" #include "cpu/m6502/m65c02.h" #include "machine/input_merger.h" diff --git a/src/mame/televideo/tv955kb.cpp b/src/mame/televideo/tv955kb.cpp index aaaf968bebe..6b9063f1f3f 100644 --- a/src/mame/televideo/tv955kb.cpp +++ b/src/mame/televideo/tv955kb.cpp @@ -15,7 +15,7 @@ Connector pinout: ************************************************************************************************************************************/ #include "emu.h" -#include "machine/tv955kb.h" +#include "tv955kb.h" #include "machine/input_merger.h" #include "speaker.h" diff --git a/src/mame/terminal/tiamc1.cpp b/src/mame/terminal/tiamc1.cpp index e9d459bc5e5..01a05776a3d 100644 --- a/src/mame/terminal/tiamc1.cpp +++ b/src/mame/terminal/tiamc1.cpp @@ -118,8 +118,8 @@ */ #include "emu.h" -#include "includes/tiamc1.h" -#include "audio/tiamc1.h" +#include "tiamc1.h" +#include "tiamc1_a.h" #include "cpu/i8085/i8085.h" #include "machine/i8255.h" diff --git a/src/mame/terminal/tiamc1_a.cpp b/src/mame/terminal/tiamc1_a.cpp index 67049496ceb..f0829c07f94 100644 --- a/src/mame/terminal/tiamc1_a.cpp +++ b/src/mame/terminal/tiamc1_a.cpp @@ -34,7 +34,7 @@ ***************************************************************************/ #include "emu.h" -#include "audio/tiamc1.h" +#include "tiamc1_a.h" #define CLOCK_DIVIDER 16 #define BUF_LEN 100000 diff --git a/src/mame/terminal/tiamc1_v.cpp b/src/mame/terminal/tiamc1_v.cpp index e7765351be9..267940cd8dd 100644 --- a/src/mame/terminal/tiamc1_v.cpp +++ b/src/mame/terminal/tiamc1_v.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/tiamc1.h" +#include "tiamc1.h" void tiamc1_state::tiamc1_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/tesla/ondra.cpp b/src/mame/tesla/ondra.cpp index b73db3c3926..18682329a00 100644 --- a/src/mame/tesla/ondra.cpp +++ b/src/mame/tesla/ondra.cpp @@ -26,7 +26,7 @@ ToDo: #include "emu.h" -#include "includes/ondra.h" +#include "ondra.h" #include "cpu/z80/z80.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/tesla/ondra_m.cpp b/src/mame/tesla/ondra_m.cpp index ffa97d84972..c6497d429db 100644 --- a/src/mame/tesla/ondra_m.cpp +++ b/src/mame/tesla/ondra_m.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/ondra.h" +#include "ondra.h" u8 ondra_state::keyboard_r(offs_t offset) diff --git a/src/mame/tesla/pmd85.cpp b/src/mame/tesla/pmd85.cpp index 5fb49e20b4d..ea0156236ba 100644 --- a/src/mame/tesla/pmd85.cpp +++ b/src/mame/tesla/pmd85.cpp @@ -223,7 +223,7 @@ Some software items will crash MAME, for example "bdash". *******************************************************************************************************************/ #include "emu.h" -#include "includes/pmd85.h" +#include "pmd85.h" #include "cpu/i8085/i8085.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/tesla/pmd85_m.cpp b/src/mame/tesla/pmd85_m.cpp index 1d8157bda59..2ff31c516f9 100644 --- a/src/mame/tesla/pmd85_m.cpp +++ b/src/mame/tesla/pmd85_m.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/pmd85.h" +#include "pmd85.h" diff --git a/src/mame/thepit/thepit.cpp b/src/mame/thepit/thepit.cpp index 2ee6722d5f1..6548214dcfe 100644 --- a/src/mame/thepit/thepit.cpp +++ b/src/mame/thepit/thepit.cpp @@ -153,7 +153,7 @@ Player 2 and Player 1 share the same controls ! ***************************************************************************/ #include "emu.h" -#include "includes/thepit.h" +#include "thepit.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/thepit/thepit_v.cpp b/src/mame/thepit/thepit_v.cpp index 508d2cbe64f..e408fe69600 100644 --- a/src/mame/thepit/thepit_v.cpp +++ b/src/mame/thepit/thepit_v.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/thepit.h" +#include "thepit.h" /*************************************************************************** diff --git a/src/mame/thepit/timelimt.cpp b/src/mame/thepit/timelimt.cpp index c07f502020d..27396ff178a 100644 --- a/src/mame/thepit/timelimt.cpp +++ b/src/mame/thepit/timelimt.cpp @@ -15,7 +15,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/timelimt.h" +#include "timelimt.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/thepit/timelimt_v.cpp b/src/mame/thepit/timelimt_v.cpp index 225ecdb1e8d..c8be27c2345 100644 --- a/src/mame/thepit/timelimt_v.cpp +++ b/src/mame/thepit/timelimt_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi #include "emu.h" -#include "includes/timelimt.h" +#include "timelimt.h" #include "video/resnet.h" diff --git a/src/mame/thomson/thomson.cpp b/src/mame/thomson/thomson.cpp index 33df5ac1de5..fb4cf47ffe2 100644 --- a/src/mame/thomson/thomson.cpp +++ b/src/mame/thomson/thomson.cpp @@ -77,7 +77,7 @@ */ #include "emu.h" -#include "includes/thomson.h" +#include "thomson.h" #include "bus/centronics/ctronics.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/thomson/thomson_m.cpp b/src/mame/thomson/thomson_m.cpp index 78dc3f877e6..0e1f93729a8 100644 --- a/src/mame/thomson/thomson_m.cpp +++ b/src/mame/thomson/thomson_m.cpp @@ -9,7 +9,7 @@ **********************************************************************/ #include "emu.h" -#include "includes/thomson.h" +#include "thomson.h" #include "machine/6821pia.h" #include "machine/ram.h" diff --git a/src/mame/thomson/thomson_v.cpp b/src/mame/thomson/thomson_v.cpp index 521f15f666d..b385282ce27 100644 --- a/src/mame/thomson/thomson_v.cpp +++ b/src/mame/thomson/thomson_v.cpp @@ -9,7 +9,7 @@ **********************************************************************/ #include "emu.h" -#include "includes/thomson.h" +#include "thomson.h" #include #include diff --git a/src/mame/ti/avigo.cpp b/src/mame/ti/avigo.cpp index 5fdbc433b27..abbb5a1af1b 100644 --- a/src/mame/ti/avigo.cpp +++ b/src/mame/ti/avigo.cpp @@ -66,7 +66,7 @@ #include "emu.h" -#include "includes/avigo.h" +#include "avigo.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/ti/avigo_v.cpp b/src/mame/ti/avigo_v.cpp index 9bb5d450ed6..c05a2dcf1ea 100644 --- a/src/mame/ti/avigo_v.cpp +++ b/src/mame/ti/avigo_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/avigo.h" +#include "avigo.h" /*************************************************************************** Start the video hardware emulation. diff --git a/src/mame/ti/ti85.cpp b/src/mame/ti/ti85.cpp index c6e0463d12a..3d31e64e686 100644 --- a/src/mame/ti/ti85.cpp +++ b/src/mame/ti/ti85.cpp @@ -202,7 +202,7 @@ TI-86 ports: ***************************************************************************/ #include "emu.h" -#include "includes/ti85.h" +#include "ti85.h" #include "cpu/z80/z80.h" #include "cpu/z80/ez80.h" diff --git a/src/mame/ti/ti85_m.cpp b/src/mame/ti/ti85_m.cpp index 3906581466b..71c414c9a7e 100644 --- a/src/mame/ti/ti85_m.cpp +++ b/src/mame/ti/ti85_m.cpp @@ -12,7 +12,7 @@ #include #include "emu.h" #include "cpu/z80/z80.h" -#include "includes/ti85.h" +#include "ti85.h" #define TI85_SNAPSHOT_SIZE 32976 #define TI86_SNAPSHOT_SIZE 131284 diff --git a/src/mame/ti/ti85_v.cpp b/src/mame/ti/ti85_v.cpp index 8bdf1283dec..099bab907d6 100644 --- a/src/mame/ti/ti85_v.cpp +++ b/src/mame/ti/ti85_v.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ti85.h" +#include "ti85.h" #define TI81_VIDEO_MEMORY_SIZE 768 #define TI81_SCREEN_X_SIZE 12 diff --git a/src/mame/ti/ti89.cpp b/src/mame/ti/ti89.cpp index ef7e1d9f3ce..b3c119bd637 100644 --- a/src/mame/ti/ti89.cpp +++ b/src/mame/ti/ti89.cpp @@ -18,7 +18,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/ti89.h" +#include "ti89.h" #include "cpu/m68000/m68000.h" #include "machine/intelfsh.h" diff --git a/src/mame/ti/ti990_10.cpp b/src/mame/ti/ti990_10.cpp index b16f9ee9dd3..c65b24bd518 100644 --- a/src/mame/ti/ti990_10.cpp +++ b/src/mame/ti/ti990_10.cpp @@ -75,7 +75,7 @@ TODO : #include "bus/ti99x/990_tap.h" #include "cpu/tms9900/ti990_10.h" #include "sound/beep.h" -#include "video/911_vdt.h" +#include "911_vdt.h" class ti990_10_state : public driver_device diff --git a/src/mame/ti/ti990_4.cpp b/src/mame/ti/ti990_4.cpp index 8e82cc5c2b3..e56598800d6 100644 --- a/src/mame/ti/ti990_4.cpp +++ b/src/mame/ti/ti990_4.cpp @@ -40,9 +40,9 @@ TODO: #include "emu.h" #include "cpu/tms9900/tms9900.h" -#include "video/911_vdt.h" +#include "911_vdt.h" #include "sound/beep.h" -#include "video/733_asr.h" +#include "733_asr.h" #include "bus/ti99x/990_dk.h" diff --git a/src/mame/tiger/gamecom.cpp b/src/mame/tiger/gamecom.cpp index e0e128d5fb2..38841881ee7 100644 --- a/src/mame/tiger/gamecom.cpp +++ b/src/mame/tiger/gamecom.cpp @@ -30,7 +30,7 @@ Game Status: ***************************************************************************/ #include "emu.h" -#include "includes/gamecom.h" +#include "gamecom.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/tiger/gamecom_m.cpp b/src/mame/tiger/gamecom_m.cpp index 6ff53ee45f2..cd3d6968d77 100644 --- a/src/mame/tiger/gamecom_m.cpp +++ b/src/mame/tiger/gamecom_m.cpp @@ -2,7 +2,7 @@ // copyright-holders:Wilbert Pol, Robbbert #include "emu.h" -#include "includes/gamecom.h" +#include "gamecom.h" #include "screen.h" diff --git a/src/mame/tiger/gamecom_v.cpp b/src/mame/tiger/gamecom_v.cpp index 54287e3d406..fde49912bab 100644 --- a/src/mame/tiger/gamecom_v.cpp +++ b/src/mame/tiger/gamecom_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Wilbert Pol, Robbbert #include "emu.h" -#include "includes/gamecom.h" +#include "gamecom.h" #include "screen.h" diff --git a/src/mame/tigertel/docg3.cpp b/src/mame/tigertel/docg3.cpp index 0b53b52f64b..3f59ad5e83f 100644 --- a/src/mame/tigertel/docg3.cpp +++ b/src/mame/tigertel/docg3.cpp @@ -9,7 +9,7 @@ */ #include "emu.h" -#include "machine/docg3.h" +#include "docg3.h" #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/tigertel/gizmondo.cpp b/src/mame/tigertel/gizmondo.cpp index 69f7c19c2c6..7ac0b808428 100644 --- a/src/mame/tigertel/gizmondo.cpp +++ b/src/mame/tigertel/gizmondo.cpp @@ -31,7 +31,7 @@ SYSINTR_GPS = INT_EINT3, INT_EINT8_23 (EINT18) #include "emu.h" #include "cpu/arm7/arm7.h" -#include "machine/docg3.h" +#include "docg3.h" #include "machine/s3c2440.h" #include "video/gf4500.h" #include "screen.h" diff --git a/src/mame/tiki/tiki100.cpp b/src/mame/tiki/tiki100.cpp index 84e0ed2ce4f..ab35fbb6ca6 100644 --- a/src/mame/tiki/tiki100.cpp +++ b/src/mame/tiki/tiki100.cpp @@ -28,7 +28,7 @@ */ #include "emu.h" -#include "includes/tiki100.h" +#include "tiki100.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/toaplan/kan_pand.cpp b/src/mame/toaplan/kan_pand.cpp deleted file mode 100644 index 40b10ed8ef5..00000000000 --- a/src/mame/toaplan/kan_pand.cpp +++ /dev/null @@ -1,294 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood, Luca Elia -/*********************************************************************** - - Kaneko Pandora Sprite Chip - GFX processor - PX79C480FP-3 (KANEKO, Pandora-Chip) - - This emulates the Kaneko Pandora Sprite Chip - which is found on several Kaneko boards. - - there several bootleg variants of this chip, - these are emulated in kan_panb.c instead. - - Original Games using this Chip - - Snow Bros - Air Buster - DJ Boy - Heavy Unit - Sand Scorpion - Gals Panic (1st release) - - The SemiCom games are also using this because - their bootleg chip appears to function in an - identical way. - - Rendering appears to be done to a framebuffer - and the video system can be instructed not to - clear this, allowing for 'sprite trail' effects - as used by Air Buster. - - The chip appears to be an 8-bit chip, and - when used on 16-bit CPUs only the MSB or LSB - of the data lines are connected. Address Lines - also appear to be swapped around on one of the - hookups. - - to use this in a driver you must hook functions to - VIDEO_UPDATE (copies framebuffer to screen) - and - VIDEO_EOF (renders the sprites to the framebuffer) - - also, you have to add the correspondent device in MACHINE_DRIVER - - spriteram should be accessed only with the - pandora_spriteram_r / pandora_spriteram_w or - pandora_spriteram_LSB_r / pandora_spriteram_LSB_w - handlers, depending on the CPU being used with it. - -***********************************************************************/ - -#include "emu.h" -#include "video/kan_pand.h" -#include "screen.h" - -DEFINE_DEVICE_TYPE(KANEKO_PANDORA, kaneko_pandora_device, "kaneko_pandora", "Kaneko PANDORA GFX") - -kaneko_pandora_device::kaneko_pandora_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, KANEKO_PANDORA, tag, owner, clock) - , device_video_interface(mconfig, *this) - , m_gfx_region(0) - , m_xoffset(0) - , m_yoffset(0) - , m_gfxdecode(*this, finder_base::DUMMY_TAG) -{ -} - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void kaneko_pandora_device::device_start() -{ - m_bg_pen = 0; - m_flip_screen = false; - - m_spriteram = std::make_unique(0x1000); - - m_sprites_bitmap = std::make_unique(screen().width(), screen().height()); - - save_item(NAME(m_clear_bitmap)); - save_item(NAME(m_bg_pen)); - save_item(NAME(m_flip_screen)); - save_pointer(NAME(m_spriteram), 0x1000); - save_item(NAME(*m_sprites_bitmap)); -} - -//------------------------------------------------- -// device_reset - device-specific reset -//------------------------------------------------- - -void kaneko_pandora_device::device_reset() -{ - memset(m_spriteram.get(), 0x00, 0x1000); - - m_clear_bitmap = 1; -} - - -/***************************************************************************** - IMPLEMENTATION -*****************************************************************************/ - -void kaneko_pandora_device::set_bg_pen( int pen ) -{ - m_bg_pen = pen; -} - -void kaneko_pandora_device::set_clear_bitmap( int clear ) -{ - m_clear_bitmap = clear; -} - -void kaneko_pandora_device::update( bitmap_ind16 &bitmap, const rectangle &cliprect ) -{ - if (!m_sprites_bitmap) - { - printf("ERROR: pandora_update with no pandora_sprites_bitmap\n"); - return; - } - - copybitmap_trans(bitmap, *m_sprites_bitmap, 0, 0, 0, 0, cliprect, 0); -} - - -void kaneko_pandora_device::draw( bitmap_ind16 &bitmap, const rectangle &cliprect ) -{ - int sx = 0, sy = 0, x = 0, y = 0, offs; - - - /* - * Sprite Tile Format - * ------------------ - * - * Byte | Bit(s) | Use - * -----+-76543210-+---------------- - * 0-2 | -------- | unused - * 3 | xxxx.... | Palette Bank - * 3 | .......x | XPos - Sign Bit - * 3 | ......x. | YPos - Sign Bit - * 3 | .....x.. | Use Relative offsets - * 4 | xxxxxxxx | XPos - * 5 | xxxxxxxx | YPos - * 6 | xxxxxxxx | Sprite Number (low 8 bits) - * 7 | ....xxxx | Sprite Number (high 4 bits) - * 7 | x....... | Flip Sprite Y-Axis - * 7 | .x...... | Flip Sprite X-Axis - */ - - for (offs = 0; offs < 0x1000; offs += 8) - { - int dx = m_spriteram[offs + 4]; - int dy = m_spriteram[offs + 5]; - int tilecolour = m_spriteram[offs + 3]; - int attr = m_spriteram[offs + 7]; - int flipx = attr & 0x80; - int flipy = (attr & 0x40) << 1; - int tile = ((attr & 0x3f) << 8) + (m_spriteram[offs + 6] & 0xff); - - if (tilecolour & 1) - dx |= 0x100; - if (tilecolour & 2) - dy |= 0x100; - - if (tilecolour & 4) - { - x += dx; - y += dy; - } - else - { - x = dx; - y = dy; - } - - if (m_flip_screen) - { - sx = 240 - x; - sy = 240 - y; - flipx = !flipx; - flipy = !flipy; - } - else - { - sx = x; - sy = y; - } - - /* global offset */ - sx += m_xoffset; - sy += m_yoffset; - - sx &= 0x1ff; - sy &= 0x1ff; - - if (sx & 0x100) - sx -= 0x200; - if (sy & 0x100) - sy -= 0x200; - - m_gfxdecode->gfx(m_gfx_region)->transpen(bitmap,cliprect, - tile, - (tilecolour & 0xf0) >> 4, - flipx, flipy, - sx,sy,0); - } -} - -void kaneko_pandora_device::eof( ) -{ - assert(m_spriteram != nullptr); - - // the games can disable the clearing of the sprite bitmap, to leave sprite trails - if (m_clear_bitmap) - m_sprites_bitmap->fill(m_bg_pen, screen().visible_area()); - - kaneko_pandora_device::draw(*m_sprites_bitmap, screen().visible_area()); -} - -/***************************************************************************** - DEVICE HANDLERS -*****************************************************************************/ - -void kaneko_pandora_device::spriteram_w(offs_t offset, uint8_t data) -{ - // it's either hooked up oddly on this, or on the 16-bit games - // either way, we swap the address lines so that the spriteram is in the same format - offset = bitswap<16>(offset, 15,14,13,12, 11, 7,6,5,4,3,2,1,0, 10,9,8 ); - - if (!m_spriteram) - { - printf("ERROR: spriteram_w with no m__spriteram\n"); - return; - } - - if (offset >= 0x1000) - { - logerror("spriteram_w write past spriteram, offset %04x %02x\n", offset, data); - return; - } - - m_spriteram[offset] = data; -} - -uint8_t kaneko_pandora_device::spriteram_r(offs_t offset) -{ - // it's either hooked up oddly on this, or on the 16-bit games - // either way, we swap the address lines so that the spriteram is in the same format - offset = bitswap<16>(offset, 15,14,13,12, 11, 7,6,5,4,3,2,1,0, 10,9,8 ); - - if (!m_spriteram) - { - printf("ERROR: spriteram_r with no m_spriteram\n"); - return 0x00; - } - - if (offset >= 0x1000) - { - logerror("spriteram_r read past spriteram, offset %04x\n", offset); - return 0x00; - } - return m_spriteram[offset]; -} - -/* I don't know if this MSB/LSB mirroring is correct, or if there is twice as much ram, with half of it unused */ -void kaneko_pandora_device::spriteram_LSB_w(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - if (!m_spriteram) - { - printf("ERROR: m_spriteram_LSB_w with no m_spriteram\n"); - return; - } - - if (ACCESSING_BITS_8_15) - { - m_spriteram[offset] = (data >> 8) & 0xff; - } - - if (ACCESSING_BITS_0_7) - { - m_spriteram[offset] = data & 0xff; - } -} - -uint16_t kaneko_pandora_device::spriteram_LSB_r(offs_t offset) -{ - if (!m_spriteram) - { - printf("ERROR: spriteram_LSB_r with no m_spriteram\n"); - return 0x0000; - } - - return m_spriteram[offset] | (m_spriteram[offset] << 8); -} diff --git a/src/mame/toaplan/kan_pand.h b/src/mame/toaplan/kan_pand.h deleted file mode 100644 index 1565b224c81..00000000000 --- a/src/mame/toaplan/kan_pand.h +++ /dev/null @@ -1,67 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood, Luca Elia -/************************************************************************* - - kan_pand.h - - Implementation of Kaneko Pandora sprite chip - -**************************************************************************/ - -#ifndef MAME_VIDEO_KAN_PAND_H -#define MAME_VIDEO_KAN_PAND_H - -#pragma once - -/*************************************************************************** - TYPE DEFINITIONS -***************************************************************************/ - -class kaneko_pandora_device : public device_t, - public device_video_interface -{ -public: - kaneko_pandora_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - // configuration - template void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward(tag)); } - void set_gfx_region(int gfxregion) { m_gfx_region = gfxregion; } - void set_offsets(int x_offset, int y_offset) - { - m_xoffset = x_offset; - m_yoffset = y_offset; - } - - void spriteram_w(offs_t offset, uint8_t data); - uint8_t spriteram_r(offs_t offset); - void spriteram_LSB_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - uint16_t spriteram_LSB_r(offs_t offset); - void update( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void set_clear_bitmap( int clear ); - void eof(); - void set_bg_pen( int pen ); - void flip_screen_set(bool flip) { m_flip_screen = flip; } - -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - void draw( bitmap_ind16 &bitmap, const rectangle &cliprect ); - -private: - // internal state - std::unique_ptr m_spriteram; - std::unique_ptr m_sprites_bitmap; /* bitmap to render sprites to, Pandora seems to be frame'buffered' */ - int m_clear_bitmap = 0; - int m_bg_pen = 0; // might work some other way.. - uint8_t m_gfx_region; - int m_xoffset; - int m_yoffset; - bool m_flip_screen = false; - required_device m_gfxdecode; -}; - -DECLARE_DEVICE_TYPE(KANEKO_PANDORA, kaneko_pandora_device) - -#endif // MAME_VIDEO_KAN_PAND_H diff --git a/src/mame/toaplan/slapfght.cpp b/src/mame/toaplan/slapfght.cpp index 65822b263d3..e532afa7baa 100644 --- a/src/mame/toaplan/slapfght.cpp +++ b/src/mame/toaplan/slapfght.cpp @@ -262,7 +262,7 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "emu.h" -#include "includes/slapfght.h" +#include "slapfght.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" diff --git a/src/mame/toaplan/slapfght.h b/src/mame/toaplan/slapfght.h index 015faa57fdc..f4f90fb7867 100644 --- a/src/mame/toaplan/slapfght.h +++ b/src/mame/toaplan/slapfght.h @@ -5,14 +5,16 @@ Toaplan Slap Fight hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_SLAPFGHT_H -#define MAME_INCLUDES_SLAPFGHT_H +#ifndef MAME_TOAPLAN_SLAPFGHT_H +#define MAME_TOAPLAN_SLAPFGHT_H #pragma once +#include "taito68705.h" + #include "cpu/z80/z80.h" #include "video/bufsprite.h" -#include "machine/taito68705interface.h" + #include "emupal.h" #include "screen.h" #include "tilemap.h" @@ -156,4 +158,4 @@ private: void tigerhb2_map(address_map &map); }; -#endif // MAME_INCLUDES_SLAPFGHT_H +#endif // MAME_TOAPLAN_SLAPFGHT_H diff --git a/src/mame/toaplan/slapfght_m.cpp b/src/mame/toaplan/slapfght_m.cpp index 061594a801c..e857cef1309 100644 --- a/src/mame/toaplan/slapfght_m.cpp +++ b/src/mame/toaplan/slapfght_m.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/slapfght.h" +#include "slapfght.h" /**************************************************************************/ diff --git a/src/mame/toaplan/slapfght_v.cpp b/src/mame/toaplan/slapfght_v.cpp index df8bc0d5ab2..93cea874afc 100644 --- a/src/mame/toaplan/slapfght_v.cpp +++ b/src/mame/toaplan/slapfght_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/slapfght.h" +#include "slapfght.h" /*************************************************************************** diff --git a/src/mame/toaplan/snowbros.cpp b/src/mame/toaplan/snowbros.cpp deleted file mode 100644 index 8ca54925399..00000000000 --- a/src/mame/toaplan/snowbros.cpp +++ /dev/null @@ -1,3147 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood, Mike Coates -/*************************************************************************** - - Snow Brothers (Toaplan) / SemiCom Hardware - uses Kaneko's Pandora sprite chip (also used in DJ Boy, Air Buster ..) - -Snow Bros Nick & Tom -Toaplan, 1990 - - PCB Layout - ---------- - MIN16-02 - - |------------------------------------------| - | VOL YM3812 6116 4464 4464 | - | LA4460 YM3014 4464 4464 | - | 458 SBROS-4.29 SBROS1.40 | - | 2003 Z80B PANDORA | - |J D41101C-1 LS07 LS32 | - |A SBROS-3A.5 SBROS-2A.6 LS139 LS174| - |M LS245 LS74 LS04 16MHz| - |M 6264 6264 F32 LS74 LS74 | - |A 68000 LS20 F138 LS04 12MHz| - | LS04 LS148 LS251 LS00 | - | LS273 LS245 LS245 LS158 LS257 LS257 LS32 | - | | - | LS273 6116 6116 LS157 DSW2 DSW1 | - |------------------------------------------| - - Notes: - 68k clock: 8.000MHz - Z80B clock: 6.000MHz - YM3812 clock: 3.000MHz - VSync: 57.5Hz - HSync: 15.68kHz - - driver by Mike Coates - - Hyper Pacman addition by David Haywood - + some bits by Nicola Salmoria - - !!DO NOT TRUST THE SERVICE MODES FOR DIPSWITCH SETTINGS!! - -Stephh's notes (hyperpac): - - - According to the "Language" Dip Switch, this game is a Korean game. - (although the Language Dipswitch doesn't affect language, but yes - I believe SemiCom to be a Korean Company) - - There is no "cocktail mode", nor way to flip the screen. - -Notes: - -Cookie & Bibi 3 -This game is quite buggy. The test mode is incomplete and displays garbage -on the 'Dipswitch settings' screens, and during some of the attract mode -scenes the credit counter is not updated when you insert coins until the next -scene. Both these bugs are verified as occurring on the original hardware. - -Honey Doll / Twin Adventure - -These appear to have clipping problems on the left / right edges, but this -may be correct, the sprites which should be drawn there are simply blanked -out of the sprite list at that point.. (verify on real hw) - -Ma Cheon Ru - -The electrified maze + ball minigame appears unresponsive to controls, this -is because it actually requires you to move the joysticks in a circular -motion through all 8 directions at a very even speed, a task which is -practically impossible to perform on keyboard, and not even that easy with -a joystick. This is not an emulation bug. - - -***************************************************************************/ - -#include "emu.h" -#include "includes/snowbros.h" - -#include "cpu/m68000/m68000.h" -#include "cpu/mcs51/mcs51.h" // for semicom mcu -#include "cpu/z80/z80.h" -#include "machine/watchdog.h" -#include "sound/ymopm.h" -#include "sound/ymopl.h" - -#include "speaker.h" - - -void snowbros_state::snowbros_flipscreen_w(uint8_t data) -{ - m_pandora->flip_screen_set(!BIT(data, 7)); -} - - -void snowbros_state::bootleg_flipscreen_w(uint8_t data) -{ - flip_screen_set(~data & 0x80); -} - - -uint32_t snowbros_state::screen_update_snowbros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - /* This clears & redraws the entire screen each pass */ - bitmap.fill(0xf0, cliprect); - m_pandora->update(bitmap, cliprect); - return 0; -} - - -WRITE_LINE_MEMBER(snowbros_state::screen_vblank_snowbros) -{ - // rising edge - if (state) - { - m_pandora->eof(); - } -} - - - -void snowbros_state::snowbros_irq4_ack_w(uint16_t data) -{ - m_maincpu->set_input_line(4, CLEAR_LINE); -} - -void snowbros_state::snowbros_irq3_ack_w(uint16_t data) -{ - m_maincpu->set_input_line(3, CLEAR_LINE); -} - -void snowbros_state::snowbros_irq2_ack_w(uint16_t data) -{ - m_maincpu->set_input_line(2, CLEAR_LINE); -} - -TIMER_DEVICE_CALLBACK_MEMBER(snowbros_state::snowbros_irq) -{ - int scanline = param; - - if(scanline == 240) - m_maincpu->set_input_line(2, ASSERT_LINE); - - if(scanline == 128) - m_maincpu->set_input_line(3, ASSERT_LINE); - - if(scanline == 32) - m_maincpu->set_input_line(4, ASSERT_LINE); -} - -TIMER_DEVICE_CALLBACK_MEMBER(snowbros_state::snowbros3_irq) -{ - int status = m_oki->read(); - int scanline = param; - - if(scanline == 240) - m_maincpu->set_input_line(2, ASSERT_LINE); - - if(scanline == 128) - m_maincpu->set_input_line(3, ASSERT_LINE); - - if(scanline == 32) - m_maincpu->set_input_line(4, ASSERT_LINE); - - if (m_sb3_music_is_playing) - { - if ((status&0x08)==0x00) - { - m_oki->write(0x80|m_sb3_music); - m_oki->write(0x00|0x82); - } - - } - else - { - if ((status&0x08)==0x08) - { - m_oki->write(0x40); /* Stop playing music */ - } - } - -} - -uint16_t snowbros_state::toto_read(offs_t offset, uint16_t mem_mask) -{ - int pc = m_maincpu->pc(); - if ((pc!= 0x3f010) && (pc!= 0x38008)) printf("toto prot %08x %04x\n", pc, mem_mask); - return 0x0700; -} - -/* Snow Bros Memory Map */ - -void snowbros_state::snowbros_map(address_map &map) -{ - map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x103fff).ram(); - map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x300001, 0x300001).r("soundlatch2", FUNC(generic_latch_8_device::read)); - map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x400000, 0x400000).w(FUNC(snowbros_state::snowbros_flipscreen_w)); - map(0x500000, 0x500001).portr("DSW1"); - map(0x500002, 0x500003).portr("DSW2"); - map(0x500004, 0x500005).portr("SYSTEM"); - map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x700000, 0x701fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); - map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ -} - -void snowbros_state::sound_map(address_map &map) -{ - map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram(); -} - -void snowbros_state::sound_io_map(address_map &map) -{ - map.global_mask(0xff); - map(0x02, 0x03).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); - map(0x04, 0x04).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x04, 0x04).w("soundlatch2", FUNC(generic_latch_8_device::write)); // goes back to the main CPU, checked during boot -} - - -/* Semicom AT89C52 MCU */ - -// probably not endian safe -void snowbros_state::prot_p0_w(uint8_t data) -{ - uint16_t word = m_hyperpac_ram[m_semicom_prot_base + m_semicom_prot_offset]; - word = (word & 0xff00) | (data << 0); - m_hyperpac_ram[m_semicom_prot_base + m_semicom_prot_offset] = word; -} - -// probably not endian safe -void snowbros_state::prot_p1_w(uint8_t data) -{ - uint16_t word = m_hyperpac_ram[m_semicom_prot_base + m_semicom_prot_offset]; - word = (word & 0x00ff) | (data << 8); - m_hyperpac_ram[m_semicom_prot_base + m_semicom_prot_offset] = word; -} - -void snowbros_state::prot_p2_w(uint8_t data) -{ - // offset - m_semicom_prot_offset = data; -} - -/* Winter Bobble - bootleg GFX chip */ - -void snowbros_state::wintbob_map(address_map &map) -{ - map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x103fff).ram(); - map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x300001, 0x300001).r("soundlatch2", FUNC(generic_latch_8_device::read)); - map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x400000, 0x400000).w(FUNC(snowbros_state::bootleg_flipscreen_w)); - map(0x500000, 0x500001).portr("DSW1"); - map(0x500002, 0x500003).portr("DSW2"); - map(0x500004, 0x500005).portr("SYSTEM"); - map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x700000, 0x701fff).ram().share("spriteram16b"); - map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ -} - -/* Honey Doll */ - -void snowbros_state::honeydol_map(address_map &map) -{ - map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x10ffff).ram().share("hyperpac_ram"); - map(0x200000, 0x200001).nopw(); /* ? */ - map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x400000, 0x400001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x500000, 0x500001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0x600000, 0x600001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ - map(0x800000, 0x800001).nopw(); /* ? */ - map(0x900000, 0x900001).portr("DSW1"); - map(0x900002, 0x900003).portr("DSW2"); - map(0x900004, 0x900005).portr("SYSTEM"); - map(0xa00000, 0xa007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0xb00000, 0xb01fff).ram().share("spriteram16b"); -} - -void snowbros_state::honeydol_sound_map(address_map &map) -{ - map(0x0000, 0x7fff).rom(); - map(0x8000, 0x87ff).ram(); - map(0xe010, 0xe010).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); -} - -void snowbros_state::honeydol_sound_io_map(address_map &map) -{ - map.global_mask(0xff); - map(0x02, 0x03).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); // not connected? - map(0x04, 0x04).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x04, 0x04).nopw(); // still written but never actually read by the main CPU -} - -/* Twin Adventure */ - -void snowbros_state::twinadv_map(address_map &map) -{ - map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x10ffff).ram(); - map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x300001, 0x300001).r("soundlatch2", FUNC(generic_latch_8_device::read)); - map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); - map(0x400000, 0x400000).w(FUNC(snowbros_state::bootleg_flipscreen_w)); - - map(0x500000, 0x500001).portr("DSW1"); - map(0x500002, 0x500003).portr("DSW2"); - map(0x500004, 0x500005).portr("SYSTEM"); - map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x700000, 0x701fff).ram().share("spriteram16b"); - map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ -} - -void snowbros_state::twinadv_oki_bank_w(uint8_t data) -{ - int bank = (data &0x02)>>1; - - if (data&0xfd) logerror ("Unused bank bits! %02x\n",data); - - m_oki->set_rom_bank(bank); -} - -void snowbros_state::twinadv_sound_io_map(address_map &map) -{ - map.global_mask(0xff); - map(0x02, 0x02).r(m_soundlatch, FUNC(generic_latch_8_device::read)); - map(0x02, 0x02).w("soundlatch2", FUNC(generic_latch_8_device::write)); // back to 68k? - map(0x04, 0x04).w(FUNC(snowbros_state::twinadv_oki_bank_w)); // oki bank? - map(0x06, 0x06).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); -} - - -/* SemiCom Memory Map - -the SemiCom games have slightly more ram and are protected -sound hardware is also different - -*/ - -void snowbros_state::hyperpac_map(address_map &map) -{ - map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x10ffff).ram().share("hyperpac_ram"); - map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); -// map(0x400000, 0x400001) ??? - map(0x500000, 0x500001).portr("DSW1"); - map(0x500002, 0x500003).portr("DSW2"); - map(0x500004, 0x500005).portr("SYSTEM"); - - map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x700000, 0x701fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); - map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ -} - -void snowbros_state::hyperpac_sound_map(address_map &map) -{ - map(0x0000, 0xcfff).rom(); - map(0xd000, 0xd7ff).ram(); - map(0xf000, 0xf001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); - map(0xf002, 0xf002).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0xf008, 0xf008).r(m_soundlatch, FUNC(generic_latch_8_device::read)); -} - -/* Same volume used for all samples at the Moment, could be right, we have no - way of knowing .. */ -uint16_t snowbros_state::sb3_sound_r() -{ - return 0x0003; -} - -void snowbros_state::sb3_play_music(int data) -{ - uint8_t *snd; - - /* sample is actually played in interrupt function so it loops */ - m_sb3_music = data; - - switch (data) - { - case 0x23: - case 0x26: - snd = memregion("oki")->base(); - memcpy(snd+0x20000, snd+0x80000+0x00000, 0x20000); - m_sb3_music_is_playing = 1; - break; - - case 0x24: - snd = memregion("oki")->base(); - memcpy(snd+0x20000, snd+0x80000+0x20000, 0x20000); - m_sb3_music_is_playing = 1; - break; - - case 0x25: - case 0x27: - case 0x28: - case 0x29: - case 0x2a: - case 0x2b: - case 0x2c: - case 0x2d: - snd = memregion("oki")->base(); - memcpy(snd+0x20000, snd+0x80000+0x40000, 0x20000); - m_sb3_music_is_playing = 1; - break; - - case 0x2e: - m_sb3_music_is_playing = 0; - break; - } -} - -void snowbros_state::sb3_play_sound (int data) -{ - int status = m_oki->read(); - - if ((status&0x01)==0x00) - { - m_oki->write(0x80|data); - m_oki->write(0x00|0x12); - } - else if ((status&0x02)==0x00) - { - m_oki->write(0x80|data); - m_oki->write(0x00|0x22); - } - else if ((status&0x04)==0x00) - { - m_oki->write(0x80|data); - m_oki->write(0x00|0x42); - } - - -} - -void snowbros_state::sb3_sound_w(uint16_t data) -{ - if (data == 0x00fe) - { - m_sb3_music_is_playing = 0; - m_oki->write(0x78); /* Stop sounds */ - } - else /* the alternating 0x00-0x2f or 0x30-0x5f might be something to do with the channels */ - { - data = data>>8; - - if (data <= 0x21) - { - sb3_play_sound(data); - } - - if (data>=0x22 && data<=0x31) - { - sb3_play_music(data); - } - - if ((data>=0x30) && (data<=0x51)) - { - sb3_play_sound(data-0x30); - } - - if (data>=0x52 && data<=0x5f) - { - sb3_play_music(data-0x30); - } - - } -} - - - -void snowbros_state::snowbros3_map(address_map &map) -{ - map(0x000000, 0x03ffff).rom(); - map(0x100000, 0x103fff).ram(); - map(0x200000, 0x200001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); - map(0x300000, 0x300001).r(FUNC(snowbros_state::sb3_sound_r)); // ? - map(0x300000, 0x300001).w(FUNC(snowbros_state::sb3_sound_w)); // ? - map(0x400000, 0x400000).w(FUNC(snowbros_state::bootleg_flipscreen_w)); - map(0x500000, 0x500001).portr("DSW1"); - map(0x500002, 0x500003).portr("DSW2"); - map(0x500004, 0x500005).portr("SYSTEM"); - map(0x600000, 0x6003ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x700000, 0x7021ff).ram().share("spriteram16b"); - map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ -} - -/* Final Tetris */ - -void snowbros_state::finalttr_map(address_map &map) -{ - map(0x000000, 0x0fffff).rom(); - map(0x100000, 0x103fff).ram().share("hyperpac_ram"); - map(0x300001, 0x300001).w(m_soundlatch, FUNC(generic_latch_8_device::write)); -// map(0x400000, 0x400001) ??? - - map(0x500000, 0x500001).portr("DSW1"); - map(0x500002, 0x500003).portr("DSW2"); - map(0x500004, 0x500005).portr("SYSTEM"); - - map(0x600000, 0x6001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x700000, 0x701fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); - map(0x800000, 0x800001).w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ -} - - -// Yutnori protection. -// The sequence MEN is sent to the protection device, followed by the code request (4 bytes in all). -// After each byte, a number of NOPs are executed to give the device time to catch up. -// After the 4th byte, the code reads the device to get its response. -uint16_t snowbros_state::yutnori_prot_r() -{ - switch(m_yutnori_prot_val) // the 4th byte - { - case 0x33: // C3B6 - return 0xcc; - case 0x60: // 4878 - return 0xf9; - case 0xb8: // D820 - return 0x74; - } - logerror("%s: Unhandled protection sequence found: %02X\n", machine().describe_context(), m_yutnori_prot_val); - return 0; -} - -void snowbros_state::yutnori_prot_w(uint16_t data) -{ - m_yutnori_prot_val = data; -} - -void snowbros_state::yutnori_map(address_map &map) -{ - map(0x000000, 0x03ffff).rom(); - - // 0x100000 clr.w on startup - - map(0x200000, 0x200001).rw(FUNC(snowbros_state::yutnori_prot_r),FUNC(snowbros_state::yutnori_prot_w)); // protection - - map(0x300000, 0x300001).portr("DSW1"); - map(0x300002, 0x300003).portr("DSW2"); - map(0x300004, 0x300005).portr("SYSTEM"); - - // could be one of the OKIs? but gets value to write from RAM, always seems to be 0? - map(0x30000c, 0x30000d).nopw(); - map(0x30000e, 0x30000f).nopr(); //.r(FUNC(snowbros_state::yutnori_unk_r)); // ?? - -// map(0x400000, 0x400001).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); // maybe? - map(0x400000, 0x400001).noprw(); - - map(0x500000, 0x5001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - - map(0x600000, 0x601fff).rw(m_pandora, FUNC(kaneko_pandora_device::spriteram_LSB_r), FUNC(kaneko_pandora_device::spriteram_LSB_w)); - - map(0x700000, 0x70ffff).ram(); - - map(0x800000, 0x800001).nopr().w(FUNC(snowbros_state::snowbros_irq4_ack_w)); /* IRQ 4 acknowledge */ - map(0x900000, 0x900001).nopr().w(FUNC(snowbros_state::snowbros_irq3_ack_w)); /* IRQ 3 acknowledge */ - map(0xa00000, 0xa00001).nopr().w(FUNC(snowbros_state::snowbros_irq2_ack_w)); /* IRQ 2 acknowledge */ -} - -static INPUT_PORTS_START( snowbros ) - PORT_START("DSW1") /* 500001 */ - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Region ) ) PORT_DIPLOCATION("SW1:1") /* Listed as "NOT USE" in the manual */ - PORT_DIPSETTING( 0x00, DEF_STR( Europe ) ) - PORT_DIPSETTING( 0x01, "America (Romstar license)" ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW1:3" ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:4") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:5,6") - PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) - PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:7,8") - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x01) - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) - PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) - PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) - PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW1", 0x01, EQUALS, 0x00) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Must be low or game stops! */ - /* probably VBlank */ - - PORT_START("DSW2") /* 500003 */ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4") - PORT_DIPSETTING( 0x04, "100k and every 200k" ) - PORT_DIPSETTING( 0x0c, "100k Only" ) - PORT_DIPSETTING( 0x08, "200k Only" ) - PORT_DIPSETTING( 0x00, DEF_STR( None ) ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6") - PORT_DIPSETTING( 0x20, "1" ) - PORT_DIPSETTING( 0x00, "2" ) - PORT_DIPSETTING( 0x30, "3" ) - PORT_DIPSETTING( 0x10, "4" ) - PORT_DIPNAME( 0x40, 0x40, "Invulnerability" ) PORT_DIPLOCATION("SW2:7") - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:8") /* Listed as "NOT USE" in the manual */ - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500005 */ - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -static INPUT_PORTS_START( snowbroj ) - PORT_INCLUDE(snowbros) - - PORT_MODIFY("DSW1") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1") /* Listed as "NOT USE" in the manual */ - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x01, DEF_STR( On ) ) -INPUT_PORTS_END - -static INPUT_PORTS_START( ballboy3p ) - PORT_INCLUDE(snowbros) - - PORT_MODIFY("DSW1") // on the PCB in place of the dips there's the plug for the controls of the 3rd player - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_MODIFY("SYSTEM") - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_START3 ) -INPUT_PORTS_END - -static INPUT_PORTS_START( honeydol ) - PORT_START("DSW1") - PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x0003, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( 1C_2C ) ) - PORT_DIPNAME( 0x0004, 0x0004, "Show Girls" ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Level_Select ) ) /* Up & Down to set level, then punch to start */ - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, "Slide Show On Boot-up" ) /* Joystick to scroll. Seems to happen once at boot up, then the game auto starts */ - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* Must be low or game stops! */ - - PORT_START("DSW2") - PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x0001, DEF_STR( Harder ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x000c, 0x000c, "Timer Speed" ) /* Based on Normal Difficulty, Stage 1-1 first try */ - PORT_DIPSETTING( 0x000c, DEF_STR( Normal ) ) /* About 40 Seconds */ - PORT_DIPSETTING( 0x0008, "Fast" ) /* About 35 Seconds */ - PORT_DIPSETTING( 0x0004, "Faster" ) /* About 30 Seconds */ - PORT_DIPSETTING( 0x0000, "Fastest" ) /* About 20 Seconds */ - PORT_DIPNAME( 0x0030, 0x0020, DEF_STR( Lives ) ) - PORT_DIPSETTING( 0x0000, "1" ) - PORT_DIPSETTING( 0x0010, "2" ) - PORT_DIPSETTING( 0x0020, "3" ) - PORT_DIPSETTING( 0x0030, "5" ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, "Max Vs Round" ) - PORT_DIPSETTING( 0x0080, "3" ) /* 44 Seconds each */ - PORT_DIPSETTING( 0x0000, "1" ) /* 89 Seconds */ - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -static INPUT_PORTS_START( twinadv ) - PORT_START("DSW1") - PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x0003, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( 1C_2C ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Level_Select ) ) /* P1 Button 2 to advance, P1 Button 1 to start, starts game with 10 credits */ - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* Must be low or game stops! */ - - PORT_START("DSW2") - PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x0001, DEF_STR( Harder ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Lives ) ) - PORT_DIPSETTING( 0x0004, "3" ) - PORT_DIPSETTING( 0x0000, "5" ) - PORT_DIPNAME( 0x0008, 0x0008, "Ticket Mode #1" ) /* Shows on title screen "EVERY 4 GAMES = 1 TICKET" same as 0x0040 below? */ - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, "Ticket Mode #2" ) /* Shows on title screen "EVERY 4 GAMES = 1 TICKET" same as 0x0008 above? */ - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x0080, DEF_STR( Free_Play ) ) /* Always shows 24 credits */ - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -static INPUT_PORTS_START( 4in1boot ) - PORT_START("DSW1") /* 500001 */ - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:2,3") - PORT_DIPSETTING( 0x04, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x06, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x78, 0x78, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:4,5,6,7") - PORT_DIPSETTING( 0x18, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x38, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x10, DEF_STR( 4C_2C ) ) - PORT_DIPSETTING( 0x58, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x30, DEF_STR( 3C_2C ) ) - PORT_DIPSETTING( 0x08, DEF_STR( 4C_3C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 4C_4C ) ) - PORT_DIPSETTING( 0x28, DEF_STR( 3C_3C ) ) - PORT_DIPSETTING( 0x50, DEF_STR( 2C_2C ) ) - PORT_DIPSETTING( 0x78, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x20, DEF_STR( 3C_4C ) ) - PORT_DIPSETTING( 0x48, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x40, DEF_STR( 2C_4C ) ) - PORT_DIPSETTING( 0x70, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x68, DEF_STR( 1C_3C ) ) - PORT_DIPSETTING( 0x60, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW1:8") - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Must be low or game stops! */ - /* probably VBlank */ - - PORT_START("DSW2") /* 500003 */ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") - PORT_DIPSETTING( 0x02, "1" ) - PORT_DIPSETTING( 0x00, "2" ) - PORT_DIPSETTING( 0x03, "3" ) - PORT_DIPSETTING( 0x01, "4" ) - PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) - PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) - PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) - PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) - PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW2:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500005 */ - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -static INPUT_PORTS_START( hyperpac ) - PORT_START("DSW1") /* 500000.w */ - PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:2") // "Language" in the "test mode" - PORT_DIPSETTING( 0x0002, "3" ) // "Korean" - PORT_DIPSETTING( 0x0000, "5" ) // "English" - PORT_DIPNAME( 0x001c, 0x001c, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:3,4,5") - PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x000c, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x001c, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x0014, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x0018, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0060, 0x0060, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:6,7") - PORT_DIPSETTING( 0x0000, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x0060, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Hardest ) ) // DEF_STR( Very_Hard ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW2") /* 500002.w */ - PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) - PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) - PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) - PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) - PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) - PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) - PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) - PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0000, "SW2:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500004.w */ - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -static INPUT_PORTS_START( cookbib2 ) - PORT_START("DSW1") /* 500000.w */ - PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, "Max Vs Round" ) PORT_DIPLOCATION("SW1:2") // "Language" in the "test mode" - PORT_DIPSETTING( 0x0002, "3" ) - PORT_DIPSETTING( 0x0000, "1" ) - PORT_DIPNAME( 0x001c, 0x001c, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:3,4,5") - PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x000c, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x001c, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x0014, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x0018, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0060, 0x0060, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:6,7") - PORT_DIPSETTING( 0x0000, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x0060, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Hardest ) ) // DEF_STR( Very_Hard ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW2") /* 500002.w */ - PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) - PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) - PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) - PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) - PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) - PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) - PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) - PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0000, "SW2:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500004.w */ - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -static INPUT_PORTS_START( cookbib2c ) - PORT_INCLUDE(cookbib2) - - PORT_MODIFY("DSW1") - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Language ) ) PORT_DIPLOCATION("SW1:2") - PORT_DIPSETTING( 0x0002, DEF_STR( English ) ) // Korean in test mode - PORT_DIPSETTING( 0x0000, DEF_STR( Korean ) ) // English in test mode -INPUT_PORTS_END - -static INPUT_PORTS_START( cookbib3 ) - PORT_START("DSW1") /* 500000.w */ - PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x000e, 0x000e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4") - PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x000a, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x000c, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0070, 0x0070, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7") - PORT_DIPSETTING( 0x0020, "Level 1" ) - PORT_DIPSETTING( 0x0010, "Level 2" ) - PORT_DIPSETTING( 0x0000, "Level 3" ) - PORT_DIPSETTING( 0x0070, "Level 4" ) - PORT_DIPSETTING( 0x0060, "Level 5" ) - PORT_DIPSETTING( 0x0050, "Level 6" ) - PORT_DIPSETTING( 0x0040, "Level 7" ) - PORT_DIPSETTING( 0x0030, "Level 8" ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW2") /* 500002.w */ - PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) - PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) - PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) - PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) - PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) - PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) - PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") /* Will go into negative credits and cause graphics issues */ - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500004.w */ - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -static INPUT_PORTS_START( moremore ) - PORT_START("DSW1") /* 500000.w */ - PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x000e, 0x000e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4") - PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x000a, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x000c, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0070, 0x0070, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7") - PORT_DIPSETTING( 0x0020, "Level 1" ) - PORT_DIPSETTING( 0x0010, "Level 2" ) - PORT_DIPSETTING( 0x0000, "Level 3" ) - PORT_DIPSETTING( 0x0070, "Level 4" ) - PORT_DIPSETTING( 0x0060, "Level 5" ) - PORT_DIPSETTING( 0x0050, "Level 6" ) - PORT_DIPSETTING( 0x0040, "Level 7" ) - PORT_DIPSETTING( 0x0030, "Level 8" ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW2") /* 500002.w */ - PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) - PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) - PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) - PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) - PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) - PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) - PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500004.w */ - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -// don't trust the test mode! <-- Verified via actual game play: Demo Sounds, Coinage & Free Play -static INPUT_PORTS_START( mcheonru ) - PORT_START("DSW1") /* 500000.w */ - PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x000e, 0x000e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4") - PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) ) /* Duplicate */ - PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) ) /* Duplicate */ - PORT_DIPSETTING( 0x0004, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x000a, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x000c, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0070, 0x0070, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7") - PORT_DIPSETTING( 0x0020, "Level 1" ) - PORT_DIPSETTING( 0x0010, "Level 2" ) - PORT_DIPSETTING( 0x0000, "Level 3" ) - PORT_DIPSETTING( 0x0070, "Level 4" ) - PORT_DIPSETTING( 0x0060, "Level 5" ) - PORT_DIPSETTING( 0x0050, "Level 6" ) - PORT_DIPSETTING( 0x0040, "Level 7" ) - PORT_DIPSETTING( 0x0030, "Level 8" ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW2") /* 500002.w */ - PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:1") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, "Tile Type" ) PORT_DIPLOCATION("SW2:2") /* Does NOT show up in service mode! */ - PORT_DIPSETTING( 0x0002, "Picture" ) - PORT_DIPSETTING( 0x0000, "Traditional" ) - PORT_DIPNAME( 0x0004, 0x0004, "Mini Game Frequency" ) PORT_DIPLOCATION("SW2:3") /* Does NOT show up in service mode! */ - PORT_DIPSETTING( 0x0004, "Every 3 Rounds" ) - PORT_DIPSETTING( 0x0000, "Every Round" ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:4") - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:5") - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:6") - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7") - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500004.w */ - PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) -INPUT_PORTS_END - -static INPUT_PORTS_START( twinkle ) - PORT_START("DSW1") /* 500000.w */ - PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x000e, 0x000e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4") - PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x000a, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x000c, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0070, 0x0070, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7") // this is what service mode lists, but I don't trust it. - PORT_DIPSETTING( 0x0020, "Level 1" ) - PORT_DIPSETTING( 0x0010, "Level 2" ) - PORT_DIPSETTING( 0x0000, "Level 3" ) - PORT_DIPSETTING( 0x0070, "Level 4" ) - PORT_DIPSETTING( 0x0060, "Level 5" ) - PORT_DIPSETTING( 0x0050, "Level 6" ) - PORT_DIPSETTING( 0x0040, "Level 7" ) - PORT_DIPSETTING( 0x0030, "Level 8" ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW2") /* 500002.w */ - PORT_DIPNAME( 0x0003, 0x0002, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") // unlisted in service mode - PORT_DIPSETTING( 0x0000, "1" ) - PORT_DIPSETTING( 0x0003, "2" ) - PORT_DIPSETTING( 0x0002, "3" ) - PORT_DIPSETTING( 0x0001, "4" ) - PORT_DIPUNKNOWN_DIPLOC( 0x0004, 0x0000, "SW2:3" ) - PORT_DIPUNKNOWN_DIPLOC( 0x0008, 0x0000, "SW2:4" ) - PORT_DIPNAME( 0x0010, 0x0010, "Pellet Animations" ) PORT_DIPLOCATION("SW2:5") // unlisted in service mode - PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( On ) ) - PORT_DIPUNKNOWN_DIPLOC( 0x0020, 0x0000, "SW2:6" ) - PORT_DIPUNKNOWN_DIPLOC( 0x0040, 0x0000, "SW2:7" ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500004.w */ - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -// don't trust the test mode! <-- Verified via actual game play: Demo Sounds, Coinage & Free Play -static INPUT_PORTS_START( pzlbreak ) - PORT_START("DSW1") /* 500000.w */ - PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x000e, 0x000e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4") - PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x000a, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x000c, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0070, 0x0070, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6,7") - PORT_DIPSETTING( 0x0020, "Level 1" ) - PORT_DIPSETTING( 0x0010, "Level 2" ) - PORT_DIPSETTING( 0x0000, "Level 3" ) - PORT_DIPSETTING( 0x0070, "Level 4" ) - PORT_DIPSETTING( 0x0060, "Level 5" ) - PORT_DIPSETTING( 0x0050, "Level 6" ) - PORT_DIPSETTING( 0x0040, "Level 7" ) - PORT_DIPSETTING( 0x0030, "Level 8" ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW2") /* 500002.w */ - PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) - PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) - PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) - PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) - PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) - PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) - PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500004.w */ - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -static INPUT_PORTS_START( toppyrap ) - PORT_START("DSW1") /* 500000.w */ - PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW1:2" ) - PORT_DIPNAME( 0x001c, 0x001c, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:3,4,5") - PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x000c, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x001c, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x0014, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x0018, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( 1C_3C ) ) - PORT_DIPNAME( 0x0060, 0x0060, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:6,7") - PORT_DIPSETTING( 0x0000, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x0060, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Hardest ) ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW2") /* 500002.w */ - PORT_DIPNAME( 0x03, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") - PORT_DIPSETTING( 0x0000, "2" ) - PORT_DIPSETTING( 0x0003, "3" ) - PORT_DIPSETTING( 0x0002, "4" ) - PORT_DIPSETTING( 0x0001, "5" ) - PORT_DIPNAME( 0x000c, 0x000c, "Time" ) PORT_DIPLOCATION("SW2:3,4") - PORT_DIPSETTING( 0x0004, "40 Seconds" ) - PORT_DIPSETTING( 0x0008, "50 Seconds" ) - PORT_DIPSETTING( 0x000c, "60 Seconds" ) - PORT_DIPSETTING( 0x0000, "70 Seconds" ) - PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) - PORT_DIPNAME( 0x0020, 0x0020, "God Mode" ) PORT_DIPLOCATION("SW2:6") - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, "Internal Test" ) PORT_DIPLOCATION("SW2:7") - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // jump - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) // fire - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only? - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500004.w */ - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -static INPUT_PORTS_START( finalttr ) - PORT_START("DSW1") /* 500001 */ - PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0001, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coinage ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x0030, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x0038, DEF_STR( 1C_1C ) ) -/* PORT_DIPSETTING( 0x0018, DEF_STR( 1C_1C ) ) Duplicate setting? */ - PORT_DIPSETTING( 0x0020, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x0028, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Must be low or game stops! */ - /* probably VBlank */ - PORT_START("DSW2") /* 500003 */ - PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x000c, 0x000c, "Time" ) - PORT_DIPSETTING( 0x0000, "60 Seconds" ) - PORT_DIPSETTING( 0x000c, "90 Seconds" ) - PORT_DIPSETTING( 0x0008, "120 Seconds" ) - PORT_DIPSETTING( 0x0004, "150 Seconds" ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") /* 500005 */ - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - -// ignore service mode, it shows a regular joystick + 3 buttons config, these game simply uses 6 buttons -static INPUT_PORTS_START( suhosong ) - PORT_START("DSW1") - PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW1:2" ) - PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW1:3" ) - PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW1:4" ) - PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW1:5" ) - PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW1:6" ) - PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW1:7" ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Button 4 / Stand / Stop / Drop / Full Bet / Take") PORT_CODE(KEYCODE_V) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Button 1 / High") PORT_CODE(KEYCODE_Z) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Button 2 / Low") PORT_CODE(KEYCODE_X) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Button 3 / Hit / Go / Double Up") PORT_CODE(KEYCODE_C) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Button 6 / Bet / Raise") PORT_CODE(KEYCODE_N) - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW2") - PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0000, "SW2:1" ) - PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0000, "SW2:2" ) - PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0000, "SW2:3" ) - PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0000, "SW2:4" ) - PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0000, "SW2:5" ) - PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0000, "SW2:6" ) - PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0000, "SW2:7" ) - PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0000, "SW2:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Button 5 / Start / Double / Call / Check") PORT_CODE(KEYCODE_B) // Double != Double Up - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) -INPUT_PORTS_END - - - - -static INPUT_PORTS_START( yutnori ) - PORT_START("DSW1") - PORT_DIPNAME( 0x007, 0x0007, "Coin / Credit" ) PORT_DIPLOCATION("SW1:1,2,3") - PORT_DIPSETTING( 0x0004, "1 / 50" ) - PORT_DIPSETTING( 0x0003, "1 / 40" ) - PORT_DIPSETTING( 0x0002, "1 / 30" ) - PORT_DIPSETTING( 0x0007, "2 / 50" ) - PORT_DIPSETTING( 0x0006, "2 / 40" ) - PORT_DIPSETTING( 0x0005, "2 / 30" ) - PORT_DIPSETTING( 0x0001, "3 / 50" ) - PORT_DIPSETTING( 0x0000, "3 / 40" ) - PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5,6") - PORT_DIPSETTING( 0x0030, "1" ) - PORT_DIPSETTING( 0x0028, "2" ) - PORT_DIPSETTING( 0x0020, "3" ) - PORT_DIPSETTING( 0x0038, "4" ) - PORT_DIPSETTING( 0x0018, "5" ) - PORT_DIPSETTING( 0x0010, "6" ) - PORT_DIPSETTING( 0x0008, "7" ) - PORT_DIPSETTING( 0x0000, "8" ) - PORT_DIPNAME( 0xc0, 0xc0, "Mal Count" ) PORT_DIPLOCATION("SW1:7,8") - PORT_DIPSETTING( 0x40, "2" ) - PORT_DIPSETTING( 0xc0, "3" ) - PORT_DIPSETTING( 0x00, "4" ) - PORT_DIPSETTING( 0x80, "5" ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("DSW2") - PORT_DIPNAME( 0x03, 0x03, "Base Bet" ) PORT_DIPLOCATION("SW2:1,2") - PORT_DIPSETTING( 0x00, "20" ) - PORT_DIPSETTING( 0x01, "30" ) - PORT_DIPSETTING( 0x02, "40" ) - PORT_DIPSETTING( 0x03, "50" ) - PORT_DIPNAME( 0x0c, 0x0c, "Max Bet" ) PORT_DIPLOCATION("SW2:3,4") - PORT_DIPSETTING( 0x04, "150" ) - PORT_DIPSETTING( 0x08, "200" ) - PORT_DIPSETTING( 0x0c, "300" ) - PORT_DIPSETTING( 0x00, "400" ) - PORT_DIPNAME( 0x30, 0x30, "Score" ) PORT_DIPLOCATION("SW2:5,6") - PORT_DIPSETTING( 0x10, "800 1200 1600" ) - PORT_DIPSETTING( 0x30, "1000 1500 2000" ) - PORT_DIPSETTING( 0x00, "1200 1800 2400" ) - PORT_DIPSETTING( 0x20, "1000 2000 3000" ) - PORT_DIPNAME( 0x0040, 0x0040, "Bet -> Score" ) PORT_DIPLOCATION("SW2:7") - PORT_DIPSETTING( 0x0040, DEF_STR( On ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) - PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW2:8" ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - - PORT_START("SYSTEM") - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) -INPUT_PORTS_END - - -/* SnowBros */ - -static GFXDECODE_START( gfx_snowbros ) - GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0, 16 ) -GFXDECODE_END - -/* Honey Doll */ - -static const gfx_layout honeydol_tilelayout8bpp = -{ - 16,16, - RGN_FRAC(1,2), - 8, - { 0, 1, 2, 3, RGN_FRAC(1,2)+0, RGN_FRAC(1,2)+1, RGN_FRAC(1,2)+2, RGN_FRAC(1,2)+3}, - { STEP8(0,4), STEP8(8*32,4) }, - { STEP8(0,32), STEP8(16*32,32) }, - 32*32 -}; - -static GFXDECODE_START( gfx_honeydol ) - GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0, 64 ) // how does it use 0-15 - GFXDECODE_ENTRY( "gfx2", 0, honeydol_tilelayout8bpp, 0, 4 ) - -GFXDECODE_END - -static GFXDECODE_START( gfx_twinadv ) - GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0, 64 ) -GFXDECODE_END - -/* Winter Bobble */ - -static const gfx_layout tilelayout_wb = -{ - 16,16, - RGN_FRAC(1,1), - 4, - { 0, 1, 2, 3 }, - { STEP4(3*4,-4), STEP4(7*4,-4), STEP4(11*4,-4), STEP4(15*4,-4) }, - { STEP16(0,64) }, - 16*64 -}; - -static GFXDECODE_START( gfx_wb ) - GFXDECODE_ENTRY( "gfx1", 0, tilelayout_wb, 0, 16 ) -GFXDECODE_END - -/* SemiCom */ - -static const gfx_layout hyperpac_tilelayout = -{ - 16,16, - RGN_FRAC(1,1), - 4, - { 0, 1, 2, 3 }, - { 4, 0, 8*32+4, 8*32+0, 20,16, 8*32+20, 8*32+16, - 12, 8, 8*32+12, 8*32+8, 28, 24, 8*32+28, 8*32+24 }, - { 0*32, 2*32, 1*32, 3*32, 16*32+0*32, 16*32+2*32, 16*32+1*32, 16*32+3*32, - 4*32, 6*32, 5*32, 7*32, 16*32+4*32, 16*32+6*32, 16*32+5*32, 16*32+7*32 }, - 32*32 -}; - - -static const gfx_layout sb3_tilebglayout = -{ - 16,16, - RGN_FRAC(1,1), - 8, - {8, 9,10, 11, 0, 1, 2, 3 }, - { 0, 4, 16, 20, 32, 36, 48, 52, - 512+0,512+4,512+16,512+20,512+32,512+36,512+48,512+52}, - { 0*64, 1*64, 2*64, 3*64, 4*64, 5*64, 6*64, 7*64, - 1024+0*16,1024+1*64,1024+2*64,1024+3*64,1024+4*64,1024+5*64,1024+6*64,1024+7*64}, - 32*64 -}; - - -static GFXDECODE_START( gfx_sb3 ) - GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_row_2x2_group_packed_msb, 0, 16 ) - GFXDECODE_ENTRY( "gfx2", 0, sb3_tilebglayout, 0, 2 ) -GFXDECODE_END - -static GFXDECODE_START( gfx_hyperpac ) - GFXDECODE_ENTRY( "gfx1", 0, hyperpac_tilelayout, 0, 16 ) -GFXDECODE_END - -MACHINE_RESET_MEMBER(snowbros_state,semiprot) -{ - uint16_t *PROTDATA = (uint16_t*)memregion("user1")->base(); - int i; - - for (i = 0;i < 0x200/2;i++) - m_hyperpac_ram[0xf000/2 + i] = PROTDATA[i]; -} - -MACHINE_RESET_MEMBER(snowbros_state,finalttr) -{ - uint16_t *PROTDATA = (uint16_t*)memregion("user1")->base(); - int i; - - for (i = 0;i < 0x200/2;i++) - m_hyperpac_ram[0x2000/2 + i] = PROTDATA[i]; -} - -void snowbros_state::snowbros(machine_config &config) -{ - /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(16'000'000)/2); /* 8 Mhz - confirmed */ - m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::snowbros_map); - TIMER(config, "scantimer", 0).configure_scanline(FUNC(snowbros_state::snowbros_irq), "screen", 0, 1); - WATCHDOG_TIMER(config, "watchdog"); - - Z80(config, m_soundcpu, XTAL(12'000'000)/2); /* 6 MHz - confirmed */ - m_soundcpu->set_addrmap(AS_PROGRAM, &snowbros_state::sound_map); - m_soundcpu->set_addrmap(AS_IO, &snowbros_state::sound_io_map); - - /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(57.5); /* ~57.5 - confirmed */ - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(32*8, 262); - m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); - m_screen->set_screen_update(FUNC(snowbros_state::screen_update_snowbros)); - m_screen->screen_vblank().set(FUNC(snowbros_state::screen_vblank_snowbros)); - m_screen->set_palette(m_palette); - - GFXDECODE(config, m_gfxdecode, m_palette, gfx_snowbros); - PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 256); - - KANEKO_PANDORA(config, m_pandora, 0); - m_pandora->set_gfxdecode_tag(m_gfxdecode); - - /* sound hardware */ - SPEAKER(config, "mono").front_center(); - - GENERIC_LATCH_8(config, m_soundlatch); - m_soundlatch->data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_NMI); - - GENERIC_LATCH_8(config, "soundlatch2"); - - ym3812_device &ymsnd(YM3812(config, "ymsnd", XTAL(12'000'000)/4)); /* 3 MHz - confirmed */ - ymsnd.irq_handler().set_inputline("soundcpu", 0); - ymsnd.add_route(ALL_OUTPUTS, "mono", 1.0); -} - -void snowbros_state::wintbob(machine_config &config) -{ - snowbros(config); - - /* basic machine hardware */ - m_maincpu->set_clock(10000000); /* 10mhz - Confirmed */ - m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::wintbob_map); - - config.device_remove("pandora"); - - /* video hardware */ - m_gfxdecode->set_info(gfx_wb); - - m_screen->set_screen_update(FUNC(snowbros_state::screen_update_wintbob)); - m_screen->screen_vblank().set_nop(); -} - -void snowbros_state::semicom(machine_config &config) -{ - snowbros(config); - - /* basic machine hardware */ - m_maincpu->set_clock(XTAL(12'000'000)); /* 12MHz - Confirmed */ - m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::hyperpac_map); - - m_soundcpu->set_clock(XTAL(16'000'000)/4); /* 4MHz - Confirmed */ - m_soundcpu->set_addrmap(AS_PROGRAM, &snowbros_state::hyperpac_sound_map); - m_soundcpu->set_addrmap(AS_IO, address_map_constructor()); - - m_gfxdecode->set_info(gfx_hyperpac); - - m_soundlatch->data_pending_callback().set_nop(); - - config.device_remove("soundlatch2"); - - /* sound hardware */ - ym2151_device &ymsnd(YM2151(config.replace(), "ymsnd", XTAL(16'000'000)/4)); /* 4MHz - Confirmed */ - ymsnd.irq_handler().set_inputline(m_soundcpu, 0); - ymsnd.add_route(0, "mono", 0.10); - ymsnd.add_route(1, "mono", 0.10); - - OKIM6295(config, m_oki, XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH); /* 1MHz & pin 7 High - Confirmed */ - m_oki->add_route(ALL_OUTPUTS, "mono", 1.0); -} - -void snowbros_state::semicom_mcu(machine_config &config) -{ - semicom(config); - - /* basic machine hardware */ - at89c52_device &prot(AT89C52(config, "protection", XTAL(16'000'000))); - prot.port_out_cb<0>().set(FUNC(snowbros_state::prot_p0_w)); - prot.port_out_cb<1>().set(FUNC(snowbros_state::prot_p1_w)); - prot.port_out_cb<2>().set(FUNC(snowbros_state::prot_p2_w)); -} - - -void snowbros_state::semiprot(machine_config &config) -{ - semicom(config); - MCFG_MACHINE_RESET_OVERRIDE(snowbros_state, semiprot) -} - - -void snowbros_state::honeydol(machine_config &config) -{ - /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(12'000'000)); /* MC68000P12 @ 12MHz */ - m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::honeydol_map); - TIMER(config, "scantimer", 0).configure_scanline(FUNC(snowbros_state::snowbros_irq), "screen", 0, 1); - - Z80(config, m_soundcpu, XTAL(16'000'000)/4); /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */ - m_soundcpu->set_addrmap(AS_PROGRAM, &snowbros_state::honeydol_sound_map); - m_soundcpu->set_addrmap(AS_IO, &snowbros_state::honeydol_sound_io_map); - - /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(57.5); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ - m_screen->set_size(32*8, 262); - m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); - m_screen->set_screen_update(FUNC(snowbros_state::screen_update_honeydol)); - m_screen->set_palette(m_palette); - - GFXDECODE(config, m_gfxdecode, m_palette, gfx_honeydol); - PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x800/2); - - /* sound hardware */ - SPEAKER(config, "mono").front_center(); - - GENERIC_LATCH_8(config, m_soundlatch); - m_soundlatch->data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_NMI); - - ym3812_device &ymsnd(YM3812(config, "ymsnd", XTAL(12'000'000)/4)); /* 3Mhz */ - ymsnd.irq_handler().set_inputline("soundcpu", 0); - ymsnd.add_route(ALL_OUTPUTS, "mono", 1.0); - - OKIM6295(config, m_oki, XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH); /* freq? */ - m_oki->add_route(ALL_OUTPUTS, "mono", 1.0); -} - -void snowbros_state::twinadv(machine_config &config) -{ - /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(12'000'000)); /* 12MHz like Honey Doll ? */ - m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::twinadv_map); - TIMER(config, "scantimer", 0).configure_scanline(FUNC(snowbros_state::snowbros_irq), "screen", 0, 1); - WATCHDOG_TIMER(config, "watchdog"); - - Z80(config, m_soundcpu, XTAL(16'000'000)/4); /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */ - m_soundcpu->set_addrmap(AS_PROGRAM, &snowbros_state::sound_map); - m_soundcpu->set_addrmap(AS_IO, &snowbros_state::twinadv_sound_io_map); - m_soundcpu->set_vblank_int("screen", FUNC(snowbros_state::irq0_line_hold)); - - /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(57.5); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ - m_screen->set_size(32*8, 262); - m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); - m_screen->set_screen_update(FUNC(snowbros_state::screen_update_twinadv)); - m_screen->set_palette(m_palette); - - GFXDECODE(config, m_gfxdecode, m_palette, gfx_twinadv); - PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x100); - - /* sound hardware */ - SPEAKER(config, "mono").front_center(); - - GENERIC_LATCH_8(config, m_soundlatch); - m_soundlatch->data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_NMI); - - GENERIC_LATCH_8(config, "soundlatch2"); - - /* sound hardware */ - OKIM6295(config, m_oki, XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH); /* freq? */ - m_oki->add_route(ALL_OUTPUTS, "mono", 1.0); -} - - -/* - -Final Tetris - -the pcb is korean and probably original even if it's very cheap. - -osc 12mhz -osc 3.579545mhz -68000 -z8004b -CA5101 (sound chip) -OKI M6295 (sound chip) -Intel P8752 (mcu) - -2x dips banks - -*/ - -void snowbros_state::finalttr(machine_config &config) -{ - semicom(config); - - m_maincpu->set_clock(XTAL(12'000'000)); - m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::finalttr_map); - - m_soundcpu->set_clock(XTAL(3'579'545)); - - MCFG_MACHINE_RESET_OVERRIDE(snowbros_state, finalttr) - - ym2151_device &ymsnd(YM2151(config.replace(), "ymsnd", XTAL(3'579'545))); /* possible but less likely 4MHz (12MHz/3) */ - ymsnd.irq_handler().set_inputline(m_soundcpu, 0); - ymsnd.add_route(0, "mono", 0.08); - ymsnd.add_route(1, "mono", 0.08); - - m_oki->set_clock(999900); - m_oki->reset_routes().add_route(ALL_OUTPUTS, "mono", 0.4); -} - - -void snowbros_state::_4in1(machine_config &config) -{ - semicom(config); - - /* basic machine hardware */ - m_gfxdecode->set_info(gfx_snowbros); -} - -void snowbros_state::snowbro3(machine_config &config) /* PCB has 16MHz & 12MHz OSCs */ -{ - /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(12'000'000)); /* MC68000P10 CPU @ 12mhz or 8MHz (16MHz/2) ? */ - m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::snowbros3_map); - TIMER(config, "scantimer", 0).configure_scanline(FUNC(snowbros_state::snowbros3_irq), "screen", 0, 1); - WATCHDOG_TIMER(config, "watchdog"); - - /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(32*8, 32*8); - m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); - m_screen->set_screen_update(FUNC(snowbros_state::screen_update_snowbro3)); - m_screen->set_palette(m_palette); - - GFXDECODE(config, m_gfxdecode, m_palette, gfx_sb3); - PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 512); - - /* sound hardware */ - SPEAKER(config, "mono").front_center(); - - OKIM6295(config, m_oki, XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH); // clock frequency & pin 7 not verified - m_oki->add_route(ALL_OUTPUTS, "mono", 1.0); -} - -void snowbros_state::yutnori(machine_config &config) -{ - /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(16'000'000)/2); - m_maincpu->set_addrmap(AS_PROGRAM, &snowbros_state::yutnori_map); - TIMER(config, "scantimer", 0).configure_scanline(FUNC(snowbros_state::snowbros_irq), "screen", 0, 1); - -// WATCHDOG_TIMER(config, "watchdog"); // maybe - - /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(57.5); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(32*8, 262); - m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); - m_screen->set_screen_update(FUNC(snowbros_state::screen_update_snowbros)); - m_screen->screen_vblank().set(FUNC(snowbros_state::screen_vblank_snowbros)); - m_screen->set_palette(m_palette); - - GFXDECODE(config, m_gfxdecode, m_palette, gfx_hyperpac); - PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 256); - - KANEKO_PANDORA(config, m_pandora, 0); - m_pandora->set_gfxdecode_tag(m_gfxdecode); - - /* sound hardware */ - SPEAKER(config, "mono").front_center(); - - okim6295_device &oki1(OKIM6295(config, "oki1", XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified - oki1.add_route(ALL_OUTPUTS, "mono", 1.0); - - okim6295_device &oki2(OKIM6295(config, "oki2", XTAL(16'000'000)/16, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified - oki2.add_route(ALL_OUTPUTS, "mono", 1.0); -} - -/*************************************************************************** - - ROM definitions - -***************************************************************************/ - -ROM_START( snowbros ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "sn6.bin", 0x00000, 0x20000, CRC(4899ddcf) SHA1(47d750d3022a80e47ffabe47566bb2556cc8d477) ) - ROM_LOAD16_BYTE( "sn5.bin", 0x00001, 0x20000, CRC(ad310d3f) SHA1(f39295b38d99087dbb9c5b00bf9cb963337a50e2) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) - /* where were these from, a bootleg? */ -// ROM_LOAD( "ch0", 0x00000, 0x20000, CRC(36d84dfe) SHA1(5d45a750220930bc409de30f19282bb143fbf94f) ) -// ROM_LOAD( "ch1", 0x20000, 0x20000, CRC(76347256) SHA1(48ec03965905adaba5e50eb3e42a2813f7883bb4) ) -// ROM_LOAD( "ch2", 0x40000, 0x20000, CRC(fdaa634c) SHA1(1271c74df7da7596caf67caae3c51b4c163a49f4) ) -// ROM_LOAD( "ch3", 0x60000, 0x20000, CRC(34024aef) SHA1(003a9b9ee3aaab3d787894d3d4126d372b19d2a8) ) -ROM_END - -ROM_START( snowbrosa ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "sbros-3a.5", 0x00000, 0x20000, CRC(10cb37e1) SHA1(786be4640f8df2c81a32decc189ea7657ace00c6) ) - ROM_LOAD16_BYTE( "sbros-2a.6", 0x00001, 0x20000, CRC(ab91cc1e) SHA1(8cff61539dc7d35fcbf110d3e54fc1883e7b8509) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) -ROM_END - -ROM_START( snowbrosb ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "sbros3-a", 0x00000, 0x20000, CRC(301627d6) SHA1(0d1dc70091c87e9c27916d4232ff31b7381a64e1) ) - ROM_LOAD16_BYTE( "sbros2-a", 0x00001, 0x20000, CRC(f6689f41) SHA1(e4fd27b930a31479c0d99e0ddd23d5db34044666) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) -ROM_END - -ROM_START( snowbrosc ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "3-a.ic5", 0x00000, 0x20000, CRC(e1bc346b) SHA1(a20c343d9ed2ad4f785d21076499008edad251f9) ) - ROM_LOAD16_BYTE( "2-a.ic6", 0x00001, 0x20000, CRC(1be27f9d) SHA1(76dd14480b9274831e51016f7bb57459d7b15cf9) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) -ROM_END - -ROM_START( snowbrosd ) /* Korean release, but no specific "For use in Korea only..." notice screen */ - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "sbk_3-a.bin", 0x00000, 0x20000, CRC(97174d40) SHA1(481e8c680af8b03d4bcf97b87ca0ba5a3ffca0d7) ) - ROM_LOAD16_BYTE( "sbk_2-a.bin", 0x00001, 0x20000, CRC(80cc80e5) SHA1(1eeca0924c93e9f0536683160e80c59871569088) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) -ROM_END - -ROM_START( snowbrosj )/* "For use in Japan only..." notice screen */ - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "snowbros.3", 0x00000, 0x20000, CRC(3f504f9e) SHA1(700758b114c3fde6ea8f84222af0850dba13cd3b) ) - ROM_LOAD16_BYTE( "snowbros.2", 0x00001, 0x20000, CRC(854b02bc) SHA1(4ad1548eef94dcb95119cb4a7dcdefa037591b5b) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "sbros-4.29", 0x0000, 0x8000, CRC(e6eab4e4) SHA1(d08187d03b21192e188784cb840a37a7bdb5ad32) ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - /* The gfx ROM (snowbros.1) was bad, I'm using the ones from the other sets. */ - ROM_LOAD( "sbros-1.41", 0x00000, 0x80000, CRC(16f06b3a) SHA1(c64d3b2d32f0f0fcf1d8c5f02f8589d59ddfd428) ) -ROM_END - -ROM_START( wintbob ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "wb3", 0x00000, 0x10000, CRC(b9719767) SHA1(431c97d409f2a5ff7f46116a4d8907e446434431) ) - ROM_LOAD16_BYTE( "wb1", 0x00001, 0x10000, CRC(a4488998) SHA1(4e927e31c1b865dbdba2b985c7a819a07e2e81b8) ) - - /* The wb03.bin below is bad, the set has a different copyright message (IN KOREA is replaced with 1990) - but also clearly suffers from bitrot at the following addresses - 4FC2, 5F02, 6642, D6C2, D742 - in all cases bit 0x20 is incorrectly set in the bad rom - */ - -// ROM_LOAD16_BYTE( "wb03.bin", 0x00000, 0x10000, CRC(df56e168) SHA1(20dbabdd97e6f3d4bf6500bf9e8476942cb48ae3) ) -// ROM_LOAD16_BYTE( "wb01.bin", 0x00001, 0x10000, CRC(05722f17) SHA1(9356e2488ea35e0a2978689f2ca6dfa0d57fd2ed) ) - - ROM_LOAD16_BYTE( "wb04.bin", 0x20000, 0x10000, CRC(53be758d) SHA1(56cf85ba23fe699031d73e8f367a1b8ac837d5f8) ) - ROM_LOAD16_BYTE( "wb02.bin", 0x20001, 0x10000, CRC(fc8e292e) SHA1(857cfeb0be121e64e6117120514ae1f2ffeae4d6) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "wb05.bin", 0x0000, 0x10000, CRC(53fe59df) SHA1(a99053e82b9fed76f744fa9f67078294641c6317) ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD16_BYTE( "wb13.bin", 0x00000, 0x10000, CRC(426921de) SHA1(5107c58e7e08d71895baa67fe260b17ebd61389c) ) - ROM_LOAD16_BYTE( "wb06.bin", 0x00001, 0x10000, CRC(68204937) SHA1(fd2ef93df5fd8aa2d36072858dbcfce41157ef3e) ) - ROM_LOAD16_BYTE( "wb12.bin", 0x20000, 0x10000, CRC(ef4e04c7) SHA1(17158b61b3c158e0491db9abb2e1a8c20d981d37) ) - ROM_LOAD16_BYTE( "wb07.bin", 0x20001, 0x10000, CRC(53f40978) SHA1(058bbf3b7877f0cd320383e0386c5959e0d6589b) ) - ROM_LOAD16_BYTE( "wb11.bin", 0x40000, 0x10000, CRC(41cb4563) SHA1(94f1d12d299ac08fc8522139e1927f0cf739be75) ) - ROM_LOAD16_BYTE( "wb08.bin", 0x40001, 0x10000, CRC(9497b88c) SHA1(367c6106276f3816528341f11f3a97ae458d25cd) ) - ROM_LOAD16_BYTE( "wb10.bin", 0x60000, 0x10000, CRC(5fa22b1e) SHA1(1164003d873e9738a3ca133cce689c7120061e3c) ) - ROM_LOAD16_BYTE( "wb09.bin", 0x60001, 0x10000, CRC(9be718ca) SHA1(5c195e4f13efbdb229201d2408d018861bf389cc) ) -ROM_END - - -ROM_START( snowbroswb ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "toa3.bin", 0x00000, 0x10000, CRC(55d302da) SHA1(235f1cd5adeb783f42bd7261e6f575826235c5b2) ) - ROM_LOAD16_BYTE( "toa1.bin", 0x00001, 0x10000, CRC(3c64e145) SHA1(46c3ba17aac516fc203d2d82ed5452b8212f5edb) ) - ROM_LOAD16_BYTE( "wb04.bin", 0x20000, 0x10000, CRC(53be758d) SHA1(56cf85ba23fe699031d73e8f367a1b8ac837d5f8) ) - ROM_LOAD16_BYTE( "wb02.bin", 0x20001, 0x10000, CRC(fc8e292e) SHA1(857cfeb0be121e64e6117120514ae1f2ffeae4d6) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "wb05.bin", 0x0000, 0x10000, CRC(53fe59df) SHA1(a99053e82b9fed76f744fa9f67078294641c6317) ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD16_BYTE( "wb13.bin", 0x00000, 0x10000, CRC(426921de) SHA1(5107c58e7e08d71895baa67fe260b17ebd61389c) ) - ROM_LOAD16_BYTE( "wb06.bin", 0x00001, 0x10000, CRC(68204937) SHA1(fd2ef93df5fd8aa2d36072858dbcfce41157ef3e) ) - ROM_LOAD16_BYTE( "wb12.bin", 0x20000, 0x10000, CRC(ef4e04c7) SHA1(17158b61b3c158e0491db9abb2e1a8c20d981d37) ) - ROM_LOAD16_BYTE( "wb07.bin", 0x20001, 0x10000, CRC(53f40978) SHA1(058bbf3b7877f0cd320383e0386c5959e0d6589b) ) - ROM_LOAD16_BYTE( "wb11.bin", 0x40000, 0x10000, CRC(41cb4563) SHA1(94f1d12d299ac08fc8522139e1927f0cf739be75) ) - ROM_LOAD16_BYTE( "wb08.bin", 0x40001, 0x10000, CRC(9497b88c) SHA1(367c6106276f3816528341f11f3a97ae458d25cd) ) - ROM_LOAD16_BYTE( "wb10.bin", 0x60000, 0x10000, CRC(5fa22b1e) SHA1(1164003d873e9738a3ca133cce689c7120061e3c) ) - ROM_LOAD16_BYTE( "wb09.bin", 0x60001, 0x10000, CRC(9be718ca) SHA1(5c195e4f13efbdb229201d2408d018861bf389cc) ) -ROM_END - -ROM_START( toto ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "u60.5j", 0x00000, 0x20000, CRC(39203792) SHA1(4c8d560be02a514cbf91774c7a0b4a95cf573356) ) - ROM_LOAD16_BYTE( "u51.4j", 0x00001, 0x20000, CRC(7b846cd4) SHA1(04aa0bbaab4303fb08dff52d5515f7e764f1be6d)) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "u46.4c", 0x0000, 0x8000, CRC(77b1ef42) SHA1(75e3c8c2b687669cc56f972dd7375dab5185859c) ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD( "u107.8k", 0x00000, 0x20000, CRC(4486153b) SHA1(a6dc0c17bf2328ab725bce4aaa0a413a42129fb0) ) - ROM_LOAD( "u108.8l", 0x20000, 0x20000, CRC(3286cf5f) SHA1(133366b0e10ab86111247cbedf329e8e3a7f2148) ) - ROM_LOAD( "u109.8m", 0x40000, 0x20000, CRC(464d7251) SHA1(f03ee54e9301ea87de4171cecdbad4a5e17929c4) ) - ROM_LOAD( "u110.8n", 0x60000, 0x20000, CRC(7dea56df) SHA1(7e7b9238837c6f4221cff416a2de21723d2c9272) ) -ROM_END - -/* Barko */ - -/* - -Honey Doll - Barko Corp 1995 - -Rom Board include a Cypress cy7C382-0JC chip - -Main Board : - -CPU : 1 X MC68000P12 - 1 X Z80B - -1 X Oki M6295 -2 X Cypress CY7C384A-XJC - -2 x quartz - 12Mhz and 16Mhz - -*/ - -ROM_START( honeydol ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "d-16.uh12", 0x00001, 0x20000, CRC(cee1a2e3) SHA1(6d1ff5358ec704616b724eea2ab9b60b84709eb1) ) - ROM_LOAD16_BYTE( "d-17.ui12", 0x00000, 0x20000, CRC(cac44154) SHA1(2c30dc033001fc9303da7e117e3401bc7af16607) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "d-12.uh15", 0x0000, 0x8000, CRC(386f1b63) SHA1(d719875226cd3d380e2ebec49209590d91b6f07b) ) - - ROM_REGION( 0x80000, "gfx1", 0 ) // 4 bpp gfx - ROM_LOAD( "d-13.1", 0x000000, 0x80000, CRC(ff6a57fb) SHA1(2fbf61f4ac2655a60b1fa82bb6d001f0ef8b4654) ) - - ROM_REGION( 0x200000, "gfx2", 0 ) - ROM_LOAD( "d-14.5", 0x000000, 0x80000, CRC(2178996f) SHA1(04368384cb191b28b23199c8175e93271ab79103) ) - ROM_LOAD( "d-15.6", 0x080000, 0x80000, CRC(6629239e) SHA1(5f462c04eb11c2b662236fd65bbf74fa08038eec) ) - ROM_LOAD( "d-18.9", 0x100000, 0x80000, CRC(0210507a) SHA1(5b7348bf253b1ae8bfa86cdee2ff80aa2b3faa79) ) - ROM_LOAD( "d-19.10", 0x180000, 0x80000, CRC(d27375d5) SHA1(2a39ce9b985e00a290c3ea75be3b1edbc00d39ec) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "d-11.u14", 0x00000, 0x40000, CRC(f3ee4861) SHA1(f24f1f855ae6c96a6d84a4b5e5c196df8f922d0a) ) -ROM_END - -/* - -+--------------------------------+ -| Z80A | -|GL324 6116 ua4| -|M6295 uh15 HY6264 ua5| -|J sra HY6264 ua6| -|A srb 84256 | -|M 84256 | -|M 84256 CY7C384A | -|A 84256 | -| SWA1 uh12 | -| 68000 84256 | -| SWA2 ui12 12MHz 16MHz | -+--------------------------------+ - -Produttore: Barko -N.revisione: S16K951102 -CPU -1x 68000 (main) -1x Z8400B (sound) -1x OKI M6295 (sound) -1x GL324 (sound) -1x CY7C384A -1x oscillator 12.000MHz -1x oscillator 16.000MHz - -ROMs - -1x 27256 (uh15) -2x M27C2001 (sra,srb) -1x AM27C010 (12) -1x D27C010 (13) -1x M27C4001 (14) -1x AT27C040 (15) -1x TMS27C040 (16) - -6x HY18CV8S (read protected) - -*/ - -ROM_START( twinadv ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "13.uh12", 0x00001, 0x20000, CRC(9f70a39b) SHA1(d49823be58b00c4c5a4f6cc4e4371531492aff1e) ) - ROM_LOAD16_BYTE( "12.ui12", 0x00000, 0x20000, CRC(d8776495) SHA1(15b93ded80bf9f240faef2d89b6076f33f1f4ece) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "uh15.bin", 0x0000, 0x8000, CRC(3d5acd08) SHA1(c19f686862dfc12d2fa91c2dd3d3b75d9cb410c3) ) - - ROM_REGION( 0x180000, "gfx1", 0 ) /* 4bpp gfx */ - ROM_LOAD( "16.ua4", 0x000000, 0x80000, CRC(f491e171) SHA1(f31b945b0c4b30d1b3dc6c5928b77aad4e956bc7) ) - ROM_LOAD( "15.ua5", 0x080000, 0x80000, CRC(79a08b8d) SHA1(034c0a3b9e27ac174092d265b32fb82d6ee45d47) ) - ROM_LOAD( "14.ua6", 0x100000, 0x80000, CRC(79faee0b) SHA1(7421a5fa038d01658ba5ac1f65ea87b97ac25c36) ) - - ROM_REGION( 0x080000, "oki", 0 ) /* Samples - both banks are almost the same */ - /* todo, check bank ordering .. */ - ROM_LOAD( "sra.bin", 0x00000, 0x40000, CRC(82f452c4) SHA1(95ad6ede87ceafb045ed7df40496baf96190b97f) ) // bank 1 - ROM_LOAD( "srb.bin", 0x40000, 0x40000, CRC(109e51e6) SHA1(3344c68d63bbad4a02b47143b2d2f72ce9bcb4bb) ) // bank 2 -ROM_END - -ROM_START( twinadvk ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "uh12", 0x00001, 0x20000, CRC(e0bcc738) SHA1(7fc6a793fcdd80122c0ac6409ae4cac5597b7b5a) ) - ROM_LOAD16_BYTE( "ui12", 0x00000, 0x20000, CRC(a3ee6451) SHA1(9c0b415a2f325513739f2047780c2a56df350aa5) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "uh15.bin", 0x0000, 0x8000, CRC(3d5acd08) SHA1(c19f686862dfc12d2fa91c2dd3d3b75d9cb410c3) ) - - ROM_REGION( 0x180000, "gfx1", 0 ) /* 4bpp gfx */ - ROM_LOAD( "ua4", 0x000000, 0x80000, CRC(a5aff49b) SHA1(ee162281ba643729ee007f9634c21fadd3c1cb48) ) - ROM_LOAD( "ua5", 0x080000, 0x80000, CRC(f83b3b97) SHA1(2e967d49ef411d164a0b6cf32444f60fcd8068a9) ) - ROM_LOAD( "ua6", 0x100000, 0x80000, CRC(4dfcffb9) SHA1(c157e031acbb321b9435389f9fc4e1ffebca106d) ) - - ROM_REGION( 0x080000, "oki", 0 ) /* Samples - both banks are almost the same */ - /* todo, check bank ordering .. */ - ROM_LOAD( "sra.bin", 0x00000, 0x40000, CRC(82f452c4) SHA1(95ad6ede87ceafb045ed7df40496baf96190b97f) ) // bank 1 - ROM_LOAD( "srb.bin", 0x40000, 0x40000, CRC(109e51e6) SHA1(3344c68d63bbad4a02b47143b2d2f72ce9bcb4bb) ) // bank 2 -ROM_END - -ROM_START( multi96 ) - ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "uh12", 0x00001, 0x20000, CRC(e912ea4e) SHA1(cf0b37d6b6fbdd311ef7b404c4ba2c6a7e1f8486) ) // sldh - ROM_LOAD16_BYTE( "ui12", 0x00000, 0x20000, CRC(ac99e837) SHA1(20bc1599f78a4eac65cae54350872fa292daa807) ) // sldh - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* 64k for z80 sound code */ - ROM_LOAD( "uh15.bin", 0x0000, 0x8000, CRC(3d5acd08) SHA1(c19f686862dfc12d2fa91c2dd3d3b75d9cb410c3) ) - - ROM_REGION( 0x180000, "gfx1", 0 ) /* 4bpp gfx */ - ROM_LOAD( "ua4", 0x000000, 0x80000, CRC(66cae586) SHA1(22af524b26241a6456b777a847db73ff8d3db11f) ) // sldh - ROM_LOAD( "ua5", 0x080000, 0x80000, CRC(0bd9f6bb) SHA1(400ddff7a76860caacfe8bfd803f9ccd2dba3356) ) // sldh - ROM_LOAD( "ua6", 0x100000, 0x80000, CRC(0e90b26c) SHA1(fd9b40988d03db8ed797abf859a8828bb65db8d5) ) // sldh - - ROM_REGION( 0x080000, "oki", 0 ) /* Samples - both banks are almost the same */ - /* todo, check bank ordering .. */ - ROM_LOAD( "sra.bin", 0x00000, 0x40000, CRC(82f452c4) SHA1(95ad6ede87ceafb045ed7df40496baf96190b97f) ) // bank 1 - ROM_LOAD( "srb.bin", 0x40000, 0x40000, CRC(109e51e6) SHA1(3344c68d63bbad4a02b47143b2d2f72ce9bcb4bb) ) // bank 2 -ROM_END - -/* SemiCom Games */ - -ROM_START( hyperpac ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "hyperpac.h12", 0x00001, 0x20000, CRC(2cf0531a) SHA1(c4321d728845035507352d0bcf4348d28b92e85e) ) - ROM_LOAD16_BYTE( "hyperpac.i12", 0x00000, 0x20000, CRC(9c7d85b8) SHA1(432d5fbe8bef875ce4a9aeb74a7b57dc79c709fd) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "hyperpac.u1", 0x00000, 0x10000 , CRC(03faf88e) SHA1(a8da883d4b765b809452bbffca37ff224edbe86d) ) - - ROM_REGION( 0x2000, "protection", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "at89c52.bin", 0x0000, 0x2000 , CRC(291f9326) SHA1(e440ce7d92188faa86e02e7f9db4ec6bce21efd3) ) /* decapped */ - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "hyperpac.j15", 0x00000, 0x40000, CRC(fb9f468d) SHA1(52857b1a04c64ac853340ebb8e92d98eabea8bc1) ) - - ROM_REGION( 0x0c0000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "hyperpac.a4", 0x000000, 0x40000, CRC(bd8673da) SHA1(8466355894da4d2c9a54d03a833cc9b4ec0c67eb) ) - ROM_LOAD( "hyperpac.a5", 0x040000, 0x40000, CRC(5d90cd82) SHA1(56be68478a81bb4e1011990da83334929a0ac886) ) - ROM_LOAD( "hyperpac.a6", 0x080000, 0x40000, CRC(61d86e63) SHA1(974c634607993924fa098eff106b1b288bec1e26) ) -ROM_END - -ROM_START( hyperpacb ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "hpacuh12.bin", 0x00001, 0x20000, CRC(633ab2c6) SHA1(534435fa602adebf651e1d42f7c96b01eb6634ef) ) - ROM_LOAD16_BYTE( "hpacui12.bin", 0x00000, 0x20000, CRC(23dc00d1) SHA1(8d4d00f450b94912adcbb24073f9b3b01eab0450) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "hyperpac.u1", 0x00000, 0x10000 , CRC(03faf88e) SHA1(a8da883d4b765b809452bbffca37ff224edbe86d) ) // was missing from this set, using the one from the original - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "hyperpac.j15", 0x00000, 0x40000, CRC(fb9f468d) SHA1(52857b1a04c64ac853340ebb8e92d98eabea8bc1) ) - - ROM_REGION( 0x0c0000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "hyperpac.a4", 0x000000, 0x40000, CRC(bd8673da) SHA1(8466355894da4d2c9a54d03a833cc9b4ec0c67eb) ) - ROM_LOAD( "hyperpac.a5", 0x040000, 0x40000, CRC(5d90cd82) SHA1(56be68478a81bb4e1011990da83334929a0ac886) ) - ROM_LOAD( "hyperpac.a6", 0x080000, 0x40000, CRC(61d86e63) SHA1(974c634607993924fa098eff106b1b288bec1e26) ) -ROM_END - -ROM_START( twinkle ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "uh12.bin", 0x00001, 0x20000, CRC(a99626fe) SHA1(489098a2ceb36df97b6b1d59b7b696300deee3ab) ) - ROM_LOAD16_BYTE( "ui12.bin", 0x00000, 0x20000, CRC(5af73684) SHA1(9be43e5c71152d515366e422eb077a41dbb3fe62) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "u1.bin", 0x00000, 0x10000 , CRC(e40481da) SHA1(1c1fabcb67693235eaa6ff59ae12a35854b5564a) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - - ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there */ - ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200, CRC(00d3e4b4) SHA1(afa359a8b48605ff034133bad2a0a182429dec71) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "uj15.bin", 0x00000, 0x40000, CRC(0a534b37) SHA1(b7d780eb4668f1f757a60884c022f5bbc424dc97) ) - - ROM_REGION( 0x080000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "ua4.bin", 0x000000, 0x80000, CRC(6b64bb09) SHA1(547eac1ad931a6b937dff0b922d06af92cc7ab73) ) -ROM_END - -ROM_START( twinklea ) - ROM_REGION( 0x100000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "uh12.bin", 0x00001, 0x20000, CRC(6cc6e53c) SHA1(26584d2b99878230a33c1c2c8d71e758b0c09cac) ) // sldh - ROM_LOAD16_BYTE( "ui12.bin", 0x00000, 0x20000, CRC(79420382) SHA1(13183d819f5b7699e8e0974c193796151a0a9617) ) // sldh - - ROM_REGION( 0x10000, "soundcpu", 0 ) - ROM_LOAD( "u1.bin", 0x00000, 0x10000 , CRC(e40481da) SHA1(1c1fabcb67693235eaa6ff59ae12a35854b5564a) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) // Intel 87C52 MCU Code - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) // needs decapping - - ROM_REGION16_BE( 0x200, "user1", 0 ) // Data from Shared RAM - // this is not a real rom but instead the data extracted from shared ram, the MCU puts it there - ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200, BAD_DUMP CRC(00d3e4b4) SHA1(afa359a8b48605ff034133bad2a0a182429dec71) ) // this has been extracted for the parent set, seems to work for this set, too - - ROM_REGION( 0x040000, "oki", 0 ) - ROM_LOAD( "uj15.bin", 0x00000, 0x40000, CRC(0a534b37) SHA1(b7d780eb4668f1f757a60884c022f5bbc424dc97) ) - - ROM_REGION( 0x080000, "gfx1", 0 ) // Sprites - ROM_LOAD( "ua4.bin", 0x000000, 0x80000, CRC(6b64bb09) SHA1(547eac1ad931a6b937dff0b922d06af92cc7ab73) ) -ROM_END - -ROM_START( pzlbreak ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "4.uh12", 0x00001, 0x20000, CRC(b3f04f80) SHA1(79b5414727004719ff172e084a672b21e955f0bc) ) - ROM_LOAD16_BYTE( "5.ui12", 0x00000, 0x20000, CRC(13c298a0) SHA1(9455de7ea45c9a61ed6105023eb909c086c44007) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "0.u1", 0x00000, 0x10000 , CRC(1ad646b7) SHA1(0132baa097e48df2450afdcd316375dc546ea4d0) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - - ROM_REGION16_BE( 0x200, "user1", ROMREGION_ERASEFF ) /* Data from Shared RAM */ - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there */ - ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200, CRC(092cb794) SHA1(eb2b336d97b440453ca37ee7605654b35dfb6bad) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "1.uj15", 0x00000, 0x40000, CRC(dbfae77c) SHA1(cc509d52cd9c608fc80df799890e62e7b4c143c6) ) - - ROM_REGION( 0x100000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "2.ua4", 0x000000, 0x80000, CRC(d211705a) SHA1(b3a7f8198dc8c034b17b843b2ab0298426de3f55) ) - ROM_LOAD( "3.ua5", 0x080000, 0x80000, CRC(6cdb73e9) SHA1(649e91ee54de2b359a207bed4d950db95515a3d8) ) -ROM_END - -ROM_START( pzlbreaka ) - ROM_REGION( 0x100000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "uh12", 0x00001, 0x20000, CRC(c8a82ca8) SHA1(ee19c253af9c7c8a33435d9d2494c50f16033572) ) - ROM_LOAD16_BYTE( "ui12", 0x00000, 0x20000, CRC(2f66c4ce) SHA1(4349f093ce1267c2ebcbf1233082661604f10851) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) - ROM_LOAD( "u1", 0x00000, 0x10000 , CRC(1ad646b7) SHA1(0132baa097e48df2450afdcd316375dc546ea4d0) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) // Intel 87C52 MCU Code - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) - - ROM_REGION16_BE( 0x200, "user1", ROMREGION_ERASEFF ) // Data from Shared RAM - // this is not a real rom but instead the data extracted from shared ram, the MCU puts it there - ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200, BAD_DUMP CRC(092cb794) SHA1(eb2b336d97b440453ca37ee7605654b35dfb6bad) ) // extracted from the parent set, so marked as bad - - ROM_REGION( 0x040000, "oki", 0 ) - ROM_LOAD( "uj15", 0x00000, 0x20000, CRC(5cdffcc5) SHA1(793a20bd0480cfea0dbf9397797428f6d105f724) ) // 1xxxxxxxxxxxxxxxx = 0xFF and half sized compared to the parent - - ROM_REGION( 0x100000, "gfx1", 0 ) - ROM_LOAD( "ua4", 0x000000, 0x80000, CRC(d211705a) SHA1(b3a7f8198dc8c034b17b843b2ab0298426de3f55) ) - ROM_LOAD( "ua5", 0x080000, 0x80000, CRC(eb3044bc) SHA1(c00e7b112b82c8eeb59c2a96168ea5156347f05e) ) // some differences compared to the parent -ROM_END - - -ROM_START( toppyrap ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "uh12.bin", 0x00001, 0x40000, CRC(6f5ad699) SHA1(42f7201d6274ff8338a7d4627af99001f473e841) ) - ROM_LOAD16_BYTE( "ui12.bin", 0x00000, 0x40000, CRC(caf5a7e1) SHA1(b521b2f06a804a52dad1b07657db2a29e1411844) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "u1.bin", 0x00000, 0x10000 , CRC(07f50947) SHA1(83740655ab5f677bd009191bb0de60e237aaa11c) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - - ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ - /* this contains the code for 2 of the IRQ functions, but the game only uses one of them, the other is - executed from ROM. The version in ROM is slightly patched version so maybe there is an earlier revision - which uses the code provided by the MCU instead */ - ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200, CRC(0704e6c7) SHA1(22387257db569990378c304af9677e6dc1436207) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "uj15.bin", 0x00000, 0x20000, CRC(a3bacfd7) SHA1(d015d8bd26d0189fc13d09fefcb9b8baaaacec8a) ) - - ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "ua4.bin", 0x000000, 0x80000, CRC(a9577bcf) SHA1(9918d982ebee1c88bd203fa2b3ce2468c160fb95) ) - ROM_LOAD( "ua5.bin", 0x080000, 0x80000, CRC(7179d32d) SHA1(dae7126401b5bb7f99689587e05a8bf5033ec06e) ) - ROM_LOAD( "ua6.bin", 0x100000, 0x80000, CRC(4834e5b1) SHA1(cd8a4c329b2bfe1a9c2dea9d72ca09b71366c60a) ) - ROM_LOAD( "ua7.bin", 0x180000, 0x80000, CRC(663dd099) SHA1(84b52af54ac49e8b4bae23995e3cf94494be2bb3) ) -ROM_END - -ROM_START( moremore ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "u52.bin", 0x00001, 0x40000, CRC(cea4b246) SHA1(5febcb5dda6581caccfe9079b28c2366dfc1db2b) ) - ROM_LOAD16_BYTE( "u74.bin", 0x00000, 0x40000, CRC(2acdcb88) SHA1(74d661d07752bbccab7eab151209a414e9bf7675) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "u35.bin", 0x00000, 0x10000 , CRC(92dc95fc) SHA1(f04e63cc680835458246989532faf5657e28db13) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - - ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there */ - ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(782dd2aa) SHA1(2587734271e0c85cb76bcdee171366c4e6fc9f81) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "u14.bin", 0x00000, 0x40000, CRC(90580088) SHA1(c64de2c0db95ab4ce06fc0a29c0cc8b7f3deeb28) ) - - ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "u75.bin", 0x000000, 0x80000, CRC(d671815c) SHA1(a7e8d3bf688ce51b5d9a2b306cc557974328c322) ) - ROM_LOAD( "u76.bin", 0x080000, 0x80000, CRC(e0d479e8) SHA1(454b53949664aca07a86229d3b6c9ce4e9449ea6) ) - ROM_LOAD( "u77.bin", 0x100000, 0x80000, CRC(60a281da) SHA1(3f268f8b1cd8efd3e32d0fcdba5483c93122800e) ) - ROM_LOAD( "u78.bin", 0x180000, 0x80000, CRC(e2723b4e) SHA1(6b4ba1e2e937b3231d76526af3f5a4a67144e4d5) ) -ROM_END - -ROM_START( moremorp ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "mmp_u52.bin", 0x00001, 0x40000, CRC(66baf9b2) SHA1(f1d383a94ef4313cb02c59ace17b9562eddcfb3c) ) - ROM_LOAD16_BYTE( "mmp_u74.bin", 0x00000, 0x40000, CRC(7c6fede5) SHA1(41bc539a6efe9eb2304243701857b972d2170bcf) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "mmp_u35.bin", 0x00000, 0x10000 , CRC(4d098cad) SHA1(a79d417e7525a25dd6697da9f3d1de269e759d2e) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - - ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there */ - ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(782dd2aa) SHA1(2587734271e0c85cb76bcdee171366c4e6fc9f81) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "mmp_u14.bin", 0x00000, 0x40000, CRC(211a2566) SHA1(48138547822a8e76c101dd4189d581f80eee1e24) ) - - ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "mmp_u75.bin", 0x000000, 0x80000, CRC(af9e824e) SHA1(2b68813bf025a34b8958033108e4f8d39fd618cb) ) - ROM_LOAD( "mmp_u76.bin", 0x080000, 0x80000, CRC(c42af064) SHA1(f9d755e7cb52828d8594f7871932daf11443689f) ) - ROM_LOAD( "mmp_u77.bin", 0x100000, 0x80000, CRC(1d7396e1) SHA1(bde7e925051408dd2371b5da8235a6a4cae8cf6a) ) - ROM_LOAD( "mmp_u78.bin", 0x180000, 0x80000, CRC(5508d80b) SHA1(1b9a70a502b237fa11d1d55dce761e2def18873a) ) -ROM_END - -ROM_START( 3in1semi ) /* SemiCom Ser-4331-4 PCB */ - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "u52", 0x00001, 0x40000, CRC(b0e4a0f7) SHA1(e1f8b8ef020a85fcd7817814cf6c5d560e9e608d) ) - ROM_LOAD16_BYTE( "u74", 0x00000, 0x40000, CRC(266862c4) SHA1(2c5c513fee99bdb6e0ae3e0e644e516bdaddd629) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "u35", 0x00000, 0x10000 , CRC(e40481da) SHA1(1c1fabcb67693235eaa6ff59ae12a35854b5564a) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - - ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there */ - ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(85deba7c) SHA1(44c6d9306b4f8e47182f4740a18971c49a8df8db) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "u14", 0x00000, 0x40000, CRC(c83c11be) SHA1(c05d96d61e5b8245232c85cbbcb7cc1e4e066492) ) - - ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "u75", 0x000000, 0x80000, CRC(b66a0db6) SHA1(a4e604eb3c0a5b16b4b0bb99219045bf2146287c) ) - ROM_LOAD( "u76", 0x080000, 0x80000, CRC(5f4b48ea) SHA1(e9dd1100d55b021b060990988c1e5271ce1ae35b) ) - ROM_LOAD( "u77", 0x100000, 0x80000, CRC(d44211e3) SHA1(53af19dec03e76912632450414cdbcbb31cc094c) ) - ROM_LOAD( "u78", 0x180000, 0x80000, CRC(af596afc) SHA1(875d7a51ff5c741cae4483d8da33df9cae8de52a) ) -ROM_END - -ROM_START( 3in1semia ) // SemiCom Ser-4331-4 PCB - ROM_REGION( 0x100000, "maincpu", 0 ) // 68000 Code - ROM_LOAD16_BYTE( "u52.bin", 0x00001, 0x40000, CRC(388334a8) SHA1(93823917682f1658a443d23ceb58eafa530d1854) ) - ROM_LOAD16_BYTE( "u74.bin", 0x00000, 0x40000, CRC(555ae716) SHA1(9a3d7d81d7c6fb8443d263087bb7dca7bc3918b6) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) // Z80 Code - ROM_LOAD( "u35.bin", 0x00000, 0x10000 , CRC(e40481da) SHA1(1c1fabcb67693235eaa6ff59ae12a35854b5564a) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) // Intel 87C52 MCU Code - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) - - ROM_REGION16_BE( 0x200, "user1", 0 ) // Data from Shared RAM - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there */ - ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(85deba7c) SHA1(44c6d9306b4f8e47182f4740a18971c49a8df8db) ) - - ROM_REGION( 0x040000, "oki", 0 ) // Samples - ROM_LOAD( "u14.bin", 0x00000, 0x40000, CRC(c83c11be) SHA1(c05d96d61e5b8245232c85cbbcb7cc1e4e066492) ) - - ROM_REGION( 0x200000, "gfx1", 0 ) // Sprites - ROM_LOAD( "u75.bin", 0x000000, 0x80000, CRC(9d705249) SHA1(99e0adca1f3f285692bf15c988b25d87f6b1dd90) ) - ROM_LOAD( "u76.bin", 0x080000, 0x80000, CRC(b65f5d79) SHA1(a9f19cf54f5ecdeca58f853f3053a686b89fea63) ) - ROM_LOAD( "u77.bin", 0x100000, 0x80000, CRC(b9728be9) SHA1(4ea7940f9d1d7c01cfcab92184b6513e4b0a83d7) ) - ROM_LOAD( "u78.bin", 0x180000, 0x20000, CRC(aefad49e) SHA1(246ea713eaaa6a01290eded36377437cb7e79fa8) ) // MX26C1000APC -ROM_END - -/* - -Ma Cheon Ru -SemiCom (c) 1999 - -PCB: Ser-4331-4 - - CPU: 68000, Z80 -Sound: OKIM6295, YM2151+YM3012 (rebadged as KA51+BS902) -Video: QuickLogic QL2003-XPL84C - OSC: 16MHz, 12MHz - -Measurements: - 68000 12MHz - Z80 4MHz (16MHz/4) - YM2151 4MHz (16MHz/4) -OKI 6295 1MHz (16MHz/16, pin 7 High) -*/ - -ROM_START( mcheonru ) /* SemiCom Ser-4331-4 PCB */ - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "u52", 0x00001, 0x40000, CRC(63fd8a9b) SHA1(53054d8072322842c32625ab38e7d62dc0e75627) ) - ROM_LOAD16_BYTE( "u74", 0x00000, 0x40000, CRC(3edb17ce) SHA1(0c6ea239f57eca114d75c173b77b2c8ef43d63a2) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "u35", 0x00000, 0x10000 , CRC(79e965b4) SHA1(268df67ec6ea828ae01a6e4d2da9ad2a08a837f1) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - - ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there */ - ROM_LOAD( "protdata.bin", 0x00000, 0x200 , CRC(d61f4f07) SHA1(29485bce6e3a7ed2ace540bb81fe028456ae1ae9) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "u14", 0x00000, 0x40000, CRC(28a62d23) SHA1(24dbe6229647032599e02225de57650205dce5c3) ) - - ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "u75", 0x000000, 0x80000, CRC(0142c085) SHA1(9d948a63e4edcdb7f5cef0d2d7f118e6cbf4779e) ) - ROM_LOAD( "u76", 0x080000, 0x80000, CRC(27fda507) SHA1(87820348470979da730956066d3c820faedbec13) ) - ROM_LOAD( "u77", 0x100000, 0x80000, CRC(4dfe0550) SHA1(9a227114765ea5327b64061e4b4e4d4f19bd3293) ) - ROM_LOAD( "u78", 0x180000, 0x80000, CRC(f1b74978) SHA1(d1ac1bc212050d4f1a861045ab612115c73d3fd0) ) -ROM_END - -/* - -Cookie & Bibi 2 -SemiCom (c) 1996 - - CPU: MC68000P10, Z8400B Z80 -Sound: OKIM6295, YM2151+YM3012 (rebadged as AD-65, KA51+K-662) -Video: Lattice pLSI 1032-60LJ (square 84 pin socketed) - OSC: 16MHz, 12MHz -*/ - -ROM_START( cookbib2 ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "unico_02.uh12", 0x00001, 0x40000, CRC(b2909460) SHA1(2438638af870cfc105631d2b5e5a27a64ab5394d) ) // 27C020 - ROM_LOAD16_BYTE( "unico_01.ui12", 0x00000, 0x40000, CRC(65aafde2) SHA1(01f9f261527c35182f0445d641d987aa86ad750f) ) // 27C020 - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "unico_07.u1", 0x00000, 0x10000 , CRC(f59f1c9a) SHA1(2830261fd55249e015514fcb4cf8392e83b7fd0d) ) // 27C512 - - ROM_REGION( 0x2000, "protection", 0 ) /* P87C52EBPN (XSC6407A) Code (8052) */ - ROM_LOAD( "p87c52ebpn.bin", 0x0000, 0x2000 , CRC(ef042cef) SHA1(3089d5a3cb5ed663a8d89d59e427a06cffcd6219) ) /* dumped via laser glitching */ - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "unico_06.uj15", 0x00000, 0x20000, CRC(5e6f76b8) SHA1(725800143dfeaa6093ed5fcc5b9f15678ae9e547) ) // 27C010 - - ROM_REGION( 0x140000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "unico_05.ua4", 0x000000, 0x80000, CRC(89fb38ce) SHA1(1b39dd9c2743916b8d8af590bd92fe4819c2454b) ) // 27C040 - ROM_LOAD( "unico_04.ua5", 0x080000, 0x80000, CRC(f240111f) SHA1(b2c3b6e3d916fc68e1fd258b1279b6c39e1f0108) ) // 27C040 - ROM_LOAD( "unico_03.ua6", 0x100000, 0x40000, CRC(e1604821) SHA1(bede6bdd8331128b9f2b229d718133470bf407c9) ) // 27C020 - /* UA7 is unpopulated */ -ROM_END - -ROM_START( cookbib2a ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "unico.uh12", 0x00001, 0x40000, CRC(19421631) SHA1(00dfc474cee7d21d4b6bdbae2eabcdfde3584307) ) // non descriptive UNICO label with no numbers - ROM_LOAD16_BYTE( "unico.ui12", 0x00000, 0x40000, CRC(0d09ecf5) SHA1(16f787638041d38ee2567ca958ca4405324cf5fa) ) // both program ROMs are 27C020 - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "unico_07.u1", 0x00000, 0x10000 , CRC(f59f1c9a) SHA1(2830261fd55249e015514fcb4cf8392e83b7fd0d) ) // 27C512 - - ROM_REGION( 0x2000, "protection", 0 ) /* P87C52EBPN (XSC6407A) Code (8052) */ - ROM_LOAD( "p87c52ebpn.bin", 0x0000, 0x2000 , CRC(ef042cef) SHA1(3089d5a3cb5ed663a8d89d59e427a06cffcd6219) ) /* dumped via laser glitching */ - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "unico_06.uj15", 0x00000, 0x20000, CRC(5e6f76b8) SHA1(725800143dfeaa6093ed5fcc5b9f15678ae9e547) ) // 27C010 - - ROM_REGION( 0x140000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "unico_05.ua4", 0x000000, 0x80000, CRC(89fb38ce) SHA1(1b39dd9c2743916b8d8af590bd92fe4819c2454b) ) // 27C040 - ROM_LOAD( "unico_04.ua5", 0x080000, 0x80000, CRC(f240111f) SHA1(b2c3b6e3d916fc68e1fd258b1279b6c39e1f0108) ) // 27C040 - ROM_LOAD( "unico_03.ua6", 0x100000, 0x40000, CRC(e1604821) SHA1(bede6bdd8331128b9f2b229d718133470bf407c9) ) // 27C020 - /* UA7 is unpopulated */ -ROM_END - -ROM_START( cookbib2b ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "uh12.020", 0x00001, 0x40000, CRC(a44ec1f8) SHA1(0c741bf38f5cf667586cd1925417b6e17dbb8916) ) - ROM_LOAD16_BYTE( "ui12.020", 0x00000, 0x40000, CRC(bdbcd0d1) SHA1(9a6a85a492c21f6dd5daef964071a8a1c62f73c8) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "u1.512", 0x00000, 0x10000 , CRC(f59f1c9a) SHA1(2830261fd55249e015514fcb4cf8392e83b7fd0d) ) - - ROM_REGION( 0x2000, "protection", 0 ) /* P87C52EBPN (XSC6407A) Code (8052) */ - ROM_LOAD( "87c52.mcu", 0x0000, 0x2000 , NO_DUMP ) /* not dumped yet */ - - ROM_REGION( 0x200, "user1", 0 ) /* Data from Shared RAM */ - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there - - this one is hacked from the cookbib2 one, absolute code jump needed to be changed at least */ - ROM_LOAD16_WORD_SWAP( "protdata_alt.bin", 0x000, 0x200, BAD_DUMP CRC(bc136ead) SHA1(96459c2ccf7f95880421ba082c2414fa1040f3ed) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "uj15.010", 0x00000, 0x20000, CRC(5e6f76b8) SHA1(725800143dfeaa6093ed5fcc5b9f15678ae9e547) ) - - ROM_REGION( 0x180000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "ua4.040", 0x000000, 0x80000, CRC(f458d52e) SHA1(f6a145aaa57c64557479e63bb95732a98a7b8b85) ) - ROM_LOAD( "ua6.040", 0x080000, 0x80000, CRC(249e89b4) SHA1(2100eea2c3cee84a046ba7ff6cec1027966b895c) ) - ROM_LOAD( "ua8.040", 0x100000, 0x80000, CRC(caa25138) SHA1(784111255777f5774abf4d34c0a95b5e23a14c9f) ) -ROM_END - -// PCB is marked: "YFTE3" and "951121" on component side -// EPROMs are labelled: "UNICO" -ROM_START( cookbib2c ) // no ROM matches any of the other sets - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "unico.uh12", 0x00001, 0x40000, CRC(be021efa) SHA1(87e169e4987f4c31bcda147d0bf5f7fdbaa52f38) ) - ROM_LOAD16_BYTE( "unico.ui12", 0x00000, 0x40000, CRC(ed49a0e5) SHA1(fbb6c45559d82ec84253aac5e4e6ff0a8c4d04e0) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "unico.u1", 0x00000, 0x10000 , CRC(f1100b20) SHA1(92c78e028e9020743b68744a759a11638cf2c971) ) - - ROM_REGION( 0x2000, "protection", 0 ) /* P87C52EBPN (XSC6407A) Code (8052) */ - ROM_LOAD( "87c52.mcu", 0x0000, 0x2000 , NO_DUMP ) /* not dumped yet */ - - ROM_REGION( 0x200, "user1", 0 ) /* Data from Shared RAM */ - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there - - this one is hacked from the old cookbib2 one, absolute code jump needed to be changed at least */ - ROM_LOAD16_WORD_SWAP( "protdata.bin", 0x000, 0x200, BAD_DUMP CRC(b956f056) SHA1(aa9a73e8546b027ae8ef30b03524d302d07cae92) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "unico.uj15", 0x00000, 0x20000, CRC(ae5cc9e5) SHA1(f001c00fea76795ad2d7f4f0e436abecbc7ff00d) ) - - ROM_REGION( 0x140000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "unico.ua4", 0x000000, 0x80000, CRC(3de7a813) SHA1(fdf7e0a092a2056bd7e6443e035c86dde94a2300) ) - ROM_LOAD( "unico.ua5", 0x080000, 0x80000, CRC(6d543788) SHA1(efcd4f45e2bcdffcdd650c6e3bd543e877ce205a) ) - ROM_LOAD( "unico.ua6", 0x100000, 0x40000, CRC(13cc9bf4) SHA1(dec3561d953699ced17231b76980663fdcd6e155) ) -ROM_END - -ROM_START( cookbib3 ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "u52.bin", 0x00001, 0x40000, CRC(65134893) SHA1(b1f26794d1a85893aedf55adb2195ad244f90132) ) - ROM_LOAD16_BYTE( "u74.bin", 0x00000, 0x40000, CRC(c4ab8435) SHA1(7f97d3deafb3eb5412a44308ef20d3317405e94c) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "u35.bin", 0x0c000, 0x4000 , CRC(5dfd2a98) SHA1(193c0cd9272144c25cbc3660967424d34d0da185) ) /* bit strange but verified, not the first time SemiCom have done this, see bcstory.. */ - ROM_CONTINUE(0x8000,0x4000) - ROM_CONTINUE(0x4000,0x4000) - ROM_CONTINUE(0x0000,0x4000) - - ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - - ROM_REGION16_BE( 0x200, "user1", 0 ) /* Data from Shared RAM */ - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there */ - ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(c819b9a8) SHA1(1d425e8c9940c0e691149e5406dd71808bd73832) ) - /* the 'empty' pattern continued after 0x200 but the game doesn't use it or attempt to decrypt it */ - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "u14.bin", 0x00000, 0x20000, CRC(e5bf9288) SHA1(12fb9542f9105fe1a21a74a08cda4d6372b984ee) ) - - ROM_REGION( 0x180000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "u75.bin", 0x000000, 0x80000, CRC(cbe4d9c8) SHA1(81b043bd2b45ab2a8c9df0ba599c6220ed0c9fbf) ) - ROM_LOAD( "u76.bin", 0x080000, 0x80000, CRC(1be17b57) SHA1(57b58cc094d6b47ed6136266f1d34b8bad3f421f) ) - ROM_LOAD( "u77.bin", 0x100000, 0x80000, CRC(7823600d) SHA1(90d431f324b71758c49f3a72ee07701ceb76403f) ) -ROM_END - -ROM_START( 4in1boot ) /* snow bros, tetris, hyperman 1, pacman 2 */ - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "u52", 0x00001, 0x80000, CRC(71815878) SHA1(e3868f5687c1d8ec817671c50ade6c56ee83bfa1) ) - ROM_LOAD16_BYTE( "u74", 0x00000, 0x80000, CRC(e22d3fa2) SHA1(020ab92d8cbf37a9f8186a81934abb97088c16f9) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "u35", 0x00000, 0x10000 , CRC(c894ac80) SHA1(ee896675b5205ab2dbd0cbb13db16aa145391d06) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "u14", 0x00000, 0x40000, CRC(94b09b0e) SHA1(414de3e36eff85126038e8ff74145b35076e0a43) ) - - ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "u78", 0x000000, 0x200000, CRC(6c1fbc9c) SHA1(067f32cae89fd4d57b90be659d2d648e557c11df) ) -ROM_END - -ROM_START( snowbro3 ) - ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "ur4", 0x00000, 0x20000, CRC(19c13ffd) SHA1(4f9db70354bd410b7bcafa96be4591de8dc33d90) ) - ROM_LOAD16_BYTE( "ur3", 0x00001, 0x20000, CRC(3f32fa15) SHA1(1402c173c1df142ff9dd7b859689c075813a50e5) ) - - /* the sound is driven by an MCU */ - ROM_REGION( 0x10000, "cpu2", 0 ) - ROM_LOAD( "sound.mcu", 0x00000, 0x10000 , NO_DUMP ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD( "ua5", 0x000000, 0x80000, CRC(0604e385) SHA1(96acbc65a8db89a7be100f852dc07ba9a0313167) ) /* 16x16 tiles */ - - ROM_REGION( 0x400000, "gfx2", 0 ) /* 16x16 BG Tiles */ - ROM_LOAD( "un7", 0x000000, 0x200000, CRC(4a79da4c) SHA1(59207d116d39b9ee25c51affe520f5fdff34e536) ) - ROM_LOAD( "un8", 0x200000, 0x200000, CRC(7a4561a4) SHA1(1dd823369c09368d1f0ec8e1cb85d700f10ff448) ) - - ROM_REGION( 0x100000, "oki", 0 ) /* OKIM6295 samples */ - ROM_LOAD( "us5", 0x00000, 0x20000, CRC(7c6368ef) SHA1(53393c570c605f7582b61c630980041e2ed32e2d) ) - ROM_CONTINUE(0x80000,0x60000) -ROM_END - -ROM_START( ballboy ) - ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "27c010.ur4", 0x00000, 0x20000, CRC(5fb51b99) SHA1(07e12a3bb51fbb3f192b81497460231c7b609290) ) - ROM_LOAD16_BYTE( "27c010.ur3", 0x00001, 0x20000, CRC(a9c1fdda) SHA1(efb7eaab993f99d89d3b9c159c3b8eb18ace9c2c) ) - - /* the sound is driven by an MCU */ - ROM_REGION( 0x10000, "cpu2", 0 ) - ROM_LOAD( "sound.mcu", 0x00000, 0x10000 , NO_DUMP ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD( "27c040.ua5", 0x000000, 0x80000, CRC(0604e385) SHA1(96acbc65a8db89a7be100f852dc07ba9a0313167) ) /* 16x16 tiles */ - - ROM_REGION( 0x400000, "gfx2", 0 ) /* 16x16 BG Tiles */ - ROM_LOAD( "27c160.un7", 0x000000, 0x200000, CRC(4a79da4c) SHA1(59207d116d39b9ee25c51affe520f5fdff34e536) ) - ROM_LOAD( "27c160.un8", 0x200000, 0x200000, CRC(bfef8c44) SHA1(86930cfcaedbd111d5b985e87a76d2211d2ce2ec) ) - - ROM_REGION( 0x100000, "oki", 0 ) /* OKIM6295 samples */ - ROM_LOAD( "27c040.us5", 0x00000, 0x20000, CRC(7c6368ef) SHA1(53393c570c605f7582b61c630980041e2ed32e2d) ) - ROM_CONTINUE(0x80000,0x60000) -ROM_END - - -ROM_START( ballboy3p ) //PCB etched JOYCUS1B and 2001927 - ROM_REGION( 0x40000, "maincpu", 0 ) // 68000 code - ROM_LOAD16_BYTE( "ur4", 0x00000, 0x20000, CRC(32153d8f) SHA1(1fa698b93507fb775dfff6da8701ab65c986cac5) ) - ROM_LOAD16_BYTE( "ur3", 0x00001, 0x20000, CRC(4d462a75) SHA1(30a84a618bea5c64201329d02847382c2d0c84ba) ) - - // the sound is driven by an MCU - ROM_REGION( 0x10000, "cpu2", 0 ) - ROM_LOAD( "sound.mcu", 0x00000, 0x10000 , NO_DUMP ) - - ROM_REGION( 0x80000, "gfx1", 0 ) - ROM_LOAD( "ua5", 0x000000, 0x80000, CRC(fc72011f) SHA1(f1f10b34fd3365c6542299bd0224dad926d650b4) ) // 16x16 tiles - - ROM_REGION( 0x400000, "gfx2", 0 ) // 16x16 BG Tiles - ROM_LOAD( "un7", 0x000000, 0x400000, CRC(fe427e9d) SHA1(6932ad18b6807af860f8430e2a00e959d6c36a23) ) - - ROM_REGION( 0x100000, "oki", 0 ) // OKIM6295 samples - ROM_LOAD( "us5", 0x00000, 0x20000, CRC(7c6368ef) SHA1(53393c570c605f7582b61c630980041e2ed32e2d) ) // only ROM identical to the 2 player version - ROM_CONTINUE(0x80000,0x60000) -ROM_END - - -/* - -Information from Korean arcade gaming magazine - -name : Final Tetris -author : Jeil computer system -year : 1993.08.24 - -*/ - -ROM_START( finalttr ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "10.7o", 0x00000, 0x20000, CRC(eecc83e5) SHA1(48088a2fae8852a73a325a9659c24b241515eac3) ) - ROM_LOAD16_BYTE( "9.5o", 0x00001, 0x20000, CRC(58d3640e) SHA1(361bc64174a6c7b15a13e0d1f048c7ea270182ca) ) - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "12.5r", 0x00000, 0x10000, CRC(4bc21361) SHA1(dab9bea665c0f2fd7cee8ab7f3762e427911bcca) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - - ROM_REGION( 0x200, "user1", 0 ) /* Data from Shared RAM */ - /* this is not a real rom but instead the data extracted from - shared ram, the MCU puts it there */ - ROM_LOAD16_WORD_SWAP( "protdata.bin", 0x00000, 0x200 , CRC(d5bbb006) SHA1(2f9ce6c4f4f5a304a807134da9c85c68a7b49200) ) - /* after 0xc7 the data read seems meaningless garbage, it doesn't appear to - stop at 0x102200, might be worth going back and checking if its simply random - values due to ram not being cleared, or actual data */ - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "11.7p", 0x00000, 0x20000, CRC(2e331022) SHA1(1e74c66d16eb9c8ae04acecbb4040dea037492cc) ) - - ROM_REGION( 0x100000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "5.1d", 0x00000, 0x40000, CRC(64a450f3) SHA1(d0560f68fe1527fda7852269ec39237ace66ab32) ) - ROM_LOAD( "6.1f", 0x40000, 0x40000, CRC(7281a3cc) SHA1(3f2ed7893bd7c5ff25ecb6eabce78ab66fe532a7) ) - ROM_LOAD( "7.1g", 0x80000, 0x40000, CRC(ec80f442) SHA1(870e44d28490a324f74af554604b9daa8422b86f) ) - ROM_LOAD( "9.1h", 0xc0000, 0x40000, CRC(2ebd316d) SHA1(2f1249ebd2a0bb0cc15259f7187201576a365fa6) ) -ROM_END - - - -ROM_START( suhosong ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ - ROM_LOAD16_BYTE( "su_ho_sung.uh12", 0x00001, 0x20000, CRC(6bd8bd08) SHA1(668398c9c77cc4cc52858daefd3cb13fbaf29a37) ) - ROM_LOAD16_BYTE( "su_ho_sung.ui12", 0x00000, 0x20000, CRC(79a4806e) SHA1(a4080ea70fa588ada384ffa9877f5cf965fb68df) ) - - - ROM_REGION( 0x10000, "soundcpu", 0 ) /* Z80 Code */ - ROM_LOAD( "su_ho_sung.u1", 0x00000, 0x10000 , CRC(509ce74e) SHA1(a93add5ab674671078b55128281dcf9b0db46617) ) - - ROM_REGION( 0x10000, "cpu2", 0 ) /* Intel 87C52 MCU Code */ - ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - - ROM_REGION16_BE( 0x200, "user1", ROMREGION_ERASE00 ) /* Data from Shared RAM */ - ROM_LOAD16_WORD( "protdata.bin", 0x000, 0x200 , CRC(4478e251) SHA1(08489d6bfe5503c8eb62909e56a07193a922b4c1) ) - - ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ - ROM_LOAD( "su_ho_sung.uj15", 0x00000, 0x40000, CRC(266fcae8) SHA1(0f15f880bde0c12b5c663ed387f9353c13b731b6) ) - - ROM_REGION( 0x180000, "gfx1", 0 ) /* Sprites */ - ROM_LOAD( "su_ho_sung.ua4", 0x000000, 0x80000, CRC(bc83a944) SHA1(fbd46648107c66f328b0a61c74b6b82c718e6f4b) ) - ROM_LOAD( "su_ho_sung.ua5", 0x080000, 0x80000, CRC(a1907ea4) SHA1(e21c29d12e50cce1434dbaff0929c207bfd33344) ) - ROM_LOAD( "su_ho_sung.ua6", 0x100000, 0x80000, CRC(92fea02c) SHA1(946c7bf55354875a1581ce484cb185b640f74166) ) -ROM_END - - -ROM_START( yutnori ) - ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "sys_d0-d7", 0x000001, 0x20000, CRC(d5c853da) SHA1(578f29c3a307f82fcaa23a7fe2931c0a673e777e) ) - ROM_LOAD16_BYTE( "sys_d8-d15", 0x000000, 0x20000, CRC(bf108119) SHA1(e64f64ddb577d6750cbc3a6c9d8d2ec4482cafe0) ) - - ROM_REGION( 0x4010, "mcu", 0 ) /* PIC code */ - ROM_LOAD( "pic16c64a-04-p", 0x000000, 0x4010, BAD_DUMP CRC(46fd3671) SHA1(54cf7a38f7743cdad73a2741183b2720ee42e6c8) ) // dump seems to be 99% empty, protected, only configuration bytes dumped? - - ROM_REGION( 0x120000, "gfx1", ROMREGION_ERASE00 ) - ROM_LOAD( "graphics_rom_1", 0x000000, 0x80000, CRC(d4881b49) SHA1(e169b7eca48a0bd66ad55fe21197a4bb491198bb) ) - ROM_LOAD( "graphics_rom_2", 0x080000, 0x80000, CRC(8cd9ce60) SHA1(d1db929ca6128ec2ebe983e6161f200ba421bd31) ) - ROM_LOAD( "graphics_rom_3", 0x100000, 0x20000, CRC(04f7c2ac) SHA1(927fa0f76ff1801845776d47aa5311f485b0b809) ) - - ROM_REGION(0x80000, "oki1", 0 ) // 2 banks, 1 large sample in each (music) - ROM_LOAD("sound rom", 0x000000, 0x080000, CRC(d24c2e43) SHA1(5c7a130048463558d695857ffc056a95a8072219) ) - - ROM_REGION(0x40000, "oki2", 0 ) - ROM_LOAD("voice_rom", 0x000000, 0x040000, CRC(25e85201) SHA1(6c0001e2942f49b62e1bbf3a68c59abad1e2f94c) ) -ROM_END - - - -void snowbros_state::init_cookbib2() -{ - save_item(NAME(m_semicom_prot_offset)); - - m_semicom_prot_base = 0xf000 / 2; -} - - -uint16_t snowbros_state::_4in1_02_read() -{ - return 0x0202; -} - -void snowbros_state::init_4in1boot() -{ - uint8_t *src = memregion("maincpu")->base(); - int len = memregion("maincpu")->bytes(); - - /* strange order */ - { - std::vector buffer(len); - for (int i = 0;i < len; i++) - if (i & 1) buffer[i] = bitswap<8>(src[i],6,7,5,4,3,2,1,0); - else buffer[i] = src[i]; - - memcpy(src, &buffer[0], len); - } - - src = memregion("soundcpu")->base(); - len = memregion("soundcpu")->bytes(); - - /* strange order */ - { - std::vector buffer(len); - for (int i = 0;i < len; i++) - buffer[i] = src[i^0x4000]; - memcpy(src,&buffer[0],len); - } - m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16smo_delegate(*this, FUNC(snowbros_state::_4in1_02_read))); -} - -void snowbros_state::init_snowbro3() -{ - uint8_t *src = memregion("maincpu")->base(); - int len = memregion("maincpu")->bytes(); - - /* strange order */ - { - std::vector buffer(len); - for (int i = 0;i < len; i++) - buffer[i] = src[bitswap<24>(i,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,3,4,1,2,0)]; - memcpy(src,&buffer[0],len); - } - - save_item(NAME(m_sb3_music_is_playing)); - save_item(NAME(m_sb3_music)); -} - -void snowbros_state::init_ballboy3p() -{ - init_snowbro3(); - - m_maincpu->space(AS_PROGRAM).unmap_write(0x400000, 0x400001); // unmap flipscreen as the DSW has been removed in favor of the controls for the 3rd player -} - -uint16_t snowbros_state::_3in1_read() -{ - return 0x000a; -} - -void snowbros_state::init_3in1semi() -{ - m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16smo_delegate(*this, FUNC(snowbros_state::_3in1_read))); -} - - -uint16_t snowbros_state::cookbib3_read() -{ - return 0x2a2a; -} - -void snowbros_state::init_cookbib3() -{ - m_maincpu->space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16smo_delegate(*this, FUNC(snowbros_state::cookbib3_read))); -} - -void snowbros_state::init_pzlbreak() -{ - m_pandora->set_bg_pen(0xc0); -} - - - -void snowbros_state::init_toto() -{ - // every single rom has bits 0x10 and 0x08 swapped - uint8_t *src = memregion("maincpu")->base(); - int len = memregion("maincpu")->bytes(); - - for (int i = 0; i < len; i++) - { - src[i] = bitswap<8>(src[i], 7, 6, 5, 3, 4, 2, 1, 0); - } - - src = memregion("gfx1")->base(); - len = memregion("gfx1")->bytes(); - - for (int i = 0; i < len; i++) - { - src[i] = bitswap<8>(src[i], 7, 6, 5, 3, 4, 2, 1, 0); - } - - src = memregion("soundcpu")->base(); - len = memregion("soundcpu")->bytes(); - - for (int i = 0; i < len; i++) - { - src[i] = bitswap<8>(src[i], 7, 6, 5, 3, 4, 2, 1, 0); - } - - // protection? (just return 0x07) - m_maincpu->space(AS_PROGRAM).install_read_handler(0x500006, 0x500007, read16s_delegate(*this, FUNC(snowbros_state::toto_read))); -} - -void snowbros_state::init_hyperpac() -{ - save_item(NAME(m_semicom_prot_offset)); - m_semicom_prot_base = 0xe000 / 2; -} - - -void snowbros_state::init_yutnori() -{ - m_yutnori_prot_val = 0; - m_pandora->set_bg_pen(0xf0); - save_item(NAME(m_yutnori_prot_val)); -} - -GAME( 1990, snowbros, 0, snowbros, snowbros, snowbros_state, empty_init, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1990, snowbrosa, snowbros, snowbros, snowbros, snowbros_state, empty_init, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1990, snowbrosb, snowbros, snowbros, snowbros, snowbros_state, empty_init, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 3)", MACHINE_SUPPORTS_SAVE ) -GAME( 1990, snowbrosc, snowbros, snowbros, snowbros, snowbros_state, empty_init, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 4)", MACHINE_SUPPORTS_SAVE ) -GAME( 1990, snowbrosj, snowbros, snowbros, snowbroj, snowbros_state, empty_init, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (Japan)", MACHINE_SUPPORTS_SAVE ) -GAME( 1990, snowbrosd, snowbros, snowbros, snowbroj, snowbros_state, empty_init, ROT0, "Toaplan (Dooyong license)", "Snow Bros. - Nick & Tom (Dooyong license)", MACHINE_SUPPORTS_SAVE ) -GAME( 1990, wintbob, snowbros, wintbob, snowbros, snowbros_state, empty_init, ROT0, "bootleg (Sakowa Project Korea)", "The Winter Bobble (bootleg of Snow Bros.)", MACHINE_SUPPORTS_SAVE ) -GAME( 1990, snowbroswb, snowbros, wintbob, snowbros, snowbros_state, empty_init, ROT0, "bootleg", "Snow Bros. - Nick & Tom (The Winter Bobble hardware bootleg)", MACHINE_SUPPORTS_SAVE ) // this was probably unhacked back from the more common Winter Bobble to make it look more original - -GAME( 1996, toto, 0, snowbros, snowbros, snowbros_state, init_toto, ROT0, "SoftClub", "Come Back Toto", MACHINE_SUPPORTS_SAVE ) // modified from 'snowbros' code - -// none of the games below are on genuine SnowBros hardware, but they clone the functionality of it. - -// SemiCom / Jeil titles are protected, a dumb MCU copies code into RAM at startup, some also check for a specific return value from an address on startup. -GAME( 1993, finalttr, 0, finalttr, finalttr, snowbros_state, empty_init, ROT0, "Jeil Computer System", "Final Tetris", MACHINE_SUPPORTS_SAVE ) -GAME( 1995, hyperpac, 0, semicom_mcu, hyperpac, snowbros_state, init_hyperpac, ROT0, "SemiCom", "Hyper Pacman", MACHINE_SUPPORTS_SAVE ) -GAME( 1995, hyperpacb, hyperpac, semicom, hyperpac, snowbros_state, empty_init, ROT0, "bootleg", "Hyper Pacman (bootleg)", MACHINE_SUPPORTS_SAVE ) -GAME( 1996, cookbib2, 0, semicom_mcu, cookbib2, snowbros_state, init_cookbib2, ROT0, "SemiCom", "Cookie & Bibi 2 (English, set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1996, cookbib2a, cookbib2, semicom_mcu, cookbib2, snowbros_state, init_cookbib2, ROT0, "SemiCom", "Cookie & Bibi 2 (English, set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1996, cookbib2b, cookbib2, semiprot, cookbib2, snowbros_state, init_cookbib2, ROT0, "SemiCom", "Cookie & Bibi 2 (English, set 3)", MACHINE_SUPPORTS_SAVE ) // older? test mode looks even worse on this, but neither shows the correct dip info anyway -GAME( 1996, cookbib2c, cookbib2, semiprot, cookbib2c,snowbros_state, init_cookbib2, ROT0, "SemiCom", "Cookie & Bibi 2 (English / Korean)", MACHINE_SUPPORTS_SAVE ) // in this set the language switch actually works but its effects are inverted to what test mode shows. Sticker on PCB shows 95 so maybe earliest set? -GAME( 1996, toppyrap, 0, semiprot, toppyrap, snowbros_state, empty_init, ROT0, "SemiCom", "Toppy & Rappy", MACHINE_SUPPORTS_SAVE ) -GAME( 1997, cookbib3, 0, semiprot, cookbib3, snowbros_state, init_cookbib3, ROT0, "SemiCom", "Cookie & Bibi 3", MACHINE_SUPPORTS_SAVE ) -GAME( 1997, pzlbreak, 0, semiprot, pzlbreak, snowbros_state, init_pzlbreak, ROT0, "SemiCom / Tirano", "Puzzle Break (set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1997, pzlbreaka, pzlbreak, semiprot, pzlbreak, snowbros_state, init_pzlbreak, ROT0, "SemiCom / Tirano", "Puzzle Break (set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1997, suhosong, 0, semiprot, suhosong, snowbros_state, empty_init, ROT0, "SemiCom", "Su Ho Seong", MACHINE_SUPPORTS_SAVE ) -GAME( 1997, twinkle, 0, semiprot, twinkle, snowbros_state, empty_init, ROT0, "SemiCom / Tirano", "Twinkle (set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1997, twinklea, twinkle, semiprot, twinkle, snowbros_state, empty_init, ROT0, "SemiCom / Tirano", "Twinkle (set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1998, 3in1semi, 0, semiprot, moremore, snowbros_state, init_3in1semi, ROT0, "SemiCom / XESS", "New HyperMan (3-in-1 with Cookie & Bibi & HyperMan) (set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1998, 3in1semia, 3in1semi, semiprot, moremore, snowbros_state, init_3in1semi, ROT0, "SemiCom / XESS", "New HyperMan (3-in-1 with Cookie & Bibi & HyperMan) (set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1999, mcheonru, 0, semiprot, mcheonru, snowbros_state, init_3in1semi, ROT0, "SemiCom / AceVer", "Ma Cheon Ru", MACHINE_SUPPORTS_SAVE ) // a flyer exists for an English version called Arirang, AceVer team logo is displayed on it -GAME( 1999, moremore, 0, semiprot, moremore, snowbros_state, init_3in1semi, ROT0, "SemiCom / Exit", "More More", MACHINE_SUPPORTS_SAVE ) -GAME( 1999, moremorp, 0, semiprot, moremore, snowbros_state, init_3in1semi, ROT0, "SemiCom / Exit", "More More Plus", MACHINE_SUPPORTS_SAVE ) -// This is very similar to the SemiCom titles, but unprotected. -GAME( 2002, 4in1boot, 0, _4in1, 4in1boot, snowbros_state, init_4in1boot, ROT0, "K1 Soft", "Puzzle King (PacMan 2, Tetris, HyperMan 2, Snow Bros.)" , MACHINE_SUPPORTS_SAVE ) - -GAME( 1995, honeydol, 0, honeydol, honeydol, snowbros_state, empty_init, ROT0, "Barko Corp.", "Honey Doll", MACHINE_SUPPORTS_SAVE ) // based on snowbros code.. - -GAME( 1995, twinadv, 0, twinadv, twinadv, snowbros_state, empty_init, ROT0, "Barko Corp.", "Twin Adventure (World)", MACHINE_SUPPORTS_SAVE ) -GAME( 1995, twinadvk, twinadv, twinadv, twinadv, snowbros_state, empty_init, ROT0, "Barko Corp.", "Twin Adventure (Korea)", MACHINE_SUPPORTS_SAVE ) -GAME( 1996, multi96, twinadv, twinadv, twinadv, snowbros_state, empty_init, ROT0, "Barko Corp.", "Multi Game '96 (Italy)", MACHINE_SUPPORTS_SAVE ) - -// The Korean games database shows an earlier version of this called Ball Boy with a different title screen to the version of Ball Boy we have -// http://mamedev.emulab.it/undumped/images/Ballboy.jpg -// it is possible this 'ball boy' is the original bootleg, with snwobro3 being a hack of that, and the ballboy set we have a further hack of that -// these use an MCU to drive the sound -GAME( 2002, snowbro3, 0, snowbro3, snowbroj, snowbros_state, init_snowbro3, ROT0, "Syrmex", "Snow Brothers 3 - Magical Adventure", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // hacked from SnowBros code but released as an original game -GAME( 2003, ballboy, snowbro3, snowbro3, snowbroj, snowbros_state, init_snowbro3, ROT0, "bootleg", "Ball Boy (2 players)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) -GAME( 2004, ballboy3p, snowbro3, snowbro3, ballboy3p, snowbros_state, init_ballboy3p, ROT0, "bootleg", "Ball Boy (3 players)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) -// protection appears to handle the sound, should check if it's just a block of code that is conditionally executed like some of the Semicom titles. -GAME( 1999, yutnori, 0, yutnori, yutnori, snowbros_state, init_yutnori, ROT0, "Nunal", "Puzzle Yutnori (Korea)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // Nunal is apparently Korean slang for Eyeball, hence the logo. Some places report 'JCC Soft' as the manufacturer diff --git a/src/mame/toaplan/snowbros.h b/src/mame/toaplan/snowbros.h deleted file mode 100644 index 33678fac6a7..00000000000 --- a/src/mame/toaplan/snowbros.h +++ /dev/null @@ -1,125 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood, Mike Coates -#ifndef MAME_INCLUDES_SNOWBROS_H -#define MAME_INCLUDES_SNOWBROS_H - -#pragma once - -#include "machine/gen_latch.h" -#include "machine/timer.h" -#include "sound/okim6295.h" -#include "video/kan_pand.h" // for the original pandora -#include "emupal.h" -#include "screen.h" - -class snowbros_state : public driver_device -{ -public: - snowbros_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this,"maincpu"), - m_soundcpu(*this, "soundcpu"), - m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette"), - m_screen(*this, "screen"), - m_soundlatch(*this, "soundlatch"), - m_pandora(*this, "pandora"), - m_hyperpac_ram(*this, "hyperpac_ram"), - m_bootleg_spriteram16(*this, "spriteram16b"), - m_semicom_prot_base(0) - { } - - void _4in1(machine_config &config); - void semiprot(machine_config &config); - void semicom_mcu(machine_config &config); - void yutnori(machine_config &config); - void snowbros(machine_config &config); - void semicom(machine_config &config); - void twinadv(machine_config &config); - void wintbob(machine_config &config); - void honeydol(machine_config &config); - void snowbro3(machine_config &config); - void finalttr(machine_config &config); - - void init_pzlbreak(); - void init_snowbro3(); - void init_ballboy3p(); - void init_cookbib3(); - void init_4in1boot(); - void init_3in1semi(); - void init_cookbib2(); - void init_toto(); - void init_hyperpac(); - void init_yutnori(); - -private: - required_device m_maincpu; - optional_device m_soundcpu; - optional_device m_oki; - required_device m_gfxdecode; - required_device m_palette; - required_device m_screen; - optional_device m_soundlatch; // not snowbro3 - - optional_device m_pandora; - optional_shared_ptr m_hyperpac_ram; - optional_shared_ptr m_bootleg_spriteram16; - - int m_sb3_music_is_playing = 0; - int m_sb3_music = 0; - uint8_t m_semicom_prot_offset = 0; - uint16_t m_semicom_prot_base; - uint16_t m_yutnori_prot_val = 0; - - void snowbros_flipscreen_w(uint8_t data); - void bootleg_flipscreen_w(uint8_t data); - void snowbros_irq4_ack_w(uint16_t data); - void snowbros_irq3_ack_w(uint16_t data); - void snowbros_irq2_ack_w(uint16_t data); - void prot_p0_w(uint8_t data); - void prot_p1_w(uint8_t data); - void prot_p2_w(uint8_t data); - uint16_t sb3_sound_r(); - uint16_t _4in1_02_read(); - uint16_t _3in1_read(); - uint16_t cookbib3_read(); - void twinadv_oki_bank_w(uint8_t data); - void sb3_sound_w(uint16_t data); - uint16_t toto_read(offs_t offset, uint16_t mem_mask = ~0); - void yutnori_prot_w(uint16_t data); - uint16_t yutnori_prot_r(); - - DECLARE_MACHINE_RESET(semiprot); - DECLARE_MACHINE_RESET(finalttr); - - uint32_t screen_update_snowbros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - uint32_t screen_update_honeydol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - uint32_t screen_update_twinadv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - uint32_t screen_update_snowbro3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - uint32_t screen_update_wintbob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_snowbros); - - TIMER_DEVICE_CALLBACK_MEMBER(snowbros_irq); - TIMER_DEVICE_CALLBACK_MEMBER(snowbros3_irq); - - void sb3_play_music(int data); - void sb3_play_sound(int data); - - void finalttr_map(address_map &map); - void honeydol_map(address_map &map); - void honeydol_sound_io_map(address_map &map); - void honeydol_sound_map(address_map &map); - void hyperpac_map(address_map &map); - void hyperpac_sound_map(address_map &map); - void snowbros3_map(address_map &map); - void snowbros_map(address_map &map); - void sound_io_map(address_map &map); - void sound_map(address_map &map); - void twinadv_map(address_map &map); - void twinadv_sound_io_map(address_map &map); - void wintbob_map(address_map &map); - void yutnori_map(address_map &map); -}; - -#endif // MAME_INCLUDES_SNOWBROS_H diff --git a/src/mame/toaplan/snowbros_v.cpp b/src/mame/toaplan/snowbros_v.cpp deleted file mode 100644 index 7823006bfe4..00000000000 --- a/src/mame/toaplan/snowbros_v.cpp +++ /dev/null @@ -1,275 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood, Luca Elia -/* bootlegs of Kaneko Pandora chip, with modifications */ - -#include "emu.h" -#include "includes/snowbros.h" - -uint32_t snowbros_state::screen_update_honeydol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - uint16_t *spriteram16 = m_bootleg_spriteram16; - int sx=0, sy=0, x=0, y=0, offs; - /* sprites clip on left / right edges when scrolling, but it seems correct, - no extra sprite attribute bits are set during this time, the sprite co-ordinates - are simply set to 0 */ - - /* not standard snowbros video */ - - bitmap.fill(0xf0, cliprect); - - for (offs = 0x0000/2;offs < 0x2000/2;offs += 8) - { - int dx,dy,tilecolour,attr,flipx,flipy,tile; - - /* 8bpp gfx */ - dx = (spriteram16[offs+4]>>8) & 0xff; - dy = (spriteram16[offs+5]>>8) & 0xff; - tilecolour = (spriteram16[offs+3]>>8)&3; - attr = spriteram16[offs+7]>>8; - flipx = attr & 0x80; - flipy = (attr & 0x40) << 1; - tile = ((attr & 0x3f)<<8) + ((spriteram16[offs+6]>>8) & 0xff); - - x = dx; - y = dy; - - if (flip_screen()) - { - sx = 240 - x; - sy = 240 - y; - flipx = !flipx; - flipy = !flipy; - } - else - { - sx = x; - sy = y; - } - - m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, - tile, - tilecolour, - flipx, flipy, - sx,sy,0); - - /* second list interleaved with first (4bpp) ??? */ - dx = spriteram16[offs+4] & 0xff; - dy = spriteram16[offs+5] & 0xff; - tilecolour = spriteram16[offs+3]; - attr = spriteram16[offs+7]; - flipx = attr & 0x80; - flipy = (attr & 0x40) << 1; - tile = ((attr & 0x3f) << 8) + (spriteram16[offs+6] & 0xff); - - x = dx; - y = dy; - - if (flip_screen()) - { - sx = 240 - x; - sy = 240 - y; - flipx = !flipx; - flipy = !flipy; - } - else - { - sx = x; - sy = y; - } - - tilecolour = (tilecolour&0x03f0) >> 4; - tilecolour ^=0x3f; // unusual, but correct.. - - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, - tile, - tilecolour, - flipx, flipy, - sx,sy,0); - } - return 0; -} - - -uint32_t snowbros_state::screen_update_twinadv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - uint16_t *spriteram16 = m_bootleg_spriteram16; - int sx=0, sy=0, x=0, y=0, offs; - /* sprites clip on left / right edges when scrolling, but it seems correct, - no extra sprite attribute bits are set during this time, the sprite co-ordinates - are simply set to 0 */ - - /* not standard snowbros video */ - - bitmap.fill(0xf0, cliprect); - - for (offs = 0x0000/2;offs < 0x2000/2;offs += 8) - { - int dx,dy,tilecolour,attr,flipx,flipy,tile; - - /* Similar to Honey Doll, but no 8bpp list / gfx */ - - dx = spriteram16[offs+4] & 0xff; - dy = spriteram16[offs+5] & 0xff; - tilecolour = spriteram16[offs+3]; - attr = spriteram16[offs+7]; - flipx = attr & 0x80; - flipy = (attr & 0x40) << 1; - tile = ((attr & 0x3f) << 8) + (spriteram16[offs+6] & 0xff); - - x = dx; - y = dy; - - if (flip_screen()) - { - sx = 240 - x; - sy = 240 - y; - flipx = !flipx; - flipy = !flipy; - } - else - { - sx = x; - sy = y; - } - - tilecolour = (tilecolour&0x00f0) >> 4; - tilecolour ^=0xf; // unusual, but correct.. - - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, - tile, - tilecolour, - flipx, flipy, - sx,sy,0); - } - return 0; -} - - -uint32_t snowbros_state::screen_update_wintbob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - uint16_t *spriteram16 = m_bootleg_spriteram16; - int offs; - - bitmap.fill(m_palette->black_pen(), cliprect); - - for (offs = 0;offs < m_bootleg_spriteram16.bytes()/2;offs += 8) - { - int xpos = spriteram16[offs] & 0xff; - int ypos = spriteram16[offs+4] & 0xff; -/* int unk1 = spriteram16[offs+1] & 0x01;*/ /* Unknown .. Set for the Bottom Left part of Sprites */ - int disbl = spriteram16[offs+1] & 0x02; -/* int unk2 = spriteram16[offs+1] & 0x04;*/ /* Unknown .. Set for most things */ - int wrapr = spriteram16[offs+1] & 0x08; - int colr = (spriteram16[offs+1] & 0xf0) >> 4; - int tilen = (spriteram16[offs+2] << 8) + (spriteram16[offs+3] & 0xff); - int flipx = spriteram16[offs+2] & 0x80; - int flipy = (spriteram16[offs+2] & 0x40) << 1; - - if (wrapr == 8) xpos -= 256; - - if (flip_screen()) - { - xpos = 240 - xpos; - ypos = 240 - ypos; - flipx = !flipx; - flipy = !flipy; - } - - if ((xpos > -16) && (ypos > 0) && (xpos < 256) && (ypos < 240) && (disbl !=2)) - { - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, - tilen, - colr, - flipx, flipy, - xpos,ypos,0); - } - } - return 0; -} - - -uint32_t snowbros_state::screen_update_snowbro3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - uint16_t *spriteram16 = m_bootleg_spriteram16; - int sx=0, sy=0, x=0, y=0, offs; - - /* - * Sprite Tile Format - * ------------------ - * - * Byte | Bit(s) | Use - * -----+-76543210-+---------------- - * 0-5 | -------- | ? - * 6 | -------- | ? - * 7 | xxxx.... | Palette Bank - * 7 | .......x | XPos - Sign Bit - * 9 | xxxxxxxx | XPos - * 7 | ......x. | YPos - Sign Bit - * B | xxxxxxxx | YPos - * 7 | .....x.. | Use Relative offsets - * C | -------- | ? - * D | xxxxxxxx | Sprite Number (low 8 bits) - * E | -------- | ? - * F | ....xxxx | Sprite Number (high 4 bits) - * F | x....... | Flip Sprite Y-Axis - * F | .x...... | Flip Sprite X-Axis - */ - - /* This clears & redraws the entire screen each pass */ - - bitmap.fill(m_palette->black_pen(), cliprect); - - for (offs = 0;offs < m_bootleg_spriteram16.bytes()/2;offs += 8) - { - gfx_element *gfx = m_gfxdecode->gfx(0); - int dx = spriteram16[offs+4] & 0xff; - int dy = spriteram16[offs+5] & 0xff; - int tilecolour = spriteram16[offs+3]; - int attr = spriteram16[offs+7]; - int flipx = attr & 0x80; - int flipy = (attr & 0x40) << 1; - int tile = ((attr & 0xff) << 8) + (spriteram16[offs+6] & 0xff); - - if (tilecolour & 1) dx = -1 - (dx ^ 0xff); - if (tilecolour & 2) dy = -1 - (dy ^ 0xff); - if (tilecolour & 4) - { - x += dx; - y += dy; - } - else - { - x = dx; - y = dy; - } - - if (x > 511) x &= 0x1ff; - if (y > 511) y &= 0x1ff; - - if (flip_screen()) - { - sx = 240 - x; - sy = 240 - y; - flipx = !flipx; - flipy = !flipy; - } - else - { - sx = x; - sy = y; - } - - if (offs < 0x800) /* i guess this is the right way */ - { - gfx = m_gfxdecode->gfx(1); - tilecolour = 0x10; - } - - gfx->transpen(bitmap,cliprect, - tile, - (tilecolour & 0xf0) >> 4, - flipx, flipy, - sx,sy,0); - } - return 0; -} diff --git a/src/mame/toaplan/toaplan1.cpp b/src/mame/toaplan/toaplan1.cpp index 523700b95c8..87434431775 100644 --- a/src/mame/toaplan/toaplan1.cpp +++ b/src/mame/toaplan/toaplan1.cpp @@ -606,8 +606,8 @@ Stephh's and AWJ's notes (based on the games M68000 and Z80 code and some tests) ***************************************************************************/ #include "emu.h" -#include "includes/toaplan1.h" -#include "includes/toaplipt.h" +#include "toaplan1.h" +#include "toaplipt.h" #include "cpu/z80/z80.h" #include "cpu/z180/hd647180x.h" diff --git a/src/mame/toaplan/toaplan1.h b/src/mame/toaplan/toaplan1.h index aee5e554737..40c70544cda 100644 --- a/src/mame/toaplan/toaplan1.h +++ b/src/mame/toaplan/toaplan1.h @@ -12,7 +12,7 @@ #include "cpu/m68000/m68000.h" #include "cpu/tms32010/tms32010.h" #include "sound/ymopl.h" -#include "video/toaplan_scu.h" +#include "toaplan_scu.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/toaplan/toaplan1_m.cpp b/src/mame/toaplan/toaplan1_m.cpp index 465f7245e3a..8a977680df7 100644 --- a/src/mame/toaplan/toaplan1_m.cpp +++ b/src/mame/toaplan/toaplan1_m.cpp @@ -9,7 +9,7 @@ #include "cpu/z80/z80.h" #include "cpu/tms32010/tms32010.h" #include "sound/ymopl.h" -#include "includes/toaplan1.h" +#include "toaplan1.h" void toaplan1_state::interrupt() diff --git a/src/mame/toaplan/toaplan1_v.cpp b/src/mame/toaplan/toaplan1_v.cpp index 47d00a00064..43304777dad 100644 --- a/src/mame/toaplan/toaplan1_v.cpp +++ b/src/mame/toaplan/toaplan1_v.cpp @@ -123,7 +123,7 @@ Abnormalities: #include "emu.h" -#include "includes/toaplan1.h" +#include "toaplan1.h" #define TOAPLAN1_TILEVRAM_SIZE 0x4000 /* 4 tile layers each this RAM size */ diff --git a/src/mame/toaplan/toaplan2.cpp b/src/mame/toaplan/toaplan2.cpp index 9bd9d28ed47..bb7c97aa383 100644 --- a/src/mame/toaplan/toaplan2.cpp +++ b/src/mame/toaplan/toaplan2.cpp @@ -390,8 +390,8 @@ To reset the NVRAM in Othello Derby, hold P1 Button 1 down while booting. #include "emu.h" -#include "includes/toaplan2.h" -#include "includes/toaplipt.h" +#include "toaplan2.h" +#include "toaplipt.h" #include "cpu/nec/v25.h" #include "cpu/z80/z80.h" diff --git a/src/mame/toaplan/toaplan2.h b/src/mame/toaplan/toaplan2.h index 94572aefefa..d2d054ec776 100644 --- a/src/mame/toaplan/toaplan2.h +++ b/src/mame/toaplan/toaplan2.h @@ -11,7 +11,7 @@ #include "machine/gen_latch.h" #include "machine/ticket.h" #include "machine/upd4992.h" -#include "video/gp9001.h" +#include "gp9001.h" #include "sound/okim6295.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/toaplan/toaplan2_v.cpp b/src/mame/toaplan/toaplan2_v.cpp index f52431508a8..7a8ad6a3cc2 100644 --- a/src/mame/toaplan/toaplan2_v.cpp +++ b/src/mame/toaplan/toaplan2_v.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/toaplan2.h" +#include "toaplan2.h" /*************************************************************************** diff --git a/src/mame/toaplan/twincobr.cpp b/src/mame/toaplan/twincobr.cpp index a8d24312ee7..a498a8145dd 100644 --- a/src/mame/toaplan/twincobr.cpp +++ b/src/mame/toaplan/twincobr.cpp @@ -378,8 +378,8 @@ Shark Zame #include "emu.h" -#include "includes/twincobr.h" -#include "includes/toaplipt.h" +#include "twincobr.h" +#include "toaplipt.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs48/mcs48.h" diff --git a/src/mame/toaplan/twincobr.h b/src/mame/toaplan/twincobr.h index 127be71dea4..e559943afe7 100644 --- a/src/mame/toaplan/twincobr.h +++ b/src/mame/toaplan/twincobr.h @@ -13,7 +13,7 @@ #include "machine/74259.h" #include "video/mc6845.h" #include "video/bufsprite.h" -#include "video/toaplan_scu.h" +#include "toaplan_scu.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/toaplan/twincobr_m.cpp b/src/mame/toaplan/twincobr_m.cpp index 9fc69b343d8..a40c535a6d8 100644 --- a/src/mame/toaplan/twincobr_m.cpp +++ b/src/mame/toaplan/twincobr_m.cpp @@ -8,7 +8,7 @@ #include "emu.h" #include "cpu/m68000/m68000.h" #include "cpu/tms32010/tms32010.h" -#include "includes/twincobr.h" +#include "twincobr.h" #define LOG_DSP_CALLS 0 diff --git a/src/mame/toaplan/twincobr_v.cpp b/src/mame/toaplan/twincobr_v.cpp index 4159174a534..319e46bb281 100644 --- a/src/mame/toaplan/twincobr_v.cpp +++ b/src/mame/toaplan/twincobr_v.cpp @@ -16,7 +16,7 @@ #include "emu.h" #include "video/mc6845.h" -#include "includes/twincobr.h" +#include "twincobr.h" /*************************************************************************** Callbacks for the TileMap code diff --git a/src/mame/toaplan/wardner.cpp b/src/mame/toaplan/wardner.cpp index c565901ed69..b59f06204c9 100644 --- a/src/mame/toaplan/wardner.cpp +++ b/src/mame/toaplan/wardner.cpp @@ -127,8 +127,8 @@ out: #include "emu.h" -#include "includes/twincobr.h" -#include "includes/toaplipt.h" +#include "twincobr.h" +#include "toaplipt.h" #include "cpu/tms32010/tms32010.h" #include "cpu/z80/z80.h" diff --git a/src/mame/toshiba/pasopia.cpp b/src/mame/toshiba/pasopia.cpp index a65f5664e90..4020951603d 100644 --- a/src/mame/toshiba/pasopia.cpp +++ b/src/mame/toshiba/pasopia.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/pasopia.h" +#include "pasopia.h" #include "bus/pasopia/pac2.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/toshiba/pasopia7.cpp b/src/mame/toshiba/pasopia7.cpp index a13163faedf..edd4120fb98 100644 --- a/src/mame/toshiba/pasopia7.cpp +++ b/src/mame/toshiba/pasopia7.cpp @@ -28,7 +28,7 @@ ***************************************************************************************************/ #include "emu.h" -#include "includes/pasopia.h" +#include "pasopia.h" #include "bus/pasopia/pac2.h" #include "cpu/z80/z80.h" diff --git a/src/mame/trs/6883sam.cpp b/src/mame/trs/6883sam.cpp index 73b37c50c09..140791aa7fb 100644 --- a/src/mame/trs/6883sam.cpp +++ b/src/mame/trs/6883sam.cpp @@ -50,7 +50,7 @@ #include "emu.h" -#include "machine/6883sam.h" +#include "6883sam.h" //************************************************************************** diff --git a/src/mame/trs/coco.cpp b/src/mame/trs/coco.cpp index c2de273d41e..7a50c0962fb 100644 --- a/src/mame/trs/coco.cpp +++ b/src/mame/trs/coco.cpp @@ -54,7 +54,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/coco.h" +#include "coco.h" #include "cpu/m6809/m6809.h" #include "screen.h" diff --git a/src/mame/trs/coco.h b/src/mame/trs/coco.h index 78e54f40f0c..c66c144dccc 100644 --- a/src/mame/trs/coco.h +++ b/src/mame/trs/coco.h @@ -17,7 +17,7 @@ #include "bus/rs232/rs232.h" #include "machine/6821pia.h" #include "bus/coco/cococart.h" -#include "machine/coco_vhd.h" +#include "coco_vhd.h" #include "bus/coco/coco_dwsock.h" #include "machine/ram.h" #include "machine/bankdev.h" diff --git a/src/mame/trs/coco12.cpp b/src/mame/trs/coco12.cpp index 78a06c7c24e..970faca3371 100644 --- a/src/mame/trs/coco12.cpp +++ b/src/mame/trs/coco12.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/coco12.h" +#include "coco12.h" #include "bus/coco/cococart.h" #include "bus/coco/coco_t4426.h" diff --git a/src/mame/trs/coco12.h b/src/mame/trs/coco12.h index 41280f43dd1..d67102a714a 100644 --- a/src/mame/trs/coco12.h +++ b/src/mame/trs/coco12.h @@ -13,8 +13,8 @@ #pragma once -#include "includes/coco.h" -#include "machine/6883sam.h" +#include "coco.h" +#include "6883sam.h" #include "video/mc6847.h" diff --git a/src/mame/trs/coco12_m.cpp b/src/mame/trs/coco12_m.cpp index 258834131e0..d217f8f5eef 100644 --- a/src/mame/trs/coco12_m.cpp +++ b/src/mame/trs/coco12_m.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/coco12.h" +#include "coco12.h" //------------------------------------------------- // device_start diff --git a/src/mame/trs/coco3.cpp b/src/mame/trs/coco3.cpp index 4a5e95ee022..151a24a0475 100644 --- a/src/mame/trs/coco3.cpp +++ b/src/mame/trs/coco3.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/coco3.h" +#include "coco3.h" #include "cpu/m6809/m6809.h" #include "cpu/m6809/hd6309.h" #include "formats/coco_cas.h" diff --git a/src/mame/trs/coco3.h b/src/mame/trs/coco3.h index a2157a21bbd..fa8359b2032 100644 --- a/src/mame/trs/coco3.h +++ b/src/mame/trs/coco3.h @@ -13,8 +13,8 @@ #pragma once -#include "includes/coco12.h" -#include "video/gime.h" +#include "coco12.h" +#include "gime.h" //************************************************************************** diff --git a/src/mame/trs/coco3_m.cpp b/src/mame/trs/coco3_m.cpp index a276d5d45f0..1e65c7293c3 100644 --- a/src/mame/trs/coco3_m.cpp +++ b/src/mame/trs/coco3_m.cpp @@ -44,7 +44,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/coco3.h" +#include "coco3.h" //------------------------------------------------- // ff20_write diff --git a/src/mame/trs/coco_vhd.cpp b/src/mame/trs/coco_vhd.cpp index 29368003056..b2b95e30830 100644 --- a/src/mame/trs/coco_vhd.cpp +++ b/src/mame/trs/coco_vhd.cpp @@ -40,7 +40,7 @@ #include "emu.h" #include "coco_vhd.h" -#include "includes/coco.h" +#include "coco.h" #include "machine/ram.h" diff --git a/src/mame/trs/dgn_beta.cpp b/src/mame/trs/dgn_beta.cpp index b92af5e4fcd..810a076a2dd 100644 --- a/src/mame/trs/dgn_beta.cpp +++ b/src/mame/trs/dgn_beta.cpp @@ -41,7 +41,7 @@ documentation still exists. ***************************************************************************/ #include "emu.h" -#include "includes/dgn_beta.h" +#include "dgn_beta.h" #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" diff --git a/src/mame/trs/dgn_beta_m.cpp b/src/mame/trs/dgn_beta_m.cpp index 564609d8c5b..b34e014a7c4 100644 --- a/src/mame/trs/dgn_beta_m.cpp +++ b/src/mame/trs/dgn_beta_m.cpp @@ -58,9 +58,9 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dgn_beta.h" +#include "dgn_beta.h" -#include "includes/coco.h" // for CoCo OS-9 disassembler enhancements +#include "coco.h" // for CoCo OS-9 disassembler enhancements #include "cpu/m6809/m6809.h" #include "imagedev/floppy.h" diff --git a/src/mame/trs/dgn_beta_v.cpp b/src/mame/trs/dgn_beta_v.cpp index 6e482899bcc..2292d0bced5 100644 --- a/src/mame/trs/dgn_beta_v.cpp +++ b/src/mame/trs/dgn_beta_v.cpp @@ -82,7 +82,7 @@ the access to the video memory is unclear to me at the moment. */ #include "emu.h" -#include "includes/dgn_beta.h" +#include "dgn_beta.h" /* GCtrl bitmasks, inferred from bits of Beta schematic */ #define GCtrlWI 0x01 diff --git a/src/mame/trs/dgnalpha.cpp b/src/mame/trs/dgnalpha.cpp index 72b3d1a5b95..c91c409702f 100644 --- a/src/mame/trs/dgnalpha.cpp +++ b/src/mame/trs/dgnalpha.cpp @@ -67,7 +67,7 @@ keeping track of it in a variable in the driver. ***************************************************************************/ #include "emu.h" -#include "includes/dgnalpha.h" +#include "dgnalpha.h" #include "sound/ay8910.h" //------------------------------------------------- diff --git a/src/mame/trs/dgnalpha.h b/src/mame/trs/dgnalpha.h index c0b3cbaf785..f4e7813b632 100644 --- a/src/mame/trs/dgnalpha.h +++ b/src/mame/trs/dgnalpha.h @@ -14,7 +14,7 @@ #pragma once -#include "includes/dragon.h" +#include "dragon.h" #include "imagedev/floppy.h" #include "sound/ay8910.h" #include "machine/wd_fdc.h" diff --git a/src/mame/trs/dragon.cpp b/src/mame/trs/dragon.cpp index 3f8ad75ea21..fcde7f5cb1c 100644 --- a/src/mame/trs/dragon.cpp +++ b/src/mame/trs/dragon.cpp @@ -11,8 +11,8 @@ ***************************************************************************/ #include "emu.h" -#include "includes/dragon.h" -#include "includes/dgnalpha.h" +#include "dragon.h" +#include "dgnalpha.h" #include "imagedev/cassette.h" #include "formats/coco_cas.h" #include "cpu/m6809/m6809.h" diff --git a/src/mame/trs/dragon.h b/src/mame/trs/dragon.h index 6ebacd1e658..dedf1202ea3 100644 --- a/src/mame/trs/dragon.h +++ b/src/mame/trs/dragon.h @@ -14,7 +14,7 @@ #pragma once -#include "includes/coco12.h" +#include "coco12.h" #include "imagedev/printer.h" #include "machine/mos6551.h" #include "video/mc6845.h" diff --git a/src/mame/trs/dragon_m.cpp b/src/mame/trs/dragon_m.cpp index 8ee63706a87..e972c3be983 100644 --- a/src/mame/trs/dragon_m.cpp +++ b/src/mame/trs/dragon_m.cpp @@ -38,7 +38,7 @@ easier to manage. ***************************************************************************/ #include "emu.h" -#include "includes/dragon.h" +#include "dragon.h" /*************************************************************************** diff --git a/src/mame/trs/gime.cpp b/src/mame/trs/gime.cpp index b444be4045d..09551f50a53 100644 --- a/src/mame/trs/gime.cpp +++ b/src/mame/trs/gime.cpp @@ -83,8 +83,8 @@ #include "emu.h" -#include "video/gime.h" -#include "machine/6883sam.h" +#include "gime.h" +#include "6883sam.h" #include "bus/coco/cococart.h" #include "machine/ram.h" diff --git a/src/mame/trs/gime.h b/src/mame/trs/gime.h index bd77fb68738..19237bb3e69 100644 --- a/src/mame/trs/gime.h +++ b/src/mame/trs/gime.h @@ -15,7 +15,7 @@ #pragma once #include "video/mc6847.h" -#include "machine/6883sam.h" +#include "6883sam.h" #include "machine/ram.h" diff --git a/src/mame/trs/lnw80.cpp b/src/mame/trs/lnw80.cpp index 8c4e67a01ef..5f1fa035c82 100644 --- a/src/mame/trs/lnw80.cpp +++ b/src/mame/trs/lnw80.cpp @@ -75,7 +75,7 @@ To Do / Status: *******************************************************************************************************/ #include "emu.h" -#include "includes/trs80.h" +#include "trs80.h" #include "machine/input_merger.h" #include "formats/td0_dsk.h" #include "softlist_dev.h" diff --git a/src/mame/trs/meritum.cpp b/src/mame/trs/meritum.cpp index e6bed85f903..51a200e91fc 100644 --- a/src/mame/trs/meritum.cpp +++ b/src/mame/trs/meritum.cpp @@ -55,12 +55,14 @@ For Model III: ****************************************************************************/ #include "emu.h" -#include "includes/trs80.h" +#include "trs80.h" + #include "bus/centronics/ctronics.h" #include "machine/input_merger.h" #include "machine/i8251.h" #include "machine/i8255.h" #include "machine/pit8253.h" + #include "emupal.h" #include "softlist_dev.h" diff --git a/src/mame/trs/radionic.cpp b/src/mame/trs/radionic.cpp index c266c8ffdf2..628480496e9 100644 --- a/src/mame/trs/radionic.cpp +++ b/src/mame/trs/radionic.cpp @@ -108,7 +108,7 @@ To Do / Status: *******************************************************************************************************/ #include "emu.h" -#include "includes/trs80.h" +#include "trs80.h" #include "machine/i8251.h" #include "machine/i8255.h" #include "machine/clock.h" diff --git a/src/mame/trs/tandy2k.cpp b/src/mame/trs/tandy2k.cpp index f373a0731eb..e7356d7fd65 100644 --- a/src/mame/trs/tandy2k.cpp +++ b/src/mame/trs/tandy2k.cpp @@ -23,7 +23,7 @@ */ #include "emu.h" -#include "includes/tandy2k.h" +#include "tandy2k.h" #include "screen.h" #include "softlist.h" diff --git a/src/mame/trs/tandy2k.h b/src/mame/trs/tandy2k.h index 7e3313af8b6..a77662a39e6 100644 --- a/src/mame/trs/tandy2k.h +++ b/src/mame/trs/tandy2k.h @@ -16,7 +16,7 @@ #include "machine/pit8253.h" #include "machine/pic8259.h" #include "machine/ram.h" -#include "machine/tandy2kb.h" +#include "tandy2kb.h" #include "machine/timer.h" #include "machine/upd765.h" #include "machine/bankdev.h" diff --git a/src/mame/trs/trs80.cpp b/src/mame/trs/trs80.cpp index 64eb3094670..154bbd19612 100644 --- a/src/mame/trs/trs80.cpp +++ b/src/mame/trs/trs80.cpp @@ -153,7 +153,7 @@ ht1080z works *******************************************************************************************************/ #include "emu.h" -#include "includes/trs80.h" +#include "trs80.h" #include "machine/input_merger.h" #include "sound/ay8910.h" #include "softlist_dev.h" diff --git a/src/mame/trs/trs80_m.cpp b/src/mame/trs/trs80_m.cpp index 21723f95ddd..2d704a16fb1 100644 --- a/src/mame/trs/trs80_m.cpp +++ b/src/mame/trs/trs80_m.cpp @@ -3,7 +3,7 @@ //*************************************************************************** #include "emu.h" -#include "includes/trs80.h" +#include "trs80.h" #define IRQ_M1_RTC 0x80 /* RTC on Model I */ diff --git a/src/mame/trs/trs80_v.cpp b/src/mame/trs/trs80_v.cpp index 6199c7e0bbb..e7769d92eae 100644 --- a/src/mame/trs/trs80_v.cpp +++ b/src/mame/trs/trs80_v.cpp @@ -3,7 +3,7 @@ //*************************************************************************** #include "emu.h" -#include "includes/trs80.h" +#include "trs80.h" // 7 or 8-bit video. Software control of 32/64 CPL = trs80, trs80l2. u32 trs80_state::screen_update_trs80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/trs/trs80m2.cpp b/src/mame/trs/trs80m2.cpp index 13ba0b12cb7..430bd5e7c98 100644 --- a/src/mame/trs/trs80m2.cpp +++ b/src/mame/trs/trs80m2.cpp @@ -22,7 +22,7 @@ */ #include "emu.h" -#include "includes/trs80m2.h" +#include "trs80m2.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/trs/trs80m2.h b/src/mame/trs/trs80m2.h index 831a358eae6..fc1716ee9fc 100644 --- a/src/mame/trs/trs80m2.h +++ b/src/mame/trs/trs80m2.h @@ -15,7 +15,7 @@ #include "machine/am9519.h" #include "machine/keyboard.h" #include "machine/ram.h" -#include "machine/trs80m2kb.h" +#include "trs80m2kb.h" #include "machine/wd_fdc.h" #include "machine/z80ctc.h" #include "machine/z80dma.h" diff --git a/src/mame/trs/trs80m3.cpp b/src/mame/trs/trs80m3.cpp index 345e7578ca6..17e5e80c9ce 100644 --- a/src/mame/trs/trs80m3.cpp +++ b/src/mame/trs/trs80m3.cpp @@ -72,7 +72,7 @@ trs80m4p: Floppy not working, so machine is useless. ***************************************************************************/ #include "emu.h" -#include "includes/trs80m3.h" +#include "trs80m3.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/trs/trs80m3_m.cpp b/src/mame/trs/trs80m3_m.cpp index fed0e9d0ff3..922222ddd54 100644 --- a/src/mame/trs/trs80m3_m.cpp +++ b/src/mame/trs/trs80m3_m.cpp @@ -3,7 +3,7 @@ //************************************************************************************************************************** #include "emu.h" -#include "includes/trs80m3.h" +#include "trs80m3.h" #define IRQ_M4_RTC 0x04 /* RTC on Model 4 */ diff --git a/src/mame/trs/trs80m3_v.cpp b/src/mame/trs/trs80m3_v.cpp index bd4b165441f..cd4e409299c 100644 --- a/src/mame/trs/trs80m3_v.cpp +++ b/src/mame/trs/trs80m3_v.cpp @@ -3,7 +3,7 @@ //*************************************************************************** #include "emu.h" -#include "includes/trs80m3.h" +#include "trs80m3.h" #include "screen.h" /* Bit assignment for "m_mode" diff --git a/src/mame/tvgames/bl_handhelds_lcdc.cpp b/src/mame/tvgames/bl_handhelds_lcdc.cpp index 15038e30bb0..fe137b8ea6e 100644 --- a/src/mame/tvgames/bl_handhelds_lcdc.cpp +++ b/src/mame/tvgames/bl_handhelds_lcdc.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" -#include "video/bl_handhelds_lcdc.h" +#include "bl_handhelds_lcdc.h" DEFINE_DEVICE_TYPE(BL_HANDHELDS_LCDC, bl_handhelds_lcdc_device, "blhandheldlcdc", "BaoBaoLong Handhelds LCD Controller") diff --git a/src/mame/tvgames/elan_ep3a19a.cpp b/src/mame/tvgames/elan_ep3a19a.cpp index 315454776b5..920c13d30d7 100644 --- a/src/mame/tvgames/elan_ep3a19a.cpp +++ b/src/mame/tvgames/elan_ep3a19a.cpp @@ -8,15 +8,17 @@ // Currently these checksums fail in MAME due to the interrupt hack mapping over ROM, if you remove that hack they pass #include "emu.h" +#include "elan_eu3a05_a.h" +#include "elan_eu3a05gpio.h" +#include "elan_ep3a19asys.h" +#include "elan_eu3a05vid.h" + #include "cpu/m6502/m6502.h" +#include "machine/bankdev.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" -#include "machine/bankdev.h" -#include "audio/elan_eu3a05.h" -#include "machine/elan_eu3a05gpio.h" -#include "machine/elan_ep3a19asys.h" -#include "video/elan_eu3a05vid.h" class elan_ep3a19a_state : public driver_device { diff --git a/src/mame/tvgames/elan_eu3a05.cpp b/src/mame/tvgames/elan_eu3a05.cpp index 5a0ad712374..e6b3fa89727 100644 --- a/src/mame/tvgames/elan_eu3a05.cpp +++ b/src/mame/tvgames/elan_eu3a05.cpp @@ -207,6 +207,9 @@ Set 5043 bit 0 low */ #include "emu.h" + +#include "elan_eu3a05_a.h" + #include "cpu/m6502/m6502.h" //#include "cpu/m6502/m65c02.h" #include "emupal.h" @@ -214,10 +217,9 @@ Set 5043 bit 0 low #include "softlist_dev.h" #include "speaker.h" #include "machine/bankdev.h" -#include "audio/elan_eu3a05.h" -#include "machine/elan_eu3a05gpio.h" -#include "machine/elan_eu3a05sys.h" -#include "video/elan_eu3a05vid.h" +#include "elan_eu3a05gpio.h" +#include "elan_eu3a05sys.h" +#include "elan_eu3a05vid.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/tvgames/elan_eu3a05_a.cpp b/src/mame/tvgames/elan_eu3a05_a.cpp index 1922ee3b1da..1ae8a1bc704 100644 --- a/src/mame/tvgames/elan_eu3a05_a.cpp +++ b/src/mame/tvgames/elan_eu3a05_a.cpp @@ -4,7 +4,7 @@ // Format not understood, it is not OKI ADPCM or IMA ADPCM, maybe something more basic? #include "emu.h" -#include "elan_eu3a05.h" +#include "elan_eu3a05_a.h" DEFINE_DEVICE_TYPE(ELAN_EU3A05_SOUND, elan_eu3a05_sound_device, "elan_eu3a05sound", "Elan EU3A05 / EU3A14 Sound") diff --git a/src/mame/tvgames/elan_eu3a14.cpp b/src/mame/tvgames/elan_eu3a14.cpp index 45953f54841..d0c1b105bc3 100644 --- a/src/mame/tvgames/elan_eu3a14.cpp +++ b/src/mame/tvgames/elan_eu3a14.cpp @@ -61,15 +61,18 @@ */ #include "emu.h" + +#include "elan_eu3a05_a.h" +#include "elan_eu3a14sys.h" +#include "elan_eu3a14vid.h" + #include "cpu/m6502/m6502.h" +#include "machine/bankdev.h" +#include "machine/timer.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" -#include "machine/bankdev.h" -#include "audio/elan_eu3a05.h" -#include "machine/timer.h" -#include "machine/elan_eu3a14sys.h" -#include "video/elan_eu3a14vid.h" diff --git a/src/mame/tvgames/generalplus_gpl16250.cpp b/src/mame/tvgames/generalplus_gpl16250.cpp index 03b81821bfe..0cecae9e5d3 100644 --- a/src/mame/tvgames/generalplus_gpl16250.cpp +++ b/src/mame/tvgames/generalplus_gpl16250.cpp @@ -68,7 +68,7 @@ */ #include "emu.h" -#include "includes/generalplus_gpl16250.h" +#include "generalplus_gpl16250.h" uint16_t gcm394_game_state::cs0_r(offs_t offset) diff --git a/src/mame/tvgames/generalplus_gpl16250.h b/src/mame/tvgames/generalplus_gpl16250.h index 17114afd274..1520a3aaba5 100644 --- a/src/mame/tvgames/generalplus_gpl16250.h +++ b/src/mame/tvgames/generalplus_gpl16250.h @@ -6,7 +6,7 @@ #pragma once #include "machine/generalplus_gpl16250soc.h" -#include "machine/generalplus_gpl16250.h" +#include "generalplus_gpl16250_m.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/tvgames/generalplus_gpl16250_m.cpp b/src/mame/tvgames/generalplus_gpl16250_m.cpp index d7c1d03e3e7..c6ed0621d66 100644 --- a/src/mame/tvgames/generalplus_gpl16250_m.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_m.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" -#include "generalplus_gpl16250.h" +#include "generalplus_gpl16250_m.h" // device type definition DEFINE_DEVICE_TYPE(FULL_MEMORY, full_memory_device, "full_memory", "SunPlus Full CS Memory Map") diff --git a/src/mame/tvgames/generalplus_gpl16250_mobigo.cpp b/src/mame/tvgames/generalplus_gpl16250_mobigo.cpp index e222e18e0fc..bb62a93fff1 100644 --- a/src/mame/tvgames/generalplus_gpl16250_mobigo.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_mobigo.cpp @@ -17,8 +17,8 @@ */ #include "emu.h" -#include "includes/generalplus_gpl16250_nand.h" -#include "includes/generalplus_gpl16250_romram.h" +#include "generalplus_gpl16250_nand.h" +#include "generalplus_gpl16250_romram.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/tvgames/generalplus_gpl16250_nand.cpp b/src/mame/tvgames/generalplus_gpl16250_nand.cpp index 2e418fd0337..03c6aeabab2 100644 --- a/src/mame/tvgames/generalplus_gpl16250_nand.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_nand.cpp @@ -29,8 +29,8 @@ #include "emu.h" -#include "includes/generalplus_gpl16250.h" -#include "includes/generalplus_gpl16250_nand.h" +#include "generalplus_gpl16250.h" +#include "generalplus_gpl16250_nand.h" #include "softlist_dev.h" uint16_t generalplus_gpac800_game_state::cs0_r(offs_t offset) diff --git a/src/mame/tvgames/generalplus_gpl16250_nand.h b/src/mame/tvgames/generalplus_gpl16250_nand.h index 9e26d5a07ff..fa156013f62 100644 --- a/src/mame/tvgames/generalplus_gpl16250_nand.h +++ b/src/mame/tvgames/generalplus_gpl16250_nand.h @@ -5,9 +5,9 @@ #pragma once -#include "includes/generalplus_gpl16250.h" +#include "generalplus_gpl16250.h" #include "machine/generalplus_gpl16250soc.h" -#include "machine/generalplus_gpl16250.h" +#include "generalplus_gpl16250_m.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/tvgames/generalplus_gpl16250_rom.cpp b/src/mame/tvgames/generalplus_gpl16250_rom.cpp index e5967e2a017..4ff383fc5e1 100644 --- a/src/mame/tvgames/generalplus_gpl16250_rom.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_rom.cpp @@ -13,7 +13,7 @@ */ #include "emu.h" -#include "includes/generalplus_gpl16250.h" +#include "generalplus_gpl16250.h" static INPUT_PORTS_START( smartfp ) diff --git a/src/mame/tvgames/generalplus_gpl16250_romram.cpp b/src/mame/tvgames/generalplus_gpl16250_romram.cpp index b3d4215d5e7..2192c6a5310 100644 --- a/src/mame/tvgames/generalplus_gpl16250_romram.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_romram.cpp @@ -13,7 +13,7 @@ */ #include "emu.h" -#include "includes/generalplus_gpl16250_romram.h" +#include "generalplus_gpl16250_romram.h" static INPUT_PORTS_START( wrlshunt ) diff --git a/src/mame/tvgames/generalplus_gpl16250_romram.h b/src/mame/tvgames/generalplus_gpl16250_romram.h index 23cc5c9c30b..cc054b775db 100644 --- a/src/mame/tvgames/generalplus_gpl16250_romram.h +++ b/src/mame/tvgames/generalplus_gpl16250_romram.h @@ -5,9 +5,9 @@ #pragma once -#include "includes/generalplus_gpl16250.h" +#include "generalplus_gpl16250.h" #include "machine/generalplus_gpl16250soc.h" -#include "machine/generalplus_gpl16250.h" +#include "generalplus_gpl16250_m.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/tvgames/generalplus_gpl16250_spi.cpp b/src/mame/tvgames/generalplus_gpl16250_spi.cpp index 4ca9637b248..8b4c5fdeac3 100644 --- a/src/mame/tvgames/generalplus_gpl16250_spi.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_spi.cpp @@ -13,7 +13,7 @@ */ #include "emu.h" -#include "includes/generalplus_gpl16250.h" +#include "generalplus_gpl16250.h" #include "softlist_dev.h" diff --git a/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp b/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp index 8b9f36a457f..7b18458701f 100644 --- a/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp @@ -11,7 +11,7 @@ */ #include "emu.h" -#include "includes/generalplus_gpl16250.h" +#include "generalplus_gpl16250.h" class generalplus_gpspi_direct_game_state : public gcm394_game_state { diff --git a/src/mame/tvgames/spg29x.cpp b/src/mame/tvgames/spg29x.cpp index c471a6fd11d..955c50173b2 100644 --- a/src/mame/tvgames/spg29x.cpp +++ b/src/mame/tvgames/spg29x.cpp @@ -76,8 +76,8 @@ #include "machine/spg290_i2c.h" #include "machine/spg290_ppu.h" #include "machine/spg290_timer.h" -#include "machine/hyperscan_card.h" -#include "machine/hyperscan_ctrl.h" +#include "hyperscan_card.h" +#include "hyperscan_ctrl.h" #include "screen.h" #include "softlist_dev.h" diff --git a/src/mame/tvgames/spg2xx.cpp b/src/mame/tvgames/spg2xx.cpp index c9a249ab426..e942271496b 100644 --- a/src/mame/tvgames/spg2xx.cpp +++ b/src/mame/tvgames/spg2xx.cpp @@ -147,7 +147,7 @@ *******************************************************************************/ #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" /************************* diff --git a/src/mame/tvgames/spg2xx_digimake.cpp b/src/mame/tvgames/spg2xx_digimake.cpp index 989e432a333..8e0016d06c0 100644 --- a/src/mame/tvgames/spg2xx_digimake.cpp +++ b/src/mame/tvgames/spg2xx_digimake.cpp @@ -5,7 +5,7 @@ // - why do we need a hack to boot? #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "machine/nvram.h" class spg2xx_game_digimake_state : public spg2xx_game_state diff --git a/src/mame/tvgames/spg2xx_dreamlife.cpp b/src/mame/tvgames/spg2xx_dreamlife.cpp index 33afcae960d..6a8483df05c 100644 --- a/src/mame/tvgames/spg2xx_dreamlife.cpp +++ b/src/mame/tvgames/spg2xx_dreamlife.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz, David Haywood #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "machine/eepromser.h" diff --git a/src/mame/tvgames/spg2xx_ican.cpp b/src/mame/tvgames/spg2xx_ican.cpp index b63397f8eb6..3a68ac35d0e 100644 --- a/src/mame/tvgames/spg2xx_ican.cpp +++ b/src/mame/tvgames/spg2xx_ican.cpp @@ -4,7 +4,7 @@ /* Fisher Price / Mattel "I Can..." systems */ #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/tvgames/spg2xx_jakks.cpp b/src/mame/tvgames/spg2xx_jakks.cpp index 7deed4f8473..bfcb7e8f1ed 100644 --- a/src/mame/tvgames/spg2xx_jakks.cpp +++ b/src/mame/tvgames/spg2xx_jakks.cpp @@ -5,7 +5,7 @@ // - Scorpion's 'get over here' sounds don't decode well #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "machine/nvram.h" class jakks_state : public spg2xx_game_state diff --git a/src/mame/tvgames/spg2xx_jakks_gkr.cpp b/src/mame/tvgames/spg2xx_jakks_gkr.cpp index 63b5c95343c..48fd59422d9 100644 --- a/src/mame/tvgames/spg2xx_jakks_gkr.cpp +++ b/src/mame/tvgames/spg2xx_jakks_gkr.cpp @@ -4,7 +4,7 @@ // Note: even after the GameKey port was physically removed and the PCBs redesigned, many of the test modes still show the value read from the port (and many games still show the Game Key Ready splash screen on startup) #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "bus/jakks_gamekey/slot.h" #include "softlist_dev.h" diff --git a/src/mame/tvgames/spg2xx_jakks_sharp.cpp b/src/mame/tvgames/spg2xx_jakks_sharp.cpp index e77b205a8b2..d5389d761d4 100644 --- a/src/mame/tvgames/spg2xx_jakks_sharp.cpp +++ b/src/mame/tvgames/spg2xx_jakks_sharp.cpp @@ -4,7 +4,7 @@ // Sharp Cookie units were published by JAKKS Pacific under the 'Child Guidance' brand (battery compartments etc. still have JAKKS branding) #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "machine/nvram.h" class jakks_sharp_state : public spg2xx_game_state diff --git a/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp b/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp index 55fed19d0d8..98ac6a11ff1 100644 --- a/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp +++ b/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz, David Haywood #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" class jakks_tvtouch_state : public spg2xx_game_state { diff --git a/src/mame/tvgames/spg2xx_lexibook.cpp b/src/mame/tvgames/spg2xx_lexibook.cpp index ada0488c068..0cdebba05d0 100644 --- a/src/mame/tvgames/spg2xx_lexibook.cpp +++ b/src/mame/tvgames/spg2xx_lexibook.cpp @@ -6,7 +6,7 @@ // of note, the way the audio is stored for Tiger Rescue has been updated and the core does not handle it properly at the moment #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" class spg2xx_lexizeus_game_state : public spg2xx_game_state diff --git a/src/mame/tvgames/spg2xx_mysprtch.cpp b/src/mame/tvgames/spg2xx_mysprtch.cpp index e8e7d87fca3..479cff6faa1 100644 --- a/src/mame/tvgames/spg2xx_mysprtch.cpp +++ b/src/mame/tvgames/spg2xx_mysprtch.cpp @@ -3,7 +3,7 @@ #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" class spg2xx_game_mysprt_plus_state : public spg2xx_game_state diff --git a/src/mame/tvgames/spg2xx_pdc.cpp b/src/mame/tvgames/spg2xx_pdc.cpp index 431a4dd9deb..178af8d33ba 100644 --- a/src/mame/tvgames/spg2xx_pdc.cpp +++ b/src/mame/tvgames/spg2xx_pdc.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz, David Haywood #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" class spg2xx_pdc_game_state : public spg2xx_game_state diff --git a/src/mame/tvgames/spg2xx_playvision.cpp b/src/mame/tvgames/spg2xx_playvision.cpp index 65f14a39c67..8a8870840a1 100644 --- a/src/mame/tvgames/spg2xx_playvision.cpp +++ b/src/mame/tvgames/spg2xx_playvision.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz, David Haywood #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "pvmil.lh" diff --git a/src/mame/tvgames/spg2xx_senario.cpp b/src/mame/tvgames/spg2xx_senario.cpp index 23b00027262..497b95f60d2 100644 --- a/src/mame/tvgames/spg2xx_senario.cpp +++ b/src/mame/tvgames/spg2xx_senario.cpp @@ -15,7 +15,7 @@ */ #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "machine/intelfsh.h" diff --git a/src/mame/tvgames/spg2xx_senario_poker.cpp b/src/mame/tvgames/spg2xx_senario_poker.cpp index f75c83162d0..9fba0e2ee5e 100644 --- a/src/mame/tvgames/spg2xx_senario_poker.cpp +++ b/src/mame/tvgames/spg2xx_senario_poker.cpp @@ -9,7 +9,7 @@ improve controller hookup / simulation and remove PC-based hacks! */ #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "sentx6p.lh" diff --git a/src/mame/tvgames/spg2xx_senca.cpp b/src/mame/tvgames/spg2xx_senca.cpp index 1cbb0e27f85..884907efe70 100644 --- a/src/mame/tvgames/spg2xx_senca.cpp +++ b/src/mame/tvgames/spg2xx_senca.cpp @@ -4,7 +4,7 @@ /* Shenzhen Senca Technology Co., Ltd developed "Family Sport" systems - sold by various manufacturers */ #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" class zon32bit_state : public spg2xx_game_state diff --git a/src/mame/tvgames/spg2xx_shredmjr.cpp b/src/mame/tvgames/spg2xx_shredmjr.cpp index 8b303d6788c..c0f9dc93c00 100644 --- a/src/mame/tvgames/spg2xx_shredmjr.cpp +++ b/src/mame/tvgames/spg2xx_shredmjr.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz, David Haywood #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" class shredmjr_game_state : public spg2xx_game_state diff --git a/src/mame/tvgames/spg2xx_skannerztv.cpp b/src/mame/tvgames/spg2xx_skannerztv.cpp index 797b9bc7fa6..d0069ad0ca3 100644 --- a/src/mame/tvgames/spg2xx_skannerztv.cpp +++ b/src/mame/tvgames/spg2xx_skannerztv.cpp @@ -289,7 +289,7 @@ doPlayerMore(player) */ #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "machine/nvram.h" class skannerztv_state : public spg2xx_game_state diff --git a/src/mame/tvgames/spg2xx_smarttv.cpp b/src/mame/tvgames/spg2xx_smarttv.cpp index 29ac50a5813..b632a1391fc 100644 --- a/src/mame/tvgames/spg2xx_smarttv.cpp +++ b/src/mame/tvgames/spg2xx_smarttv.cpp @@ -7,7 +7,7 @@ // it's possible some of the base units have ROM, although the US version does not. #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/tvgames/spg2xx_telestory.cpp b/src/mame/tvgames/spg2xx_telestory.cpp index ae8b3e95ec4..82b73c8968f 100644 --- a/src/mame/tvgames/spg2xx_telestory.cpp +++ b/src/mame/tvgames/spg2xx_telestory.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz, David Haywood #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/tvgames/spg2xx_tvgogo.cpp b/src/mame/tvgames/spg2xx_tvgogo.cpp index a2b0fdd300e..54221210bc5 100644 --- a/src/mame/tvgames/spg2xx_tvgogo.cpp +++ b/src/mame/tvgames/spg2xx_tvgogo.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz, David Haywood #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/tvgames/spg2xx_vii.cpp b/src/mame/tvgames/spg2xx_vii.cpp index 968a170fb86..495a65a487a 100644 --- a/src/mame/tvgames/spg2xx_vii.cpp +++ b/src/mame/tvgames/spg2xx_vii.cpp @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz, David Haywood #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/tvgames/spg2xx_wiwi.cpp b/src/mame/tvgames/spg2xx_wiwi.cpp index c06992988ae..2df08259d60 100644 --- a/src/mame/tvgames/spg2xx_wiwi.cpp +++ b/src/mame/tvgames/spg2xx_wiwi.cpp @@ -15,7 +15,7 @@ #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" class spg2xx_game_wiwi18_state : public spg2xx_game_state { diff --git a/src/mame/tvgames/spg2xx_zone.cpp b/src/mame/tvgames/spg2xx_zone.cpp index 93e172d759e..3780f5e9358 100644 --- a/src/mame/tvgames/spg2xx_zone.cpp +++ b/src/mame/tvgames/spg2xx_zone.cpp @@ -5,7 +5,7 @@ // also Waixing developed systems for the lower capacity (~40 game) units #include "emu.h" -#include "includes/spg2xx.h" +#include "spg2xx.h" class wireless60_state : public spg2xx_game_state diff --git a/src/mame/tvgames/st2302u_bbl_rom.cpp b/src/mame/tvgames/st2302u_bbl_rom.cpp index 9aa2520c110..624ba18269c 100644 --- a/src/mame/tvgames/st2302u_bbl_rom.cpp +++ b/src/mame/tvgames/st2302u_bbl_rom.cpp @@ -3,7 +3,7 @@ #include "emu.h" #include "cpu/m6502/st2205u.h" -#include "video/bl_handhelds_lcdc.h" +#include "bl_handhelds_lcdc.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/tvgames/st2302u_bbl_spi.cpp b/src/mame/tvgames/st2302u_bbl_spi.cpp index 6383103404a..7d73091f073 100644 --- a/src/mame/tvgames/st2302u_bbl_spi.cpp +++ b/src/mame/tvgames/st2302u_bbl_spi.cpp @@ -29,7 +29,7 @@ #include "cpu/m6502/st2205u.h" #include "machine/bl_handhelds_menucontrol.h" -#include "video/bl_handhelds_lcdc.h" +#include "bl_handhelds_lcdc.h" #include "screen.h" #include "emupal.h" diff --git a/src/mame/tvgames/xavix.cpp b/src/mame/tvgames/xavix.cpp index b5e66f981a2..1765aa4960a 100644 --- a/src/mame/tvgames/xavix.cpp +++ b/src/mame/tvgames/xavix.cpp @@ -231,7 +231,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/xavix.h" +#include "xavix.h" #include "softlist_dev.h" diff --git a/src/mame/tvgames/xavix.h b/src/mame/tvgames/xavix.h index f2c6b544578..da52cf314b2 100644 --- a/src/mame/tvgames/xavix.h +++ b/src/mame/tvgames/xavix.h @@ -16,13 +16,13 @@ #include "bus/ekara/slot.h" #include "machine/nvram.h" -#include "machine/xavix_mtrk_wheel.h" -#include "machine/xavix_madfb_ball.h" -#include "machine/xavix2002_io.h" -#include "machine/xavix_io.h" -#include "machine/xavix_adc.h" -#include "machine/xavix_anport.h" -#include "machine/xavix_math.h" +#include "xavix_mtrk_wheel.h" +#include "xavix_madfb_ball.h" +#include "xavix2002_io.h" +#include "xavix_io.h" +#include "xavix_adc.h" +#include "xavix_anport.h" +#include "xavix_math.h" // NTSC clock for regular XaviX? #define MAIN_CLOCK XTAL(21'477'272) diff --git a/src/mame/tvgames/xavix_2000.cpp b/src/mame/tvgames/xavix_2000.cpp index c6909d45b17..76f9ae14dbb 100644 --- a/src/mame/tvgames/xavix_2000.cpp +++ b/src/mame/tvgames/xavix_2000.cpp @@ -16,7 +16,7 @@ */ #include "emu.h" -#include "includes/xavix_2002.h" +#include "xavix_2002.h" // #define VERBOSE 1 #include "logmacro.h" diff --git a/src/mame/tvgames/xavix_2002.cpp b/src/mame/tvgames/xavix_2002.cpp index aa5c03e0a64..3a1475f444c 100644 --- a/src/mame/tvgames/xavix_2002.cpp +++ b/src/mame/tvgames/xavix_2002.cpp @@ -12,7 +12,7 @@ */ #include "emu.h" -#include "includes/xavix_2002.h" +#include "xavix_2002.h" // #define VERBOSE 1 #include "logmacro.h" diff --git a/src/mame/tvgames/xavix_a.cpp b/src/mame/tvgames/xavix_a.cpp index ab5b2387a86..b16c0490734 100644 --- a/src/mame/tvgames/xavix_a.cpp +++ b/src/mame/tvgames/xavix_a.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" -#include "includes/xavix.h" +#include "xavix.h" // #define VERBOSE 1 #include "logmacro.h" diff --git a/src/mame/tvgames/xavix_m.cpp b/src/mame/tvgames/xavix_m.cpp index d56ef68366e..efb0fa8ea9e 100644 --- a/src/mame/tvgames/xavix_m.cpp +++ b/src/mame/tvgames/xavix_m.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" -#include "includes/xavix.h" +#include "xavix.h" // #define VERBOSE 1 #include "logmacro.h" diff --git a/src/mame/tvgames/xavix_madfb_ball.cpp b/src/mame/tvgames/xavix_madfb_ball.cpp index b773460c990..a127ebdeeed 100644 --- a/src/mame/tvgames/xavix_madfb_ball.cpp +++ b/src/mame/tvgames/xavix_madfb_ball.cpp @@ -14,7 +14,7 @@ */ #include "emu.h" -#include "machine/xavix_madfb_ball.h" +#include "xavix_madfb_ball.h" DEFINE_DEVICE_TYPE(XAVIX_MADFB_BALL, xavix_madfb_ball_device, "xavix_madfb_ball", "XaviX / Radica Football Ball") diff --git a/src/mame/tvgames/xavix_mtrk_wheel.cpp b/src/mame/tvgames/xavix_mtrk_wheel.cpp index ad3e8b7982e..207b32563c1 100644 --- a/src/mame/tvgames/xavix_mtrk_wheel.cpp +++ b/src/mame/tvgames/xavix_mtrk_wheel.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood #include "emu.h" -#include "machine/xavix_mtrk_wheel.h" +#include "xavix_mtrk_wheel.h" DEFINE_DEVICE_TYPE(XAVIX_MTRK_WHEEL, xavix_mtrk_wheel_device, "xavix_mtrk_wheel", "XaviX / Radica Monster Truck Steering Wheel") diff --git a/src/mame/tvgames/xavix_v.cpp b/src/mame/tvgames/xavix_v.cpp index 3e5fa11035a..d8817bfb323 100644 --- a/src/mame/tvgames/xavix_v.cpp +++ b/src/mame/tvgames/xavix_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood #include "emu.h" -#include "includes/xavix.h" +#include "xavix.h" #include diff --git a/src/mame/unico/drgnmst.cpp b/src/mame/unico/drgnmst.cpp index 527c1aba151..c44dcb90ffa 100644 --- a/src/mame/unico/drgnmst.cpp +++ b/src/mame/unico/drgnmst.cpp @@ -88,7 +88,7 @@ MF-0x are locations silkscreened on the PCB */ #include "emu.h" -#include "includes/drgnmst.h" +#include "drgnmst.h" #include "cpu/m68000/m68000.h" #include "screen.h" diff --git a/src/mame/unico/drgnmst_v.cpp b/src/mame/unico/drgnmst_v.cpp index 5ed9b304079..caaa0cb861c 100644 --- a/src/mame/unico/drgnmst_v.cpp +++ b/src/mame/unico/drgnmst_v.cpp @@ -5,7 +5,7 @@ // layer priority register not fully understood #include "emu.h" -#include "includes/drgnmst.h" +#include "drgnmst.h" rgb_t drgnmst_base_state::drgnmst_IIIIRRRRGGGGBBBB(uint32_t raw) diff --git a/src/mame/unico/silkroad.cpp b/src/mame/unico/silkroad.cpp index 19c0685f4d8..f50abcc2e97 100644 --- a/src/mame/unico/silkroad.cpp +++ b/src/mame/unico/silkroad.cpp @@ -7,7 +7,7 @@ /* and preliminary sound hookup by R. Belmont + fixes by Pierpaolo Prazzoli */ #include "emu.h" -#include "includes/silkroad.h" +#include "silkroad.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" diff --git a/src/mame/unico/silkroad_v.cpp b/src/mame/unico/silkroad_v.cpp index d29cdd0934b..ee80746ad14 100644 --- a/src/mame/unico/silkroad_v.cpp +++ b/src/mame/unico/silkroad_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, R. Belmont #include "emu.h" -#include "includes/silkroad.h" +#include "silkroad.h" #include "screen.h" /* Sprites probably need to be delayed */ diff --git a/src/mame/unico/unico.cpp b/src/mame/unico/unico.cpp index 6aef71f5c90..c2bb3665508 100644 --- a/src/mame/unico/unico.cpp +++ b/src/mame/unico/unico.cpp @@ -25,7 +25,7 @@ Year + Game PCB Notes ***************************************************************************/ #include "emu.h" -#include "includes/unico.h" +#include "unico.h" #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" diff --git a/src/mame/unico/unico_v.cpp b/src/mame/unico/unico_v.cpp index f20aa408943..9a9edadae98 100644 --- a/src/mame/unico/unico_v.cpp +++ b/src/mame/unico/unico_v.cpp @@ -39,7 +39,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "emu.h" -#include "includes/unico.h" +#include "unico.h" /*************************************************************************** diff --git a/src/mame/unisonic/unichamp.cpp b/src/mame/unisonic/unichamp.cpp index 7790766c6b1..41716e53ae7 100644 --- a/src/mame/unisonic/unichamp.cpp +++ b/src/mame/unisonic/unichamp.cpp @@ -42,7 +42,7 @@ #include "emu.h" #include "cpu/cp1610/cp1610.h" -#include "video/gic.h" +#include "gic.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" diff --git a/src/mame/univers/cheekyms.cpp b/src/mame/univers/cheekyms.cpp index 05ed301bba6..c14a87a960b 100644 --- a/src/mame/univers/cheekyms.cpp +++ b/src/mame/univers/cheekyms.cpp @@ -7,7 +7,7 @@ **************************************************************************/ #include "emu.h" -#include "includes/cheekyms.h" +#include "cheekyms.h" #include "cpu/z80/z80.h" diff --git a/src/mame/univers/cheekyms.h b/src/mame/univers/cheekyms.h index cd3d6c03de7..068ba663d13 100644 --- a/src/mame/univers/cheekyms.h +++ b/src/mame/univers/cheekyms.h @@ -10,7 +10,7 @@ #pragma once -#include "audio/cheekyms.h" +#include "cheekyms_a.h" #include "sound/dac.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/univers/cheekyms_a.cpp b/src/mame/univers/cheekyms_a.cpp index 1ff076de3c0..f5268f62b10 100644 --- a/src/mame/univers/cheekyms_a.cpp +++ b/src/mame/univers/cheekyms_a.cpp @@ -2,8 +2,8 @@ // copyright-holders:Vas Crabb #include "emu.h" -#include "audio/cheekyms.h" -#include "audio/nl_cheekyms.h" +#include "cheekyms_a.h" +#include "nl_cheekyms.h" #include "speaker.h" diff --git a/src/mame/univers/cheekyms_v.cpp b/src/mame/univers/cheekyms_v.cpp index dbada8340e8..a74b2033c70 100644 --- a/src/mame/univers/cheekyms_v.cpp +++ b/src/mame/univers/cheekyms_v.cpp @@ -9,7 +9,7 @@ Functions to emulate the video hardware of the machine. ***************************************************************************/ #include "emu.h" -#include "includes/cheekyms.h" +#include "cheekyms.h" // bit 3 and 7 of the char color PROMs are used for something -- not currently emulated - thus GAME_IMPERFECT_GRAPHICS diff --git a/src/mame/univers/cosmic.cpp b/src/mame/univers/cosmic.cpp index c7608bc1c27..90ce1e41d91 100644 --- a/src/mame/univers/cosmic.cpp +++ b/src/mame/univers/cosmic.cpp @@ -30,7 +30,7 @@ a physical DSW B but only read when SWA:3,4 are both set to OFF. Currently, #include "emu.h" -#include "includes/cosmic.h" +#include "cosmic.h" #include "cpu/z80/z80.h" #include "sound/samples.h" diff --git a/src/mame/univers/cosmic_v.cpp b/src/mame/univers/cosmic_v.cpp index 7f7cc234e3d..f2f5aa3e105 100644 --- a/src/mame/univers/cosmic_v.cpp +++ b/src/mame/univers/cosmic_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/cosmic.h" +#include "cosmic.h" void cosmic_state::cosmic_color_register_w(offs_t offset, uint8_t data) diff --git a/src/mame/univers/docastle.cpp b/src/mame/univers/docastle.cpp index 912c04aa103..3af22809d34 100644 --- a/src/mame/univers/docastle.cpp +++ b/src/mame/univers/docastle.cpp @@ -159,7 +159,7 @@ Dip locations verified with manual for docastle, dorunrun and dowild. ***************************************************************************/ #include "emu.h" -#include "includes/docastle.h" +#include "docastle.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/univers/docastle_m.cpp b/src/mame/univers/docastle_m.cpp index b7126d1f80f..789bab3f34c 100644 --- a/src/mame/univers/docastle_m.cpp +++ b/src/mame/univers/docastle_m.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "includes/docastle.h" +#include "docastle.h" #define LOG 0 diff --git a/src/mame/univers/docastle_v.cpp b/src/mame/univers/docastle_v.cpp index e4df2a5b281..9f4c4af2c77 100644 --- a/src/mame/univers/docastle_v.cpp +++ b/src/mame/univers/docastle_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/docastle.h" +#include "docastle.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/univers/ladybug.cpp b/src/mame/univers/ladybug.cpp index ef41f1f7fd7..d6e8b8869ae 100644 --- a/src/mame/univers/ladybug.cpp +++ b/src/mame/univers/ladybug.cpp @@ -70,7 +70,7 @@ unknown dips ***************************************************************************/ #include "emu.h" -#include "includes/ladybug.h" +#include "ladybug.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/univers/ladybug.h b/src/mame/univers/ladybug.h index d703c2e29c6..8c34b2a1e16 100644 --- a/src/mame/univers/ladybug.h +++ b/src/mame/univers/ladybug.h @@ -10,7 +10,7 @@ #pragma once -#include "video/ladybug.h" +#include "ladybug_v.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/univers/ladybug_v.cpp b/src/mame/univers/ladybug_v.cpp index 958e2cc7638..458c1b64e87 100644 --- a/src/mame/univers/ladybug_v.cpp +++ b/src/mame/univers/ladybug_v.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "emu.h" +#include "ladybug_v.h" #include "ladybug.h" -#include "includes/ladybug.h" #include "video/resnet.h" diff --git a/src/mame/univers/mrdo.cpp b/src/mame/univers/mrdo.cpp index ba9552a6d48..b710544ec6e 100644 --- a/src/mame/univers/mrdo.cpp +++ b/src/mame/univers/mrdo.cpp @@ -23,7 +23,7 @@ is also 8106 and has the same sound chips. ***************************************************************************/ #include "emu.h" -#include "includes/mrdo.h" +#include "mrdo.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" diff --git a/src/mame/univers/mrdo_v.cpp b/src/mame/univers/mrdo_v.cpp index 53ac33eb6ec..412f8cacbf7 100644 --- a/src/mame/univers/mrdo_v.cpp +++ b/src/mame/univers/mrdo_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/mrdo.h" +#include "mrdo.h" /*************************************************************************** diff --git a/src/mame/univers/redclash.cpp b/src/mame/univers/redclash.cpp index 5905b3507d7..b3c6d2423f4 100644 --- a/src/mame/univers/redclash.cpp +++ b/src/mame/univers/redclash.cpp @@ -23,7 +23,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/redclash.h" +#include "redclash.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/univers/redclash.h b/src/mame/univers/redclash.h index fa78de9dfb5..f35f08c7cba 100644 --- a/src/mame/univers/redclash.h +++ b/src/mame/univers/redclash.h @@ -10,7 +10,7 @@ #pragma once -#include "video/ladybug.h" +#include "ladybug_v.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/univers/redclash_v.cpp b/src/mame/univers/redclash_v.cpp index 573f01bed1f..22b70494346 100644 --- a/src/mame/univers/redclash_v.cpp +++ b/src/mame/univers/redclash_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/redclash.h" +#include "redclash.h" #include "video/resnet.h" /*************************************************************************** diff --git a/src/mame/upl/mouser.cpp b/src/mame/upl/mouser.cpp index 81758f94b73..21bda00884c 100644 --- a/src/mame/upl/mouser.cpp +++ b/src/mame/upl/mouser.cpp @@ -15,7 +15,7 @@ *******************************************************************************/ #include "emu.h" -#include "includes/mouser.h" +#include "mouser.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/upl/mouser_v.cpp b/src/mame/upl/mouser_v.cpp index 09896fc4bf0..4bd6fa0e7c1 100644 --- a/src/mame/upl/mouser_v.cpp +++ b/src/mame/upl/mouser_v.cpp @@ -16,7 +16,7 @@ *******************************************************************************/ #include "emu.h" -#include "includes/mouser.h" +#include "mouser.h" void mouser_state::mouser_palette(palette_device &palette) const { diff --git a/src/mame/upl/ninjakd2.cpp b/src/mame/upl/ninjakd2.cpp index 27464bde788..6fbc9b61ae3 100644 --- a/src/mame/upl/ninjakd2.cpp +++ b/src/mame/upl/ninjakd2.cpp @@ -151,11 +151,13 @@ TODO: ******************************************************************************/ #include "emu.h" -#include "includes/ninjakd2.h" +#include "ninjakd2.h" + +#include "mc8123.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" -#include "machine/mc8123.h" + #include "sound/ymopn.h" #include "speaker.h" diff --git a/src/mame/upl/ninjakd2_v.cpp b/src/mame/upl/ninjakd2_v.cpp index 2ec95db5dff..1d45fecb827 100644 --- a/src/mame/upl/ninjakd2_v.cpp +++ b/src/mame/upl/ninjakd2_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/ninjakd2.h" +#include "ninjakd2.h" /************************************* * diff --git a/src/mame/upl/nova2001.cpp b/src/mame/upl/nova2001.cpp index 950e7a550c3..2fe5e47cea2 100644 --- a/src/mame/upl/nova2001.cpp +++ b/src/mame/upl/nova2001.cpp @@ -122,7 +122,7 @@ e000 - e7ff R/W Work RAM ******************************************************************************/ #include "emu.h" -#include "includes/nova2001.h" +#include "nova2001.h" #include "machine/watchdog.h" #include "sound/ay8910.h" diff --git a/src/mame/upl/nova2001_v.cpp b/src/mame/upl/nova2001_v.cpp index 0ffef93368a..7812e9a27eb 100644 --- a/src/mame/upl/nova2001_v.cpp +++ b/src/mame/upl/nova2001_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Howie Cohen, Frank Palazzolo, Alex Pasadyn, David Haywood, Phil Stroffolino, Uki #include "emu.h" -#include "includes/nova2001.h" +#include "nova2001.h" /************************************* diff --git a/src/mame/usp/patinho_feio.cpp b/src/mame/usp/patinho_feio.cpp index 51d423f8f3f..aebd744ad92 100644 --- a/src/mame/usp/patinho_feio.cpp +++ b/src/mame/usp/patinho_feio.cpp @@ -9,7 +9,7 @@ #include "bus/generic/carts.h" #include "softlist.h" #include "cpu/patinhofeio/patinhofeio_cpu.h" -#include "includes/patinhofeio.h" +#include "patinhofeio.h" #include "patinho.lh" /* diff --git a/src/mame/usp/patinhofeio.h b/src/mame/usp/patinhofeio.h index 4b79ba1564d..c8d1894549c 100644 --- a/src/mame/usp/patinhofeio.h +++ b/src/mame/usp/patinhofeio.h @@ -1,11 +1,11 @@ // license:GPL2+ // copyright-holders:Felipe Sanches -#ifndef MAME_INCLUDES_PATINHOFEIO_H -#define MAME_INCLUDES_PATINHOFEIO_H +#ifndef MAME_USP_PATINHOFEIO_H +#define MAME_USP_PATINHOFEIO_H #pragma once -#include "machine/teleprinter.h" +#include "teleprinter.h" class patinho_feio_state : public driver_device { public: @@ -58,4 +58,4 @@ private: uint16_t m_prev_RC = 0; }; -#endif // MAME_INCLUDES_PATINHOFEIO_H +#endif // MAME_USP_PATINHOFEIO_H diff --git a/src/mame/valadon/bagman.cpp b/src/mame/valadon/bagman.cpp index 5cfc7c72cca..0e0dcd5dfca 100644 --- a/src/mame/valadon/bagman.cpp +++ b/src/mame/valadon/bagman.cpp @@ -63,7 +63,7 @@ DIP locations verified for: ***************************************************************************/ #include "emu.h" -#include "includes/bagman.h" +#include "bagman.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/valadon/bagman_m.cpp b/src/mame/valadon/bagman_m.cpp index 8da02dd1ffd..e5ce0f6c3ee 100644 --- a/src/mame/valadon/bagman_m.cpp +++ b/src/mame/valadon/bagman_m.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/bagman.h" +#include "bagman.h" /*Creation date: 98-02-18 */ diff --git a/src/mame/valadon/bagman_v.cpp b/src/mame/valadon/bagman_v.cpp index a520555e60e..c434835a352 100644 --- a/src/mame/valadon/bagman_v.cpp +++ b/src/mame/valadon/bagman_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/bagman.h" +#include "bagman.h" void bagman_state::videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/veb/kc.cpp b/src/mame/veb/kc.cpp index 3c902f6c1cd..9a7ea78325b 100644 --- a/src/mame/veb/kc.cpp +++ b/src/mame/veb/kc.cpp @@ -15,7 +15,7 @@ /* Core includes */ #include "emu.h" -#include "includes/kc.h" +#include "kc.h" #include "machine/input_merger.h" #include "softlist_dev.h" diff --git a/src/mame/veb/kc.h b/src/mame/veb/kc.h index 949687569dc..272c235e190 100644 --- a/src/mame/veb/kc.h +++ b/src/mame/veb/kc.h @@ -21,7 +21,7 @@ #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "machine/ram.h" -#include "machine/kc_keyb.h" +#include "kc_keyb.h" #include "machine/rescap.h" #include "sound/spkrdev.h" #include "emupal.h" diff --git a/src/mame/veb/kc_m.cpp b/src/mame/veb/kc_m.cpp index febbb1b5d14..832e198cd86 100644 --- a/src/mame/veb/kc_m.cpp +++ b/src/mame/veb/kc_m.cpp @@ -2,7 +2,7 @@ // copyright-holders:Kevin Thacker,Sandro Ronco /* Core includes */ #include "emu.h" -#include "includes/kc.h" +#include "kc.h" #define KC_DEBUG 0 #define LOG(x) do { if (KC_DEBUG) logerror x; } while (0) diff --git a/src/mame/veb/kc_v.cpp b/src/mame/veb/kc_v.cpp index b9ccc6cdbea..383eb48ceba 100644 --- a/src/mame/veb/kc_v.cpp +++ b/src/mame/veb/kc_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/kc.h" +#include "kc.h" #include "screen.h" diff --git a/src/mame/venture/spcforce.cpp b/src/mame/venture/spcforce.cpp index 5c5b399fde0..06816c27f18 100644 --- a/src/mame/venture/spcforce.cpp +++ b/src/mame/venture/spcforce.cpp @@ -36,7 +36,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "includes/spcforce.h" +#include "spcforce.h" #include "cpu/i8085/i8085.h" #include "machine/gen_latch.h" diff --git a/src/mame/venture/spcforce_v.cpp b/src/mame/venture/spcforce_v.cpp index 28fe46ace89..5fc5353aab6 100644 --- a/src/mame/venture/spcforce_v.cpp +++ b/src/mame/venture/spcforce_v.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/spcforce.h" +#include "spcforce.h" WRITE_LINE_MEMBER(spcforce_state::flip_screen_w) diff --git a/src/mame/venture/suprridr.cpp b/src/mame/venture/suprridr.cpp index a13296b36ab..5107a91066c 100644 --- a/src/mame/venture/suprridr.cpp +++ b/src/mame/venture/suprridr.cpp @@ -84,7 +84,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/suprridr.h" +#include "suprridr.h" #include "cpu/z80/z80.h" #include "machine/watchdog.h" diff --git a/src/mame/venture/suprridr_v.cpp b/src/mame/venture/suprridr_v.cpp index 343aca69cac..7dfe7b5442d 100644 --- a/src/mame/venture/suprridr_v.cpp +++ b/src/mame/venture/suprridr_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/suprridr.h" +#include "suprridr.h" #include "screen.h" diff --git a/src/mame/verifone/tranz330.cpp b/src/mame/verifone/tranz330.cpp index 77fce7d111d..77fad03ef36 100644 --- a/src/mame/verifone/tranz330.cpp +++ b/src/mame/verifone/tranz330.cpp @@ -21,7 +21,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/tranz330.h" +#include "tranz330.h" #include "machine/input_merger.h" #include "speaker.h" diff --git a/src/mame/vidbrain/vidbrain.cpp b/src/mame/vidbrain/vidbrain.cpp index c342f11db28..e3e8fecf120 100644 --- a/src/mame/vidbrain/vidbrain.cpp +++ b/src/mame/vidbrain/vidbrain.cpp @@ -51,7 +51,7 @@ Using the system: */ #include "emu.h" -#include "includes/vidbrain.h" +#include "vidbrain.h" #include "machine/rescap.h" #include "softlist_dev.h" diff --git a/src/mame/vidbrain/vidbrain.h b/src/mame/vidbrain/vidbrain.h index 22d42450789..9461e4ff645 100644 --- a/src/mame/vidbrain/vidbrain.h +++ b/src/mame/vidbrain/vidbrain.h @@ -10,7 +10,7 @@ #include "machine/f3853.h" #include "machine/ram.h" #include "sound/dac.h" -#include "video/uv201.h" +#include "uv201.h" #define F3850_TAG "cd34" #define F3853_TAG "cd5" diff --git a/src/mame/videoton/tvc.cpp b/src/mame/videoton/tvc.cpp index 7d1b4a2a8b4..fa156fc5540 100644 --- a/src/mame/videoton/tvc.cpp +++ b/src/mame/videoton/tvc.cpp @@ -13,7 +13,7 @@ ****************************************************************************/ #include "emu.h" -#include "audio/tvc.h" +#include "tvc_a.h" #include "cpu/z80/z80.h" #include "imagedev/cassette.h" diff --git a/src/mame/videoton/tvc_a.cpp b/src/mame/videoton/tvc_a.cpp index eb11d69ef86..d80dfa1a97f 100644 --- a/src/mame/videoton/tvc_a.cpp +++ b/src/mame/videoton/tvc_a.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "tvc.h" +#include "tvc_a.h" // device type definition DEFINE_DEVICE_TYPE(TVC_SOUND, tvc_sound_device, "tvc_sound", "TVC 64 Custom Sound") diff --git a/src/mame/virtual.flt b/src/mame/virtual.flt new file mode 100644 index 00000000000..acda15fcba5 --- /dev/null +++ b/src/mame/virtual.flt @@ -0,0 +1,3 @@ +virtual/vgmplay.cpp +virtual/wavesynth.cpp +virtual/ldplayer.cpp diff --git a/src/mame/virtual.lst b/src/mame/virtual.lst deleted file mode 100644 index f53d1fff9d2..00000000000 --- a/src/mame/virtual.lst +++ /dev/null @@ -1,6 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Olivier Galibert -vgmplay -simldv1000 -simpr8210 -wavesynth diff --git a/src/mame/virtual/vgmplay.cpp b/src/mame/virtual/vgmplay.cpp index ddfb6d23da9..a7402341fb4 100644 --- a/src/mame/virtual/vgmplay.cpp +++ b/src/mame/virtual/vgmplay.cpp @@ -43,9 +43,10 @@ #include "sound/ymopm.h" #include "sound/ymopn.h" #include "sound/ymz280b.h" -#include "audio/vboy.h" -#include "audio/wswan.h" -#include "machine/mega32x.h" + +#include "mega32x.h" +#include "vboysound.h" +#include "wswansound.h" #include "vgmplay.lh" #include "debugger.h" diff --git a/src/mame/visual/v102.cpp b/src/mame/visual/v102.cpp index c8b25fedd72..f0672344cf7 100644 --- a/src/mame/visual/v102.cpp +++ b/src/mame/visual/v102.cpp @@ -20,7 +20,7 @@ Skeleton driver for Visual 102 display terminal. //#include "video/crt9021.h" #include "screen.h" -#include "machine/v102_kbd.h" +#include "v102_kbd.h" class v102_state : public driver_device { diff --git a/src/mame/visual/v102_kbd.cpp b/src/mame/visual/v102_kbd.cpp index d1e2d861cb0..e4c3c98389f 100644 --- a/src/mame/visual/v102_kbd.cpp +++ b/src/mame/visual/v102_kbd.cpp @@ -13,7 +13,7 @@ through software commands. ************************************************************************************************************************************/ #include "emu.h" -#include "machine/v102_kbd.h" +#include "v102_kbd.h" DEFINE_DEVICE_TYPE(V102_KEYBOARD, v102_keyboard_device, "v102_kbd", "Visual 102 Keyboard") DEFINE_DEVICE_TYPE(V550_KEYBOARD, v550_keyboard_device, "v550_kbd", "Visual 550 Keyboard") diff --git a/src/mame/visual/v1050.cpp b/src/mame/visual/v1050.cpp index 3a3864bc26c..a909fd33282 100644 --- a/src/mame/visual/v1050.cpp +++ b/src/mame/visual/v1050.cpp @@ -150,7 +150,7 @@ Notes: */ #include "emu.h" -#include "includes/v1050.h" +#include "v1050.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/visual/v1050.h b/src/mame/visual/v1050.h index 80a56ffb5c7..63f31cf3485 100644 --- a/src/mame/visual/v1050.h +++ b/src/mame/visual/v1050.h @@ -19,7 +19,7 @@ #include "machine/timer.h" #include "bus/scsi/scsi.h" #include "bus/scsi/scsihd.h" -#include "machine/v1050kb.h" +#include "v1050kb.h" #include "machine/wd_fdc.h" #include "video/mc6845.h" #include "emupal.h" diff --git a/src/mame/visual/v1050_v.cpp b/src/mame/visual/v1050_v.cpp index 3b65ad29cef..7d2ea5f2aef 100644 --- a/src/mame/visual/v1050_v.cpp +++ b/src/mame/visual/v1050_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder #include "emu.h" -#include "includes/v1050.h" +#include "v1050.h" #include "screen.h" diff --git a/src/mame/visual/v550.cpp b/src/mame/visual/v550.cpp index 31d703cec08..78d9406c4b7 100644 --- a/src/mame/visual/v550.cpp +++ b/src/mame/visual/v550.cpp @@ -20,7 +20,7 @@ #include "machine/nvram.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/v102_kbd.h" +#include "v102_kbd.h" #include "machine/z80sio.h" #include "video/scn2674.h" #include "video/upd7220.h" diff --git a/src/mame/vsystem/aerofgt.cpp b/src/mame/vsystem/aerofgt.cpp index dde1fbe94ba..41ca2b2cc23 100644 --- a/src/mame/vsystem/aerofgt.cpp +++ b/src/mame/vsystem/aerofgt.cpp @@ -61,16 +61,16 @@ Verification still needed for the other PCBs. ***************************************************************************/ #include "emu.h" -#include "includes/aerofgt.h" +#include "aerofgt.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/mb3773.h" -#include "machine/vs9209.h" +#include "vs9209.h" #include "sound/ymopm.h" #include "sound/ymopn.h" #include "sound/ymopl.h" -#include "video/vsystem_gga.h" +#include "vsystem_gga.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/vsystem/aerofgt.h b/src/mame/vsystem/aerofgt.h index 5005e1ea473..cf31093abe0 100644 --- a/src/mame/vsystem/aerofgt.h +++ b/src/mame/vsystem/aerofgt.h @@ -6,8 +6,8 @@ #pragma once #include "machine/gen_latch.h" -#include "video/vsystem_spr.h" -#include "video/vsystem_spr2.h" +#include "vsystem_spr.h" +#include "vsystem_spr2.h" #include "sound/okim6295.h" #include "sound/upd7759.h" #include "emupal.h" diff --git a/src/mame/vsystem/aerofgt_v.cpp b/src/mame/vsystem/aerofgt_v.cpp index 1a828d8060d..05bd6d84d7b 100644 --- a/src/mame/vsystem/aerofgt_v.cpp +++ b/src/mame/vsystem/aerofgt_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/aerofgt.h" +#include "aerofgt.h" #include "screen.h" /*************************************************************************** diff --git a/src/mame/vsystem/crshrace.cpp b/src/mame/vsystem/crshrace.cpp index a49b0b80426..19ee9b9edf2 100644 --- a/src/mame/vsystem/crshrace.cpp +++ b/src/mame/vsystem/crshrace.cpp @@ -130,7 +130,7 @@ Dip locations verified with Service Mode. ***************************************************************************/ #include "emu.h" -#include "includes/crshrace.h" +#include "crshrace.h" #include "cpu/m68000/m68000.h" #include "sound/ymopn.h" diff --git a/src/mame/vsystem/crshrace.h b/src/mame/vsystem/crshrace.h index 51ef123ffb0..029bab186f7 100644 --- a/src/mame/vsystem/crshrace.h +++ b/src/mame/vsystem/crshrace.h @@ -1,15 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_CRSHRACE_H -#define MAME_INCLUDES_CRSHRACE_H +#ifndef MAME_VSYSTEM_CRSHRACE_H +#define MAME_VSYSTEM_CRSHRACE_H #pragma once +#include "vsystem_spr.h" + +#include "k053936.h" + #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "video/bufsprite.h" -#include "video/vsystem_spr.h" -#include "video/k053936.h" #include "emupal.h" #include "tilemap.h" @@ -82,4 +84,4 @@ private: [[maybe_unused]] void patch_code(uint16_t offset); }; -#endif // MAME_INCLUDES_CRSHRACE_H +#endif // MAME_VSYSTEM_CRSHRACE_H diff --git a/src/mame/vsystem/crshrace_v.cpp b/src/mame/vsystem/crshrace_v.cpp index 5cb37beee11..6b6c339037c 100644 --- a/src/mame/vsystem/crshrace_v.cpp +++ b/src/mame/vsystem/crshrace_v.cpp @@ -2,7 +2,7 @@ // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/crshrace.h" +#include "crshrace.h" /*************************************************************************** diff --git a/src/mame/vsystem/f1gp.cpp b/src/mame/vsystem/f1gp.cpp index 342bccbc8b8..129e40df1f7 100644 --- a/src/mame/vsystem/f1gp.cpp +++ b/src/mame/vsystem/f1gp.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/f1gp.h" +#include "f1gp.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" @@ -35,7 +35,7 @@ #include "sound/okim6295.h" #include "sound/ymopn.h" -#include "video/vsystem_gga.h" +#include "vsystem_gga.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/vsystem/f1gp.h b/src/mame/vsystem/f1gp.h index a4ab1d5dc73..d1bb58920b8 100644 --- a/src/mame/vsystem/f1gp.h +++ b/src/mame/vsystem/f1gp.h @@ -1,15 +1,18 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_F1GP_H -#define MAME_INCLUDES_F1GP_H +#ifndef MAME_VSYSTEM_F1GP_H +#define MAME_VSYSTEM_F1GP_H #pragma once +#include "vsystem_spr.h" +#include "vsystem_spr2.h" + +#include "k053936.h" + #include "machine/6850acia.h" #include "machine/gen_latch.h" -#include "video/vsystem_spr.h" -#include "video/vsystem_spr2.h" -#include "video/k053936.h" + #include "emupal.h" #include "tilemap.h" @@ -135,4 +138,4 @@ private: void f1gp2_cpu1_map(address_map &map); }; -#endif // MAME_INCLUDES_F1GP_H +#endif // MAME_VSYSTEM_F1GP_H diff --git a/src/mame/vsystem/f1gp_v.cpp b/src/mame/vsystem/f1gp_v.cpp index 5a1ca0b8fd2..09ebb76d6a1 100644 --- a/src/mame/vsystem/f1gp_v.cpp +++ b/src/mame/vsystem/f1gp_v.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "emu.h" -#include "includes/f1gp.h" +#include "f1gp.h" #include "screen.h" diff --git a/src/mame/vsystem/fromanc2.cpp b/src/mame/vsystem/fromanc2.cpp index 377950501aa..4bd252ac75e 100644 --- a/src/mame/vsystem/fromanc2.cpp +++ b/src/mame/vsystem/fromanc2.cpp @@ -19,7 +19,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/fromanc2.h" +#include "fromanc2.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/vsystem/fromanc2_v.cpp b/src/mame/vsystem/fromanc2_v.cpp index 336fce7d9b5..d7cc30c91f7 100644 --- a/src/mame/vsystem/fromanc2_v.cpp +++ b/src/mame/vsystem/fromanc2_v.cpp @@ -9,7 +9,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/fromanc2.h" +#include "fromanc2.h" /****************************************************************************** diff --git a/src/mame/vsystem/fromance.cpp b/src/mame/vsystem/fromance.cpp index 46b35c231bf..9bef9de3f42 100644 --- a/src/mame/vsystem/fromance.cpp +++ b/src/mame/vsystem/fromance.cpp @@ -80,13 +80,13 @@ with the following code: ******************************************************************************/ #include "emu.h" -#include "includes/fromance.h" +#include "fromance.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/msm5205.h" #include "sound/ymopl.h" -#include "video/vsystem_gga.h" +#include "vsystem_gga.h" #include "speaker.h" diff --git a/src/mame/vsystem/fromance.h b/src/mame/vsystem/fromance.h index 0b5b3e84ed0..2e128dd5e69 100644 --- a/src/mame/vsystem/fromance.h +++ b/src/mame/vsystem/fromance.h @@ -15,8 +15,8 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" -#include "video/vsystem_gga.h" -#include "video/vsystem_spr2.h" +#include "vsystem_gga.h" +#include "vsystem_spr2.h" #include "emupal.h" #include "screen.h" #include "tilemap.h" diff --git a/src/mame/vsystem/fromance_v.cpp b/src/mame/vsystem/fromance_v.cpp index 672138bb38c..3ddfb78f9a4 100644 --- a/src/mame/vsystem/fromance_v.cpp +++ b/src/mame/vsystem/fromance_v.cpp @@ -10,7 +10,7 @@ ******************************************************************************/ #include "emu.h" -#include "includes/fromance.h" +#include "fromance.h" diff --git a/src/mame/vsystem/gstriker.cpp b/src/mame/vsystem/gstriker.cpp index 207ded7bfbc..83866fa5103 100644 --- a/src/mame/vsystem/gstriker.cpp +++ b/src/mame/vsystem/gstriker.cpp @@ -176,10 +176,10 @@ Frequencies: 68k is XTAL_32MHZ/2 #include "emu.h" -#include "machine/vs9209.h" -#include "video/mb60553.h" -#include "video/vs920a.h" -#include "video/vsystem_spr.h" +#include "vs9209.h" +#include "mb60553.h" +#include "vs920a.h" +#include "vsystem_spr.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/vsystem/inufuku.cpp b/src/mame/vsystem/inufuku.cpp index f945aac0790..39935c72517 100644 --- a/src/mame/vsystem/inufuku.cpp +++ b/src/mame/vsystem/inufuku.cpp @@ -83,7 +83,7 @@ TODO: #include "machine/gen_latch.h" #include "sound/ymopn.h" #include "video/bufsprite.h" -#include "video/vsystem_spr.h" +#include "vsystem_spr.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/vsystem/ojankohs.cpp b/src/mame/vsystem/ojankohs.cpp index e1c7c7bafa5..a67379dfef7 100644 --- a/src/mame/vsystem/ojankohs.cpp +++ b/src/mame/vsystem/ojankohs.cpp @@ -27,12 +27,12 @@ ***************************************************************************/ #include "emu.h" -#include "includes/ojankohs.h" +#include "ojankohs.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "sound/ay8910.h" -#include "video/vsystem_gga.h" +#include "vsystem_gga.h" #include "speaker.h" diff --git a/src/mame/vsystem/ojankohs_v.cpp b/src/mame/vsystem/ojankohs_v.cpp index 543bed40f8a..9357de060be 100644 --- a/src/mame/vsystem/ojankohs_v.cpp +++ b/src/mame/vsystem/ojankohs_v.cpp @@ -11,7 +11,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "includes/ojankohs.h" +#include "ojankohs.h" /****************************************************************************** diff --git a/src/mame/vsystem/pipedrm.cpp b/src/mame/vsystem/pipedrm.cpp index b879b7968c6..a9096600b48 100644 --- a/src/mame/vsystem/pipedrm.cpp +++ b/src/mame/vsystem/pipedrm.cpp @@ -163,7 +163,7 @@ Added Multiple Coin Feature: #include "emu.h" -#include "includes/fromance.h" +#include "fromance.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" diff --git a/src/mame/vsystem/rpunch.cpp b/src/mame/vsystem/rpunch.cpp index 82c1fe5340d..2809eed09da 100644 --- a/src/mame/vsystem/rpunch.cpp +++ b/src/mame/vsystem/rpunch.cpp @@ -109,7 +109,7 @@ #include "emu.h" // mame -#include "video/vsystem_gga.h" +#include "vsystem_gga.h" // devices #include "cpu/m68000/m68000.h" diff --git a/src/mame/vsystem/suprslam.cpp b/src/mame/vsystem/suprslam.cpp index 4fc816a7a96..8952df57849 100644 --- a/src/mame/vsystem/suprslam.cpp +++ b/src/mame/vsystem/suprslam.cpp @@ -83,11 +83,11 @@ EB26IC73.BIN 27C240 / Main Program ******************************************************************************/ #include "emu.h" -#include "includes/suprslam.h" +#include "suprslam.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" -#include "machine/vs9209.h" +#include "vs9209.h" #include "sound/ymopn.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/vsystem/suprslam.h b/src/mame/vsystem/suprslam.h index fa05408839e..5c353d67581 100644 --- a/src/mame/vsystem/suprslam.h +++ b/src/mame/vsystem/suprslam.h @@ -5,16 +5,20 @@ Super Slams *************************************************************************/ -#ifndef MAME_INCLUDES_SUPRSLAM_H -#define MAME_INCLUDES_SUPRSLAM_H +#ifndef MAME_VSYSTEM_SUPRSLAM_H +#define MAME_VSYSTEM_SUPRSLAM_H #pragma once -#include "video/vsystem_spr.h" +#include "vsystem_spr.h" + +#include "k053936.h" + #include "machine/gen_latch.h" -#include "video/k053936.h" + #include "tilemap.h" + class suprslam_state : public driver_device { public: @@ -80,4 +84,4 @@ private: void suprslam_map(address_map &map); }; -#endif // MAME_INCLUDES_SUPRSLAM_H +#endif // MAME_VSYSTEM_SUPRSLAM_H diff --git a/src/mame/vsystem/suprslam_v.cpp b/src/mame/vsystem/suprslam_v.cpp index bf9cdeec981..821b67605fc 100644 --- a/src/mame/vsystem/suprslam_v.cpp +++ b/src/mame/vsystem/suprslam_v.cpp @@ -5,7 +5,7 @@ #include "emu.h" #include "vsystem_spr.h" -#include "includes/suprslam.h" +#include "suprslam.h" /* FG 'SCREEN' LAYER */ diff --git a/src/mame/vsystem/tail2nos.cpp b/src/mame/vsystem/tail2nos.cpp index c753a932849..886eb0ee716 100644 --- a/src/mame/vsystem/tail2nos.cpp +++ b/src/mame/vsystem/tail2nos.cpp @@ -16,8 +16,9 @@ #include "emu.h" -#include "video/k051316.h" -#include "video/vsystem_gga.h" +#include "vsystem_gga.h" + +#include "k051316.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/vsystem/taotaido.cpp b/src/mame/vsystem/taotaido.cpp index ee87c24fd00..c1f60d48514 100644 --- a/src/mame/vsystem/taotaido.cpp +++ b/src/mame/vsystem/taotaido.cpp @@ -64,11 +64,11 @@ zooming might be wrong ***************************************************************************/ #include "emu.h" -#include "includes/taotaido.h" +#include "taotaido.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" -#include "machine/vs9209.h" +#include "vs9209.h" #include "sound/ymopn.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/vsystem/taotaido.h b/src/mame/vsystem/taotaido.h index 70a5a87374f..10bf187e040 100644 --- a/src/mame/vsystem/taotaido.h +++ b/src/mame/vsystem/taotaido.h @@ -5,7 +5,7 @@ #pragma once -#include "video/vsystem_spr.h" +#include "vsystem_spr.h" #include "machine/gen_latch.h" #include "machine/mb3773.h" #include "tilemap.h" diff --git a/src/mame/vsystem/taotaido_v.cpp b/src/mame/vsystem/taotaido_v.cpp index 30e98049483..abb681ce213 100644 --- a/src/mame/vsystem/taotaido_v.cpp +++ b/src/mame/vsystem/taotaido_v.cpp @@ -11,7 +11,7 @@ zooming might be wrong (only used on title logo?) */ #include "emu.h" -#include "includes/taotaido.h" +#include "taotaido.h" #include "screen.h" /* sprite tile codes 0x4000 - 0x7fff get remapped according to the content of these registers */ diff --git a/src/mame/vsystem/vs9209.cpp b/src/mame/vsystem/vs9209.cpp index e6bd7288be4..49dd131f6e0 100644 --- a/src/mame/vsystem/vs9209.cpp +++ b/src/mame/vsystem/vs9209.cpp @@ -24,7 +24,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/vs9209.h" +#include "vs9209.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/mame/vsystem/welltris.cpp b/src/mame/vsystem/welltris.cpp index a5d4f7062b9..171508ce725 100644 --- a/src/mame/vsystem/welltris.cpp +++ b/src/mame/vsystem/welltris.cpp @@ -314,8 +314,8 @@ TODO: #include "emu.h" -#include "video/vsystem_gga.h" -#include "video/vsystem_spr2.h" +#include "vsystem_gga.h" +#include "vsystem_spr2.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/vtech/crvision.cpp b/src/mame/vtech/crvision.cpp index faac9dc3fab..d6c2ee94a5b 100644 --- a/src/mame/vtech/crvision.cpp +++ b/src/mame/vtech/crvision.cpp @@ -146,7 +146,7 @@ TODO: */ #include "emu.h" -#include "includes/crvision.h" +#include "crvision.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/vtech/gamemachine.cpp b/src/mame/vtech/gamemachine.cpp index c90680626a5..db7fe8aa554 100644 --- a/src/mame/vtech/gamemachine.cpp +++ b/src/mame/vtech/gamemachine.cpp @@ -102,7 +102,7 @@ Grand Prix: #include "speaker.h" -#include "audio/nl_gamemachine.h" +#include "nl_gamemachine.h" // internal artwork #include "gamemach.lh" diff --git a/src/mame/vtech/pc4.cpp b/src/mame/vtech/pc4.cpp index 90894a86ea9..cb1d22aa615 100644 --- a/src/mame/vtech/pc4.cpp +++ b/src/mame/vtech/pc4.cpp @@ -28,7 +28,7 @@ #include "emu.h" -#include "includes/pc4.h" +#include "pc4.h" #include "cpu/z80/z80.h" #include "machine/rp5c01.h" diff --git a/src/mame/vtech/pc4_v.cpp b/src/mame/vtech/pc4_v.cpp index 77594620f26..fe221742efb 100644 --- a/src/mame/vtech/pc4_v.cpp +++ b/src/mame/vtech/pc4_v.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/pc4.h" +#include "pc4.h" void pc4_state::set_busy_flag(uint16_t usec) { diff --git a/src/mame/vtech/socrates.cpp b/src/mame/vtech/socrates.cpp index 79a4e8c94e7..c82ca45feae 100644 --- a/src/mame/vtech/socrates.cpp +++ b/src/mame/vtech/socrates.cpp @@ -85,7 +85,7 @@ TODO (socrates): ******************************************************************************/ #include "emu.h" -#include "audio/socrates.h" +#include "socrates_a.h" #include "cpu/z80/z80.h" diff --git a/src/mame/vtech/socrates_a.cpp b/src/mame/vtech/socrates_a.cpp index 4f9731494eb..8f5c6dfbfed 100644 --- a/src/mame/vtech/socrates_a.cpp +++ b/src/mame/vtech/socrates_a.cpp @@ -12,7 +12,7 @@ ****************************************************************************/ #include "emu.h" -#include "socrates.h" +#include "socrates_a.h" // device type definition diff --git a/src/mame/vtech/vsmile.cpp b/src/mame/vtech/vsmile.cpp index 479f1ebdd09..b069dfa02f7 100644 --- a/src/mame/vtech/vsmile.cpp +++ b/src/mame/vtech/vsmile.cpp @@ -8,7 +8,7 @@ #include "emu.h" -#include "includes/vsmile.h" +#include "vsmile.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/vtech/vsmileb.cpp b/src/mame/vtech/vsmileb.cpp index c128cd4199b..bd5611b6d64 100644 --- a/src/mame/vtech/vsmileb.cpp +++ b/src/mame/vtech/vsmileb.cpp @@ -24,7 +24,7 @@ #include "emu.h" -#include "includes/vsmile.h" +#include "vsmile.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/vtech/vtech2.cpp b/src/mame/vtech/vtech2.cpp index 241ab23a7d2..003e1549217 100644 --- a/src/mame/vtech/vtech2.cpp +++ b/src/mame/vtech/vtech2.cpp @@ -73,7 +73,7 @@ ***************************************************************************/ #include "emu.h" -#include "includes/vtech2.h" +#include "vtech2.h" #include "cpu/z80/z80.h" #include "formats/vt_cas.h" #include "screen.h" diff --git a/src/mame/vtech/vtech2_m.cpp b/src/mame/vtech/vtech2_m.cpp index 0e8a2bea126..48bd075a1b5 100644 --- a/src/mame/vtech/vtech2_m.cpp +++ b/src/mame/vtech/vtech2_m.cpp @@ -15,7 +15,7 @@ ****************************************************************************/ #include "emu.h" -#include "includes/vtech2.h" +#include "vtech2.h" /* public */ diff --git a/src/mame/vtech/vtech2_v.cpp b/src/mame/vtech/vtech2_v.cpp index db400c8bc1d..53d7aaced62 100644 --- a/src/mame/vtech/vtech2_v.cpp +++ b/src/mame/vtech/vtech2_v.cpp @@ -11,7 +11,7 @@ #include "emu.h" -#include "includes/vtech2.h" +#include "vtech2.h" #define BORDER_H 64 #define BORDER_V 32 diff --git a/src/mame/wang/wangpc.cpp b/src/mame/wang/wangpc.cpp index 1ba7681f0a5..93ed05aa9e3 100644 --- a/src/mame/wang/wangpc.cpp +++ b/src/mame/wang/wangpc.cpp @@ -35,7 +35,7 @@ #include "machine/scn_pci.h" #include "machine/ram.h" #include "machine/upd765.h" -#include "machine/wangpckb.h" +#include "wangpckb.h" #define I8086_TAG "i8086" #define AM9517A_TAG "am9517a" diff --git a/src/mame/wavemate/bullet.cpp b/src/mame/wavemate/bullet.cpp index 706f271a404..58b141abc89 100644 --- a/src/mame/wavemate/bullet.cpp +++ b/src/mame/wavemate/bullet.cpp @@ -59,7 +59,7 @@ Notes: */ #include "emu.h" -#include "includes/bullet.h" +#include "bullet.h" #include "bus/rs232/rs232.h" #include "bus/scsi/scsihd.h" diff --git a/src/mame/wing/lucky74.cpp b/src/mame/wing/lucky74.cpp index 1f489b794f2..8624bfd0377 100644 --- a/src/mame/wing/lucky74.cpp +++ b/src/mame/wing/lucky74.cpp @@ -759,7 +759,7 @@ *****************************************************************************************/ #include "emu.h" -#include "includes/lucky74.h" +#include "lucky74.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" diff --git a/src/mame/wing/lucky74_v.cpp b/src/mame/wing/lucky74_v.cpp index ab7bd07d25c..e73f9b46b99 100644 --- a/src/mame/wing/lucky74_v.cpp +++ b/src/mame/wing/lucky74_v.cpp @@ -97,7 +97,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/lucky74.h" +#include "lucky74.h" void lucky74_state::fg_videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/wyse/wy100.cpp b/src/mame/wyse/wy100.cpp index 5dbb24b5af6..cda660c27b1 100644 --- a/src/mame/wyse/wy100.cpp +++ b/src/mame/wyse/wy100.cpp @@ -21,7 +21,7 @@ #include "machine/bankdev.h" #include "machine/input_merger.h" #include "machine/scn_pci.h" -#include "machine/wy50kb.h" +#include "wy50kb.h" #include "sound/spkrdev.h" #include "video/i8275.h" #include "screen.h" diff --git a/src/mame/wyse/wy50.cpp b/src/mame/wyse/wy50.cpp index 349e77a1f7c..3c30de95610 100644 --- a/src/mame/wyse/wy50.cpp +++ b/src/mame/wyse/wy50.cpp @@ -29,7 +29,7 @@ #include "cpu/mcs51/mcs51.h" #include "machine/er1400.h" #include "machine/scn_pci.h" -#include "machine/wy50kb.h" +#include "wy50kb.h" #include "video/scn2674.h" #include "screen.h" diff --git a/src/mame/wyse/wy50kb.cpp b/src/mame/wyse/wy50kb.cpp index 38f61610127..d6f480fa39e 100644 --- a/src/mame/wyse/wy50kb.cpp +++ b/src/mame/wyse/wy50kb.cpp @@ -30,7 +30,7 @@ *******************************************************************************/ #include "emu.h" -#include "machine/wy50kb.h" +#include "wy50kb.h" DEFINE_DEVICE_TYPE(WY50_KEYBOARD, wy50_keyboard_device, "wy50kb", "WY-50 Keyboard") DEFINE_DEVICE_TYPE(WY100_KEYBOARD, wy100_keyboard_device, "wy100kb", "WY-100 Keyboard") diff --git a/src/mame/xerox/xerox820.cpp b/src/mame/xerox/xerox820.cpp index 9dfb9cb358f..fafa413992e 100644 --- a/src/mame/xerox/xerox820.cpp +++ b/src/mame/xerox/xerox820.cpp @@ -55,7 +55,7 @@ #include "emu.h" -#include "includes/xerox820.h" +#include "xerox820.h" #include "screen.h" #include "softlist.h" diff --git a/src/mame/xerox/xerox820.h b/src/mame/xerox/xerox820.h index 141369647a3..ec1252200f2 100644 --- a/src/mame/xerox/xerox820.h +++ b/src/mame/xerox/xerox820.h @@ -16,7 +16,7 @@ #include "bus/scsi/scsihd.h" #include "machine/timer.h" #include "machine/wd_fdc.h" -#include "machine/x820kb.h" +#include "x820kb.h" #include "machine/z80pio.h" #include "machine/z80ctc.h" #include "machine/z80sio.h" diff --git a/src/mame/xussrpc/mc1502.cpp b/src/mame/xussrpc/mc1502.cpp index f49dc15b7a7..bc55bc7d8a9 100644 --- a/src/mame/xussrpc/mc1502.cpp +++ b/src/mame/xussrpc/mc1502.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/kb_7007_3.h" +#include "kb_7007_3.h" #include "bus/centronics/ctronics.h" #include "bus/isa/isa.h" diff --git a/src/mame/xussrpc/poisk1.cpp b/src/mame/xussrpc/poisk1.cpp index 4535ae9e5ba..cf76b136200 100644 --- a/src/mame/xussrpc/poisk1.cpp +++ b/src/mame/xussrpc/poisk1.cpp @@ -22,7 +22,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/kb_poisk1.h" +#include "kb_poisk1.h" #include "bus/isa/isa.h" #include "bus/isa/p1_fdc.h" diff --git a/src/mame/yamaha/yman1x.cpp b/src/mame/yamaha/yman1x.cpp index 483db76ce64..f93defa8818 100644 --- a/src/mame/yamaha/yman1x.cpp +++ b/src/mame/yamaha/yman1x.cpp @@ -14,7 +14,7 @@ //#include "bus/midi/midi.h" #include "cpu/h8/h83002.h" #include "cpu/m6805/m6805.h" -#include "machine/mulcd.h" +#include "mulcd.h" #include "machine/nvram.h" #include "sound/meg.h" #include "speaker.h" diff --git a/src/mame/yamaha/ymmu100.cpp b/src/mame/yamaha/ymmu100.cpp index debecd41f0a..37e23c43db3 100644 --- a/src/mame/yamaha/ymmu100.cpp +++ b/src/mame/yamaha/ymmu100.cpp @@ -120,7 +120,7 @@ #include "bus/midi/midiinport.h" #include "bus/midi/midioutport.h" #include "cpu/h8/h8s2655.h" -#include "machine/mulcd.h" +#include "mulcd.h" #include "sound/swp30.h" #include "debugger.h" diff --git a/src/mame/yamaha/ymmu50.cpp b/src/mame/yamaha/ymmu50.cpp index a3962f4902d..0a8325b06ff 100644 --- a/src/mame/yamaha/ymmu50.cpp +++ b/src/mame/yamaha/ymmu50.cpp @@ -13,7 +13,7 @@ #include "bus/midi/midiinport.h" #include "bus/midi/midioutport.h" #include "cpu/h8/h83003.h" -#include "machine/mulcd.h" +#include "mulcd.h" #include "sound/swp00.h" #include "debugger.h" diff --git a/src/mame/yamaha/ymmu80.cpp b/src/mame/yamaha/ymmu80.cpp index a8a0c618f66..0a8f9c3299b 100644 --- a/src/mame/yamaha/ymmu80.cpp +++ b/src/mame/yamaha/ymmu80.cpp @@ -123,7 +123,7 @@ #include "bus/midi/midiinport.h" #include "bus/midi/midioutport.h" #include "cpu/h8/h83002.h" -#include "machine/mulcd.h" +#include "mulcd.h" #include "sound/swp20.h" #include "sound/meg.h" diff --git a/src/mame/yamaha/ymvl70.cpp b/src/mame/yamaha/ymvl70.cpp index 9564f597e48..de7e742be34 100644 --- a/src/mame/yamaha/ymvl70.cpp +++ b/src/mame/yamaha/ymvl70.cpp @@ -6,7 +6,7 @@ #include "bus/midi/midiinport.h" #include "bus/midi/midioutport.h" #include "cpu/h8/h83003.h" -#include "machine/mulcd.h" +#include "mulcd.h" #include "sound/meg.h" #include "sound/dspv.h" diff --git a/src/mame/yunsung/nmg5.cpp b/src/mame/yunsung/nmg5.cpp index a7060190915..1ad740cd76f 100644 --- a/src/mame/yunsung/nmg5.cpp +++ b/src/mame/yunsung/nmg5.cpp @@ -222,12 +222,15 @@ Stephh's notes (based on the games M68000 code and some tests) : */ #include "emu.h" + +#include "decospr.h" + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "sound/ymopl.h" -#include "video/decospr.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/zaccaria/laserbat.cpp b/src/mame/zaccaria/laserbat.cpp index c46c0f26ea2..306045561e0 100644 --- a/src/mame/zaccaria/laserbat.cpp +++ b/src/mame/zaccaria/laserbat.cpp @@ -82,7 +82,7 @@ */ #include "emu.h" -#include "includes/laserbat.h" +#include "laserbat.h" #include "cpu/m6800/m6800.h" diff --git a/src/mame/zaccaria/laserbat.h b/src/mame/zaccaria/laserbat.h index b7fdae178d1..133ac3d8439 100644 --- a/src/mame/zaccaria/laserbat.h +++ b/src/mame/zaccaria/laserbat.h @@ -10,7 +10,7 @@ #pragma once -#include "audio/zaccaria.h" +#include "zaccaria_a.h" #include "cpu/s2650/s2650.h" diff --git a/src/mame/zaccaria/laserbat_a.cpp b/src/mame/zaccaria/laserbat_a.cpp index 3adefb5f944..96e114c3dea 100644 --- a/src/mame/zaccaria/laserbat_a.cpp +++ b/src/mame/zaccaria/laserbat_a.cpp @@ -8,7 +8,7 @@ */ #include "emu.h" -#include "includes/laserbat.h" +#include "laserbat.h" uint8_t laserbat_state_base::rhsc_r() diff --git a/src/mame/zaccaria/laserbat_v.cpp b/src/mame/zaccaria/laserbat_v.cpp index efcd021d2ad..ab6da08c718 100644 --- a/src/mame/zaccaria/laserbat_v.cpp +++ b/src/mame/zaccaria/laserbat_v.cpp @@ -80,7 +80,7 @@ */ #include "emu.h" -#include "includes/laserbat.h" +#include "laserbat.h" void laserbat_state_base::videoram_w(offs_t offset, uint8_t data) diff --git a/src/mame/zaccaria/zac2650.cpp b/src/mame/zaccaria/zac2650.cpp index b7d2cbaa5af..e7cbf477dbb 100644 --- a/src/mame/zaccaria/zac2650.cpp +++ b/src/mame/zaccaria/zac2650.cpp @@ -15,7 +15,7 @@ */ #include "emu.h" -#include "includes/zac2650.h" +#include "zac2650.h" #include "cpu/s2650/s2650.h" #include "speaker.h" diff --git a/src/mame/zaccaria/zac2650_v.cpp b/src/mame/zaccaria/zac2650_v.cpp index 8fdbe48d159..4ad4545b5bf 100644 --- a/src/mame/zaccaria/zac2650_v.cpp +++ b/src/mame/zaccaria/zac2650_v.cpp @@ -7,7 +7,7 @@ /*************************************************************/ #include "emu.h" -#include "includes/zac2650.h" +#include "zac2650.h" /**************************************************************/ diff --git a/src/mame/zaccaria/zaccaria.cpp b/src/mame/zaccaria/zaccaria.cpp index c7c55d1d606..e7475a6e757 100644 --- a/src/mame/zaccaria/zaccaria.cpp +++ b/src/mame/zaccaria/zaccaria.cpp @@ -44,7 +44,7 @@ Notes: ***************************************************************************/ #include "emu.h" -#include "includes/zaccaria.h" +#include "zaccaria.h" #include "cpu/z80/z80.h" #include "machine/74259.h" diff --git a/src/mame/zaccaria/zaccaria.h b/src/mame/zaccaria/zaccaria.h index 3ba870b97f0..45f115f4029 100644 --- a/src/mame/zaccaria/zaccaria.h +++ b/src/mame/zaccaria/zaccaria.h @@ -5,7 +5,7 @@ #pragma once -#include "audio/zaccaria.h" +#include "zaccaria_a.h" #include "emupal.h" #include "tilemap.h" diff --git a/src/mame/zaccaria/zaccaria_a.cpp b/src/mame/zaccaria/zaccaria_a.cpp index 3fb78ce3121..080b00741e4 100644 --- a/src/mame/zaccaria/zaccaria_a.cpp +++ b/src/mame/zaccaria/zaccaria_a.cpp @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Vas Crabb #include "emu.h" -#include "audio/zaccaria.h" -#include "audio/nl_zac1b11142.h" +#include "zaccaria_a.h" +#include "nl_zac1b11142.h" #include "cpu/m6800/m6800.h" #include "machine/clock.h" diff --git a/src/mame/zaccaria/zaccaria_v.cpp b/src/mame/zaccaria/zaccaria_v.cpp index 1712b7dc895..eb5333dae2b 100644 --- a/src/mame/zaccaria/zaccaria_v.cpp +++ b/src/mame/zaccaria/zaccaria_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" #include "video/resnet.h" -#include "includes/zaccaria.h" +#include "zaccaria.h" /*************************************************************************** diff --git a/src/mame/zvt/pp01.cpp b/src/mame/zvt/pp01.cpp index 9df1ac90637..2e66f7c0fdd 100644 --- a/src/mame/zvt/pp01.cpp +++ b/src/mame/zvt/pp01.cpp @@ -23,7 +23,7 @@ ToDo: *****************************************************************************************/ #include "emu.h" -#include "includes/pp01.h" +#include "pp01.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/zvt/pp01_m.cpp b/src/mame/zvt/pp01_m.cpp index f937f1e62e6..62eba4b7a43 100644 --- a/src/mame/zvt/pp01_m.cpp +++ b/src/mame/zvt/pp01_m.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/pp01.h" +#include "pp01.h" void pp01_state::video_write_mode_w(uint8_t data) diff --git a/src/mame/zvt/pp01_v.cpp b/src/mame/zvt/pp01_v.cpp index eff118c6b2d..4055f67bac5 100644 --- a/src/mame/zvt/pp01_v.cpp +++ b/src/mame/zvt/pp01_v.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "includes/pp01.h" +#include "pp01.h" uint32_t pp01_state::screen_update_pp01(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { diff --git a/src/tools/reorganize.py b/src/tools/reorganize.py index a0cc8f48806..e755ff8a86e 100755 --- a/src/tools/reorganize.py +++ b/src/tools/reorganize.py @@ -27,32 +27,22 @@ def resolve_conflicts(root, *parts): for part in parts: c = part[0] for file in walk(part): - base, ext = os.path.splitext(file) - key = part + '/' + base if file in present: + base, ext = os.path.splitext(file) if not ext: raise Exception('File %s has no extension' % (file, )) - nb = base + '_' + c - nf = nb + ext + nf = base + '_' + c + ext #print('%s -> %s' % (os.path.join(part, file), nf)) if nf in present: raise Exception('File %s still conflicted after renaming from %s' % (nf, file)) - result[key] = nb else: nf = file - if key not in result: - result[key] = base present.add(nf) + result[part + '/' + file] = nf return result -def remap_file(renaming, filename): - parts = filename.split('/') - parts[-1], ext = os.path.splitext(parts[-1]) - return renaming.get('/'.join(parts), parts[-1]) + ext - - def update_projects(root, renaming, *scripts): keys = ('createMAMEProjects', 'createMESSProjects') result = { 'video/konamiic.txt': 'konami' } @@ -88,13 +78,18 @@ def update_projects(root, renaming, *scripts): else: if fn not in result: bad = True - print("Missing in projects and seen in another .lua: %s" % fn) + #print("Missing in projects and seen in another .lua: %s" % fn) ap = '?' else: ap = result[fn] - ls = ls[:p+22] + ap + '/' + remap_file(renaming, fn) + ls[p2:] + ls = ls[:p+22] + ap + '/' + renaming[fn] + ls[p2:] print(ls, file=f) + for k in renaming: + if k not in result: + print('Missing in projects: %s' % (k, )) + bad = True + if bad: raise Exception('Error updating project scripts') @@ -110,7 +105,7 @@ def update_driver_list(fname, renaming, projectmap): match = re.match('(.*@source:)([-_0-9a-z]+\\.cpp)\\b(\s*)(.*)', ls) if match: f = 'drivers/' + match.group(2) - r = projectmap[f] + '/' + remap_file(renaming, f) + r = projectmap[f] + '/' + renaming.get(f, match.group(2)) if match.group(3): w = len(match.group(2)) + len(match.group(3)) if len(r) < w: @@ -131,7 +126,7 @@ def update_driver_filter(fname, renaming, projectmap): match = re.match('(.*)(?