summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/apricot/expansion/winchester.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/apricot/expansion/winchester.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/apricot/expansion/winchester.cpp')
-rw-r--r--src/devices/bus/apricot/expansion/winchester.cpp254
1 files changed, 0 insertions, 254 deletions
diff --git a/src/devices/bus/apricot/expansion/winchester.cpp b/src/devices/bus/apricot/expansion/winchester.cpp
deleted file mode 100644
index f16752b3ede..00000000000
--- a/src/devices/bus/apricot/expansion/winchester.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Dirk Best
-/***************************************************************************
-
- ACT Apricot Winchester Controller
-
- Version Rev 9
-
-***************************************************************************/
-
-#include "emu.h"
-#include "winchester.h"
-#include "imagedev/harddriv.h"
-
-//#define LOG_GENERAL (1U << 0)
-#define LOG_REGS (1U << 1)
-#define LOG_DATA (1U << 2)
-
-//#define VERBOSE (LOG_REGS)
-//#define LOG_OUTPUT_STREAM std::cout
-
-#include "logmacro.h"
-
-#define LOGREGS(...) LOGMASKED(LOG_REGS, __VA_ARGS__)
-#define LOGDATA(...) LOGMASKED(LOG_DATA, __VA_ARGS__)
-
-
-//**************************************************************************
-// DEVICE DEFINITIONS
-//**************************************************************************
-
-DEFINE_DEVICE_TYPE(APRICOT_WINCHESTER, apricot_winchester_device, "apricot_winchester", "Apricot Winchester Controller Board")
-
-//-------------------------------------------------
-// regs - controller register i/o map
-//-------------------------------------------------
-
-void apricot_winchester_device::regs(address_map &map)
-{
- map(0x0e0, 0x0ef).rw(m_hdc, FUNC(wd1010_device::read), FUNC(wd1010_device::write)).umask16(0x00ff);
- map(0x1e0, 0x1e0).rw(FUNC(apricot_winchester_device::int_r), FUNC(apricot_winchester_device::head_w<0>)).umask16(0x00ff);
- map(0x1e2, 0x1e2).w(FUNC(apricot_winchester_device::head_w<1>)).umask16(0x00ff);
- map(0x1e4, 0x1e4).w(FUNC(apricot_winchester_device::head_w<2>)).umask16(0x00ff);
- map(0x1e6, 0x1e6).w(FUNC(apricot_winchester_device::drive_w<0>)).umask16(0x00ff);
- map(0x1e8, 0x1e8).w(FUNC(apricot_winchester_device::xferd_w)).umask16(0x00ff); // transferred
- map(0x1ea, 0x1ea).w(FUNC(apricot_winchester_device::hbcr_w)).umask16(0x00ff); // host buffer clear register
- map(0x1ec, 0x1ec).w(FUNC(apricot_winchester_device::clksel_w)).umask16(0x00ff); // buffer chip read/write clock select (host or wdc)
- map(0x1ee, 0x1ee).w(FUNC(apricot_winchester_device::drive_w<1>)).umask16(0x00ff);
- map(0x1f0, 0x1f0).rw(FUNC(apricot_winchester_device::data_r), FUNC(apricot_winchester_device::data_w)).umask16(0x00ff);
-}
-
-//-------------------------------------------------
-// device_add_mconfig - add device configuration
-//-------------------------------------------------
-
-void apricot_winchester_device::device_add_mconfig(machine_config &config)
-{
- WD1010(config, m_hdc, 5000000);
- m_hdc->out_intrq_callback().set(FUNC(apricot_winchester_device::hdc_intrq_w));
- m_hdc->in_data_callback().set(FUNC(apricot_winchester_device::hdc_data_r));
- m_hdc->out_data_callback().set(FUNC(apricot_winchester_device::hdc_data_w));
-
- HARDDISK(config, "hdc:0", 0);
- HARDDISK(config, "hdc:1", 0);
-}
-
-
-//**************************************************************************
-// LIVE DEVICE
-//**************************************************************************
-
-//-------------------------------------------------
-// apricot_winchester_device - constructor
-//-------------------------------------------------
-
-apricot_winchester_device::apricot_winchester_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, APRICOT_WINCHESTER, tag, owner, clock),
- device_apricot_expansion_card_interface(mconfig, *this),
- m_hdc(*this, "hdc"),
- m_ram_ptr(0),
- m_int(0),
- m_drive(0),
- m_head(0),
- m_hbcr(0),
- m_clksel(0)
-{
-}
-
-//-------------------------------------------------
-// device_start - device-specific startup
-//-------------------------------------------------
-
-void apricot_winchester_device::device_start()
-{
- // allocate 8-bit buffer ram (8k)
- m_ram = std::make_unique<uint8_t[]>(0x2000);
-
- // register for save states
- save_pointer(NAME(m_ram), 0x2000);
- save_item(NAME(m_ram_ptr));
- save_item(NAME(m_int));
- save_item(NAME(m_drive));
- save_item(NAME(m_head));
- save_item(NAME(m_hbcr));
- save_item(NAME(m_clksel));
-}
-
-//-------------------------------------------------
-// device_reset - device-specific reset
-//-------------------------------------------------
-
-void apricot_winchester_device::device_reset()
-{
- m_bus->install_io_device(0x000, 0xfff, *this, &apricot_winchester_device::regs);
-}
-
-
-//**************************************************************************
-// IMPLEMENTATION
-//**************************************************************************
-
-WRITE_LINE_MEMBER( apricot_winchester_device::hdc_intrq_w )
-{
- LOGREGS("hdc_intrq_w: %d\n", state);
-
- m_int = state;
- m_bus->int2_w(state);
-}
-
-READ8_MEMBER( apricot_winchester_device::hdc_data_r )
-{
- uint8_t data = 0xff;
-
- if (m_clksel == 1)
- {
- LOGDATA("hdc_data_r[%04x]\n", m_ram_ptr);
-
- data = m_ram[m_ram_ptr];
- if (m_ram_ptr < 0x1fff)
- m_ram_ptr++;
- }
-
- return data;
-}
-
-WRITE8_MEMBER( apricot_winchester_device::hdc_data_w )
-{
- if (m_clksel == 1)
- {
- LOGDATA("hdc_data_w[%04x] = %02x\n", m_ram_ptr, data);
-
- m_ram[m_ram_ptr] = data;
- if (m_ram_ptr < 0x1fff)
- m_ram_ptr++;
- }
-}
-
-READ8_MEMBER( apricot_winchester_device::int_r )
-{
- return m_int;
-}
-
-template<int N>
-WRITE8_MEMBER( apricot_winchester_device::head_w )
-{
- m_head = (m_head & ~(1 << N)) | (BIT(data, 0) << N);
- LOGREGS("Select head: %d\n", m_head);
-}
-
-template<int N>
-WRITE8_MEMBER( apricot_winchester_device::drive_w )
-{
- m_drive = (m_drive & ~(1 << N)) | (BIT(data, 0) << N);
- LOGREGS("Select drive: %d\n", m_drive);
-
- // forward drive status to the hdc
- harddisk_image_device *drive = nullptr;
-
- switch (m_drive)
- {
- case 0:
- drive = nullptr;
- break;
- case 1:
- drive = m_hdc->subdevice<harddisk_image_device>("0");
- break;
- case 2:
- drive = m_hdc->subdevice<harddisk_image_device>("1");
- break;
- case 3:
- // both (invalid?)
- drive = nullptr;
- break;
- }
-
- m_hdc->drdy_w(drive != nullptr && drive->exists());
-}
-
-WRITE8_MEMBER( apricot_winchester_device::xferd_w )
-{
- LOGREGS("xferd_w: %02x\n", data);
-
- m_hdc->brdy_w(BIT(data, 0));
-}
-
-WRITE8_MEMBER( apricot_winchester_device::hbcr_w )
-{
- LOGREGS("hbcr_w: %02x\n", data);
-
- // reset ram pointer on high->low transition
- if (m_hbcr == 1 && data == 0)
- m_ram_ptr = 0;
-
- m_hbcr = BIT(data, 0);
-}
-
-WRITE8_MEMBER( apricot_winchester_device::clksel_w )
-{
- LOGREGS("clksel_w: %02x\n", data);
-
- m_clksel = BIT(data, 0);
-}
-
-READ8_MEMBER( apricot_winchester_device::data_r )
-{
- uint8_t data = 0xff;
-
- if (m_clksel == 0)
- {
- LOGDATA("data_r[%04x]\n", m_ram_ptr);
-
- data = m_ram[m_ram_ptr];
-
- // wrap or stop at end?
- if (m_ram_ptr < 0x1fff)
- m_ram_ptr++;
- }
-
- return data;
-}
-
-WRITE8_MEMBER( apricot_winchester_device::data_w )
-{
- if (m_clksel == 0)
- {
- LOGDATA("data_w[%04x] = %02x\n", m_ram_ptr, data);
-
- m_ram[m_ram_ptr] = data;
-
- // wrap or stop at end?
- if (m_ram_ptr < 0x1fff)
- m_ram_ptr++;
- }
-}