diff options
author | Vas Crabb <vas@vastheman.com> | 2018-05-07 18:35:05 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-05-07 18:35:51 +1000 |
commit | 21f535838cb8c71f4c4b807e0dad0c6aa7bbddc0 (patch) | |
tree | c978072465d9c779162693b55afccf50dd643f84 /src/mame | |
parent | 3cb95fa87776237c105ad765196f8c33df8a77ae (diff) |
(nw) few more macros replaced with constructors
Diffstat (limited to 'src/mame')
-rw-r--r-- | src/mame/drivers/sun3.cpp | 4 | ||||
-rw-r--r-- | src/mame/drivers/sun3x.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/sun4.cpp | 4 | ||||
-rw-r--r-- | src/mame/drivers/ti85.cpp | 6 | ||||
-rw-r--r-- | src/mame/drivers/vic10.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/vic20.cpp | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp index 622751eaee7..5239f361adf 100644 --- a/src/mame/drivers/sun3.cpp +++ b/src/mame/drivers/sun3.cpp @@ -1019,7 +1019,7 @@ MACHINE_CONFIG_START(sun3_state::sun3) MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0) MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd)) - MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type3hle") + MCFG_DEVICE_ADD(KEYBOARD_TAG, SUNKBD_PORT, default_sun_keyboard_devices, "type3hle") MCFG_SUNKBD_RXD_HANDLER(WRITELINE(SCC1_TAG, z80scc_device, rxa_w)) MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0) @@ -1124,7 +1124,7 @@ MACHINE_CONFIG_START(sun3_state::sun3_50) MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0) MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd)) - MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type3hle") + MCFG_DEVICE_ADD(KEYBOARD_TAG, SUNKBD_PORT, default_sun_keyboard_devices, "type3hle") MCFG_SUNKBD_RXD_HANDLER(WRITELINE(SCC1_TAG, z80scc_device, rxa_w)) MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0) diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp index 5c26ab47682..842c4128c98 100644 --- a/src/mame/drivers/sun3x.cpp +++ b/src/mame/drivers/sun3x.cpp @@ -592,7 +592,7 @@ MACHINE_CONFIG_START(sun3x_state::sun3_80) MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0) MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd)) - MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type3hle") + MCFG_DEVICE_ADD(KEYBOARD_TAG, SUNKBD_PORT, default_sun_keyboard_devices, "type3hle") MCFG_SUNKBD_RXD_HANDLER(WRITELINE(SCC1_TAG, z80scc_device, rxa_w)) MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0) diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp index 1889b1a0ec4..a5b666da15d 100644 --- a/src/mame/drivers/sun4.cpp +++ b/src/mame/drivers/sun4.cpp @@ -1942,7 +1942,7 @@ MACHINE_CONFIG_START(sun4_state::sun4) MCFG_Z80SCC_OUT_INT_CB(WRITELINE(*this, sun4_state, scc1_int)) MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd)) - MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type4hle") + MCFG_DEVICE_ADD(KEYBOARD_TAG, SUNKBD_PORT, default_sun_keyboard_devices, "type4hle") MCFG_SUNKBD_RXD_HANDLER(WRITELINE(SCC1_TAG, z80scc_device, rxa_w)) // RS232 serial ports @@ -2007,7 +2007,7 @@ MACHINE_CONFIG_START(sun4_state::sun4c) MCFG_Z80SCC_OUT_INT_CB(WRITELINE(*this, sun4_state, scc1_int)) MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd)) - MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type5hle") + MCFG_DEVICE_ADD(KEYBOARD_TAG, SUNKBD_PORT, default_sun_keyboard_devices, "type5hle") MCFG_SUNKBD_RXD_HANDLER(WRITELINE(SCC1_TAG, z80scc_device, rxa_w)) // RS232 serial ports diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp index 332b0931854..92609c639ee 100644 --- a/src/mame/drivers/ti85.cpp +++ b/src/mame/drivers/ti85.cpp @@ -613,7 +613,7 @@ MACHINE_CONFIG_START(ti85_state::ti85) MCFG_SCREEN_SIZE(128, 64) MCFG_SCREEN_VISIBLE_AREA(0, 128-1, 0, 64-1) - MCFG_TI8X_LINK_PORT_ADD("linkport", default_ti8x_link_devices, nullptr) + MCFG_DEVICE_ADD("linkport", TI8X_LINK_PORT, default_ti8x_link_devices, nullptr) MACHINE_CONFIG_END @@ -642,7 +642,7 @@ MACHINE_CONFIG_START(ti85_state::ti82) MCFG_DEVICE_ADD("t6a04", T6A04, 0) MCFG_T6A04_SIZE(96, 64) - MCFG_TI8X_LINK_PORT_ADD("linkport", default_ti8x_link_devices, nullptr) + MCFG_DEVICE_ADD("linkport", TI8X_LINK_PORT, default_ti8x_link_devices, nullptr) MACHINE_CONFIG_END MACHINE_CONFIG_START(ti85_state::ti81v2) @@ -728,7 +728,7 @@ MACHINE_CONFIG_START(ti85_state::ti83p) MCFG_DEVICE_ADD("t6a04", T6A04, 0) MCFG_T6A04_SIZE(96, 64) - MCFG_TI8X_LINK_PORT_ADD("linkport", default_ti8x_link_devices, nullptr) + MCFG_DEVICE_ADD("linkport", TI8X_LINK_PORT, default_ti8x_link_devices, nullptr) MCFG_AMD_29F400T_ADD("flash") MACHINE_CONFIG_END diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp index 837b26bcd90..9cb9ed00a67 100644 --- a/src/mame/drivers/vic10.cpp +++ b/src/mame/drivers/vic10.cpp @@ -737,7 +737,7 @@ MACHINE_CONFIG_START(vic10_state::vic10) MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr) MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(MOS6566_TAG, mos6566_device, lp_w)) MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy") - MCFG_VIC10_EXPANSION_SLOT_ADD(VIC10_EXPANSION_SLOT_TAG, XTAL(8'000'000)/8, vic10_expansion_cards, nullptr) + MCFG_DEVICE_ADD(VIC10_EXPANSION_SLOT_TAG, VIC10_EXPANSION_SLOT, XTAL(8'000'000)/8, vic10_expansion_cards, nullptr) MCFG_VIC10_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, vic10_state, exp_irq_w)) MCFG_VIC10_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(*this, vic10_state, exp_reset_w)) MCFG_VIC10_EXPANSION_SLOT_CNT_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, cnt_w)) diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp index ee295f6f496..88c4c8312c5 100644 --- a/src/mame/drivers/vic20.cpp +++ b/src/mame/drivers/vic20.cpp @@ -872,7 +872,7 @@ MACHINE_CONFIG_START(vic20_state::ntsc) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // devices - MCFG_VIC20_EXPANSION_SLOT_ADD(VIC20_EXPANSION_SLOT_TAG, MOS6560_CLOCK, vic20_expansion_cards, nullptr) + MCFG_DEVICE_ADD(VIC20_EXPANSION_SLOT_TAG, VIC20_EXPANSION_SLOT, MOS6560_CLOCK, vic20_expansion_cards, nullptr) MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACK(INPUTLINE(M6502_TAG, M6502_IRQ_LINE)) MCFG_VIC20_EXPANSION_SLOT_NMI_CALLBACK(INPUTLINE(M6502_TAG, M6502_NMI_LINE)) MCFG_VIC20_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(*this, vic20_state, exp_reset_w)) @@ -920,7 +920,7 @@ MACHINE_CONFIG_START(vic20_state::pal) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // devices - MCFG_VIC20_EXPANSION_SLOT_ADD(VIC20_EXPANSION_SLOT_TAG, MOS6561_CLOCK, vic20_expansion_cards, nullptr) + MCFG_DEVICE_ADD(VIC20_EXPANSION_SLOT_TAG, VIC20_EXPANSION_SLOT, MOS6561_CLOCK, vic20_expansion_cards, nullptr) MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACK(INPUTLINE(M6502_TAG, M6502_IRQ_LINE)) MCFG_VIC20_EXPANSION_SLOT_NMI_CALLBACK(INPUTLINE(M6502_TAG, M6502_NMI_LINE)) MCFG_VIC20_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(*this, vic20_state, exp_reset_w)) |