diff options
Diffstat (limited to 'src/devices/bus/bbc/fdc/watford.cpp')
-rw-r--r-- | src/devices/bus/bbc/fdc/watford.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp index 158e7c9a9c3..b63e1e92f69 100644 --- a/src/devices/bus/bbc/fdc/watford.cpp +++ b/src/devices/bus/bbc/fdc/watford.cpp @@ -19,8 +19,8 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type BBC_WEDDB2 = device_creator<bbc_weddb2_device>; -const device_type BBC_WEDDB3 = device_creator<bbc_weddb3_device>; +DEFINE_DEVICE_TYPE(BBC_WEDDB2, bbc_weddb2_device, "bbc_weddb2", "Watford Electronics DDB2 1772 FDC") +DEFINE_DEVICE_TYPE(BBC_WEDDB3, bbc_weddb3_device, "bbc_weddb3", "Watford Electronics DDB3 1770 FDC") //------------------------------------------------- @@ -114,14 +114,14 @@ const tiny_rom_entry *bbc_weddb3_device::device_rom_region() const // bbc_watfordfdc_device - constructor //------------------------------------------------- -bbc_watfordfdc_device::bbc_watfordfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) : - device_t(mconfig, type, name, tag, owner, clock, shortname, source), +bbc_watfordfdc_device::bbc_watfordfdc_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_bbc_fdc_interface(mconfig, *this) { } bbc_weddb2_device::bbc_weddb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : bbc_watfordfdc_device(mconfig, BBC_WEDDB2, "Watford Electronics DDB2 1772 FDC", tag, owner, clock, "bbc_weddb2", __FILE__), + : bbc_watfordfdc_device(mconfig, BBC_WEDDB2, tag, owner, clock), m_dfs_rom(*this, "dfs_rom"), m_fdc(*this, "wd1772"), m_floppy0(*this, "wd1772:0"), @@ -130,7 +130,7 @@ bbc_weddb2_device::bbc_weddb2_device(const machine_config &mconfig, const char * } bbc_weddb3_device::bbc_weddb3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : bbc_watfordfdc_device(mconfig, BBC_WEDDB3, "Watford Electronics DDB3 1770 FDC", tag, owner, clock, "bbc_weddb3", __FILE__), + : bbc_watfordfdc_device(mconfig, BBC_WEDDB3, tag, owner, clock), m_dfs_rom(*this, "dfs_rom"), m_fdc(*this, "wd1770"), m_floppy0(*this, "wd1770:0"), @@ -149,7 +149,7 @@ void bbc_weddb2_device::device_start() m_slot = dynamic_cast<bbc_fdc_slot_device *>(owner()); space.install_readwrite_handler(0xfe80, 0xfe83, READ8_DELEGATE(bbc_weddb2_device, wd177xl_read), WRITE8_DELEGATE(bbc_weddb2_device, wd177xl_write)); - space.install_readwrite_handler(0xfe84, 0xfe8f, READ8_DEVICE_DELEGATE(m_fdc, wd_fdc_t, read), WRITE8_DEVICE_DELEGATE(m_fdc, wd_fdc_t, write)); + space.install_readwrite_handler(0xfe84, 0xfe8f, READ8_DEVICE_DELEGATE(m_fdc, wd_fdc_device_base, read), WRITE8_DEVICE_DELEGATE(m_fdc, wd_fdc_device_base, write)); } void bbc_weddb3_device::device_start() @@ -159,7 +159,7 @@ void bbc_weddb3_device::device_start() m_slot = dynamic_cast<bbc_fdc_slot_device *>(owner()); space.install_readwrite_handler(0xfe80, 0xfe83, READ8_DELEGATE(bbc_weddb3_device, wd177xl_read), WRITE8_DELEGATE(bbc_weddb3_device, wd177xl_write)); - space.install_readwrite_handler(0xfe84, 0xfe8f, READ8_DEVICE_DELEGATE(m_fdc, wd_fdc_t, read), WRITE8_DEVICE_DELEGATE(m_fdc, wd_fdc_t, write)); + space.install_readwrite_handler(0xfe84, 0xfe8f, READ8_DEVICE_DELEGATE(m_fdc, wd_fdc_device_base, read), WRITE8_DEVICE_DELEGATE(m_fdc, wd_fdc_device_base, write)); } //------------------------------------------------- |