From 3820999e15839e134c20776f0eea76b9222ce88b Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Fri, 10 Jan 2014 22:50:51 +0000 Subject: [PATCH] (MESS) Moved files to emu/bus. (nw) --- .gitattributes | 10 +- src/emu/bus/bus.mak | 12 ++ .../machine => emu/bus/centronics}/comxpl80.c | 0 .../machine => emu/bus/centronics}/comxpl80.h | 0 src/emu/bus/ieee488/softbox.c | 11 ++ src/emu/bus/ieee488/softbox.h | 1 + .../machine => emu/bus/imi7000}/imi5000h.c | 19 +-- .../machine => emu/bus/imi7000}/imi5000h.h | 13 +- src/emu/bus/imi7000/imi7000.c | 104 ++++++++++++++ src/emu/bus/imi7000/imi7000.h | 135 ++++++++++++++++++ src/emu/emu.mak | 1 + src/mess/drivers/softbox.c | 3 +- src/mess/includes/comx35.h | 1 - src/mess/includes/softbox.h | 4 +- src/mess/mess.mak | 74 ++++++---- 15 files changed, 335 insertions(+), 53 deletions(-) rename src/{mess/machine => emu/bus/centronics}/comxpl80.c (100%) rename src/{mess/machine => emu/bus/centronics}/comxpl80.h (100%) rename src/{mess/machine => emu/bus/imi7000}/imi5000h.c (96%) rename src/{mess/machine => emu/bus/imi7000}/imi5000h.h (87%) create mode 100644 src/emu/bus/imi7000/imi7000.c create mode 100644 src/emu/bus/imi7000/imi7000.h diff --git a/.gitattributes b/.gitattributes index 501ecfb7b31..5eee4736a2c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -646,6 +646,8 @@ src/emu/bus/cbmiec/interpod.c svneol=native#text/plain src/emu/bus/cbmiec/interpod.h svneol=native#text/plain src/emu/bus/cbmiec/serialbox.c svneol=native#text/plain src/emu/bus/cbmiec/serialbox.h svneol=native#text/plain +src/emu/bus/centronics/comxpl80.c svneol=native#text/plain +src/emu/bus/centronics/comxpl80.h svneol=native#text/plain src/emu/bus/centronics/covox.c svneol=native#text/plain src/emu/bus/centronics/covox.h svneol=native#text/plain src/emu/bus/centronics/ctronics.c svneol=native#text/plain @@ -698,6 +700,10 @@ src/emu/bus/ieee488/shark.c svneol=native#text/plain src/emu/bus/ieee488/shark.h svneol=native#text/plain src/emu/bus/ieee488/softbox.c svneol=native#text/plain src/emu/bus/ieee488/softbox.h svneol=native#text/plain +src/emu/bus/imi7000/imi5000h.c svneol=native#text/plain +src/emu/bus/imi7000/imi5000h.h svneol=native#text/plain +src/emu/bus/imi7000/imi7000.c svneol=native#text/plain +src/emu/bus/imi7000/imi7000.h svneol=native#text/plain src/emu/bus/iq151/disc2.c svneol=native#text/plain src/emu/bus/iq151/disc2.h svneol=native#text/plain src/emu/bus/iq151/grafik.c svneol=native#text/plain @@ -7841,8 +7847,6 @@ src/mess/machine/coleco.c svneol=native#text/plain src/mess/machine/coleco.h svneol=native#text/plain src/mess/machine/compiskb.c svneol=native#text/plain src/mess/machine/compiskb.h svneol=native#text/plain -src/mess/machine/comxpl80.c svneol=native#text/plain -src/mess/machine/comxpl80.h svneol=native#text/plain src/mess/machine/concept.c svneol=native#text/plain src/mess/machine/concept_exp.c svneol=native#text/plain src/mess/machine/concept_exp.h svneol=native#text/plain @@ -7922,8 +7926,6 @@ src/mess/machine/i82439tx.c svneol=native#text/plain src/mess/machine/i82439tx.h svneol=native#text/plain src/mess/machine/i8271.c svneol=native#text/plain src/mess/machine/i8271.h svneol=native#text/plain -src/mess/machine/imi5000h.c svneol=native#text/plain -src/mess/machine/imi5000h.h svneol=native#text/plain src/mess/machine/intv.c svneol=native#text/plain src/mess/machine/isa.c svneol=native#text/plain src/mess/machine/isa.h svneol=native#text/plain diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak index d6fe525c16e..c420e5f957a 100644 --- a/src/emu/bus/bus.mak +++ b/src/emu/bus/bus.mak @@ -277,6 +277,17 @@ BUSOBJS += $(BUSOBJ)/iq151/video64.o endif +#------------------------------------------------- +# +#@src/emu/bus/isbx/isbx.h,BUSES += IMI7000 +#------------------------------------------------- + +ifneq ($(filter IMI7000,$(BUSES)),) +BUSOBJS += $(BUSOBJ)/imi7000/imi7000.o +BUSOBJS += $(BUSOBJ)/imi7000/imi5000h.o +endif + + #------------------------------------------------- # #@src/emu/bus/isbx/isbx.h,BUSES += ISBX @@ -560,5 +571,6 @@ endif ifneq ($(filter CENTRONICS,$(BUSES)),) BUSOBJS += $(BUSOBJ)/centronics/ctronics.o +BUSOBJS += $(BUSOBJ)/centronics/comxpl80.o BUSOBJS += $(BUSOBJ)/centronics/covox.o endif diff --git a/src/mess/machine/comxpl80.c b/src/emu/bus/centronics/comxpl80.c similarity index 100% rename from src/mess/machine/comxpl80.c rename to src/emu/bus/centronics/comxpl80.c diff --git a/src/mess/machine/comxpl80.h b/src/emu/bus/centronics/comxpl80.h similarity index 100% rename from src/mess/machine/comxpl80.h rename to src/emu/bus/centronics/comxpl80.h diff --git a/src/emu/bus/ieee488/softbox.c b/src/emu/bus/ieee488/softbox.c index 847ad3cafae..b9034c2009a 100644 --- a/src/emu/bus/ieee488/softbox.c +++ b/src/emu/bus/ieee488/softbox.c @@ -255,6 +255,14 @@ static I8255A_INTERFACE( ppi1_intf ) }; +static DEVICE_INPUT_DEFAULTS_START( terminal ) + DEVICE_INPUT_DEFAULTS( "TERM_BAUD", 0xff, 0x06 ) // 9600 + DEVICE_INPUT_DEFAULTS( "TERM_DATABITS", 0xff, 0x02 ) // 7 + DEVICE_INPUT_DEFAULTS( "TERM_PARITY", 0xff, 0x02 ) // E + DEVICE_INPUT_DEFAULTS( "TERM_STOPBITS", 0xff, 0x00 ) // 1 +DEVICE_INPUT_DEFAULTS_END + + //------------------------------------------------- // MACHINE_CONFIG_FRAGMENT( softbox ) //------------------------------------------------- @@ -277,6 +285,9 @@ static MACHINE_CONFIG_FRAGMENT( softbox ) MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL) MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rx)) MCFG_RS232_OUT_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) + //MCFG_IMI7000_BUS_ADD("imi5000h", NULL, NULL, NULL) + + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) MACHINE_CONFIG_END diff --git a/src/emu/bus/ieee488/softbox.h b/src/emu/bus/ieee488/softbox.h index f72f7ea0f83..3f7bb21f80f 100644 --- a/src/emu/bus/ieee488/softbox.h +++ b/src/emu/bus/ieee488/softbox.h @@ -16,6 +16,7 @@ #include "emu.h" #include "ieee488.h" +#include "bus/imi7000/imi7000.h" #include "cpu/z80/z80.h" #include "imagedev/harddriv.h" #include "includes/corvushd.h" diff --git a/src/mess/machine/imi5000h.c b/src/emu/bus/imi7000/imi5000h.c similarity index 96% rename from src/mess/machine/imi5000h.c rename to src/emu/bus/imi7000/imi5000h.c index 5a6a284bc63..383de8c2401 100644 --- a/src/mess/machine/imi5000h.c +++ b/src/emu/bus/imi7000/imi5000h.c @@ -397,6 +397,8 @@ static MACHINE_CONFIG_FRAGMENT( imi5000h ) MCFG_Z80PIO_ADD(Z80PIO_0_TAG, XTAL_8MHz/2, pio0_intf) MCFG_Z80PIO_ADD(Z80PIO_2_TAG, XTAL_8MHz/2, pio2_intf) MCFG_Z80PIO_ADD(Z80PIO_3_TAG, XTAL_8MHz/2, pio3_intf) + + //MCFG_HARDDISK_ADD("harddisk1") MACHINE_CONFIG_END @@ -465,14 +467,15 @@ ioport_constructor imi5000h_device::device_input_ports() const // imi5000h_device - constructor //------------------------------------------------- -imi5000h_device::imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, IMI5000H, "IMI 5000H", tag, owner, clock, "imi5000h", __FILE__), - m_maincpu(*this, Z80_TAG), - m_ctc(*this, Z80CTC_TAG), - m_lsi11(*this, "LSI-11"), - m_mux(*this, "MUX"), - m_format(*this, "FORMAT"), - m_ub4(*this, "UB4") +imi5000h_device::imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, IMI5000H, "IMI 5000H", tag, owner, clock, "imi5000h", __FILE__), + device_imi7000_interface(mconfig, *this), + m_maincpu(*this, Z80_TAG), + m_ctc(*this, Z80CTC_TAG), + m_lsi11(*this, "LSI-11"), + m_mux(*this, "MUX"), + m_format(*this, "FORMAT"), + m_ub4(*this, "UB4") { } diff --git a/src/mess/machine/imi5000h.h b/src/emu/bus/imi7000/imi5000h.h similarity index 87% rename from src/mess/machine/imi5000h.h rename to src/emu/bus/imi7000/imi5000h.h index 9917cf63e19..8b313cc3a03 100644 --- a/src/mess/machine/imi5000h.h +++ b/src/emu/bus/imi7000/imi5000h.h @@ -17,6 +17,7 @@ #define __IMI5000H__ #include "emu.h" +#include "imi7000.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" #include "machine/z80ctc.h" @@ -24,22 +25,14 @@ -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_IMI5000H_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, IMI5000H, 0) - - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** // ======================> imi5000h_device -class imi5000h_device : public device_t +class imi5000h_device : public device_t, + public device_imi7000_interface { public: // construction/destruction diff --git a/src/emu/bus/imi7000/imi7000.c b/src/emu/bus/imi7000/imi7000.c new file mode 100644 index 00000000000..b974dd9a29e --- /dev/null +++ b/src/emu/bus/imi7000/imi7000.c @@ -0,0 +1,104 @@ +// license:BSD-3-Clause +// copyright-holders:Curt Coder +/********************************************************************** + + International Memories Incorporated IMI 7000 Series bus emulation + + Copyright MESS Team. + Visit http://mamedev.org for licensing and usage restrictions. + +**********************************************************************/ + +#include "imi7000.h" + + + +//************************************************************************** +// MACROS / CONSTANTS +//************************************************************************** + +#define LOG 0 + + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +const device_type IMI7000_BUS = &device_creator; +const device_type IMI7000_SLOT = &device_creator; + + + +//************************************************************************** +// DEVICE INTERFACE +//************************************************************************** + +//------------------------------------------------- +// device_imi7000_interface - constructor +//------------------------------------------------- + +device_imi7000_interface::device_imi7000_interface(const machine_config &mconfig, device_t &device) + : device_slot_card_interface(mconfig, device) +{ +} + + + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// imi7000_slot_device - constructor +//------------------------------------------------- + +imi7000_slot_device::imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, IMI7000_SLOT, "IMI 7000 slot", tag, owner, clock, "imi7000_slot", __FILE__), + device_slot_interface(mconfig, *this) +{ +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void imi7000_slot_device::device_start() +{ +} + + + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// imi7000_bus_device - constructor +//------------------------------------------------- + +imi7000_bus_device::imi7000_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + device_t(mconfig, IMI7000_BUS, "IMI 7000 bus", tag, owner, clock, "imi7000", __FILE__) +{ +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void imi7000_bus_device::device_start() +{ +} + + +//------------------------------------------------- +// SLOT_INTERFACE( imi7000_devices ) +//------------------------------------------------- + +#include "imi5000h.h" + +SLOT_INTERFACE_START( imi7000_devices ) + SLOT_INTERFACE("imi5000h", IMI5000H) +SLOT_INTERFACE_END diff --git a/src/emu/bus/imi7000/imi7000.h b/src/emu/bus/imi7000/imi7000.h new file mode 100644 index 00000000000..fa8d24b075d --- /dev/null +++ b/src/emu/bus/imi7000/imi7000.h @@ -0,0 +1,135 @@ +// license:BSD-3-Clause +// copyright-holders:Curt Coder +/********************************************************************** + + International Memories Incorporated IMI 7000 Series bus emulation + + Copyright MESS Team. + Visit http://mamedev.org for licensing and usage restrictions. + +********************************************************************** + + GND 1 2 GND + SPARE 3 4 SPARE + -SEL UNIT ADDR 3 5 6 -SEL UNIT ADDR 2 + +R/W DATA 7 8 -R/W DATA + -SEL UNIT ADDR 1 9 10 -SEL UNIT ADDR 0 + +SYS CLOCK 11 12 -SYS CLOCK + GND 13 14 GND + -SECTOR 15 16 -INDEX + -SEEK COMPLETE 17 18 -FAULT + -CMD STROBE 19 20 -CMD R/W + -CMD SELECT 0 21 22 -CMD SELECT 1 + SPARE 23 24 SPARE + -CMD ACK 25 26 SPARE + -CMD BUS 6 27 28 -CMD BUS 7 + -CMD BUS 4 29 30 -CMD BUS 5 + -CMD BUS 2 31 32 -CMD BUS 3 + -CMD BUS 0 33 34 -CMD BUS 1 + +**********************************************************************/ + +#pragma once + +#ifndef __IMI7000_BUS__ +#define __IMI7000_BUS__ + +#include "emu.h" + + + +//************************************************************************** +// CONSTANTS +//************************************************************************** + +#define IMI7000_BUS_TAG "imi7000" + + + +//************************************************************************** +// INTERFACE CONFIGURATION MACROS +//************************************************************************** + +#define MCFG_IMI7000_BUS_ADD(_def_slot1, _def_slot2, _def_slot3, _def_slot4) \ + MCFG_DEVICE_ADD(IMI7000_BUS_TAG":0", IMI7000_SLOT, 0) \ + MCFG_DEVICE_SLOT_INTERFACE(imi7000_devices, _def_slot1, false) \ + MCFG_DEVICE_ADD(IMI7000_BUS_TAG":1", IMI7000_SLOT, 0) \ + MCFG_DEVICE_SLOT_INTERFACE(imi7000_devices, _def_slot1, false) \ + MCFG_DEVICE_ADD(IMI7000_BUS_TAG":2", IMI7000_SLOT, 0) \ + MCFG_DEVICE_SLOT_INTERFACE(imi7000_devices, _def_slot1, false) \ + MCFG_DEVICE_ADD(IMI7000_BUS_TAG":3", IMI7000_SLOT, 0) \ + MCFG_DEVICE_SLOT_INTERFACE(imi7000_devices, _def_slot1, false) \ + MCFG_DEVICE_ADD(IMI7000_BUS_TAG, IMI7000_BUS, 0) + + + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +class imi7000_slot_device; +class device_imi7000_interface; + + +// ======================> imi7000_bus_device + +class imi7000_bus_device : public device_t +{ +public: + // construction/destruction + imi7000_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + + void add_device(imi7000_slot_device *slot, device_t *target); + +protected: + // device-level overrides + virtual void device_start(); + + imi7000_slot_device *m_unit[4]; +}; + + +// ======================> imi7000_slot_device + +class imi7000_slot_device : public device_t, + public device_slot_interface +{ +public: + // construction/destruction + imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + +protected: + // device-level overrides + virtual void device_start(); + + device_imi7000_interface *m_card; +}; + + +// ======================> device_imi7000_interface + +class device_imi7000_interface : public device_slot_card_interface +{ + friend class imi7000_slot_device; + +public: + // construction/destruction + device_imi7000_interface(const machine_config &mconfig, device_t &device); + virtual ~device_imi7000_interface() { } + +protected: + imi7000_slot_device *m_slot; +}; + + +// device type definition +extern const device_type IMI7000_BUS; +extern const device_type IMI7000_SLOT; + + +// slot interface +SLOT_INTERFACE_EXTERN( imi7000_devices ); + + + +#endif diff --git a/src/emu/emu.mak b/src/emu/emu.mak index f4c452c8c2f..f7fe1f269b4 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -40,6 +40,7 @@ OBJDIRS += \ $(EMUOBJ)/bus/econet \ $(EMUOBJ)/bus/ep64 \ $(EMUOBJ)/bus/ieee488 \ + $(EMUOBJ)/bus/imi7000 \ $(EMUOBJ)/bus/isbx \ $(EMUOBJ)/bus/pc_kbd \ $(EMUOBJ)/bus/pet \ diff --git a/src/mess/drivers/softbox.c b/src/mess/drivers/softbox.c index 894c90481a7..7dc91eb9dc8 100644 --- a/src/mess/drivers/softbox.c +++ b/src/mess/drivers/softbox.c @@ -394,6 +394,7 @@ void softbox_state::ieee488_ifc(int state) } + //************************************************************************** // MACHINE CONFIGURATION //************************************************************************** @@ -422,9 +423,9 @@ static MACHINE_CONFIG_START( softbox, softbox_state ) MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "serial_terminal") MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rx)) MCFG_RS232_OUT_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) + MCFG_IMI7000_BUS_ADD("imi5000h", NULL, NULL, NULL) MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal) - MCFG_IMI5000H_ADD("corvus1") // software lists MCFG_SOFTWARE_LIST_ADD("flop_list", "softbox") diff --git a/src/mess/includes/comx35.h b/src/mess/includes/comx35.h index 550928c02c3..90a26bc1343 100644 --- a/src/mess/includes/comx35.h +++ b/src/mess/includes/comx35.h @@ -12,7 +12,6 @@ #include "imagedev/printer.h" #include "imagedev/snapquik.h" #include "machine/cdp1871.h" -#include "machine/comxpl80.h" #include "machine/ram.h" #include "machine/rescap.h" #include "sound/cdp1869.h" diff --git a/src/mess/includes/softbox.h b/src/mess/includes/softbox.h index 1b1cc1fba16..05b45102728 100644 --- a/src/mess/includes/softbox.h +++ b/src/mess/includes/softbox.h @@ -6,14 +6,14 @@ #define __SOFTBOX__ #include "emu.h" +#include "bus/ieee488/ieee488.h" +#include "bus/imi7000/imi7000.h" #include "cpu/z80/z80.h" #include "imagedev/harddriv.h" #include "includes/corvushd.h" #include "machine/com8116.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "bus/ieee488/ieee488.h" -#include "machine/imi5000h.h" #include "machine/serial.h" #define Z80_TAG "z80" diff --git a/src/mess/mess.mak b/src/mess/mess.mak index 081b8ef5978..2aa915bd34f 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -495,6 +495,7 @@ BUSES += ECBBUS BUSES += ECONET BUSES += EP64 BUSES += IEEE488 +BUSES += IMI7000 BUSES += ISBX BUSES += PC_KBD BUSES += PET @@ -525,6 +526,7 @@ DRVLIBS += \ $(MESSOBJ)/act.a \ $(MESSOBJ)/adc.a \ $(MESSOBJ)/alesis.a \ + $(MESSOBJ)/altos.a \ $(MESSOBJ)/amiga.a \ $(MESSOBJ)/amstrad.a \ $(MESSOBJ)/apf.a \ @@ -569,12 +571,14 @@ DRVLIBS += \ $(MESSOBJ)/elektor.a \ $(MESSOBJ)/elektrka.a \ $(MESSOBJ)/ensoniq.a \ + $(MESSOBJ)/enterprise.a \ $(MESSOBJ)/entex.a \ $(MESSOBJ)/epoch.a \ $(MESSOBJ)/epson.a \ $(MESSOBJ)/exeltel.a \ $(MESSOBJ)/exidy.a \ $(MESSOBJ)/fairch.a \ + $(MESSOBJ)/fidelity.a \ $(MESSOBJ)/fujitsu.a \ $(MESSOBJ)/funtech.a \ $(MESSOBJ)/galaxy.a \ @@ -588,8 +592,8 @@ DRVLIBS += \ $(MESSOBJ)/homebrew.a \ $(MESSOBJ)/homelab.a \ $(MESSOBJ)/hp.a \ + $(MESSOBJ)/imp.a \ $(MESSOBJ)/intel.a \ - $(MESSOBJ)/intelgnt.a \ $(MESSOBJ)/interton.a \ $(MESSOBJ)/intv.a \ $(MESSOBJ)/isa.a \ @@ -645,6 +649,7 @@ DRVLIBS += \ $(MESSOBJ)/robotron.a \ $(MESSOBJ)/rockwell.a \ $(MESSOBJ)/roland.a \ + $(MESSOBJ)/sage.a \ $(MESSOBJ)/samcoupe.a \ $(MESSOBJ)/samsung.a \ $(MESSOBJ)/sanyo.a \ @@ -661,6 +666,7 @@ DRVLIBS += \ $(MESSOBJ)/svi.a \ $(MESSOBJ)/svision.a \ $(MESSOBJ)/synertec.a \ + $(MESSOBJ)/ta.a \ $(MESSOBJ)/tandberg.a \ $(MESSOBJ)/tangerin.a \ $(MESSOBJ)/tatung.a \ @@ -668,6 +674,7 @@ DRVLIBS += \ $(MESSOBJ)/tektroni.a \ $(MESSOBJ)/telenova.a \ $(MESSOBJ)/telercas.a \ + $(MESSOBJ)/televideo.a \ $(MESSOBJ)/tem.a \ $(MESSOBJ)/tesla.a \ $(MESSOBJ)/test.a \ @@ -692,6 +699,7 @@ DRVLIBS += \ $(MESSOBJ)/xerox.a \ $(MESSOBJ)/xussrpc.a \ $(MESSOBJ)/yamaha.a \ + $(MESSOBJ)/zenith.a \ $(MESSOBJ)/zpa.a \ $(MESSOBJ)/zvt.a \ $(MESSOBJ)/shared.a \ @@ -789,7 +797,6 @@ $(MESSOBJ)/shared.a: \ $(MESS_MACHINE)/dp8390.o \ $(MESS_MACHINE)/hd63450.o \ $(MESS_MACHINE)/i8271.o \ - $(MESS_MACHINE)/imi5000h.o \ $(MESS_MACHINE)/kb3600.o \ $(MESS_MACHINE)/keyboard.o \ $(MESS_MACHINE)/kr2376.o \ @@ -888,6 +895,9 @@ $(MESSOBJ)/alesis.a: \ $(MESS_AUDIO)/alesis.o \ $(MESS_VIDEO)/alesis.o \ +$(MESSOBJ)/altos.a: \ + $(MESS_DRIVERS)/altos5.o \ + $(MESSOBJ)/amiga.a: \ $(MESS_MACHINE)/amigacrt.o \ $(MESS_MACHINE)/amigacd.o \ @@ -1084,12 +1094,14 @@ $(MESSOBJ)/cccp.a: \ $(MESS_DRIVERS)/pyl601.o \ $(MESS_DRIVERS)/sm1800.o \ $(MESS_DRIVERS)/uknc.o \ + $(MESS_DRIVERS)/unior.o \ $(MESS_DRIVERS)/ut88.o \ $(MESS_MACHINE)/ut88.o \ $(MESS_VIDEO)/ut88.o \ $(MESS_DRIVERS)/vector06.o \ $(MESS_MACHINE)/vector06.o \ $(MESS_VIDEO)/vector06.o \ + $(MESS_DRIVERS)/vta2000.o \ $(MESSOBJ)/cce.a: \ $(MESS_DRIVERS)/mc1000.o \ @@ -1109,10 +1121,10 @@ $(MESSOBJ)/coleco.a: \ $(MESSOBJ)/cromemco.a: \ $(MESS_DRIVERS)/c10.o \ + $(MESS_DRIVERS)/mcb216.o \ $(MESSOBJ)/comx.a: \ $(MESS_DRIVERS)/comx35.o \ - $(MESS_MACHINE)/comxpl80.o \ $(MESS_VIDEO)/comx35.o \ $(MESSOBJ)/concept.a: \ @@ -1222,6 +1234,11 @@ $(MESSOBJ)/ensoniq.a: \ $(MESS_MACHINE)/esqvfd.o \ $(MESS_MACHINE)/esqpanel.o \ +$(MESSOBJ)/enterprise.a: \ + $(MESS_DRIVERS)/ep64.o \ + $(MESS_AUDIO)/dave.o \ + $(MESS_VIDEO)/nick.o \ + $(MESSOBJ)/entex.a: \ $(MESS_VIDEO)/advision.o \ $(MESS_MACHINE)/advision.o \ @@ -1259,6 +1276,10 @@ $(MESSOBJ)/fairch.a: \ $(MESS_AUDIO)/channelf.o \ $(MESS_DRIVERS)/channelf.o \ +$(MESSOBJ)/fidelity.a: \ + $(MESS_DRIVERS)/csc.o \ + $(MESS_DRIVERS)/fidelz80.o \ + $(MESSOBJ)/fujitsu.a: \ $(MESS_DRIVERS)/fmtowns.o \ $(MESS_VIDEO)/fmtowns.o \ @@ -1352,10 +1373,9 @@ $(MESSOBJ)/intel.a: \ $(MESS_DRIVERS)/sdk86.o \ $(MESS_DRIVERS)/rex6000.o \ -$(MESSOBJ)/intelgnt.a: \ - $(MESS_DRIVERS)/ep64.o \ - $(MESS_AUDIO)/dave.o \ - $(MESS_VIDEO)/nick.o \ +$(MESSOBJ)/imp.a: \ + $(MESS_DRIVERS)/tim011.o \ + $(MESS_DRIVERS)/tim100.o \ $(MESSOBJ)/interton.a: \ $(MESS_AUDIO)/vc4000.o \ @@ -1447,7 +1467,9 @@ $(MESSOBJ)/mitsubishi.a: \ $(MESS_DRIVERS)/multi16.o \ $(MESSOBJ)/morrow.a: \ + $(MESS_DRIVERS)/microdec.o \ $(MESS_DRIVERS)/mpz80.o \ + $(MESS_DRIVERS)/tricep.o \ $(MESSOBJ)/mos.a: \ $(MESS_DRIVERS)/kim1.o \ @@ -1723,6 +1745,9 @@ $(MESSOBJ)/rockwell.a: \ $(MESS_DRIVERS)/aim65.o \ $(MESS_DRIVERS)/aim65_40.o \ +$(MESSOBJ)/sage.a: \ + $(MESS_DRIVERS)/sage2.o \ + $(MESSOBJ)/samcoupe.a: \ $(MESS_VIDEO)/samcoupe.o \ $(MESS_DRIVERS)/samcoupe.o \ @@ -1732,10 +1757,11 @@ $(MESSOBJ)/samsung.a: \ $(MESS_DRIVERS)/spc1000.o \ $(MESSOBJ)/sanyo.a: \ - $(MESS_DRIVERS)/phc25.o \ + $(MESS_DRIVERS)/mbc200.o \ $(MESS_DRIVERS)/mbc55x.o \ $(MESS_MACHINE)/mbc55x.o \ $(MESS_VIDEO)/mbc55x.o \ + $(MESS_DRIVERS)/phc25.o \ $(MESSOBJ)/sega.a: \ $(MESS_DRIVERS)/sg1000.o \ @@ -1881,6 +1907,9 @@ $(MESSOBJ)/svision.a: \ $(MESSOBJ)/synertec.a: \ $(MESS_DRIVERS)/sym1.o \ +$(MESSOBJ)/ta.a: \ + $(MESS_DRIVERS)/alphatro.o \ + $(MESSOBJ)/tandberg.a: \ $(MESS_DRIVERS)/tdv2324.o \ @@ -1915,6 +1944,12 @@ $(MESSOBJ)/telercas.a: \ $(MESS_VIDEO)/tmc600.o \ $(MESS_DRIVERS)/tmc2000e.o \ +$(MESSOBJ)/televideo.a: \ + $(MESS_DRIVERS)/ts802.o \ + $(MESS_DRIVERS)/ts803.o \ + $(MESS_DRIVERS)/ts816.o \ + $(MESS_DRIVERS)/tv950.o \ + $(MESSOBJ)/tem.a: \ $(MESS_DRIVERS)/tec1.o \ @@ -2128,6 +2163,9 @@ $(MESSOBJ)/xussrpc.a: \ $(MESSOBJ)/yamaha.a: \ $(MESS_DRIVERS)/ymmu100.o \ +$(MESSOBJ)/zenith.a: \ + $(MESS_DRIVERS)/z100.o \ + $(MESSOBJ)/zpa.a: \ $(MESS_DRIVERS)/iq151.o \ @@ -2137,9 +2175,7 @@ $(MESSOBJ)/zvt.a: \ $(MESS_VIDEO)/pp01.o \ $(MESSOBJ)/skeleton.a: \ - $(MESS_DRIVERS)/altos5.o \ $(MESS_DRIVERS)/alphasma.o \ - $(MESS_DRIVERS)/alphatro.o \ $(MESS_DRIVERS)/ampro.o \ $(MESS_DRIVERS)/applix.o \ $(MESS_DRIVERS)/attache.o \ @@ -2158,7 +2194,6 @@ $(MESSOBJ)/skeleton.a: \ $(MESS_DRIVERS)/cortex.o \ $(MESS_DRIVERS)/cosmicos.o \ $(MESS_DRIVERS)/cp1.o \ - $(MESS_DRIVERS)/csc.o \ $(MESS_DRIVERS)/cxhumax.o \ $(MESS_DRIVERS)/czk80.o \ $(MESS_DRIVERS)/d6800.o \ @@ -2174,7 +2209,6 @@ $(MESSOBJ)/skeleton.a: \ $(MESS_DRIVERS)/elwro800.o \ $(MESS_DRIVERS)/eti660.o \ $(MESS_DRIVERS)/fanucs15.o \ - $(MESS_DRIVERS)/fidelz80.o \ $(MESS_DRIVERS)/fk1.o \ $(MESS_DRIVERS)/ft68m.o \ $(MESS_DRIVERS)/grfd2301.o \ @@ -2194,12 +2228,9 @@ $(MESSOBJ)/skeleton.a: \ $(MESS_DRIVERS)/lft.o \ $(MESS_DRIVERS)/lola8a.o \ $(MESS_DRIVERS)/m79152pc.o \ - $(MESS_DRIVERS)/mbc200.o \ - $(MESS_DRIVERS)/mcb216.o \ $(MESS_DRIVERS)/mccpm.o \ $(MESS_DRIVERS)/mes.o \ $(MESS_DRIVERS)/mice.o \ - $(MESS_DRIVERS)/microdec.o \ $(MESS_DRIVERS)/micronic.o \ $(MESS_DRIVERS)/mini2440.o \ $(MESS_DRIVERS)/mmd1.o \ @@ -2229,7 +2260,6 @@ $(MESSOBJ)/skeleton.a: \ $(MESS_DRIVERS)/qtsbc.o \ $(MESS_DRIVERS)/rvoice.o \ $(MESS_DRIVERS)/sacstate.o \ - $(MESS_DRIVERS)/sage2.o \ $(MESS_DRIVERS)/sbrain.o \ $(MESS_DRIVERS)/seattle.o \ $(MESS_DRIVERS)/sh4robot.o \ @@ -2239,24 +2269,14 @@ $(MESSOBJ)/skeleton.a: \ $(MESS_DRIVERS)/systec.o \ $(MESS_DRIVERS)/tavernie.o \ $(MESS_DRIVERS)/terak.o \ - $(MESS_DRIVERS)/tim011.o \ - $(MESS_DRIVERS)/tim100.o \ - $(MESS_DRIVERS)/tricep.o \ - $(MESS_DRIVERS)/ts802.o \ - $(MESS_DRIVERS)/ts803.o \ - $(MESS_DRIVERS)/ts816.o \ - $(MESS_DRIVERS)/tv950.o \ $(MESS_DRIVERS)/tsispch.o \ - $(MESS_DRIVERS)/unior.o \ $(MESS_DRIVERS)/unistar.o \ $(MESS_DRIVERS)/v6809.o \ $(MESS_DRIVERS)/vector4.o \ $(MESS_DRIVERS)/vii.o \ - $(MESS_DRIVERS)/vta2000.o \ $(MESS_DRIVERS)/wicat.o \ $(MESS_DRIVERS)/xor100.o \ $(MESS_DRIVERS)/xavix.o \ - $(MESS_DRIVERS)/z100.o \ $(MESS_DRIVERS)/zorba.o \ @@ -2398,7 +2418,7 @@ $(MESS_DRIVERS)/pro80.o: $(MESS_LAYOUT)/pro80.lh $(MESS_DRIVERS)/px4.o: $(MESS_LAYOUT)/px4.lh $(MESS_DRIVERS)/px8.o: $(MESS_LAYOUT)/px8.lh $(MESS_DRIVERS)/ravens.o: $(MESS_LAYOUT)/ravens.lh -$(MESS_DRIVERS)/rainbow.o: $(MESS_LAYOUT)/rainbow.lh +$(MESS_DRIVERS)/rainbow.o: $(MESS_LAYOUT)/rainbow.lh $(MESS_DRIVERS)/savia84.o: $(MESS_LAYOUT)/savia84.lh $(MESS_DRIVERS)/sc1.o: $(MESS_LAYOUT)/sc1.lh $(MESS_DRIVERS)/sc2.o: $(MESS_LAYOUT)/sc2.lh