diff options
Diffstat (limited to 'src/mame/sigma')
-rw-r--r-- | src/mame/sigma/nyny.cpp | 6 | ||||
-rw-r--r-- | src/mame/sigma/r2dtank.cpp | 6 | ||||
-rw-r--r-- | src/mame/sigma/sigma21.cpp | 6 | ||||
-rw-r--r-- | src/mame/sigma/sigmab98.cpp | 6 | ||||
-rw-r--r-- | src/mame/sigma/spiders.cpp | 16 |
5 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/sigma/nyny.cpp b/src/mame/sigma/nyny.cpp index 9db28f5898f..f8ce2162ad8 100644 --- a/src/mame/sigma/nyny.cpp +++ b/src/mame/sigma/nyny.cpp @@ -596,7 +596,7 @@ void nyny_state::machine_reset() void nyny_state::nyny(machine_config &config) { /* basic machine hardware */ - MC6809(config, m_maincpu, 5600000); /* 1.40 MHz? The clock signal is generated by analog chips */ + MC6809(config, m_maincpu, XTAL::u(5600000)); /* 1.40 MHz? The clock signal is generated by analog chips */ m_maincpu->set_addrmap(AS_PROGRAM, &nyny_state::main_map); m_maincpu->set_periodic_int(FUNC(nyny_state::update_pia_1), attotime::from_hz(25)); @@ -624,7 +624,7 @@ void nyny_state::nyny(machine_config &config) m_mc6845->out_de_callback().set(m_ic48_1, FUNC(ttl74123_device::a_w)); /* 74LS123 */ - TTL74123(config, m_ic48_1, 0); + TTL74123(config, m_ic48_1); m_ic48_1->set_connection_type(TTL74123_GROUNDED); /* the hook up type */ m_ic48_1->set_resistor_value(RES_K(22)); /* resistor connected to RCext */ m_ic48_1->set_capacitor_value(CAP_U(0.01)); /* capacitor connected to Cext and RCext */ @@ -666,7 +666,7 @@ void nyny_state::nyny(machine_config &config) AY8910(config, "ay3", AUDIO_CPU_2_CLOCK).add_route(ALL_OUTPUTS, "speaker", 0.03); - DAC_8BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.25); // unknown DAC + DAC_8BIT_R2R(config, "dac").add_route(ALL_OUTPUTS, "speaker", 0.25); // unknown DAC } diff --git a/src/mame/sigma/r2dtank.cpp b/src/mame/sigma/r2dtank.cpp index f047855940b..e602ebc5e6c 100644 --- a/src/mame/sigma/r2dtank.cpp +++ b/src/mame/sigma/r2dtank.cpp @@ -468,7 +468,7 @@ void r2dtank_state::r2dtank(machine_config &config) /* 74LS123 */ - ttl74123_device &ttl74123(TTL74123(config, "74123", 0)); + ttl74123_device &ttl74123(TTL74123(config, "74123")); ttl74123.set_connection_type(TTL74123_GROUNDED); /* the hook up type */ ttl74123.set_resistor_value(RES_K(22)); /* resistor connected to RCext */ ttl74123.set_capacitor_value(CAP_U(0.01)); /* capacitor connected to Cext and RCext */ @@ -477,14 +477,14 @@ void r2dtank_state::r2dtank(machine_config &config) ttl74123.set_clear_pin_value(1); /* Clear pin - pulled high */ ttl74123.out_cb().set(FUNC(r2dtank_state::ttl74123_output_changed)); - PIA6821(config, m_pia_main, 0); + PIA6821(config, m_pia_main); m_pia_main->readpa_handler().set_ioport("IN0"); m_pia_main->readpb_handler().set_ioport("IN1"); m_pia_main->cb2_handler().set(FUNC(r2dtank_state::flipscreen_w)); m_pia_main->irqa_handler().set(FUNC(r2dtank_state::main_cpu_irq)); m_pia_main->irqb_handler().set(FUNC(r2dtank_state::main_cpu_irq)); - PIA6821(config, m_pia_audio, 0); + PIA6821(config, m_pia_audio); m_pia_audio->readpa_handler().set(FUNC(r2dtank_state::AY8910_port_r)); m_pia_audio->writepa_handler().set(FUNC(r2dtank_state::AY8910_port_w)); m_pia_audio->writepb_handler().set(FUNC(r2dtank_state::AY8910_select_w)); diff --git a/src/mame/sigma/sigma21.cpp b/src/mame/sigma/sigma21.cpp index bc15f37c867..6119ae1685d 100644 --- a/src/mame/sigma/sigma21.cpp +++ b/src/mame/sigma/sigma21.cpp @@ -80,16 +80,16 @@ GFXDECODE_END void sigma21_state::sigma21(machine_config &config) { - MC6809(config, m_maincpu, 5600000); // exact type and clock unknown + MC6809(config, m_maincpu, XTAL::u(5600000)); // exact type and clock unknown m_maincpu->set_addrmap(AS_PROGRAM, &sigma21_state::mem_map); PIA6821(config, "pia"); screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(5600000, 360, 0, 256, 276, 0, 224); // copied from r2dtank; actual params are in badly dumped ROM + screen.set_raw(XTAL::u(5600000), 360, 0, 256, 276, 0, 224); // copied from r2dtank; actual params are in badly dumped ROM screen.set_screen_update("crtc", FUNC(mc6845_device::screen_update)); - mc6845_device &crtc(MC6845(config, "crtc", 700000)); + mc6845_device &crtc(MC6845(config, "crtc", XTAL::u(700000))); crtc.set_screen("screen"); crtc.set_show_border_area(false); crtc.set_char_width(8); diff --git a/src/mame/sigma/sigmab98.cpp b/src/mame/sigma/sigmab98.cpp index fe0d3523969..8fd56e6b80c 100644 --- a/src/mame/sigma/sigmab98.cpp +++ b/src/mame/sigma/sigmab98.cpp @@ -1431,7 +1431,7 @@ INTERRUPT_GEN_MEMBER(sigmab98_state::sigmab98_vblank_interrupt) void sigmab98_state::sigmab98(machine_config &config) { - KY80(config, m_maincpu, 20000000); // !! TAXAN KY-80, clock @X1? !! + KY80(config, m_maincpu, XTAL::u(20000000)); // !! TAXAN KY-80, clock @X1? !! m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::gegege_mem_map); m_maincpu->set_addrmap(AS_IO, &sigmab98_state::gegege_io_map); m_maincpu->set_vblank_int("screen", FUNC(sigmab98_state::sigmab98_vblank_interrupt)); @@ -1460,7 +1460,7 @@ void sigmab98_state::sigmab98(machine_config &config) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - ymz280b_device &ymz(YMZ280B(config, "ymz", 16934400)); // clock @X2? + ymz280b_device &ymz(YMZ280B(config, "ymz", XTAL::u(16934400))); // clock @X2? ymz.add_route(0, "lspeaker", 1.0); ymz.add_route(1, "rspeaker", 1.0); } @@ -1499,7 +1499,7 @@ void lufykzku_state::lufykzku(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // battery backed RAM (TC55257DFL-70L) // No EEPROM - MB3773(config, m_watchdog, 0); + MB3773(config, m_watchdog); TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ); // 2 x 8-bit parallel/serial converters diff --git a/src/mame/sigma/spiders.cpp b/src/mame/sigma/spiders.cpp index fd6453391fc..dd4d07e98e3 100644 --- a/src/mame/sigma/spiders.cpp +++ b/src/mame/sigma/spiders.cpp @@ -202,7 +202,7 @@ #include "screen.h" -#define MAIN_CPU_MASTER_CLOCK (11200000) +#define MAIN_CPU_MASTER_CLOCK XTAL::u(11200000) #define PIXEL_CLOCK (MAIN_CPU_MASTER_CLOCK / 2) #define CRTC_CLOCK (MAIN_CPU_MASTER_CLOCK / 16) @@ -504,11 +504,11 @@ INPUT_PORTS_END void spiders_state::spiders(machine_config &config) { /* basic machine hardware */ - MC6809(config, m_maincpu, 2800000); + MC6809(config, m_maincpu, XTAL::u(2800000)); m_maincpu->set_addrmap(AS_PROGRAM, &spiders_state::spiders_main_map); m_maincpu->set_periodic_int(FUNC(spiders_state::update_pia_1), attotime::from_hz(25)); - M6802(config, m_audiocpu, 3000000); + M6802(config, m_audiocpu, XTAL::u(3000000)); m_audiocpu->set_addrmap(AS_PROGRAM, &spiders_state::spiders_audio_map); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); @@ -527,20 +527,20 @@ void spiders_state::spiders(machine_config &config) crtc.set_update_row_callback(FUNC(spiders_state::crtc_update_row)); crtc.out_de_callback().set("ic60", FUNC(ttl74123_device::a_w)); - PIA6821(config, m_pia[0], 0); + PIA6821(config, m_pia[0]); m_pia[0]->readpa_handler().set_ioport("IN0"); m_pia[0]->readpb_handler().set_ioport("IN1"); m_pia[0]->irqa_handler().set("mainirq", FUNC(input_merger_device::in_w<0>)); m_pia[0]->irqb_handler().set("mainirq", FUNC(input_merger_device::in_w<1>)); - PIA6821(config, m_pia[1], 0); + PIA6821(config, m_pia[1]); m_pia[1]->readpa_handler().set(FUNC(spiders_state::gfx_rom_r)); m_pia[1]->writepb_handler().set(FUNC(spiders_state::gfx_rom_intf_w)); m_pia[1]->cb2_handler().set(FUNC(spiders_state::flipscreen_w)); m_pia[1]->irqa_handler().set_inputline("maincpu", M6809_FIRQ_LINE); m_pia[1]->irqb_handler().set("mainirq", FUNC(input_merger_device::in_w<2>)); - PIA6821(config, m_pia[2], 0); + PIA6821(config, m_pia[2]); m_pia[2]->writepa_handler().set(FUNC(spiders_state::spiders_audio_ctrl_w)); m_pia[2]->writepb_handler().set(FUNC(spiders_state::spiders_audio_command_w)); m_pia[2]->irqa_handler().set("mainirq", FUNC(input_merger_device::in_w<3>)); @@ -548,12 +548,12 @@ void spiders_state::spiders(machine_config &config) INPUT_MERGER_ANY_HIGH(config, "mainirq").output_handler().set_inputline(m_maincpu, M6809_IRQ_LINE); - PIA6821(config, m_pia[3], 0); + PIA6821(config, m_pia[3]); m_pia[3]->writepa_handler().set(FUNC(spiders_state::spiders_audio_a_w)); m_pia[3]->writepb_handler().set(FUNC(spiders_state::spiders_audio_b_w)); m_pia[3]->irqa_handler().set_inputline("audiocpu", M6802_IRQ_LINE); - ttl74123_device &ic60(TTL74123(config, "ic60", 0)); + ttl74123_device &ic60(TTL74123(config, "ic60")); ic60.set_connection_type(TTL74123_GROUNDED); /* the hook up type */ ic60.set_resistor_value(RES_K(22)); /* resistor connected to RCext */ ic60.set_capacitor_value(CAP_U(0.01)); /* capacitor connected to Cext and RCext */ |