From 69e33bcb5ed9a375db6e7f3bc5a266f6731cc8d0 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 10 Mar 2014 08:29:46 +0000 Subject: [PATCH] snes and nes slot devices moved into bus folder (nw) --- .gitattributes | 250 ++++++------ src/emu/bus/bus.mak | 76 ++++ .../nes_act53.c => emu/bus/nes/act53.c} | 2 +- .../nes_act53.h => emu/bus/nes/act53.h} | 2 +- .../nes_aladdin.c => emu/bus/nes/aladdin.c} | 2 +- .../nes_aladdin.h => emu/bus/nes/aladdin.h} | 2 +- .../machine/nes_ave.c => emu/bus/nes/ave.c} | 2 +- .../machine/nes_ave.h => emu/bus/nes/ave.h} | 2 +- .../nes_bandai.c => emu/bus/nes/bandai.c} | 2 +- .../nes_bandai.h => emu/bus/nes/bandai.h} | 2 +- .../bus/nes/benshieng.c} | 2 +- .../bus/nes/benshieng.h} | 2 +- .../nes_bootleg.c => emu/bus/nes/bootleg.c} | 2 +- .../nes_bootleg.h => emu/bus/nes/bootleg.h} | 2 +- .../nes_camerica.c => emu/bus/nes/camerica.c} | 2 +- .../nes_camerica.h => emu/bus/nes/camerica.h} | 2 +- .../machine/nes_cne.c => emu/bus/nes/cne.c} | 2 +- .../machine/nes_cne.h => emu/bus/nes/cne.h} | 2 +- .../machine/nes_cony.c => emu/bus/nes/cony.c} | 2 +- .../machine/nes_cony.h => emu/bus/nes/cony.h} | 2 +- .../nes_datach.c => emu/bus/nes/datach.c} | 2 +- .../nes_datach.h => emu/bus/nes/datach.h} | 2 +- .../nes_discrete.c => emu/bus/nes/discrete.c} | 2 +- .../nes_discrete.h => emu/bus/nes/discrete.h} | 2 +- .../nes_event.c => emu/bus/nes/event.c} | 2 +- .../nes_event.h => emu/bus/nes/event.h} | 2 +- .../nes_ggenie.c => emu/bus/nes/ggenie.c} | 2 +- .../nes_ggenie.h => emu/bus/nes/ggenie.h} | 2 +- .../bus/nes/henggedianzi.c} | 2 +- .../bus/nes/henggedianzi.h} | 2 +- .../machine/nes_hes.c => emu/bus/nes/hes.c} | 2 +- .../machine/nes_hes.h => emu/bus/nes/hes.h} | 2 +- .../nes_hosenkan.c => emu/bus/nes/hosenkan.c} | 2 +- .../nes_hosenkan.h => emu/bus/nes/hosenkan.h} | 2 +- .../machine/nes_irem.c => emu/bus/nes/irem.c} | 2 +- .../machine/nes_irem.h => emu/bus/nes/irem.h} | 2 +- .../nes_jaleco.c => emu/bus/nes/jaleco.c} | 2 +- .../nes_jaleco.h => emu/bus/nes/jaleco.h} | 2 +- .../machine/nes_jy.c => emu/bus/nes/jy.c} | 2 +- .../machine/nes_jy.h => emu/bus/nes/jy.h} | 2 +- .../nes_kaiser.c => emu/bus/nes/kaiser.c} | 2 +- .../nes_kaiser.h => emu/bus/nes/kaiser.h} | 2 +- .../bus/nes/karastudio.c} | 2 +- .../bus/nes/karastudio.h} | 2 +- .../nes_konami.c => emu/bus/nes/konami.c} | 2 +- .../nes_konami.h => emu/bus/nes/konami.h} | 4 +- .../nes_legacy.c => emu/bus/nes/legacy.c} | 2 +- .../nes_legacy.h => emu/bus/nes/legacy.h} | 2 +- .../machine/nes_mmc1.c => emu/bus/nes/mmc1.c} | 2 +- .../machine/nes_mmc1.h => emu/bus/nes/mmc1.h} | 2 +- .../machine/nes_mmc2.c => emu/bus/nes/mmc2.c} | 2 +- .../machine/nes_mmc2.h => emu/bus/nes/mmc2.h} | 2 +- .../machine/nes_mmc3.c => emu/bus/nes/mmc3.c} | 2 +- .../machine/nes_mmc3.h => emu/bus/nes/mmc3.h} | 2 +- .../bus/nes/mmc3_clones.c} | 2 +- .../bus/nes/mmc3_clones.h} | 2 +- .../machine/nes_mmc5.c => emu/bus/nes/mmc5.c} | 2 +- .../machine/nes_mmc5.h => emu/bus/nes/mmc5.h} | 2 +- .../bus/nes/multigame.c} | 2 +- .../bus/nes/multigame.h} | 2 +- .../nes_namcot.c => emu/bus/nes/namcot.c} | 2 +- .../nes_namcot.h => emu/bus/nes/namcot.h} | 2 +- .../nes_nanjing.c => emu/bus/nes/nanjing.c} | 2 +- .../nes_nanjing.h => emu/bus/nes/nanjing.h} | 2 +- src/emu/bus/nes/nes_carts.c | 356 ++++++++++++++++++ src/emu/bus/nes/nes_carts.h | 68 ++++ .../machine => emu/bus/nes}/nes_ines.inc | 0 src/{mess/machine => emu/bus/nes}/nes_pcb.inc | 0 src/{mess/machine => emu/bus/nes}/nes_slot.c | 8 +- src/{mess/machine => emu/bus/nes}/nes_slot.h | 0 .../machine => emu/bus/nes}/nes_unif.inc | 0 .../nes_ntdec.c => emu/bus/nes/ntdec.c} | 2 +- .../nes_ntdec.h => emu/bus/nes/ntdec.h} | 2 +- .../nes_nxrom.c => emu/bus/nes/nxrom.c} | 2 +- .../nes_nxrom.h => emu/bus/nes/nxrom.h} | 2 +- .../nes_pirate.c => emu/bus/nes/pirate.c} | 2 +- .../nes_pirate.h => emu/bus/nes/pirate.h} | 2 +- .../nes_pt554.c => emu/bus/nes/pt554.c} | 2 +- .../nes_pt554.h => emu/bus/nes/pt554.h} | 2 +- .../bus/nes/racermate.c} | 2 +- .../bus/nes/racermate.h} | 2 +- .../machine/nes_rcm.c => emu/bus/nes/rcm.c} | 2 +- .../machine/nes_rcm.h => emu/bus/nes/rcm.h} | 2 +- .../nes_rexsoft.c => emu/bus/nes/rexsoft.c} | 2 +- .../nes_rexsoft.h => emu/bus/nes/rexsoft.h} | 2 +- .../nes_sachen.c => emu/bus/nes/sachen.c} | 2 +- .../nes_sachen.h => emu/bus/nes/sachen.h} | 2 +- .../nes_somari.c => emu/bus/nes/somari.c} | 2 +- .../nes_somari.h => emu/bus/nes/somari.h} | 2 +- .../nes_sunsoft.c => emu/bus/nes/sunsoft.c} | 2 +- .../nes_sunsoft.h => emu/bus/nes/sunsoft.h} | 2 +- .../bus/nes/sunsoft_dcs.c} | 2 +- .../bus/nes/sunsoft_dcs.h} | 2 +- .../nes_taito.c => emu/bus/nes/taito.c} | 2 +- .../nes_taito.h => emu/bus/nes/taito.h} | 2 +- .../nes_tengen.c => emu/bus/nes/tengen.c} | 2 +- .../nes_tengen.h => emu/bus/nes/tengen.h} | 2 +- .../machine/nes_txc.c => emu/bus/nes/txc.c} | 2 +- .../machine/nes_txc.h => emu/bus/nes/txc.h} | 2 +- .../nes_waixing.c => emu/bus/nes/waixing.c} | 2 +- .../nes_waixing.h => emu/bus/nes/waixing.h} | 2 +- .../machine/sns_bsx.c => emu/bus/snes/bsx.c} | 2 +- .../machine/sns_bsx.h => emu/bus/snes/bsx.h} | 6 +- .../sns_event.c => emu/bus/snes/event.c} | 2 +- .../sns_event.h => emu/bus/snes/event.h} | 2 +- .../machine/sns_rom.c => emu/bus/snes/rom.c} | 2 +- .../machine/sns_rom.h => emu/bus/snes/rom.h} | 2 +- .../sns_rom21.c => emu/bus/snes/rom21.c} | 2 +- .../sns_rom21.h => emu/bus/snes/rom21.h} | 2 +- .../machine/sns_sa1.c => emu/bus/snes/sa1.c} | 2 +- .../machine/sns_sa1.h => emu/bus/snes/sa1.h} | 2 +- .../sns_sdd1.c => emu/bus/snes/sdd1.c} | 2 +- .../sns_sdd1.h => emu/bus/snes/sdd1.h} | 2 +- .../machine/sns_sfx.c => emu/bus/snes/sfx.c} | 2 +- .../machine/sns_sfx.h => emu/bus/snes/sfx.h} | 4 +- .../machine/sns_sgb.c => emu/bus/snes/sgb.c} | 2 +- .../machine/sns_sgb.h => emu/bus/snes/sgb.h} | 4 +- src/emu/bus/snes/snes_carts.c | 50 +++ src/emu/bus/snes/snes_carts.h | 29 ++ .../sns_slot.c => emu/bus/snes/snes_slot.c} | 2 +- .../sns_slot.h => emu/bus/snes/snes_slot.h} | 0 .../sns_spc7110.c => emu/bus/snes/spc7110.c} | 2 +- .../sns_spc7110.h => emu/bus/snes/spc7110.h} | 4 +- .../sns_sufami.c => emu/bus/snes/sufami.c} | 2 +- .../sns_sufami.h => emu/bus/snes/sufami.h} | 4 +- .../machine/sns_upd.c => emu/bus/snes/upd.c} | 2 +- .../machine/sns_upd.h => emu/bus/snes/upd.h} | 6 +- src/emu/emu.mak | 2 + src/emu/sound/sound.mak | 9 + src/{mess/audio => emu/sound}/vrc6.c | 0 src/{mess/audio => emu/sound}/vrc6.h | 0 src/mess/drivers/nes.c | 352 ----------------- src/mess/drivers/snes.c | 59 +-- src/mess/includes/nes.h | 56 +-- src/mess/machine/nes.c | 1 - src/mess/mess.mak | 63 +--- 136 files changed, 852 insertions(+), 775 deletions(-) rename src/{mess/machine/nes_act53.c => emu/bus/nes/act53.c} (99%) rename src/{mess/machine/nes_act53.h => emu/bus/nes/act53.h} (95%) rename src/{mess/machine/nes_aladdin.c => emu/bus/nes/aladdin.c} (99%) rename src/{mess/machine/nes_aladdin.h => emu/bus/nes/aladdin.h} (99%) rename src/{mess/machine/nes_ave.c => emu/bus/nes/ave.c} (99%) rename src/{mess/machine/nes_ave.h => emu/bus/nes/ave.h} (97%) rename src/{mess/machine/nes_bandai.c => emu/bus/nes/bandai.c} (99%) rename src/{mess/machine/nes_bandai.h => emu/bus/nes/bandai.h} (99%) rename src/{mess/machine/nes_benshieng.c => emu/bus/nes/benshieng.c} (98%) rename src/{mess/machine/nes_benshieng.h => emu/bus/nes/benshieng.h} (95%) rename src/{mess/machine/nes_bootleg.c => emu/bus/nes/bootleg.c} (99%) rename src/{mess/machine/nes_bootleg.h => emu/bus/nes/bootleg.h} (99%) rename src/{mess/machine/nes_camerica.c => emu/bus/nes/camerica.c} (99%) rename src/{mess/machine/nes_camerica.h => emu/bus/nes/camerica.h} (97%) rename src/{mess/machine/nes_cne.c => emu/bus/nes/cne.c} (99%) rename src/{mess/machine/nes_cne.h => emu/bus/nes/cne.h} (97%) rename src/{mess/machine/nes_cony.c => emu/bus/nes/cony.c} (99%) rename src/{mess/machine/nes_cony.h => emu/bus/nes/cony.h} (98%) rename src/{mess/machine/nes_datach.c => emu/bus/nes/datach.c} (99%) rename src/{mess/machine/nes_datach.h => emu/bus/nes/datach.h} (99%) rename src/{mess/machine/nes_discrete.c => emu/bus/nes/discrete.c} (99%) rename src/{mess/machine/nes_discrete.h => emu/bus/nes/discrete.h} (98%) rename src/{mess/machine/nes_event.c => emu/bus/nes/event.c} (99%) rename src/{mess/machine/nes_event.h => emu/bus/nes/event.h} (96%) rename src/{mess/machine/nes_ggenie.c => emu/bus/nes/ggenie.c} (99%) rename src/{mess/machine/nes_ggenie.h => emu/bus/nes/ggenie.h} (98%) rename src/{mess/machine/nes_henggedianzi.c => emu/bus/nes/henggedianzi.c} (99%) rename src/{mess/machine/nes_henggedianzi.h => emu/bus/nes/henggedianzi.h} (98%) rename src/{mess/machine/nes_hes.c => emu/bus/nes/hes.c} (98%) rename src/{mess/machine/nes_hes.h => emu/bus/nes/hes.h} (93%) rename src/{mess/machine/nes_hosenkan.c => emu/bus/nes/hosenkan.c} (99%) rename src/{mess/machine/nes_hosenkan.h => emu/bus/nes/hosenkan.h} (95%) rename src/{mess/machine/nes_irem.c => emu/bus/nes/irem.c} (99%) rename src/{mess/machine/nes_irem.h => emu/bus/nes/irem.h} (98%) rename src/{mess/machine/nes_jaleco.c => emu/bus/nes/jaleco.c} (99%) rename src/{mess/machine/nes_jaleco.h => emu/bus/nes/jaleco.h} (99%) rename src/{mess/machine/nes_jy.c => emu/bus/nes/jy.c} (99%) rename src/{mess/machine/nes_jy.h => emu/bus/nes/jy.h} (98%) rename src/{mess/machine/nes_kaiser.c => emu/bus/nes/kaiser.c} (99%) rename src/{mess/machine/nes_kaiser.h => emu/bus/nes/kaiser.h} (99%) rename src/{mess/machine/nes_karastudio.c => emu/bus/nes/karastudio.c} (99%) rename src/{mess/machine/nes_karastudio.h => emu/bus/nes/karastudio.h} (99%) rename src/{mess/machine/nes_konami.c => emu/bus/nes/konami.c} (99%) rename src/{mess/machine/nes_konami.h => emu/bus/nes/konami.h} (98%) rename src/{mess/machine/nes_legacy.c => emu/bus/nes/legacy.c} (99%) rename src/{mess/machine/nes_legacy.h => emu/bus/nes/legacy.h} (98%) rename src/{mess/machine/nes_mmc1.c => emu/bus/nes/mmc1.c} (99%) rename src/{mess/machine/nes_mmc1.h => emu/bus/nes/mmc1.h} (98%) rename src/{mess/machine/nes_mmc2.c => emu/bus/nes/mmc2.c} (99%) rename src/{mess/machine/nes_mmc2.h => emu/bus/nes/mmc2.h} (97%) rename src/{mess/machine/nes_mmc3.c => emu/bus/nes/mmc3.c} (99%) rename src/{mess/machine/nes_mmc3.h => emu/bus/nes/mmc3.h} (99%) rename src/{mess/machine/nes_mmc3_clones.c => emu/bus/nes/mmc3_clones.c} (99%) rename src/{mess/machine/nes_mmc3_clones.h => emu/bus/nes/mmc3_clones.h} (99%) rename src/{mess/machine/nes_mmc5.c => emu/bus/nes/mmc5.c} (99%) rename src/{mess/machine/nes_mmc5.h => emu/bus/nes/mmc5.h} (98%) rename src/{mess/machine/nes_multigame.c => emu/bus/nes/multigame.c} (99%) rename src/{mess/machine/nes_multigame.h => emu/bus/nes/multigame.h} (99%) rename src/{mess/machine/nes_namcot.c => emu/bus/nes/namcot.c} (99%) rename src/{mess/machine/nes_namcot.h => emu/bus/nes/namcot.h} (99%) rename src/{mess/machine/nes_nanjing.c => emu/bus/nes/nanjing.c} (98%) rename src/{mess/machine/nes_nanjing.h => emu/bus/nes/nanjing.h} (95%) create mode 100644 src/emu/bus/nes/nes_carts.c create mode 100644 src/emu/bus/nes/nes_carts.h rename src/{mess/machine => emu/bus/nes}/nes_ines.inc (100%) rename src/{mess/machine => emu/bus/nes}/nes_pcb.inc (100%) rename src/{mess/machine => emu/bus/nes}/nes_slot.c (99%) rename src/{mess/machine => emu/bus/nes}/nes_slot.h (100%) rename src/{mess/machine => emu/bus/nes}/nes_unif.inc (100%) rename src/{mess/machine/nes_ntdec.c => emu/bus/nes/ntdec.c} (99%) rename src/{mess/machine/nes_ntdec.h => emu/bus/nes/ntdec.h} (96%) rename src/{mess/machine/nes_nxrom.c => emu/bus/nes/nxrom.c} (99%) rename src/{mess/machine/nes_nxrom.h => emu/bus/nes/nxrom.h} (99%) rename src/{mess/machine/nes_pirate.c => emu/bus/nes/pirate.c} (99%) rename src/{mess/machine/nes_pirate.h => emu/bus/nes/pirate.h} (99%) rename src/{mess/machine/nes_pt554.c => emu/bus/nes/pt554.c} (98%) rename src/{mess/machine/nes_pt554.h => emu/bus/nes/pt554.h} (94%) rename src/{mess/machine/nes_racermate.c => emu/bus/nes/racermate.c} (98%) rename src/{mess/machine/nes_racermate.h => emu/bus/nes/racermate.h} (94%) rename src/{mess/machine/nes_rcm.c => emu/bus/nes/rcm.c} (99%) rename src/{mess/machine/nes_rcm.h => emu/bus/nes/rcm.h} (98%) rename src/{mess/machine/nes_rexsoft.c => emu/bus/nes/rexsoft.c} (99%) rename src/{mess/machine/nes_rexsoft.h => emu/bus/nes/rexsoft.h} (97%) rename src/{mess/machine/nes_sachen.c => emu/bus/nes/sachen.c} (99%) rename src/{mess/machine/nes_sachen.h => emu/bus/nes/sachen.h} (99%) rename src/{mess/machine/nes_somari.c => emu/bus/nes/somari.c} (99%) rename src/{mess/machine/nes_somari.h => emu/bus/nes/somari.h} (97%) rename src/{mess/machine/nes_sunsoft.c => emu/bus/nes/sunsoft.c} (99%) rename src/{mess/machine/nes_sunsoft.h => emu/bus/nes/sunsoft.h} (99%) rename src/{mess/machine/nes_sunsoft_dcs.c => emu/bus/nes/sunsoft_dcs.c} (99%) rename src/{mess/machine/nes_sunsoft_dcs.h => emu/bus/nes/sunsoft_dcs.h} (99%) rename src/{mess/machine/nes_taito.c => emu/bus/nes/taito.c} (99%) rename src/{mess/machine/nes_taito.h => emu/bus/nes/taito.h} (98%) rename src/{mess/machine/nes_tengen.c => emu/bus/nes/tengen.c} (99%) rename src/{mess/machine/nes_tengen.h => emu/bus/nes/tengen.h} (98%) rename src/{mess/machine/nes_txc.c => emu/bus/nes/txc.c} (99%) rename src/{mess/machine/nes_txc.h => emu/bus/nes/txc.h} (98%) rename src/{mess/machine/nes_waixing.c => emu/bus/nes/waixing.c} (99%) rename src/{mess/machine/nes_waixing.h => emu/bus/nes/waixing.h} (99%) rename src/{mess/machine/sns_bsx.c => emu/bus/snes/bsx.c} (99%) rename src/{mess/machine/sns_bsx.h => emu/bus/snes/bsx.h} (97%) rename src/{mess/machine/sns_event.c => emu/bus/snes/event.c} (99%) rename src/{mess/machine/sns_event.h => emu/bus/snes/event.h} (97%) rename src/{mess/machine/sns_rom.c => emu/bus/snes/rom.c} (99%) rename src/{mess/machine/sns_rom.h => emu/bus/snes/rom.h} (99%) rename src/{mess/machine/sns_rom21.c => emu/bus/snes/rom21.c} (99%) rename src/{mess/machine/sns_rom21.h => emu/bus/snes/rom21.h} (98%) rename src/{mess/machine/sns_sa1.c => emu/bus/snes/sa1.c} (99%) rename src/{mess/machine/sns_sa1.h => emu/bus/snes/sa1.h} (98%) rename src/{mess/machine/sns_sdd1.c => emu/bus/snes/sdd1.c} (99%) rename src/{mess/machine/sns_sdd1.h => emu/bus/snes/sdd1.h} (99%) rename src/{mess/machine/sns_sfx.c => emu/bus/snes/sfx.c} (99%) rename src/{mess/machine/sns_sfx.h => emu/bus/snes/sfx.h} (95%) rename src/{mess/machine/sns_sgb.c => emu/bus/snes/sgb.c} (99%) rename src/{mess/machine/sns_sgb.h => emu/bus/snes/sgb.h} (96%) create mode 100644 src/emu/bus/snes/snes_carts.c create mode 100644 src/emu/bus/snes/snes_carts.h rename src/{mess/machine/sns_slot.c => emu/bus/snes/snes_slot.c} (99%) rename src/{mess/machine/sns_slot.h => emu/bus/snes/snes_slot.h} (100%) rename src/{mess/machine/sns_spc7110.c => emu/bus/snes/spc7110.c} (99%) rename src/{mess/machine/sns_spc7110.h => emu/bus/snes/spc7110.h} (99%) rename src/{mess/machine/sns_sufami.c => emu/bus/snes/sufami.c} (99%) rename src/{mess/machine/sns_sufami.h => emu/bus/snes/sufami.h} (95%) rename src/{mess/machine/sns_upd.c => emu/bus/snes/upd.c} (99%) rename src/{mess/machine/sns_upd.h => emu/bus/snes/upd.h} (98%) rename src/{mess/audio => emu/sound}/vrc6.c (100%) rename src/{mess/audio => emu/sound}/vrc6.h (100%) diff --git a/.gitattributes b/.gitattributes index 3b72480b8ac..d682c607cac 100644 --- a/.gitattributes +++ b/.gitattributes @@ -867,6 +867,105 @@ src/emu/bus/midi/midiinport.c svneol=native#text/plain src/emu/bus/midi/midiinport.h svneol=native#text/plain src/emu/bus/midi/midioutport.c svneol=native#text/plain src/emu/bus/midi/midioutport.h svneol=native#text/plain +src/emu/bus/nes/act53.c svneol=native#text/plain +src/emu/bus/nes/act53.h svneol=native#text/plain +src/emu/bus/nes/aladdin.c svneol=native#text/plain +src/emu/bus/nes/aladdin.h svneol=native#text/plain +src/emu/bus/nes/ave.c svneol=native#text/plain +src/emu/bus/nes/ave.h svneol=native#text/plain +src/emu/bus/nes/bandai.c svneol=native#text/plain +src/emu/bus/nes/bandai.h svneol=native#text/plain +src/emu/bus/nes/benshieng.c svneol=native#text/plain +src/emu/bus/nes/benshieng.h svneol=native#text/plain +src/emu/bus/nes/bootleg.c svneol=native#text/plain +src/emu/bus/nes/bootleg.h svneol=native#text/plain +src/emu/bus/nes/camerica.c svneol=native#text/plain +src/emu/bus/nes/camerica.h svneol=native#text/plain +src/emu/bus/nes/cne.c svneol=native#text/plain +src/emu/bus/nes/cne.h svneol=native#text/plain +src/emu/bus/nes/cony.c svneol=native#text/plain +src/emu/bus/nes/cony.h svneol=native#text/plain +src/emu/bus/nes/datach.c svneol=native#text/plain +src/emu/bus/nes/datach.h svneol=native#text/plain +src/emu/bus/nes/discrete.c svneol=native#text/plain +src/emu/bus/nes/discrete.h svneol=native#text/plain +src/emu/bus/nes/event.c svneol=native#text/plain +src/emu/bus/nes/event.h svneol=native#text/plain +src/emu/bus/nes/ggenie.c svneol=native#text/plain +src/emu/bus/nes/ggenie.h svneol=native#text/plain +src/emu/bus/nes/henggedianzi.c svneol=native#text/plain +src/emu/bus/nes/henggedianzi.h svneol=native#text/plain +src/emu/bus/nes/hes.c svneol=native#text/plain +src/emu/bus/nes/hes.h svneol=native#text/plain +src/emu/bus/nes/hosenkan.c svneol=native#text/plain +src/emu/bus/nes/hosenkan.h svneol=native#text/plain +src/emu/bus/nes/irem.c svneol=native#text/plain +src/emu/bus/nes/irem.h svneol=native#text/plain +src/emu/bus/nes/jaleco.c svneol=native#text/plain +src/emu/bus/nes/jaleco.h svneol=native#text/plain +src/emu/bus/nes/jy.c svneol=native#text/plain +src/emu/bus/nes/jy.h svneol=native#text/plain +src/emu/bus/nes/kaiser.c svneol=native#text/plain +src/emu/bus/nes/kaiser.h svneol=native#text/plain +src/emu/bus/nes/karastudio.c svneol=native#text/plain +src/emu/bus/nes/karastudio.h svneol=native#text/plain +src/emu/bus/nes/konami.c svneol=native#text/plain +src/emu/bus/nes/konami.h svneol=native#text/plain +src/emu/bus/nes/legacy.c svneol=native#text/plain +src/emu/bus/nes/legacy.h svneol=native#text/plain +src/emu/bus/nes/mmc1.c svneol=native#text/plain +src/emu/bus/nes/mmc1.h svneol=native#text/plain +src/emu/bus/nes/mmc2.c svneol=native#text/plain +src/emu/bus/nes/mmc2.h svneol=native#text/plain +src/emu/bus/nes/mmc3.c svneol=native#text/plain +src/emu/bus/nes/mmc3.h svneol=native#text/plain +src/emu/bus/nes/mmc3_clones.c svneol=native#text/plain +src/emu/bus/nes/mmc3_clones.h svneol=native#text/plain +src/emu/bus/nes/mmc5.c svneol=native#text/plain +src/emu/bus/nes/mmc5.h svneol=native#text/plain +src/emu/bus/nes/multigame.c svneol=native#text/plain +src/emu/bus/nes/multigame.h svneol=native#text/plain +src/emu/bus/nes/namcot.c svneol=native#text/plain +src/emu/bus/nes/namcot.h svneol=native#text/plain +src/emu/bus/nes/nanjing.c svneol=native#text/plain +src/emu/bus/nes/nanjing.h svneol=native#text/plain +src/emu/bus/nes/nes_carts.c svneol=native#text/plain +src/emu/bus/nes/nes_carts.h svneol=native#text/plain +src/emu/bus/nes/nes_ines.inc svneol=native#text/plain +src/emu/bus/nes/nes_pcb.inc svneol=native#text/plain +src/emu/bus/nes/nes_slot.c svneol=native#text/plain +src/emu/bus/nes/nes_slot.h svneol=native#text/plain +src/emu/bus/nes/nes_unif.inc svneol=native#text/plain +src/emu/bus/nes/ntdec.c svneol=native#text/plain +src/emu/bus/nes/ntdec.h svneol=native#text/plain +src/emu/bus/nes/nxrom.c svneol=native#text/plain +src/emu/bus/nes/nxrom.h svneol=native#text/plain +src/emu/bus/nes/pirate.c svneol=native#text/plain +src/emu/bus/nes/pirate.h svneol=native#text/plain +src/emu/bus/nes/pt554.c svneol=native#text/plain +src/emu/bus/nes/pt554.h svneol=native#text/plain +src/emu/bus/nes/racermate.c svneol=native#text/plain +src/emu/bus/nes/racermate.h svneol=native#text/plain +src/emu/bus/nes/rcm.c svneol=native#text/plain +src/emu/bus/nes/rcm.h svneol=native#text/plain +src/emu/bus/nes/rexsoft.c svneol=native#text/plain +src/emu/bus/nes/rexsoft.h svneol=native#text/plain +src/emu/bus/nes/sachen.c svneol=native#text/plain +src/emu/bus/nes/sachen.h svneol=native#text/plain +src/emu/bus/nes/somari.c svneol=native#text/plain +src/emu/bus/nes/somari.h svneol=native#text/plain +src/emu/bus/nes/sunsoft.c svneol=native#text/plain +src/emu/bus/nes/sunsoft.h svneol=native#text/plain +src/emu/bus/nes/sunsoft_dcs.c svneol=native#text/plain +src/emu/bus/nes/sunsoft_dcs.h svneol=native#text/plain +src/emu/bus/nes/taito.c svneol=native#text/plain +src/emu/bus/nes/taito.h svneol=native#text/plain +src/emu/bus/nes/tengen.c svneol=native#text/plain +src/emu/bus/nes/tengen.h svneol=native#text/plain +src/emu/bus/nes/txc.c svneol=native#text/plain +src/emu/bus/nes/txc.h svneol=native#text/plain +src/emu/bus/nes/waixing.c svneol=native#text/plain +src/emu/bus/nes/waixing.h svneol=native#text/plain src/emu/bus/nubus/nubus.c svneol=native#text/plain src/emu/bus/nubus/nubus.h svneol=native#text/plain src/emu/bus/nubus/nubus_48gc.c svneol=native#text/plain @@ -989,6 +1088,32 @@ src/emu/bus/s100/s100.c svneol=native#text/plain src/emu/bus/s100/s100.h svneol=native#text/plain src/emu/bus/s100/wunderbus.c svneol=native#text/plain src/emu/bus/s100/wunderbus.h svneol=native#text/plain +src/emu/bus/snes/bsx.c svneol=native#text/plain +src/emu/bus/snes/bsx.h svneol=native#text/plain +src/emu/bus/snes/event.c svneol=native#text/plain +src/emu/bus/snes/event.h svneol=native#text/plain +src/emu/bus/snes/rom.c svneol=native#text/plain +src/emu/bus/snes/rom.h svneol=native#text/plain +src/emu/bus/snes/rom21.c svneol=native#text/plain +src/emu/bus/snes/rom21.h svneol=native#text/plain +src/emu/bus/snes/sa1.c svneol=native#text/plain +src/emu/bus/snes/sa1.h svneol=native#text/plain +src/emu/bus/snes/sdd1.c svneol=native#text/plain +src/emu/bus/snes/sdd1.h svneol=native#text/plain +src/emu/bus/snes/sfx.c svneol=native#text/plain +src/emu/bus/snes/sfx.h svneol=native#text/plain +src/emu/bus/snes/sgb.c svneol=native#text/plain +src/emu/bus/snes/sgb.h svneol=native#text/plain +src/emu/bus/snes/snes_carts.c svneol=native#text/plain +src/emu/bus/snes/snes_carts.h svneol=native#text/plain +src/emu/bus/snes/snes_slot.c svneol=native#text/plain +src/emu/bus/snes/snes_slot.h svneol=native#text/plain +src/emu/bus/snes/spc7110.c svneol=native#text/plain +src/emu/bus/snes/spc7110.h svneol=native#text/plain +src/emu/bus/snes/sufami.c svneol=native#text/plain +src/emu/bus/snes/sufami.h svneol=native#text/plain +src/emu/bus/snes/upd.c svneol=native#text/plain +src/emu/bus/snes/upd.h svneol=native#text/plain src/emu/bus/tvc/hbf.c svneol=native#text/plain src/emu/bus/tvc/hbf.h svneol=native#text/plain src/emu/bus/tvc/tvc.c svneol=native#text/plain @@ -2657,6 +2782,8 @@ src/emu/sound/vlm5030.c svneol=native#text/plain src/emu/sound/vlm5030.h svneol=native#text/plain src/emu/sound/votrax.c svneol=native#text/plain src/emu/sound/votrax.h svneol=native#text/plain +src/emu/sound/vrc6.c svneol=native#text/plain +src/emu/sound/vrc6.h svneol=native#text/plain src/emu/sound/vrender0.c svneol=native#text/plain src/emu/sound/vrender0.h svneol=native#text/plain src/emu/sound/wave.c svneol=native#text/plain @@ -7093,8 +7220,6 @@ src/mess/audio/upd1771.h svneol=native#text/plain src/mess/audio/vboy.c svneol=native#text/plain src/mess/audio/vboy.h svneol=native#text/plain src/mess/audio/vc4000.c svneol=native#text/plain -src/mess/audio/vrc6.c svneol=native#text/plain -src/mess/audio/vrc6.h svneol=native#text/plain src/mess/audio/wswan.c svneol=native#text/plain src/mess/drivers/4004clk.c svneol=native#text/plain src/mess/drivers/68ksbc.c svneol=native#text/plain @@ -8246,103 +8371,6 @@ src/mess/machine/ncr5380.h svneol=native#text/plain src/mess/machine/ncr5390.c svneol=native#text/plain src/mess/machine/ncr5390.h svneol=native#text/plain src/mess/machine/nes.c svneol=native#text/plain -src/mess/machine/nes_act53.c svneol=native#text/plain -src/mess/machine/nes_act53.h svneol=native#text/plain -src/mess/machine/nes_aladdin.c svneol=native#text/plain -src/mess/machine/nes_aladdin.h svneol=native#text/plain -src/mess/machine/nes_ave.c svneol=native#text/plain -src/mess/machine/nes_ave.h svneol=native#text/plain -src/mess/machine/nes_bandai.c svneol=native#text/plain -src/mess/machine/nes_bandai.h svneol=native#text/plain -src/mess/machine/nes_benshieng.c svneol=native#text/plain -src/mess/machine/nes_benshieng.h svneol=native#text/plain -src/mess/machine/nes_bootleg.c svneol=native#text/plain -src/mess/machine/nes_bootleg.h svneol=native#text/plain -src/mess/machine/nes_camerica.c svneol=native#text/plain -src/mess/machine/nes_camerica.h svneol=native#text/plain -src/mess/machine/nes_cne.c svneol=native#text/plain -src/mess/machine/nes_cne.h svneol=native#text/plain -src/mess/machine/nes_cony.c svneol=native#text/plain -src/mess/machine/nes_cony.h svneol=native#text/plain -src/mess/machine/nes_datach.c svneol=native#text/plain -src/mess/machine/nes_datach.h svneol=native#text/plain -src/mess/machine/nes_discrete.c svneol=native#text/plain -src/mess/machine/nes_discrete.h svneol=native#text/plain -src/mess/machine/nes_event.c svneol=native#text/plain -src/mess/machine/nes_event.h svneol=native#text/plain -src/mess/machine/nes_ggenie.c svneol=native#text/plain -src/mess/machine/nes_ggenie.h svneol=native#text/plain -src/mess/machine/nes_henggedianzi.c svneol=native#text/plain -src/mess/machine/nes_henggedianzi.h svneol=native#text/plain -src/mess/machine/nes_hes.c svneol=native#text/plain -src/mess/machine/nes_hes.h svneol=native#text/plain -src/mess/machine/nes_hosenkan.c svneol=native#text/plain -src/mess/machine/nes_hosenkan.h svneol=native#text/plain -src/mess/machine/nes_ines.inc svneol=native#text/plain -src/mess/machine/nes_irem.c svneol=native#text/plain -src/mess/machine/nes_irem.h svneol=native#text/plain -src/mess/machine/nes_jaleco.c svneol=native#text/plain -src/mess/machine/nes_jaleco.h svneol=native#text/plain -src/mess/machine/nes_jy.c svneol=native#text/plain -src/mess/machine/nes_jy.h svneol=native#text/plain -src/mess/machine/nes_kaiser.c svneol=native#text/plain -src/mess/machine/nes_kaiser.h svneol=native#text/plain -src/mess/machine/nes_karastudio.c svneol=native#text/plain -src/mess/machine/nes_karastudio.h svneol=native#text/plain -src/mess/machine/nes_konami.c svneol=native#text/plain -src/mess/machine/nes_konami.h svneol=native#text/plain -src/mess/machine/nes_legacy.c svneol=native#text/plain -src/mess/machine/nes_legacy.h svneol=native#text/plain -src/mess/machine/nes_mmc1.c svneol=native#text/plain -src/mess/machine/nes_mmc1.h svneol=native#text/plain -src/mess/machine/nes_mmc2.c svneol=native#text/plain -src/mess/machine/nes_mmc2.h svneol=native#text/plain -src/mess/machine/nes_mmc3.c svneol=native#text/plain -src/mess/machine/nes_mmc3.h svneol=native#text/plain -src/mess/machine/nes_mmc3_clones.c svneol=native#text/plain -src/mess/machine/nes_mmc3_clones.h svneol=native#text/plain -src/mess/machine/nes_mmc5.c svneol=native#text/plain -src/mess/machine/nes_mmc5.h svneol=native#text/plain -src/mess/machine/nes_multigame.c svneol=native#text/plain -src/mess/machine/nes_multigame.h svneol=native#text/plain -src/mess/machine/nes_namcot.c svneol=native#text/plain -src/mess/machine/nes_namcot.h svneol=native#text/plain -src/mess/machine/nes_nanjing.c svneol=native#text/plain -src/mess/machine/nes_nanjing.h svneol=native#text/plain -src/mess/machine/nes_ntdec.c svneol=native#text/plain -src/mess/machine/nes_ntdec.h svneol=native#text/plain -src/mess/machine/nes_nxrom.c svneol=native#text/plain -src/mess/machine/nes_nxrom.h svneol=native#text/plain -src/mess/machine/nes_pcb.inc svneol=native#text/plain -src/mess/machine/nes_pirate.c svneol=native#text/plain -src/mess/machine/nes_pirate.h svneol=native#text/plain -src/mess/machine/nes_pt554.c svneol=native#text/plain -src/mess/machine/nes_pt554.h svneol=native#text/plain -src/mess/machine/nes_racermate.c svneol=native#text/plain -src/mess/machine/nes_racermate.h svneol=native#text/plain -src/mess/machine/nes_rcm.c svneol=native#text/plain -src/mess/machine/nes_rcm.h svneol=native#text/plain -src/mess/machine/nes_rexsoft.c svneol=native#text/plain -src/mess/machine/nes_rexsoft.h svneol=native#text/plain -src/mess/machine/nes_sachen.c svneol=native#text/plain -src/mess/machine/nes_sachen.h svneol=native#text/plain -src/mess/machine/nes_slot.c svneol=native#text/plain -src/mess/machine/nes_slot.h svneol=native#text/plain -src/mess/machine/nes_somari.c svneol=native#text/plain -src/mess/machine/nes_somari.h svneol=native#text/plain -src/mess/machine/nes_sunsoft.c svneol=native#text/plain -src/mess/machine/nes_sunsoft.h svneol=native#text/plain -src/mess/machine/nes_sunsoft_dcs.c svneol=native#text/plain -src/mess/machine/nes_sunsoft_dcs.h svneol=native#text/plain -src/mess/machine/nes_taito.c svneol=native#text/plain -src/mess/machine/nes_taito.h svneol=native#text/plain -src/mess/machine/nes_tengen.c svneol=native#text/plain -src/mess/machine/nes_tengen.h svneol=native#text/plain -src/mess/machine/nes_txc.c svneol=native#text/plain -src/mess/machine/nes_txc.h svneol=native#text/plain -src/mess/machine/nes_unif.inc svneol=native#text/plain -src/mess/machine/nes_waixing.c svneol=native#text/plain -src/mess/machine/nes_waixing.h svneol=native#text/plain src/mess/machine/nextkbd.c svneol=native#text/plain src/mess/machine/nextkbd.h svneol=native#text/plain src/mess/machine/nextmo.c svneol=native#text/plain @@ -8457,30 +8485,6 @@ src/mess/machine/smsexp.c svneol=native#text/plain src/mess/machine/smsexp.h svneol=native#text/plain src/mess/machine/snescx4.c svneol=native#text/plain src/mess/machine/snescx4.h svneol=native#text/plain -src/mess/machine/sns_bsx.c svneol=native#text/plain -src/mess/machine/sns_bsx.h svneol=native#text/plain -src/mess/machine/sns_event.c svneol=native#text/plain -src/mess/machine/sns_event.h svneol=native#text/plain -src/mess/machine/sns_rom.c svneol=native#text/plain -src/mess/machine/sns_rom.h svneol=native#text/plain -src/mess/machine/sns_rom21.c svneol=native#text/plain -src/mess/machine/sns_rom21.h svneol=native#text/plain -src/mess/machine/sns_sa1.c svneol=native#text/plain -src/mess/machine/sns_sa1.h svneol=native#text/plain -src/mess/machine/sns_sdd1.c svneol=native#text/plain -src/mess/machine/sns_sdd1.h svneol=native#text/plain -src/mess/machine/sns_sfx.c svneol=native#text/plain -src/mess/machine/sns_sfx.h svneol=native#text/plain -src/mess/machine/sns_sgb.c svneol=native#text/plain -src/mess/machine/sns_sgb.h svneol=native#text/plain -src/mess/machine/sns_slot.c svneol=native#text/plain -src/mess/machine/sns_slot.h svneol=native#text/plain -src/mess/machine/sns_spc7110.c svneol=native#text/plain -src/mess/machine/sns_spc7110.h svneol=native#text/plain -src/mess/machine/sns_sufami.c svneol=native#text/plain -src/mess/machine/sns_sufami.h svneol=native#text/plain -src/mess/machine/sns_upd.c svneol=native#text/plain -src/mess/machine/sns_upd.h svneol=native#text/plain src/mess/machine/sonydriv.c svneol=native#text/plain src/mess/machine/sonydriv.h svneol=native#text/plain src/mess/machine/sorcerer.c svneol=native#text/plain diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak index 5054ea90e03..28ad39783ef 100644 --- a/src/emu/bus/bus.mak +++ b/src/emu/bus/bus.mak @@ -685,3 +685,79 @@ BUSOBJS += $(BUSOBJ)/pci/southbridge.o BUSOBJS += $(BUSOBJ)/pci/mpc105.o endif +#------------------------------------------------- +# +#@src/emu/bus/nes/nes_slot.h,BUSES += NES +#------------------------------------------------- + +ifneq ($(filter NES,$(BUSES)),) +BUSOBJS += $(BUSOBJ)/nes/nes_slot.o +BUSOBJS += $(BUSOBJ)/nes/nes_carts.o +BUSOBJS += $(BUSOBJ)/nes/act53.o +BUSOBJS += $(BUSOBJ)/nes/aladdin.o +BUSOBJS += $(BUSOBJ)/nes/ave.o +BUSOBJS += $(BUSOBJ)/nes/bandai.o +BUSOBJS += $(BUSOBJ)/nes/benshieng.o +BUSOBJS += $(BUSOBJ)/nes/bootleg.o +BUSOBJS += $(BUSOBJ)/nes/camerica.o +BUSOBJS += $(BUSOBJ)/nes/cne.o +BUSOBJS += $(BUSOBJ)/nes/cony.o +BUSOBJS += $(BUSOBJ)/nes/datach.o +BUSOBJS += $(BUSOBJ)/nes/discrete.o +BUSOBJS += $(BUSOBJ)/nes/event.o +BUSOBJS += $(BUSOBJ)/nes/ggenie.o +BUSOBJS += $(BUSOBJ)/nes/henggedianzi.o +BUSOBJS += $(BUSOBJ)/nes/hes.o +BUSOBJS += $(BUSOBJ)/nes/hosenkan.o +BUSOBJS += $(BUSOBJ)/nes/irem.o +BUSOBJS += $(BUSOBJ)/nes/jaleco.o +BUSOBJS += $(BUSOBJ)/nes/jy.o +BUSOBJS += $(BUSOBJ)/nes/kaiser.o +BUSOBJS += $(BUSOBJ)/nes/karastudio.o +BUSOBJS += $(BUSOBJ)/nes/konami.o +BUSOBJS += $(BUSOBJ)/nes/legacy.o +BUSOBJS += $(BUSOBJ)/nes/mmc1.o +BUSOBJS += $(BUSOBJ)/nes/mmc2.o +BUSOBJS += $(BUSOBJ)/nes/mmc3.o +BUSOBJS += $(BUSOBJ)/nes/mmc3_clones.o +BUSOBJS += $(BUSOBJ)/nes/mmc5.o +BUSOBJS += $(BUSOBJ)/nes/multigame.o +BUSOBJS += $(BUSOBJ)/nes/namcot.o +BUSOBJS += $(BUSOBJ)/nes/nanjing.o +BUSOBJS += $(BUSOBJ)/nes/ntdec.o +BUSOBJS += $(BUSOBJ)/nes/nxrom.o +BUSOBJS += $(BUSOBJ)/nes/pirate.o +BUSOBJS += $(BUSOBJ)/nes/pt554.o +BUSOBJS += $(BUSOBJ)/nes/racermate.o +BUSOBJS += $(BUSOBJ)/nes/rcm.o +BUSOBJS += $(BUSOBJ)/nes/rexsoft.o +BUSOBJS += $(BUSOBJ)/nes/sachen.o +BUSOBJS += $(BUSOBJ)/nes/somari.o +BUSOBJS += $(BUSOBJ)/nes/sunsoft.o +BUSOBJS += $(BUSOBJ)/nes/sunsoft_dcs.o +BUSOBJS += $(BUSOBJ)/nes/taito.o +BUSOBJS += $(BUSOBJ)/nes/tengen.o +BUSOBJS += $(BUSOBJ)/nes/txc.o +BUSOBJS += $(BUSOBJ)/nes/waixing.o +endif + +#------------------------------------------------- +# +#@src/emu/bus/snes/snes_slot.h,BUSES += SNES +#------------------------------------------------- + +ifneq ($(filter SNES,$(BUSES)),) +BUSOBJS += $(BUSOBJ)/snes/snes_slot.o +BUSOBJS += $(BUSOBJ)/snes/snes_carts.o +BUSOBJS += $(BUSOBJ)/snes/bsx.o +BUSOBJS += $(BUSOBJ)/snes/event.o +BUSOBJS += $(BUSOBJ)/snes/rom.o +BUSOBJS += $(BUSOBJ)/snes/rom21.o +BUSOBJS += $(BUSOBJ)/snes/sa1.o +BUSOBJS += $(BUSOBJ)/snes/sdd1.o +BUSOBJS += $(BUSOBJ)/snes/sfx.o +BUSOBJS += $(BUSOBJ)/snes/sgb.o +BUSOBJS += $(BUSOBJ)/snes/spc7110.o +BUSOBJS += $(BUSOBJ)/snes/sufami.o +BUSOBJS += $(BUSOBJ)/snes/upd.o +endif diff --git a/src/mess/machine/nes_act53.c b/src/emu/bus/nes/act53.c similarity index 99% rename from src/mess/machine/nes_act53.c rename to src/emu/bus/nes/act53.c index 87527b0a2b9..5ee6293ac68 100644 --- a/src/mess/machine/nes_act53.c +++ b/src/emu/bus/nes/act53.c @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/nes_act53.h" +#include "act53.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_act53.h b/src/emu/bus/nes/act53.h similarity index 95% rename from src/mess/machine/nes_act53.h rename to src/emu/bus/nes/act53.h index 0d9b2cea489..6ec50e6af91 100644 --- a/src/mess/machine/nes_act53.h +++ b/src/emu/bus/nes/act53.h @@ -1,7 +1,7 @@ #ifndef __NES_ACTION53_H #define __NES_ACTION53_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_racermate_device diff --git a/src/mess/machine/nes_aladdin.c b/src/emu/bus/nes/aladdin.c similarity index 99% rename from src/mess/machine/nes_aladdin.c rename to src/emu/bus/nes/aladdin.c index 38e6e15996e..0ddceeb347d 100644 --- a/src/mess/machine/nes_aladdin.c +++ b/src/emu/bus/nes/aladdin.c @@ -16,7 +16,7 @@ #include "emu.h" -#include "machine/nes_aladdin.h" +#include "aladdin.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_aladdin.h b/src/emu/bus/nes/aladdin.h similarity index 99% rename from src/mess/machine/nes_aladdin.h rename to src/emu/bus/nes/aladdin.h index c7009f70a73..f944c1127b5 100644 --- a/src/mess/machine/nes_aladdin.h +++ b/src/emu/bus/nes/aladdin.h @@ -1,7 +1,7 @@ #ifndef __NES_ALADDIN_H #define __NES_ALADDIN_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" //---------------------------------- diff --git a/src/mess/machine/nes_ave.c b/src/emu/bus/nes/ave.c similarity index 99% rename from src/mess/machine/nes_ave.c rename to src/emu/bus/nes/ave.c index 90784e1cbe0..aecf875d000 100644 --- a/src/mess/machine/nes_ave.c +++ b/src/emu/bus/nes/ave.c @@ -18,7 +18,7 @@ #include "emu.h" -#include "machine/nes_ave.h" +#include "ave.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_ave.h b/src/emu/bus/nes/ave.h similarity index 97% rename from src/mess/machine/nes_ave.h rename to src/emu/bus/nes/ave.h index 3fa5e365a29..861b77f28d6 100644 --- a/src/mess/machine/nes_ave.h +++ b/src/emu/bus/nes/ave.h @@ -1,7 +1,7 @@ #ifndef __NES_AVE_H #define __NES_AVE_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_nina001_device diff --git a/src/mess/machine/nes_bandai.c b/src/emu/bus/nes/bandai.c similarity index 99% rename from src/mess/machine/nes_bandai.c rename to src/emu/bus/nes/bandai.c index b5420408e69..880ddfd44bb 100644 --- a/src/mess/machine/nes_bandai.c +++ b/src/emu/bus/nes/bandai.c @@ -33,7 +33,7 @@ #include "emu.h" -#include "machine/nes_bandai.h" +#include "bandai.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_bandai.h b/src/emu/bus/nes/bandai.h similarity index 99% rename from src/mess/machine/nes_bandai.h rename to src/emu/bus/nes/bandai.h index eabcfff4ace..9fafb604c6f 100644 --- a/src/mess/machine/nes_bandai.h +++ b/src/emu/bus/nes/bandai.h @@ -1,7 +1,7 @@ #ifndef __NES_BANDAI_H #define __NES_BANDAI_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" #include "machine/i2cmem.h" diff --git a/src/mess/machine/nes_benshieng.c b/src/emu/bus/nes/benshieng.c similarity index 98% rename from src/mess/machine/nes_benshieng.c rename to src/emu/bus/nes/benshieng.c index 45bedc6da29..e3ddb5117df 100644 --- a/src/mess/machine/nes_benshieng.c +++ b/src/emu/bus/nes/benshieng.c @@ -13,7 +13,7 @@ #include "emu.h" -#include "machine/nes_benshieng.h" +#include "benshieng.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_benshieng.h b/src/emu/bus/nes/benshieng.h similarity index 95% rename from src/mess/machine/nes_benshieng.h rename to src/emu/bus/nes/benshieng.h index a3447ca65e1..8bd6ee60594 100644 --- a/src/mess/machine/nes_benshieng.h +++ b/src/emu/bus/nes/benshieng.h @@ -1,7 +1,7 @@ #ifndef __NES_BENSHIENG_H #define __NES_BENSHIENG_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_benshieng_device diff --git a/src/mess/machine/nes_bootleg.c b/src/emu/bus/nes/bootleg.c similarity index 99% rename from src/mess/machine/nes_bootleg.c rename to src/emu/bus/nes/bootleg.c index aa42e9bf93e..724b4cb7a2c 100644 --- a/src/mess/machine/nes_bootleg.c +++ b/src/emu/bus/nes/bootleg.c @@ -20,7 +20,7 @@ #include "emu.h" -#include "machine/nes_bootleg.h" +#include "bootleg.h" #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE diff --git a/src/mess/machine/nes_bootleg.h b/src/emu/bus/nes/bootleg.h similarity index 99% rename from src/mess/machine/nes_bootleg.h rename to src/emu/bus/nes/bootleg.h index 13a41d684a8..20926602e98 100644 --- a/src/mess/machine/nes_bootleg.h +++ b/src/emu/bus/nes/bootleg.h @@ -1,7 +1,7 @@ #ifndef __NES_BTL_H #define __NES_BTL_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_ax5705_device diff --git a/src/mess/machine/nes_camerica.c b/src/emu/bus/nes/camerica.c similarity index 99% rename from src/mess/machine/nes_camerica.c rename to src/emu/bus/nes/camerica.c index 6c1f72b3425..8b0386034d7 100644 --- a/src/mess/machine/nes_camerica.c +++ b/src/emu/bus/nes/camerica.c @@ -26,7 +26,7 @@ #include "emu.h" -#include "machine/nes_camerica.h" +#include "camerica.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_camerica.h b/src/emu/bus/nes/camerica.h similarity index 97% rename from src/mess/machine/nes_camerica.h rename to src/emu/bus/nes/camerica.h index c067af668e6..6146ba7df36 100644 --- a/src/mess/machine/nes_camerica.h +++ b/src/emu/bus/nes/camerica.h @@ -1,7 +1,7 @@ #ifndef __NES_CAMERICA_H #define __NES_CAMERICA_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_bf9093_device diff --git a/src/mess/machine/nes_cne.c b/src/emu/bus/nes/cne.c similarity index 99% rename from src/mess/machine/nes_cne.c rename to src/emu/bus/nes/cne.c index f02cc27470c..8ba358dfafe 100644 --- a/src/mess/machine/nes_cne.c +++ b/src/emu/bus/nes/cne.c @@ -17,7 +17,7 @@ #include "emu.h" -#include "machine/nes_cne.h" +#include "cne.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_cne.h b/src/emu/bus/nes/cne.h similarity index 97% rename from src/mess/machine/nes_cne.h rename to src/emu/bus/nes/cne.h index 8756f414f3b..5e9453f14a8 100644 --- a/src/mess/machine/nes_cne.h +++ b/src/emu/bus/nes/cne.h @@ -1,7 +1,7 @@ #ifndef __NES_CNE_H #define __NES_CNE_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_cne_decathl_device diff --git a/src/mess/machine/nes_cony.c b/src/emu/bus/nes/cony.c similarity index 99% rename from src/mess/machine/nes_cony.c rename to src/emu/bus/nes/cony.c index 38bfa73ef5e..cf00c164871 100644 --- a/src/mess/machine/nes_cony.c +++ b/src/emu/bus/nes/cony.c @@ -18,7 +18,7 @@ #include "emu.h" -#include "machine/nes_cony.h" +#include "cony.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_cony.h b/src/emu/bus/nes/cony.h similarity index 98% rename from src/mess/machine/nes_cony.h rename to src/emu/bus/nes/cony.h index 1737f610a86..314dfb64efb 100644 --- a/src/mess/machine/nes_cony.h +++ b/src/emu/bus/nes/cony.h @@ -1,7 +1,7 @@ #ifndef __NES_CONY_H #define __NES_CONY_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_cony_device diff --git a/src/mess/machine/nes_datach.c b/src/emu/bus/nes/datach.c similarity index 99% rename from src/mess/machine/nes_datach.c rename to src/emu/bus/nes/datach.c index 5346817cdee..babd3f94454 100644 --- a/src/mess/machine/nes_datach.c +++ b/src/emu/bus/nes/datach.c @@ -16,7 +16,7 @@ #include "emu.h" -#include "machine/nes_datach.h" +#include "datach.h" #include "cpu/m6502/m6502.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_datach.h b/src/emu/bus/nes/datach.h similarity index 99% rename from src/mess/machine/nes_datach.h rename to src/emu/bus/nes/datach.h index 9dbe2413ceb..a65fd683231 100644 --- a/src/mess/machine/nes_datach.h +++ b/src/emu/bus/nes/datach.h @@ -1,7 +1,7 @@ #ifndef __NES_DATACH_H #define __NES_DATACH_H -#include "machine/nes_bandai.h" +#include "bandai.h" #include "machine/i2cmem.h" #include "machine/bcreader.h" diff --git a/src/mess/machine/nes_discrete.c b/src/emu/bus/nes/discrete.c similarity index 99% rename from src/mess/machine/nes_discrete.c rename to src/emu/bus/nes/discrete.c index 704e647b8df..d95214c0521 100644 --- a/src/mess/machine/nes_discrete.c +++ b/src/emu/bus/nes/discrete.c @@ -20,7 +20,7 @@ #include "emu.h" -#include "machine/nes_discrete.h" +#include "discrete.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_discrete.h b/src/emu/bus/nes/discrete.h similarity index 98% rename from src/mess/machine/nes_discrete.h rename to src/emu/bus/nes/discrete.h index 27ea57af211..c5f1840fe35 100644 --- a/src/mess/machine/nes_discrete.h +++ b/src/emu/bus/nes/discrete.h @@ -1,7 +1,7 @@ #ifndef __NES_DISCRETE_H #define __NES_DISCRETE_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_74x161x161x32_device diff --git a/src/mess/machine/nes_event.c b/src/emu/bus/nes/event.c similarity index 99% rename from src/mess/machine/nes_event.c rename to src/emu/bus/nes/event.c index 2eacfbd131f..bb51a4d0f5e 100644 --- a/src/mess/machine/nes_event.c +++ b/src/emu/bus/nes/event.c @@ -15,7 +15,7 @@ #include "emu.h" -#include "machine/nes_event.h" +#include "event.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_event.h b/src/emu/bus/nes/event.h similarity index 96% rename from src/mess/machine/nes_event.h rename to src/emu/bus/nes/event.h index ecd617576d1..bc8d3550aa9 100644 --- a/src/mess/machine/nes_event.h +++ b/src/emu/bus/nes/event.h @@ -1,7 +1,7 @@ #ifndef __NES_EVENT_H #define __NES_EVENT_H -#include "machine/nes_mmc1.h" +#include "mmc1.h" // ======================> nes_event_device diff --git a/src/mess/machine/nes_ggenie.c b/src/emu/bus/nes/ggenie.c similarity index 99% rename from src/mess/machine/nes_ggenie.c rename to src/emu/bus/nes/ggenie.c index 2954a21685c..b6b6b7efc2d 100644 --- a/src/mess/machine/nes_ggenie.c +++ b/src/emu/bus/nes/ggenie.c @@ -15,7 +15,7 @@ #include "emu.h" -#include "machine/nes_ggenie.h" +#include "ggenie.h" #include "includes/nes.h" diff --git a/src/mess/machine/nes_ggenie.h b/src/emu/bus/nes/ggenie.h similarity index 98% rename from src/mess/machine/nes_ggenie.h rename to src/emu/bus/nes/ggenie.h index c6851b10e8a..1b14c9cd416 100644 --- a/src/mess/machine/nes_ggenie.h +++ b/src/emu/bus/nes/ggenie.h @@ -1,7 +1,7 @@ #ifndef __NES_GGENIE_H #define __NES_GGENIE_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_ggenie_device diff --git a/src/mess/machine/nes_henggedianzi.c b/src/emu/bus/nes/henggedianzi.c similarity index 99% rename from src/mess/machine/nes_henggedianzi.c rename to src/emu/bus/nes/henggedianzi.c index 6b2b17f2ffe..ac5ede29767 100644 --- a/src/mess/machine/nes_henggedianzi.c +++ b/src/emu/bus/nes/henggedianzi.c @@ -21,7 +21,7 @@ #include "emu.h" -#include "machine/nes_henggedianzi.h" +#include "henggedianzi.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_henggedianzi.h b/src/emu/bus/nes/henggedianzi.h similarity index 98% rename from src/mess/machine/nes_henggedianzi.h rename to src/emu/bus/nes/henggedianzi.h index ed07e71e32f..116316cf766 100644 --- a/src/mess/machine/nes_henggedianzi.h +++ b/src/emu/bus/nes/henggedianzi.h @@ -1,7 +1,7 @@ #ifndef __NES_HENGGEDIANZI_H #define __NES_HENGGEDIANZI_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_hengg_srich_device diff --git a/src/mess/machine/nes_hes.c b/src/emu/bus/nes/hes.c similarity index 98% rename from src/mess/machine/nes_hes.c rename to src/emu/bus/nes/hes.c index c6eba7d51db..514b78c7a1c 100644 --- a/src/mess/machine/nes_hes.c +++ b/src/emu/bus/nes/hes.c @@ -15,7 +15,7 @@ #include "emu.h" -#include "machine/nes_hes.h" +#include "hes.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_hes.h b/src/emu/bus/nes/hes.h similarity index 93% rename from src/mess/machine/nes_hes.h rename to src/emu/bus/nes/hes.h index 4c1a27eae3b..d7d85adf81d 100644 --- a/src/mess/machine/nes_hes.h +++ b/src/emu/bus/nes/hes.h @@ -1,7 +1,7 @@ #ifndef __NES_HES_H #define __NES_HES_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_hes_device diff --git a/src/mess/machine/nes_hosenkan.c b/src/emu/bus/nes/hosenkan.c similarity index 99% rename from src/mess/machine/nes_hosenkan.c rename to src/emu/bus/nes/hosenkan.c index cefc53b7b3f..077e1b70ca1 100644 --- a/src/mess/machine/nes_hosenkan.c +++ b/src/emu/bus/nes/hosenkan.c @@ -11,7 +11,7 @@ #include "emu.h" -#include "machine/nes_hosenkan.h" +#include "hosenkan.h" #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE diff --git a/src/mess/machine/nes_hosenkan.h b/src/emu/bus/nes/hosenkan.h similarity index 95% rename from src/mess/machine/nes_hosenkan.h rename to src/emu/bus/nes/hosenkan.h index a59567135ac..70d9c0f959b 100644 --- a/src/mess/machine/nes_hosenkan.h +++ b/src/emu/bus/nes/hosenkan.h @@ -1,7 +1,7 @@ #ifndef __NES_HOSENKAN_H #define __NES_HOSENKAN_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_hosenkan_device diff --git a/src/mess/machine/nes_irem.c b/src/emu/bus/nes/irem.c similarity index 99% rename from src/mess/machine/nes_irem.c rename to src/emu/bus/nes/irem.c index 02eb8cb2f3b..7d571f34b27 100644 --- a/src/mess/machine/nes_irem.c +++ b/src/emu/bus/nes/irem.c @@ -19,7 +19,7 @@ #include "emu.h" -#include "machine/nes_irem.h" +#include "irem.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_irem.h b/src/emu/bus/nes/irem.h similarity index 98% rename from src/mess/machine/nes_irem.h rename to src/emu/bus/nes/irem.h index 0380448092d..f72f7a0a452 100644 --- a/src/mess/machine/nes_irem.h +++ b/src/emu/bus/nes/irem.h @@ -1,7 +1,7 @@ #ifndef __NES_IREM_H #define __NES_IREM_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_lrog017_device diff --git a/src/mess/machine/nes_jaleco.c b/src/emu/bus/nes/jaleco.c similarity index 99% rename from src/mess/machine/nes_jaleco.c rename to src/emu/bus/nes/jaleco.c index 86b5a21ae55..059b20c017b 100644 --- a/src/mess/machine/nes_jaleco.c +++ b/src/emu/bus/nes/jaleco.c @@ -20,7 +20,7 @@ #include "emu.h" -#include "machine/nes_jaleco.h" +#include "jaleco.h" #include "cpu/m6502/m6502.h" #include "sound/samples.h" diff --git a/src/mess/machine/nes_jaleco.h b/src/emu/bus/nes/jaleco.h similarity index 99% rename from src/mess/machine/nes_jaleco.h rename to src/emu/bus/nes/jaleco.h index b621c38c2f8..fd2c60ea4ce 100644 --- a/src/mess/machine/nes_jaleco.h +++ b/src/emu/bus/nes/jaleco.h @@ -1,7 +1,7 @@ #ifndef __NES_JALECO_H #define __NES_JALECO_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" #include "sound/samples.h" diff --git a/src/mess/machine/nes_jy.c b/src/emu/bus/nes/jy.c similarity index 99% rename from src/mess/machine/nes_jy.c rename to src/emu/bus/nes/jy.c index 8ea95f2d146..bf2d29a3d36 100644 --- a/src/mess/machine/nes_jy.c +++ b/src/emu/bus/nes/jy.c @@ -20,7 +20,7 @@ #include "emu.h" -#include "machine/nes_jy.h" +#include "jy.h" #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE diff --git a/src/mess/machine/nes_jy.h b/src/emu/bus/nes/jy.h similarity index 98% rename from src/mess/machine/nes_jy.h rename to src/emu/bus/nes/jy.h index ec2e6aec5d4..720c3ea2e60 100644 --- a/src/mess/machine/nes_jy.h +++ b/src/emu/bus/nes/jy.h @@ -1,7 +1,7 @@ #ifndef __NES_JY_H #define __NES_JY_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_jy_typea_device diff --git a/src/mess/machine/nes_kaiser.c b/src/emu/bus/nes/kaiser.c similarity index 99% rename from src/mess/machine/nes_kaiser.c rename to src/emu/bus/nes/kaiser.c index b425fb9120e..5d7e3b626ac 100644 --- a/src/mess/machine/nes_kaiser.c +++ b/src/emu/bus/nes/kaiser.c @@ -30,7 +30,7 @@ #include "emu.h" -#include "machine/nes_kaiser.h" +#include "kaiser.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_kaiser.h b/src/emu/bus/nes/kaiser.h similarity index 99% rename from src/mess/machine/nes_kaiser.h rename to src/emu/bus/nes/kaiser.h index 07f6f0707ab..70036ab6606 100644 --- a/src/mess/machine/nes_kaiser.h +++ b/src/emu/bus/nes/kaiser.h @@ -1,7 +1,7 @@ #ifndef __NES_KAISER_H #define __NES_KAISER_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_ks7058_device diff --git a/src/mess/machine/nes_karastudio.c b/src/emu/bus/nes/karastudio.c similarity index 99% rename from src/mess/machine/nes_karastudio.c rename to src/emu/bus/nes/karastudio.c index cdc4ee012aa..a62dc44ec1b 100644 --- a/src/mess/machine/nes_karastudio.c +++ b/src/emu/bus/nes/karastudio.c @@ -30,7 +30,7 @@ #include "emu.h" -#include "machine/nes_karastudio.h" +#include "karastudio.h" #ifdef NES_PCB_DEBUG #define VERBOSE 1 diff --git a/src/mess/machine/nes_karastudio.h b/src/emu/bus/nes/karastudio.h similarity index 99% rename from src/mess/machine/nes_karastudio.h rename to src/emu/bus/nes/karastudio.h index df06a462b31..1acd4fcbe6a 100644 --- a/src/mess/machine/nes_karastudio.h +++ b/src/emu/bus/nes/karastudio.h @@ -1,7 +1,7 @@ #ifndef __NES_KARASTUDIO_H #define __NES_KARASTUDIO_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" //----------------------------------------- diff --git a/src/mess/machine/nes_konami.c b/src/emu/bus/nes/konami.c similarity index 99% rename from src/mess/machine/nes_konami.c rename to src/emu/bus/nes/konami.c index 27d73eb0790..5d19e5bcf44 100644 --- a/src/mess/machine/nes_konami.c +++ b/src/emu/bus/nes/konami.c @@ -26,7 +26,7 @@ #include "emu.h" -#include "machine/nes_konami.h" +#include "konami.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_konami.h b/src/emu/bus/nes/konami.h similarity index 98% rename from src/mess/machine/nes_konami.h rename to src/emu/bus/nes/konami.h index 2a68beaa62d..375e3d4d8dd 100644 --- a/src/mess/machine/nes_konami.h +++ b/src/emu/bus/nes/konami.h @@ -1,8 +1,8 @@ #ifndef __NES_KONAMI_H #define __NES_KONAMI_H -#include "machine/nes_nxrom.h" -#include "audio/vrc6.h" +#include "nxrom.h" +#include "sound/vrc6.h" #include "sound/2413intf.h" diff --git a/src/mess/machine/nes_legacy.c b/src/emu/bus/nes/legacy.c similarity index 99% rename from src/mess/machine/nes_legacy.c rename to src/emu/bus/nes/legacy.c index 6af72d17627..be132dd86d1 100644 --- a/src/mess/machine/nes_legacy.c +++ b/src/emu/bus/nes/legacy.c @@ -17,7 +17,7 @@ #include "emu.h" -#include "machine/nes_legacy.h" +#include "legacy.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_legacy.h b/src/emu/bus/nes/legacy.h similarity index 98% rename from src/mess/machine/nes_legacy.h rename to src/emu/bus/nes/legacy.h index b4f18943a6d..41fc7036c6a 100644 --- a/src/mess/machine/nes_legacy.h +++ b/src/emu/bus/nes/legacy.h @@ -1,7 +1,7 @@ #ifndef __NES_LEGACY_H #define __NES_LEGACY_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_ffe3_device diff --git a/src/mess/machine/nes_mmc1.c b/src/emu/bus/nes/mmc1.c similarity index 99% rename from src/mess/machine/nes_mmc1.c rename to src/emu/bus/nes/mmc1.c index 5f528424c5d..fd3a038cd66 100644 --- a/src/mess/machine/nes_mmc1.c +++ b/src/emu/bus/nes/mmc1.c @@ -18,7 +18,7 @@ #include "emu.h" -#include "machine/nes_mmc1.h" +#include "mmc1.h" #ifdef NES_PCB_DEBUG #define VERBOSE 1 diff --git a/src/mess/machine/nes_mmc1.h b/src/emu/bus/nes/mmc1.h similarity index 98% rename from src/mess/machine/nes_mmc1.h rename to src/emu/bus/nes/mmc1.h index a13c4100b0a..f0f0987bb27 100644 --- a/src/mess/machine/nes_mmc1.h +++ b/src/emu/bus/nes/mmc1.h @@ -1,7 +1,7 @@ #ifndef __NES_MMC1_H #define __NES_MMC1_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_sxrom_device diff --git a/src/mess/machine/nes_mmc2.c b/src/emu/bus/nes/mmc2.c similarity index 99% rename from src/mess/machine/nes_mmc2.c rename to src/emu/bus/nes/mmc2.c index 87e69095bfb..64e7931f7ed 100644 --- a/src/mess/machine/nes_mmc2.c +++ b/src/emu/bus/nes/mmc2.c @@ -13,7 +13,7 @@ #include "emu.h" -#include "machine/nes_mmc2.h" +#include "mmc2.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_mmc2.h b/src/emu/bus/nes/mmc2.h similarity index 97% rename from src/mess/machine/nes_mmc2.h rename to src/emu/bus/nes/mmc2.h index 580ac31302b..a4963a7f2c4 100644 --- a/src/mess/machine/nes_mmc2.h +++ b/src/emu/bus/nes/mmc2.h @@ -1,7 +1,7 @@ #ifndef __NES_MMC2_H #define __NES_MMC2_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_pxrom_device diff --git a/src/mess/machine/nes_mmc3.c b/src/emu/bus/nes/mmc3.c similarity index 99% rename from src/mess/machine/nes_mmc3.c rename to src/emu/bus/nes/mmc3.c index 17b365c69ed..8aa780aa69c 100644 --- a/src/mess/machine/nes_mmc3.c +++ b/src/emu/bus/nes/mmc3.c @@ -27,7 +27,7 @@ #include "emu.h" -#include "machine/nes_mmc3.h" +#include "mmc3.h" #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE diff --git a/src/mess/machine/nes_mmc3.h b/src/emu/bus/nes/mmc3.h similarity index 99% rename from src/mess/machine/nes_mmc3.h rename to src/emu/bus/nes/mmc3.h index 7c2e607e5ec..6c1f59bd6d3 100644 --- a/src/mess/machine/nes_mmc3.h +++ b/src/emu/bus/nes/mmc3.h @@ -1,7 +1,7 @@ #ifndef __NES_MMC3_H #define __NES_MMC3_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_txrom_device diff --git a/src/mess/machine/nes_mmc3_clones.c b/src/emu/bus/nes/mmc3_clones.c similarity index 99% rename from src/mess/machine/nes_mmc3_clones.c rename to src/emu/bus/nes/mmc3_clones.c index 13a788d586b..ed4744b5a9f 100644 --- a/src/mess/machine/nes_mmc3_clones.c +++ b/src/emu/bus/nes/mmc3_clones.c @@ -13,7 +13,7 @@ #include "emu.h" -#include "machine/nes_mmc3_clones.h" +#include "mmc3_clones.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_mmc3_clones.h b/src/emu/bus/nes/mmc3_clones.h similarity index 99% rename from src/mess/machine/nes_mmc3_clones.h rename to src/emu/bus/nes/mmc3_clones.h index 28ff9392a45..6fc1e922e2b 100644 --- a/src/mess/machine/nes_mmc3_clones.h +++ b/src/emu/bus/nes/mmc3_clones.h @@ -1,7 +1,7 @@ #ifndef __NES_MMC3_CLONES_H #define __NES_MMC3_CLONES_H -#include "machine/nes_mmc3.h" +#include "mmc3.h" // ======================> nes_nitra_device diff --git a/src/mess/machine/nes_mmc5.c b/src/emu/bus/nes/mmc5.c similarity index 99% rename from src/mess/machine/nes_mmc5.c rename to src/emu/bus/nes/mmc5.c index abb7eddf0b5..24276804a8f 100644 --- a/src/mess/machine/nes_mmc5.c +++ b/src/emu/bus/nes/mmc5.c @@ -17,7 +17,7 @@ #include "emu.h" -#include "machine/nes_mmc5.h" +#include "mmc5.h" #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE diff --git a/src/mess/machine/nes_mmc5.h b/src/emu/bus/nes/mmc5.h similarity index 98% rename from src/mess/machine/nes_mmc5.h rename to src/emu/bus/nes/mmc5.h index cafb4618874..488c4a23b35 100644 --- a/src/mess/machine/nes_mmc5.h +++ b/src/emu/bus/nes/mmc5.h @@ -1,7 +1,7 @@ #ifndef __NES_MMC5_H #define __NES_MMC5_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_exrom_device diff --git a/src/mess/machine/nes_multigame.c b/src/emu/bus/nes/multigame.c similarity index 99% rename from src/mess/machine/nes_multigame.c rename to src/emu/bus/nes/multigame.c index 62b69f96dba..bfcb8b444ac 100644 --- a/src/mess/machine/nes_multigame.c +++ b/src/emu/bus/nes/multigame.c @@ -13,7 +13,7 @@ #include "emu.h" -#include "machine/nes_multigame.h" +#include "multigame.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_multigame.h b/src/emu/bus/nes/multigame.h similarity index 99% rename from src/mess/machine/nes_multigame.h rename to src/emu/bus/nes/multigame.h index 87c7297ad92..9e73c4c3d5e 100644 --- a/src/mess/machine/nes_multigame.h +++ b/src/emu/bus/nes/multigame.h @@ -1,7 +1,7 @@ #ifndef __NES_MULTIGAME_H #define __NES_MULTIGAME_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_action52_device diff --git a/src/mess/machine/nes_namcot.c b/src/emu/bus/nes/namcot.c similarity index 99% rename from src/mess/machine/nes_namcot.c rename to src/emu/bus/nes/namcot.c index ccde1eeeb74..7b792bb1bc0 100644 --- a/src/mess/machine/nes_namcot.c +++ b/src/emu/bus/nes/namcot.c @@ -24,7 +24,7 @@ #include "emu.h" -#include "machine/nes_namcot.h" +#include "namcot.h" #include "ui/ui.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_namcot.h b/src/emu/bus/nes/namcot.h similarity index 99% rename from src/mess/machine/nes_namcot.h rename to src/emu/bus/nes/namcot.h index 718a4d9b339..d7cb4c0b0da 100644 --- a/src/mess/machine/nes_namcot.h +++ b/src/emu/bus/nes/namcot.h @@ -1,7 +1,7 @@ #ifndef __NES_NAMCOT_H #define __NES_NAMCOT_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_namcot3433_device diff --git a/src/mess/machine/nes_nanjing.c b/src/emu/bus/nes/nanjing.c similarity index 98% rename from src/mess/machine/nes_nanjing.c rename to src/emu/bus/nes/nanjing.c index 469371b2e29..b14297f067b 100644 --- a/src/mess/machine/nes_nanjing.c +++ b/src/emu/bus/nes/nanjing.c @@ -13,7 +13,7 @@ #include "emu.h" -#include "machine/nes_nanjing.h" +#include "nanjing.h" #include "video/ppu2c0x.h" diff --git a/src/mess/machine/nes_nanjing.h b/src/emu/bus/nes/nanjing.h similarity index 95% rename from src/mess/machine/nes_nanjing.h rename to src/emu/bus/nes/nanjing.h index 71a93d11ee0..3b1efe0a165 100644 --- a/src/mess/machine/nes_nanjing.h +++ b/src/emu/bus/nes/nanjing.h @@ -1,7 +1,7 @@ #ifndef __NES_NANJING_H #define __NES_NANJING_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_nanjing_device diff --git a/src/emu/bus/nes/nes_carts.c b/src/emu/bus/nes/nes_carts.c new file mode 100644 index 00000000000..30ccbc457bd --- /dev/null +++ b/src/emu/bus/nes/nes_carts.c @@ -0,0 +1,356 @@ +/********************************************************************** + + NES carts + +**********************************************************************/ + +#include "nes_carts.h" + +SLOT_INTERFACE_START(nes_cart) +// HROM, NROM, RROM, SROM & STROM + SLOT_INTERFACE_INTERNAL("nrom", NES_NROM) +// Nintendo Family BASIC pcb (NROM + 2K or 4K WRAM) + SLOT_INTERFACE_INTERNAL("hvc_basic", NES_FCBASIC) +// Extended NROM-368 board (NROM with 46K PRG) + SLOT_INTERFACE_INTERNAL("nrom368", NES_NROM368) +// Game Genie + SLOT_INTERFACE_INTERNAL("nrom_gg", NES_GGENIE) +// UNROM/UOROM + SLOT_INTERFACE_INTERNAL("uxrom", NES_UXROM) + SLOT_INTERFACE_INTERNAL("unrom_cc", NES_UXROM_CC) +// CNROM + SLOT_INTERFACE_INTERNAL("cnrom", NES_CNROM) +// Bandai PT-554 (CNROM boards + special audio chip, used by Aerobics Studio) + SLOT_INTERFACE_INTERNAL("bandai_pt554", NES_BANDAI_PT554) +// CPROM + SLOT_INTERFACE_INTERNAL("cprom", NES_CPROM) +// AMROM, ANROM, AOROM + SLOT_INTERFACE_INTERNAL("axrom", NES_AXROM) +// PxROM + SLOT_INTERFACE_INTERNAL("pxrom", NES_PXROM) +// FxROM + SLOT_INTERFACE_INTERNAL("fxrom", NES_FXROM) +// BNROM + SLOT_INTERFACE_INTERNAL("bnrom", NES_BXROM) +// GNROM & MHROM + SLOT_INTERFACE_INTERNAL("gxrom", NES_GXROM) +// UN1ROM + SLOT_INTERFACE_INTERNAL("un1rom", NES_UN1ROM) +// SxROM + SLOT_INTERFACE_INTERNAL("sxrom", NES_SXROM) + SLOT_INTERFACE_INTERNAL("sorom", NES_SOROM) + SLOT_INTERFACE_INTERNAL("sxrom_a", NES_SXROM_A) // in MMC1-A PRG RAM is always enabled + SLOT_INTERFACE_INTERNAL("sorom_a", NES_SOROM_A) // in MMC1-A PRG RAM is always enabled +// TxROM + SLOT_INTERFACE_INTERNAL("txrom", NES_TXROM) +// HKROM + SLOT_INTERFACE_INTERNAL("hkrom", NES_HKROM) +// TQROM + SLOT_INTERFACE_INTERNAL("tqrom", NES_TQROM) +// TxSROM + SLOT_INTERFACE_INTERNAL("txsrom", NES_TXSROM) +// ExROM + SLOT_INTERFACE_INTERNAL("exrom", NES_EXROM) +// Nintendo Custom boards + SLOT_INTERFACE_INTERNAL("pal_zz", NES_ZZ_PCB) + SLOT_INTERFACE_INTERNAL("nes_qj", NES_QJ_PCB) + SLOT_INTERFACE_INTERNAL("nes_event", NES_EVENT) +// Discrete Components boards +// IC_74x139x74 + SLOT_INTERFACE_INTERNAL("discrete_74x139", NES_74X139X74) +// IC_74x377 + SLOT_INTERFACE_INTERNAL("discrete_74x377", NES_74X377) +// Discrete board IC_74x161x161x32 + SLOT_INTERFACE_INTERNAL("discrete_74x161", NES_74X161X161X32) +// Discrete board IC_74x161x138 + SLOT_INTERFACE_INTERNAL("bitcorp_dis", NES_74X161X138) +// Bandai boards + SLOT_INTERFACE_INTERNAL("lz93d50", NES_LZ93D50) + SLOT_INTERFACE_INTERNAL("lz93d50_ep1", NES_LZ93D50_24C01) + SLOT_INTERFACE_INTERNAL("lz93d50_ep2", NES_LZ93D50_24C02) + SLOT_INTERFACE_INTERNAL("fcg", NES_FCG) + SLOT_INTERFACE_INTERNAL("fjump2", NES_FJUMP2) + SLOT_INTERFACE_INTERNAL("datach", NES_DATACH) + SLOT_INTERFACE_INTERNAL("karastudio", NES_KARAOKESTUDIO) + SLOT_INTERFACE_INTERNAL("oekakids", NES_OEKAKIDS) +// Irem boards + SLOT_INTERFACE_INTERNAL("g101", NES_G101) + SLOT_INTERFACE_INTERNAL("lrog017", NES_LROG017) + SLOT_INTERFACE_INTERNAL("h3001", NES_H3001) + SLOT_INTERFACE_INTERNAL("holydivr", NES_HOLYDIVR) + SLOT_INTERFACE_INTERNAL("tam_s1", NES_TAM_S1) +// Jaleco boards + SLOT_INTERFACE_INTERNAL("jf11", NES_JF11) + SLOT_INTERFACE_INTERNAL("jf13", NES_JF13) + SLOT_INTERFACE_INTERNAL("jf16", NES_JF16) + SLOT_INTERFACE_INTERNAL("jf17", NES_JF17) + SLOT_INTERFACE_INTERNAL("jf17pcm", NES_JF17_ADPCM) + SLOT_INTERFACE_INTERNAL("jf19", NES_JF19) + SLOT_INTERFACE_INTERNAL("jf19pcm", NES_JF19_ADPCM) + SLOT_INTERFACE_INTERNAL("ss88006", NES_SS88006) + SLOT_INTERFACE_INTERNAL("jf23", NES_JF23) + SLOT_INTERFACE_INTERNAL("jf24", NES_JF24) + SLOT_INTERFACE_INTERNAL("jf29", NES_JF29) + SLOT_INTERFACE_INTERNAL("jf33", NES_JF33) +// Konami boards + SLOT_INTERFACE_INTERNAL("vrc1", NES_VRC1) + SLOT_INTERFACE_INTERNAL("vrc2", NES_VRC2) + SLOT_INTERFACE_INTERNAL("vrc3", NES_VRC3) + SLOT_INTERFACE_INTERNAL("vrc4", NES_VRC4) + SLOT_INTERFACE_INTERNAL("vrc6", NES_VRC6) + SLOT_INTERFACE_INTERNAL("vrc7", NES_VRC7) +// Namcot boards + SLOT_INTERFACE_INTERNAL("namcot_163", NES_NAMCOT163) + SLOT_INTERFACE_INTERNAL("namcot_175", NES_NAMCOT175) + SLOT_INTERFACE_INTERNAL("namcot_340", NES_NAMCOT340) + SLOT_INTERFACE_INTERNAL("namcot_3433", NES_NAMCOT3433) // DxROM is a Nintendo board for US versions of the 3433/3443 games + SLOT_INTERFACE_INTERNAL("namcot_3425", NES_NAMCOT3425) + SLOT_INTERFACE_INTERNAL("namcot_3446", NES_NAMCOT3446) +// Sunsoft boards + SLOT_INTERFACE_INTERNAL("sunsoft1", NES_SUNSOFT_1) + SLOT_INTERFACE_INTERNAL("sunsoft2", NES_SUNSOFT_2) + SLOT_INTERFACE_INTERNAL("sunsoft3", NES_SUNSOFT_3) + SLOT_INTERFACE_INTERNAL("sunsoft4", NES_SUNSOFT_4) + SLOT_INTERFACE_INTERNAL("sunsoft_dcs", NES_SUNSOFT_DCS) + SLOT_INTERFACE_INTERNAL("sunsoft_fme7", NES_SUNSOFT_FME7) // JxROM is a Nintendo board for US versions of the Sunsoft FME7 games + SLOT_INTERFACE_INTERNAL("sunsoft5a", NES_SUNSOFT_5) + SLOT_INTERFACE_INTERNAL("sunsoft5b", NES_SUNSOFT_5) +// Taito boards + SLOT_INTERFACE_INTERNAL("tc0190fmc", NES_TC0190FMC) + SLOT_INTERFACE_INTERNAL("tc0190fmcp", NES_TC0190FMC_PAL16R4) + SLOT_INTERFACE_INTERNAL("tc0350fmr", NES_TC0190FMC) + SLOT_INTERFACE_INTERNAL("x1_005", NES_X1_005) // two variants exist, depending on pin17 & pin31 connections + SLOT_INTERFACE_INTERNAL("x1_017", NES_X1_017) +// Misc pirate boards (by AVE, Camerica, C&E, Nanjing, NTDEC, JY Company, Sachen, Tengen, TXC, Waixing, Henggendianzi, etc.) + SLOT_INTERFACE_INTERNAL("nina001", NES_NINA001) + SLOT_INTERFACE_INTERNAL("nina006", NES_NINA006) + SLOT_INTERFACE_INTERNAL("bf9093", NES_BF9093) + SLOT_INTERFACE_INTERNAL("bf9096", NES_BF9096) + SLOT_INTERFACE_INTERNAL("goldenfive", NES_GOLDEN5) + SLOT_INTERFACE_INTERNAL("ade", NES_ALADDIN) + SLOT_INTERFACE_INTERNAL("cne_decathl", NES_CNE_DECATHL) + SLOT_INTERFACE_INTERNAL("cne_fsb", NES_CNE_FSB) + SLOT_INTERFACE_INTERNAL("cne_shlz", NES_CNE_SHLZ) + SLOT_INTERFACE_INTERNAL("nanjing", NES_NANJING) // mapper 163 + SLOT_INTERFACE_INTERNAL("ntdec_asder", NES_NTDEC_ASDER) // mapper 112 + SLOT_INTERFACE_INTERNAL("ntdec_fh", NES_NTDEC_FH) // mapper 193 + SLOT_INTERFACE_INTERNAL("jyc_a", NES_JY_TYPEA) // mapper 90 + SLOT_INTERFACE_INTERNAL("jyc_b", NES_JY_TYPEB) // mapper 211 + SLOT_INTERFACE_INTERNAL("jyc_c", NES_JY_TYPEC) // mapper 209 + SLOT_INTERFACE_INTERNAL("sa009", NES_SACHEN_SA009) + SLOT_INTERFACE_INTERNAL("sa0036", NES_SACHEN_SA0036) + SLOT_INTERFACE_INTERNAL("sa0037", NES_SACHEN_SA0037) + SLOT_INTERFACE_INTERNAL("sa72007", NES_SACHEN_SA72007) + SLOT_INTERFACE_INTERNAL("sa72008", NES_SACHEN_SA72008) + SLOT_INTERFACE_INTERNAL("tca01", NES_SACHEN_TCA01) + SLOT_INTERFACE_INTERNAL("s8259a", NES_SACHEN_8259A) + SLOT_INTERFACE_INTERNAL("s8259b", NES_SACHEN_8259B) + SLOT_INTERFACE_INTERNAL("s8259c", NES_SACHEN_8259C) + SLOT_INTERFACE_INTERNAL("s8259d", NES_SACHEN_8259D) + SLOT_INTERFACE_INTERNAL("s74x374", NES_SACHEN_74X374) + SLOT_INTERFACE_INTERNAL("s74x374a", NES_SACHEN_74X374_ALT) /* FIXME: Made up boards some different handling */ + SLOT_INTERFACE_INTERNAL("tcu01", NES_SACHEN_TCU01) + SLOT_INTERFACE_INTERNAL("tcu02", NES_SACHEN_TCU02) + SLOT_INTERFACE_INTERNAL("tengen_800008", NES_TENGEN_800008) /* FIXME: Is this the same as CNROM? */ + SLOT_INTERFACE_INTERNAL("tengen_800032", NES_TENGEN_800032) + SLOT_INTERFACE_INTERNAL("tengen_800037", NES_TENGEN_800037) + SLOT_INTERFACE_INTERNAL("txc_22211", NES_TXC_22211) + SLOT_INTERFACE_INTERNAL("txc_dumarc", NES_TXC_DUMARACING) + SLOT_INTERFACE_INTERNAL("txc_mjblock", NES_TXC_MJBLOCK) + SLOT_INTERFACE_INTERNAL("txc_strikew", NES_TXC_STRIKEW) + SLOT_INTERFACE_INTERNAL("txc_commandos", NES_TXC_COMMANDOS) + SLOT_INTERFACE_INTERNAL("waixing_a", NES_WAIXING_A) + SLOT_INTERFACE_INTERNAL("waixing_a1", NES_WAIXING_A1) /* FIXME: Made up boards the different CHRRAM banks (see Ji Jia Zhan Shi) */ + SLOT_INTERFACE_INTERNAL("waixing_b", NES_WAIXING_B) + SLOT_INTERFACE_INTERNAL("waixing_c", NES_WAIXING_C) + SLOT_INTERFACE_INTERNAL("waixing_d", NES_WAIXING_D) + SLOT_INTERFACE_INTERNAL("waixing_e", NES_WAIXING_E) + SLOT_INTERFACE_INTERNAL("waixing_f", NES_WAIXING_F) + SLOT_INTERFACE_INTERNAL("waixing_g", NES_WAIXING_G) + SLOT_INTERFACE_INTERNAL("waixing_h", NES_WAIXING_H) + SLOT_INTERFACE_INTERNAL("waixing_h1", NES_WAIXING_H1) /* FIXME: Made up boards the different WRAM protect banks (see Shen Mi Jin San Jiao) */ + SLOT_INTERFACE_INTERNAL("waixing_i", NES_WAIXING_I) + SLOT_INTERFACE_INTERNAL("waixing_j", NES_WAIXING_J) + SLOT_INTERFACE_INTERNAL("waixing_sgz", NES_WAIXING_SGZ) + SLOT_INTERFACE_INTERNAL("waixing_sgzlz", NES_WAIXING_SGZLZ) + SLOT_INTERFACE_INTERNAL("waixing_sec", NES_WAIXING_SEC) + SLOT_INTERFACE_INTERNAL("waixing_ffv", NES_WAIXING_FFV) + SLOT_INTERFACE_INTERNAL("waixing_wxzs", NES_WAIXING_WXZS) + SLOT_INTERFACE_INTERNAL("waixing_wxzs2", NES_WAIXING_WXZS2) + SLOT_INTERFACE_INTERNAL("waixing_dq8", NES_WAIXING_DQ8) + SLOT_INTERFACE_INTERNAL("waixing_sh2", NES_WAIXING_SH2) + SLOT_INTERFACE_INTERNAL("fs304", NES_WAIXING_FS304) // used in Zelda 3 by Waixing + SLOT_INTERFACE_INTERNAL("cony", NES_CONY) + SLOT_INTERFACE_INTERNAL("yoko", NES_YOKO) + SLOT_INTERFACE_INTERNAL("hengg_srich", NES_HENGG_SRICH) + SLOT_INTERFACE_INTERNAL("hengg_xhzs", NES_HENGG_XHZS) + SLOT_INTERFACE_INTERNAL("hengg_shjy3", NES_HENGG_SHJY3) // mapper 253 + SLOT_INTERFACE_INTERNAL("hes", NES_HES) + SLOT_INTERFACE_INTERNAL("hosenkan", NES_HOSENKAN) + SLOT_INTERFACE_INTERNAL("ks7058", NES_KS7058) + SLOT_INTERFACE_INTERNAL("ks202", NES_KS202) // mapper 56 + SLOT_INTERFACE_INTERNAL("ks7022", NES_KS7022)// mapper 175 + SLOT_INTERFACE_INTERNAL("ks7017", NES_KS7017) + SLOT_INTERFACE_INTERNAL("ks7032", NES_KS7032) // mapper 142 + SLOT_INTERFACE_INTERNAL("ks7012", NES_KS7012) // used in Zanac (FDS Conversion) + SLOT_INTERFACE_INTERNAL("ks7013b", NES_KS7013B) // used in Highway Star (FDS Conversion) + SLOT_INTERFACE_INTERNAL("ks7031", NES_KS7031) // used in Dracula II (FDS Conversion) + SLOT_INTERFACE_INTERNAL("gs2015", NES_GS2015) + SLOT_INTERFACE_INTERNAL("gs2004", NES_GS2004) + SLOT_INTERFACE_INTERNAL("gs2013", NES_GS2013) + SLOT_INTERFACE_INTERNAL("tf9in1", NES_TF9IN1) + SLOT_INTERFACE_INTERNAL("3dblock", NES_3DBLOCK) // NROM + IRQ? + SLOT_INTERFACE_INTERNAL("racermate", NES_RACERMATE) // mapper 168 + SLOT_INTERFACE_INTERNAL("agci_50282", NES_AGCI_50282) + SLOT_INTERFACE_INTERNAL("dreamtech01", NES_DREAMTECH01) + SLOT_INTERFACE_INTERNAL("fukutake", NES_FUKUTAKE) + SLOT_INTERFACE_INTERNAL("futuremedia", NES_FUTUREMEDIA) + SLOT_INTERFACE_INTERNAL("magicseries", NES_MAGSERIES) + SLOT_INTERFACE_INTERNAL("daou_306", NES_DAOU306) + SLOT_INTERFACE_INTERNAL("subor0", NES_SUBOR0) + SLOT_INTERFACE_INTERNAL("subor1", NES_SUBOR1) + SLOT_INTERFACE_INTERNAL("cc21", NES_CC21) + SLOT_INTERFACE_INTERNAL("xiaozy", NES_XIAOZY) + SLOT_INTERFACE_INTERNAL("edu2k", NES_EDU2K) + SLOT_INTERFACE_INTERNAL("t230", NES_T230) + SLOT_INTERFACE_INTERNAL("mk2", NES_MK2) + SLOT_INTERFACE_INTERNAL("unl_whero", NES_WHERO) // mapper 27 + SLOT_INTERFACE_INTERNAL("unl_43272", NES_43272) // used in Gaau Hok Gwong Cheung + SLOT_INTERFACE_INTERNAL("tf1201", NES_TF1201) + SLOT_INTERFACE_INTERNAL("unl_cfight", NES_CITYFIGHT) // used by City Fighter IV +// misc bootleg boards + SLOT_INTERFACE_INTERNAL("ax5705", NES_AX5705) + SLOT_INTERFACE_INTERNAL("sc127", NES_SC127) + SLOT_INTERFACE_INTERNAL("mariobaby", NES_MARIOBABY) + SLOT_INTERFACE_INTERNAL("asnicol", NES_ASN) + SLOT_INTERFACE_INTERNAL("smb3pirate", NES_SMB3PIRATE) + SLOT_INTERFACE_INTERNAL("btl_dninja", NES_BTL_DNINJA) + SLOT_INTERFACE_INTERNAL("whirl2706", NES_WHIRLWIND_2706) + SLOT_INTERFACE_INTERNAL("smb2j", NES_SMB2J) + SLOT_INTERFACE_INTERNAL("smb2ja", NES_SMB2JA) + SLOT_INTERFACE_INTERNAL("smb2jb", NES_SMB2JB) + SLOT_INTERFACE_INTERNAL("09034a", NES_09034A) + SLOT_INTERFACE_INTERNAL("tobidase", NES_TOBIDASE) // mapper 120 + SLOT_INTERFACE_INTERNAL("mmalee2", NES_MMALEE) // mapper 55? + SLOT_INTERFACE_INTERNAL("unl_2708", NES_2708) // mapper 103 + SLOT_INTERFACE_INTERNAL("unl_lh32", NES_LH32) // used by Monty no Doki Doki Daidassou FDS conversion + SLOT_INTERFACE_INTERNAL("unl_lh10", NES_LH10) // used in Fuuun Shaolin Kyo (FDS Conversion) + SLOT_INTERFACE_INTERNAL("unl_lh53", NES_LH53) // used in Nazo no Murasamejou (FDS Conversion) + SLOT_INTERFACE_INTERNAL("unl_ac08", NES_AC08) // used by Green Beret FDS conversion + SLOT_INTERFACE_INTERNAL("unl_bb", NES_UNL_BB) // used by a few FDS conversions + SLOT_INTERFACE_INTERNAL("sgpipe", NES_SHUIGUAN) // mapper 183 +// misc MMC3 clone boards + SLOT_INTERFACE_INTERNAL("dbz5", NES_REX_DBZ5) + SLOT_INTERFACE_INTERNAL("sl1632", NES_REX_SL1632) + SLOT_INTERFACE_INTERNAL("somari", NES_SOMARI) // mapper 116 + SLOT_INTERFACE_INTERNAL("nitra", NES_NITRA) + SLOT_INTERFACE_INTERNAL("ks7057", NES_KS7057) // mapper 196 alt (for Street Fighter VI / Fight Street VI) + SLOT_INTERFACE_INTERNAL("sbros11", NES_SBROS11) + SLOT_INTERFACE_INTERNAL("unl_malisb", NES_MALISB) // used by Super Mali Splash Bomb + SLOT_INTERFACE_INTERNAL("family4646", NES_FAMILY4646) + SLOT_INTERFACE_INTERNAL("pikay2k", NES_PIKAY2K) // mapper 254 + SLOT_INTERFACE_INTERNAL("8237", NES_8237) + SLOT_INTERFACE_INTERNAL("8237a", NES_NROM) // UNSUPPORTED + SLOT_INTERFACE_INTERNAL("sg_lionk", NES_SG_LIONK) + SLOT_INTERFACE_INTERNAL("sg_boog", NES_SG_BOOG) + SLOT_INTERFACE_INTERNAL("kasing", NES_KASING) + SLOT_INTERFACE_INTERNAL("kay", NES_KAY) + SLOT_INTERFACE_INTERNAL("h2288", NES_H2288) + SLOT_INTERFACE_INTERNAL("unl_6035052", NES_6035052) // mapper 238? + SLOT_INTERFACE_INTERNAL("txc_tw", NES_TXC_TW) + SLOT_INTERFACE_INTERNAL("kof97", NES_KOF97) + SLOT_INTERFACE_INTERNAL("kof96", NES_KOF96) + SLOT_INTERFACE_INTERNAL("sfight3", NES_SF3) + SLOT_INTERFACE_INTERNAL("gouder", NES_GOUDER) + SLOT_INTERFACE_INTERNAL("sa9602b", NES_SA9602B) + SLOT_INTERFACE_INTERNAL("unl_shero", NES_SACHEN_SHERO) +// misc multigame cart boards + SLOT_INTERFACE_INTERNAL("benshieng", NES_BENSHIENG) + SLOT_INTERFACE_INTERNAL("action52", NES_ACTION52) + SLOT_INTERFACE_INTERNAL("caltron6in1", NES_CALTRON6IN1) + SLOT_INTERFACE_INTERNAL("maxi15", NES_MAXI15) // mapper 234 + SLOT_INTERFACE_INTERNAL("rumblestation", NES_RUMBLESTATION) // mapper 46 + SLOT_INTERFACE_INTERNAL("svision16", NES_SVISION16) // mapper 53 + SLOT_INTERFACE_INTERNAL("n625092", NES_N625092) + SLOT_INTERFACE_INTERNAL("a65as", NES_A65AS) + SLOT_INTERFACE_INTERNAL("t262", NES_T262) + SLOT_INTERFACE_INTERNAL("novel1", NES_NOVEL1) + SLOT_INTERFACE_INTERNAL("novel2", NES_NOVEL2) // mapper 213... same as BMC-NOVELDIAMOND9999999IN1 board? + SLOT_INTERFACE_INTERNAL("studyngame", NES_STUDYNGAME) // mapper 39 + SLOT_INTERFACE_INTERNAL("sgun20in1", NES_SUPERGUN20IN1) + SLOT_INTERFACE_INTERNAL("bmc_vt5201", NES_VT5201) // mapper 60 otherwise + SLOT_INTERFACE_INTERNAL("bmc_d1038", NES_VT5201) // mapper 60? + SLOT_INTERFACE_INTERNAL("810544c", NES_810544C) + SLOT_INTERFACE_INTERNAL("ntd03", NES_NTD03) + SLOT_INTERFACE_INTERNAL("bmc_gb63", NES_BMC_GB63) + SLOT_INTERFACE_INTERNAL("bmc_gka", NES_BMC_GKA) + SLOT_INTERFACE_INTERNAL("bmc_gkb", NES_BMC_GKB) + SLOT_INTERFACE_INTERNAL("bmc_ws", NES_BMC_WS) + SLOT_INTERFACE_INTERNAL("bmc_g146", NES_BMC_G146) + SLOT_INTERFACE_INTERNAL("bmc_11160", NES_BMC_11160) + SLOT_INTERFACE_INTERNAL("bmc_8157", NES_BMC_8157) + SLOT_INTERFACE_INTERNAL("bmc_hik300", NES_BMC_HIK300) + SLOT_INTERFACE_INTERNAL("bmc_s700", NES_BMC_S700) + SLOT_INTERFACE_INTERNAL("bmc_ball11", NES_BMC_BALL11) + SLOT_INTERFACE_INTERNAL("bmc_22games", NES_BMC_22GAMES) + SLOT_INTERFACE_INTERNAL("bmc_64y2k", NES_BMC_64Y2K) + SLOT_INTERFACE_INTERNAL("bmc_12in1", NES_BMC_12IN1) + SLOT_INTERFACE_INTERNAL("bmc_20in1", NES_BMC_20IN1) + SLOT_INTERFACE_INTERNAL("bmc_21in1", NES_BMC_21IN1) + SLOT_INTERFACE_INTERNAL("bmc_31in1", NES_BMC_31IN1) + SLOT_INTERFACE_INTERNAL("bmc_35in1", NES_BMC_35IN1) + SLOT_INTERFACE_INTERNAL("bmc_36in1", NES_BMC_36IN1) + SLOT_INTERFACE_INTERNAL("bmc_64in1", NES_BMC_64IN1) + SLOT_INTERFACE_INTERNAL("bmc_70in1", NES_BMC_70IN1) // mapper 236? + SLOT_INTERFACE_INTERNAL("bmc_72in1", NES_BMC_72IN1) + SLOT_INTERFACE_INTERNAL("bmc_76in1", NES_BMC_76IN1) + SLOT_INTERFACE_INTERNAL("bmc_s42in1", NES_BMC_76IN1) + SLOT_INTERFACE_INTERNAL("bmc_110in1", NES_BMC_110IN1) + SLOT_INTERFACE_INTERNAL("bmc_150in1", NES_BMC_150IN1) + SLOT_INTERFACE_INTERNAL("bmc_190in1", NES_BMC_190IN1) + SLOT_INTERFACE_INTERNAL("bmc_800in1", NES_BMC_800IN1) // mapper 236? + SLOT_INTERFACE_INTERNAL("bmc_1200in1", NES_BMC_1200IN1) + SLOT_INTERFACE_INTERNAL("bmc_gold150", NES_BMC_GOLD150) // mapper 235 with 2M PRG + SLOT_INTERFACE_INTERNAL("bmc_gold260", NES_BMC_GOLD260) // mapper 235 with 4M PRG + SLOT_INTERFACE_INTERNAL("bmc_power255", NES_BMC_CH001) // mapper 63? + SLOT_INTERFACE_INTERNAL("bmc_s22games", NES_BMC_SUPER22) // mapper 233 + SLOT_INTERFACE_INTERNAL("bmc_reset4", NES_BMC_4IN1RESET) // mapper 60 with 64k prg and 32k chr + SLOT_INTERFACE_INTERNAL("bmc_reset42", NES_BMC_42IN1RESET) // mapper 60? or 226? or 233? +// misc multigame cart MMC3 clone boards + SLOT_INTERFACE_INTERNAL("fk23c", NES_FK23C) + SLOT_INTERFACE_INTERNAL("fk23ca", NES_FK23CA) + SLOT_INTERFACE_INTERNAL("s24in1c03", NES_S24IN1SC03) + SLOT_INTERFACE_INTERNAL("bmc_15in1", NES_BMC_15IN1) + SLOT_INTERFACE_INTERNAL("bmc_sbig7in1", NES_BMC_SBIG7) + SLOT_INTERFACE_INTERNAL("bmc_hik8in1", NES_BMC_HIK8) + SLOT_INTERFACE_INTERNAL("bmc_hik4in1", NES_BMC_HIK4) + SLOT_INTERFACE_INTERNAL("bmc_mario7in1", NES_BMC_MARIO7IN1) + SLOT_INTERFACE_INTERNAL("bmc_gold7in1", NES_BMC_GOLD7IN1) + SLOT_INTERFACE_INTERNAL("bmc_gc6in1", NES_BMC_GC6IN1) + SLOT_INTERFACE_INTERNAL("bmc_411120c", NES_BMC_411120C) + SLOT_INTERFACE_INTERNAL("bmc_830118c", NES_BMC_830118C) + SLOT_INTERFACE_INTERNAL("pjoy84", NES_PJOY84) + SLOT_INTERFACE_INTERNAL("nocash_nochr", NES_NOCHR) + SLOT_INTERFACE_INTERNAL("nes_action53", NES_ACTION53) +// other unsupported... + SLOT_INTERFACE_INTERNAL("ninjaryu", NES_NROM) // mapper 111 - UNSUPPORTED + SLOT_INTERFACE_INTERNAL("unl_dance", NES_NROM) // UNSUPPORTED + SLOT_INTERFACE_INTERNAL("onebus", NES_NROM) // UNSUPPORTED +// are there dumps of games with these boards? + SLOT_INTERFACE_INTERNAL("bmc_hik_kof", NES_NROM) // mapper 251 - UNSUPPORTED + SLOT_INTERFACE_INTERNAL("bmc_13in1jy110", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED + SLOT_INTERFACE_INTERNAL("bmc_gk_192", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED + SLOT_INTERFACE_INTERNAL("konami_qtai", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED + SLOT_INTERFACE_INTERNAL("unl_3d_block", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED + SLOT_INTERFACE_INTERNAL("unl_c_n22m", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED + SLOT_INTERFACE_INTERNAL("unl_pec_586", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED + SLOT_INTERFACE_INTERNAL("a9746", NES_NROM) // mapper 219 - UNSUPPORTED (no dump available) +// legacy boards for FFE copier mappers (are there images available to fix/improve emulation?) + SLOT_INTERFACE_INTERNAL("ffe3", NES_FFE3) + SLOT_INTERFACE_INTERNAL("ffe4", NES_FFE4) + SLOT_INTERFACE_INTERNAL("ffe8", NES_FFE8) +SLOT_INTERFACE_INTERNAL("test", NES_NROM) +// + SLOT_INTERFACE_INTERNAL("unknown", NES_NROM) // a few pirate dumps uses the wrong mapper... +SLOT_INTERFACE_END + diff --git a/src/emu/bus/nes/nes_carts.h b/src/emu/bus/nes/nes_carts.h new file mode 100644 index 00000000000..3f1eed77f5c --- /dev/null +++ b/src/emu/bus/nes/nes_carts.h @@ -0,0 +1,68 @@ +/********************************************************************** + + NES carts + +**********************************************************************/ + +#pragma once + +#ifndef __NES_CARTS_H__ +#define __NES_CARTS_H__ + +#include "emu.h" + +// official PCBs +#include "nxrom.h" +#include "mmc1.h" +#include "mmc2.h" +#include "mmc3.h" +#include "mmc5.h" +#include "bandai.h" +#include "datach.h" +#include "discrete.h" +#include "event.h" +#include "irem.h" +#include "jaleco.h" +#include "karastudio.h" +#include "konami.h" +#include "namcot.h" +#include "pt554.h" +#include "sunsoft.h" +#include "sunsoft_dcs.h" +#include "taito.h" +// unlicensed/bootleg/pirate PCBs +#include "act53.h" +#include "aladdin.h" +#include "ave.h" +#include "benshieng.h" +#include "camerica.h" +#include "cne.h" +#include "cony.h" +#include "ggenie.h" +#include "hes.h" +#include "henggedianzi.h" +#include "hosenkan.h" +#include "jy.h" +#include "kaiser.h" +#include "legacy.h" +#include "nanjing.h" +#include "ntdec.h" +#include "racermate.h" +#include "rcm.h" +#include "rexsoft.h" +#include "sachen.h" +#include "somari.h" +#include "tengen.h" +#include "txc.h" +#include "waixing.h" +// misc unlicensed/bootleg/pirate PCBs +#include "bootleg.h" +#include "multigame.h" +#include "pirate.h" +#include "mmc3_clones.h" + + +// supported devices +SLOT_INTERFACE_EXTERN(nes_cart); + +#endif // __NES_CARTS_H__ diff --git a/src/mess/machine/nes_ines.inc b/src/emu/bus/nes/nes_ines.inc similarity index 100% rename from src/mess/machine/nes_ines.inc rename to src/emu/bus/nes/nes_ines.inc diff --git a/src/mess/machine/nes_pcb.inc b/src/emu/bus/nes/nes_pcb.inc similarity index 100% rename from src/mess/machine/nes_pcb.inc rename to src/emu/bus/nes/nes_pcb.inc diff --git a/src/mess/machine/nes_slot.c b/src/emu/bus/nes/nes_slot.c similarity index 99% rename from src/mess/machine/nes_slot.c rename to src/emu/bus/nes/nes_slot.c index 0ef0eca7791..52a80b1618d 100644 --- a/src/mess/machine/nes_slot.c +++ b/src/emu/bus/nes/nes_slot.c @@ -82,7 +82,7 @@ #include "emu.h" #include "hashfile.h" -#include "machine/nes_slot.h" +#include "nes_slot.h" #define NES_BATTERY_SIZE 0x2000 @@ -859,7 +859,7 @@ void nes_cart_slot_device::pcb_reset() -------------------------------------------------*/ /* Include emulation of NES PCBs for softlist */ -#include "machine/nes_pcb.inc" +#include "nes_pcb.inc" /*------------------------------------------------- @@ -869,7 +869,7 @@ void nes_cart_slot_device::pcb_reset() -------------------------------------------------*/ /* Include emulation of UNIF Boards for .unf files */ -#include "machine/nes_unif.inc" +#include "nes_unif.inc" /*------------------------------------------------- @@ -879,7 +879,7 @@ void nes_cart_slot_device::pcb_reset() -------------------------------------------------*/ /* Include emulation of iNES Mappers for .nes files */ -#include "machine/nes_ines.inc" +#include "nes_ines.inc" bool nes_cart_slot_device::call_load() diff --git a/src/mess/machine/nes_slot.h b/src/emu/bus/nes/nes_slot.h similarity index 100% rename from src/mess/machine/nes_slot.h rename to src/emu/bus/nes/nes_slot.h diff --git a/src/mess/machine/nes_unif.inc b/src/emu/bus/nes/nes_unif.inc similarity index 100% rename from src/mess/machine/nes_unif.inc rename to src/emu/bus/nes/nes_unif.inc diff --git a/src/mess/machine/nes_ntdec.c b/src/emu/bus/nes/ntdec.c similarity index 99% rename from src/mess/machine/nes_ntdec.c rename to src/emu/bus/nes/ntdec.c index 8519acc4d0b..b204f231554 100644 --- a/src/mess/machine/nes_ntdec.c +++ b/src/emu/bus/nes/ntdec.c @@ -19,7 +19,7 @@ #include "emu.h" -#include "machine/nes_ntdec.h" +#include "ntdec.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_ntdec.h b/src/emu/bus/nes/ntdec.h similarity index 96% rename from src/mess/machine/nes_ntdec.h rename to src/emu/bus/nes/ntdec.h index df2b9cf2bc4..4b611e303b6 100644 --- a/src/mess/machine/nes_ntdec.h +++ b/src/emu/bus/nes/ntdec.h @@ -1,7 +1,7 @@ #ifndef __NES_NTDEC_H #define __NES_NTDEC_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_ntdec_asder_device diff --git a/src/mess/machine/nes_nxrom.c b/src/emu/bus/nes/nxrom.c similarity index 99% rename from src/mess/machine/nes_nxrom.c rename to src/emu/bus/nes/nxrom.c index 7c93db7f789..68349d97f7b 100644 --- a/src/mess/machine/nes_nxrom.c +++ b/src/emu/bus/nes/nxrom.c @@ -29,7 +29,7 @@ #include "emu.h" -#include "machine/nes_nxrom.h" +#include "nxrom.h" #include "sound/samples.h" diff --git a/src/mess/machine/nes_nxrom.h b/src/emu/bus/nes/nxrom.h similarity index 99% rename from src/mess/machine/nes_nxrom.h rename to src/emu/bus/nes/nxrom.h index 9a19545efe9..43c462409fe 100644 --- a/src/mess/machine/nes_nxrom.h +++ b/src/emu/bus/nes/nxrom.h @@ -1,7 +1,7 @@ #ifndef __NES_MMCX_H #define __NES_MMCX_H -#include "machine/nes_slot.h" +#include "nes_slot.h" #include "sound/samples.h" diff --git a/src/mess/machine/nes_pirate.c b/src/emu/bus/nes/pirate.c similarity index 99% rename from src/mess/machine/nes_pirate.c rename to src/emu/bus/nes/pirate.c index 858598208ca..0c75c3e1c06 100644 --- a/src/mess/machine/nes_pirate.c +++ b/src/emu/bus/nes/pirate.c @@ -16,7 +16,7 @@ #include "emu.h" -#include "machine/nes_pirate.h" +#include "pirate.h" #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE diff --git a/src/mess/machine/nes_pirate.h b/src/emu/bus/nes/pirate.h similarity index 99% rename from src/mess/machine/nes_pirate.h rename to src/emu/bus/nes/pirate.h index c8236bdb047..01bb71ab503 100644 --- a/src/mess/machine/nes_pirate.h +++ b/src/emu/bus/nes/pirate.h @@ -1,7 +1,7 @@ #ifndef __NES_PIR_H #define __NES_PIR_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_agci_device diff --git a/src/mess/machine/nes_pt554.c b/src/emu/bus/nes/pt554.c similarity index 98% rename from src/mess/machine/nes_pt554.c rename to src/emu/bus/nes/pt554.c index d6f5ab28745..b76048e692d 100644 --- a/src/mess/machine/nes_pt554.c +++ b/src/emu/bus/nes/pt554.c @@ -16,7 +16,7 @@ #include "emu.h" -#include "machine/nes_pt554.h" +#include "pt554.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_pt554.h b/src/emu/bus/nes/pt554.h similarity index 94% rename from src/mess/machine/nes_pt554.h rename to src/emu/bus/nes/pt554.h index a1f5cd2ea35..979acc31d8b 100644 --- a/src/mess/machine/nes_pt554.h +++ b/src/emu/bus/nes/pt554.h @@ -1,7 +1,7 @@ #ifndef __NES_PT554_H #define __NES_PT554_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_bandai_pt554_device diff --git a/src/mess/machine/nes_racermate.c b/src/emu/bus/nes/racermate.c similarity index 98% rename from src/mess/machine/nes_racermate.c rename to src/emu/bus/nes/racermate.c index 17116c6a487..290c1179114 100644 --- a/src/mess/machine/nes_racermate.c +++ b/src/emu/bus/nes/racermate.c @@ -17,7 +17,7 @@ #include "emu.h" -#include "machine/nes_racermate.h" +#include "racermate.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_racermate.h b/src/emu/bus/nes/racermate.h similarity index 94% rename from src/mess/machine/nes_racermate.h rename to src/emu/bus/nes/racermate.h index fd4729bd30b..520429c26c0 100644 --- a/src/mess/machine/nes_racermate.h +++ b/src/emu/bus/nes/racermate.h @@ -1,7 +1,7 @@ #ifndef __NES_RACERMATE_H #define __NES_RACERMATE_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_racermate_device diff --git a/src/mess/machine/nes_rcm.c b/src/emu/bus/nes/rcm.c similarity index 99% rename from src/mess/machine/nes_rcm.c rename to src/emu/bus/nes/rcm.c index 6eb5e9a2656..50638a0f7c7 100644 --- a/src/mess/machine/nes_rcm.c +++ b/src/emu/bus/nes/rcm.c @@ -22,7 +22,7 @@ #include "emu.h" -#include "machine/nes_rcm.h" +#include "rcm.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_rcm.h b/src/emu/bus/nes/rcm.h similarity index 98% rename from src/mess/machine/nes_rcm.h rename to src/emu/bus/nes/rcm.h index 2f4d0e2c67a..f101a2710f8 100644 --- a/src/mess/machine/nes_rcm.h +++ b/src/emu/bus/nes/rcm.h @@ -1,7 +1,7 @@ #ifndef __NES_RCM_H #define __NES_RCM_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_gs2015_device diff --git a/src/mess/machine/nes_rexsoft.c b/src/emu/bus/nes/rexsoft.c similarity index 99% rename from src/mess/machine/nes_rexsoft.c rename to src/emu/bus/nes/rexsoft.c index 4841949da67..8134db399ac 100644 --- a/src/mess/machine/nes_rexsoft.c +++ b/src/emu/bus/nes/rexsoft.c @@ -20,7 +20,7 @@ #include "emu.h" -#include "machine/nes_rexsoft.h" +#include "rexsoft.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_rexsoft.h b/src/emu/bus/nes/rexsoft.h similarity index 97% rename from src/mess/machine/nes_rexsoft.h rename to src/emu/bus/nes/rexsoft.h index 10eddc20bd2..184da640347 100644 --- a/src/mess/machine/nes_rexsoft.h +++ b/src/emu/bus/nes/rexsoft.h @@ -1,7 +1,7 @@ #ifndef __NES_REXSOFT_H #define __NES_REXSOFT_H -#include "machine/nes_mmc3.h" +#include "mmc3.h" // ======================> nes_rex_dbz5_device diff --git a/src/mess/machine/nes_sachen.c b/src/emu/bus/nes/sachen.c similarity index 99% rename from src/mess/machine/nes_sachen.c rename to src/emu/bus/nes/sachen.c index fe0ca5b2c62..6ce6e8a3804 100644 --- a/src/mess/machine/nes_sachen.c +++ b/src/emu/bus/nes/sachen.c @@ -29,7 +29,7 @@ #include "emu.h" -#include "machine/nes_sachen.h" +#include "sachen.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_sachen.h b/src/emu/bus/nes/sachen.h similarity index 99% rename from src/mess/machine/nes_sachen.h rename to src/emu/bus/nes/sachen.h index 49a88131c52..32baf7c6708 100644 --- a/src/mess/machine/nes_sachen.h +++ b/src/emu/bus/nes/sachen.h @@ -1,7 +1,7 @@ #ifndef __NES_SACHEN_H #define __NES_SACHEN_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_sachen_sa009_device diff --git a/src/mess/machine/nes_somari.c b/src/emu/bus/nes/somari.c similarity index 99% rename from src/mess/machine/nes_somari.c rename to src/emu/bus/nes/somari.c index 65c8dc1a9fe..a8c10446064 100644 --- a/src/mess/machine/nes_somari.c +++ b/src/emu/bus/nes/somari.c @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/nes_somari.h" +#include "somari.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_somari.h b/src/emu/bus/nes/somari.h similarity index 97% rename from src/mess/machine/nes_somari.h rename to src/emu/bus/nes/somari.h index 5770bfa9614..bdf4f5f359d 100644 --- a/src/mess/machine/nes_somari.h +++ b/src/emu/bus/nes/somari.h @@ -1,7 +1,7 @@ #ifndef __NES_SOMARI_H #define __NES_SOMARI_H -#include "machine/nes_mmc3.h" +#include "mmc3.h" // ======================> nes_somari_device diff --git a/src/mess/machine/nes_sunsoft.c b/src/emu/bus/nes/sunsoft.c similarity index 99% rename from src/mess/machine/nes_sunsoft.c rename to src/emu/bus/nes/sunsoft.c index 0c8273620b6..44bcb9eb517 100644 --- a/src/mess/machine/nes_sunsoft.c +++ b/src/emu/bus/nes/sunsoft.c @@ -23,7 +23,7 @@ #include "emu.h" -#include "machine/nes_sunsoft.h" +#include "sunsoft.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" diff --git a/src/mess/machine/nes_sunsoft.h b/src/emu/bus/nes/sunsoft.h similarity index 99% rename from src/mess/machine/nes_sunsoft.h rename to src/emu/bus/nes/sunsoft.h index 1bc5f007cb0..91f6a34bb26 100644 --- a/src/mess/machine/nes_sunsoft.h +++ b/src/emu/bus/nes/sunsoft.h @@ -1,7 +1,7 @@ #ifndef __NES_SUNSOFT_H #define __NES_SUNSOFT_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" #include "sound/ay8910.h" diff --git a/src/mess/machine/nes_sunsoft_dcs.c b/src/emu/bus/nes/sunsoft_dcs.c similarity index 99% rename from src/mess/machine/nes_sunsoft_dcs.c rename to src/emu/bus/nes/sunsoft_dcs.c index f2cfa3090da..015f45ed055 100644 --- a/src/mess/machine/nes_sunsoft_dcs.c +++ b/src/emu/bus/nes/sunsoft_dcs.c @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/nes_sunsoft_dcs.h" +#include "sunsoft_dcs.h" #ifdef NES_PCB_DEBUG #define VERBOSE 1 diff --git a/src/mess/machine/nes_sunsoft_dcs.h b/src/emu/bus/nes/sunsoft_dcs.h similarity index 99% rename from src/mess/machine/nes_sunsoft_dcs.h rename to src/emu/bus/nes/sunsoft_dcs.h index 2c76f0b022d..342af98a1fc 100644 --- a/src/mess/machine/nes_sunsoft_dcs.h +++ b/src/emu/bus/nes/sunsoft_dcs.h @@ -1,7 +1,7 @@ #ifndef __NES_SUNSOFT_DCS_H #define __NES_SUNSOFT_DCS_H -#include "machine/nes_sunsoft.h" +#include "sunsoft.h" //----------------------------------------------- diff --git a/src/mess/machine/nes_taito.c b/src/emu/bus/nes/taito.c similarity index 99% rename from src/mess/machine/nes_taito.c rename to src/emu/bus/nes/taito.c index 3796501870d..abefa211d66 100644 --- a/src/mess/machine/nes_taito.c +++ b/src/emu/bus/nes/taito.c @@ -23,7 +23,7 @@ #include "emu.h" -#include "machine/nes_taito.h" +#include "taito.h" #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE diff --git a/src/mess/machine/nes_taito.h b/src/emu/bus/nes/taito.h similarity index 98% rename from src/mess/machine/nes_taito.h rename to src/emu/bus/nes/taito.h index 0b07bccd705..f1168252c34 100644 --- a/src/mess/machine/nes_taito.h +++ b/src/emu/bus/nes/taito.h @@ -1,7 +1,7 @@ #ifndef __NES_TAITO_H #define __NES_TAITO_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_tc0190fmc_device diff --git a/src/mess/machine/nes_tengen.c b/src/emu/bus/nes/tengen.c similarity index 99% rename from src/mess/machine/nes_tengen.c rename to src/emu/bus/nes/tengen.c index bf1d76c7a72..85edf4d3fa4 100644 --- a/src/mess/machine/nes_tengen.c +++ b/src/emu/bus/nes/tengen.c @@ -20,7 +20,7 @@ #include "emu.h" -#include "machine/nes_tengen.h" +#include "tengen.h" #include "cpu/m6502/m6502.h" #include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access PPU_BOTTOM_VISIBLE_SCANLINE diff --git a/src/mess/machine/nes_tengen.h b/src/emu/bus/nes/tengen.h similarity index 98% rename from src/mess/machine/nes_tengen.h rename to src/emu/bus/nes/tengen.h index f48e9e8a316..e7956adb161 100644 --- a/src/mess/machine/nes_tengen.h +++ b/src/emu/bus/nes/tengen.h @@ -1,7 +1,7 @@ #ifndef __NES_TENGEN_H #define __NES_TENGEN_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_tengen008_device diff --git a/src/mess/machine/nes_txc.c b/src/emu/bus/nes/txc.c similarity index 99% rename from src/mess/machine/nes_txc.c rename to src/emu/bus/nes/txc.c index e0c501fc4de..5d790f89cb9 100644 --- a/src/mess/machine/nes_txc.c +++ b/src/emu/bus/nes/txc.c @@ -23,7 +23,7 @@ #include "emu.h" -#include "machine/nes_txc.h" +#include "txc.h" #ifdef NES_PCB_DEBUG diff --git a/src/mess/machine/nes_txc.h b/src/emu/bus/nes/txc.h similarity index 98% rename from src/mess/machine/nes_txc.h rename to src/emu/bus/nes/txc.h index 9199dc49a04..9b7e089cc36 100644 --- a/src/mess/machine/nes_txc.h +++ b/src/emu/bus/nes/txc.h @@ -1,7 +1,7 @@ #ifndef __NES_TXC_H #define __NES_TXC_H -#include "machine/nes_nxrom.h" +#include "nxrom.h" // ======================> nes_txc_22211_device diff --git a/src/mess/machine/nes_waixing.c b/src/emu/bus/nes/waixing.c similarity index 99% rename from src/mess/machine/nes_waixing.c rename to src/emu/bus/nes/waixing.c index 0b73da9b8c7..11088535305 100644 --- a/src/mess/machine/nes_waixing.c +++ b/src/emu/bus/nes/waixing.c @@ -17,7 +17,7 @@ #include "emu.h" -#include "machine/nes_waixing.h" +#include "waixing.h" #include "cpu/m6502/m6502.h" diff --git a/src/mess/machine/nes_waixing.h b/src/emu/bus/nes/waixing.h similarity index 99% rename from src/mess/machine/nes_waixing.h rename to src/emu/bus/nes/waixing.h index 80ef359d870..e6633739463 100644 --- a/src/mess/machine/nes_waixing.h +++ b/src/emu/bus/nes/waixing.h @@ -1,7 +1,7 @@ #ifndef __NES_WAIXING_H #define __NES_WAIXING_H -#include "machine/nes_mmc3.h" +#include "mmc3.h" // ======================> nes_waixing_a_device diff --git a/src/mess/machine/sns_bsx.c b/src/emu/bus/snes/bsx.c similarity index 99% rename from src/mess/machine/sns_bsx.c rename to src/emu/bus/snes/bsx.c index 9b947b3bad8..1efa7378d25 100644 --- a/src/mess/machine/sns_bsx.c +++ b/src/emu/bus/snes/bsx.c @@ -12,7 +12,7 @@ #include "emu.h" -#include "machine/sns_bsx.h" +#include "bsx.h" //------------------------------------------------- diff --git a/src/mess/machine/sns_bsx.h b/src/emu/bus/snes/bsx.h similarity index 97% rename from src/mess/machine/sns_bsx.h rename to src/emu/bus/snes/bsx.h index 8fcdaa0c18c..369b8e856f7 100644 --- a/src/mess/machine/sns_bsx.h +++ b/src/emu/bus/snes/bsx.h @@ -1,9 +1,9 @@ #ifndef __SNS_BSX_H #define __SNS_BSX_H -#include "machine/sns_slot.h" -#include "machine/sns_rom.h" -#include "machine/sns_rom21.h" +#include "snes_slot.h" +#include "rom.h" +#include "rom21.h" class BSX_base { diff --git a/src/mess/machine/sns_event.c b/src/emu/bus/snes/event.c similarity index 99% rename from src/mess/machine/sns_event.c rename to src/emu/bus/snes/event.c index 53b0f19cf27..9a05a1a5fb4 100644 --- a/src/mess/machine/sns_event.c +++ b/src/emu/bus/snes/event.c @@ -11,7 +11,7 @@ #include "emu.h" -#include "machine/sns_event.h" +#include "event.h" //------------------------------------------------- diff --git a/src/mess/machine/sns_event.h b/src/emu/bus/snes/event.h similarity index 97% rename from src/mess/machine/sns_event.h rename to src/emu/bus/snes/event.h index cbe602b4748..fd286c0f523 100644 --- a/src/mess/machine/sns_event.h +++ b/src/emu/bus/snes/event.h @@ -1,7 +1,7 @@ #ifndef __SNS_EVENT_H #define __SNS_EVENT_H -#include "machine/sns_slot.h" +#include "snes_slot.h" #include "cpu/upd7725/upd7725.h" diff --git a/src/mess/machine/sns_rom.c b/src/emu/bus/snes/rom.c similarity index 99% rename from src/mess/machine/sns_rom.c rename to src/emu/bus/snes/rom.c index 5346461469c..55f376ae856 100644 --- a/src/mess/machine/sns_rom.c +++ b/src/emu/bus/snes/rom.c @@ -9,7 +9,7 @@ #include "emu.h" -#include "machine/sns_rom.h" +#include "rom.h" //------------------------------------------------- diff --git a/src/mess/machine/sns_rom.h b/src/emu/bus/snes/rom.h similarity index 99% rename from src/mess/machine/sns_rom.h rename to src/emu/bus/snes/rom.h index 561c3fd0d29..2830f573434 100644 --- a/src/mess/machine/sns_rom.h +++ b/src/emu/bus/snes/rom.h @@ -1,7 +1,7 @@ #ifndef __SNS_ROM_H #define __SNS_ROM_H -#include "machine/sns_slot.h" +#include "snes_slot.h" // ======================> sns_rom_device diff --git a/src/mess/machine/sns_rom21.c b/src/emu/bus/snes/rom21.c similarity index 99% rename from src/mess/machine/sns_rom21.c rename to src/emu/bus/snes/rom21.c index 1d485d4dce9..5c991504579 100644 --- a/src/mess/machine/sns_rom21.c +++ b/src/emu/bus/snes/rom21.c @@ -9,7 +9,7 @@ #include "emu.h" -#include "machine/sns_rom21.h" +#include "rom21.h" //------------------------------------------------- diff --git a/src/mess/machine/sns_rom21.h b/src/emu/bus/snes/rom21.h similarity index 98% rename from src/mess/machine/sns_rom21.h rename to src/emu/bus/snes/rom21.h index 55cd1201d87..d9738e0c035 100644 --- a/src/mess/machine/sns_rom21.h +++ b/src/emu/bus/snes/rom21.h @@ -1,7 +1,7 @@ #ifndef __SNS_ROM21_H #define __SNS_ROM21_H -#include "machine/sns_slot.h" +#include "snes_slot.h" // ======================> sns_rom21_device diff --git a/src/mess/machine/sns_sa1.c b/src/emu/bus/snes/sa1.c similarity index 99% rename from src/mess/machine/sns_sa1.c rename to src/emu/bus/snes/sa1.c index 494253d3e1e..872fe5ab52e 100644 --- a/src/mess/machine/sns_sa1.c +++ b/src/emu/bus/snes/sa1.c @@ -67,7 +67,7 @@ ***********************************************************************************************************/ #include "emu.h" -#include "machine/sns_sa1.h" +#include "sa1.h" #define SA1_IRQ_SCPU (0x80) #define SA1_IRQ_TIMER (0x40) diff --git a/src/mess/machine/sns_sa1.h b/src/emu/bus/snes/sa1.h similarity index 98% rename from src/mess/machine/sns_sa1.h rename to src/emu/bus/snes/sa1.h index 503b87667d3..a72263116d0 100644 --- a/src/mess/machine/sns_sa1.h +++ b/src/emu/bus/snes/sa1.h @@ -1,7 +1,7 @@ #ifndef __SNS_SA1_H #define __SNS_SA1_H -#include "machine/sns_slot.h" +#include "snes_slot.h" #include "cpu/g65816/g65816.h" diff --git a/src/mess/machine/sns_sdd1.c b/src/emu/bus/snes/sdd1.c similarity index 99% rename from src/mess/machine/sns_sdd1.c rename to src/emu/bus/snes/sdd1.c index 8291e00574e..6d5356317b7 100644 --- a/src/mess/machine/sns_sdd1.c +++ b/src/emu/bus/snes/sdd1.c @@ -12,7 +12,7 @@ #include "emu.h" -#include "machine/sns_sdd1.h" +#include "sdd1.h" #define SSD1_ADD(addr)\ diff --git a/src/mess/machine/sns_sdd1.h b/src/emu/bus/snes/sdd1.h similarity index 99% rename from src/mess/machine/sns_sdd1.h rename to src/emu/bus/snes/sdd1.h index 0bd7d464fc4..fdd94ed7b2f 100644 --- a/src/mess/machine/sns_sdd1.h +++ b/src/emu/bus/snes/sdd1.h @@ -1,7 +1,7 @@ #ifndef __SNS_SDD1_H #define __SNS_SDD1_H -#include "machine/sns_slot.h" +#include "snes_slot.h" // misc classes for the S-DD1 diff --git a/src/mess/machine/sns_sfx.c b/src/emu/bus/snes/sfx.c similarity index 99% rename from src/mess/machine/sns_sfx.c rename to src/emu/bus/snes/sfx.c index 78150103827..75c2827a5a6 100644 --- a/src/mess/machine/sns_sfx.c +++ b/src/emu/bus/snes/sfx.c @@ -9,7 +9,7 @@ #include "emu.h" -#include "machine/sns_sfx.h" +#include "sfx.h" #include "cpu/g65816/g65816.h" //------------------------------------------------- diff --git a/src/mess/machine/sns_sfx.h b/src/emu/bus/snes/sfx.h similarity index 95% rename from src/mess/machine/sns_sfx.h rename to src/emu/bus/snes/sfx.h index 7c07b7c97b7..a68ea4ffce9 100644 --- a/src/mess/machine/sns_sfx.h +++ b/src/emu/bus/snes/sfx.h @@ -1,8 +1,8 @@ #ifndef __SNS_SFX_H #define __SNS_SFX_H -#include "machine/sns_slot.h" -#include "machine/sns_rom.h" +#include "snes_slot.h" +#include "rom.h" #include "cpu/superfx/superfx.h" diff --git a/src/mess/machine/sns_sgb.c b/src/emu/bus/snes/sgb.c similarity index 99% rename from src/mess/machine/sns_sgb.c rename to src/emu/bus/snes/sgb.c index dac40ccc6a4..a2e8eabe4c2 100644 --- a/src/mess/machine/sns_sgb.c +++ b/src/emu/bus/snes/sgb.c @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/sns_sgb.h" +#include "sgb.h" //------------------------------------------------- // sns_rom_sgb_device - constructor diff --git a/src/mess/machine/sns_sgb.h b/src/emu/bus/snes/sgb.h similarity index 96% rename from src/mess/machine/sns_sgb.h rename to src/emu/bus/snes/sgb.h index 8a07e5f9f2a..fc7c940083e 100644 --- a/src/mess/machine/sns_sgb.h +++ b/src/emu/bus/snes/sgb.h @@ -1,8 +1,8 @@ #ifndef __SNS_SGB_H #define __SNS_SGB_H -#include "machine/sns_slot.h" -#include "machine/sns_rom.h" +#include "snes_slot.h" +#include "rom.h" #include "cpu/lr35902/lr35902.h" #include "machine/gb_slot.h" diff --git a/src/emu/bus/snes/snes_carts.c b/src/emu/bus/snes/snes_carts.c new file mode 100644 index 00000000000..121edca8f3b --- /dev/null +++ b/src/emu/bus/snes/snes_carts.c @@ -0,0 +1,50 @@ +/********************************************************************** + + SNES carts + +**********************************************************************/ + +#include "snes_carts.h" + +SLOT_INTERFACE_START(snes_cart) + SLOT_INTERFACE_INTERNAL("lorom", SNS_LOROM) + SLOT_INTERFACE_INTERNAL("lorom_bsx", SNS_LOROM_BSX) // LoROM + BS-X slot - unsupported + SLOT_INTERFACE_INTERNAL("lorom_cx4", SNS_LOROM) // Cart + CX4 - unsupported + SLOT_INTERFACE_INTERNAL("lorom_dsp", SNS_LOROM_NECDSP) + SLOT_INTERFACE_INTERNAL("lorom_dsp4", SNS_LOROM_NECDSP) + SLOT_INTERFACE_INTERNAL("lorom_obc1", SNS_LOROM_OBC1) + SLOT_INTERFACE_INTERNAL("lorom_sa1", SNS_LOROM_SA1) // Cart + SA1 - unsupported + SLOT_INTERFACE_INTERNAL("lorom_sdd1", SNS_LOROM_SDD1) + SLOT_INTERFACE_INTERNAL("lorom_sfx", SNS_LOROM_SUPERFX) + SLOT_INTERFACE_INTERNAL("lorom_sgb", SNS_LOROM_SUPERGB) // SuperGB base cart - unsupported + SLOT_INTERFACE_INTERNAL("lorom_st010", SNS_LOROM_SETA10) + SLOT_INTERFACE_INTERNAL("lorom_st011", SNS_LOROM_SETA11) + SLOT_INTERFACE_INTERNAL("lorom_st018", SNS_LOROM) // Cart + ST018 - unsupported + SLOT_INTERFACE_INTERNAL("lorom_sufami", SNS_LOROM_SUFAMI) // Sufami Turbo base cart + SLOT_INTERFACE_INTERNAL("hirom", SNS_HIROM) + SLOT_INTERFACE_INTERNAL("hirom_bsx", SNS_HIROM_BSX) // HiROM + BS-X slot - unsupported + SLOT_INTERFACE_INTERNAL("hirom_dsp", SNS_HIROM_NECDSP) + SLOT_INTERFACE_INTERNAL("hirom_spc7110", SNS_HIROM_SPC7110) + SLOT_INTERFACE_INTERNAL("hirom_spcrtc", SNS_HIROM_SPC7110_RTC) + SLOT_INTERFACE_INTERNAL("hirom_srtc", SNS_HIROM_SRTC) + SLOT_INTERFACE_INTERNAL("bsxrom", SNS_ROM_BSX) // BS-X base cart - partial support only + SLOT_INTERFACE_INTERNAL("pfest94", SNS_PFEST94) + // pirate carts + SLOT_INTERFACE_INTERNAL("lorom_poke", SNS_LOROM_POKEMON) + SLOT_INTERFACE_INTERNAL("lorom_tekken2", SNS_LOROM_TEKKEN2) + SLOT_INTERFACE_INTERNAL("lorom_sbld", SNS_LOROM_SOULBLAD) + SLOT_INTERFACE_INTERNAL("lorom_mcpir1", SNS_LOROM_MCPIR1) + SLOT_INTERFACE_INTERNAL("lorom_mcpir2", SNS_LOROM_MCPIR2) + SLOT_INTERFACE_INTERNAL("lorom_20col", SNS_LOROM_20COL) + SLOT_INTERFACE_INTERNAL("lorom_pija", SNS_LOROM_BANANA) // not working yet + SLOT_INTERFACE_INTERNAL("lorom_bugs", SNS_LOROM_BUGSLIFE) // not working yet + // legacy slots to support DSPx games from fullpath + SLOT_INTERFACE_INTERNAL("lorom_dsp1leg", SNS_LOROM_NECDSP1_LEG) + SLOT_INTERFACE_INTERNAL("lorom_dsp1bleg",SNS_LOROM_NECDSP1B_LEG) + SLOT_INTERFACE_INTERNAL("lorom_dsp2leg", SNS_LOROM_NECDSP2_LEG) + SLOT_INTERFACE_INTERNAL("lorom_dsp3leg", SNS_LOROM_NECDSP3_LEG) + SLOT_INTERFACE_INTERNAL("lorom_dsp4leg", SNS_LOROM_NECDSP4_LEG) + SLOT_INTERFACE_INTERNAL("hirom_dsp1leg", SNS_HIROM_NECDSP1_LEG) + SLOT_INTERFACE_INTERNAL("lorom_st10leg", SNS_LOROM_SETA10_LEG) + SLOT_INTERFACE_INTERNAL("lorom_st11leg", SNS_LOROM_SETA11_LEG) +SLOT_INTERFACE_END diff --git a/src/emu/bus/snes/snes_carts.h b/src/emu/bus/snes/snes_carts.h new file mode 100644 index 00000000000..f5f619e272c --- /dev/null +++ b/src/emu/bus/snes/snes_carts.h @@ -0,0 +1,29 @@ +/********************************************************************** + + SNES carts + +**********************************************************************/ + +#pragma once + +#ifndef __SNES_CARTS_H__ +#define __SNES_CARTS_H__ + +#include "emu.h" + +#include "rom.h" +#include "rom21.h" +#include "bsx.h" +#include "sa1.h" +#include "sdd1.h" +#include "sfx.h" +#include "sgb.h" +#include "spc7110.h" +#include "sufami.h" +#include "upd.h" +#include "event.h" + +// supported devices +SLOT_INTERFACE_EXTERN(snes_cart); + +#endif // __SNES_CARTS_H__ diff --git a/src/mess/machine/sns_slot.c b/src/emu/bus/snes/snes_slot.c similarity index 99% rename from src/mess/machine/sns_slot.c rename to src/emu/bus/snes/snes_slot.c index 58666e7cfe3..6765685841f 100644 --- a/src/mess/machine/sns_slot.c +++ b/src/emu/bus/snes/snes_slot.c @@ -48,7 +48,7 @@ #include "emu.h" -#include "machine/sns_slot.h" +#include "snes_slot.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/mess/machine/sns_slot.h b/src/emu/bus/snes/snes_slot.h similarity index 100% rename from src/mess/machine/sns_slot.h rename to src/emu/bus/snes/snes_slot.h diff --git a/src/mess/machine/sns_spc7110.c b/src/emu/bus/snes/spc7110.c similarity index 99% rename from src/mess/machine/sns_spc7110.c rename to src/emu/bus/snes/spc7110.c index 2eb768af13f..ed7dccc247a 100644 --- a/src/mess/machine/sns_spc7110.c +++ b/src/emu/bus/snes/spc7110.c @@ -17,7 +17,7 @@ #include "emu.h" -#include "machine/sns_spc7110.h" +#include "spc7110.h" //------------------------------------------------- diff --git a/src/mess/machine/sns_spc7110.h b/src/emu/bus/snes/spc7110.h similarity index 99% rename from src/mess/machine/sns_spc7110.h rename to src/emu/bus/snes/spc7110.h index 0a607d2d001..c18bb16eaad 100644 --- a/src/mess/machine/sns_spc7110.h +++ b/src/emu/bus/snes/spc7110.h @@ -1,8 +1,8 @@ #ifndef __SNS_SPC7110_H #define __SNS_SPC7110_H -#include "machine/sns_slot.h" -#include "machine/sns_rom21.h" +#include "snes_slot.h" +#include "rom21.h" enum RTC_State diff --git a/src/mess/machine/sns_sufami.c b/src/emu/bus/snes/sufami.c similarity index 99% rename from src/mess/machine/sns_sufami.c rename to src/emu/bus/snes/sufami.c index e0128810d6b..f4f388bbfae 100644 --- a/src/mess/machine/sns_sufami.c +++ b/src/emu/bus/snes/sufami.c @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/sns_sufami.h" +#include "sufami.h" //------------------------------------------------- diff --git a/src/mess/machine/sns_sufami.h b/src/emu/bus/snes/sufami.h similarity index 95% rename from src/mess/machine/sns_sufami.h rename to src/emu/bus/snes/sufami.h index 10bbf1abc13..5e8572a953b 100644 --- a/src/mess/machine/sns_sufami.h +++ b/src/emu/bus/snes/sufami.h @@ -1,8 +1,8 @@ #ifndef __SNS_SUFAMI_H #define __SNS_SUFAMI_H -#include "machine/sns_slot.h" -#include "machine/sns_rom.h" +#include "snes_slot.h" +#include "rom.h" // ======================> sns_rom_sufami_device diff --git a/src/mess/machine/sns_upd.c b/src/emu/bus/snes/upd.c similarity index 99% rename from src/mess/machine/sns_upd.c rename to src/emu/bus/snes/upd.c index b01869b53bb..9f73f9539d7 100644 --- a/src/mess/machine/sns_upd.c +++ b/src/emu/bus/snes/upd.c @@ -10,7 +10,7 @@ #include "emu.h" -#include "machine/sns_upd.h" +#include "upd.h" // helpers diff --git a/src/mess/machine/sns_upd.h b/src/emu/bus/snes/upd.h similarity index 98% rename from src/mess/machine/sns_upd.h rename to src/emu/bus/snes/upd.h index 950c89cd752..ad084c672fc 100644 --- a/src/mess/machine/sns_upd.h +++ b/src/emu/bus/snes/upd.h @@ -1,9 +1,9 @@ #ifndef __SNS_UPD_H #define __SNS_UPD_H -#include "machine/sns_slot.h" -#include "machine/sns_rom.h" -#include "machine/sns_rom21.h" +#include "snes_slot.h" +#include "rom.h" +#include "rom21.h" #include "cpu/upd7725/upd7725.h" // ======================> sns_rom_necdsp_device diff --git a/src/emu/emu.mak b/src/emu/emu.mak index e8d394a9b27..003840c5adf 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -64,6 +64,8 @@ OBJDIRS += \ $(EMUOBJ)/bus/kc \ $(EMUOBJ)/bus/tvc \ $(EMUOBJ)/bus/z88 \ + $(EMUOBJ)/bus/nes \ + $(EMUOBJ)/bus/snes \ $(EMUOBJ)/drivers \ $(EMUOBJ)/machine \ $(EMUOBJ)/layout \ diff --git a/src/emu/sound/sound.mak b/src/emu/sound/sound.mak index db3b967fe45..2e0a14bc865 100644 --- a/src/emu/sound/sound.mak +++ b/src/emu/sound/sound.mak @@ -875,3 +875,12 @@ ifneq ($(filter ZSG2,$(SOUNDS)),) SOUNDOBJS += $(SOUNDOBJ)/zsg2.o endif +#------------------------------------------------- +# VRC6 +#@src/emu/sound/vrc6.h,SOUNDS += VRC6 +#------------------------------------------------- + +ifneq ($(filter VRC6,$(SOUNDS)),) +SOUNDOBJS += $(SOUNDOBJ)/vrc6.o +endif + diff --git a/src/mess/audio/vrc6.c b/src/emu/sound/vrc6.c similarity index 100% rename from src/mess/audio/vrc6.c rename to src/emu/sound/vrc6.c diff --git a/src/mess/audio/vrc6.h b/src/emu/sound/vrc6.h similarity index 100% rename from src/mess/audio/vrc6.h rename to src/emu/sound/vrc6.h diff --git a/src/mess/drivers/nes.c b/src/mess/drivers/nes.c index 50de0c6058a..c82be42ce15 100644 --- a/src/mess/drivers/nes.c +++ b/src/mess/drivers/nes.c @@ -16,9 +16,6 @@ #include "imagedev/flopdrv.h" #include "formats/nes_dsk.h" -#include "machine/nes_slot.h" - - READ8_MEMBER(nes_state::psg_4015_r) { return m_sound->read(space, 0x15); @@ -692,355 +689,6 @@ static const cassette_interface fc_cassette_interface = }; -SLOT_INTERFACE_START(nes_cart) -// HROM, NROM, RROM, SROM & STROM - SLOT_INTERFACE_INTERNAL("nrom", NES_NROM) -// Nintendo Family BASIC pcb (NROM + 2K or 4K WRAM) - SLOT_INTERFACE_INTERNAL("hvc_basic", NES_FCBASIC) -// Extended NROM-368 board (NROM with 46K PRG) - SLOT_INTERFACE_INTERNAL("nrom368", NES_NROM368) -// Game Genie - SLOT_INTERFACE_INTERNAL("nrom_gg", NES_GGENIE) -// UNROM/UOROM - SLOT_INTERFACE_INTERNAL("uxrom", NES_UXROM) - SLOT_INTERFACE_INTERNAL("unrom_cc", NES_UXROM_CC) -// CNROM - SLOT_INTERFACE_INTERNAL("cnrom", NES_CNROM) -// Bandai PT-554 (CNROM boards + special audio chip, used by Aerobics Studio) - SLOT_INTERFACE_INTERNAL("bandai_pt554", NES_BANDAI_PT554) -// CPROM - SLOT_INTERFACE_INTERNAL("cprom", NES_CPROM) -// AMROM, ANROM, AOROM - SLOT_INTERFACE_INTERNAL("axrom", NES_AXROM) -// PxROM - SLOT_INTERFACE_INTERNAL("pxrom", NES_PXROM) -// FxROM - SLOT_INTERFACE_INTERNAL("fxrom", NES_FXROM) -// BNROM - SLOT_INTERFACE_INTERNAL("bnrom", NES_BXROM) -// GNROM & MHROM - SLOT_INTERFACE_INTERNAL("gxrom", NES_GXROM) -// UN1ROM - SLOT_INTERFACE_INTERNAL("un1rom", NES_UN1ROM) -// SxROM - SLOT_INTERFACE_INTERNAL("sxrom", NES_SXROM) - SLOT_INTERFACE_INTERNAL("sorom", NES_SOROM) - SLOT_INTERFACE_INTERNAL("sxrom_a", NES_SXROM_A) // in MMC1-A PRG RAM is always enabled - SLOT_INTERFACE_INTERNAL("sorom_a", NES_SOROM_A) // in MMC1-A PRG RAM is always enabled -// TxROM - SLOT_INTERFACE_INTERNAL("txrom", NES_TXROM) -// HKROM - SLOT_INTERFACE_INTERNAL("hkrom", NES_HKROM) -// TQROM - SLOT_INTERFACE_INTERNAL("tqrom", NES_TQROM) -// TxSROM - SLOT_INTERFACE_INTERNAL("txsrom", NES_TXSROM) -// ExROM - SLOT_INTERFACE_INTERNAL("exrom", NES_EXROM) -// Nintendo Custom boards - SLOT_INTERFACE_INTERNAL("pal_zz", NES_ZZ_PCB) - SLOT_INTERFACE_INTERNAL("nes_qj", NES_QJ_PCB) - SLOT_INTERFACE_INTERNAL("nes_event", NES_EVENT) -// Discrete Components boards -// IC_74x139x74 - SLOT_INTERFACE_INTERNAL("discrete_74x139", NES_74X139X74) -// IC_74x377 - SLOT_INTERFACE_INTERNAL("discrete_74x377", NES_74X377) -// Discrete board IC_74x161x161x32 - SLOT_INTERFACE_INTERNAL("discrete_74x161", NES_74X161X161X32) -// Discrete board IC_74x161x138 - SLOT_INTERFACE_INTERNAL("bitcorp_dis", NES_74X161X138) -// Bandai boards - SLOT_INTERFACE_INTERNAL("lz93d50", NES_LZ93D50) - SLOT_INTERFACE_INTERNAL("lz93d50_ep1", NES_LZ93D50_24C01) - SLOT_INTERFACE_INTERNAL("lz93d50_ep2", NES_LZ93D50_24C02) - SLOT_INTERFACE_INTERNAL("fcg", NES_FCG) - SLOT_INTERFACE_INTERNAL("fjump2", NES_FJUMP2) - SLOT_INTERFACE_INTERNAL("datach", NES_DATACH) - SLOT_INTERFACE_INTERNAL("karastudio", NES_KARAOKESTUDIO) - SLOT_INTERFACE_INTERNAL("oekakids", NES_OEKAKIDS) -// Irem boards - SLOT_INTERFACE_INTERNAL("g101", NES_G101) - SLOT_INTERFACE_INTERNAL("lrog017", NES_LROG017) - SLOT_INTERFACE_INTERNAL("h3001", NES_H3001) - SLOT_INTERFACE_INTERNAL("holydivr", NES_HOLYDIVR) - SLOT_INTERFACE_INTERNAL("tam_s1", NES_TAM_S1) -// Jaleco boards - SLOT_INTERFACE_INTERNAL("jf11", NES_JF11) - SLOT_INTERFACE_INTERNAL("jf13", NES_JF13) - SLOT_INTERFACE_INTERNAL("jf16", NES_JF16) - SLOT_INTERFACE_INTERNAL("jf17", NES_JF17) - SLOT_INTERFACE_INTERNAL("jf17pcm", NES_JF17_ADPCM) - SLOT_INTERFACE_INTERNAL("jf19", NES_JF19) - SLOT_INTERFACE_INTERNAL("jf19pcm", NES_JF19_ADPCM) - SLOT_INTERFACE_INTERNAL("ss88006", NES_SS88006) - SLOT_INTERFACE_INTERNAL("jf23", NES_JF23) - SLOT_INTERFACE_INTERNAL("jf24", NES_JF24) - SLOT_INTERFACE_INTERNAL("jf29", NES_JF29) - SLOT_INTERFACE_INTERNAL("jf33", NES_JF33) -// Konami boards - SLOT_INTERFACE_INTERNAL("vrc1", NES_VRC1) - SLOT_INTERFACE_INTERNAL("vrc2", NES_VRC2) - SLOT_INTERFACE_INTERNAL("vrc3", NES_VRC3) - SLOT_INTERFACE_INTERNAL("vrc4", NES_VRC4) - SLOT_INTERFACE_INTERNAL("vrc6", NES_VRC6) - SLOT_INTERFACE_INTERNAL("vrc7", NES_VRC7) -// Namcot boards - SLOT_INTERFACE_INTERNAL("namcot_163", NES_NAMCOT163) - SLOT_INTERFACE_INTERNAL("namcot_175", NES_NAMCOT175) - SLOT_INTERFACE_INTERNAL("namcot_340", NES_NAMCOT340) - SLOT_INTERFACE_INTERNAL("namcot_3433", NES_NAMCOT3433) // DxROM is a Nintendo board for US versions of the 3433/3443 games - SLOT_INTERFACE_INTERNAL("namcot_3425", NES_NAMCOT3425) - SLOT_INTERFACE_INTERNAL("namcot_3446", NES_NAMCOT3446) -// Sunsoft boards - SLOT_INTERFACE_INTERNAL("sunsoft1", NES_SUNSOFT_1) - SLOT_INTERFACE_INTERNAL("sunsoft2", NES_SUNSOFT_2) - SLOT_INTERFACE_INTERNAL("sunsoft3", NES_SUNSOFT_3) - SLOT_INTERFACE_INTERNAL("sunsoft4", NES_SUNSOFT_4) - SLOT_INTERFACE_INTERNAL("sunsoft_dcs", NES_SUNSOFT_DCS) - SLOT_INTERFACE_INTERNAL("sunsoft_fme7", NES_SUNSOFT_FME7) // JxROM is a Nintendo board for US versions of the Sunsoft FME7 games - SLOT_INTERFACE_INTERNAL("sunsoft5a", NES_SUNSOFT_5) - SLOT_INTERFACE_INTERNAL("sunsoft5b", NES_SUNSOFT_5) -// Taito boards - SLOT_INTERFACE_INTERNAL("tc0190fmc", NES_TC0190FMC) - SLOT_INTERFACE_INTERNAL("tc0190fmcp", NES_TC0190FMC_PAL16R4) - SLOT_INTERFACE_INTERNAL("tc0350fmr", NES_TC0190FMC) - SLOT_INTERFACE_INTERNAL("x1_005", NES_X1_005) // two variants exist, depending on pin17 & pin31 connections - SLOT_INTERFACE_INTERNAL("x1_017", NES_X1_017) -// Misc pirate boards (by AVE, Camerica, C&E, Nanjing, NTDEC, JY Company, Sachen, Tengen, TXC, Waixing, Henggendianzi, etc.) - SLOT_INTERFACE_INTERNAL("nina001", NES_NINA001) - SLOT_INTERFACE_INTERNAL("nina006", NES_NINA006) - SLOT_INTERFACE_INTERNAL("bf9093", NES_BF9093) - SLOT_INTERFACE_INTERNAL("bf9096", NES_BF9096) - SLOT_INTERFACE_INTERNAL("goldenfive", NES_GOLDEN5) - SLOT_INTERFACE_INTERNAL("ade", NES_ALADDIN) - SLOT_INTERFACE_INTERNAL("cne_decathl", NES_CNE_DECATHL) - SLOT_INTERFACE_INTERNAL("cne_fsb", NES_CNE_FSB) - SLOT_INTERFACE_INTERNAL("cne_shlz", NES_CNE_SHLZ) - SLOT_INTERFACE_INTERNAL("nanjing", NES_NANJING) // mapper 163 - SLOT_INTERFACE_INTERNAL("ntdec_asder", NES_NTDEC_ASDER) // mapper 112 - SLOT_INTERFACE_INTERNAL("ntdec_fh", NES_NTDEC_FH) // mapper 193 - SLOT_INTERFACE_INTERNAL("jyc_a", NES_JY_TYPEA) // mapper 90 - SLOT_INTERFACE_INTERNAL("jyc_b", NES_JY_TYPEB) // mapper 211 - SLOT_INTERFACE_INTERNAL("jyc_c", NES_JY_TYPEC) // mapper 209 - SLOT_INTERFACE_INTERNAL("sa009", NES_SACHEN_SA009) - SLOT_INTERFACE_INTERNAL("sa0036", NES_SACHEN_SA0036) - SLOT_INTERFACE_INTERNAL("sa0037", NES_SACHEN_SA0037) - SLOT_INTERFACE_INTERNAL("sa72007", NES_SACHEN_SA72007) - SLOT_INTERFACE_INTERNAL("sa72008", NES_SACHEN_SA72008) - SLOT_INTERFACE_INTERNAL("tca01", NES_SACHEN_TCA01) - SLOT_INTERFACE_INTERNAL("s8259a", NES_SACHEN_8259A) - SLOT_INTERFACE_INTERNAL("s8259b", NES_SACHEN_8259B) - SLOT_INTERFACE_INTERNAL("s8259c", NES_SACHEN_8259C) - SLOT_INTERFACE_INTERNAL("s8259d", NES_SACHEN_8259D) - SLOT_INTERFACE_INTERNAL("s74x374", NES_SACHEN_74X374) - SLOT_INTERFACE_INTERNAL("s74x374a", NES_SACHEN_74X374_ALT) /* FIXME: Made up boards some different handling */ - SLOT_INTERFACE_INTERNAL("tcu01", NES_SACHEN_TCU01) - SLOT_INTERFACE_INTERNAL("tcu02", NES_SACHEN_TCU02) - SLOT_INTERFACE_INTERNAL("tengen_800008", NES_TENGEN_800008) /* FIXME: Is this the same as CNROM? */ - SLOT_INTERFACE_INTERNAL("tengen_800032", NES_TENGEN_800032) - SLOT_INTERFACE_INTERNAL("tengen_800037", NES_TENGEN_800037) - SLOT_INTERFACE_INTERNAL("txc_22211", NES_TXC_22211) - SLOT_INTERFACE_INTERNAL("txc_dumarc", NES_TXC_DUMARACING) - SLOT_INTERFACE_INTERNAL("txc_mjblock", NES_TXC_MJBLOCK) - SLOT_INTERFACE_INTERNAL("txc_strikew", NES_TXC_STRIKEW) - SLOT_INTERFACE_INTERNAL("txc_commandos", NES_TXC_COMMANDOS) - SLOT_INTERFACE_INTERNAL("waixing_a", NES_WAIXING_A) - SLOT_INTERFACE_INTERNAL("waixing_a1", NES_WAIXING_A1) /* FIXME: Made up boards the different CHRRAM banks (see Ji Jia Zhan Shi) */ - SLOT_INTERFACE_INTERNAL("waixing_b", NES_WAIXING_B) - SLOT_INTERFACE_INTERNAL("waixing_c", NES_WAIXING_C) - SLOT_INTERFACE_INTERNAL("waixing_d", NES_WAIXING_D) - SLOT_INTERFACE_INTERNAL("waixing_e", NES_WAIXING_E) - SLOT_INTERFACE_INTERNAL("waixing_f", NES_WAIXING_F) - SLOT_INTERFACE_INTERNAL("waixing_g", NES_WAIXING_G) - SLOT_INTERFACE_INTERNAL("waixing_h", NES_WAIXING_H) - SLOT_INTERFACE_INTERNAL("waixing_h1", NES_WAIXING_H1) /* FIXME: Made up boards the different WRAM protect banks (see Shen Mi Jin San Jiao) */ - SLOT_INTERFACE_INTERNAL("waixing_i", NES_WAIXING_I) - SLOT_INTERFACE_INTERNAL("waixing_j", NES_WAIXING_J) - SLOT_INTERFACE_INTERNAL("waixing_sgz", NES_WAIXING_SGZ) - SLOT_INTERFACE_INTERNAL("waixing_sgzlz", NES_WAIXING_SGZLZ) - SLOT_INTERFACE_INTERNAL("waixing_sec", NES_WAIXING_SEC) - SLOT_INTERFACE_INTERNAL("waixing_ffv", NES_WAIXING_FFV) - SLOT_INTERFACE_INTERNAL("waixing_wxzs", NES_WAIXING_WXZS) - SLOT_INTERFACE_INTERNAL("waixing_wxzs2", NES_WAIXING_WXZS2) - SLOT_INTERFACE_INTERNAL("waixing_dq8", NES_WAIXING_DQ8) - SLOT_INTERFACE_INTERNAL("waixing_sh2", NES_WAIXING_SH2) - SLOT_INTERFACE_INTERNAL("fs304", NES_WAIXING_FS304) // used in Zelda 3 by Waixing - SLOT_INTERFACE_INTERNAL("cony", NES_CONY) - SLOT_INTERFACE_INTERNAL("yoko", NES_YOKO) - SLOT_INTERFACE_INTERNAL("hengg_srich", NES_HENGG_SRICH) - SLOT_INTERFACE_INTERNAL("hengg_xhzs", NES_HENGG_XHZS) - SLOT_INTERFACE_INTERNAL("hengg_shjy3", NES_HENGG_SHJY3) // mapper 253 - SLOT_INTERFACE_INTERNAL("hes", NES_HES) - SLOT_INTERFACE_INTERNAL("hosenkan", NES_HOSENKAN) - SLOT_INTERFACE_INTERNAL("ks7058", NES_KS7058) - SLOT_INTERFACE_INTERNAL("ks202", NES_KS202) // mapper 56 - SLOT_INTERFACE_INTERNAL("ks7022", NES_KS7022)// mapper 175 - SLOT_INTERFACE_INTERNAL("ks7017", NES_KS7017) - SLOT_INTERFACE_INTERNAL("ks7032", NES_KS7032) // mapper 142 - SLOT_INTERFACE_INTERNAL("ks7012", NES_KS7012) // used in Zanac (FDS Conversion) - SLOT_INTERFACE_INTERNAL("ks7013b", NES_KS7013B) // used in Highway Star (FDS Conversion) - SLOT_INTERFACE_INTERNAL("ks7031", NES_KS7031) // used in Dracula II (FDS Conversion) - SLOT_INTERFACE_INTERNAL("gs2015", NES_GS2015) - SLOT_INTERFACE_INTERNAL("gs2004", NES_GS2004) - SLOT_INTERFACE_INTERNAL("gs2013", NES_GS2013) - SLOT_INTERFACE_INTERNAL("tf9in1", NES_TF9IN1) - SLOT_INTERFACE_INTERNAL("3dblock", NES_3DBLOCK) // NROM + IRQ? - SLOT_INTERFACE_INTERNAL("racermate", NES_RACERMATE) // mapper 168 - SLOT_INTERFACE_INTERNAL("agci_50282", NES_AGCI_50282) - SLOT_INTERFACE_INTERNAL("dreamtech01", NES_DREAMTECH01) - SLOT_INTERFACE_INTERNAL("fukutake", NES_FUKUTAKE) - SLOT_INTERFACE_INTERNAL("futuremedia", NES_FUTUREMEDIA) - SLOT_INTERFACE_INTERNAL("magicseries", NES_MAGSERIES) - SLOT_INTERFACE_INTERNAL("daou_306", NES_DAOU306) - SLOT_INTERFACE_INTERNAL("subor0", NES_SUBOR0) - SLOT_INTERFACE_INTERNAL("subor1", NES_SUBOR1) - SLOT_INTERFACE_INTERNAL("cc21", NES_CC21) - SLOT_INTERFACE_INTERNAL("xiaozy", NES_XIAOZY) - SLOT_INTERFACE_INTERNAL("edu2k", NES_EDU2K) - SLOT_INTERFACE_INTERNAL("t230", NES_T230) - SLOT_INTERFACE_INTERNAL("mk2", NES_MK2) - SLOT_INTERFACE_INTERNAL("unl_whero", NES_WHERO) // mapper 27 - SLOT_INTERFACE_INTERNAL("unl_43272", NES_43272) // used in Gaau Hok Gwong Cheung - SLOT_INTERFACE_INTERNAL("tf1201", NES_TF1201) - SLOT_INTERFACE_INTERNAL("unl_cfight", NES_CITYFIGHT) // used by City Fighter IV -// misc bootleg boards - SLOT_INTERFACE_INTERNAL("ax5705", NES_AX5705) - SLOT_INTERFACE_INTERNAL("sc127", NES_SC127) - SLOT_INTERFACE_INTERNAL("mariobaby", NES_MARIOBABY) - SLOT_INTERFACE_INTERNAL("asnicol", NES_ASN) - SLOT_INTERFACE_INTERNAL("smb3pirate", NES_SMB3PIRATE) - SLOT_INTERFACE_INTERNAL("btl_dninja", NES_BTL_DNINJA) - SLOT_INTERFACE_INTERNAL("whirl2706", NES_WHIRLWIND_2706) - SLOT_INTERFACE_INTERNAL("smb2j", NES_SMB2J) - SLOT_INTERFACE_INTERNAL("smb2ja", NES_SMB2JA) - SLOT_INTERFACE_INTERNAL("smb2jb", NES_SMB2JB) - SLOT_INTERFACE_INTERNAL("09034a", NES_09034A) - SLOT_INTERFACE_INTERNAL("tobidase", NES_TOBIDASE) // mapper 120 - SLOT_INTERFACE_INTERNAL("mmalee2", NES_MMALEE) // mapper 55? - SLOT_INTERFACE_INTERNAL("unl_2708", NES_2708) // mapper 103 - SLOT_INTERFACE_INTERNAL("unl_lh32", NES_LH32) // used by Monty no Doki Doki Daidassou FDS conversion - SLOT_INTERFACE_INTERNAL("unl_lh10", NES_LH10) // used in Fuuun Shaolin Kyo (FDS Conversion) - SLOT_INTERFACE_INTERNAL("unl_lh53", NES_LH53) // used in Nazo no Murasamejou (FDS Conversion) - SLOT_INTERFACE_INTERNAL("unl_ac08", NES_AC08) // used by Green Beret FDS conversion - SLOT_INTERFACE_INTERNAL("unl_bb", NES_UNL_BB) // used by a few FDS conversions - SLOT_INTERFACE_INTERNAL("sgpipe", NES_SHUIGUAN) // mapper 183 -// misc MMC3 clone boards - SLOT_INTERFACE_INTERNAL("dbz5", NES_REX_DBZ5) - SLOT_INTERFACE_INTERNAL("sl1632", NES_REX_SL1632) - SLOT_INTERFACE_INTERNAL("somari", NES_SOMARI) // mapper 116 - SLOT_INTERFACE_INTERNAL("nitra", NES_NITRA) - SLOT_INTERFACE_INTERNAL("ks7057", NES_KS7057) // mapper 196 alt (for Street Fighter VI / Fight Street VI) - SLOT_INTERFACE_INTERNAL("sbros11", NES_SBROS11) - SLOT_INTERFACE_INTERNAL("unl_malisb", NES_MALISB) // used by Super Mali Splash Bomb - SLOT_INTERFACE_INTERNAL("family4646", NES_FAMILY4646) - SLOT_INTERFACE_INTERNAL("pikay2k", NES_PIKAY2K) // mapper 254 - SLOT_INTERFACE_INTERNAL("8237", NES_8237) - SLOT_INTERFACE_INTERNAL("8237a", NES_NROM) // UNSUPPORTED - SLOT_INTERFACE_INTERNAL("sg_lionk", NES_SG_LIONK) - SLOT_INTERFACE_INTERNAL("sg_boog", NES_SG_BOOG) - SLOT_INTERFACE_INTERNAL("kasing", NES_KASING) - SLOT_INTERFACE_INTERNAL("kay", NES_KAY) - SLOT_INTERFACE_INTERNAL("h2288", NES_H2288) - SLOT_INTERFACE_INTERNAL("unl_6035052", NES_6035052) // mapper 238? - SLOT_INTERFACE_INTERNAL("txc_tw", NES_TXC_TW) - SLOT_INTERFACE_INTERNAL("kof97", NES_KOF97) - SLOT_INTERFACE_INTERNAL("kof96", NES_KOF96) - SLOT_INTERFACE_INTERNAL("sfight3", NES_SF3) - SLOT_INTERFACE_INTERNAL("gouder", NES_GOUDER) - SLOT_INTERFACE_INTERNAL("sa9602b", NES_SA9602B) - SLOT_INTERFACE_INTERNAL("unl_shero", NES_SACHEN_SHERO) -// misc multigame cart boards - SLOT_INTERFACE_INTERNAL("benshieng", NES_BENSHIENG) - SLOT_INTERFACE_INTERNAL("action52", NES_ACTION52) - SLOT_INTERFACE_INTERNAL("caltron6in1", NES_CALTRON6IN1) - SLOT_INTERFACE_INTERNAL("maxi15", NES_MAXI15) // mapper 234 - SLOT_INTERFACE_INTERNAL("rumblestation", NES_RUMBLESTATION) // mapper 46 - SLOT_INTERFACE_INTERNAL("svision16", NES_SVISION16) // mapper 53 - SLOT_INTERFACE_INTERNAL("n625092", NES_N625092) - SLOT_INTERFACE_INTERNAL("a65as", NES_A65AS) - SLOT_INTERFACE_INTERNAL("t262", NES_T262) - SLOT_INTERFACE_INTERNAL("novel1", NES_NOVEL1) - SLOT_INTERFACE_INTERNAL("novel2", NES_NOVEL2) // mapper 213... same as BMC-NOVELDIAMOND9999999IN1 board? - SLOT_INTERFACE_INTERNAL("studyngame", NES_STUDYNGAME) // mapper 39 - SLOT_INTERFACE_INTERNAL("sgun20in1", NES_SUPERGUN20IN1) - SLOT_INTERFACE_INTERNAL("bmc_vt5201", NES_VT5201) // mapper 60 otherwise - SLOT_INTERFACE_INTERNAL("bmc_d1038", NES_VT5201) // mapper 60? - SLOT_INTERFACE_INTERNAL("810544c", NES_810544C) - SLOT_INTERFACE_INTERNAL("ntd03", NES_NTD03) - SLOT_INTERFACE_INTERNAL("bmc_gb63", NES_BMC_GB63) - SLOT_INTERFACE_INTERNAL("bmc_gka", NES_BMC_GKA) - SLOT_INTERFACE_INTERNAL("bmc_gkb", NES_BMC_GKB) - SLOT_INTERFACE_INTERNAL("bmc_ws", NES_BMC_WS) - SLOT_INTERFACE_INTERNAL("bmc_g146", NES_BMC_G146) - SLOT_INTERFACE_INTERNAL("bmc_11160", NES_BMC_11160) - SLOT_INTERFACE_INTERNAL("bmc_8157", NES_BMC_8157) - SLOT_INTERFACE_INTERNAL("bmc_hik300", NES_BMC_HIK300) - SLOT_INTERFACE_INTERNAL("bmc_s700", NES_BMC_S700) - SLOT_INTERFACE_INTERNAL("bmc_ball11", NES_BMC_BALL11) - SLOT_INTERFACE_INTERNAL("bmc_22games", NES_BMC_22GAMES) - SLOT_INTERFACE_INTERNAL("bmc_64y2k", NES_BMC_64Y2K) - SLOT_INTERFACE_INTERNAL("bmc_12in1", NES_BMC_12IN1) - SLOT_INTERFACE_INTERNAL("bmc_20in1", NES_BMC_20IN1) - SLOT_INTERFACE_INTERNAL("bmc_21in1", NES_BMC_21IN1) - SLOT_INTERFACE_INTERNAL("bmc_31in1", NES_BMC_31IN1) - SLOT_INTERFACE_INTERNAL("bmc_35in1", NES_BMC_35IN1) - SLOT_INTERFACE_INTERNAL("bmc_36in1", NES_BMC_36IN1) - SLOT_INTERFACE_INTERNAL("bmc_64in1", NES_BMC_64IN1) - SLOT_INTERFACE_INTERNAL("bmc_70in1", NES_BMC_70IN1) // mapper 236? - SLOT_INTERFACE_INTERNAL("bmc_72in1", NES_BMC_72IN1) - SLOT_INTERFACE_INTERNAL("bmc_76in1", NES_BMC_76IN1) - SLOT_INTERFACE_INTERNAL("bmc_s42in1", NES_BMC_76IN1) - SLOT_INTERFACE_INTERNAL("bmc_110in1", NES_BMC_110IN1) - SLOT_INTERFACE_INTERNAL("bmc_150in1", NES_BMC_150IN1) - SLOT_INTERFACE_INTERNAL("bmc_190in1", NES_BMC_190IN1) - SLOT_INTERFACE_INTERNAL("bmc_800in1", NES_BMC_800IN1) // mapper 236? - SLOT_INTERFACE_INTERNAL("bmc_1200in1", NES_BMC_1200IN1) - SLOT_INTERFACE_INTERNAL("bmc_gold150", NES_BMC_GOLD150) // mapper 235 with 2M PRG - SLOT_INTERFACE_INTERNAL("bmc_gold260", NES_BMC_GOLD260) // mapper 235 with 4M PRG - SLOT_INTERFACE_INTERNAL("bmc_power255", NES_BMC_CH001) // mapper 63? - SLOT_INTERFACE_INTERNAL("bmc_s22games", NES_BMC_SUPER22) // mapper 233 - SLOT_INTERFACE_INTERNAL("bmc_reset4", NES_BMC_4IN1RESET) // mapper 60 with 64k prg and 32k chr - SLOT_INTERFACE_INTERNAL("bmc_reset42", NES_BMC_42IN1RESET) // mapper 60? or 226? or 233? -// misc multigame cart MMC3 clone boards - SLOT_INTERFACE_INTERNAL("fk23c", NES_FK23C) - SLOT_INTERFACE_INTERNAL("fk23ca", NES_FK23CA) - SLOT_INTERFACE_INTERNAL("s24in1c03", NES_S24IN1SC03) - SLOT_INTERFACE_INTERNAL("bmc_15in1", NES_BMC_15IN1) - SLOT_INTERFACE_INTERNAL("bmc_sbig7in1", NES_BMC_SBIG7) - SLOT_INTERFACE_INTERNAL("bmc_hik8in1", NES_BMC_HIK8) - SLOT_INTERFACE_INTERNAL("bmc_hik4in1", NES_BMC_HIK4) - SLOT_INTERFACE_INTERNAL("bmc_mario7in1", NES_BMC_MARIO7IN1) - SLOT_INTERFACE_INTERNAL("bmc_gold7in1", NES_BMC_GOLD7IN1) - SLOT_INTERFACE_INTERNAL("bmc_gc6in1", NES_BMC_GC6IN1) - SLOT_INTERFACE_INTERNAL("bmc_411120c", NES_BMC_411120C) - SLOT_INTERFACE_INTERNAL("bmc_830118c", NES_BMC_830118C) - SLOT_INTERFACE_INTERNAL("pjoy84", NES_PJOY84) - SLOT_INTERFACE_INTERNAL("nocash_nochr", NES_NOCHR) - SLOT_INTERFACE_INTERNAL("nes_action53", NES_ACTION53) -// other unsupported... - SLOT_INTERFACE_INTERNAL("ninjaryu", NES_NROM) // mapper 111 - UNSUPPORTED - SLOT_INTERFACE_INTERNAL("unl_dance", NES_NROM) // UNSUPPORTED - SLOT_INTERFACE_INTERNAL("onebus", NES_NROM) // UNSUPPORTED -// are there dumps of games with these boards? - SLOT_INTERFACE_INTERNAL("bmc_hik_kof", NES_NROM) // mapper 251 - UNSUPPORTED - SLOT_INTERFACE_INTERNAL("bmc_13in1jy110", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED - SLOT_INTERFACE_INTERNAL("bmc_gk_192", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED - SLOT_INTERFACE_INTERNAL("konami_qtai", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED - SLOT_INTERFACE_INTERNAL("unl_3d_block", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED - SLOT_INTERFACE_INTERNAL("unl_c_n22m", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED - SLOT_INTERFACE_INTERNAL("unl_pec_586", NES_NROM) // [mentioned in FCEUMM source - we need more info] - UNSUPPORTED - SLOT_INTERFACE_INTERNAL("a9746", NES_NROM) // mapper 219 - UNSUPPORTED (no dump available) -// legacy boards for FFE copier mappers (are there images available to fix/improve emulation?) - SLOT_INTERFACE_INTERNAL("ffe3", NES_FFE3) - SLOT_INTERFACE_INTERNAL("ffe4", NES_FFE4) - SLOT_INTERFACE_INTERNAL("ffe8", NES_FFE8) -SLOT_INTERFACE_INTERNAL("test", NES_NROM) -// - SLOT_INTERFACE_INTERNAL("unknown", NES_NROM) // a few pirate dumps uses the wrong mapper... -SLOT_INTERFACE_END - - static MACHINE_CONFIG_START( nes, nes_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", N2A03, NTSC_CLOCK) diff --git a/src/mess/drivers/snes.c b/src/mess/drivers/snes.c index 8390d088ed0..10e728a2ff4 100644 --- a/src/mess/drivers/snes.c +++ b/src/mess/drivers/snes.c @@ -35,19 +35,8 @@ #include "crsshair.h" -#include "machine/sns_slot.h" -#include "machine/sns_rom.h" -#include "machine/sns_rom21.h" -#include "machine/sns_bsx.h" -#include "machine/sns_sa1.h" -#include "machine/sns_sdd1.h" -#include "machine/sns_sfx.h" -#include "machine/sns_sgb.h" -#include "machine/sns_spc7110.h" -#include "machine/sns_sufami.h" -#include "machine/sns_upd.h" -#include "machine/sns_event.h" - +#include "bus/snes/snes_slot.h" +#include "bus/snes/snes_carts.h" struct snes_mouse { @@ -1806,50 +1795,6 @@ UINT8 snes_console_state::oldjoy2_read(int latched) * *************************************/ - -static SLOT_INTERFACE_START(snes_cart) - SLOT_INTERFACE_INTERNAL("lorom", SNS_LOROM) - SLOT_INTERFACE_INTERNAL("lorom_bsx", SNS_LOROM_BSX) // LoROM + BS-X slot - unsupported - SLOT_INTERFACE_INTERNAL("lorom_cx4", SNS_LOROM) // Cart + CX4 - unsupported - SLOT_INTERFACE_INTERNAL("lorom_dsp", SNS_LOROM_NECDSP) - SLOT_INTERFACE_INTERNAL("lorom_dsp4", SNS_LOROM_NECDSP) - SLOT_INTERFACE_INTERNAL("lorom_obc1", SNS_LOROM_OBC1) - SLOT_INTERFACE_INTERNAL("lorom_sa1", SNS_LOROM_SA1) // Cart + SA1 - unsupported - SLOT_INTERFACE_INTERNAL("lorom_sdd1", SNS_LOROM_SDD1) - SLOT_INTERFACE_INTERNAL("lorom_sfx", SNS_LOROM_SUPERFX) - SLOT_INTERFACE_INTERNAL("lorom_sgb", SNS_LOROM_SUPERGB) // SuperGB base cart - unsupported - SLOT_INTERFACE_INTERNAL("lorom_st010", SNS_LOROM_SETA10) - SLOT_INTERFACE_INTERNAL("lorom_st011", SNS_LOROM_SETA11) - SLOT_INTERFACE_INTERNAL("lorom_st018", SNS_LOROM) // Cart + ST018 - unsupported - SLOT_INTERFACE_INTERNAL("lorom_sufami", SNS_LOROM_SUFAMI) // Sufami Turbo base cart - SLOT_INTERFACE_INTERNAL("hirom", SNS_HIROM) - SLOT_INTERFACE_INTERNAL("hirom_bsx", SNS_HIROM_BSX) // HiROM + BS-X slot - unsupported - SLOT_INTERFACE_INTERNAL("hirom_dsp", SNS_HIROM_NECDSP) - SLOT_INTERFACE_INTERNAL("hirom_spc7110", SNS_HIROM_SPC7110) - SLOT_INTERFACE_INTERNAL("hirom_spcrtc", SNS_HIROM_SPC7110_RTC) - SLOT_INTERFACE_INTERNAL("hirom_srtc", SNS_HIROM_SRTC) - SLOT_INTERFACE_INTERNAL("bsxrom", SNS_ROM_BSX) // BS-X base cart - partial support only - SLOT_INTERFACE_INTERNAL("pfest94", SNS_PFEST94) - // pirate carts - SLOT_INTERFACE_INTERNAL("lorom_poke", SNS_LOROM_POKEMON) - SLOT_INTERFACE_INTERNAL("lorom_tekken2", SNS_LOROM_TEKKEN2) - SLOT_INTERFACE_INTERNAL("lorom_sbld", SNS_LOROM_SOULBLAD) - SLOT_INTERFACE_INTERNAL("lorom_mcpir1", SNS_LOROM_MCPIR1) - SLOT_INTERFACE_INTERNAL("lorom_mcpir2", SNS_LOROM_MCPIR2) - SLOT_INTERFACE_INTERNAL("lorom_20col", SNS_LOROM_20COL) - SLOT_INTERFACE_INTERNAL("lorom_pija", SNS_LOROM_BANANA) // not working yet - SLOT_INTERFACE_INTERNAL("lorom_bugs", SNS_LOROM_BUGSLIFE) // not working yet - // legacy slots to support DSPx games from fullpath - SLOT_INTERFACE_INTERNAL("lorom_dsp1leg", SNS_LOROM_NECDSP1_LEG) - SLOT_INTERFACE_INTERNAL("lorom_dsp1bleg",SNS_LOROM_NECDSP1B_LEG) - SLOT_INTERFACE_INTERNAL("lorom_dsp2leg", SNS_LOROM_NECDSP2_LEG) - SLOT_INTERFACE_INTERNAL("lorom_dsp3leg", SNS_LOROM_NECDSP3_LEG) - SLOT_INTERFACE_INTERNAL("lorom_dsp4leg", SNS_LOROM_NECDSP4_LEG) - SLOT_INTERFACE_INTERNAL("hirom_dsp1leg", SNS_HIROM_NECDSP1_LEG) - SLOT_INTERFACE_INTERNAL("lorom_st10leg", SNS_LOROM_SETA10_LEG) - SLOT_INTERFACE_INTERNAL("lorom_st11leg", SNS_LOROM_SETA11_LEG) -SLOT_INTERFACE_END - void snes_console_state::machine_start() { snes_state::machine_start(); diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h index 935dbe5a36e..e6d606e000f 100644 --- a/src/mess/includes/nes.h +++ b/src/mess/includes/nes.h @@ -11,63 +11,11 @@ #include "video/ppu2c0x.h" -#include "machine/nes_slot.h" +#include "bus/nes/nes_slot.h" +#include "bus/nes/nes_carts.h" #include "sound/nes_apu.h" #include "imagedev/cassette.h" -// official PCBs -#include "machine/nes_nxrom.h" -#include "machine/nes_mmc1.h" -#include "machine/nes_mmc2.h" -#include "machine/nes_mmc3.h" -#include "machine/nes_mmc5.h" -#include "machine/nes_bandai.h" -#include "machine/nes_datach.h" -#include "machine/nes_discrete.h" -#include "machine/nes_event.h" -#include "machine/nes_irem.h" -#include "machine/nes_jaleco.h" -#include "machine/nes_karastudio.h" -#include "machine/nes_konami.h" -#include "machine/nes_namcot.h" -#include "machine/nes_pt554.h" -#include "machine/nes_sunsoft.h" -#include "machine/nes_sunsoft_dcs.h" -#include "machine/nes_taito.h" -// unlicensed/bootleg/pirate PCBs -#include "machine/nes_act53.h" -#include "machine/nes_aladdin.h" -#include "machine/nes_ave.h" -#include "machine/nes_benshieng.h" -#include "machine/nes_camerica.h" -#include "machine/nes_cne.h" -#include "machine/nes_cony.h" -#include "machine/nes_ggenie.h" -#include "machine/nes_hes.h" -#include "machine/nes_henggedianzi.h" -#include "machine/nes_hosenkan.h" -#include "machine/nes_jy.h" -#include "machine/nes_kaiser.h" -#include "machine/nes_legacy.h" -#include "machine/nes_nanjing.h" -#include "machine/nes_ntdec.h" -#include "machine/nes_racermate.h" -#include "machine/nes_rcm.h" -#include "machine/nes_rexsoft.h" -#include "machine/nes_sachen.h" -#include "machine/nes_somari.h" -#include "machine/nes_tengen.h" -#include "machine/nes_txc.h" -#include "machine/nes_waixing.h" -// misc unlicensed/bootleg/pirate PCBs -#include "machine/nes_bootleg.h" -#include "machine/nes_multigame.h" -#include "machine/nes_pirate.h" -#include "machine/nes_mmc3_clones.h" - - -SLOT_INTERFACE_EXTERN(nes_cart); - /*************************************************************************** CONSTANTS ***************************************************************************/ diff --git a/src/mess/machine/nes.c b/src/mess/machine/nes.c index a8d133ec120..a74c2db4872 100644 --- a/src/mess/machine/nes.c +++ b/src/mess/machine/nes.c @@ -12,7 +12,6 @@ #include "includes/nes.h" #include "imagedev/cartslot.h" #include "imagedev/flopdrv.h" -#include "hashfile.h" /*************************************************************************** CONSTANTS diff --git a/src/mess/mess.mak b/src/mess/mess.mak index 04cacd1b180..954f1befd5d 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -252,6 +252,7 @@ SOUNDS += AWACS SOUNDS += T6721A SOUNDS += MOS7360 SOUNDS += ESQPUMP +SOUNDS += VRC6 #------------------------------------------------- # specify available video cores @@ -511,6 +512,7 @@ BUSES += ISA BUSES += ISBX BUSES += KC BUSES += MIDI +BUSES += NES BUSES += NUBUS BUSES += PCI BUSES += PC_JOY @@ -519,6 +521,7 @@ BUSES += PET BUSES += PLUS4 BUSES += RS232 BUSES += S100 +BUSES += SNES BUSES += TVC BUSES += VCS BUSES += VIC10 @@ -1487,70 +1490,10 @@ $(MESSOBJ)/next.a: \ $(MESS_MACHINE)/nextmo.o \ $(MESSOBJ)/nintendo.a: \ - $(MESS_MACHINE)/nes_nxrom.o \ - $(MESS_MACHINE)/nes_mmc1.o \ - $(MESS_MACHINE)/nes_mmc2.o \ - $(MESS_MACHINE)/nes_mmc3.o \ - $(MESS_MACHINE)/nes_mmc3_clones.o \ - $(MESS_MACHINE)/nes_mmc5.o \ - $(MESS_MACHINE)/nes_act53.o \ - $(MESS_MACHINE)/nes_aladdin.o \ - $(MESS_MACHINE)/nes_ave.o \ - $(MESS_MACHINE)/nes_bandai.o \ - $(MESS_MACHINE)/nes_benshieng.o \ - $(MESS_MACHINE)/nes_bootleg.o \ - $(MESS_MACHINE)/nes_camerica.o \ - $(MESS_MACHINE)/nes_cne.o \ - $(MESS_MACHINE)/nes_cony.o \ - $(MESS_MACHINE)/nes_datach.o \ - $(MESS_MACHINE)/nes_discrete.o \ - $(MESS_MACHINE)/nes_event.o \ - $(MESS_MACHINE)/nes_ggenie.o \ - $(MESS_MACHINE)/nes_hes.o \ - $(MESS_MACHINE)/nes_henggedianzi.o \ - $(MESS_MACHINE)/nes_hosenkan.o \ - $(MESS_MACHINE)/nes_irem.o \ - $(MESS_MACHINE)/nes_jaleco.o \ - $(MESS_MACHINE)/nes_jy.o \ - $(MESS_MACHINE)/nes_kaiser.o \ - $(MESS_MACHINE)/nes_karastudio.o \ - $(MESS_MACHINE)/nes_konami.o \ - $(MESS_AUDIO)/vrc6.o \ - $(MESS_MACHINE)/nes_legacy.o \ - $(MESS_MACHINE)/nes_multigame.o \ - $(MESS_MACHINE)/nes_namcot.o \ - $(MESS_MACHINE)/nes_nanjing.o \ - $(MESS_MACHINE)/nes_ntdec.o \ - $(MESS_MACHINE)/nes_pirate.o \ - $(MESS_MACHINE)/nes_pt554.o \ - $(MESS_MACHINE)/nes_racermate.o \ - $(MESS_MACHINE)/nes_rcm.o \ - $(MESS_MACHINE)/nes_rexsoft.o \ - $(MESS_MACHINE)/nes_sachen.o \ - $(MESS_MACHINE)/nes_somari.o \ - $(MESS_MACHINE)/nes_tengen.o \ - $(MESS_MACHINE)/nes_txc.o \ - $(MESS_MACHINE)/nes_sunsoft.o \ - $(MESS_MACHINE)/nes_sunsoft_dcs.o \ - $(MESS_MACHINE)/nes_taito.o \ - $(MESS_MACHINE)/nes_waixing.o \ - $(MESS_MACHINE)/nes_slot.o \ $(MESS_VIDEO)/nes.o \ $(MESS_MACHINE)/nes.o \ $(MESS_DRIVERS)/nes.o \ $(MESS_MACHINE)/snescx4.o \ - $(MESS_MACHINE)/sns_slot.o \ - $(MESS_MACHINE)/sns_rom.o \ - $(MESS_MACHINE)/sns_rom21.o \ - $(MESS_MACHINE)/sns_bsx.o \ - $(MESS_MACHINE)/sns_sa1.o \ - $(MESS_MACHINE)/sns_sdd1.o \ - $(MESS_MACHINE)/sns_sfx.o \ - $(MESS_MACHINE)/sns_sgb.o \ - $(MESS_MACHINE)/sns_spc7110.o \ - $(MESS_MACHINE)/sns_sufami.o\ - $(MESS_MACHINE)/sns_upd.o \ - $(MESS_MACHINE)/sns_event.o \ $(MESS_DRIVERS)/snes.o \ $(MESS_DRIVERS)/n64.o \ $(MESS_AUDIO)/gb.o \