summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/isa/ibm_mfc.cpp
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2017-06-09 12:48:45 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2017-06-09 12:48:45 +0200
commite844b01154f1d57c9736b37c085ea0b9bbb15acb (patch)
tree272d3ad1d7c9562f8c01809ab3daaafc9442435a /src/devices/bus/isa/ibm_mfc.cpp
parent0b546073e758e33abb12e738ab12aaf1377f2a3e (diff)
device_add_mconfig up to devices/bus/l* (nw)
Diffstat (limited to 'src/devices/bus/isa/ibm_mfc.cpp')
-rw-r--r--src/devices/bus/isa/ibm_mfc.cpp83
1 files changed, 36 insertions, 47 deletions
diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp
index 81ba7f9328a..e2c35e02551 100644
--- a/src/devices/bus/isa/ibm_mfc.cpp
+++ b/src/devices/bus/isa/ibm_mfc.cpp
@@ -269,47 +269,6 @@ WRITE_LINE_MEMBER(isa8_ibm_mfc_device::ibm_mfc_ym_irq)
//-------------------------------------------------
-// Machine config
-//-------------------------------------------------
-
-static MACHINE_CONFIG_START( ibm_mfc )
- MCFG_CPU_ADD("ibm_mfc", Z80, XTAL_11_8MHz / 2)
- MCFG_CPU_PROGRAM_MAP(prg_map)
- MCFG_CPU_IO_MAP(io_map)
-
- MCFG_DEVICE_ADD("d71055c_0", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(isa8_ibm_mfc_device, ppi0_i_a))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(isa8_ibm_mfc_device, ppi0_o_b))
- MCFG_I8255_IN_PORTC_CB(READ8(isa8_ibm_mfc_device, ppi0_i_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(isa8_ibm_mfc_device, ppi0_o_c))
-
- MCFG_DEVICE_ADD("d71055c_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(isa8_ibm_mfc_device, ppi1_o_a))
- MCFG_I8255_IN_PORTB_CB(READ8(isa8_ibm_mfc_device, ppi1_i_b))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(isa8_ibm_mfc_device, ppi1_o_c))
-
- MCFG_DEVICE_ADD("d71051", I8251, 0)
-
- MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL_4MHz / 8) // 500KHz
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(isa8_ibm_mfc_device, write_usart_clock))
-
- MCFG_DEVICE_ADD("d8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_4MHz / 8)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out0))
- MCFG_PIT8253_CLK1(0)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out1))
- MCFG_PIT8253_CLK2(XTAL_4MHz / 2)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("d8253", pit8253_device, write_clk1))
-
- MCFG_SPEAKER_STANDARD_STEREO("ymleft", "ymright")
- MCFG_YM2151_ADD("ym2151", XTAL_4MHz)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(isa8_ibm_mfc_device, ibm_mfc_ym_irq))
- MCFG_SOUND_ROUTE(0, "ymleft", 1.00)
- MCFG_SOUND_ROUTE(1, "ymright", 1.00)
-MACHINE_CONFIG_END
-
-
-//-------------------------------------------------
// ISA interface
//-------------------------------------------------
@@ -410,14 +369,44 @@ ROM_END
//-------------------------------------------------
-// machine_config_additions - device-specific
-// machine configurations
+// device_add_mconfig - add device configuration
//-------------------------------------------------
-machine_config_constructor isa8_ibm_mfc_device::device_mconfig_additions() const
-{
- return MACHINE_CONFIG_NAME( ibm_mfc );
-}
+MACHINE_CONFIG_MEMBER( isa8_ibm_mfc_device::device_add_mconfig )
+ MCFG_CPU_ADD("ibm_mfc", Z80, XTAL_11_8MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(prg_map)
+ MCFG_CPU_IO_MAP(io_map)
+
+ MCFG_DEVICE_ADD("d71055c_0", I8255, 0)
+ MCFG_I8255_IN_PORTA_CB(READ8(isa8_ibm_mfc_device, ppi0_i_a))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(isa8_ibm_mfc_device, ppi0_o_b))
+ MCFG_I8255_IN_PORTC_CB(READ8(isa8_ibm_mfc_device, ppi0_i_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(isa8_ibm_mfc_device, ppi0_o_c))
+
+ MCFG_DEVICE_ADD("d71055c_1", I8255, 0)
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(isa8_ibm_mfc_device, ppi1_o_a))
+ MCFG_I8255_IN_PORTB_CB(READ8(isa8_ibm_mfc_device, ppi1_i_b))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(isa8_ibm_mfc_device, ppi1_o_c))
+
+ MCFG_DEVICE_ADD("d71051", I8251, 0)
+
+ MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL_4MHz / 8) // 500KHz
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(isa8_ibm_mfc_device, write_usart_clock))
+
+ MCFG_DEVICE_ADD("d8253", PIT8253, 0)
+ MCFG_PIT8253_CLK0(XTAL_4MHz / 8)
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out0))
+ MCFG_PIT8253_CLK1(0)
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out1))
+ MCFG_PIT8253_CLK2(XTAL_4MHz / 2)
+ MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("d8253", pit8253_device, write_clk1))
+
+ MCFG_SPEAKER_STANDARD_STEREO("ymleft", "ymright")
+ MCFG_YM2151_ADD("ym2151", XTAL_4MHz)
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(isa8_ibm_mfc_device, ibm_mfc_ym_irq))
+ MCFG_SOUND_ROUTE(0, "ymleft", 1.00)
+ MCFG_SOUND_ROUTE(1, "ymright", 1.00)
+MACHINE_CONFIG_END
//-------------------------------------------------