From 14a623f407805cdad0cafb25bad85f5a6451a80d Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Thu, 10 Jan 2019 17:34:09 +0700 Subject: z80scc: don't spam interrupt state (nw) --- src/devices/machine/z80scc.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/devices/machine/z80scc.cpp') diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index 711d58b8b49..a3a926636ee 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -436,6 +436,7 @@ z80scc_device::z80scc_device(const machine_config &mconfig, device_type type, co m_out_rxdrq_cb{ { *this }, { *this } }, m_out_txdrq_cb{ { *this }, { *this } }, m_out_int_cb(*this), + m_out_int_state(CLEAR_LINE), m_variant(variant), m_wr0_ptrbits(0), m_cputag(nullptr) @@ -517,6 +518,7 @@ void z80scc_device::device_start() LOG("%s", FUNCNAME); // state saving + save_item(NAME(m_out_int_state)); save_item(NAME(m_int_state)); save_item(NAME(m_int_source)); save_item(NAME(m_wr9)); @@ -681,8 +683,12 @@ void z80scc_device::z80daisy_irq_reti() void z80scc_device::check_interrupts() { int state = (z80daisy_irq_state() & Z80_DAISY_INT) ? ASSERT_LINE : CLEAR_LINE; - LOGINT("%s %s \n",tag(), FUNCNAME); - m_out_int_cb(state); + if (m_out_int_state != state) + { + m_out_int_state = state; + LOGINT("%s\n", FUNCNAME); + m_out_int_cb(state); + } } -- cgit v1.2.3-70-g09d2 From 22f6e038b26b38610d6f90d2242ded32ed938f49 Mon Sep 17 00:00:00 2001 From: MooglyGuy Date: Sun, 3 Feb 2019 03:32:48 +0100 Subject: -src/devices/machine: Random MCFG and MACHINE_CONFIG removals, nw --- src/devices/machine/genpc.cpp | 27 ++++++++++++++------------- src/devices/machine/idehd.cpp | 7 ++++--- src/devices/machine/ie15.cpp | 32 +++++++++++++++++--------------- src/devices/machine/keyboard.cpp | 6 +++--- src/devices/machine/mc68681.cpp | 35 +++++++++++++++++++---------------- src/devices/machine/pit8253.cpp | 11 ++++++----- src/devices/machine/pxa255.cpp | 26 +++++++++++++------------- src/devices/machine/scnxx562.cpp | 9 +++++---- src/devices/machine/sis85c496.cpp | 13 +++++++------ src/devices/machine/terminal.cpp | 21 +++++++++++---------- src/devices/machine/wd2010.cpp | 6 +++--- src/devices/machine/z80scc.cpp | 4 ++-- src/devices/machine/z80sio.cpp | 20 +++++++++++--------- 13 files changed, 115 insertions(+), 102 deletions(-) (limited to 'src/devices/machine/z80scc.cpp') diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp index cdd381f1cfe..e626bf96b30 100644 --- a/src/devices/machine/genpc.cpp +++ b/src/devices/machine/genpc.cpp @@ -420,7 +420,8 @@ DEFINE_DEVICE_TYPE(IBM5160_MOTHERBOARD, ibm5160_mb_device, "ibm5160_mb", "IBM 51 // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(ibm5160_mb_device::device_add_mconfig) +void ibm5160_mb_device::device_add_mconfig(machine_config &config) +{ PIT8253(config, m_pit8253); m_pit8253->set_clk<0>(XTAL(14'318'181)/12.0); // heartbeat IRQ m_pit8253->out_handler<0>().set(m_pic8259, FUNC(pic8259_device::ir0_w)); @@ -468,14 +469,14 @@ MACHINE_CONFIG_START(ibm5160_mb_device::device_add_mconfig) m_isabus->drq3_callback().set(m_dma8237, FUNC(am9517a_device::dreq3_w)); m_isabus->iochck_callback().set(FUNC(ibm5160_mb_device::iochck_w)); - MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0) - MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(*this, ibm5160_mb_device, keyboard_clock_w)) - MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(*this, ibm5160_mb_device, keyboard_data_w)) + PC_KBDC(config, m_pc_kbdc, 0); + m_pc_kbdc->out_clock_cb().set(FUNC(ibm5160_mb_device::keyboard_clock_w)); + m_pc_kbdc->out_data_cb().set(FUNC(ibm5160_mb_device::keyboard_data_w)); /* sound hardware */ SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00); -MACHINE_CONFIG_END +} static INPUT_PORTS_START( ibm5160_mb ) @@ -607,18 +608,18 @@ DEFINE_DEVICE_TYPE(IBM5150_MOTHERBOARD, ibm5150_mb_device, "ibm5150_mb", "IBM 51 // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(ibm5150_mb_device::device_add_mconfig) +void ibm5150_mb_device::device_add_mconfig(machine_config &config) +{ ibm5160_mb_device::device_add_mconfig(config); - MCFG_DEVICE_MODIFY("pc_kbdc") - MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(*this, ibm5150_mb_device, keyboard_clock_w)) + subdevice("pc_kbdc")->out_clock_cb().set(FUNC(ibm5150_mb_device::keyboard_clock_w)); m_ppi8255->out_pb_callback().set(FUNC(ibm5150_mb_device::pc_ppi_portb_w)); m_ppi8255->in_pc_callback().set(FUNC(ibm5150_mb_device::pc_ppi_portc_r)); CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); -MACHINE_CONFIG_END +} //************************************************************************** // LIVE DEVICE @@ -784,15 +785,15 @@ DEFINE_DEVICE_TYPE(EC1841_MOTHERBOARD, ec1841_mb_device, "ec1841_mb", "EC-1840 m // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(ec1841_mb_device::device_add_mconfig) +void ec1841_mb_device::device_add_mconfig(machine_config &config) +{ ibm5160_mb_device::device_add_mconfig(config); m_ppi8255->out_pb_callback().set(FUNC(ec1841_mb_device::pc_ppi_portb_w)); m_ppi8255->in_pc_callback().set(FUNC(ec1841_mb_device::pc_ppi_portc_r)); - MCFG_DEVICE_MODIFY("pc_kbdc") - MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(*this, ec1841_mb_device, keyboard_clock_w)) -MACHINE_CONFIG_END + subdevice("pc_kbdc")->out_clock_cb().set(FUNC(ec1841_mb_device::keyboard_clock_w)); +} static INPUT_PORTS_START( ec1841_mb ) PORT_START("DSW0") /* SA1 */ diff --git a/src/devices/machine/idehd.cpp b/src/devices/machine/idehd.cpp index b9f6ddbbe70..1f4be38d491 100644 --- a/src/devices/machine/idehd.cpp +++ b/src/devices/machine/idehd.cpp @@ -869,6 +869,7 @@ uint8_t ide_hdd_device::calculate_status() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(ide_hdd_device::device_add_mconfig) - MCFG_HARDDISK_ADD( "image" ) -MACHINE_CONFIG_END +void ide_hdd_device::device_add_mconfig(machine_config &config) +{ + HARDDISK(config, "image"); +} diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp index 4f1a8a25bfc..65a71ae23c3 100644 --- a/src/devices/machine/ie15.cpp +++ b/src/devices/machine/ie15.cpp @@ -568,25 +568,25 @@ static GFXDECODE_START( gfx_ie15 ) GFXDECODE_ENTRY("chargen", 0x0000, ie15_charlayout, 0, 1) GFXDECODE_END -MACHINE_CONFIG_START(ie15_device::ie15core) +void ie15_device::ie15core(machine_config &config) +{ /* Basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", IE15_CPU, XTAL(30'800'000)/10) - MCFG_DEVICE_PROGRAM_MAP(ie15_mem) - MCFG_DEVICE_IO_MAP(ie15_io) + IE15_CPU(config, m_maincpu, XTAL(30'800'000)/10); + m_maincpu->set_addrmap(AS_PROGRAM, &ie15_device::ie15_mem); + m_maincpu->set_addrmap(AS_IO, &ie15_device::ie15_io); config.set_default_layout(layout_ie15); /* Devices */ - IE15_KEYBOARD(config, m_keyboard, 0) - .keyboard_cb().set(FUNC(ie15_device::kbd_put)); + IE15_KEYBOARD(config, m_keyboard, 0).keyboard_cb().set(FUNC(ie15_device::kbd_put)); RS232_PORT(config, m_rs232, default_rs232_devices, "null_modem"); m_rs232->rxd_handler().set(FUNC(ie15_device::serial_rx_callback)); SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("beeper", BEEP, 2400) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) -MACHINE_CONFIG_END + BEEP(config, m_beeper, 2400); + m_beeper->add_route(ALL_OUTPUTS, "mono", 0.15); +} /* ROM definition */ ROM_START( ie15 ) @@ -603,18 +603,20 @@ ROM_START( ie15 ) ROM_LOAD("chargen-15ie.bin", 0x0000, 0x0800, CRC(ed16bf6b) SHA1(6af9fb75f5375943d5c0ce9ed408e0fb4621b17e)) ROM_END -MACHINE_CONFIG_START(ie15_device::device_add_mconfig) - MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) - MCFG_SCREEN_UPDATE_DRIVER(ie15_device, screen_update) - MCFG_SCREEN_RAW_PARAMS(XTAL(30'800'000)/2, +void ie15_device::device_add_mconfig(machine_config &config) +{ + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_color(rgb_t::green()); + m_screen->set_screen_update(FUNC(ie15_device::screen_update)); + m_screen->set_raw(XTAL(30'800'000)/2, IE15_TOTAL_HORZ, IE15_HORZ_START, IE15_HORZ_START+IE15_DISP_HORZ, IE15_TOTAL_VERT, IE15_VERT_START, IE15_VERT_START+IE15_DISP_VERT); ie15core(config); - MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ie15) + GFXDECODE(config, "gfxdecode", "palette", gfx_ie15); PALETTE(config, "palette", palette_device::MONOCHROME); -MACHINE_CONFIG_END +} ioport_constructor ie15_device::device_input_ports() const { diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp index 03e73f3ac05..52502597227 100644 --- a/src/devices/machine/keyboard.cpp +++ b/src/devices/machine/keyboard.cpp @@ -9,10 +9,10 @@ or for the case of a computer with an inbuilt (not serial) ascii keyboard. Example of usage in a driver. -In MACHINE_CONFIG +In the machine config function: - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) - MCFG_GENERIC_KEYBOARD_CB(WRITE8(*this, xxx_state, kbd_put)) + generic_keyboard_device &kbd(GENERIC_KEYBOARD(config, KEYBOARD_TAG, 0)); + kbd.set_keyboard_callback(FUNC(xxx_state::kbd_put)); In the code: diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp index b60567aa3f7..a3a3b480979 100644 --- a/src/devices/machine/mc68681.cpp +++ b/src/devices/machine/mc68681.cpp @@ -268,22 +268,25 @@ void xr68c681_device::device_reset() m_XTXA = m_XRXA = m_XTXB = m_XRXB = false; } -MACHINE_CONFIG_START(duart_base_device::device_add_mconfig) - MCFG_DEVICE_ADD(CHANA_TAG, DUART_CHANNEL, 0) - MCFG_DEVICE_ADD(CHANB_TAG, DUART_CHANNEL, 0) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(sc28c94_device::device_add_mconfig) - MCFG_DEVICE_ADD(CHANA_TAG, DUART_CHANNEL, 0) - MCFG_DEVICE_ADD(CHANB_TAG, DUART_CHANNEL, 0) - MCFG_DEVICE_ADD(CHANC_TAG, DUART_CHANNEL, 0) - MCFG_DEVICE_ADD(CHAND_TAG, DUART_CHANNEL, 0) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(mc68340_duart_device::device_add_mconfig) - MCFG_DEVICE_ADD(CHANA_TAG, DUART_CHANNEL, 0) - MCFG_DEVICE_ADD(CHANB_TAG, DUART_CHANNEL, 0) -MACHINE_CONFIG_END +void duart_base_device::device_add_mconfig(machine_config &config) +{ + DUART_CHANNEL(config, CHANA_TAG, 0); + DUART_CHANNEL(config, CHANB_TAG, 0); +} + +void sc28c94_device::device_add_mconfig(machine_config &config) +{ + DUART_CHANNEL(config, CHANA_TAG, 0); + DUART_CHANNEL(config, CHANB_TAG, 0); + DUART_CHANNEL(config, CHANC_TAG, 0); + DUART_CHANNEL(config, CHAND_TAG, 0); +} + +void mc68340_duart_device::device_add_mconfig(machine_config &config) +{ + DUART_CHANNEL(config, CHANA_TAG, 0); + DUART_CHANNEL(config, CHANB_TAG, 0); +} void duart_base_device::update_interrupts() { diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp index 6e6f86e5b0e..7d52572ba89 100644 --- a/src/devices/machine/pit8253.cpp +++ b/src/devices/machine/pit8253.cpp @@ -74,11 +74,12 @@ fe2010_pit_device::fe2010_pit_device(const machine_config &mconfig, const char * // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(pit8253_device::device_add_mconfig) - MCFG_DEVICE_ADD("counter0", PIT_COUNTER, 0) - MCFG_DEVICE_ADD("counter1", PIT_COUNTER, 0) - MCFG_DEVICE_ADD("counter2", PIT_COUNTER, 0) -MACHINE_CONFIG_END +void pit8253_device::device_add_mconfig(machine_config &config) +{ + PIT_COUNTER(config, "counter0", 0); + PIT_COUNTER(config, "counter1", 0); + PIT_COUNTER(config, "counter2", 0); +} //------------------------------------------------- diff --git a/src/devices/machine/pxa255.cpp b/src/devices/machine/pxa255.cpp index 0e96fec2b27..5a65f1542ae 100644 --- a/src/devices/machine/pxa255.cpp +++ b/src/devices/machine/pxa255.cpp @@ -1222,20 +1222,20 @@ uint32_t pxa255_periphs_device::screen_update(screen_device &screen, bitmap_rgb3 return 0; } -MACHINE_CONFIG_START(pxa255_periphs_device::device_add_mconfig) - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(1024, 1024) - MCFG_SCREEN_VISIBLE_AREA(0, 295, 0, 479) - MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, pxa255_periphs_device, screen_update) - MCFG_PALETTE_ADD(m_palette, 256) +void pxa255_periphs_device::device_add_mconfig(machine_config &config) +{ + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_refresh_hz(60); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); + screen.set_size(1024, 1024); + screen.set_visarea(0, 295, 0, 479); + screen.set_screen_update(FUNC(pxa255_periphs_device::screen_update)); + + PALETTE(config, m_palette).set_entries(256); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_DEVICE_ADD(m_dmadac[0], DMADAC) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) - MCFG_DEVICE_ADD(m_dmadac[1], DMADAC) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) -MACHINE_CONFIG_END + DMADAC(config, m_dmadac[0]).add_route(ALL_OUTPUTS, "lspeaker", 1.0); + DMADAC(config, m_dmadac[1]).add_route(ALL_OUTPUTS, "rspeaker", 1.0); +} diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp index 9ccf996782c..c3bfbfacc5d 100644 --- a/src/devices/machine/scnxx562.cpp +++ b/src/devices/machine/scnxx562.cpp @@ -126,10 +126,11 @@ DEFINE_DEVICE_TYPE(DUSCC68C562, duscc68c562_device, "duscc68c562", "Philips //------------------------------------------------- // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(duscc_device::device_add_mconfig) - MCFG_DEVICE_ADD(CHANA_TAG, DUSCC_CHANNEL, 0) - MCFG_DEVICE_ADD(CHANB_TAG, DUSCC_CHANNEL, 0) -MACHINE_CONFIG_END +void duscc_device::device_add_mconfig(machine_config &config) +{ + DUSCC_CHANNEL(config, CHANA_TAG, 0); + DUSCC_CHANNEL(config, CHANB_TAG, 0); +} //************************************************************************** // LIVE DEVICE diff --git a/src/devices/machine/sis85c496.cpp b/src/devices/machine/sis85c496.cpp index a307e83111b..63288a5447e 100644 --- a/src/devices/machine/sis85c496.cpp +++ b/src/devices/machine/sis85c496.cpp @@ -45,7 +45,8 @@ void sis85c496_host_device::internal_io_map(address_map &map) map(0x00e0, 0x00ef).noprw(); } -MACHINE_CONFIG_START(sis85c496_host_device::device_add_mconfig) +void sis85c496_host_device::device_add_mconfig(machine_config &config) +{ PIT8254(config, m_pit8254, 0); m_pit8254->set_clk<0>(4772720/4); // heartbeat IRQ m_pit8254->out_handler<0>().set(FUNC(sis85c496_host_device::at_pit8254_out0_changed)); @@ -103,10 +104,10 @@ MACHINE_CONFIG_START(sis85c496_host_device::device_add_mconfig) m_keybc->kbd_clk().set("pc_kbdc", FUNC(pc_kbdc_device::clock_write_from_mb)); m_keybc->kbd_data().set("pc_kbdc", FUNC(pc_kbdc_device::data_write_from_mb)); - MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0) - MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE("keybc", at_keyboard_controller_device, kbd_clk_w)) - MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE("keybc", at_keyboard_controller_device, kbd_data_w)) - MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL) + PC_KBDC(config, m_pc_kbdc, 0); + m_pc_kbdc->out_clock_cb().set("keybc", FUNC(at_keyboard_controller_device::kbd_clk_w)); + m_pc_kbdc->out_data_cb().set("keybc", FUNC(at_keyboard_controller_device::kbd_data_w)); + PC_KBDC_SLOT(config, "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL).set_pc_kbdc_slot(subdevice("pc_kbdc")); DS12885(config, m_ds12885); m_ds12885->irq().set(m_pic8259_slave, FUNC(pic8259_device::ir0_w)); @@ -115,7 +116,7 @@ MACHINE_CONFIG_START(sis85c496_host_device::device_add_mconfig) /* sound hardware */ SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50); -MACHINE_CONFIG_END +} sis85c496_host_device::sis85c496_host_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp index be9b501c687..c2e5c5be205 100644 --- a/src/devices/machine/terminal.cpp +++ b/src/devices/machine/terminal.cpp @@ -326,21 +326,22 @@ void generic_terminal_device::kbd_put(u8 data) VIDEO HARDWARE ***************************************************************************/ -MACHINE_CONFIG_START(generic_terminal_device::device_add_mconfig) - MCFG_SCREEN_ADD(TERMINAL_SCREEN_TAG, RASTER) - MCFG_SCREEN_REFRESH_RATE(50) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ - MCFG_SCREEN_SIZE(generic_terminal_device::TERMINAL_WIDTH*8, generic_terminal_device::TERMINAL_HEIGHT*10) - MCFG_SCREEN_VISIBLE_AREA(0, generic_terminal_device::TERMINAL_WIDTH*8-1, 0, generic_terminal_device::TERMINAL_HEIGHT*10-1) - MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, generic_terminal_device, update) +void generic_terminal_device::device_add_mconfig(machine_config &config) +{ + screen_device &screen(SCREEN(config, TERMINAL_SCREEN_TAG, SCREEN_TYPE_RASTER)); + screen.set_refresh_hz(50); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ + screen.set_size(generic_terminal_device::TERMINAL_WIDTH*8, generic_terminal_device::TERMINAL_HEIGHT*10); + screen.set_visarea(0, generic_terminal_device::TERMINAL_WIDTH*8-1, 0, generic_terminal_device::TERMINAL_HEIGHT*10-1); + screen.set_screen_update(FUNC(generic_terminal_device::update)); generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, KEYBOARD_TAG, 0)); keyboard.set_keyboard_callback(FUNC(generic_terminal_device::kbd_put)); SPEAKER(config, "bell").front_center(); - MCFG_DEVICE_ADD("beeper", BEEP, 2'000) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 0.25) -MACHINE_CONFIG_END + BEEP(config, m_beeper, 2'000); + m_beeper->add_route(ALL_OUTPUTS, "bell", 0.25); +} void generic_terminal_device::device_start() { diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp index c25aa538df3..59dfd16128d 100644 --- a/src/devices/machine/wd2010.cpp +++ b/src/devices/machine/wd2010.cpp @@ -28,11 +28,11 @@ UNIMPLEMENTED FEATURES : the intended instruction flow. Some loops were omitted! USAGE: tie WF (write fault) to ground if not needed: - MCFG_WD2010_IN_WF_CB(GND) + in_wf_callback().set_constant(0) Other signals should be set to VCC if not serviced: - MCFG_WD2010_IN_DRDY_CB(VCC) // DRIVE READY = VCC - MCFG_WD2010_IN_SC_CB(VCC) // SEEK COMPLETE = VCC + in_drdy_callback().set_constant(1) // DRIVE READY = VCC + in_sc_callback().set_constant(1) // SEEK COMPLETE = VCC **********************************************************************/ #include "emu.h" diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index a3a926636ee..b44be5c5873 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -84,9 +84,9 @@ baud rate: -- in the unlikely case of T == 0, pretend T = 1. - If the required wr11 bits are set: -- let's say M = wr4 D7,D6 if 1,1 M = 64; if 1,0 M = 32; if 0,1 M = 16 else M = 1 --- so, the required clock on the MCFG_DEVICE_ADD line = 2*T*B*M. +-- so, the required device clock = 2*T*B*M. - If the required wr11 bits are not set: --- add a line: MCFG_Z80SCC_OFFSETS(X, 0, Y, 0), where X = channel-A-baud * T, +-- call: configure_channels(X, 0, Y, 0), where X = channel-A-baud * T, and Y = channel-B-baud * T. ***************************************************************************/ diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index 82997875f46..8337aeafdf6 100644 --- a/src/devices/machine/z80sio.cpp +++ b/src/devices/machine/z80sio.cpp @@ -242,15 +242,17 @@ DEFINE_DEVICE_TYPE(UPD7201_NEW, upd7201_new_device, "upd7201_new", "NEC uP //------------------------------------------------- // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(z80sio_device::device_add_mconfig) - MCFG_DEVICE_ADD(CHANA_TAG, Z80SIO_CHANNEL, 0) - MCFG_DEVICE_ADD(CHANB_TAG, Z80SIO_CHANNEL, 0) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(i8274_new_device::device_add_mconfig) - MCFG_DEVICE_ADD(CHANA_TAG, I8274_CHANNEL, 0) - MCFG_DEVICE_ADD(CHANB_TAG, I8274_CHANNEL, 0) -MACHINE_CONFIG_END +void z80sio_device::device_add_mconfig(machine_config &config) +{ + Z80SIO_CHANNEL(config, CHANA_TAG, 0); + Z80SIO_CHANNEL(config, CHANB_TAG, 0); +} + +void i8274_new_device::device_add_mconfig(machine_config &config) +{ + I8274_CHANNEL(config, CHANA_TAG, 0); + I8274_CHANNEL(config, CHANB_TAG, 0); +} //************************************************************************** -- cgit v1.2.3-70-g09d2