summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/spectrum/sixword.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/spectrum/sixword.h')
-rw-r--r--src/devices/bus/spectrum/sixword.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/devices/bus/spectrum/sixword.h b/src/devices/bus/spectrum/sixword.h
index 32370577080..2c35304a391 100644
--- a/src/devices/bus/spectrum/sixword.h
+++ b/src/devices/bus/spectrum/sixword.h
@@ -14,7 +14,6 @@
#include "machine/wd_fdc.h"
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
-#include "formats/swd_dsk.h"
//**************************************************************************
// TYPE DEFINITIONS
@@ -30,7 +29,7 @@ public:
spectrum_swiftdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void floppy_formats(format_registration &fr);
- DECLARE_INPUT_CHANGED_MEMBER(nmi_button) { m_rombank |= newval << 12; m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); };
+ DECLARE_INPUT_CHANGED_MEMBER(nmi_button) { m_rombank |= newval << 12; m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); }
protected:
spectrum_swiftdisc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -49,12 +48,12 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t iorq_r(offs_t offset) override;
- virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+ virtual bool romcs() override;
// passthru
- virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); };
- virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
- virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+ virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }
+ virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }
+ virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }
virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); }
required_memory_region m_rom;
@@ -64,7 +63,7 @@ protected:
required_device<rs232_port_device> m_rs232;
required_ioport m_joy;
- int m_romcs;
+ bool m_romcs;
u8 m_ram[0x2000];
u16 m_rombank;
u8 m_control;
@@ -92,7 +91,7 @@ protected:
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; };
+ void busy_w(int state) { m_busy = state; }
required_device<centronics_device> m_centronics;
required_ioport m_conf;