From bcad4e9c09a322a09bf18628e2f7c6cd3e4c1c01 Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Mon, 17 Sep 2018 19:18:38 +0100 Subject: bbcb: Added floppy disc controller options:- - AMS 3" Microdrive Disc System - Microware DDFS FDC (not working) --- scripts/src/bus.lua | 8 +- src/devices/bus/bbc/fdc/ams.cpp | 146 ++++++++++++++++++++++++++++ src/devices/bus/bbc/fdc/ams.h | 61 ++++++++++++ src/devices/bus/bbc/fdc/fdc.cpp | 8 +- src/devices/bus/bbc/fdc/microware.cpp | 176 ++++++++++++++++++++++++++++++++++ src/devices/bus/bbc/fdc/microware.h | 68 +++++++++++++ src/lib/formats/acorn_dsk.cpp | 4 + 7 files changed, 465 insertions(+), 6 deletions(-) create mode 100644 src/devices/bus/bbc/fdc/ams.cpp create mode 100644 src/devices/bus/bbc/fdc/ams.h create mode 100644 src/devices/bus/bbc/fdc/microware.cpp create mode 100644 src/devices/bus/bbc/fdc/microware.h diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 662b2627c7e..7a1ff75d43a 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -107,12 +107,12 @@ if (BUSES["ACORN"]~=null) then files { MAME_DIR .. "src/devices/bus/acorn/bus.cpp", MAME_DIR .. "src/devices/bus/acorn/bus.h", - MAME_DIR .. "src/devices/bus/acorn/atom/sid.cpp", - MAME_DIR .. "src/devices/bus/acorn/atom/sid.h", MAME_DIR .. "src/devices/bus/acorn/atom/discpack.cpp", MAME_DIR .. "src/devices/bus/acorn/atom/discpack.h", MAME_DIR .. "src/devices/bus/acorn/atom/econet.cpp", MAME_DIR .. "src/devices/bus/acorn/atom/econet.h", + MAME_DIR .. "src/devices/bus/acorn/atom/sid.cpp", + MAME_DIR .. "src/devices/bus/acorn/atom/sid.h", MAME_DIR .. "src/devices/bus/acorn/cms/4080term.cpp", MAME_DIR .. "src/devices/bus/acorn/cms/4080term.h", MAME_DIR .. "src/devices/bus/acorn/cms/fdc.cpp", @@ -273,10 +273,14 @@ if (BUSES["BBC_FDC"]~=null) then MAME_DIR .. "src/devices/bus/bbc/fdc/fdc.h", MAME_DIR .. "src/devices/bus/bbc/fdc/acorn.cpp", MAME_DIR .. "src/devices/bus/bbc/fdc/acorn.h", + MAME_DIR .. "src/devices/bus/bbc/fdc/ams.cpp", + MAME_DIR .. "src/devices/bus/bbc/fdc/ams.h", MAME_DIR .. "src/devices/bus/bbc/fdc/cumana.cpp", MAME_DIR .. "src/devices/bus/bbc/fdc/cumana.h", MAME_DIR .. "src/devices/bus/bbc/fdc/cv1797.cpp", MAME_DIR .. "src/devices/bus/bbc/fdc/cv1797.h", + MAME_DIR .. "src/devices/bus/bbc/fdc/microware.cpp", + MAME_DIR .. "src/devices/bus/bbc/fdc/microware.h", MAME_DIR .. "src/devices/bus/bbc/fdc/opus.cpp", MAME_DIR .. "src/devices/bus/bbc/fdc/opus.h", MAME_DIR .. "src/devices/bus/bbc/fdc/watford.cpp", diff --git a/src/devices/bus/bbc/fdc/ams.cpp b/src/devices/bus/bbc/fdc/ams.cpp new file mode 100644 index 00000000000..2afc7c969a2 --- /dev/null +++ b/src/devices/bus/bbc/fdc/ams.cpp @@ -0,0 +1,146 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/********************************************************************** + + AMS 3" Microdrive Disc System + +**********************************************************************/ + + +#include "emu.h" +#include "ams.h" + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE(BBC_AMS3, bbc_ams3_device, "bbc_ams3", "AMS 3" Microdrive Disc System") + + +//------------------------------------------------- +// MACHINE_DRIVER( ams3 ) +//------------------------------------------------- + +FLOPPY_FORMATS_MEMBER( bbc_ams3_device::floppy_formats ) + FLOPPY_ACORN_SSD_FORMAT +FLOPPY_FORMATS_END + +ROM_START( ams3 ) + ROM_REGION(0x8000, "dfs_rom", 0) + ROM_LOAD("dfs098.rom", 0x0000, 0x2000, CRC(90852e7d) SHA1(6df3552d5426f3a4625b9a0c7829bdba03f05e84)) + ROM_RELOAD( 0x2000, 0x2000) + ROM_LOAD("amsdisc.rom", 0x4000, 0x1000, CRC(93876595) SHA1(a9d9123667e65334b28b8588b09642478653e356)) + ROM_RELOAD( 0x5000, 0x1000) + ROM_RELOAD( 0x6000, 0x1000) + ROM_RELOAD( 0x7000, 0x1000) +ROM_END + + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void bbc_ams3_device::device_add_mconfig(machine_config &config) +{ + I8271(config, m_fdc, 16_MHz_XTAL / 8); + m_fdc->intrq_wr_callback().set(FUNC(bbc_ams3_device::fdc_intrq_w)); + m_fdc->hdl_wr_callback().set(FUNC(bbc_ams3_device::motor_w)); + m_fdc->opt_wr_callback().set(FUNC(bbc_ams3_device::side_w)); + // Hitachi HFD 305S + FLOPPY_CONNECTOR(config, m_floppy0, "3dsdd", FLOPPY_3_DSDD, true, bbc_ams3_device::floppy_formats).enable_sound(true); + FLOPPY_CONNECTOR(config, m_floppy1, "3dsdd", FLOPPY_3_DSDD, false, bbc_ams3_device::floppy_formats).enable_sound(true); +} + + +const tiny_rom_entry *bbc_ams3_device::device_rom_region() const +{ + return ROM_NAME( ams3 ); +} + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// bbc_ams3_device - constructor +//------------------------------------------------- + +bbc_ams3_device::bbc_ams3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, BBC_AMS3, tag, owner, clock) + , device_bbc_fdc_interface(mconfig, *this) + , m_dfs_rom(*this, "dfs_rom") + , m_fdc(*this, "i8271") + , m_floppy0(*this, "i8271:0") + , m_floppy1(*this, "i8271:1") +{ +} + + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void bbc_ams3_device::device_start() +{ +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void bbc_ams3_device::device_reset() +{ + machine().root_device().membank("bank4")->configure_entry(12, memregion("dfs_rom")->base() + 0x0000); + machine().root_device().membank("bank4")->configure_entry(13, memregion("dfs_rom")->base() + 0x4000); +} + + +//************************************************************************** +// IMPLEMENTATION +//************************************************************************** + +READ8_MEMBER(bbc_ams3_device::read) +{ + uint8_t data; + + if (offset & 0x04) + { + data = m_fdc->data_r(space , 0); + } + else + { + data = m_fdc->read(space, offset & 0x03); + } + return data; +} + +WRITE8_MEMBER(bbc_ams3_device::write) +{ + if (offset & 0x04) + { + m_fdc->data_w(space, 0, data); + } + else + { + m_fdc->write(space, offset & 0x03, data); + } +} + +WRITE_LINE_MEMBER(bbc_ams3_device::motor_w) +{ + if (m_floppy0->get_device()) m_floppy0->get_device()->mon_w(!state); + if (m_floppy1->get_device()) m_floppy1->get_device()->mon_w(!state); + m_fdc->ready_w(!state); +} + +WRITE_LINE_MEMBER(bbc_ams3_device::side_w) +{ + if (m_floppy0->get_device()) m_floppy0->get_device()->ss_w(state); + if (m_floppy1->get_device()) m_floppy1->get_device()->ss_w(state); +} + +WRITE_LINE_MEMBER(bbc_ams3_device::fdc_intrq_w) +{ + m_slot->intrq_w(state); +} diff --git a/src/devices/bus/bbc/fdc/ams.h b/src/devices/bus/bbc/fdc/ams.h new file mode 100644 index 00000000000..acdb077b3f6 --- /dev/null +++ b/src/devices/bus/bbc/fdc/ams.h @@ -0,0 +1,61 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/********************************************************************** + + AMS 3" Microdrive Disc System + +**********************************************************************/ + + +#ifndef MAME_BUS_BBC_FDC_AMS_H +#define MAME_BUS_BBC_FDC_AMS_H + +#pragma once + +#include "fdc.h" +#include "machine/i8271.h" +#include "formats/acorn_dsk.h" + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +class bbc_ams3_device : + public device_t, + public device_bbc_fdc_interface +{ +public: + // construction/destruction + bbc_ams3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + DECLARE_FLOPPY_FORMATS(floppy_formats); + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual const tiny_rom_entry *device_rom_region() const override; + + virtual DECLARE_READ8_MEMBER(read) override; + virtual DECLARE_WRITE8_MEMBER(write) override; + +private: + DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); + DECLARE_WRITE_LINE_MEMBER(motor_w); + DECLARE_WRITE_LINE_MEMBER(side_w); + + required_memory_region m_dfs_rom; + required_device m_fdc; + required_device m_floppy0; + optional_device m_floppy1; +}; + + +// device type definition +DECLARE_DEVICE_TYPE(BBC_AMS3, bbc_ams3_device) + + +#endif // MAME_BUS_BBC_FDC_AMS_H diff --git a/src/devices/bus/bbc/fdc/fdc.cpp b/src/devices/bus/bbc/fdc/fdc.cpp index d3588ea9f6f..1db62be6357 100644 --- a/src/devices/bus/bbc/fdc/fdc.cpp +++ b/src/devices/bus/bbc/fdc/fdc.cpp @@ -114,10 +114,10 @@ WRITE8_MEMBER(bbc_fdc_slot_device::write) // slot devices #include "acorn.h" -//#include "ams.h" +#include "ams.h" #include "cumana.h" #include "cv1797.h" -//#include "microware.h" +#include "microware.h" #include "opus.h" //#include "solidisk.h" #include "watford.h" @@ -128,11 +128,11 @@ void bbc_fdc_devices(device_slot_interface &device) { device.option_add("acorn8271", BBC_ACORN8271); device.option_add("acorn1770", BBC_ACORN1770); - //device.option_add("ams3", BBC_AMS3); + device.option_add("ams3", BBC_AMS3); device.option_add("cumana1", BBC_CUMANA1); device.option_add("cumana2", BBC_CUMANA2); device.option_add("cv1797", BBC_CV1797); - //device.option_add("microware", BBC_MICROWARE); + device.option_add("microware", BBC_MICROWARE); device.option_add("opus8272", BBC_OPUS8272); device.option_add("opus2791", BBC_OPUS2791); device.option_add("opus2793", BBC_OPUS2793); diff --git a/src/devices/bus/bbc/fdc/microware.cpp b/src/devices/bus/bbc/fdc/microware.cpp new file mode 100644 index 00000000000..2dc527ea822 --- /dev/null +++ b/src/devices/bus/bbc/fdc/microware.cpp @@ -0,0 +1,176 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/********************************************************************** + + United Disk Memories DDFS FDC + + Microware DDFS FDC + +**********************************************************************/ + + +#include "emu.h" +#include "microware.h" + + +//************************************************************************** +// DEVICE DEFINITIONS +//************************************************************************** + +DEFINE_DEVICE_TYPE(BBC_MICROWARE, bbc_microware_device, "bbc_microware", "Microware DDFS FDC") + + +//------------------------------------------------- +// MACHINE_DRIVER( microware ) +//------------------------------------------------- + +FLOPPY_FORMATS_MEMBER( bbc_microware_device::floppy_formats ) + FLOPPY_ACORN_SSD_FORMAT, + FLOPPY_ACORN_DSD_FORMAT, + FLOPPY_FSD_FORMAT +FLOPPY_FORMATS_END + +static void bbc_floppies_525(device_slot_interface &device) +{ + device.option_add("525sssd", FLOPPY_525_SSSD); + device.option_add("525sd", FLOPPY_525_SD); + device.option_add("525ssdd", FLOPPY_525_SSDD); + device.option_add("525dd", FLOPPY_525_DD); + device.option_add("525qd", FLOPPY_525_QD); +} + +ROM_START( microware ) + ROM_REGION(0x4000, "dfs_rom", 0) + ROM_DEFAULT_BIOS("udm200") + ROM_SYSTEM_BIOS(0, "ddfs090", "Microware DDFS 0.90") + ROMX_LOAD("microware_ddfs090.rom", 0x0000, 0x4000, CRC(700d50e5) SHA1(6834e46cb15354003d553e6c2bdb4ed76b47a465), ROM_BIOS(0)) + ROM_SYSTEM_BIOS(1, "udm200", "UDM DDFS 2.00") + ROMX_LOAD("udm_ddfs200.rom", 0x0000, 0x4000, CRC(1b4708a2) SHA1(0f37bcc73a758657cfe58c19f0cc92be9107e767), ROM_BIOS(1)) +ROM_END + + +//------------------------------------------------- +// device_add_mconfig - add device configuration +//------------------------------------------------- + +void bbc_microware_device::device_add_mconfig(machine_config &config) +{ + WD2793(config, m_fdc, 16_MHz_XTAL / 16); // Replay advert suggests Type R8272 UDM DFS + m_fdc->intrq_wr_callback().set(FUNC(bbc_microware_device::fdc_intrq_w)); + m_fdc->drq_wr_callback().set(FUNC(bbc_microware_device::fdc_drq_w)); + m_fdc->hld_wr_callback().set(FUNC(bbc_microware_device::motor_w)); + + FLOPPY_CONNECTOR(config, m_floppy0, bbc_floppies_525, "525qd", floppy_formats).enable_sound(true); + FLOPPY_CONNECTOR(config, m_floppy1, bbc_floppies_525, "525qd", floppy_formats).enable_sound(true); +} + +const tiny_rom_entry *bbc_microware_device::device_rom_region() const +{ + return ROM_NAME( microware ); +} + +//************************************************************************** +// LIVE DEVICE +//************************************************************************** + +//------------------------------------------------- +// bbc_microware_device - constructor +//------------------------------------------------- + +bbc_microware_device::bbc_microware_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, BBC_MICROWARE, tag, owner, clock) + , device_bbc_fdc_interface(mconfig, *this) + , m_dfs_rom(*this, "dfs_rom") + , m_fdc(*this, "wd2793") + , m_floppy0(*this, "wd2793:0") + , m_floppy1(*this, "wd2793:1") + , m_drive_control(0) +{ +} + +//------------------------------------------------- +// device_start - device-specific startup +//------------------------------------------------- + +void bbc_microware_device::device_start() +{ + save_item(NAME(m_drive_control)); +} + +//------------------------------------------------- +// device_reset - device-specific reset +//------------------------------------------------- + +void bbc_microware_device::device_reset() +{ + machine().root_device().membank("bank4")->configure_entry(12, memregion("dfs_rom")->base()); +} + + +//************************************************************************** +// IMPLEMENTATION +//************************************************************************** + +READ8_MEMBER(bbc_microware_device::read) +{ + uint8_t data; + + if (offset & 0x04) + { + data = m_fdc->read(offset & 0x03); + } + else + { + data = m_drive_control; + } + return data; +} + +WRITE8_MEMBER(bbc_microware_device::write) +{ + if (offset & 0x04) + { + m_fdc->write(offset & 0x03, data); + } + else + { + floppy_image_device *floppy = nullptr; + + m_drive_control = data; + logerror("fdc: Drive control %02x \n", data); + // bit 0: drive select + switch (BIT(data, 0)) + { + case 0: floppy = m_floppy0->get_device(); break; + case 1: floppy = m_floppy1->get_device(); break; + } + m_fdc->set_floppy(floppy); + + // bit 1: side select + if (floppy) + floppy->ss_w(BIT(data, 1)); + + // bit 2: density + m_fdc->dden_w(BIT(data, 2)); + + // bit 3: always set ??? + + // bit 4: ??? interrupt + } +} + +WRITE_LINE_MEMBER(bbc_microware_device::fdc_intrq_w) +{ + m_slot->intrq_w(state); +} + +WRITE_LINE_MEMBER(bbc_microware_device::fdc_drq_w) +{ + m_slot->drq_w(state); +} + +WRITE_LINE_MEMBER(bbc_microware_device::motor_w) +{ + if (m_floppy0->get_device()) m_floppy0->get_device()->mon_w(!state); + if (m_floppy1->get_device()) m_floppy1->get_device()->mon_w(!state); +} diff --git a/src/devices/bus/bbc/fdc/microware.h b/src/devices/bus/bbc/fdc/microware.h new file mode 100644 index 00000000000..9d42eb2b668 --- /dev/null +++ b/src/devices/bus/bbc/fdc/microware.h @@ -0,0 +1,68 @@ +// license:BSD-3-Clause +// copyright-holders:Nigel Barnes +/********************************************************************** + + United Disk Memories DDFS FDC + + Microware DDFS FDC + +**********************************************************************/ + + +#ifndef MAME_BUS_BBC_FDC_MICROWARE_H +#define MAME_BUS_BBC_FDC_MICROWARE_H + +#pragma once + +#include "fdc.h" +#include "machine/wd_fdc.h" +#include "formats/acorn_dsk.h" +#include "formats/fsd_dsk.h" + +//************************************************************************** +// TYPE DEFINITIONS +//************************************************************************** + +class bbc_microware_device : + public device_t, + public device_bbc_fdc_interface +{ +public: + static constexpr feature_type imperfect_features() { return feature::DISK; } + + // construction/destruction + bbc_microware_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual const tiny_rom_entry *device_rom_region() const override; + + virtual DECLARE_READ8_MEMBER(read) override; + virtual DECLARE_WRITE8_MEMBER(write) override; + +private: + DECLARE_FLOPPY_FORMATS(floppy_formats); + + DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); + DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + DECLARE_WRITE_LINE_MEMBER(motor_w); + + required_memory_region m_dfs_rom; + required_device m_fdc; + required_device m_floppy0; + optional_device m_floppy1; + + int m_drive_control; +}; + + +// device type definition +DECLARE_DEVICE_TYPE(BBC_MICROWARE, bbc_microware_device); + + +#endif /* MAME_BUS_BBC_FDC_MICROWARE_H */ diff --git a/src/lib/formats/acorn_dsk.cpp b/src/lib/formats/acorn_dsk.cpp index 59261f9b4d5..d8992b9ad5a 100644 --- a/src/lib/formats/acorn_dsk.cpp +++ b/src/lib/formats/acorn_dsk.cpp @@ -127,6 +127,10 @@ const acorn_ssd_format::format acorn_ssd_format::formats[] = floppy_image::FF_35, floppy_image::DSDD, floppy_image::FM, 4000, 10, 80, 2, 256,{}, 0,{}, 40, 10, 10 }, + { // 100k 40 track single sided single density + floppy_image::FF_3, floppy_image::SSSD, floppy_image::FM, + 4000, 10, 40, 1, 256,{}, 0,{}, 40, 10, 10 + }, {} }; -- cgit v1.2.3