bus/pc98_cbus/fdd_2dd.cpp: port over from base driver

Author: angelosa

hash/pc98.xml

@@ -48503,10 +48503,14 @@ Eventually hangs with stuck [PC9801-26] sound note (verify, should be fixed)
 		</part>
 	</software>
 
-	<software name="tforce">
+	<software name="tforce" supported="no">
 		<description>Thunder Force</description>
 		<year>1984</year>
 		<publisher>テクノソフト (Techno Soft)</publisher>
+		<notes><![CDATA[
+"Incorrect layout on track 0 head 1, expected_size=100000, current_size=124448"
+May require [PC80S31] interface?
+]]></notes>
 		<info name="alt_title" value="サンダーフォース" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="351024">

src/devices/bus/pc98_cbus/fdd_2dd.cpp

@@ -4,21 +4,28 @@
 
 FDD 2DD bridge for 1st gen HW
 
+TODO:
+- support for TMSK / TTRG (sorcer cares)
+
 **************************************************************************************************/
 
 #include "emu.h"
 #include "fdd_2dd.h"
 
-
-//**************************************************************************
-//  GLOBAL VARIABLES
-//**************************************************************************
+#include "formats/img_dsk.h"
+#include "formats/pc98_dsk.h"
+#include "formats/pc98fdi_dsk.h"
+#include "formats/fdd_dsk.h"
+#include "formats/dcp_dsk.h"
+#include "formats/dip_dsk.h"
+#include "formats/nfd_dsk.h"
 
 DEFINE_DEVICE_TYPE(FDD_2DD_BRIDGE, fdd_2dd_bridge_device, "pc98_fdd_2dd", "NEC PC-98 2DD FDD bridge")
 
 fdd_2dd_bridge_device::fdd_2dd_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, FDD_2DD_BRIDGE, tag, owner, clock)
 	, device_pc98_cbus_slot_interface(mconfig, *this)
+	, m_fdc(*this, "fdc")
 	, m_bios(*this, "bios")
 {
 }
@@ -35,18 +42,50 @@ const tiny_rom_entry *fdd_2dd_bridge_device::device_rom_region() const
 	return ROM_NAME( fdd_2dd );
 }
 
+static void drives_2dd(device_slot_interface &device)
+{
+	device.option_add("525dd", TEAC_FD_55F);
+}
+
+static void floppy_formats(format_registration &fr)
+{
+	fr.add_mfm_containers();
+	fr.add(FLOPPY_PC98_FORMAT);
+	fr.add(FLOPPY_PC98FDI_FORMAT);
+	fr.add(FLOPPY_FDD_FORMAT);
+	fr.add(FLOPPY_DCP_FORMAT);
+	fr.add(FLOPPY_DIP_FORMAT);
+	fr.add(FLOPPY_NFD_FORMAT);
+	// *nix/FreeBSD may distribute with this
+	fr.add(FLOPPY_IMG_FORMAT);
+}
+
 void fdd_2dd_bridge_device::device_add_mconfig(machine_config &config)
 {
-	// TODO: move from base driver
+	UPD765A(config, m_fdc, 8'000'000, false, true);
+	m_fdc->intrq_wr_callback().set([this] (int state) {
+		//if (BIT(m_ctrl, 2))
+		m_bus->int_w(7, state);
+	});
+	m_fdc->drq_wr_callback().set([this] (int state) { m_bus->drq_w(3, state); });
+	FLOPPY_CONNECTOR(config, "fdc:0", drives_2dd, "525dd", floppy_formats);
+	FLOPPY_CONNECTOR(config, "fdc:1", drives_2dd, "525dd", floppy_formats);
 }
 
 
 void fdd_2dd_bridge_device::device_start()
 {
+	m_bus->set_dma_channel(3, this, true);
+
+	m_fdc->set_rate(250000);
+	// TODO: set_rpm?
+
+	save_item(NAME(m_ctrl));
 }
 
 void fdd_2dd_bridge_device::device_reset()
 {
+	m_ctrl = 0;
 }
 
 void fdd_2dd_bridge_device::remap(int space_id, offs_t start, offs_t end)
@@ -70,6 +109,56 @@ void fdd_2dd_bridge_device::remap(int space_id, offs_t start, offs_t end)
 
 void fdd_2dd_bridge_device::io_map(address_map &map)
 {
-	// TODO: map me
+	map(0x00c8, 0x00cb).m(m_fdc, FUNC(upd765a_device::map)).umask16(0x00ff);
+	map(0x00cc, 0x00cc).rw(FUNC(fdd_2dd_bridge_device::ctrl_r), FUNC(fdd_2dd_bridge_device::ctrl_w));
+}
+
+u8 fdd_2dd_bridge_device::dack_r(int line)
+{
+	u8 res = m_fdc->dma_r();
+	return res;
+}
+
+void fdd_2dd_bridge_device::dack_w(int line, u8 data)
+{
+	m_fdc->dma_w(data);
+}
+
+void fdd_2dd_bridge_device::eop_w(int state)
+{
+	m_fdc->tc_w(state);
 }
 
+bool fdd_2dd_bridge_device::fdc_drive_ready_r(upd765a_device *fdc)
+{
+	floppy_image_device *floppy0 = fdc->subdevice<floppy_connector>("0")->get_device();
+	floppy_image_device *floppy1 = fdc->subdevice<floppy_connector>("1")->get_device();
+
+	return (!floppy0->ready_r() || !floppy1->ready_r());
+}
+
+u8 fdd_2dd_bridge_device::ctrl_r()
+{
+	u8 ret = 0;
+
+	// 2dd BIOS specifically tests if a disk is in any drive
+	// (does not happen on 2HD standalone)
+	ret |= fdc_drive_ready_r(m_fdc) << 4;
+
+	//popmessage("%d %d %02x", floppy0->ready_r(), floppy1->ready_r(), ret);
+
+	// TODO: dips et al.
+	return ret | 0x40;
+}
+
+void fdd_2dd_bridge_device::ctrl_w(u8 data)
+{
+	logerror("%02x ctrl\n",data);
+	m_fdc->reset_w(BIT(data, 7));
+
+	m_ctrl = data;
+	m_fdc->subdevice<floppy_connector>("0")->get_device()->mon_w(data & 8 ? CLEAR_LINE : ASSERT_LINE);
+	m_fdc->subdevice<floppy_connector>("1")->get_device()->mon_w(data & 8 ? CLEAR_LINE : ASSERT_LINE);
+}
+
+

src/devices/bus/pc98_cbus/fdd_2dd.h

@@ -8,6 +8,9 @@
 
 #include "slot.h"
 
+#include "imagedev/floppy.h"
+#include "machine/upd765.h"
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -29,11 +32,22 @@ class fdd_2dd_bridge_device : public device_t
 	// optional information overrides
 	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
 	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
+	virtual u8 dack_r(int line) override;
+	virtual void dack_w(int line, u8 data) override;
+	virtual void eop_w(int state) override;
 
 	virtual void remap(int space_id, offs_t start, offs_t end) override;
 private:
-	void io_map(address_map &map) ATTR_COLD;
+	required_device<upd765a_device> m_fdc;
 	required_memory_region m_bios;
+
+	void io_map(address_map &map) ATTR_COLD;
+
+	bool fdc_drive_ready_r(upd765a_device *fdc);
+	u8 ctrl_r();
+	void ctrl_w(u8 data);
+
+	u8 m_ctrl;
 };
 
 

src/devices/bus/pc98_cbus/slot.h

@@ -120,7 +120,7 @@ class pc98_cbus_root_device : public device_t,
 	address_space_config m_space_mem_config;
 	address_space_config m_space_io_config;
 
-	devcb_write_line::array<7> m_int_cb;
+	devcb_write_line::array<8> m_int_cb;
 	devcb_write_line::array<4> m_drq_cb;
 
 	device_pc98_cbus_slot_interface *m_dma_device[8];

src/mame/nec/pc9801.cpp

@@ -137,30 +137,6 @@ bool pc9801_state::fdc_drive_ready_r(upd765a_device *fdc)
 	return (!floppy0->ready_r() || !floppy1->ready_r());
 }
 
-uint8_t pc9801_state::fdc_2dd_ctrl_r()
-{
-	u8 ret = 0;
-
-	// 2dd BIOS specifically tests if a disk is in any drive
-	// (does not happen on 2HD standalone)
-	ret |= fdc_drive_ready_r(m_fdc_2dd) << 4;
-
-	//popmessage("%d %d %02x", floppy0->ready_r(), floppy1->ready_r(), ret);
-
-	// TODO: dips et al.
-	return ret | 0x40;
-}
-
-void pc9801_state::fdc_2dd_ctrl_w(uint8_t data)
-{
-	logerror("%02x ctrl\n",data);
-	m_fdc_2dd->reset_w(BIT(data, 7));
-
-	m_fdc_2dd_ctrl = data;
-	m_fdc_2dd->subdevice<floppy_connector>("0")->get_device()->mon_w(data & 8 ? CLEAR_LINE : ASSERT_LINE);
-	m_fdc_2dd->subdevice<floppy_connector>("1")->get_device()->mon_w(data & 8 ? CLEAR_LINE : ASSERT_LINE);
-}
-
 u8 pc9801vm_state::ide_ctrl_hack_r()
 {
 	if (!machine().side_effects_disabled())
@@ -258,8 +234,8 @@ void pc9801_state::pc9801_io(address_map &map)
 	map(0x0092, 0x0092).rw(m_fdc_2hd, FUNC(upd765a_device::fifo_r), FUNC(upd765a_device::fifo_w));
 	map(0x0094, 0x0094).rw(FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w));
 	map(0x00a0, 0x00af).rw(FUNC(pc9801_state::pc9801_a0_r), FUNC(pc9801_state::pc9801_a0_w)); //upd7220 bitmap ports / display registers
-	map(0x00c8, 0x00cb).m(m_fdc_2dd, FUNC(upd765a_device::map)).umask16(0x00ff);
-	map(0x00cc, 0x00cc).rw(FUNC(pc9801_state::fdc_2dd_ctrl_r), FUNC(pc9801_state::fdc_2dd_ctrl_w)); //upd765a 2dd / <undefined>
+//	map(0x00c8, 0x00cb).m(m_fdc_2dd, FUNC(upd765a_device::map)).umask16(0x00ff);
+//	map(0x00cc, 0x00cc).rw(FUNC(pc9801_state::fdc_2dd_ctrl_r), FUNC(pc9801_state::fdc_2dd_ctrl_w)); //upd765a 2dd / <undefined>
 }
 
 /*************************************
@@ -1223,8 +1199,10 @@ void pc9801_state::tc_w(int state)
 		case 2:
 		case 3:
 			m_fdc_2hd->tc_w(state);
-			if(m_fdc_2dd)
-				m_fdc_2dd->tc_w(state);
+			if (m_dack == 3)
+				m_cbus_root->eop_w(3, state);
+			//if(m_fdc_2dd)
+			//	m_fdc_2dd->tc_w(state);
 			break;
 	}
 
@@ -1629,18 +1607,6 @@ static void pc9801_floppies(device_slot_interface &device)
 	device.option_add("35hd", FLOPPY_35_HD);
 }
 
-void pc9801_state::fdc_2dd_irq(int state)
-{
-	logerror("IRQ 2DD %d\n",state);
-
-	// TODO: does this mask applies to the specific timer irq trigger only?
-	// (bit 0 of control)
-	if(m_fdc_2dd_ctrl & 8)
-	{
-		m_pic2->ir2_w(state);
-	}
-}
-
 void pc9801vm_state::fdc_irq_w(int state)
 {
 	if(m_fdc_mode & 1)
@@ -1688,8 +1654,7 @@ MACHINE_START_MEMBER(pc9801_state,pc9801f)
 	MACHINE_START_CALL_MEMBER(pc9801_common);
 
 	m_fdc_2hd->set_rate(500000);
-	m_fdc_2dd->set_rate(250000);
-	// TODO: set_rpm for m_fdc_2dd?
+
 	m_sys_type = 0x00 >> 6;
 }
 
@@ -1903,10 +1868,12 @@ void pc9801_state::pc9801_cbus(machine_config &config)
 	m_cbus_root->int_cb<1>().set("pic8259_master", FUNC(pic8259_device::ir5_w));
 	m_cbus_root->int_cb<2>().set("pic8259_master", FUNC(pic8259_device::ir6_w));
 	m_cbus_root->int_cb<3>().set("pic8259_slave", FUNC(pic8259_device::ir1_w));
-	m_cbus_root->int_cb<4>().set("pic8259_slave", FUNC(pic8259_device::ir3_w));
+	m_cbus_root->int_cb<4>().set("pic8259_slave", FUNC(pic8259_device::ir3_w)); // INT42
 	m_cbus_root->int_cb<5>().set("pic8259_slave", FUNC(pic8259_device::ir4_w));
 	m_cbus_root->int_cb<6>().set("pic8259_slave", FUNC(pic8259_device::ir5_w));
+	m_cbus_root->int_cb<7>().set("pic8259_slave", FUNC(pic8259_device::ir2_w)); // INT41
 	m_cbus_root->drq_cb<0>().set(m_dmac, FUNC(am9517a_device::dreq0_w)).invert();
+	m_cbus_root->drq_cb<3>().set(m_dmac, FUNC(am9517a_device::dreq3_w)).invert();
 }
 
 void pc9801vm_state::cdrom_headphones(device_t *device)
@@ -1969,6 +1936,9 @@ void pc9801_state::pc9801_common(machine_config &config)
 
 	m_dmac->in_ior_callback<2>().set(m_fdc_2hd, FUNC(upd765a_device::dma_r));
 	m_dmac->out_iow_callback<2>().set(m_fdc_2hd, FUNC(upd765a_device::dma_w));
+	m_dmac->in_ior_callback<3>().set([this] () { return m_cbus_root->dack_r(3); });
+	m_dmac->out_iow_callback<3>().set([this] (u8 data) { m_cbus_root->dack_w(3, data); });
+
 	m_dmac->out_dack_callback<0>().set(FUNC(pc9801_state::dack0_w));
 	m_dmac->out_dack_callback<1>().set(FUNC(pc9801_state::dack1_w));
 	m_dmac->out_dack_callback<2>().set(FUNC(pc9801_state::dack2_w));
@@ -2061,17 +2031,8 @@ void pc9801_state::pc9801(machine_config &config)
 	MCFG_MACHINE_START_OVERRIDE(pc9801_state, pc9801f)
 	MCFG_MACHINE_RESET_OVERRIDE(pc9801_state, pc9801f)
 
-	UPD765A(config, m_fdc_2dd, 8'000'000, false, true);
-	m_fdc_2dd->intrq_wr_callback().set(FUNC(pc9801_state::fdc_2dd_irq));
-	m_fdc_2dd->drq_wr_callback().set(m_dmac, FUNC(am9517a_device::dreq3_w)).invert();
-	FLOPPY_CONNECTOR(config, "fdc_2dd:0", pc9801_floppies, "525dd", pc9801_state::floppy_formats);
-	FLOPPY_CONNECTOR(config, "fdc_2dd:1", pc9801_floppies, "525dd", pc9801_state::floppy_formats);
-
 	UPD1990A(config, m_rtc);
 
-	m_dmac->in_ior_callback<3>().set(m_fdc_2dd, FUNC(upd765a_device::dma_r));
-	m_dmac->out_iow_callback<3>().set(m_fdc_2dd, FUNC(upd765a_device::dma_w));
-
 	BEEP(config, m_beeper, 2400).add_route(ALL_OUTPUTS, "mono", 0.15);
 	PALETTE(config, m_palette, FUNC(pc9801_state::pc9801_palette), 16);
 

src/mame/nec/pc9801.h

@@ -139,7 +139,6 @@ class pc9801_state : public pc98_base_state
 		, m_dsw2(*this, "DSW2")
 		, m_ppi_mouse(*this, "ppi_mouse")
 		, m_fdc_2hd(*this, "fdc_2hd")
-		, m_fdc_2dd(*this, "fdc_2dd")
 		, m_hgdc(*this, "hgdc%d", 1)
 		, m_video_ram(*this, "video_ram_%d", 1)
 		, m_cbus_root(*this, "cbus_root")
@@ -167,7 +166,6 @@ class pc9801_state : public pc98_base_state
 	// TODO: should really be one FDC
 	// (I/O $90-$93 is a "simplified" version)
 	required_device<upd765a_device> m_fdc_2hd;
-	optional_device<upd765a_device> m_fdc_2dd;
 	required_device_array<upd7220_device, 2> m_hgdc;
 	required_shared_ptr_array<uint16_t, 2> m_video_ram;
 	required_device<pc98_cbus_root_device> m_cbus_root;
@@ -232,13 +230,6 @@ class pc9801_state : public pc98_base_state
 	u8 m_fdc_2hd_ctrl = 0;
 
 	bool fdc_drive_ready_r(upd765a_device *fdc);
-private:
-	void fdc_2dd_irq(int state);
-
-	uint8_t fdc_2dd_ctrl_r();
-	void fdc_2dd_ctrl_w(uint8_t data);
-
-	u8 m_fdc_2dd_ctrl = 0;
 
 //  DMA
 protected: