summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/imagedev
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-11-01 00:47:41 +1100
committer Vas Crabb <vas@vastheman.com>2019-11-01 00:47:41 +1100
commit6f4c1f6e5b2525ac8b700b3a0754f5e99c4223e1 (patch)
tree4b0e0ac5cf1c3a7fd518a7d8f4d12f39291b2629 /src/devices/imagedev
parent0be348c7fbc8c0478f724ba098dabeb9eb3aab8c (diff)
Spring cleaning:
* Changed emu_fatalerror to use util::string_format semantics * Fixed some incorrectly marked up stuff in build scripts * Make internal layout compression type a scoped enum (only zlib is supported still, but at least the values aren't magic numbers now) * Fixed memory leaks in Xbox USB * There can only be one "perfect quantum" device - enforce that only the root machine can set it, as allowing subdevices to will cause weird issues with slot cards overiding it * Allow multiple devices to set maximum quantum and use the most restrictive one (it's maximum quantum, it would be minimum interleave) * Got rid of device_slot_card_interface as it wasn't providing value * Added a helper template to reduce certain kinds of boilerplate in slots/buses * Cleaned up some particularly bad slot code (plenty more of that to do), and made some slots more idiomatic
Diffstat (limited to 'src/devices/imagedev')
-rw-r--r--src/devices/imagedev/floppy.cpp1
-rw-r--r--src/devices/imagedev/floppy.h3
-rw-r--r--src/devices/imagedev/mfmhd.cpp1
-rw-r--r--src/devices/imagedev/mfmhd.h3
4 files changed, 2 insertions, 6 deletions
diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp
index 60058681549..f725845fa0d 100644
--- a/src/devices/imagedev/floppy.cpp
+++ b/src/devices/imagedev/floppy.cpp
@@ -176,7 +176,6 @@ floppy_image_device *floppy_connector::get_device()
floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, type, tag, owner, clock),
device_image_interface(mconfig, *this),
- device_slot_card_interface(mconfig, *this),
input_format(nullptr),
output_format(nullptr),
image(nullptr),
diff --git a/src/devices/imagedev/floppy.h b/src/devices/imagedev/floppy.h
index c2380d6d02b..760cdc30a21 100644
--- a/src/devices/imagedev/floppy.h
+++ b/src/devices/imagedev/floppy.h
@@ -54,8 +54,7 @@ class floppy_sound_device;
***************************************************************************/
class floppy_image_device : public device_t,
- public device_image_interface,
- public device_slot_card_interface
+ public device_image_interface
{
public:
typedef delegate<image_init_result (floppy_image_device *)> load_cb;
diff --git a/src/devices/imagedev/mfmhd.cpp b/src/devices/imagedev/mfmhd.cpp
index 1d6d3574c07..eb953e72eaf 100644
--- a/src/devices/imagedev/mfmhd.cpp
+++ b/src/devices/imagedev/mfmhd.cpp
@@ -309,7 +309,6 @@ std::string mfm_harddisk_device::tts(const attotime &t)
mfm_harddisk_device::mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
: harddisk_image_device(mconfig, type, tag, owner, clock),
- device_slot_card_interface(mconfig, *this),
m_index_timer(nullptr),
m_spinup_timer(nullptr),
m_seek_timer(nullptr),
diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h
index a46dab519b7..2d689a168cb 100644
--- a/src/devices/imagedev/mfmhd.h
+++ b/src/devices/imagedev/mfmhd.h
@@ -48,8 +48,7 @@ private:
running_machine & m_machine;
};
-class mfm_harddisk_device : public harddisk_image_device,
- public device_slot_card_interface
+class mfm_harddisk_device : public harddisk_image_device
{
public:
~mfm_harddisk_device();