From 553ce07ee1e23d08a33f10d463d48fbc3f3abc35 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 27 May 2018 12:07:06 -0400 Subject: Remove a few unnecessary customizations of MCFG_DEVICE_ADD (nw) --- src/devices/bus/coco/coco_t4426.cpp | 31 +++++++++++++++---------------- src/devices/machine/mc14411.h | 2 -- src/devices/machine/mc68681.h | 7 ------- src/mame/drivers/force68k.cpp | 2 +- src/mame/drivers/gkigt.cpp | 4 ++-- src/mame/drivers/proteus3.cpp | 2 +- 6 files changed, 19 insertions(+), 29 deletions(-) diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index e611b1d4487..896b5ef9f53 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -153,25 +153,24 @@ MACHINE_CONFIG_START(coco_t4426_device::device_add_mconfig) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, coco_t4426_device, pia_A_w)) MCFG_DEVICE_ADD(UART_TAG, ACIA6850, 0) + MCFG_ACIA6850_TXD_HANDLER(WRITELINE(SERIAL_TAG, rs232_port_device, write_txd)) + MCFG_ACIA6850_RTS_HANDLER(WRITELINE(SERIAL_TAG, rs232_port_device, write_rts)) - MCFG_ACIA6850_TXD_HANDLER (WRITELINE (SERIAL_TAG, rs232_port_device, write_txd)) - MCFG_ACIA6850_RTS_HANDLER (WRITELINE (SERIAL_TAG, rs232_port_device, write_rts)) - - MCFG_DEVICE_ADD (SERIAL_TAG, RS232_PORT, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER (WRITELINE (UART_TAG, acia6850_device, write_rxd)) - MCFG_RS232_CTS_HANDLER (WRITELINE (UART_TAG, acia6850_device, write_cts)) + MCFG_DEVICE_ADD(SERIAL_TAG, RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(UART_TAG, acia6850_device, write_rxd)) + MCFG_RS232_CTS_HANDLER(WRITELINE(UART_TAG, acia6850_device, write_cts)) /* Bit Rate Generator */ - MCFG_MC14411_ADD (BRG_TAG, XTAL(1'843'200)) - MCFG_MC14411_F1_CB(WRITELINE (*this, coco_t4426_device, write_f1_clock)) - MCFG_MC14411_F3_CB(WRITELINE (*this, coco_t4426_device, write_f3_clock)) - MCFG_MC14411_F5_CB(WRITELINE (*this, coco_t4426_device, write_f5_clock)) - MCFG_MC14411_F7_CB(WRITELINE (*this, coco_t4426_device, write_f7_clock)) - MCFG_MC14411_F8_CB(WRITELINE (*this, coco_t4426_device, write_f8_clock)) - MCFG_MC14411_F9_CB(WRITELINE (*this, coco_t4426_device, write_f9_clock)) - MCFG_MC14411_F11_CB(WRITELINE (*this, coco_t4426_device, write_f11_clock)) - MCFG_MC14411_F13_CB(WRITELINE (*this, coco_t4426_device, write_f13_clock)) - MCFG_MC14411_F15_CB(WRITELINE (*this, coco_t4426_device, write_f15_clock)) + MCFG_DEVICE_ADD(BRG_TAG, MC14411, 1.8432_MHz_XTAL) + MCFG_MC14411_F1_CB(WRITELINE(*this, coco_t4426_device, write_f1_clock)) + MCFG_MC14411_F3_CB(WRITELINE(*this, coco_t4426_device, write_f3_clock)) + MCFG_MC14411_F5_CB(WRITELINE(*this, coco_t4426_device, write_f5_clock)) + MCFG_MC14411_F7_CB(WRITELINE(*this, coco_t4426_device, write_f7_clock)) + MCFG_MC14411_F8_CB(WRITELINE(*this, coco_t4426_device, write_f8_clock)) + MCFG_MC14411_F9_CB(WRITELINE(*this, coco_t4426_device, write_f9_clock)) + MCFG_MC14411_F11_CB(WRITELINE(*this, coco_t4426_device, write_f11_clock)) + MCFG_MC14411_F13_CB(WRITELINE(*this, coco_t4426_device, write_f13_clock)) + MCFG_MC14411_F15_CB(WRITELINE(*this, coco_t4426_device, write_f15_clock)) MACHINE_CONFIG_END ROM_START( coco_t4426 ) diff --git a/src/devices/machine/mc14411.h b/src/devices/machine/mc14411.h index c206b8df917..002ca5de65f 100644 --- a/src/devices/machine/mc14411.h +++ b/src/devices/machine/mc14411.h @@ -31,8 +31,6 @@ // DEVICE CONFIGURATION MACROS //************************************************************************** -#define MCFG_MC14411_ADD(_tag, _clock) MCFG_DEVICE_ADD(_tag, MC14411, _clock) - #define MCFG_MC14411_F1_CB(_devcb) devcb = &downcast(*device).set_out_fx_cb( 0, DEVCB_##_devcb); #define MCFG_MC14411_F2_CB(_devcb) devcb = &downcast(*device).set_out_fx_cb( 1, DEVCB_##_devcb); #define MCFG_MC14411_F3_CB(_devcb) devcb = &downcast(*device).set_out_fx_cb( 2, DEVCB_##_devcb); diff --git a/src/devices/machine/mc68681.h b/src/devices/machine/mc68681.h index 72b5f9b53b2..9b907ab703d 100644 --- a/src/devices/machine/mc68681.h +++ b/src/devices/machine/mc68681.h @@ -27,19 +27,12 @@ downcast(*device).set_clocks(_a, _b, _c, _d); // SC28C94 specific callbacks -#define MCFG_SC28C94_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, SC28C94, _clock) - #define MCFG_SC28C94_C_TX_CALLBACK(_cb) \ devcb = &downcast(*device).set_c_tx_cb(DEVCB_##_cb); #define MCFG_SC28C94_D_TX_CALLBACK(_cb) \ devcb = &downcast(*device).set_d_tx_cb(DEVCB_##_cb); -// MC68340SERIAL specific callbacks -#define MCFG_MC68340DUART_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, MC68340_DUART, _clock) - #define MC68681_RX_FIFO_SIZE 3 // forward declaration diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp index 0be6f36ff39..2a41f3b3e34 100644 --- a/src/mame/drivers/force68k.cpp +++ b/src/mame/drivers/force68k.cpp @@ -571,7 +571,7 @@ MACHINE_CONFIG_START(force68k_state::fccpu1) MCFG_DEVICE_ADD ("aciaremt", ACIA6850, 0) /* Bit Rate Generator */ - MCFG_MC14411_ADD ("brg", XTAL(1'843'200)) + MCFG_DEVICE_ADD ("brg", MC14411, XTAL(1'843'200)) MCFG_MC14411_F1_CB(WRITELINE (*this, force68k_state, write_f1_clock)) MCFG_MC14411_F3_CB(WRITELINE (*this, force68k_state, write_f3_clock)) MCFG_MC14411_F5_CB(WRITELINE (*this, force68k_state, write_f5_clock)) diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index dd3e93e5591..5839bc93f14 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -611,10 +611,10 @@ MACHINE_CONFIG_START(igt_gameking_state::igt_gameking) MCFG_DEVICE_ADD("maincpu", I960, XTAL(24'000'000)) MCFG_DEVICE_PROGRAM_MAP(igt_gameking_map) - MCFG_SC28C94_ADD("quart1", XTAL(24'000'000) / 6) + MCFG_DEVICE_ADD("quart1", SC28C94, XTAL(24'000'000) / 6) MCFG_SC28C94_D_TX_CALLBACK(WRITELINE("diag", rs232_port_device, write_txd)) - MCFG_SC28C94_ADD("quart2", XTAL(24'000'000) / 6) + MCFG_DEVICE_ADD("quart2", SC28C94, XTAL(24'000'000) / 6) MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", I960_IRQ0)) MCFG_DEVICE_ADD("diag", RS232_PORT, default_rs232_devices, nullptr) diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp index 23afc7b69f5..c8630e58f93 100644 --- a/src/mame/drivers/proteus3.cpp +++ b/src/mame/drivers/proteus3.cpp @@ -420,7 +420,7 @@ MACHINE_CONFIG_START(proteus3_state::proteus3) MCFG_RS232_CTS_HANDLER(WRITELINE("acia2", acia6850_device, write_cts)) /* Bit Rate Generator */ - MCFG_MC14411_ADD ("brg", XTAL(1'843'200)) // crystal needs verification but is the likely one + MCFG_DEVICE_ADD ("brg", MC14411, XTAL(1'843'200)) // crystal needs verification but is the likely one MCFG_MC14411_F1_CB(WRITELINE (*this, proteus3_state, write_f1_clock)) MCFG_MC14411_F2_CB(WRITELINE (*this, proteus3_state, write_f2_clock)) MCFG_MC14411_F3_CB(WRITELINE (*this, proteus3_state, write_f3_clock)) -- cgit v1.2.3