From d131f7fa0cd0255b1a33778d1b51d1bb967fb53a Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 10 Mar 2014 14:00:01 +0000 Subject: [PATCH] Moved rest of console slot devices to bus folder (nw) --- .gitattributes | 110 +++++++-------- src/emu/bus/bus.mak | 130 ++++++++++++++++++ .../machine => emu/bus/gameboy}/gb_slot.c | 2 +- .../machine => emu/bus/gameboy}/gb_slot.h | 0 .../gb_mbc.c => emu/bus/gameboy/mbc.c} | 2 +- .../gb_mbc.h => emu/bus/gameboy/mbc.h} | 2 +- .../gb_rom.c => emu/bus/gameboy/rom.c} | 2 +- .../gb_rom.h => emu/bus/gameboy/rom.h} | 2 +- src/{mess/machine => emu/bus/gba}/gba_slot.c | 2 +- src/{mess/machine => emu/bus/gba}/gba_slot.h | 0 .../machine/gba_rom.c => emu/bus/gba/rom.c} | 2 +- .../machine/gba_rom.h => emu/bus/gba/rom.h} | 2 +- .../bus/megadrive/eeprom.c} | 2 +- .../bus/megadrive/eeprom.h} | 2 +- .../md_jcart.c => emu/bus/megadrive/jcart.c} | 2 +- .../md_jcart.h => emu/bus/megadrive/jcart.h} | 2 +- src/emu/bus/megadrive/md_carts.c | 67 +++++++++ src/emu/bus/megadrive/md_carts.h | 24 ++++ .../machine => emu/bus/megadrive}/md_slot.c | 2 +- .../machine => emu/bus/megadrive}/md_slot.h | 0 .../md_rom.c => emu/bus/megadrive/rom.c} | 2 +- .../md_rom.h => emu/bus/megadrive/rom.h} | 2 +- .../md_sk.c => emu/bus/megadrive/sk.c} | 4 +- .../md_sk.h => emu/bus/megadrive/sk.h} | 2 +- .../md_stm95.c => emu/bus/megadrive/stm95.c} | 2 +- .../md_stm95.h => emu/bus/megadrive/stm95.h} | 2 +- .../md_svp.c => emu/bus/megadrive/svp.c} | 2 +- .../md_svp.h => emu/bus/megadrive/svp.h} | 2 +- .../sat_bram.c => emu/bus/saturn/bram.c} | 2 +- .../sat_bram.h => emu/bus/saturn/bram.h} | 2 +- .../sat_dram.c => emu/bus/saturn/dram.c} | 2 +- .../sat_dram.h => emu/bus/saturn/dram.h} | 2 +- .../sat_rom.c => emu/bus/saturn/rom.c} | 2 +- .../sat_rom.h => emu/bus/saturn/rom.h} | 2 +- .../machine => emu/bus/saturn}/sat_slot.c | 2 +- .../machine => emu/bus/saturn}/sat_slot.h | 0 .../sega8_rom.c => emu/bus/sega8/rom.c} | 2 +- .../sega8_rom.h => emu/bus/sega8/rom.h} | 2 +- .../machine => emu/bus/sega8}/sega8_slot.c | 2 +- .../machine => emu/bus/sega8}/sega8_slot.h | 0 .../bus/sms_ctrl/joypad.c} | 2 +- .../bus/sms_ctrl/joypad.h} | 2 +- .../bus/sms_ctrl/lphaser.c} | 2 +- .../bus/sms_ctrl/lphaser.h} | 2 +- .../bus/sms_ctrl/paddle.c} | 2 +- .../bus/sms_ctrl/paddle.h} | 2 +- .../sms_rfu.c => emu/bus/sms_ctrl/rfu.c} | 2 +- .../sms_rfu.h => emu/bus/sms_ctrl/rfu.h} | 2 +- .../machine => emu/bus/sms_ctrl}/smsctrl.c | 2 +- .../machine => emu/bus/sms_ctrl}/smsctrl.h | 12 +- .../bus/sms_ctrl/sports.c} | 2 +- .../bus/sms_ctrl/sports.h} | 2 +- .../bus/sms_ctrl/sportsjp.c} | 2 +- .../bus/sms_ctrl/sportsjp.h} | 2 +- .../sms_gender.c => emu/bus/sms_exp/gender.c} | 2 +- .../sms_gender.h => emu/bus/sms_exp/gender.h} | 6 +- .../machine => emu/bus/sms_exp}/smsexp.c | 2 +- .../machine => emu/bus/sms_exp}/smsexp.h | 2 +- src/emu/bus/snes/sgb.h | 6 +- src/emu/emu.mak | 38 ----- src/mess/drivers/gb.c | 4 +- src/mess/drivers/gba.c | 2 +- src/mess/drivers/megadriv.c | 69 +--------- src/mess/drivers/saturn.c | 8 +- src/mess/drivers/segapico.c | 4 +- src/mess/drivers/sg1000.c | 2 +- src/mess/drivers/sms.c | 2 +- src/mess/includes/gb.h | 2 +- src/mess/includes/gba.h | 2 +- src/mess/includes/sg1000.h | 2 +- src/mess/includes/sms.h | 6 +- src/mess/mess.mak | 34 +---- 72 files changed, 363 insertions(+), 263 deletions(-) rename src/{mess/machine => emu/bus/gameboy}/gb_slot.c (99%) rename src/{mess/machine => emu/bus/gameboy}/gb_slot.h (100%) rename src/{mess/machine/gb_mbc.c => emu/bus/gameboy/mbc.c} (99%) rename src/{mess/machine/gb_mbc.h => emu/bus/gameboy/mbc.h} (99%) rename src/{mess/machine/gb_rom.c => emu/bus/gameboy/rom.c} (99%) rename src/{mess/machine/gb_rom.h => emu/bus/gameboy/rom.h} (99%) rename src/{mess/machine => emu/bus/gba}/gba_slot.c (99%) rename src/{mess/machine => emu/bus/gba}/gba_slot.h (100%) rename src/{mess/machine/gba_rom.c => emu/bus/gba/rom.c} (99%) rename src/{mess/machine/gba_rom.h => emu/bus/gba/rom.h} (99%) rename src/{mess/machine/md_eeprom.c => emu/bus/megadrive/eeprom.c} (99%) rename src/{mess/machine/md_eeprom.h => emu/bus/megadrive/eeprom.h} (99%) rename src/{mess/machine/md_jcart.c => emu/bus/megadrive/jcart.c} (99%) rename src/{mess/machine/md_jcart.h => emu/bus/megadrive/jcart.h} (98%) create mode 100644 src/emu/bus/megadrive/md_carts.c create mode 100644 src/emu/bus/megadrive/md_carts.h rename src/{mess/machine => emu/bus/megadrive}/md_slot.c (99%) rename src/{mess/machine => emu/bus/megadrive}/md_slot.h (100%) rename src/{mess/machine/md_rom.c => emu/bus/megadrive/rom.c} (99%) rename src/{mess/machine/md_rom.h => emu/bus/megadrive/rom.h} (99%) rename src/{mess/machine/md_sk.c => emu/bus/megadrive/sk.c} (98%) rename src/{mess/machine/md_sk.h => emu/bus/megadrive/sk.h} (96%) rename src/{mess/machine/md_stm95.c => emu/bus/megadrive/stm95.c} (99%) rename src/{mess/machine/md_stm95.h => emu/bus/megadrive/stm95.h} (98%) rename src/{mess/machine/md_svp.c => emu/bus/megadrive/svp.c} (99%) rename src/{mess/machine/md_svp.h => emu/bus/megadrive/svp.h} (98%) rename src/{mess/machine/sat_bram.c => emu/bus/saturn/bram.c} (99%) rename src/{mess/machine/sat_bram.h => emu/bus/saturn/bram.h} (98%) rename src/{mess/machine/sat_dram.c => emu/bus/saturn/dram.c} (99%) rename src/{mess/machine/sat_dram.h => emu/bus/saturn/dram.h} (97%) rename src/{mess/machine/sat_rom.c => emu/bus/saturn/rom.c} (98%) rename src/{mess/machine/sat_rom.h => emu/bus/saturn/rom.h} (96%) rename src/{mess/machine => emu/bus/saturn}/sat_slot.c (99%) rename src/{mess/machine => emu/bus/saturn}/sat_slot.h (100%) rename src/{mess/machine/sega8_rom.c => emu/bus/sega8/rom.c} (99%) rename src/{mess/machine/sega8_rom.h => emu/bus/sega8/rom.h} (99%) rename src/{mess/machine => emu/bus/sega8}/sega8_slot.c (99%) rename src/{mess/machine => emu/bus/sega8}/sega8_slot.h (100%) rename src/{mess/machine/sms_joypad.c => emu/bus/sms_ctrl/joypad.c} (98%) rename src/{mess/machine/sms_joypad.h => emu/bus/sms_ctrl/joypad.h} (97%) rename src/{mess/machine/sms_lphaser.c => emu/bus/sms_ctrl/lphaser.c} (99%) rename src/{mess/machine/sms_lphaser.h => emu/bus/sms_ctrl/lphaser.h} (98%) rename src/{mess/machine/sms_paddle.c => emu/bus/sms_ctrl/paddle.c} (99%) rename src/{mess/machine/sms_paddle.h => emu/bus/sms_ctrl/paddle.h} (97%) rename src/{mess/machine/sms_rfu.c => emu/bus/sms_ctrl/rfu.c} (99%) rename src/{mess/machine/sms_rfu.h => emu/bus/sms_ctrl/rfu.h} (98%) rename src/{mess/machine => emu/bus/sms_ctrl}/smsctrl.c (99%) rename src/{mess/machine => emu/bus/sms_ctrl}/smsctrl.h (94%) rename src/{mess/machine/sms_sports.c => emu/bus/sms_ctrl/sports.c} (99%) rename src/{mess/machine/sms_sports.h => emu/bus/sms_ctrl/sports.h} (98%) rename src/{mess/machine/sms_sportsjp.c => emu/bus/sms_ctrl/sportsjp.c} (99%) rename src/{mess/machine/sms_sportsjp.h => emu/bus/sms_ctrl/sportsjp.h} (98%) rename src/{mess/machine/sms_gender.c => emu/bus/sms_exp/gender.c} (99%) rename src/{mess/machine/sms_gender.h => emu/bus/sms_exp/gender.h} (93%) rename src/{mess/machine => emu/bus/sms_exp}/smsexp.c (99%) rename src/{mess/machine => emu/bus/sms_exp}/smsexp.h (98%) diff --git a/.gitattributes b/.gitattributes index d682c607cac..69536aaa194 100644 --- a/.gitattributes +++ b/.gitattributes @@ -709,6 +709,16 @@ src/emu/bus/ep64/exdos.c svneol=native#text/plain src/emu/bus/ep64/exdos.h svneol=native#text/plain src/emu/bus/ep64/exp.c svneol=native#text/plain src/emu/bus/ep64/exp.h svneol=native#text/plain +src/emu/bus/gameboy/gb_slot.c svneol=native#text/plain +src/emu/bus/gameboy/gb_slot.h svneol=native#text/plain +src/emu/bus/gameboy/mbc.c svneol=native#text/plain +src/emu/bus/gameboy/mbc.h svneol=native#text/plain +src/emu/bus/gameboy/rom.c svneol=native#text/plain +src/emu/bus/gameboy/rom.h svneol=native#text/plain +src/emu/bus/gba/gba_slot.c svneol=native#text/plain +src/emu/bus/gba/gba_slot.h svneol=native#text/plain +src/emu/bus/gba/rom.c svneol=native#text/plain +src/emu/bus/gba/rom.h svneol=native#text/plain src/emu/bus/ieee488/c2031.c svneol=native#text/plain src/emu/bus/ieee488/c2031.h svneol=native#text/plain src/emu/bus/ieee488/c2040.c svneol=native#text/plain @@ -861,6 +871,22 @@ src/emu/bus/kc/ram.c svneol=native#text/plain src/emu/bus/kc/ram.h svneol=native#text/plain src/emu/bus/kc/rom.c svneol=native#text/plain src/emu/bus/kc/rom.h svneol=native#text/plain +src/emu/bus/megadrive/eeprom.c svneol=native#text/plain +src/emu/bus/megadrive/eeprom.h svneol=native#text/plain +src/emu/bus/megadrive/jcart.c svneol=native#text/plain +src/emu/bus/megadrive/jcart.h svneol=native#text/plain +src/emu/bus/megadrive/md_carts.c svneol=native#text/plain +src/emu/bus/megadrive/md_carts.h svneol=native#text/plain +src/emu/bus/megadrive/md_slot.c svneol=native#text/plain +src/emu/bus/megadrive/md_slot.h svneol=native#text/plain +src/emu/bus/megadrive/rom.c svneol=native#text/plain +src/emu/bus/megadrive/rom.h svneol=native#text/plain +src/emu/bus/megadrive/sk.c svneol=native#text/plain +src/emu/bus/megadrive/sk.h svneol=native#text/plain +src/emu/bus/megadrive/stm95.c svneol=native#text/plain +src/emu/bus/megadrive/stm95.h svneol=native#text/plain +src/emu/bus/megadrive/svp.c svneol=native#text/plain +src/emu/bus/megadrive/svp.h svneol=native#text/plain src/emu/bus/midi/midi.c svneol=native#text/plain src/emu/bus/midi/midi.h svneol=native#text/plain src/emu/bus/midi/midiinport.c svneol=native#text/plain @@ -1088,6 +1114,36 @@ 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/saturn/bram.c svneol=native#text/plain +src/emu/bus/saturn/bram.h svneol=native#text/plain +src/emu/bus/saturn/dram.c svneol=native#text/plain +src/emu/bus/saturn/dram.h svneol=native#text/plain +src/emu/bus/saturn/rom.c svneol=native#text/plain +src/emu/bus/saturn/rom.h svneol=native#text/plain +src/emu/bus/saturn/sat_slot.c svneol=native#text/plain +src/emu/bus/saturn/sat_slot.h svneol=native#text/plain +src/emu/bus/sega8/rom.c svneol=native#text/plain +src/emu/bus/sega8/rom.h svneol=native#text/plain +src/emu/bus/sega8/sega8_slot.c svneol=native#text/plain +src/emu/bus/sega8/sega8_slot.h svneol=native#text/plain +src/emu/bus/sms_ctrl/joypad.c svneol=native#text/plain +src/emu/bus/sms_ctrl/joypad.h svneol=native#text/plain +src/emu/bus/sms_ctrl/lphaser.c svneol=native#text/plain +src/emu/bus/sms_ctrl/lphaser.h svneol=native#text/plain +src/emu/bus/sms_ctrl/paddle.c svneol=native#text/plain +src/emu/bus/sms_ctrl/paddle.h svneol=native#text/plain +src/emu/bus/sms_ctrl/rfu.c svneol=native#text/plain +src/emu/bus/sms_ctrl/rfu.h svneol=native#text/plain +src/emu/bus/sms_ctrl/smsctrl.c svneol=native#text/plain +src/emu/bus/sms_ctrl/smsctrl.h svneol=native#text/plain +src/emu/bus/sms_ctrl/sports.c svneol=native#text/plain +src/emu/bus/sms_ctrl/sports.h svneol=native#text/plain +src/emu/bus/sms_ctrl/sportsjp.c svneol=native#text/plain +src/emu/bus/sms_ctrl/sportsjp.h svneol=native#text/plain +src/emu/bus/sms_exp/gender.c svneol=native#text/plain +src/emu/bus/sms_exp/gender.h svneol=native#text/plain +src/emu/bus/sms_exp/smsexp.c svneol=native#text/plain +src/emu/bus/sms_exp/smsexp.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 @@ -8273,16 +8329,6 @@ src/mess/machine/galaxy.c svneol=native#text/plain src/mess/machine/gamecom.c svneol=native#text/plain src/mess/machine/gamepock.c svneol=native#text/plain src/mess/machine/gb.c svneol=native#text/plain -src/mess/machine/gb_mbc.c svneol=native#text/plain -src/mess/machine/gb_mbc.h svneol=native#text/plain -src/mess/machine/gb_rom.c svneol=native#text/plain -src/mess/machine/gb_rom.h svneol=native#text/plain -src/mess/machine/gb_slot.c svneol=native#text/plain -src/mess/machine/gb_slot.h svneol=native#text/plain -src/mess/machine/gba_rom.c svneol=native#text/plain -src/mess/machine/gba_rom.h svneol=native#text/plain -src/mess/machine/gba_slot.c svneol=native#text/plain -src/mess/machine/gba_slot.h svneol=native#text/plain src/mess/machine/genpc.c svneol=native#text/plain src/mess/machine/hd63450.c svneol=native#text/plain src/mess/machine/hd63450.h svneol=native#text/plain @@ -8335,20 +8381,6 @@ src/mess/machine/mboard.c svneol=native#text/plain src/mess/machine/mc68328.c svneol=native#text/plain src/mess/machine/mc68328.h svneol=native#text/plain src/mess/machine/mc80.c svneol=native#text/plain -src/mess/machine/md_eeprom.c svneol=native#text/plain -src/mess/machine/md_eeprom.h svneol=native#text/plain -src/mess/machine/md_jcart.c svneol=native#text/plain -src/mess/machine/md_jcart.h svneol=native#text/plain -src/mess/machine/md_rom.c svneol=native#text/plain -src/mess/machine/md_rom.h svneol=native#text/plain -src/mess/machine/md_sk.c svneol=native#text/plain -src/mess/machine/md_sk.h svneol=native#text/plain -src/mess/machine/md_slot.c svneol=native#text/plain -src/mess/machine/md_slot.h svneol=native#text/plain -src/mess/machine/md_stm95.c svneol=native#text/plain -src/mess/machine/md_stm95.h svneol=native#text/plain -src/mess/machine/md_svp.c svneol=native#text/plain -src/mess/machine/md_svp.h svneol=native#text/plain src/mess/machine/mface2.c svneol=native#text/plain src/mess/machine/mface2.h svneol=native#text/plain src/mess/machine/microdrv.c svneol=native#text/plain @@ -8444,20 +8476,8 @@ src/mess/machine/s3c44b0.h svneol=native#text/plain src/mess/machine/sa1403d.c svneol=native#text/plain src/mess/machine/sa1403d.h svneol=native#text/plain src/mess/machine/samcoupe.c svneol=native#text/plain -src/mess/machine/sat_bram.c svneol=native#text/plain -src/mess/machine/sat_bram.h svneol=native#text/plain -src/mess/machine/sat_dram.c svneol=native#text/plain -src/mess/machine/sat_dram.h svneol=native#text/plain -src/mess/machine/sat_rom.c svneol=native#text/plain -src/mess/machine/sat_rom.h svneol=native#text/plain -src/mess/machine/sat_slot.c svneol=native#text/plain -src/mess/machine/sat_slot.h svneol=native#text/plain src/mess/machine/sed1200.c svneol=native#text/plain src/mess/machine/sed1200.h svneol=native#text/plain -src/mess/machine/sega8_rom.c svneol=native#text/plain -src/mess/machine/sega8_rom.h svneol=native#text/plain -src/mess/machine/sega8_slot.c svneol=native#text/plain -src/mess/machine/sega8_slot.h svneol=native#text/plain src/mess/machine/sgi.c svneol=native#text/plain src/mess/machine/sgi.h svneol=native#text/plain src/mess/machine/smartmed.c svneol=native#text/plain @@ -8465,24 +8485,6 @@ src/mess/machine/smartmed.h svneol=native#text/plain src/mess/machine/smc92x4.c svneol=native#text/plain src/mess/machine/smc92x4.h svneol=native#text/plain src/mess/machine/sms.c svneol=native#text/plain -src/mess/machine/sms_gender.c svneol=native#text/plain -src/mess/machine/sms_gender.h svneol=native#text/plain -src/mess/machine/sms_joypad.c svneol=native#text/plain -src/mess/machine/sms_joypad.h svneol=native#text/plain -src/mess/machine/sms_lphaser.c svneol=native#text/plain -src/mess/machine/sms_lphaser.h svneol=native#text/plain -src/mess/machine/sms_paddle.c svneol=native#text/plain -src/mess/machine/sms_paddle.h svneol=native#text/plain -src/mess/machine/sms_rfu.c svneol=native#text/plain -src/mess/machine/sms_rfu.h svneol=native#text/plain -src/mess/machine/sms_sports.c svneol=native#text/plain -src/mess/machine/sms_sports.h svneol=native#text/plain -src/mess/machine/sms_sportsjp.c svneol=native#text/plain -src/mess/machine/sms_sportsjp.h svneol=native#text/plain -src/mess/machine/smsctrl.c svneol=native#text/plain -src/mess/machine/smsctrl.h svneol=native#text/plain -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/sonydriv.c svneol=native#text/plain diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak index 28ad39783ef..c52b987ad18 100644 --- a/src/emu/bus/bus.mak +++ b/src/emu/bus/bus.mak @@ -20,6 +20,7 @@ BUSOBJ = $(EMUOBJ)/bus #------------------------------------------------- ifneq ($(filter ABCBUS,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/abcbus BUSOBJS += $(BUSOBJ)/abcbus/abcbus.o BUSOBJS += $(BUSOBJ)/abcbus/abc890.o BUSOBJS += $(BUSOBJ)/abcbus/dos.o @@ -42,6 +43,7 @@ endif #------------------------------------------------- ifneq ($(filter ADAM,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/adam BUSOBJS += $(BUSOBJ)/adam/exp.o BUSOBJS += $(BUSOBJ)/adam/adamlink.o BUSOBJS += $(BUSOBJ)/adam/ide.o @@ -55,6 +57,7 @@ endif #------------------------------------------------- ifneq ($(filter ADAMNET,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/adamnet BUSOBJS += $(BUSOBJ)/adamnet/adamnet.o BUSOBJS += $(BUSOBJ)/adamnet/ddp.o BUSOBJS += $(BUSOBJ)/adamnet/fdc.o @@ -70,6 +73,7 @@ endif #------------------------------------------------- ifneq ($(filter BW2,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/bw2 BUSOBJS += $(BUSOBJ)/bw2/exp.o BUSOBJS += $(BUSOBJ)/bw2/ramcard.o endif @@ -82,6 +86,7 @@ endif #------------------------------------------------- ifneq ($(filter C64,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/c64 BUSOBJS += $(BUSOBJ)/c64/exp.o BUSOBJS += $(BUSOBJ)/c64/c128_comal80.o BUSOBJS += $(BUSOBJ)/c64/comal80.o @@ -163,6 +168,7 @@ endif #------------------------------------------------- ifneq ($(filter CBM2,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/cbm2 BUSOBJS += $(BUSOBJ)/cbm2/exp.o BUSOBJS += $(BUSOBJ)/cbm2/24k.o BUSOBJS += $(BUSOBJ)/cbm2/hrg.o @@ -177,6 +183,7 @@ endif #------------------------------------------------- ifneq ($(filter CBMIEC,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/cbmiec BUSOBJS += $(BUSOBJ)/cbmiec/cbmiec.o BUSOBJS += $(BUSOBJ)/cbmiec/c1541.o BUSOBJS += $(BUSOBJ)/cbmiec/c1571.o @@ -196,6 +203,7 @@ endif #------------------------------------------------- ifneq ($(filter COMX35,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/comx35 BUSOBJS += $(BUSOBJ)/comx35/exp.o BUSOBJS += $(BUSOBJ)/comx35/clm.o BUSOBJS += $(BUSOBJ)/comx35/expbox.o @@ -214,6 +222,7 @@ endif #------------------------------------------------- ifneq ($(filter ECBBUS,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/ecbbus BUSOBJS += $(BUSOBJ)/ecbbus/ecbbus.o BUSOBJS += $(BUSOBJ)/ecbbus/grip.o endif @@ -225,6 +234,7 @@ endif #------------------------------------------------- ifneq ($(filter ECONET,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/econet BUSOBJS += $(BUSOBJ)/econet/econet.o BUSOBJS += $(BUSOBJ)/econet/e01.o endif @@ -236,6 +246,7 @@ endif #------------------------------------------------- ifneq ($(filter EP64,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/ep64 BUSOBJS += $(BUSOBJ)/ep64/exp.o BUSOBJS += $(BUSOBJ)/ep64/exdos.o endif @@ -247,6 +258,7 @@ endif #------------------------------------------------- ifneq ($(filter IEEE488,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/ieee488 BUSOBJS += $(BUSOBJ)/ieee488/ieee488.o BUSOBJS += $(BUSOBJ)/ieee488/c2031.o BUSOBJS += $(BUSOBJ)/ieee488/c2040.o @@ -267,6 +279,7 @@ endif #------------------------------------------------- ifneq ($(filter IQ151,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/iq151 BUSOBJS += $(BUSOBJ)/iq151/iq151.o BUSOBJS += $(BUSOBJ)/iq151/disc2.o BUSOBJS += $(BUSOBJ)/iq151/grafik.o @@ -285,6 +298,7 @@ endif #------------------------------------------------- ifneq ($(filter IMI7000,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/imi7000 BUSOBJS += $(BUSOBJ)/imi7000/imi7000.o BUSOBJS += $(BUSOBJ)/imi7000/imi5000h.o endif @@ -296,6 +310,7 @@ endif #------------------------------------------------- ifneq ($(filter ISA,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/isa BUSOBJS += $(BUSOBJ)/isa/isa.o BUSOBJS += $(BUSOBJ)/isa/isa_cards.o BUSOBJS += $(BUSOBJ)/isa/mda.o @@ -350,6 +365,7 @@ endif #------------------------------------------------- ifneq ($(filter ISBX,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/isbx BUSOBJS += $(BUSOBJ)/isbx/isbx.o BUSOBJS += $(BUSOBJ)/isbx/compis_fdc.o BUSOBJS += $(BUSOBJ)/isbx/isbc_218a.o @@ -362,6 +378,7 @@ endif #------------------------------------------------- ifneq ($(filter KC,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/kc BUSOBJS += $(BUSOBJ)/kc/kc.o BUSOBJS += $(BUSOBJ)/kc/d002.o BUSOBJS += $(BUSOBJ)/kc/d004.o @@ -375,6 +392,7 @@ endif #------------------------------------------------- ifneq ($(filter PC_JOY,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/pc_joy BUSOBJS += $(BUSOBJ)/pc_joy/pc_joy.o BUSOBJS += $(BUSOBJ)/pc_joy/pc_joy_sw.o endif @@ -386,6 +404,7 @@ endif #------------------------------------------------- ifneq ($(filter PC_KBD,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/pc_kbd BUSOBJS += $(BUSOBJ)/pc_kbd/pc_kbdc.o BUSOBJS += $(BUSOBJ)/pc_kbd/keyboards.o BUSOBJS += $(BUSOBJ)/pc_kbd/ec1841.o @@ -406,6 +425,7 @@ endif #------------------------------------------------- ifneq ($(filter PET,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/pet BUSOBJS += $(BUSOBJ)/pet/cass.o BUSOBJS += $(BUSOBJ)/pet/c2n.o BUSOBJS += $(BUSOBJ)/pet/diag264_lb_tape.o @@ -424,6 +444,7 @@ endif #------------------------------------------------- ifneq ($(filter PLUS4,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/plus4 BUSOBJS += $(BUSOBJ)/plus4/exp.o BUSOBJS += $(BUSOBJ)/plus4/c1551.o BUSOBJS += $(BUSOBJ)/plus4/sid.o @@ -439,6 +460,7 @@ endif #------------------------------------------------- ifneq ($(filter S100,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/s100 BUSOBJS += $(BUSOBJ)/s100/s100.o BUSOBJS += $(BUSOBJ)/s100/dj2db.o BUSOBJS += $(BUSOBJ)/s100/djdma.o @@ -455,6 +477,7 @@ endif #------------------------------------------------- ifneq ($(filter TVC,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/tvc BUSOBJS += $(BUSOBJ)/tvc/tvc.o BUSOBJS += $(BUSOBJ)/tvc/hbf.o endif @@ -466,6 +489,7 @@ endif #------------------------------------------------- ifneq ($(filter VCS,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/vcs BUSOBJS += $(BUSOBJ)/vcs/ctrl.o BUSOBJS += $(BUSOBJ)/vcs/joystick.o BUSOBJS += $(BUSOBJ)/vcs/joybooster.o @@ -482,6 +506,7 @@ endif #------------------------------------------------- ifneq ($(filter VIC10,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/vic10 BUSOBJS += $(BUSOBJ)/vic10/exp.o BUSOBJS += $(BUSOBJ)/vic10/std.o endif @@ -494,6 +519,7 @@ endif #------------------------------------------------- ifneq ($(filter VIC20,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/vic20 BUSOBJS += $(BUSOBJ)/vic20/exp.o BUSOBJS += $(BUSOBJ)/vic20/megacart.o BUSOBJS += $(BUSOBJ)/vic20/std.o @@ -514,6 +540,7 @@ endif #------------------------------------------------- ifneq ($(filter VIDBRAIN,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/vidbrain BUSOBJS += $(BUSOBJ)/vidbrain/exp.o BUSOBJS += $(BUSOBJ)/vidbrain/std.o BUSOBJS += $(BUSOBJ)/vidbrain/money_minder.o @@ -528,6 +555,7 @@ endif #------------------------------------------------- ifneq ($(filter VIP,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/vip BUSOBJS += $(BUSOBJ)/vip/byteio.o BUSOBJS += $(BUSOBJ)/vip/vp620.o BUSOBJS += $(BUSOBJ)/vip/exp.o @@ -547,6 +575,7 @@ endif #------------------------------------------------- ifneq ($(filter WANGPC,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/wangpc BUSOBJS += $(BUSOBJ)/wangpc/wangpc.o BUSOBJS += $(BUSOBJ)/wangpc/emb.o BUSOBJS += $(BUSOBJ)/wangpc/lic.o @@ -565,6 +594,7 @@ endif #------------------------------------------------- ifneq ($(filter Z88,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/z88 BUSOBJS += $(BUSOBJ)/z88/z88.o BUSOBJS += $(BUSOBJ)/z88/flash.o BUSOBJS += $(BUSOBJ)/z88/ram.o @@ -577,6 +607,7 @@ endif #------------------------------------------------- ifneq ($(filter A2BUS,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/a2bus BUSOBJS += $(BUSOBJ)/a2bus/a2bus.o BUSOBJS += $(BUSOBJ)/a2bus/a2lang.o BUSOBJS += $(BUSOBJ)/a2bus/a2diskii.o @@ -614,6 +645,7 @@ endif #------------------------------------------------- ifneq ($(filter NUBUS,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/nubus BUSOBJS += $(BUSOBJ)/nubus/nubus.o BUSOBJS += $(BUSOBJ)/nubus/nubus_48gc.o BUSOBJS += $(BUSOBJ)/nubus/nubus_cb264.o @@ -639,6 +671,7 @@ endif #------------------------------------------------- ifneq ($(filter CENTRONICS,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/centronics BUSOBJS += $(BUSOBJ)/centronics/ctronics.o BUSOBJS += $(BUSOBJ)/centronics/comxpl80.o BUSOBJS += $(BUSOBJ)/centronics/covox.o @@ -652,6 +685,7 @@ endif #------------------------------------------------- ifneq ($(filter RS232,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/rs232 BUSOBJS += $(BUSOBJ)/rs232/keyboard.o BUSOBJS += $(BUSOBJ)/rs232/null_modem.o BUSOBJS += $(BUSOBJ)/rs232/rs232.o @@ -665,6 +699,7 @@ endif #------------------------------------------------- ifneq ($(filter MIDI,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/midi BUSOBJS += $(BUSOBJ)/midi/midi.o BUSOBJS += $(BUSOBJ)/midi/midiinport.o BUSOBJS += $(BUSOBJ)/midi/midioutport.o @@ -676,6 +711,7 @@ endif #------------------------------------------------- ifneq ($(filter PCI,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/pci BUSOBJS += $(BUSOBJ)/pci/pci.o BUSOBJS += $(BUSOBJ)/pci/i82371ab.o BUSOBJS += $(BUSOBJ)/pci/i82371sb.o @@ -691,6 +727,7 @@ endif #------------------------------------------------- ifneq ($(filter NES,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/nes BUSOBJS += $(BUSOBJ)/nes/nes_slot.o BUSOBJS += $(BUSOBJ)/nes/nes_carts.o BUSOBJS += $(BUSOBJ)/nes/act53.o @@ -747,6 +784,7 @@ endif #------------------------------------------------- ifneq ($(filter SNES,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/snes BUSOBJS += $(BUSOBJ)/snes/snes_slot.o BUSOBJS += $(BUSOBJ)/snes/snes_carts.o BUSOBJS += $(BUSOBJ)/snes/bsx.o @@ -761,3 +799,95 @@ BUSOBJS += $(BUSOBJ)/snes/spc7110.o BUSOBJS += $(BUSOBJ)/snes/sufami.o BUSOBJS += $(BUSOBJ)/snes/upd.o endif + +#------------------------------------------------- +# +#@src/emu/bus/megadrive/md_slot.h,BUSES += MEGADRIVE +#------------------------------------------------- + +ifneq ($(filter MEGADRIVE,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/megadrive +BUSOBJS += $(BUSOBJ)/megadrive/md_slot.o +BUSOBJS += $(BUSOBJ)/megadrive/md_carts.o +BUSOBJS += $(BUSOBJ)/megadrive/eeprom.o +BUSOBJS += $(BUSOBJ)/megadrive/jcart.o +BUSOBJS += $(BUSOBJ)/megadrive/rom.o +BUSOBJS += $(BUSOBJ)/megadrive/sk.o +BUSOBJS += $(BUSOBJ)/megadrive/stm95.o +BUSOBJS += $(BUSOBJ)/megadrive/svp.o +endif + +#------------------------------------------------- +# +#@src/emu/bus/saturn/sat_slot.h,BUSES += SATURN +#------------------------------------------------- + +ifneq ($(filter SATURN,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/saturn +BUSOBJS += $(BUSOBJ)/saturn/sat_slot.o +BUSOBJS += $(BUSOBJ)/saturn/bram.o +BUSOBJS += $(BUSOBJ)/saturn/dram.o +BUSOBJS += $(BUSOBJ)/saturn/rom.o +endif + +#------------------------------------------------- +# +#@src/emu/bus/sega8/sega8_slot.h,BUSES += SEGA8 +#------------------------------------------------- + +ifneq ($(filter SEGA8,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/sega8 +BUSOBJS += $(BUSOBJ)/sega8/sega8_slot.o +BUSOBJS += $(BUSOBJ)/sega8/rom.o +endif + +#------------------------------------------------- +# +#@src/emu/bus/sms_ctrl/smsctrl.h,BUSES += SMS_CTRL +#------------------------------------------------- + +ifneq ($(filter SMS_CTRL,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/sms_ctrl +BUSOBJS += $(BUSOBJ)/sms_ctrl/smsctrl.o +BUSOBJS += $(BUSOBJ)/sms_ctrl/joypad.o +BUSOBJS += $(BUSOBJ)/sms_ctrl/lphaser.o +BUSOBJS += $(BUSOBJ)/sms_ctrl/paddle.o +BUSOBJS += $(BUSOBJ)/sms_ctrl/rfu.o +BUSOBJS += $(BUSOBJ)/sms_ctrl/sports.o +BUSOBJS += $(BUSOBJ)/sms_ctrl/sportsjp.o +endif + +#------------------------------------------------- +# +#@src/emu/bus/sms_exp/smsexp.h,BUSES += SMS_EXP +#------------------------------------------------- + +ifneq ($(filter SMS_EXP,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/sms_exp +BUSOBJS += $(BUSOBJ)/sms_exp/smsexp.o +BUSOBJS += $(BUSOBJ)/sms_exp/gender.o +endif + +#------------------------------------------------- +# +#@src/emu/bus/gameboy/gb_slot.h,BUSES += GAMEBOY +#------------------------------------------------- + +ifneq ($(filter GAMEBOY,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/gameboy +BUSOBJS += $(BUSOBJ)/gameboy/gb_slot.o +BUSOBJS += $(BUSOBJ)/gameboy/rom.o +BUSOBJS += $(BUSOBJ)/gameboy/mbc.o +endif + +#------------------------------------------------- +# +#@src/emu/bus/gba/gba_slot.h,BUSES += GBA +#------------------------------------------------- + +ifneq ($(filter GBA,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/gba +BUSOBJS += $(BUSOBJ)/gba/gba_slot.o +BUSOBJS += $(BUSOBJ)/gba/rom.o +endif + diff --git a/src/mess/machine/gb_slot.c b/src/emu/bus/gameboy/gb_slot.c similarity index 99% rename from src/mess/machine/gb_slot.c rename to src/emu/bus/gameboy/gb_slot.c index ccf09a729c2..8646440a0f3 100644 --- a/src/mess/machine/gb_slot.c +++ b/src/emu/bus/gameboy/gb_slot.c @@ -17,7 +17,7 @@ #include "emu.h" -#include "machine/gb_slot.h" +#include "gb_slot.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/mess/machine/gb_slot.h b/src/emu/bus/gameboy/gb_slot.h similarity index 100% rename from src/mess/machine/gb_slot.h rename to src/emu/bus/gameboy/gb_slot.h diff --git a/src/mess/machine/gb_mbc.c b/src/emu/bus/gameboy/mbc.c similarity index 99% rename from src/mess/machine/gb_mbc.c rename to src/emu/bus/gameboy/mbc.c index 0e78e8453be..fc823c1f991 100644 --- a/src/mess/machine/gb_mbc.c +++ b/src/emu/bus/gameboy/mbc.c @@ -9,7 +9,7 @@ #include "emu.h" -#include "machine/gb_mbc.h" +#include "mbc.h" //------------------------------------------------- diff --git a/src/mess/machine/gb_mbc.h b/src/emu/bus/gameboy/mbc.h similarity index 99% rename from src/mess/machine/gb_mbc.h rename to src/emu/bus/gameboy/mbc.h index 493d3a83902..adb74accefb 100644 --- a/src/mess/machine/gb_mbc.h +++ b/src/emu/bus/gameboy/mbc.h @@ -1,7 +1,7 @@ #ifndef __GB_MBC_H #define __GB_MBC_H -#include "machine/gb_slot.h" +#include "gb_slot.h" // ======================> gb_rom_mbc_device diff --git a/src/mess/machine/gb_rom.c b/src/emu/bus/gameboy/rom.c similarity index 99% rename from src/mess/machine/gb_rom.c rename to src/emu/bus/gameboy/rom.c index bf062225e17..1ec6258710a 100644 --- a/src/mess/machine/gb_rom.c +++ b/src/emu/bus/gameboy/rom.c @@ -10,7 +10,7 @@ #include "emu.h" -#include "machine/gb_rom.h" +#include "rom.h" //------------------------------------------------- diff --git a/src/mess/machine/gb_rom.h b/src/emu/bus/gameboy/rom.h similarity index 99% rename from src/mess/machine/gb_rom.h rename to src/emu/bus/gameboy/rom.h index a578bd57b9b..0e9f4a57974 100644 --- a/src/mess/machine/gb_rom.h +++ b/src/emu/bus/gameboy/rom.h @@ -1,7 +1,7 @@ #ifndef __GB_ROM_H #define __GB_ROM_H -#include "machine/gb_slot.h" +#include "gb_slot.h" // ======================> gb_rom_device diff --git a/src/mess/machine/gba_slot.c b/src/emu/bus/gba/gba_slot.c similarity index 99% rename from src/mess/machine/gba_slot.c rename to src/emu/bus/gba/gba_slot.c index ac1f9797a59..05c64325686 100644 --- a/src/mess/machine/gba_slot.c +++ b/src/emu/bus/gba/gba_slot.c @@ -8,7 +8,7 @@ #include "emu.h" -#include "machine/gba_slot.h" +#include "gba_slot.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/mess/machine/gba_slot.h b/src/emu/bus/gba/gba_slot.h similarity index 100% rename from src/mess/machine/gba_slot.h rename to src/emu/bus/gba/gba_slot.h diff --git a/src/mess/machine/gba_rom.c b/src/emu/bus/gba/rom.c similarity index 99% rename from src/mess/machine/gba_rom.c rename to src/emu/bus/gba/rom.c index 3b2c081de21..bcddbe8b630 100644 --- a/src/mess/machine/gba_rom.c +++ b/src/emu/bus/gba/rom.c @@ -12,7 +12,7 @@ #include "emu.h" -#include "machine/gba_rom.h" +#include "rom.h" //------------------------------------------------- diff --git a/src/mess/machine/gba_rom.h b/src/emu/bus/gba/rom.h similarity index 99% rename from src/mess/machine/gba_rom.h rename to src/emu/bus/gba/rom.h index d51de2b36c9..b6c90f742ce 100644 --- a/src/mess/machine/gba_rom.h +++ b/src/emu/bus/gba/rom.h @@ -1,7 +1,7 @@ #ifndef __GBA_ROM_H #define __GBA_ROM_H -#include "machine/gba_slot.h" +#include "gba_slot.h" #include "machine/intelfsh.h" diff --git a/src/mess/machine/md_eeprom.c b/src/emu/bus/megadrive/eeprom.c similarity index 99% rename from src/mess/machine/md_eeprom.c rename to src/emu/bus/megadrive/eeprom.c index 6e64f55f20c..95bc78c716b 100644 --- a/src/mess/machine/md_eeprom.c +++ b/src/emu/bus/megadrive/eeprom.c @@ -42,7 +42,7 @@ #include "emu.h" -#include "machine/md_eeprom.h" +#include "eeprom.h" //------------------------------------------------- diff --git a/src/mess/machine/md_eeprom.h b/src/emu/bus/megadrive/eeprom.h similarity index 99% rename from src/mess/machine/md_eeprom.h rename to src/emu/bus/megadrive/eeprom.h index 14a8efcc19f..c0c4266cc97 100644 --- a/src/mess/machine/md_eeprom.h +++ b/src/emu/bus/megadrive/eeprom.h @@ -1,7 +1,7 @@ #ifndef __MD_EEPROM_H #define __MD_EEPROM_H -#include "machine/md_slot.h" +#include "md_slot.h" #include "machine/i2cmem.h" diff --git a/src/mess/machine/md_jcart.c b/src/emu/bus/megadrive/jcart.c similarity index 99% rename from src/mess/machine/md_jcart.c rename to src/emu/bus/megadrive/jcart.c index 63574dbfeaa..3ae90264e7f 100644 --- a/src/mess/machine/md_jcart.c +++ b/src/emu/bus/megadrive/jcart.c @@ -23,7 +23,7 @@ #include "emu.h" -#include "machine/md_jcart.h" +#include "jcart.h" //------------------------------------------------- diff --git a/src/mess/machine/md_jcart.h b/src/emu/bus/megadrive/jcart.h similarity index 98% rename from src/mess/machine/md_jcart.h rename to src/emu/bus/megadrive/jcart.h index 65567a2fb34..a618f682d57 100644 --- a/src/mess/machine/md_jcart.h +++ b/src/emu/bus/megadrive/jcart.h @@ -1,7 +1,7 @@ #ifndef __MD_JCART_H #define __MD_JCART_H -#include "machine/md_slot.h" +#include "md_slot.h" #include "machine/i2cmem.h" diff --git a/src/emu/bus/megadrive/md_carts.c b/src/emu/bus/megadrive/md_carts.c new file mode 100644 index 00000000000..191c939ad7e --- /dev/null +++ b/src/emu/bus/megadrive/md_carts.c @@ -0,0 +1,67 @@ + /********************************************************************** + + Megadrive carts + +**********************************************************************/ + +#include "md_carts.h" + +SLOT_INTERFACE_START(md_cart) + SLOT_INTERFACE_INTERNAL("rom", MD_STD_ROM) + SLOT_INTERFACE_INTERNAL("rom_svp", MD_ROM_SVP) + SLOT_INTERFACE_INTERNAL("rom_sk", MD_ROM_SK) +// NVRAM handling + SLOT_INTERFACE_INTERNAL("rom_sram", MD_ROM_SRAM) + SLOT_INTERFACE_INTERNAL("rom_sramsafe", MD_ROM_SRAM) + SLOT_INTERFACE_INTERNAL("rom_fram", MD_ROM_FRAM) + SLOT_INTERFACE_INTERNAL("rom_hardbl95", MD_ROM_SRAM) + SLOT_INTERFACE_INTERNAL("rom_xinqig", MD_ROM_SRAM) + SLOT_INTERFACE_INTERNAL("rom_beggarp", MD_ROM_BEGGARP) + SLOT_INTERFACE_INTERNAL("rom_wukong", MD_ROM_WUKONG) +// EEPROM handling (not supported fully yet) + SLOT_INTERFACE_INTERNAL("rom_eeprom", MD_STD_EEPROM) + SLOT_INTERFACE_INTERNAL("rom_nbajam", MD_EEPROM_NBAJAM) + SLOT_INTERFACE_INTERNAL("rom_nbajamte", MD_EEPROM_NBAJAMTE) + SLOT_INTERFACE_INTERNAL("rom_nflqb96", MD_EEPROM_NFLQB) + SLOT_INTERFACE_INTERNAL("rom_cslam", MD_EEPROM_CSLAM) + SLOT_INTERFACE_INTERNAL("rom_nhlpa", MD_EEPROM_NHLPA) + SLOT_INTERFACE_INTERNAL("rom_blara", MD_EEPROM_BLARA) +// J-Cart controller (Sampras Tennis) + SLOT_INTERFACE_INTERNAL("rom_jcart", MD_JCART) +// J-Cart controller + EEPROM handling (not supported fully yet) + SLOT_INTERFACE_INTERNAL("rom_codemast", MD_SEPROM_CODEMAST) + SLOT_INTERFACE_INTERNAL("rom_mm96", MD_SEPROM_MM96) +// STM95 EEPROM + SLOT_INTERFACE_INTERNAL("rom_stm95", MD_EEPROM_STM95) +// CodeMasters 2-in-1 (reset based) + SLOT_INTERFACE_INTERNAL("rom_cm2in1", MD_ROM_CM2IN1) +// unique bankswitch + SLOT_INTERFACE_INTERNAL("rom_ssf2", MD_ROM_SSF2) + SLOT_INTERFACE_INTERNAL("rom_radica", MD_ROM_RADICA) +// pirate mappers (protection and/or bankswitch) + SLOT_INTERFACE_INTERNAL("rom_16mj2", MD_ROM_16MJ2) + SLOT_INTERFACE_INTERNAL("rom_bugs", MD_ROM_BUGSLIFE) + SLOT_INTERFACE_INTERNAL("rom_chinf3", MD_ROM_CHINF3) + SLOT_INTERFACE_INTERNAL("rom_elfwor", MD_ROM_ELFWOR) + SLOT_INTERFACE_INTERNAL("rom_yasech", MD_ROM_YASECH) + SLOT_INTERFACE_INTERNAL("rom_kof98", MD_ROM_KOF98) + SLOT_INTERFACE_INTERNAL("rom_kof99", MD_ROM_KOF99) + SLOT_INTERFACE_INTERNAL("rom_lion2", MD_ROM_LION2) + SLOT_INTERFACE_INTERNAL("rom_lion3", MD_ROM_LION3) + SLOT_INTERFACE_INTERNAL("rom_mcpir", MD_ROM_MCPIR) + SLOT_INTERFACE_INTERNAL("rom_mjlov", MD_ROM_MJLOV) + SLOT_INTERFACE_INTERNAL("rom_pokea", MD_ROM_POKEA) + SLOT_INTERFACE_INTERNAL("rom_pokestad", MD_ROM_POKESTAD) + SLOT_INTERFACE_INTERNAL("rom_realtec", MD_ROM_REALTEC) + SLOT_INTERFACE_INTERNAL("rom_redcl", MD_ROM_REDCL) + SLOT_INTERFACE_INTERNAL("rom_rx3", MD_ROM_RX3) + SLOT_INTERFACE_INTERNAL("rom_sbubl", MD_ROM_SBUBL) + SLOT_INTERFACE_INTERNAL("rom_smb", MD_ROM_SMB) + SLOT_INTERFACE_INTERNAL("rom_smb2", MD_ROM_SMB2) + SLOT_INTERFACE_INTERNAL("rom_smw64", MD_ROM_SMW64) + SLOT_INTERFACE_INTERNAL("rom_smouse", MD_ROM_SMOUSE) + SLOT_INTERFACE_INTERNAL("rom_soulb", MD_ROM_SOULB) + SLOT_INTERFACE_INTERNAL("rom_squir", MD_ROM_SQUIR) + SLOT_INTERFACE_INTERNAL("rom_tekkensp", MD_ROM_TEKKENSP) + SLOT_INTERFACE_INTERNAL("rom_topf", MD_ROM_TOPF) +SLOT_INTERFACE_END diff --git a/src/emu/bus/megadrive/md_carts.h b/src/emu/bus/megadrive/md_carts.h new file mode 100644 index 00000000000..50290f33ce2 --- /dev/null +++ b/src/emu/bus/megadrive/md_carts.h @@ -0,0 +1,24 @@ +/********************************************************************** + + Megadrive carts + +**********************************************************************/ + +#pragma once + +#ifndef __MD_CARTS_H__ +#define __MD_CARTS_H__ + +#include "emu.h" + +#include "rom.h" +#include "svp.h" +#include "sk.h" +#include "eeprom.h" +#include "jcart.h" +#include "stm95.h" + +// supported devices +SLOT_INTERFACE_EXTERN(md_cart); + +#endif // __MD_CARTS_H__ diff --git a/src/mess/machine/md_slot.c b/src/emu/bus/megadrive/md_slot.c similarity index 99% rename from src/mess/machine/md_slot.c rename to src/emu/bus/megadrive/md_slot.c index bb3124468c5..3dfb90a2aac 100644 --- a/src/mess/machine/md_slot.c +++ b/src/emu/bus/megadrive/md_slot.c @@ -43,7 +43,7 @@ #include "emu.h" -#include "machine/md_slot.h" +#include "md_slot.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/mess/machine/md_slot.h b/src/emu/bus/megadrive/md_slot.h similarity index 100% rename from src/mess/machine/md_slot.h rename to src/emu/bus/megadrive/md_slot.h diff --git a/src/mess/machine/md_rom.c b/src/emu/bus/megadrive/rom.c similarity index 99% rename from src/mess/machine/md_rom.c rename to src/emu/bus/megadrive/rom.c index e2995e31311..c5c5b93c49f 100644 --- a/src/mess/machine/md_rom.c +++ b/src/emu/bus/megadrive/rom.c @@ -10,7 +10,7 @@ ***********************************************************************************************************/ #include "emu.h" -#include "machine/md_rom.h" +#include "rom.h" #include "cpu/m68000/m68000.h" diff --git a/src/mess/machine/md_rom.h b/src/emu/bus/megadrive/rom.h similarity index 99% rename from src/mess/machine/md_rom.h rename to src/emu/bus/megadrive/rom.h index 6cd16d477d2..53eae8fc39a 100644 --- a/src/mess/machine/md_rom.h +++ b/src/emu/bus/megadrive/rom.h @@ -1,7 +1,7 @@ #ifndef __MD_ROM_H #define __MD_ROM_H -#include "machine/md_slot.h" +#include "md_slot.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mess/machine/md_sk.c b/src/emu/bus/megadrive/sk.c similarity index 98% rename from src/mess/machine/md_sk.c rename to src/emu/bus/megadrive/sk.c index 6c400061b8e..a86e055b6bb 100644 --- a/src/mess/machine/md_sk.c +++ b/src/emu/bus/megadrive/sk.c @@ -14,8 +14,8 @@ #include "emu.h" -#include "machine/md_sk.h" -#include "machine/md_rom.h" +#include "sk.h" +#include "rom.h" //------------------------------------------------- diff --git a/src/mess/machine/md_sk.h b/src/emu/bus/megadrive/sk.h similarity index 96% rename from src/mess/machine/md_sk.h rename to src/emu/bus/megadrive/sk.h index b8df4c692ac..45671bdef34 100644 --- a/src/mess/machine/md_sk.h +++ b/src/emu/bus/megadrive/sk.h @@ -1,7 +1,7 @@ #ifndef __MD_SK_H #define __MD_SK_H -#include "machine/md_slot.h" +#include "md_slot.h" // ======================> md_rom_sk_device diff --git a/src/mess/machine/md_stm95.c b/src/emu/bus/megadrive/stm95.c similarity index 99% rename from src/mess/machine/md_stm95.c rename to src/emu/bus/megadrive/stm95.c index 0239c026732..734a0a10397 100644 --- a/src/mess/machine/md_stm95.c +++ b/src/emu/bus/megadrive/stm95.c @@ -13,7 +13,7 @@ #include "emu.h" -#include "machine/md_stm95.h" +#include "stm95.h" stm95_eeprom_device::stm95_eeprom_device(running_machine &machine, UINT8 *eeprom) : diff --git a/src/mess/machine/md_stm95.h b/src/emu/bus/megadrive/stm95.h similarity index 98% rename from src/mess/machine/md_stm95.h rename to src/emu/bus/megadrive/stm95.h index a67a0d82aff..369f7bffd51 100644 --- a/src/mess/machine/md_stm95.h +++ b/src/emu/bus/megadrive/stm95.h @@ -1,7 +1,7 @@ #ifndef __MD_STM95_H #define __MD_STM95_H -#include "machine/md_slot.h" +#include "md_slot.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mess/machine/md_svp.c b/src/emu/bus/megadrive/svp.c similarity index 99% rename from src/mess/machine/md_svp.c rename to src/emu/bus/megadrive/svp.c index 5173c2090b4..5746720d58d 100644 --- a/src/mess/machine/md_svp.c +++ b/src/emu/bus/megadrive/svp.c @@ -25,7 +25,7 @@ #include "emu.h" -#include "machine/md_svp.h" +#include "svp.h" //------------------------------------------------- diff --git a/src/mess/machine/md_svp.h b/src/emu/bus/megadrive/svp.h similarity index 98% rename from src/mess/machine/md_svp.h rename to src/emu/bus/megadrive/svp.h index a27c6980273..3d107701603 100644 --- a/src/mess/machine/md_svp.h +++ b/src/emu/bus/megadrive/svp.h @@ -1,7 +1,7 @@ #ifndef __MD_SVP_H #define __MD_SVP_H -#include "machine/md_slot.h" +#include "md_slot.h" #include "cpu/ssp1601/ssp1601.h" //************************************************************************** diff --git a/src/mess/machine/sat_bram.c b/src/emu/bus/saturn/bram.c similarity index 99% rename from src/mess/machine/sat_bram.c rename to src/emu/bus/saturn/bram.c index 0e32c25b424..9d11af18b9b 100644 --- a/src/mess/machine/sat_bram.c +++ b/src/emu/bus/saturn/bram.c @@ -6,7 +6,7 @@ #include "emu.h" -#include "machine/sat_bram.h" +#include "bram.h" //------------------------------------------------- diff --git a/src/mess/machine/sat_bram.h b/src/emu/bus/saturn/bram.h similarity index 98% rename from src/mess/machine/sat_bram.h rename to src/emu/bus/saturn/bram.h index 455cefbfa86..861dd3db329 100644 --- a/src/mess/machine/sat_bram.h +++ b/src/emu/bus/saturn/bram.h @@ -1,7 +1,7 @@ #ifndef __SAT_BRAM_H #define __SAT_BRAM_H -#include "machine/sat_slot.h" +#include "sat_slot.h" // ======================> saturn_bram_device diff --git a/src/mess/machine/sat_dram.c b/src/emu/bus/saturn/dram.c similarity index 99% rename from src/mess/machine/sat_dram.c rename to src/emu/bus/saturn/dram.c index 19b00a428f8..40af31cb29f 100644 --- a/src/mess/machine/sat_dram.c +++ b/src/emu/bus/saturn/dram.c @@ -6,7 +6,7 @@ #include "emu.h" -#include "machine/sat_dram.h" +#include "dram.h" //------------------------------------------------- diff --git a/src/mess/machine/sat_dram.h b/src/emu/bus/saturn/dram.h similarity index 97% rename from src/mess/machine/sat_dram.h rename to src/emu/bus/saturn/dram.h index cf6d0a6e12e..3a7e27a3e52 100644 --- a/src/mess/machine/sat_dram.h +++ b/src/emu/bus/saturn/dram.h @@ -1,7 +1,7 @@ #ifndef __SAT_DRAM_H #define __SAT_DRAM_H -#include "machine/sat_slot.h" +#include "sat_slot.h" // ======================> saturn_dram_device diff --git a/src/mess/machine/sat_rom.c b/src/emu/bus/saturn/rom.c similarity index 98% rename from src/mess/machine/sat_rom.c rename to src/emu/bus/saturn/rom.c index d9509612ed9..c7fc84cbd81 100644 --- a/src/mess/machine/sat_rom.c +++ b/src/emu/bus/saturn/rom.c @@ -6,7 +6,7 @@ #include "emu.h" -#include "machine/sat_rom.h" +#include "rom.h" //------------------------------------------------- diff --git a/src/mess/machine/sat_rom.h b/src/emu/bus/saturn/rom.h similarity index 96% rename from src/mess/machine/sat_rom.h rename to src/emu/bus/saturn/rom.h index 7a42ffe0354..3cb8dd1bf73 100644 --- a/src/mess/machine/sat_rom.h +++ b/src/emu/bus/saturn/rom.h @@ -1,7 +1,7 @@ #ifndef __SAT_ROM_H #define __SAT_ROM_H -#include "machine/sat_slot.h" +#include "sat_slot.h" // ======================> saturn_rom_device diff --git a/src/mess/machine/sat_slot.c b/src/emu/bus/saturn/sat_slot.c similarity index 99% rename from src/mess/machine/sat_slot.c rename to src/emu/bus/saturn/sat_slot.c index 673a54f2cef..cc6d66786e0 100644 --- a/src/mess/machine/sat_slot.c +++ b/src/emu/bus/saturn/sat_slot.c @@ -21,7 +21,7 @@ #include "emu.h" -#include "machine/sat_slot.h" +#include "sat_slot.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/mess/machine/sat_slot.h b/src/emu/bus/saturn/sat_slot.h similarity index 100% rename from src/mess/machine/sat_slot.h rename to src/emu/bus/saturn/sat_slot.h diff --git a/src/mess/machine/sega8_rom.c b/src/emu/bus/sega8/rom.c similarity index 99% rename from src/mess/machine/sega8_rom.c rename to src/emu/bus/sega8/rom.c index 8ed048b3283..4f0047555ac 100644 --- a/src/mess/machine/sega8_rom.c +++ b/src/emu/bus/sega8/rom.c @@ -8,7 +8,7 @@ #include "emu.h" -#include "machine/sega8_rom.h" +#include "rom.h" //------------------------------------------------- diff --git a/src/mess/machine/sega8_rom.h b/src/emu/bus/sega8/rom.h similarity index 99% rename from src/mess/machine/sega8_rom.h rename to src/emu/bus/sega8/rom.h index 3f853016b73..efc49547e88 100644 --- a/src/mess/machine/sega8_rom.h +++ b/src/emu/bus/sega8/rom.h @@ -1,7 +1,7 @@ #ifndef __SEGA8_ROM_H #define __SEGA8_ROM_H -#include "machine/sega8_slot.h" +#include "sega8_slot.h" #include "machine/eepromser.h" // ======================> sega8_rom_device diff --git a/src/mess/machine/sega8_slot.c b/src/emu/bus/sega8/sega8_slot.c similarity index 99% rename from src/mess/machine/sega8_slot.c rename to src/emu/bus/sega8/sega8_slot.c index 591207c9145..c8ebf5297cb 100644 --- a/src/mess/machine/sega8_slot.c +++ b/src/emu/bus/sega8/sega8_slot.c @@ -25,7 +25,7 @@ #include "emu.h" -#include "machine/sega8_slot.h" +#include "sega8_slot.h" #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) diff --git a/src/mess/machine/sega8_slot.h b/src/emu/bus/sega8/sega8_slot.h similarity index 100% rename from src/mess/machine/sega8_slot.h rename to src/emu/bus/sega8/sega8_slot.h diff --git a/src/mess/machine/sms_joypad.c b/src/emu/bus/sms_ctrl/joypad.c similarity index 98% rename from src/mess/machine/sms_joypad.c rename to src/emu/bus/sms_ctrl/joypad.c index b2c9d66f111..578fd2054ae 100644 --- a/src/mess/machine/sms_joypad.c +++ b/src/emu/bus/sms_ctrl/joypad.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "sms_joypad.h" +#include "joypad.h" diff --git a/src/mess/machine/sms_joypad.h b/src/emu/bus/sms_ctrl/joypad.h similarity index 97% rename from src/mess/machine/sms_joypad.h rename to src/emu/bus/sms_ctrl/joypad.h index 111292ab33e..f102ca6d596 100644 --- a/src/mess/machine/sms_joypad.h +++ b/src/emu/bus/sms_ctrl/joypad.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/smsctrl.h" +#include "smsctrl.h" diff --git a/src/mess/machine/sms_lphaser.c b/src/emu/bus/sms_ctrl/lphaser.c similarity index 99% rename from src/mess/machine/sms_lphaser.c rename to src/emu/bus/sms_ctrl/lphaser.c index 9463dfa7f38..8736657cae6 100644 --- a/src/mess/machine/sms_lphaser.c +++ b/src/emu/bus/sms_ctrl/lphaser.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "sms_lphaser.h" +#include "lphaser.h" diff --git a/src/mess/machine/sms_lphaser.h b/src/emu/bus/sms_ctrl/lphaser.h similarity index 98% rename from src/mess/machine/sms_lphaser.h rename to src/emu/bus/sms_ctrl/lphaser.h index 4c4e6aa085e..8afaa47fcd7 100644 --- a/src/mess/machine/sms_lphaser.h +++ b/src/emu/bus/sms_ctrl/lphaser.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/smsctrl.h" +#include "smsctrl.h" diff --git a/src/mess/machine/sms_paddle.c b/src/emu/bus/sms_ctrl/paddle.c similarity index 99% rename from src/mess/machine/sms_paddle.c rename to src/emu/bus/sms_ctrl/paddle.c index 90aa121d77f..7258578d6da 100644 --- a/src/mess/machine/sms_paddle.c +++ b/src/emu/bus/sms_ctrl/paddle.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "sms_paddle.h" +#include "paddle.h" diff --git a/src/mess/machine/sms_paddle.h b/src/emu/bus/sms_ctrl/paddle.h similarity index 97% rename from src/mess/machine/sms_paddle.h rename to src/emu/bus/sms_ctrl/paddle.h index c267800e851..59d41ec645d 100644 --- a/src/mess/machine/sms_paddle.h +++ b/src/emu/bus/sms_ctrl/paddle.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/smsctrl.h" +#include "smsctrl.h" diff --git a/src/mess/machine/sms_rfu.c b/src/emu/bus/sms_ctrl/rfu.c similarity index 99% rename from src/mess/machine/sms_rfu.c rename to src/emu/bus/sms_ctrl/rfu.c index 7d1ec8472b5..8b92979e7e6 100644 --- a/src/mess/machine/sms_rfu.c +++ b/src/emu/bus/sms_ctrl/rfu.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "sms_rfu.h" +#include "rfu.h" diff --git a/src/mess/machine/sms_rfu.h b/src/emu/bus/sms_ctrl/rfu.h similarity index 98% rename from src/mess/machine/sms_rfu.h rename to src/emu/bus/sms_ctrl/rfu.h index e266e5d028f..4edefaf2517 100644 --- a/src/mess/machine/sms_rfu.h +++ b/src/emu/bus/sms_ctrl/rfu.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/smsctrl.h" +#include "smsctrl.h" diff --git a/src/mess/machine/smsctrl.c b/src/emu/bus/sms_ctrl/smsctrl.c similarity index 99% rename from src/mess/machine/smsctrl.c rename to src/emu/bus/sms_ctrl/smsctrl.c index e379f318703..41662470b28 100644 --- a/src/mess/machine/smsctrl.c +++ b/src/emu/bus/sms_ctrl/smsctrl.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "machine/smsctrl.h" +#include "smsctrl.h" diff --git a/src/mess/machine/smsctrl.h b/src/emu/bus/sms_ctrl/smsctrl.h similarity index 94% rename from src/mess/machine/smsctrl.h rename to src/emu/bus/sms_ctrl/smsctrl.h index 27edf7b6056..f9581d86c8f 100644 --- a/src/mess/machine/smsctrl.h +++ b/src/emu/bus/sms_ctrl/smsctrl.h @@ -114,12 +114,12 @@ extern const device_type SMS_CONTROL_PORT; // slot devices -#include "machine/sms_joypad.h" -#include "machine/sms_lphaser.h" -#include "machine/sms_paddle.h" -#include "machine/sms_sports.h" -#include "machine/sms_sportsjp.h" -#include "machine/sms_rfu.h" +#include "joypad.h" +#include "lphaser.h" +#include "paddle.h" +#include "sports.h" +#include "sportsjp.h" +#include "rfu.h" SLOT_INTERFACE_EXTERN( sms_control_port_devices ); diff --git a/src/mess/machine/sms_sports.c b/src/emu/bus/sms_ctrl/sports.c similarity index 99% rename from src/mess/machine/sms_sports.c rename to src/emu/bus/sms_ctrl/sports.c index 05090342740..4b0e184a4d0 100644 --- a/src/mess/machine/sms_sports.c +++ b/src/emu/bus/sms_ctrl/sports.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "sms_sports.h" +#include "sports.h" diff --git a/src/mess/machine/sms_sports.h b/src/emu/bus/sms_ctrl/sports.h similarity index 98% rename from src/mess/machine/sms_sports.h rename to src/emu/bus/sms_ctrl/sports.h index 7f0d33838cc..0ce5cc96b09 100644 --- a/src/mess/machine/sms_sports.h +++ b/src/emu/bus/sms_ctrl/sports.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/smsctrl.h" +#include "smsctrl.h" diff --git a/src/mess/machine/sms_sportsjp.c b/src/emu/bus/sms_ctrl/sportsjp.c similarity index 99% rename from src/mess/machine/sms_sportsjp.c rename to src/emu/bus/sms_ctrl/sportsjp.c index 352e199efa1..a9b181c1ee6 100644 --- a/src/mess/machine/sms_sportsjp.c +++ b/src/emu/bus/sms_ctrl/sportsjp.c @@ -12,7 +12,7 @@ // used by the US model, due to missing output lines on Sega Mark III // controller ports. -#include "sms_sportsjp.h" +#include "sportsjp.h" diff --git a/src/mess/machine/sms_sportsjp.h b/src/emu/bus/sms_ctrl/sportsjp.h similarity index 98% rename from src/mess/machine/sms_sportsjp.h rename to src/emu/bus/sms_ctrl/sportsjp.h index 57906c68f43..065f8293a97 100644 --- a/src/mess/machine/sms_sportsjp.h +++ b/src/emu/bus/sms_ctrl/sportsjp.h @@ -19,7 +19,7 @@ #include "emu.h" -#include "machine/smsctrl.h" +#include "smsctrl.h" diff --git a/src/mess/machine/sms_gender.c b/src/emu/bus/sms_exp/gender.c similarity index 99% rename from src/mess/machine/sms_gender.c rename to src/emu/bus/sms_exp/gender.c index 2419ca43955..0b80deb7c68 100644 --- a/src/mess/machine/sms_gender.c +++ b/src/emu/bus/sms_exp/gender.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "sms_gender.h" +#include "gender.h" diff --git a/src/mess/machine/sms_gender.h b/src/emu/bus/sms_exp/gender.h similarity index 93% rename from src/mess/machine/sms_gender.h rename to src/emu/bus/sms_exp/gender.h index 352b84fb69c..4458e880688 100644 --- a/src/mess/machine/sms_gender.h +++ b/src/emu/bus/sms_exp/gender.h @@ -14,9 +14,9 @@ #include "emu.h" -#include "machine/smsexp.h" -#include "machine/sega8_slot.h" -#include "machine/sega8_rom.h" +#include "smsexp.h" +#include "bus/sega8/sega8_slot.h" +#include "bus/sega8/rom.h" diff --git a/src/mess/machine/smsexp.c b/src/emu/bus/sms_exp/smsexp.c similarity index 99% rename from src/mess/machine/smsexp.c rename to src/emu/bus/sms_exp/smsexp.c index c9c9f362ed1..e1ddb4969f0 100644 --- a/src/mess/machine/smsexp.c +++ b/src/emu/bus/sms_exp/smsexp.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "machine/smsexp.h" +#include "smsexp.h" diff --git a/src/mess/machine/smsexp.h b/src/emu/bus/sms_exp/smsexp.h similarity index 98% rename from src/mess/machine/smsexp.h rename to src/emu/bus/sms_exp/smsexp.h index 5e50eb917b2..871424aa856 100644 --- a/src/mess/machine/smsexp.h +++ b/src/emu/bus/sms_exp/smsexp.h @@ -88,7 +88,7 @@ extern const device_type SMS_EXPANSION_SLOT; // slot devices -#include "machine/sms_gender.h" +#include "gender.h" SLOT_INTERFACE_EXTERN( sms_expansion_devices ); diff --git a/src/emu/bus/snes/sgb.h b/src/emu/bus/snes/sgb.h index fc7c940083e..549a7152da2 100644 --- a/src/emu/bus/snes/sgb.h +++ b/src/emu/bus/snes/sgb.h @@ -5,9 +5,9 @@ #include "rom.h" #include "cpu/lr35902/lr35902.h" -#include "machine/gb_slot.h" -#include "machine/gb_rom.h" -#include "machine/gb_mbc.h" +#include "bus/gameboy/gb_slot.h" +#include "bus/gameboy/rom.h" +#include "bus/gameboy/mbc.h" #include "video/gb_lcd.h" #include "audio/gb.h" diff --git a/src/emu/emu.mak b/src/emu/emu.mak index 003840c5adf..0cd146b2615 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -28,44 +28,6 @@ OBJDIRS += \ $(EMUOBJ)/debugint \ $(EMUOBJ)/audio \ $(EMUOBJ)/bus \ - $(EMUOBJ)/bus/abcbus \ - $(EMUOBJ)/bus/adam \ - $(EMUOBJ)/bus/adamnet \ - $(EMUOBJ)/bus/bw2 \ - $(EMUOBJ)/bus/c64 \ - $(EMUOBJ)/bus/cbm2 \ - $(EMUOBJ)/bus/cbmiec \ - $(EMUOBJ)/bus/centronics \ - $(EMUOBJ)/bus/comx35 \ - $(EMUOBJ)/bus/ecbbus \ - $(EMUOBJ)/bus/econet \ - $(EMUOBJ)/bus/ep64 \ - $(EMUOBJ)/bus/ieee488 \ - $(EMUOBJ)/bus/imi7000 \ - $(EMUOBJ)/bus/isa \ - $(EMUOBJ)/bus/isbx \ - $(EMUOBJ)/bus/midi \ - $(EMUOBJ)/bus/pci \ - $(EMUOBJ)/bus/pc_joy \ - $(EMUOBJ)/bus/pc_kbd \ - $(EMUOBJ)/bus/pet \ - $(EMUOBJ)/bus/plus4 \ - $(EMUOBJ)/bus/rs232 \ - $(EMUOBJ)/bus/s100 \ - $(EMUOBJ)/bus/vcs \ - $(EMUOBJ)/bus/vic10 \ - $(EMUOBJ)/bus/vic20 \ - $(EMUOBJ)/bus/vidbrain \ - $(EMUOBJ)/bus/vip \ - $(EMUOBJ)/bus/wangpc \ - $(EMUOBJ)/bus/a2bus \ - $(EMUOBJ)/bus/nubus \ - $(EMUOBJ)/bus/iq151 \ - $(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/mess/drivers/gb.c b/src/mess/drivers/gb.c index e19ef2d8edc..e4c061b7849 100644 --- a/src/mess/drivers/gb.c +++ b/src/mess/drivers/gb.c @@ -443,8 +443,8 @@ space. This mapper uses 32KB sized banks. #include "emu.h" #include "rendlay.h" #include "includes/gb.h" -#include "machine/gb_rom.h" -#include "machine/gb_mbc.h" +#include "bus/gameboy/rom.h" +#include "bus/gameboy/mbc.h" /* Initial value of the cpu registers (hacks until we get bios dumps) */ diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c index 3212939bbff..832bda32868 100644 --- a/src/mess/drivers/gba.c +++ b/src/mess/drivers/gba.c @@ -20,7 +20,7 @@ #include "sound/dac.h" #include "audio/gb.h" #include "includes/gba.h" -#include "machine/gba_rom.h" +#include "bus/gba/rom.h" #include "rendlay.h" #define VERBOSE_LEVEL (0) diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c index 3d8c2ad4a9c..4de206b98f6 100644 --- a/src/mess/drivers/megadriv.c +++ b/src/mess/drivers/megadriv.c @@ -1,13 +1,8 @@ #include "emu.h" #include "includes/megadriv.h" -#include "machine/md_slot.h" -#include "machine/md_rom.h" -#include "machine/md_svp.h" -#include "machine/md_sk.h" -#include "machine/md_eeprom.h" -#include "machine/md_jcart.h" -#include "machine/md_stm95.h" +#include "bus/megadrive/md_slot.h" +#include "bus/megadrive/md_carts.h" #include "sound/sn76496.h" @@ -314,66 +309,6 @@ MACHINE_RESET_MEMBER(md_cons_state,ms_megadriv ) MACHINE_RESET_CALL_MEMBER( megadriv ); } -static SLOT_INTERFACE_START(md_cart) - SLOT_INTERFACE_INTERNAL("rom", MD_STD_ROM) - SLOT_INTERFACE_INTERNAL("rom_svp", MD_ROM_SVP) - SLOT_INTERFACE_INTERNAL("rom_sk", MD_ROM_SK) -// NVRAM handling - SLOT_INTERFACE_INTERNAL("rom_sram", MD_ROM_SRAM) - SLOT_INTERFACE_INTERNAL("rom_sramsafe", MD_ROM_SRAM) - SLOT_INTERFACE_INTERNAL("rom_fram", MD_ROM_FRAM) - SLOT_INTERFACE_INTERNAL("rom_hardbl95", MD_ROM_SRAM) - SLOT_INTERFACE_INTERNAL("rom_xinqig", MD_ROM_SRAM) - SLOT_INTERFACE_INTERNAL("rom_beggarp", MD_ROM_BEGGARP) - SLOT_INTERFACE_INTERNAL("rom_wukong", MD_ROM_WUKONG) -// EEPROM handling (not supported fully yet) - SLOT_INTERFACE_INTERNAL("rom_eeprom", MD_STD_EEPROM) - SLOT_INTERFACE_INTERNAL("rom_nbajam", MD_EEPROM_NBAJAM) - SLOT_INTERFACE_INTERNAL("rom_nbajamte", MD_EEPROM_NBAJAMTE) - SLOT_INTERFACE_INTERNAL("rom_nflqb96", MD_EEPROM_NFLQB) - SLOT_INTERFACE_INTERNAL("rom_cslam", MD_EEPROM_CSLAM) - SLOT_INTERFACE_INTERNAL("rom_nhlpa", MD_EEPROM_NHLPA) - SLOT_INTERFACE_INTERNAL("rom_blara", MD_EEPROM_BLARA) -// J-Cart controller (Sampras Tennis) - SLOT_INTERFACE_INTERNAL("rom_jcart", MD_JCART) -// J-Cart controller + EEPROM handling (not supported fully yet) - SLOT_INTERFACE_INTERNAL("rom_codemast", MD_SEPROM_CODEMAST) - SLOT_INTERFACE_INTERNAL("rom_mm96", MD_SEPROM_MM96) -// STM95 EEPROM - SLOT_INTERFACE_INTERNAL("rom_stm95", MD_EEPROM_STM95) -// CodeMasters 2-in-1 (reset based) - SLOT_INTERFACE_INTERNAL("rom_cm2in1", MD_ROM_CM2IN1) -// unique bankswitch - SLOT_INTERFACE_INTERNAL("rom_ssf2", MD_ROM_SSF2) - SLOT_INTERFACE_INTERNAL("rom_radica", MD_ROM_RADICA) -// pirate mappers (protection and/or bankswitch) - SLOT_INTERFACE_INTERNAL("rom_16mj2", MD_ROM_16MJ2) - SLOT_INTERFACE_INTERNAL("rom_bugs", MD_ROM_BUGSLIFE) - SLOT_INTERFACE_INTERNAL("rom_chinf3", MD_ROM_CHINF3) - SLOT_INTERFACE_INTERNAL("rom_elfwor", MD_ROM_ELFWOR) - SLOT_INTERFACE_INTERNAL("rom_yasech", MD_ROM_YASECH) - SLOT_INTERFACE_INTERNAL("rom_kof98", MD_ROM_KOF98) - SLOT_INTERFACE_INTERNAL("rom_kof99", MD_ROM_KOF99) - SLOT_INTERFACE_INTERNAL("rom_lion2", MD_ROM_LION2) - SLOT_INTERFACE_INTERNAL("rom_lion3", MD_ROM_LION3) - SLOT_INTERFACE_INTERNAL("rom_mcpir", MD_ROM_MCPIR) - SLOT_INTERFACE_INTERNAL("rom_mjlov", MD_ROM_MJLOV) - SLOT_INTERFACE_INTERNAL("rom_pokea", MD_ROM_POKEA) - SLOT_INTERFACE_INTERNAL("rom_pokestad", MD_ROM_POKESTAD) - SLOT_INTERFACE_INTERNAL("rom_realtec", MD_ROM_REALTEC) - SLOT_INTERFACE_INTERNAL("rom_redcl", MD_ROM_REDCL) - SLOT_INTERFACE_INTERNAL("rom_rx3", MD_ROM_RX3) - SLOT_INTERFACE_INTERNAL("rom_sbubl", MD_ROM_SBUBL) - SLOT_INTERFACE_INTERNAL("rom_smb", MD_ROM_SMB) - SLOT_INTERFACE_INTERNAL("rom_smb2", MD_ROM_SMB2) - SLOT_INTERFACE_INTERNAL("rom_smw64", MD_ROM_SMW64) - SLOT_INTERFACE_INTERNAL("rom_smouse", MD_ROM_SMOUSE) - SLOT_INTERFACE_INTERNAL("rom_soulb", MD_ROM_SOULB) - SLOT_INTERFACE_INTERNAL("rom_squir", MD_ROM_SQUIR) - SLOT_INTERFACE_INTERNAL("rom_tekkensp", MD_ROM_TEKKENSP) - SLOT_INTERFACE_INTERNAL("rom_topf", MD_ROM_TOPF) -SLOT_INTERFACE_END - static MACHINE_CONFIG_START( ms_megadriv, md_cons_state ) MCFG_FRAGMENT_ADD( md_ntsc ) diff --git a/src/mess/drivers/saturn.c b/src/mess/drivers/saturn.c index e6cbc0e8074..155ddc44181 100644 --- a/src/mess/drivers/saturn.c +++ b/src/mess/drivers/saturn.c @@ -47,10 +47,10 @@ test1f diagnostic hacks: #include "imagedev/chd_cd.h" #include "coreutil.h" -#include "machine/sat_slot.h" -#include "machine/sat_rom.h" -#include "machine/sat_dram.h" -#include "machine/sat_bram.h" +#include "bus/saturn/sat_slot.h" +#include "bus/saturn/rom.h" +#include "bus/saturn/dram.h" +#include "bus/saturn/bram.h" #include "mcfglgcy.h" diff --git a/src/mess/drivers/segapico.c b/src/mess/drivers/segapico.c index 3b44bb4376c..2a6f3166755 100644 --- a/src/mess/drivers/segapico.c +++ b/src/mess/drivers/segapico.c @@ -117,8 +117,8 @@ C = MB3514 / 9325 M36 #include "emu.h" #include "includes/megadriv.h" -#include "machine/md_slot.h" -#include "machine/md_rom.h" +#include "bus/megadrive/md_slot.h" +#include "bus/megadrive/rom.h" #include "includes/md_cons.h" #include "sound/upd7759.h" diff --git a/src/mess/drivers/sg1000.c b/src/mess/drivers/sg1000.c index 9d5d209af21..603e1013143 100644 --- a/src/mess/drivers/sg1000.c +++ b/src/mess/drivers/sg1000.c @@ -67,7 +67,7 @@ Notes: #include "includes/sg1000.h" #include "bus/rs232/rs232.h" -#include "machine/sega8_rom.h" +#include "bus/sega8/rom.h" /*************************************************************************** diff --git a/src/mess/drivers/sms.c b/src/mess/drivers/sms.c index 19d5bde9e09..4f6eb2de086 100644 --- a/src/mess/drivers/sms.c +++ b/src/mess/drivers/sms.c @@ -227,7 +227,7 @@ DC00 - Selection buttons #2, 9-16 (R) #include "video/315_5124.h" #include "imagedev/cartslot.h" #include "includes/sms.h" -#include "machine/sega8_rom.h" +#include "bus/sega8/rom.h" #include "sms1.lh" diff --git a/src/mess/includes/gb.h b/src/mess/includes/gb.h index 2888a8673ad..bdaf9295dea 100644 --- a/src/mess/includes/gb.h +++ b/src/mess/includes/gb.h @@ -9,7 +9,7 @@ #include "audio/gb.h" #include "cpu/lr35902/lr35902.h" -#include "machine/gb_slot.h" +#include "bus/gameboy/gb_slot.h" #include "machine/ram.h" #include "video/gb_lcd.h" diff --git a/src/mess/includes/gba.h b/src/mess/includes/gba.h index b4967c4ddee..8636003b0b6 100644 --- a/src/mess/includes/gba.h +++ b/src/mess/includes/gba.h @@ -3,7 +3,7 @@ #include "audio/gb.h" #include "machine/intelfsh.h" -#include "machine/gba_slot.h" +#include "bus/gba/gba_slot.h" #include "sound/dac.h" #define DISPSTAT_VBL 0x0001 diff --git a/src/mess/includes/sg1000.h b/src/mess/includes/sg1000.h index a5d468fc1cd..538b07100a4 100644 --- a/src/mess/includes/sg1000.h +++ b/src/mess/includes/sg1000.h @@ -14,7 +14,7 @@ #include "machine/i8255.h" #include "machine/i8251.h" #include "machine/ram.h" -#include "machine/sega8_slot.h" +#include "bus/sega8/sega8_slot.h" #include "machine/upd765.h" #include "sound/sn76496.h" #include "video/tms9928a.h" diff --git a/src/mess/includes/sms.h b/src/mess/includes/sms.h index ad749b1bf04..7c9d8e0a637 100644 --- a/src/mess/includes/sms.h +++ b/src/mess/includes/sms.h @@ -19,9 +19,9 @@ #define CONTROL1_TAG "ctrl1" #define CONTROL2_TAG "ctrl2" -#include "machine/smsctrl.h" -#include "machine/smsexp.h" -#include "machine/sega8_slot.h" +#include "bus/sms_ctrl/smsctrl.h" +#include "bus/sms_exp/smsexp.h" +#include "bus/sega8/sega8_slot.h" class sms_state : public driver_device diff --git a/src/mess/mess.mak b/src/mess/mess.mak index 954f1befd5d..a8709f312be 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -512,6 +512,7 @@ BUSES += ISA BUSES += ISBX BUSES += KC BUSES += MIDI +BUSES += MEGADRIVE BUSES += NES BUSES += NUBUS BUSES += PCI @@ -530,6 +531,12 @@ BUSES += VIDBRAIN BUSES += VIP BUSES += WANGPC BUSES += Z88 +BUSES += SATURN +BUSES += GAMEBOY +BUSES += GBA +BUSES += SEGA8 +BUSES += SMS_CTRL +BUSES += SMS_EXP #------------------------------------------------- # this is the list of driver libraries that @@ -1499,15 +1506,10 @@ $(MESSOBJ)/nintendo.a: \ $(MESS_AUDIO)/gb.o \ $(MESS_VIDEO)/gb_lcd.o \ $(MESS_MACHINE)/gb.o \ - $(MESS_MACHINE)/gb_slot.o \ - $(MESS_MACHINE)/gb_rom.o \ - $(MESS_MACHINE)/gb_mbc.o \ $(MESS_DRIVERS)/gb.o \ $(MESS_DRIVERS)/pokemini.o \ $(MESS_DRIVERS)/vboy.o \ $(MESS_AUDIO)/vboy.o \ - $(MESS_MACHINE)/gba_slot.o \ - $(MESS_MACHINE)/gba_rom.o \ $(MESS_DRIVERS)/gba.o \ $(MESS_VIDEO)/gba.o \ @@ -1667,35 +1669,13 @@ $(MESSOBJ)/sanyo.a: \ $(MESSOBJ)/sega.a: \ $(MESS_DRIVERS)/sg1000.o \ - $(MESS_MACHINE)/md_slot.o \ - $(MESS_MACHINE)/md_rom.o \ - $(MESS_MACHINE)/md_sk.o \ - $(MESS_MACHINE)/md_eeprom.o \ - $(MESS_MACHINE)/md_jcart.o \ - $(MESS_MACHINE)/md_stm95.o \ - $(MESS_MACHINE)/md_svp.o \ $(MESS_DRIVERS)/megadriv.o \ $(MESS_DRIVERS)/segapico.o \ $(MESS_DRIVERS)/dccons.o \ $(MAME_MACHINE)/gdrom.o \ $(MESS_MACHINE)/dccons.o \ - $(MESS_MACHINE)/sat_slot.o \ - $(MESS_MACHINE)/sat_rom.o \ - $(MESS_MACHINE)/sat_dram.o \ - $(MESS_MACHINE)/sat_bram.o \ $(MESS_DRIVERS)/saturn.o \ $(MESS_MACHINE)/sms.o \ - $(MESS_MACHINE)/smsctrl.o \ - $(MESS_MACHINE)/sms_joypad.o \ - $(MESS_MACHINE)/sms_lphaser.o \ - $(MESS_MACHINE)/sms_paddle.o \ - $(MESS_MACHINE)/sms_sports.o \ - $(MESS_MACHINE)/sms_sportsjp.o \ - $(MESS_MACHINE)/sms_rfu.o \ - $(MESS_MACHINE)/sega8_slot.o \ - $(MESS_MACHINE)/sega8_rom.o \ - $(MESS_MACHINE)/smsexp.o \ - $(MESS_MACHINE)/sms_gender.o \ $(MESS_DRIVERS)/sms.o \ $(MESS_DRIVERS)/svmu.o \