diff --git a/.gitattributes b/.gitattributes index 675c944c1a9..4023f9d6d5d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1244,6 +1244,38 @@ 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/ti99_peb/bwg.c svneol=native#text/plain +src/emu/bus/ti99_peb/bwg.h svneol=native#text/plain +src/emu/bus/ti99_peb/evpc.c svneol=native#text/plain +src/emu/bus/ti99_peb/evpc.h svneol=native#text/plain +src/emu/bus/ti99_peb/hfdc.c svneol=native#text/plain +src/emu/bus/ti99_peb/hfdc.h svneol=native#text/plain +src/emu/bus/ti99_peb/horizon.c svneol=native#text/plain +src/emu/bus/ti99_peb/horizon.h svneol=native#text/plain +src/emu/bus/ti99_peb/hsgpl.c svneol=native#text/plain +src/emu/bus/ti99_peb/hsgpl.h svneol=native#text/plain +src/emu/bus/ti99_peb/memex.c svneol=native#text/plain +src/emu/bus/ti99_peb/memex.h svneol=native#text/plain +src/emu/bus/ti99_peb/myarcmem.c svneol=native#text/plain +src/emu/bus/ti99_peb/myarcmem.h svneol=native#text/plain +src/emu/bus/ti99_peb/pcode.c svneol=native#text/plain +src/emu/bus/ti99_peb/pcode.h svneol=native#text/plain +src/emu/bus/ti99_peb/peribox.c svneol=native#text/plain +src/emu/bus/ti99_peb/peribox.h svneol=native#text/plain +src/emu/bus/ti99_peb/samsmem.c svneol=native#text/plain +src/emu/bus/ti99_peb/samsmem.h svneol=native#text/plain +src/emu/bus/ti99_peb/spchsyn.c svneol=native#text/plain +src/emu/bus/ti99_peb/spchsyn.h svneol=native#text/plain +src/emu/bus/ti99_peb/ti_32kmem.c svneol=native#text/plain +src/emu/bus/ti99_peb/ti_32kmem.h svneol=native#text/plain +src/emu/bus/ti99_peb/ti_fdc.c svneol=native#text/plain +src/emu/bus/ti99_peb/ti_fdc.h svneol=native#text/plain +src/emu/bus/ti99_peb/ti_rs232.c svneol=native#text/plain +src/emu/bus/ti99_peb/ti_rs232.h svneol=native#text/plain +src/emu/bus/ti99_peb/tn_ide.c svneol=native#text/plain +src/emu/bus/ti99_peb/tn_ide.h svneol=native#text/plain +src/emu/bus/ti99_peb/tn_usbsm.c svneol=native#text/plain +src/emu/bus/ti99_peb/tn_usbsm.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 @@ -8549,12 +8581,8 @@ src/mess/machine/ti99/990_hd.c svneol=native#text/plain src/mess/machine/ti99/990_hd.h svneol=native#text/plain src/mess/machine/ti99/990_tap.c svneol=native#text/plain src/mess/machine/ti99/990_tap.h svneol=native#text/plain -src/mess/machine/ti99/bwg.c svneol=native#text/plain -src/mess/machine/ti99/bwg.h svneol=native#text/plain src/mess/machine/ti99/datamux.c svneol=native#text/plain src/mess/machine/ti99/datamux.h svneol=native#text/plain -src/mess/machine/ti99/evpc.c svneol=native#text/plain -src/mess/machine/ti99/evpc.h svneol=native#text/plain src/mess/machine/ti99/genboard.c svneol=native#text/plain src/mess/machine/ti99/genboard.h svneol=native#text/plain src/mess/machine/ti99/grom.c svneol=native#text/plain @@ -8563,47 +8591,19 @@ src/mess/machine/ti99/gromport.c svneol=native#text/plain src/mess/machine/ti99/gromport.h svneol=native#text/plain src/mess/machine/ti99/handset.c svneol=native#text/plain src/mess/machine/ti99/handset.h svneol=native#text/plain -src/mess/machine/ti99/hfdc.c svneol=native#text/plain -src/mess/machine/ti99/hfdc.h svneol=native#text/plain -src/mess/machine/ti99/horizon.c svneol=native#text/plain -src/mess/machine/ti99/horizon.h svneol=native#text/plain -src/mess/machine/ti99/hsgpl.c svneol=native#text/plain -src/mess/machine/ti99/hsgpl.h svneol=native#text/plain src/mess/machine/ti99/joyport.c svneol=native#text/plain src/mess/machine/ti99/joyport.h svneol=native#text/plain src/mess/machine/ti99/mapper8.c svneol=native#text/plain src/mess/machine/ti99/mapper8.h svneol=native#text/plain src/mess/machine/ti99/mecmouse.c svneol=native#text/plain src/mess/machine/ti99/mecmouse.h svneol=native#text/plain -src/mess/machine/ti99/memex.c svneol=native#text/plain -src/mess/machine/ti99/memex.h svneol=native#text/plain -src/mess/machine/ti99/myarcmem.c svneol=native#text/plain -src/mess/machine/ti99/myarcmem.h svneol=native#text/plain -src/mess/machine/ti99/p_code.c svneol=native#text/plain -src/mess/machine/ti99/p_code.h svneol=native#text/plain -src/mess/machine/ti99/peribox.c svneol=native#text/plain -src/mess/machine/ti99/peribox.h svneol=native#text/plain -src/mess/machine/ti99/samsmem.c svneol=native#text/plain -src/mess/machine/ti99/samsmem.h svneol=native#text/plain -src/mess/machine/ti99/spchsyn.c svneol=native#text/plain -src/mess/machine/ti99/spchsyn.h svneol=native#text/plain src/mess/machine/ti99/speech8.c svneol=native#text/plain src/mess/machine/ti99/speech8.h svneol=native#text/plain -src/mess/machine/ti99/ti32kmem.c svneol=native#text/plain -src/mess/machine/ti99/ti32kmem.h svneol=native#text/plain src/mess/machine/ti99/ti990.c svneol=native#text/plain src/mess/machine/ti99/ti990.h svneol=native#text/plain src/mess/machine/ti99/ti99_hd.c svneol=native#text/plain src/mess/machine/ti99/ti99_hd.h svneol=native#text/plain src/mess/machine/ti99/ti99defs.h svneol=native#text/plain -src/mess/machine/ti99/ti_fdc.c svneol=native#text/plain -src/mess/machine/ti99/ti_fdc.h svneol=native#text/plain -src/mess/machine/ti99/ti_rs232.c svneol=native#text/plain -src/mess/machine/ti99/ti_rs232.h svneol=native#text/plain -src/mess/machine/ti99/tn_ide.c svneol=native#text/plain -src/mess/machine/ti99/tn_ide.h svneol=native#text/plain -src/mess/machine/ti99/tn_usbsm.c svneol=native#text/plain -src/mess/machine/ti99/tn_usbsm.h svneol=native#text/plain src/mess/machine/ti99/videowrp.c svneol=native#text/plain src/mess/machine/ti99/videowrp.h svneol=native#text/plain src/mess/machine/trs80.c svneol=native#text/plain diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak index efe3c5fcc25..5f88e66e292 100644 --- a/src/emu/bus/bus.mak +++ b/src/emu/bus/bus.mak @@ -884,6 +884,31 @@ BUSOBJS += $(BUSOBJ)/sms_exp/smsexp.o BUSOBJS += $(BUSOBJ)/sms_exp/gender.o endif +#------------------------------------------------- +# +#@src/emu/bus/ti99_peb/peribox.h,BUSES += TI99PEB +#------------------------------------------------- + +ifneq ($(filter TI99PEB,$(BUSES)),) +OBJDIRS += $(BUSOBJ)/ti99_peb +BUSOBJS += $(BUSOBJ)/ti99_peb/peribox.o +BUSOBJS += $(BUSOBJ)/ti99_peb/bwg.o +BUSOBJS += $(BUSOBJ)/ti99_peb/evpc.o +BUSOBJS += $(BUSOBJ)/ti99_peb/hfdc.o +BUSOBJS += $(BUSOBJ)/ti99_peb/horizon.o +BUSOBJS += $(BUSOBJ)/ti99_peb/hsgpl.o +BUSOBJS += $(BUSOBJ)/ti99_peb/memex.o +BUSOBJS += $(BUSOBJ)/ti99_peb/myarcmem.o +BUSOBJS += $(BUSOBJ)/ti99_peb/pcode.o +BUSOBJS += $(BUSOBJ)/ti99_peb/samsmem.o +BUSOBJS += $(BUSOBJ)/ti99_peb/spchsyn.o +BUSOBJS += $(BUSOBJ)/ti99_peb/ti_32kmem.o +BUSOBJS += $(BUSOBJ)/ti99_peb/ti_fdc.o +BUSOBJS += $(BUSOBJ)/ti99_peb/ti_rs232.o +BUSOBJS += $(BUSOBJ)/ti99_peb/tn_ide.o +BUSOBJS += $(BUSOBJ)/ti99_peb/tn_usbsm.o +endif + #------------------------------------------------- # #@src/emu/bus/gameboy/gb_slot.h,BUSES += GAMEBOY diff --git a/src/mess/machine/ti99/bwg.c b/src/emu/bus/ti99_peb/bwg.c similarity index 100% rename from src/mess/machine/ti99/bwg.c rename to src/emu/bus/ti99_peb/bwg.c diff --git a/src/mess/machine/ti99/bwg.h b/src/emu/bus/ti99_peb/bwg.h similarity index 99% rename from src/mess/machine/ti99/bwg.h rename to src/emu/bus/ti99_peb/bwg.h index a3c6a74208f..d534acbc280 100644 --- a/src/mess/machine/ti99/bwg.h +++ b/src/emu/bus/ti99_peb/bwg.h @@ -14,7 +14,6 @@ #ifndef __BWG__ #define __BWG__ -#include "ti99defs.h" #include "imagedev/flopdrv.h" #include "machine/mm58274c.h" #include "machine/wd_fdc.h" diff --git a/src/mess/machine/ti99/evpc.c b/src/emu/bus/ti99_peb/evpc.c similarity index 100% rename from src/mess/machine/ti99/evpc.c rename to src/emu/bus/ti99_peb/evpc.c diff --git a/src/mess/machine/ti99/evpc.h b/src/emu/bus/ti99_peb/evpc.h similarity index 98% rename from src/mess/machine/ti99/evpc.h rename to src/emu/bus/ti99_peb/evpc.h index 267e7023078..be21baebd23 100644 --- a/src/mess/machine/ti99/evpc.h +++ b/src/emu/bus/ti99_peb/evpc.h @@ -16,7 +16,6 @@ #define __EVPC__ #include "emu.h" -#include "ti99defs.h" #include "peribox.h" extern const device_type TI99_EVPC; diff --git a/src/mess/machine/ti99/hfdc.c b/src/emu/bus/ti99_peb/hfdc.c similarity index 100% rename from src/mess/machine/ti99/hfdc.c rename to src/emu/bus/ti99_peb/hfdc.c diff --git a/src/mess/machine/ti99/hfdc.h b/src/emu/bus/ti99_peb/hfdc.h similarity index 98% rename from src/mess/machine/ti99/hfdc.h rename to src/emu/bus/ti99_peb/hfdc.h index 7c73372e446..bff741b45bd 100644 --- a/src/mess/machine/ti99/hfdc.h +++ b/src/emu/bus/ti99_peb/hfdc.h @@ -16,8 +16,7 @@ #include "emu.h" #include "peribox.h" -#include "ti99defs.h" -#include "ti99_hd.h" +#include "machine/ti99/ti99_hd.h" #include "machine/smc92x4.h" #include "machine/mm58274c.h" diff --git a/src/mess/machine/ti99/horizon.c b/src/emu/bus/ti99_peb/horizon.c similarity index 100% rename from src/mess/machine/ti99/horizon.c rename to src/emu/bus/ti99_peb/horizon.c diff --git a/src/mess/machine/ti99/horizon.h b/src/emu/bus/ti99_peb/horizon.h similarity index 98% rename from src/mess/machine/ti99/horizon.h rename to src/emu/bus/ti99_peb/horizon.h index 9e31633f38d..eadc3acc7a7 100644 --- a/src/mess/machine/ti99/horizon.h +++ b/src/emu/bus/ti99_peb/horizon.h @@ -16,7 +16,6 @@ #include "emu.h" #include "peribox.h" -#include "ti99defs.h" extern const device_type TI99_HORIZON; diff --git a/src/mess/machine/ti99/hsgpl.c b/src/emu/bus/ti99_peb/hsgpl.c similarity index 100% rename from src/mess/machine/ti99/hsgpl.c rename to src/emu/bus/ti99_peb/hsgpl.c diff --git a/src/mess/machine/ti99/hsgpl.h b/src/emu/bus/ti99_peb/hsgpl.h similarity index 99% rename from src/mess/machine/ti99/hsgpl.h rename to src/emu/bus/ti99_peb/hsgpl.h index e191d8e99b7..5d596116066 100644 --- a/src/mess/machine/ti99/hsgpl.h +++ b/src/emu/bus/ti99_peb/hsgpl.h @@ -17,7 +17,6 @@ #define __HSGPL__ #include "emu.h" -#include "ti99defs.h" #include "peribox.h" #include "machine/at29040a.h" diff --git a/src/mess/machine/ti99/memex.c b/src/emu/bus/ti99_peb/memex.c similarity index 100% rename from src/mess/machine/ti99/memex.c rename to src/emu/bus/ti99_peb/memex.c diff --git a/src/mess/machine/ti99/memex.h b/src/emu/bus/ti99_peb/memex.h similarity index 98% rename from src/mess/machine/ti99/memex.h rename to src/emu/bus/ti99_peb/memex.h index e242008ae4b..9ff6e78d1e0 100644 --- a/src/mess/machine/ti99/memex.h +++ b/src/emu/bus/ti99_peb/memex.h @@ -14,7 +14,6 @@ #define __MEMEXMEM__ #include "emu.h" -#include "ti99defs.h" #include "peribox.h" extern const device_type TI99_MEMEX; diff --git a/src/mess/machine/ti99/myarcmem.c b/src/emu/bus/ti99_peb/myarcmem.c similarity index 100% rename from src/mess/machine/ti99/myarcmem.c rename to src/emu/bus/ti99_peb/myarcmem.c diff --git a/src/mess/machine/ti99/myarcmem.h b/src/emu/bus/ti99_peb/myarcmem.h similarity index 98% rename from src/mess/machine/ti99/myarcmem.h rename to src/emu/bus/ti99_peb/myarcmem.h index e4da6123ea5..81c92ac634f 100644 --- a/src/mess/machine/ti99/myarcmem.h +++ b/src/emu/bus/ti99_peb/myarcmem.h @@ -15,7 +15,6 @@ #include "emu.h" #include "peribox.h" -#include "ti99defs.h" extern const device_type TI99_MYARCMEM; diff --git a/src/mess/machine/ti99/p_code.c b/src/emu/bus/ti99_peb/pcode.c similarity index 99% rename from src/mess/machine/ti99/p_code.c rename to src/emu/bus/ti99_peb/pcode.c index 858d9b61b70..e1feba986c0 100644 --- a/src/mess/machine/ti99/p_code.c +++ b/src/emu/bus/ti99_peb/pcode.c @@ -72,7 +72,7 @@ *****************************************************************************/ -#include "p_code.h" +#include "pcode.h" #define PCODE_GROM_TAG "pcode_grom" #define PCODE_ROM_TAG "pcode_rom" diff --git a/src/mess/machine/ti99/p_code.h b/src/emu/bus/ti99_peb/pcode.h similarity index 97% rename from src/mess/machine/ti99/p_code.h rename to src/emu/bus/ti99_peb/pcode.h index 3bb1d0956fe..52018fbd2f0 100644 --- a/src/mess/machine/ti99/p_code.h +++ b/src/emu/bus/ti99_peb/pcode.h @@ -17,7 +17,7 @@ #include "emu.h" #include "peribox.h" -#include "grom.h" +#include "machine/ti99/grom.h" extern const device_type TI99_P_CODE; diff --git a/src/mess/machine/ti99/peribox.c b/src/emu/bus/ti99_peb/peribox.c similarity index 99% rename from src/mess/machine/ti99/peribox.c rename to src/emu/bus/ti99_peb/peribox.c index 2e477544afb..631b1c5bee9 100644 --- a/src/mess/machine/ti99/peribox.c +++ b/src/emu/bus/ti99_peb/peribox.c @@ -179,12 +179,15 @@ CRUCLK* 51||52 DBIN #include "emu.h" #include "peribox.h" +// MFM hard drives +#include "machine/ti99/ti99_hd.h" + // The cards -#include "ti32kmem.h" +#include "ti_32kmem.h" #include "ti_fdc.h" #include "bwg.h" #include "hfdc.h" -#include "p_code.h" +#include "pcode.h" #include "myarcmem.h" #include "samsmem.h" #include "tn_ide.h" @@ -196,8 +199,12 @@ CRUCLK* 51||52 DBIN #include "memex.h" #include "horizon.h" +// Disk formats #include "formats/ti99_dsk.h" +/* + Debugging flags. Set to 0 or 1. +*/ // Show interrupt line activity #define TRACE_INT 0 diff --git a/src/mess/machine/ti99/peribox.h b/src/emu/bus/ti99_peb/peribox.h similarity index 99% rename from src/mess/machine/ti99/peribox.h rename to src/emu/bus/ti99_peb/peribox.h index c952b4bd935..22ae92ff11d 100644 --- a/src/mess/machine/ti99/peribox.h +++ b/src/emu/bus/ti99_peb/peribox.h @@ -14,7 +14,7 @@ #ifndef __PBOX__ #define __PBOX__ -#include "ti99defs.h" +#include "machine/ti99/ti99defs.h" extern const device_type PERIBOX; extern const device_type PERIBOX_SLOT; diff --git a/src/mess/machine/ti99/samsmem.c b/src/emu/bus/ti99_peb/samsmem.c similarity index 100% rename from src/mess/machine/ti99/samsmem.c rename to src/emu/bus/ti99_peb/samsmem.c diff --git a/src/mess/machine/ti99/samsmem.h b/src/emu/bus/ti99_peb/samsmem.h similarity index 97% rename from src/mess/machine/ti99/samsmem.h rename to src/emu/bus/ti99_peb/samsmem.h index 4f3834b10c0..0662e007377 100644 --- a/src/mess/machine/ti99/samsmem.h +++ b/src/emu/bus/ti99_peb/samsmem.h @@ -17,7 +17,6 @@ #include "emu.h" #include "peribox.h" -#include "ti99defs.h" extern const device_type TI99_SAMSMEM; diff --git a/src/mess/machine/ti99/spchsyn.c b/src/emu/bus/ti99_peb/spchsyn.c similarity index 100% rename from src/mess/machine/ti99/spchsyn.c rename to src/emu/bus/ti99_peb/spchsyn.c diff --git a/src/mess/machine/ti99/spchsyn.h b/src/emu/bus/ti99_peb/spchsyn.h similarity index 100% rename from src/mess/machine/ti99/spchsyn.h rename to src/emu/bus/ti99_peb/spchsyn.h diff --git a/src/mess/machine/ti99/ti32kmem.c b/src/emu/bus/ti99_peb/ti_32kmem.c similarity index 99% rename from src/mess/machine/ti99/ti32kmem.c rename to src/emu/bus/ti99_peb/ti_32kmem.c index 7664927936c..54909559c58 100644 --- a/src/mess/machine/ti99/ti32kmem.c +++ b/src/emu/bus/ti99_peb/ti_32kmem.c @@ -27,7 +27,7 @@ #include "emu.h" #include "peribox.h" -#include "ti32kmem.h" +#include "ti_32kmem.h" #define RAMREGION "ram" diff --git a/src/mess/machine/ti99/ti32kmem.h b/src/emu/bus/ti99_peb/ti_32kmem.h similarity index 97% rename from src/mess/machine/ti99/ti32kmem.h rename to src/emu/bus/ti99_peb/ti_32kmem.h index 34fe8dd2a12..adb8ec26adc 100644 --- a/src/mess/machine/ti99/ti32kmem.h +++ b/src/emu/bus/ti99_peb/ti_32kmem.h @@ -14,8 +14,6 @@ #ifndef __TI32K__ #define __TI32K__ -#include "ti99defs.h" - extern const device_type TI_32KMEM; class ti_32k_expcard_device : public ti_expansion_card_device diff --git a/src/mess/machine/ti99/ti_fdc.c b/src/emu/bus/ti99_peb/ti_fdc.c similarity index 100% rename from src/mess/machine/ti99/ti_fdc.c rename to src/emu/bus/ti99_peb/ti_fdc.c diff --git a/src/mess/machine/ti99/ti_fdc.h b/src/emu/bus/ti99_peb/ti_fdc.h similarity index 99% rename from src/mess/machine/ti99/ti_fdc.h rename to src/emu/bus/ti99_peb/ti_fdc.h index e659729eab5..03e75361155 100644 --- a/src/mess/machine/ti99/ti_fdc.h +++ b/src/emu/bus/ti99_peb/ti_fdc.h @@ -14,7 +14,6 @@ #ifndef __TIFDC__ #define __TIFDC__ -#include "ti99defs.h" #include "machine/wd_fdc.h" #include "imagedev/floppy.h" diff --git a/src/mess/machine/ti99/ti_rs232.c b/src/emu/bus/ti99_peb/ti_rs232.c similarity index 100% rename from src/mess/machine/ti99/ti_rs232.c rename to src/emu/bus/ti99_peb/ti_rs232.c diff --git a/src/mess/machine/ti99/ti_rs232.h b/src/emu/bus/ti99_peb/ti_rs232.h similarity index 99% rename from src/mess/machine/ti99/ti_rs232.h rename to src/emu/bus/ti99_peb/ti_rs232.h index 5785d7e3701..7e3077a27e5 100644 --- a/src/mess/machine/ti99/ti_rs232.h +++ b/src/emu/bus/ti99_peb/ti_rs232.h @@ -15,7 +15,6 @@ #include "emu.h" #include "peribox.h" -#include "ti99defs.h" #include "machine/tms9902.h" extern const device_type TI99_RS232; diff --git a/src/mess/machine/ti99/tn_ide.c b/src/emu/bus/ti99_peb/tn_ide.c similarity index 99% rename from src/mess/machine/ti99/tn_ide.c rename to src/emu/bus/ti99_peb/tn_ide.c index 964b3814714..6a693c31f63 100644 --- a/src/mess/machine/ti99/tn_ide.c +++ b/src/emu/bus/ti99_peb/tn_ide.c @@ -31,7 +31,7 @@ #include "peribox.h" #include "machine/ataintf.h" #include "tn_ide.h" -#include "ti99_hd.h" +#include "machine/ti99/ti99_hd.h" #define CRU_BASE 0x1000 diff --git a/src/mess/machine/ti99/tn_ide.h b/src/emu/bus/ti99_peb/tn_ide.h similarity index 98% rename from src/mess/machine/ti99/tn_ide.h rename to src/emu/bus/ti99_peb/tn_ide.h index 0e6cb0e62a7..6b873983bee 100644 --- a/src/mess/machine/ti99/tn_ide.h +++ b/src/emu/bus/ti99_peb/tn_ide.h @@ -15,7 +15,6 @@ #define __TNIDE__ #include "emu.h" -#include "ti99defs.h" #include "machine/ataintf.h" #include "machine/rtc65271.h" diff --git a/src/mess/machine/ti99/tn_usbsm.c b/src/emu/bus/ti99_peb/tn_usbsm.c similarity index 100% rename from src/mess/machine/ti99/tn_usbsm.c rename to src/emu/bus/ti99_peb/tn_usbsm.c diff --git a/src/mess/machine/ti99/tn_usbsm.h b/src/emu/bus/ti99_peb/tn_usbsm.h similarity index 98% rename from src/mess/machine/ti99/tn_usbsm.h rename to src/emu/bus/ti99_peb/tn_usbsm.h index 05cedd05585..453ef202944 100644 --- a/src/mess/machine/ti99/tn_usbsm.h +++ b/src/emu/bus/ti99_peb/tn_usbsm.h @@ -15,7 +15,6 @@ #define __USBSMART__ #include "emu.h" -#include "ti99defs.h" #include "peribox.h" #include "machine/smartmed.h" #include "machine/strata.h" diff --git a/src/mess/drivers/geneve.c b/src/mess/drivers/geneve.c index 672070a7fbb..74256bde3dc 100644 --- a/src/mess/drivers/geneve.c +++ b/src/mess/drivers/geneve.c @@ -210,7 +210,7 @@ #include "sound/sn76496.h" #include "machine/ti99/genboard.h" -#include "machine/ti99/peribox.h" +#include "bus/ti99_peb/peribox.h" #include "machine/ti99/videowrp.h" #include "machine/ti99/joyport.h" diff --git a/src/mess/drivers/ti99_2.c b/src/mess/drivers/ti99_2.c index b2c914f876d..9a3f6097bdf 100644 --- a/src/mess/drivers/ti99_2.c +++ b/src/mess/drivers/ti99_2.c @@ -81,6 +81,11 @@ would just have taken three extra tracks on the main board and a OR gate in an A #include "machine/tms9901.h" #include "cpu/tms9900/tms9995.h" +// FIXME: The following includes are here for the sole purpose of forcing the linker to include the specified objects +#include "machine/smc92x4.h" +#include "machine/ti99/ti99_hd.h" +#include "machine/strata.h" + class ti99_2_state : public driver_device { public: @@ -89,7 +94,11 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_dummy1(*this, "linkingdummy1"), + m_dummy2(*this, "linkingdummy2"), + m_dummy3(*this, "linkingdummy3") + { } required_shared_ptr m_videoram; int m_ROM_paged; @@ -107,6 +116,9 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + optional_device m_dummy1; + optional_device m_dummy2; + optional_device m_dummy3; }; diff --git a/src/mess/drivers/ti99_4p.c b/src/mess/drivers/ti99_4p.c index 9ef0c4ff9f2..301a8fa7030 100644 --- a/src/mess/drivers/ti99_4p.c +++ b/src/mess/drivers/ti99_4p.c @@ -43,11 +43,9 @@ #include "sound/dac.h" #include "machine/tms9901.h" -#include "machine/ti99/peribox.h" - #include "imagedev/cassette.h" #include "machine/ti99/videowrp.h" -#include "machine/ti99/peribox.h" +#include "bus/ti99_peb/peribox.h" #include "machine/ti99/joyport.h" #define TMS9901_TAG "tms9901" diff --git a/src/mess/drivers/ti99_4x.c b/src/mess/drivers/ti99_4x.c index e585de47565..9ca3fe65877 100644 --- a/src/mess/drivers/ti99_4x.c +++ b/src/mess/drivers/ti99_4x.c @@ -51,7 +51,7 @@ #include "machine/ti99/grom.h" #include "machine/ti99/gromport.h" #include "machine/ti99/joyport.h" -#include "machine/ti99/peribox.h" +#include "bus/ti99_peb/peribox.h" // Debugging #define TRACE_READY 0 diff --git a/src/mess/drivers/ti99_8.c b/src/mess/drivers/ti99_8.c index fabe87a52ef..4f2c60fd988 100644 --- a/src/mess/drivers/ti99_8.c +++ b/src/mess/drivers/ti99_8.c @@ -208,7 +208,7 @@ Known Issues (MZ, 2010-11-07) #include "machine/ti99/videowrp.h" #include "machine/ti99/speech8.h" -#include "machine/ti99/peribox.h" +#include "bus/ti99_peb/peribox.h" #include "machine/ti99/mapper8.h" #include "machine/ti99/grom.h" #include "machine/ti99/gromport.h" diff --git a/src/mess/machine/ti99/mapper8.h b/src/mess/machine/ti99/mapper8.h index 6c8feaf8ea2..1662c638cac 100644 --- a/src/mess/machine/ti99/mapper8.h +++ b/src/mess/machine/ti99/mapper8.h @@ -16,7 +16,6 @@ #define __MAPPER8__ #include "emu.h" -#include "peribox.h" #include "ti99defs.h" extern const device_type MAINBOARD8; diff --git a/src/mess/mess.mak b/src/mess/mess.mak index c057d76a802..088cd53aa93 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -563,6 +563,7 @@ BUSES += SEGA8 BUSES += SMS_CTRL BUSES += SMS_EXP BUSES += SNES +BUSES += TI99PEB BUSES += TVC BUSES += VCS BUSES += VIC10 @@ -1857,26 +1858,10 @@ $(MESSOBJ)/ti.a: \ $(MESS_MACHINE)/ti99/joyport.o \ $(MESS_MACHINE)/ti99/mecmouse.o \ $(MESS_MACHINE)/ti99/handset.o \ - $(MESS_MACHINE)/ti99/peribox.o \ - $(MESS_MACHINE)/ti99/ti32kmem.o \ - $(MESS_MACHINE)/ti99/ti_fdc.o \ - $(MESS_MACHINE)/ti99/bwg.o \ - $(MESS_MACHINE)/ti99/hfdc.o \ $(MESS_MACHINE)/ti99/ti99_hd.o \ - $(MESS_MACHINE)/ti99/p_code.o \ - $(MESS_MACHINE)/ti99/myarcmem.o \ - $(MESS_MACHINE)/ti99/samsmem.o \ - $(MESS_MACHINE)/ti99/tn_ide.o \ - $(MESS_MACHINE)/ti99/tn_usbsm.o \ - $(MESS_MACHINE)/ti99/evpc.o \ - $(MESS_MACHINE)/ti99/hsgpl.o\ - $(MESS_MACHINE)/ti99/ti_rs232.o \ - $(MESS_MACHINE)/ti99/spchsyn.o \ $(MESS_MACHINE)/ti99/speech8.o \ $(MESS_MACHINE)/ti99/mapper8.o \ $(MESS_MACHINE)/ti99/genboard.o \ - $(MESS_MACHINE)/ti99/memex.o \ - $(MESS_MACHINE)/ti99/horizon.o \ $(MESS_DRIVERS)/ti990_4.o \ $(MESS_DRIVERS)/ti99_4x.o \ $(MESS_DRIVERS)/ti99_4p.o \