summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2020-06-07 14:39:19 -0400
committer AJR <ajrhacker@users.noreply.github.com>2020-06-07 14:40:02 -0400
commit763ee4e2159de53c1368ac217d412795e9031d22 (patch)
treee00c36b710bcfbf3310a826dd44613fdcb15cc39
parent3e9324a87f648d006a341dc325632411efeeab96 (diff)
tti: Convert driver to QBUS device (qts1)
-rw-r--r--scripts/src/bus.lua2
-rw-r--r--scripts/target/mame/mess.lua1
-rw-r--r--src/devices/bus/qbus/qbus.cpp6
-rw-r--r--src/devices/bus/qbus/qtx.cpp (renamed from src/mame/drivers/tti.cpp)125
-rw-r--r--src/devices/bus/qbus/qtx.h54
-rw-r--r--src/mame/mame.lst3
-rw-r--r--src/mame/mess.flt1
7 files changed, 108 insertions, 84 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 0fb2ad140d9..0ad54bc8d7d 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -3676,6 +3676,8 @@ if (BUSES["QBUS"]~=null) then
MAME_DIR .. "src/devices/bus/qbus/pc11.h",
MAME_DIR .. "src/devices/bus/qbus/qbus.cpp",
MAME_DIR .. "src/devices/bus/qbus/qbus.h",
+ MAME_DIR .. "src/devices/bus/qbus/qtx.cpp",
+ MAME_DIR .. "src/devices/bus/qbus/qtx.h",
}
end
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 2b19d93e9f5..23ebbb096da 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -4468,7 +4468,6 @@ files {
MAME_DIR .. "src/mame/drivers/trs80dt1.cpp",
MAME_DIR .. "src/mame/drivers/tsispch.cpp",
MAME_DIR .. "src/mame/includes/tsispch.h",
- MAME_DIR .. "src/mame/drivers/tti.cpp",
MAME_DIR .. "src/mame/drivers/tulip1.cpp",
MAME_DIR .. "src/mame/drivers/unistar.cpp",
MAME_DIR .. "src/mame/drivers/v6809.cpp",
diff --git a/src/devices/bus/qbus/qbus.cpp b/src/devices/bus/qbus/qbus.cpp
index 88a7f7a188e..144db1a2252 100644
--- a/src/devices/bus/qbus/qbus.cpp
+++ b/src/devices/bus/qbus/qbus.cpp
@@ -8,15 +8,17 @@
#include "emu.h"
+#include "qbus.h"
+
// Peripheral boards
#include "pc11.h"
-
-#include "qbus.h"
+#include "qtx.h"
void qbus_cards(device_slot_interface &device)
{
device.option_add("pc11", DEC_PC11); /* Paper tape reader and punch */
+ device.option_add("qts1", TTI_QTS1);
}
diff --git a/src/mame/drivers/tti.cpp b/src/devices/bus/qbus/qtx.cpp
index f1fdd6590f5..e07023c06c6 100644
--- a/src/mame/drivers/tti.cpp
+++ b/src/devices/bus/qbus/qtx.cpp
@@ -4,8 +4,8 @@
2017-11-02 Skeleton
-Transitional Technology Inc. SCSI host adapter, possibly part of the QTx (Q-Bus) series or UTx (Unibus) series.
-Model number not known, zipfile was named "TTI_10012000.zip"
+Transitional Technology Inc. SCSI Q-bus host adapter, part of the QTx series
+(x = 'S' for single-ended, x = 'D' for differential). UTx-1 was also provided for Unibus.
Chips: NCR 53C90A, Motorola MC68901P, Fujitsu 8464A-10L (8KB static ram), Xicor X24C44P (16x16 serial NOVRAM), and 14 undumped
Lattice PLDs.
@@ -16,87 +16,57 @@ Other: LED, 20MHz crystal. Next to the MC68901P is another chip just as large (4
************************************************************************************************************************************/
#include "emu.h"
-#include "bus/nscsi/cd.h"
-#include "bus/nscsi/hd.h"
+#include "qtx.h"
+
+#include "bus/nscsi/devices.h"
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
#include "machine/74259.h"
#include "machine/eepromser.h"
-#include "machine/mc68901.h"
-#include "machine/ncr5390.h"
-
-class tti_state : public driver_device
-{
-public:
- tti_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag)
- , m_maincpu(*this, "maincpu")
- , m_mfp(*this, "mfp")
- , m_asc(*this, "scsibus:7:asc")
- , m_dma_address(0)
- { }
-
- void tti(machine_config &config);
-
-protected:
- virtual void machine_start() override;
-
-private:
- u8 asc_r(offs_t offset);
- void asc_w(offs_t offset, u8 data);
- void dma_address_w(offs_t offset, u8 data);
- u8 io_status_r();
- void channel_w(u8 data);
- void asc_config(device_t *device);
- IRQ_CALLBACK_MEMBER(intack);
+// device type definition
+DEFINE_DEVICE_TYPE(TTI_QTS1, qts1_device, "qts1", "TTI QTS-1 SCSI Host Adapter")
- void prg_map(address_map &map);
- void fc7_map(address_map &map);
- required_device<cpu_device> m_maincpu;
- required_device<mc68901_device> m_mfp;
- required_device<ncr53c90a_device> m_asc;
-
- u32 m_dma_address;
-};
-
-void tti_state::machine_start()
+qts1_device::qts1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ : device_t(mconfig, TTI_QTS1, tag, owner, clock)
+ , device_qbus_card_interface(mconfig, *this)
+ , m_localcpu(*this, "localcpu")
+ , m_mfp(*this, "mfp")
+ , m_asc(*this, "scsibus:7:asc")
+ , m_dma_address(0)
{
- save_item(NAME(m_dma_address));
}
-IRQ_CALLBACK_MEMBER(tti_state::intack)
+void qts1_device::device_start()
{
- return m_mfp->get_vector();
+ save_item(NAME(m_dma_address));
}
-static INPUT_PORTS_START( tti )
-INPUT_PORTS_END
-u8 tti_state::asc_r(offs_t offset)
+u8 qts1_device::asc_r(offs_t offset)
{
return m_asc->read(offset ^ 1);
}
-void tti_state::asc_w(offs_t offset, u8 data)
+void qts1_device::asc_w(offs_t offset, u8 data)
{
m_asc->write(offset ^ 1, data);
}
-void tti_state::dma_address_w(offs_t offset, u8 data)
+void qts1_device::dma_address_w(offs_t offset, u8 data)
{
m_dma_address &= ~(0xff000000 >> (offset * 8));
m_dma_address |= u32(data) << (24 - offset * 8);
}
-u8 tti_state::io_status_r()
+u8 qts1_device::io_status_r()
{
return 0;
}
-void tti_state::channel_w(u8 data)
+void qts1_device::channel_w(u8 data)
{
switch (data & 0x03)
{
@@ -114,33 +84,31 @@ void tti_state::channel_w(u8 data)
}
}
-void tti_state::prg_map(address_map &map)
+void qts1_device::prg_map(address_map &map)
{
map(0x00000, 0x07fff).rom().region("firmware", 0);
map(0x7e000, 0x7ffff).ram();
map(0x80000, 0x80017).rw(m_mfp, FUNC(mc68901_device::read), FUNC(mc68901_device::write));
map(0x80018, 0x8001f).ram();
- map(0x80020, 0x80029).rw(FUNC(tti_state::asc_r), FUNC(tti_state::asc_w));
+ map(0x80020, 0x80029).rw(FUNC(qts1_device::asc_r), FUNC(qts1_device::asc_w));
map(0x80070, 0x80077).w("bitlatch", FUNC(ls259_device::write_d0));
- map(0x80078, 0x8007b).w(FUNC(tti_state::dma_address_w));
- map(0x8007c, 0x8007c).r(FUNC(tti_state::io_status_r));
- map(0x8007d, 0x8007d).w(FUNC(tti_state::channel_w));
+ map(0x80078, 0x8007b).w(FUNC(qts1_device::dma_address_w));
+ map(0x8007c, 0x8007c).r(FUNC(qts1_device::io_status_r));
+ map(0x8007d, 0x8007d).w(FUNC(qts1_device::channel_w));
}
-void tti_state::fc7_map(address_map &map)
+void qts1_device::fc7_map(address_map &map)
{
map(0xffff5, 0xffff5).r(m_mfp, FUNC(mc68901_device::get_vector));
}
-static void tti_scsi_devices(device_slot_interface &device)
+static void qtx_scsi_devices(device_slot_interface &device)
{
- // FIXME: these device options are placeholders
- device.option_add("cdrom", NSCSI_CDROM);
- device.option_add("harddisk", NSCSI_HARDDISK);
+ default_scsi_devices(device);
device.option_add_internal("asc", NCR53C90A);
}
-void tti_state::asc_config(device_t *device)
+void qts1_device::asc_config(device_t *device)
{
ncr53c90a_device &adapter = downcast<ncr53c90a_device &>(*device);
@@ -150,28 +118,28 @@ void tti_state::asc_config(device_t *device)
//adapter.drq_handler_cb().set(?);
}
-void tti_state::tti(machine_config &config)
+void qts1_device::device_add_mconfig(machine_config &config)
{
- M68008(config, m_maincpu, 20_MHz_XTAL / 2); // guess
- m_maincpu->set_addrmap(AS_PROGRAM, &tti_state::prg_map);
- m_maincpu->set_addrmap(m68008_device::AS_CPU_SPACE, &tti_state::fc7_map);
+ M68008(config, m_localcpu, 20_MHz_XTAL / 2); // guess
+ m_localcpu->set_addrmap(AS_PROGRAM, &qts1_device::prg_map);
+ m_localcpu->set_addrmap(m68008_device::AS_CPU_SPACE, &qts1_device::fc7_map);
MC68901(config, m_mfp, 20_MHz_XTAL / 2); // guess
m_mfp->set_timer_clock(20_MHz_XTAL / 8); // guess
m_mfp->out_tco_cb().set(m_mfp, FUNC(mc68901_device::rc_w));
m_mfp->out_tco_cb().append(m_mfp, FUNC(mc68901_device::tc_w));
m_mfp->out_so_cb().set("rs232", FUNC(rs232_port_device::write_txd));
- m_mfp->out_irq_cb().set_inputline("maincpu", M68K_IRQ_2); // probably
+ m_mfp->out_irq_cb().set_inputline("localcpu", M68K_IRQ_2); // probably
NSCSI_BUS(config, "scsibus");
- NSCSI_CONNECTOR(config, "scsibus:0", tti_scsi_devices, nullptr);
- NSCSI_CONNECTOR(config, "scsibus:1", tti_scsi_devices, nullptr);
- NSCSI_CONNECTOR(config, "scsibus:2", tti_scsi_devices, nullptr);
- NSCSI_CONNECTOR(config, "scsibus:3", tti_scsi_devices, nullptr);
- NSCSI_CONNECTOR(config, "scsibus:4", tti_scsi_devices, nullptr);
- NSCSI_CONNECTOR(config, "scsibus:5", tti_scsi_devices, nullptr);
- NSCSI_CONNECTOR(config, "scsibus:6", tti_scsi_devices, nullptr);
- NSCSI_CONNECTOR(config, "scsibus:7", tti_scsi_devices, "asc", true).set_option_machine_config("asc", [this] (device_t *device) { asc_config(device); });
+ NSCSI_CONNECTOR(config, "scsibus:0", qtx_scsi_devices, nullptr);
+ NSCSI_CONNECTOR(config, "scsibus:1", qtx_scsi_devices, nullptr);
+ NSCSI_CONNECTOR(config, "scsibus:2", qtx_scsi_devices, nullptr);
+ NSCSI_CONNECTOR(config, "scsibus:3", qtx_scsi_devices, nullptr);
+ NSCSI_CONNECTOR(config, "scsibus:4", qtx_scsi_devices, nullptr);
+ NSCSI_CONNECTOR(config, "scsibus:5", qtx_scsi_devices, nullptr);
+ NSCSI_CONNECTOR(config, "scsibus:6", qtx_scsi_devices, nullptr);
+ NSCSI_CONNECTOR(config, "scsibus:7", qtx_scsi_devices, "asc", true).set_option_machine_config("asc", [this] (device_t *device) { asc_config(device); });
rs232_port_device &rs232(RS232_PORT(config, "rs232", default_rs232_devices, "terminal"));
rs232.rxd_handler().set(m_mfp, FUNC(mc68901_device::si_w));
@@ -184,7 +152,7 @@ void tti_state::tti(machine_config &config)
bitlatch.q_out_cb<2>().set("novram", FUNC(eeprom_serial_x24c44_device::cs_write));
}
-ROM_START( tti )
+ROM_START(qts1)
ROM_REGION(0x8000, "firmware", 0)
ROM_SYSTEM_BIOS(0, "v2.3", "Firmware Version 2.3")
ROMX_LOAD("tti_10012000_rev2.3.bin", 0x0000, 0x8000, CRC(95a5bce8) SHA1(46d7c99e37ca5598aec2062dfd9759853a237c14), ROM_BIOS(0))
@@ -192,4 +160,7 @@ ROM_START( tti )
ROMX_LOAD("tti_10012000_rev1.7.bin", 0x0000, 0x8000, CRC(6660c059) SHA1(05d97009b5b8034dda520f655c73c474da97f822), ROM_BIOS(1))
ROM_END
-COMP( 1989, tti, 0, 0, tti, tti, tti_state, empty_init, "Transitional Technology Inc", "unknown TTI SCSI host adapter", MACHINE_IS_SKELETON )
+const tiny_rom_entry *qts1_device::device_rom_region() const
+{
+ return ROM_NAME(qts1);
+}
diff --git a/src/devices/bus/qbus/qtx.h b/src/devices/bus/qbus/qtx.h
new file mode 100644
index 00000000000..99c38f9f3ec
--- /dev/null
+++ b/src/devices/bus/qbus/qtx.h
@@ -0,0 +1,54 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+
+#ifndef MAME_BUS_QBUS_QTX_H
+#define MAME_BUS_QBUS_QTX_H
+
+#pragma once
+
+#include "qbus.h"
+#include "machine/mc68901.h"
+#include "machine/ncr5390.h"
+
+
+//**************************************************************************
+// TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> qts1_device
+
+class qts1_device : public device_t, public device_qbus_card_interface
+{
+public:
+ // device type constructor
+ qts1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_add_mconfig(machine_config &config) override;
+ virtual const tiny_rom_entry *device_rom_region() const override;
+
+private:
+ u8 asc_r(offs_t offset);
+ void asc_w(offs_t offset, u8 data);
+ void dma_address_w(offs_t offset, u8 data);
+ u8 io_status_r();
+ void channel_w(u8 data);
+
+ void asc_config(device_t *device);
+
+ void prg_map(address_map &map);
+ void fc7_map(address_map &map);
+
+ required_device<cpu_device> m_localcpu;
+ required_device<mc68901_device> m_mfp;
+ required_device<ncr53c90a_device> m_asc;
+
+ u32 m_dma_address;
+};
+
+// device type declaration
+DECLARE_DEVICE_TYPE(TTI_QTS1, qts1_device)
+
+#endif // MAME_BUS_QBUS_QTX_H
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 2cee4c83477..211d706c004 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -39996,9 +39996,6 @@ prose2ko //
ttchamp //
ttchampa //
-@source:tti.cpp
-tti //
-
@source:tubep.cpp
rjammer // (c) 1984 + Alice
tubep // (c) 1984 + Fujitek
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index e29f3ec128b..aa6c9bbc40b 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -997,7 +997,6 @@ ts802.cpp
ts803.cpp
ts816.cpp
tsispch.cpp
-tti.cpp
tulip1.cpp
tutor.cpp
tv910.cpp