summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/includes
diff options
context:
space:
mode:
author Dirk Best <mail@dirk-best.de>2015-07-06 10:24:28 +0200
committer Dirk Best <mail@dirk-best.de>2015-07-06 11:23:38 +0200
commit4124faf73c2406eea368a32c4e3c4ec6aa17492f (patch)
treec41f15dc0f1d2bc83155ff0cdeda97d4596049b2 /src/mess/includes
parentf32f4e5ba0eed127e0308b36be53aa3696589748 (diff)
c1pmf: updated to use new floppy
Diffstat (limited to 'src/mess/includes')
-rw-r--r--src/mess/includes/osi.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/mess/includes/osi.h b/src/mess/includes/osi.h
index 1285d0d8516..735b511fc37 100644
--- a/src/mess/includes/osi.h
+++ b/src/mess/includes/osi.h
@@ -10,7 +10,7 @@
#include "cpu/m6502/m6502.h"
#include "formats/basicdsk.h"
#include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
#include "machine/6850acia.h"
#include "machine/6821pia.h"
#include "machine/ram.h"
@@ -60,7 +60,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( cassette_tx );
DECLARE_WRITE_LINE_MEMBER( write_cassette_clock );
- DECLARE_WRITE_LINE_MEMBER(osi470_index_callback);
+ void floppy_index_callback(floppy_image_device *floppy, int state);
DECLARE_PALETTE_INIT(osi630);
@@ -126,19 +126,23 @@ public:
class c1pmf_state : public c1p_state
{
public:
- c1pmf_state(const machine_config &mconfig, device_type type, const char *tag)
- : c1p_state(mconfig, type, tag),
- m_floppy(*this, FLOPPY_0)
+ c1pmf_state(const machine_config &mconfig, device_type type, const char *tag) :
+ c1p_state(mconfig, type, tag),
+ m_floppy0(*this, "floppy0"),
+ m_floppy1(*this, "floppy1")
{ }
- required_device<legacy_floppy_image_device> m_floppy;
-
- virtual void machine_start();
-
DECLARE_READ8_MEMBER( osi470_pia_pa_r );
DECLARE_WRITE8_MEMBER( osi470_pia_pa_w );
DECLARE_WRITE8_MEMBER( osi470_pia_pb_w );
DECLARE_WRITE_LINE_MEMBER( osi470_pia_cb2_w );
+
+protected:
+ virtual void machine_start();
+
+private:
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
};
class uk101_state : public sb2m600_state