summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/abcbus
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/abcbus')
-rw-r--r--src/devices/bus/abcbus/fd2.cpp17
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp15
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp60
-rw-r--r--src/devices/bus/abcbus/lux21046.h5
4 files changed, 53 insertions, 44 deletions
diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp
index 57c55be21e3..7de408ad65f 100644
--- a/src/devices/bus/abcbus/fd2.cpp
+++ b/src/devices/bus/abcbus/fd2.cpp
@@ -237,7 +237,8 @@ FLOPPY_FORMATS_END
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_START(abc_fd2_device::device_add_mconfig)
+void abc_fd2_device::device_add_mconfig(machine_config &config)
+{
Z80(config, m_maincpu, 4_MHz_XTAL / 2);
m_maincpu->set_addrmap(AS_PROGRAM, &abc_fd2_device::abc_fd2_mem);
m_maincpu->set_addrmap(AS_IO, &abc_fd2_device::abc_fd2_io);
@@ -250,14 +251,14 @@ MACHINE_CONFIG_START(abc_fd2_device::device_add_mconfig)
m_pio->in_pb_callback().set(FUNC(abc_fd2_device::pio_pb_r));
m_pio->out_pb_callback().set(FUNC(abc_fd2_device::pio_pb_w));
- MCFG_DEVICE_ADD(FD1771_TAG, FD1771, 4_MHz_XTAL / 4)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(m_pio, z80pio_device, pb7_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(m_pio, z80pio_device, pb5_w))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(m_pio, z80pio_device, pb6_w))
+ FD1771(config, m_fdc, 4_MHz_XTAL / 4);
+ m_fdc->intrq_wr_callback().set(m_pio, FUNC(z80pio_device::pb7_w));
+ m_fdc->drq_wr_callback().set(m_pio, FUNC(z80pio_device::pb5_w));
+ m_fdc->hld_wr_callback().set(m_pio, FUNC(z80pio_device::pb6_w));
- MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG ":0", abc_fd2_floppies, "525sssd", abc_fd2_device::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG ":1", abc_fd2_floppies, "525sssd", abc_fd2_device::floppy_formats)
-MACHINE_CONFIG_END
+ FLOPPY_CONNECTOR(config, m_floppy0, abc_fd2_floppies, "525sssd", abc_fd2_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy1, abc_fd2_floppies, "525sssd", abc_fd2_device::floppy_formats);
+}
//**************************************************************************
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index 5010bf9bf0e..557f301141e 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -320,7 +320,8 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w )
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_START(luxor_55_10828_device::device_add_mconfig)
+void luxor_55_10828_device::device_add_mconfig(machine_config &config)
+{
Z80(config, m_maincpu, 4_MHz_XTAL / 2);
m_maincpu->set_addrmap(AS_PROGRAM, &luxor_55_10828_device::luxor_55_10828_mem);
m_maincpu->set_addrmap(AS_IO, &luxor_55_10828_device::luxor_55_10828_io);
@@ -333,13 +334,13 @@ MACHINE_CONFIG_START(luxor_55_10828_device::device_add_mconfig)
m_pio->in_pb_callback().set(FUNC(luxor_55_10828_device::pio_pb_r));
m_pio->out_pb_callback().set(FUNC(luxor_55_10828_device::pio_pb_w));
- MCFG_DEVICE_ADD(MB8876_TAG, MB8876, 4_MHz_XTAL / 4)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, luxor_55_10828_device, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, luxor_55_10828_device, fdc_drq_w))
+ MB8876(config, m_fdc, 4_MHz_XTAL / 4);
+ m_fdc->intrq_wr_callback().set(FUNC(luxor_55_10828_device::fdc_intrq_w));
+ m_fdc->drq_wr_callback().set(FUNC(luxor_55_10828_device::fdc_drq_w));
- MCFG_FLOPPY_DRIVE_ADD(MB8876_TAG":0", abc_floppies, "525ssdd", luxor_55_10828_device::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(MB8876_TAG":1", abc_floppies, "525ssdd", luxor_55_10828_device::floppy_formats)
-MACHINE_CONFIG_END
+ FLOPPY_CONNECTOR(config, m_floppy0, abc_floppies, "525ssdd", luxor_55_10828_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy1, abc_floppies, "525ssdd", luxor_55_10828_device::floppy_formats);
+}
//-------------------------------------------------
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index 6d4b3dc7804..03f8ab22d5b 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -290,7 +290,8 @@ static const z80_daisy_config z80_daisy_chain[] =
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig)
+void luxor_55_21046_device::device_add_mconfig(machine_config & config)
+{
Z80(config, m_maincpu, 16_MHz_XTAL / 4);
m_maincpu->set_daisy_config(z80_daisy_chain);
m_maincpu->set_addrmap(AS_PROGRAM, &luxor_55_21046_device::luxor_55_21046_mem);
@@ -304,40 +305,45 @@ MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig)
m_dma->in_iorq_callback().set(FUNC(luxor_55_21046_device::io_read_byte));
m_dma->out_iorq_callback().set(FUNC(luxor_55_21046_device::io_write_byte));
- MCFG_DEVICE_ADD(SAB1793_TAG, FD1793, 16_MHz_XTAL / 16)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, luxor_55_21046_device, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(m_dma, z80dma_device, rdy_w))
-MACHINE_CONFIG_END
+ FD1793(config, m_fdc, 16_MHz_XTAL / 16);
+ m_fdc->intrq_wr_callback().set(FUNC(luxor_55_21046_device::fdc_intrq_w));
+ m_fdc->drq_wr_callback().set(m_dma, FUNC(z80dma_device::rdy_w));
+}
-MACHINE_CONFIG_START(abc830_device::device_add_mconfig)
+void abc830_device::device_add_mconfig(machine_config &config)
+{
luxor_55_21046_device::device_add_mconfig(config);
- MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats)
-MACHINE_CONFIG_END
+ FLOPPY_CONNECTOR(config, m_floppy0, abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy1, abc_floppies, "525ssdd", luxor_55_21046_device::floppy_formats);
+}
-MACHINE_CONFIG_START(abc832_device::device_add_mconfig)
+void abc832_device::device_add_mconfig(machine_config &config)
+{
luxor_55_21046_device::device_add_mconfig(config);
- MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
-MACHINE_CONFIG_END
+ FLOPPY_CONNECTOR(config, m_floppy0, abc_floppies, "525qd", luxor_55_21046_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy1, abc_floppies, "525qd", luxor_55_21046_device::floppy_formats);
+}
-MACHINE_CONFIG_START(abc834_device::device_add_mconfig)
+void abc834_device::device_add_mconfig(machine_config &config)
+{
luxor_55_21046_device::device_add_mconfig(config);
- MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
-MACHINE_CONFIG_END
+ FLOPPY_CONNECTOR(config, m_floppy0, abc_floppies, "525qd", luxor_55_21046_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy1, abc_floppies, "525qd", luxor_55_21046_device::floppy_formats);
+}
-MACHINE_CONFIG_START(abc838_device::device_add_mconfig)
+void abc838_device::device_add_mconfig(machine_config &config)
+{
luxor_55_21046_device::device_add_mconfig(config);
- MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats)
-MACHINE_CONFIG_END
+ FLOPPY_CONNECTOR(config, m_floppy0, abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy1, abc_floppies, "8dsdd", luxor_55_21046_device::floppy_formats);
+}
-MACHINE_CONFIG_START(abc850_floppy_device::device_add_mconfig)
+void abc850_floppy_device::device_add_mconfig(machine_config &config)
+{
luxor_55_21046_device::device_add_mconfig(config);
- MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, nullptr, luxor_55_21046_device::floppy_formats)
-MACHINE_CONFIG_END
+ FLOPPY_CONNECTOR(config, m_floppy0, abc_floppies, "525qd", luxor_55_21046_device::floppy_formats);
+ FLOPPY_CONNECTOR(config, m_floppy1, abc_floppies, nullptr, luxor_55_21046_device::floppy_formats);
+}
//-------------------------------------------------
@@ -708,11 +714,11 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, cons
luxor_55_21046_device::luxor_55_21046_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_abcbus_card_interface(mconfig, *this),
+ m_floppy0(*this, SAB1793_TAG":0"),
+ m_floppy1(*this, SAB1793_TAG":1"),
m_maincpu(*this, Z80_TAG),
m_dma(*this, Z80DMA_TAG),
m_fdc(*this, SAB1793_TAG),
- m_floppy0(*this, SAB1793_TAG":0"),
- m_floppy1(*this, SAB1793_TAG":1"),
m_floppy(nullptr),
m_sw1(*this, "SW1"),
m_sw2(*this, "SW2"),
diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h
index c3f14ed47b3..6cf75a184fe 100644
--- a/src/devices/bus/abcbus/lux21046.h
+++ b/src/devices/bus/abcbus/lux21046.h
@@ -78,6 +78,9 @@ protected:
DECLARE_FLOPPY_FORMATS( floppy_formats );
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+
private:
DECLARE_WRITE_LINE_MEMBER( dma_int_w );
@@ -101,8 +104,6 @@ private:
required_device<z80_device> m_maincpu;
required_device<z80dma_device> m_dma;
required_device<fd1793_device> m_fdc;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
floppy_image_device *m_floppy;
required_ioport m_sw1;
required_ioport m_sw2;