summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-07-30 21:02:54 -0400
committer AJR <ajrhacker@users.noreply.github.com>2019-07-30 21:04:38 -0400
commitb218528e1f1857d06d7c08b8ffccdfef50c24e43 (patch)
tree2f76c449d90304ca39e4f2f4ba82b17c301c3827
parentab6a69e531c9f2b6772f09a4ea3604edf838ce4d (diff)
microdrv: Change image type to magtape; default clock; move to imagedev (nw)
-rw-r--r--scripts/src/machine.lua2
-rw-r--r--scripts/target/mame/mess.lua2
-rw-r--r--src/devices/bus/spectrum/intf1.cpp4
-rw-r--r--src/devices/bus/spectrum/intf1.h2
-rw-r--r--src/devices/imagedev/microdrv.cpp (renamed from src/mame/machine/microdrv.cpp)0
-rw-r--r--src/devices/imagedev/microdrv.h (renamed from src/mame/machine/microdrv.h)10
-rw-r--r--src/mame/drivers/ql.cpp6
-rw-r--r--src/mame/machine/zx8302.cpp2
8 files changed, 14 insertions, 14 deletions
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 82d77e9ab18..1d6c95d3346 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -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",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 4786db2e3f2..4230fc88ead 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -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",
diff --git a/src/devices/bus/spectrum/intf1.cpp b/src/devices/bus/spectrum/intf1.cpp
index a5e1859e28a..ce9713c66e2 100644
--- a/src/devices/bus/spectrum/intf1.cpp
+++ b/src/devices/bus/spectrum/intf1.cpp
@@ -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);
diff --git a/src/devices/bus/spectrum/intf1.h b/src/devices/bus/spectrum/intf1.h
index 3a09ca74a0a..022efc9b557 100644
--- a/src/devices/bus/spectrum/intf1.h
+++ b/src/devices/bus/spectrum/intf1.h
@@ -12,7 +12,7 @@
#include "exp.h"
#include "bus/rs232/rs232.h"
-#include "machine/microdrv.h"
+#include "imagedev/microdrv.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/machine/microdrv.cpp b/src/devices/imagedev/microdrv.cpp
index 1947d22f840..1947d22f840 100644
--- a/src/mame/machine/microdrv.cpp
+++ b/src/devices/imagedev/microdrv.cpp
diff --git a/src/mame/machine/microdrv.h b/src/devices/imagedev/microdrv.h
index 2b7202cd321..4ec1f728d83 100644
--- a/src/mame/machine/microdrv.h
+++ b/src/devices/imagedev/microdrv.h
@@ -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
diff --git a/src/mame/drivers/ql.cpp b/src/mame/drivers/ql.cpp
index d7c00923d23..d33fba654e6 100644
--- a/src/mame/drivers/ql.cpp
+++ b/src/mame/drivers/ql.cpp
@@ -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
diff --git a/src/mame/machine/zx8302.cpp b/src/mame/machine/zx8302.cpp
index f161efc364e..97d5c0ee0c9 100644
--- a/src/mame/machine/zx8302.cpp
+++ b/src/mame/machine/zx8302.cpp
@@ -21,7 +21,7 @@
#include "emu.h"
#include "zx8302.h"
-#include "machine/microdrv.h"
+#include "imagedev/microdrv.h"
#include <time.h>