diff options
Diffstat (limited to 'src/mame/motorola')
-rw-r--r-- | src/mame/motorola/ampscarp.cpp | 2 | ||||
-rw-r--r-- | src/mame/motorola/exorciser.cpp | 16 | ||||
-rw-r--r-- | src/mame/motorola/exorterm.cpp | 2 | ||||
-rw-r--r-- | src/mame/motorola/mekd1.cpp | 6 | ||||
-rw-r--r-- | src/mame/motorola/mekd2.cpp | 8 | ||||
-rw-r--r-- | src/mame/motorola/mekd3.cpp | 14 | ||||
-rw-r--r-- | src/mame/motorola/mekd4.cpp | 14 | ||||
-rw-r--r-- | src/mame/motorola/mekd5.cpp | 6 | ||||
-rw-r--r-- | src/mame/motorola/mvme147.cpp | 4 | ||||
-rw-r--r-- | src/mame/motorola/mvme162.cpp | 2 | ||||
-rw-r--r-- | src/mame/motorola/powerstack.cpp | 2 | ||||
-rw-r--r-- | src/mame/motorola/sys1121.cpp | 2 | ||||
-rw-r--r-- | src/mame/motorola/uchroma68.cpp | 8 |
13 files changed, 43 insertions, 43 deletions
diff --git a/src/mame/motorola/ampscarp.cpp b/src/mame/motorola/ampscarp.cpp index 8da8d3c86c5..ee3b69229af 100644 --- a/src/mame/motorola/ampscarp.cpp +++ b/src/mame/motorola/ampscarp.cpp @@ -39,7 +39,7 @@ INPUT_PORTS_END void ampscarp_state::ampscarp(machine_config &config) { - MC68HC11A1(config, m_maincpu, 8'000'000); // type and clock unknown + MC68HC11A1(config, m_maincpu, XTAL::u(8'000'000)); // type and clock unknown m_maincpu->set_addrmap(AS_PROGRAM, &scarp_state::mem_map); } diff --git a/src/mame/motorola/exorciser.cpp b/src/mame/motorola/exorciser.cpp index 11e3abd59b7..4ca58428887 100644 --- a/src/mame/motorola/exorciser.cpp +++ b/src/mame/motorola/exorciser.cpp @@ -652,10 +652,10 @@ void exorciser_state::exorciser_rs232_devices(device_slot_interface &device) void exorciser_state::exorciser(machine_config &config) { /* basic machine hardware */ - M6800(config, m_maincpu, 10000000); + M6800(config, m_maincpu, XTAL::u(10000000)); m_maincpu->set_addrmap(AS_PROGRAM, &exorciser_state::dbg_map); - ADDRESS_MAP_BANK(config, m_bankdev, 0); + ADDRESS_MAP_BANK(config, m_bankdev); m_bankdev->set_endianness(ENDIANNESS_BIG); m_bankdev->set_data_width(8); m_bankdev->set_addr_width(16); @@ -672,7 +672,7 @@ void exorciser_state::exorciser(machine_config &config) m_brg->out_f<9>().set(FUNC(exorciser_state::write_f9_clock)); m_brg->out_f<13>().set(FUNC(exorciser_state::write_f13_clock)); - ACIA6850(config, m_acia, 0); + ACIA6850(config, m_acia); m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd)); m_acia->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts)); @@ -680,7 +680,7 @@ void exorciser_state::exorciser(machine_config &config) rs232.rxd_handler().set(m_acia, FUNC(acia6850_device::write_rxd)); rs232.set_option_device_input_defaults("exorterm155", DEVICE_INPUT_DEFAULTS_NAME(exorterm)); - PIA6821(config, m_pia_dbg, 0); + PIA6821(config, m_pia_dbg); m_pia_dbg->writepa_handler().set(FUNC(exorciser_state::pia_dbg_pa_w)); m_pia_dbg->readca1_handler().set(FUNC(exorciser_state::pia_dbg_ca1_r)); m_pia_dbg->writepb_handler().set(FUNC(exorciser_state::pia_dbg_pb_w)); @@ -688,23 +688,23 @@ void exorciser_state::exorciser(machine_config &config) m_pia_dbg->cb2_handler().set(FUNC(exorciser_state::pia_dbg_cb2_w)); // MEX68PI Parallel printer port - PIA6821(config, m_pia_lpt, 0); + PIA6821(config, m_pia_lpt); m_pia_lpt->writepa_handler().set(FUNC(exorciser_state::pia_lpt_pa_w)); m_pia_lpt->ca1_w(0); // External parallel printer busy input. m_pia_lpt->ca2_handler().set(FUNC(exorciser_state::pia_lpt_ca2_w)); m_pia_lpt->readpb_handler().set(FUNC(exorciser_state::pia_lpt_pb_r)); - PRINTER(config, m_printer, 0); + PRINTER(config, m_printer); // MEX6850? Serial printer port - ACIA6850(config, m_acia_prn, 0); + ACIA6850(config, m_acia_prn); m_acia_prn->txd_handler().set("rs232_prn", FUNC(rs232_port_device::write_txd)); rs232_port_device &rs232_prn(RS232_PORT(config, "rs232_prn", default_rs232_devices, "printer")); rs232_prn.rxd_handler().set(m_acia_prn, FUNC(acia6850_device::write_rxd)); rs232_prn.set_option_device_input_defaults("printer", DEVICE_INPUT_DEFAULTS_NAME(printer)); - M68SFDC(config, m_fdc, 0); + M68SFDC(config, m_fdc); m_fdc->irq_handler().set(m_mainirq, FUNC(input_merger_device::in_w<0>)); m_fdc->nmi_handler().set(m_mainnmi, FUNC(input_merger_device::in_w<3>)); diff --git a/src/mame/motorola/exorterm.cpp b/src/mame/motorola/exorterm.cpp index 6762bb90afe..b1ed596a1de 100644 --- a/src/mame/motorola/exorterm.cpp +++ b/src/mame/motorola/exorterm.cpp @@ -32,7 +32,7 @@ private: void exorterm155_state::exorterm155(machine_config &config) { - EXORTERM155(config, m_exorterm155, 0); + EXORTERM155(config, m_exorterm155); RS232_PORT(config, m_host, default_rs232_devices, nullptr); m_host->dcd_handler().set(m_exorterm155, FUNC(exorterm155_device::rs232_conn_dcd_w)); diff --git a/src/mame/motorola/mekd1.cpp b/src/mame/motorola/mekd1.cpp index 594eb7b1cee..52ef5f8fea7 100644 --- a/src/mame/motorola/mekd1.cpp +++ b/src/mame/motorola/mekd1.cpp @@ -416,7 +416,7 @@ void mekd1_state::mekd1(machine_config &config) // PB7 input from the bit rate timer that goes high after the timer period elapses. // CB2 "reader control" output // IRQA and IRQB are NC. - PIA6821(config, m_pia0, 0); + PIA6821(config, m_pia0); m_pia0->readpa_handler().set(FUNC(mekd1_state::pia0_pa_r)); m_pia0->readpb_handler().set(FUNC(mekd1_state::pia0_pb_r)); m_pia0->writepa_handler().set(FUNC(mekd1_state::pia0_pa_w)); @@ -424,14 +424,14 @@ void mekd1_state::mekd1(machine_config &config) m_pia0->cb2_handler().set(FUNC(mekd1_state::pia0_cb2_w)); // User PIA. All the I/O lines are available at P2. - PIA6821(config, m_pia1, 0); + PIA6821(config, m_pia1); m_pia1->irqa_handler().set("mainirq", FUNC(input_merger_device::in_w<0>)); m_pia1->irqb_handler().set("mainirq", FUNC(input_merger_device::in_w<1>)); // User ACIA. Available at P2. // /CTS is pulled low, but may be driven. // /DCD is pulled low, but may be driven. - ACIA6850(config, m_acia, 0); + ACIA6850(config, m_acia); m_acia->irq_handler().set("mainirq", FUNC(input_merger_device::in_w<2>)); // Off-board clock for the on-board MC6850. diff --git a/src/mame/motorola/mekd2.cpp b/src/mame/motorola/mekd2.cpp index 71e0994bc20..5188d95e70f 100644 --- a/src/mame/motorola/mekd2.cpp +++ b/src/mame/motorola/mekd2.cpp @@ -372,7 +372,7 @@ void mekd2_state::mekd2(machine_config &config) m_cass->add_route(ALL_OUTPUTS, "mono", 0.05); /* Devices */ - PIA6821(config, m_pia_s, 0); + PIA6821(config, m_pia_s); m_pia_s->readpa_handler().set(FUNC(mekd2_state::key_r)); m_pia_s->readcb1_handler().set(FUNC(mekd2_state::key40_r)); m_pia_s->writepa_handler().set(FUNC(mekd2_state::segment_w)); @@ -381,17 +381,17 @@ void mekd2_state::mekd2(machine_config &config) m_pia_s->irqa_handler().set_inputline("maincpu", INPUT_LINE_NMI); m_pia_s->irqb_handler().set_inputline("maincpu", INPUT_LINE_NMI); - PIA6821(config, m_pia_u, 0); + PIA6821(config, m_pia_u); m_pia_u->irqa_handler().set_inputline("maincpu", M6800_IRQ_LINE); m_pia_u->irqb_handler().set_inputline("maincpu", M6800_IRQ_LINE); - ACIA6850(config, m_acia, 0); + ACIA6850(config, m_acia); m_acia->txd_handler().set([this] (bool state) { m_cassbit = state; }); clock_device &acia_tx_clock(CLOCK(config, "acia_tx_clock", XTAL_MEKD2 / 256)); // 4800Hz acia_tx_clock.signal_handler().set(m_acia, FUNC(acia6850_device::write_txc)); - clock_device &acia_rx_clock(CLOCK(config, "acia_rx_clock", 300)); // toggled by cassette circuit + clock_device &acia_rx_clock(CLOCK(config, "acia_rx_clock", XTAL::u(300))); // toggled by cassette circuit acia_rx_clock.signal_handler().set(m_acia, FUNC(acia6850_device::write_rxc)); TIMER(config, "kansas_w").configure_periodic(FUNC(mekd2_state::kansas_w), attotime::from_hz(4800)); diff --git a/src/mame/motorola/mekd3.cpp b/src/mame/motorola/mekd3.cpp index 753345c1932..9eab8c81d86 100644 --- a/src/mame/motorola/mekd3.cpp +++ b/src/mame/motorola/mekd3.cpp @@ -950,7 +950,7 @@ void mekd3_state::mekd3(machine_config &config) m_cass->add_route(ALL_OUTPUTS, "mono", 0.05); // Keypad and display PIA. CA2 and CB2 are NC. - PIA6821(config, m_kpd_pia, 0); + PIA6821(config, m_kpd_pia); m_kpd_pia->readpa_handler().set(FUNC(mekd3_state::keypad_key_r)); m_kpd_pia->readcb1_handler().set(FUNC(mekd3_state::keypad_cb1_r)); m_kpd_pia->writepa_handler().set(FUNC(mekd3_state::led_segment_w)); @@ -968,7 +968,7 @@ void mekd3_state::mekd3(machine_config &config) // MEK68IO // A 'user' PIA, I/O available at SK6. - PIA6821(config, m_pia_io1, 0); + PIA6821(config, m_pia_io1); m_pia_io1->irqa_handler().set(m_mainnmi, FUNC(input_merger_device::in_w<2>)); m_pia_io1->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<1>)); @@ -976,14 +976,14 @@ void mekd3_state::mekd3(machine_config &config) // PA0 can optionally be an audio bit input, at TP1. // PA1 is a jumper mode input, and low by default. // PA2 can optionally be an audio bit output, at TP2. - PIA6821(config, m_pia_io2, 0); + PIA6821(config, m_pia_io2); m_pia_io2->readpa_handler().set(FUNC(mekd3_state::pia_io2a_r)); m_pia_io2->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<2>)); m_pia_io2->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<3>)); // RS232 ACIA // /RTS, /CTS and /DCD are available at SK3. - ACIA6850(config, m_acia_io1, 0); + ACIA6850(config, m_acia_io1); m_acia_io1->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd)); m_acia_io1->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts)); m_acia_io1->irq_handler().set(m_mainirq, FUNC(input_merger_device::in_w<4>)); @@ -1006,7 +1006,7 @@ void mekd3_state::mekd3(machine_config &config) // /RTS is available at SK2. // /CTS and /DCD are available at SK2, or can be jumpered low. - ACIA6850(config, m_acia_cas, 0); + ACIA6850(config, m_acia_cas); m_acia_cas->txd_handler().set([this] (bool state) { m_cass_txbit = state; }); m_acia_cas->irq_handler().set(m_mainirq, FUNC(input_merger_device::in_w<5>)); @@ -1037,13 +1037,13 @@ void mekd3_state::mekd3(machine_config &config) // CA2 light pen input. // PB0 is mode flags and light pen control. // CB1 is VSYNC, and CB2 is HSYNC. - PIA6821(config, m_r2_pia, 0); + PIA6821(config, m_r2_pia); m_r2_pia->readpa_handler().set(FUNC(mekd3_state::r2_pia_pa_r)); m_r2_pia->readpb_handler().set(FUNC(mekd3_state::r2_pia_pb_r)); m_r2_pia->irqa_handler().set(m_mainirq, FUNC(input_merger_device::in_w<6>)); m_r2_pia->irqb_handler().set(m_mainirq, FUNC(input_merger_device::in_w<7>)); - generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0)); + generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard")); keyboard.set_keyboard_callback(FUNC(mekd3_state::kbd_put)); } diff --git a/src/mame/motorola/mekd4.cpp b/src/mame/motorola/mekd4.cpp index f34127eccc5..eece4e5bbd4 100644 --- a/src/mame/motorola/mekd4.cpp +++ b/src/mame/motorola/mekd4.cpp @@ -958,7 +958,7 @@ void mekd4_state::mekd4(machine_config &config) MC6809(config, m_maincpu, 3.579545_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &mekd4_state::mekd4_stop_mem); - ADDRESS_MAP_BANK(config, m_bankdev, 0); + ADDRESS_MAP_BANK(config, m_bankdev); m_bankdev->set_endianness(ENDIANNESS_BIG); m_bankdev->set_data_width(8); m_bankdev->set_addr_width(20); @@ -980,7 +980,7 @@ void mekd4_state::mekd4(machine_config &config) m_cass->add_route(ALL_OUTPUTS, "mono", 0.05); // IRQ is not connected. RTS, CTS, and DCD are available. - ACIA6850(config, m_acia, 0); + ACIA6850(config, m_acia); m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd)); m_acia->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts)); @@ -999,7 +999,7 @@ void mekd4_state::mekd4(machine_config &config) rs232.set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(terminal)); // Stop PIA. IRQB is NC. - PIA6821(config, m_stop_pia, 0); + PIA6821(config, m_stop_pia); m_stop_pia->writepa_handler().set(FUNC(mekd4_state::stop_pia_pa_w)); m_stop_pia->writepb_handler().set(FUNC(mekd4_state::stop_pia_pb_w)); m_stop_pia->ca2_w(1); // Connected to 'abort' TP2. Can be toggled low to and abort user code. @@ -1008,7 +1008,7 @@ void mekd4_state::mekd4(machine_config &config) m_stop_pia->irqa_handler().set("mainnmi", FUNC(input_merger_device::in_w<0>)); // Keypad and display PIA. CA1, CA2, IRQA are NC. CB2 is pulled high. - PIA6821(config, m_kpd_pia, 0); + PIA6821(config, m_kpd_pia); m_kpd_pia->readpa_handler().set(FUNC(mekd4_state::keypad_key_r)); m_kpd_pia->readcb1_handler().set(FUNC(mekd4_state::keypad_cb1_r)); m_kpd_pia->writepa_handler().set(FUNC(mekd4_state::led_segment_w)); @@ -1016,7 +1016,7 @@ void mekd4_state::mekd4(machine_config &config) m_kpd_pia->irqb_handler().set("mainnmi", FUNC(input_merger_device::in_w<1>)); // Keypad and display board User PIA. - PIA6821(config, m_user_pia, 0); + PIA6821(config, m_user_pia); m_user_pia->irqa_handler().set("mainirq", FUNC(input_merger_device::in_w<0>)); m_user_pia->irqb_handler().set("mainirq", FUNC(input_merger_device::in_w<1>)); @@ -1044,13 +1044,13 @@ void mekd4_state::mekd4(machine_config &config) // CA2 light pen input. // PB0 is mode flags and light pen control. // CB1 is VSYNC, and CB2 is HSYNC. - PIA6821(config, m_r2_pia, 0); + PIA6821(config, m_r2_pia); m_r2_pia->readpa_handler().set(FUNC(mekd4_state::r2_pia_pa_r)); m_r2_pia->readpb_handler().set(FUNC(mekd4_state::r2_pia_pb_r)); m_r2_pia->irqa_handler().set("mainirq", FUNC(input_merger_device::in_w<2>)); m_r2_pia->irqb_handler().set("mainirq", FUNC(input_merger_device::in_w<3>)); - generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0)); + generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard")); keyboard.set_keyboard_callback(FUNC(mekd4_state::kbd_put)); } diff --git a/src/mame/motorola/mekd5.cpp b/src/mame/motorola/mekd5.cpp index 17d9f8e8068..2d36eaacc6a 100644 --- a/src/mame/motorola/mekd5.cpp +++ b/src/mame/motorola/mekd5.cpp @@ -465,7 +465,7 @@ void mekd5_state::mekd5(machine_config &config) m_cass->add_route(ALL_OUTPUTS, "mono", 0.05); // Keypad and display PIA (U23). IRQA is NC. CB2 is trace timer input. - PIA6821(config, m_kpd_pia, 0); + PIA6821(config, m_kpd_pia); m_kpd_pia->readpa_handler().set(FUNC(mekd5_state::keypad_key_r)); m_kpd_pia->writepa_handler().set(FUNC(mekd5_state::led_segment_w)); m_kpd_pia->writepb_handler().set(FUNC(mekd5_state::led_digit_w)); @@ -477,11 +477,11 @@ void mekd5_state::mekd5(machine_config &config) // User PIA (U9). // IRQA and IRQB can be independently jumpered to IRQ or NMI via J1. // All the I/O lines are available at the User I/O connector. - PIA6821(config, m_user_pia, 0); + PIA6821(config, m_user_pia); // IRQ is NC. RX and TX clk are wired together. RTS is available. // /DCD and /CTS and wired low. - ACIA6850(config, m_acia, 0); + ACIA6850(config, m_acia); m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd)); MC14411(config, m_brg, XTAL(1'843'200)); diff --git a/src/mame/motorola/mvme147.cpp b/src/mame/motorola/mvme147.cpp index 575557cfaf8..b01bdf4c3fa 100644 --- a/src/mame/motorola/mvme147.cpp +++ b/src/mame/motorola/mvme147.cpp @@ -654,10 +654,10 @@ void mvme147_state::mvme147(machine_config &config) M68030(config, m_maincpu, 16_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &mvme147_state::mvme147_mem); - VME(config, "vme", 0); + VME(config, "vme"); VME_SLOT(config, "slot1", mvme147_vme_cards, nullptr, 1, "vme"); - M48T02(config, "m48t18", 0); /* t08 differs only in accepted voltage levels compared to t18 */ + M48T02(config, "m48t18"); /* t08 differs only in accepted voltage levels compared to t18 */ /* Terminal Port config */ SCC85C30(config, m_sccterm, SCC_CLOCK); diff --git a/src/mame/motorola/mvme162.cpp b/src/mame/motorola/mvme162.cpp index cfe4a9a4128..2ab3dd52a2e 100644 --- a/src/mame/motorola/mvme162.cpp +++ b/src/mame/motorola/mvme162.cpp @@ -297,7 +297,7 @@ void mvme162_state::mvme162(machine_config &config) M68040(config, m_maincpu, 25_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &mvme162_state::mvme162_mem); - M48T02(config, "m48t18", 0); /* t08 differs only in accepted voltage levels compared to t18 */ + M48T02(config, "m48t18"); /* t08 differs only in accepted voltage levels compared to t18 */ /* Terminal Port config */ SCC85230(config, m_sccterm, SCC_CLOCK); diff --git a/src/mame/motorola/powerstack.cpp b/src/mame/motorola/powerstack.cpp index d5444770d65..e7a9166bc81 100644 --- a/src/mame/motorola/powerstack.cpp +++ b/src/mame/motorola/powerstack.cpp @@ -29,7 +29,7 @@ INPUT_PORTS_END void powerstack_state::powerstack(machine_config &config) { -// ppc604_device &maincpu(PPC604(config, "maincpu", 300'000'000)); // PPC604E @ 300MHz +// ppc604_device &maincpu(PPC604(config, "maincpu", XTAL::u(300'000'000))); // PPC604E @ 300MHz // maincpu.set_addrmap(AS_PROGRAM, &powerstack_state::mem_map); } diff --git a/src/mame/motorola/sys1121.cpp b/src/mame/motorola/sys1121.cpp index 398ce67cdd9..553e8521206 100644 --- a/src/mame/motorola/sys1121.cpp +++ b/src/mame/motorola/sys1121.cpp @@ -41,7 +41,7 @@ namespace void sys1121_state::sys1121(machine_config &config) { - VME(config, "vme", 0); + VME(config, "vme"); VME_SLOT(config, "slot1", sys1121_vme_cards, "mvme120", 1, "vme"); VME_SLOT(config, "slot2", sys1121_vme_cards, nullptr, 2, "vme"); VME_SLOT(config, "slot3", sys1121_vme_cards, nullptr, 3, "vme"); diff --git a/src/mame/motorola/uchroma68.cpp b/src/mame/motorola/uchroma68.cpp index e45e2fcb59e..6035b06e238 100644 --- a/src/mame/motorola/uchroma68.cpp +++ b/src/mame/motorola/uchroma68.cpp @@ -454,19 +454,19 @@ void uchroma68_state::uchroma68(machine_config &config) m_mc6847->set_screen(m_screen); m_mc6847->input_callback().set(FUNC(uchroma68_state::mc6847_videoram_r)); - PIA6821(config, m_pia, 0); + PIA6821(config, m_pia); m_pia->readpa_handler().set(FUNC(uchroma68_state::pia_pa_r)); m_pia->readpb_handler().set(FUNC(uchroma68_state::pia_pb_r)); - ACIA6850(config, m_acia, 0); + ACIA6850(config, m_acia); m_acia->txd_handler().set([this] (bool state) { m_cass_txbit = state; }); - CLOCK(config, m_acia_tx_clock, 4800); + CLOCK(config, m_acia_tx_clock, XTAL::u(4800)); m_acia_tx_clock->signal_handler().set(FUNC(uchroma68_state::kansas_w)); TIMER(config, "kansas_r").configure_periodic(FUNC(uchroma68_state::kansas_r), attotime::from_hz(40000)); - generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0)); + generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard")); keyboard.set_keyboard_callback(FUNC(uchroma68_state::kbd_put)); } |