diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp
index afc7a14e913..ff73d6bb72f 100644
--- a/src/mame/drivers/trs80.cpp
+++ b/src/mame/drivers/trs80.cpp
@@ -119,7 +119,7 @@ Not emulated:
  LNW80 1.77 / 4.0 MHz switch (this is a physical switch)
  Radionic has 16 colours with a byte at 350B controlling the operation. See manual.
 
-Virtual floppy disk formats are JV1, JV3, and DMK. Only the JV1 is emulated.
+Virtual floppy disk formats are JV1, JV3, and DMK. JV3 is not emulated.
 
 ********************************************************************************************************
 
@@ -194,11 +194,7 @@ void trs80_state::m1_mem(address_map &map)
 	map(0x37e0, 0x37e3).rw(FUNC(trs80_state::irq_status_r), FUNC(trs80_state::motor_w));
 	map(0x37e4, 0x37e7).w(FUNC(trs80_state::cassunit_w));
 	map(0x37e8, 0x37eb).rw(FUNC(trs80_state::printer_r), FUNC(trs80_state::printer_w));
-	map(0x37ec, 0x37ec).r(FUNC(trs80_state::wd179x_r));
-	map(0x37ec, 0x37ec).w(m_fdc, FUNC(fd1793_device::cmd_w));
-	map(0x37ed, 0x37ed).rw(m_fdc, FUNC(fd1793_device::track_r), FUNC(fd1793_device::track_w));
-	map(0x37ee, 0x37ee).rw(m_fdc, FUNC(fd1793_device::sector_r), FUNC(fd1793_device::sector_w));
-	map(0x37ef, 0x37ef).rw(m_fdc, FUNC(fd1793_device::data_r), FUNC(fd1793_device::data_w));
+	map(0x37ec, 0x37ef).rw(FUNC(trs80_state::fdc_r), FUNC(trs80_state::fdc_w));
 	map(0x3800, 0x3bff).r(FUNC(trs80_state::keyboard_r));
 	map(0x3c00, 0x3fff).ram().share(m_p_videoram);
 	map(0x4000, 0xffff).ram();
@@ -246,11 +242,7 @@ void trs80_state::lnw_banked_mem(address_map &map)
 	map(0x0000, 0x2fff).rom().region("maincpu", 0);
 	map(0x37e0, 0x37e3).rw(FUNC(trs80_state::irq_status_r), FUNC(trs80_state::motor_w));
 	map(0x37e8, 0x37eb).rw(FUNC(trs80_state::printer_r), FUNC(trs80_state::printer_w));
-	map(0x37ec, 0x37ec).r(FUNC(trs80_state::wd179x_r));
-	map(0x37ec, 0x37ec).w(m_fdc, FUNC(fd1793_device::cmd_w));
-	map(0x37ed, 0x37ed).rw(m_fdc, FUNC(fd1793_device::track_r), FUNC(fd1793_device::track_w));
-	map(0x37ee, 0x37ee).rw(m_fdc, FUNC(fd1793_device::sector_r), FUNC(fd1793_device::sector_w));
-	map(0x37ef, 0x37ef).rw(m_fdc, FUNC(fd1793_device::data_r), FUNC(fd1793_device::data_w));
+	map(0x37ec, 0x37ef).rw(FUNC(trs80_state::fdc_r), FUNC(trs80_state::fdc_w));
 	map(0x3800, 0x3bff).r(FUNC(trs80_state::keyboard_r));
 	map(0x3c00, 0x3fff).ram().share(m_p_videoram);
 	map(0x4000, 0x7fff).ram().share(m_p_gfxram);
@@ -497,14 +489,13 @@ GFXDECODE_END
 
 void trs80_state::floppy_formats(format_registration &fr)
 {
-	fr.add_mfm_containers();
 	fr.add(FLOPPY_TRS80_FORMAT);
 	fr.add(FLOPPY_DMK_FORMAT);
 }
 
 static void trs80_floppies(device_slot_interface &device)
 {
-	device.option_add("sssd", FLOPPY_525_QD);
+	device.option_add("sssd", FLOPPY_525_QD); // QD allows the 80-track boot disks to work.
 }
 
 
@@ -547,7 +538,7 @@ void trs80_state::model1(machine_config &config)      // model I, level II
 
 	QUICKLOAD(config, "quickload", "cmd", attotime::from_seconds(1)).set_load_callback(FUNC(trs80_state::quickload_cb));
 
-	FD1793(config, m_fdc, 4_MHz_XTAL / 4); // todo: should be fd1771
+	FD1771(config, m_fdc, 4_MHz_XTAL / 4);
 	m_fdc->intrq_wr_callback().set(FUNC(trs80_state::intrq_w));
 
 	FLOPPY_CONNECTOR(config, "fdc:0", trs80_floppies, "sssd", trs80_state::floppy_formats).enable_sound(true);
diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h
index bf55ea21768..ebd2d8fe77c 100644
--- a/src/mame/includes/trs80.h
+++ b/src/mame/includes/trs80.h
@@ -88,7 +88,8 @@ private:
 	void cassunit_w(uint8_t data);
 	void motor_w(uint8_t data);
 	uint8_t keyboard_r(offs_t offset);
-	uint8_t wd179x_r();
+	u8 fdc_r(offs_t offset);
+	void fdc_w(offs_t offset, u8 data);
 
 	INTERRUPT_GEN_MEMBER(rtc_interrupt);
 	INTERRUPT_GEN_MEMBER(fdc_interrupt);
@@ -137,7 +138,7 @@ private:
 	optional_device<ay31015_device> m_uart;
 	optional_device<clock_device> m_uart_clock;
 	optional_device<i8255_device> m_ppi;
-	optional_device<fd1793_device> m_fdc;
+	optional_device<fd1771_device> m_fdc;
 	optional_device<floppy_connector> m_floppy0;
 	optional_device<floppy_connector> m_floppy1;
 	optional_device<floppy_connector> m_floppy2;
diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp
index 99dbe12934d..4f483874c15 100644
--- a/src/mame/machine/trs80.cpp
+++ b/src/mame/machine/trs80.cpp
@@ -251,13 +251,17 @@ WRITE_LINE_MEMBER(trs80_state::intrq_w)
  *                                   *
  *************************************/
 
-uint8_t trs80_state::wd179x_r()
+u8 trs80_state::fdc_r(offs_t offset)
 {
-	uint8_t data = 0xff;
-	if (BIT(m_io_config->read(), 7))
-		data = m_fdc->status_r();
+	if ((offset == 0) && (!BIT(m_io_config->read(), 7)))
+		return 0xff;
+	else
+		return m_fdc->read(offset) ^ 0xff;
+}
 
-	return data;
+void trs80_state::fdc_w(offs_t offset, u8 data)
+{
+	m_fdc->write(offset, data ^ 0xff);
 }
 
 uint8_t trs80_state::printer_r()