microdrv: Change image type to magtape; default clock; move to imagedev (nw)

This commit is contained in:
AJR 2019-07-30 21:02:54 -04:00
parent ab6a69e531
commit b218528e1f
8 changed files with 14 additions and 14 deletions

View File

@ -51,6 +51,8 @@ files {
MAME_DIR .. "src/devices/imagedev/harddriv.h",
MAME_DIR .. "src/devices/imagedev/mfmhd.cpp",
MAME_DIR .. "src/devices/imagedev/mfmhd.h",
MAME_DIR .. "src/devices/imagedev/microdrv.cpp",
MAME_DIR .. "src/devices/imagedev/microdrv.h",
MAME_DIR .. "src/devices/imagedev/midiin.cpp",
MAME_DIR .. "src/devices/imagedev/midiin.h",
MAME_DIR .. "src/devices/imagedev/midiout.cpp",

View File

@ -1453,8 +1453,6 @@ end
--------------------------------------------------
createMESSProjects(_target, _subtarget, "messshared")
files {
MAME_DIR .. "src/mame/machine/microdrv.cpp",
MAME_DIR .. "src/mame/machine/microdrv.h",
MAME_DIR .. "src/mame/machine/teleprinter.cpp",
MAME_DIR .. "src/mame/machine/teleprinter.h",
MAME_DIR .. "src/mame/machine/z80bin.cpp",

View File

@ -45,9 +45,9 @@ void spectrum_intf1_device::device_add_mconfig(machine_config &config)
RS232_PORT(config, m_rs232, default_rs232_devices, nullptr);
/* microdrive */
MICRODRIVE(config, m_mdv1, 0);
MICRODRIVE(config, m_mdv1);
m_mdv1->comms_out_wr_callback().set(m_mdv2, FUNC(microdrive_image_device::comms_in_w));
MICRODRIVE(config, m_mdv2, 0);
MICRODRIVE(config, m_mdv2);
/* passthru */
SPECTRUM_EXPANSION_SLOT(config, m_exp, spectrum_expansion_devices, nullptr);

View File

@ -12,7 +12,7 @@
#include "exp.h"
#include "bus/rs232/rs232.h"
#include "machine/microdrv.h"
#include "imagedev/microdrv.h"
//**************************************************************************
// TYPE DEFINITIONS

View File

@ -8,8 +8,8 @@
*********************************************************************/
#ifndef MAME_MACHINE_MICRODRV_H
#define MAME_MACHINE_MICRODRV_H
#ifndef MAME_DEVICES_IMAGEDEV_MICRODRV_H
#define MAME_DEVICES_IMAGEDEV_MICRODRV_H
#pragma once
@ -35,7 +35,7 @@ class microdrive_image_device : public device_t,
{
public:
// construction/destruction
microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
virtual ~microdrive_image_device();
auto comms_out_wr_callback() { return m_write_comms_out.bind(); }
@ -45,7 +45,7 @@ public:
virtual void call_unload() override;
virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); }
virtual iodevice_t image_type() const override { return IO_CASSETTE; }
virtual iodevice_t image_type() const override { return IO_MAGTAPE; }
virtual bool is_readable() const override { return 1; }
virtual bool is_writeable() const override { return 1; }
@ -91,4 +91,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(MICRODRIVE, microdrive_image_device)
#endif // MAME_MACHINE_MICRODRV_H
#endif // MAME_DEVICES_IMAGEDEV_MICRODRV_H

View File

@ -80,7 +80,7 @@
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/microdrv.h"
#include "imagedev/microdrv.h"
#include "machine/qimi.h"
#include "machine/ram.h"
#include "machine/zx8302.h"
@ -946,9 +946,9 @@ void ql_state::ql(machine_config &config)
m_zx8302->out_raw2_callback().set(FUNC(ql_state::zx8302_raw2_w));
m_zx8302->in_raw2_callback().set(FUNC(ql_state::zx8302_raw2_r));
MICRODRIVE(config, m_mdv1, 0);
MICRODRIVE(config, m_mdv1);
m_mdv1->comms_out_wr_callback().set(m_mdv2, FUNC(microdrive_image_device::comms_in_w));
MICRODRIVE(config, m_mdv2, 0);
MICRODRIVE(config, m_mdv2);
RS232_PORT(config, m_ser1, default_rs232_devices, nullptr); // wired as DCE
RS232_PORT(config, m_ser2, default_rs232_devices, nullptr); // wired as DTE

View File

@ -21,7 +21,7 @@
#include "emu.h"
#include "zx8302.h"
#include "machine/microdrv.h"
#include "imagedev/microdrv.h"
#include <time.h>