diff options
Diffstat (limited to 'src/mame/namco')
97 files changed, 251 insertions, 251 deletions
diff --git a/src/mame/namco/20pacgal.cpp b/src/mame/namco/20pacgal.cpp index 5c0e5a8f4e2..bddc0c9786d 100644 --- a/src/mame/namco/20pacgal.cpp +++ b/src/mame/namco/20pacgal.cpp @@ -431,7 +431,7 @@ void _20pacgal_state::_20pacgal(machine_config &config) namco.set_voices(3); namco.add_route(ALL_OUTPUTS, "speaker", 1.0); - DAC_8BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 1.0); // unknown DAC + DAC_8BIT_R2R(config, "dac").add_route(ALL_OUTPUTS, "speaker", 1.0); // unknown DAC } static DEVICE_INPUT_DEFAULTS_START( null_modem_57600 ) diff --git a/src/mame/namco/c117.cpp b/src/mame/namco/c117.cpp index 87621321507..3cece566724 100644 --- a/src/mame/namco/c117.cpp +++ b/src/mame/namco/c117.cpp @@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(NAMCO_C117, namco_c117_device, "namco_c117", "Namco C117 MMU" // namco_c117_device - constructor //------------------------------------------------- -namco_c117_device::namco_c117_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namco_c117_device::namco_c117_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_C117, tag, owner, clock), device_memory_interface(mconfig, *this), m_subres_cb(*this), diff --git a/src/mame/namco/c117.h b/src/mame/namco/c117.h index d41ee5fde5b..88c162ab50d 100644 --- a/src/mame/namco/c117.h +++ b/src/mame/namco/c117.h @@ -19,7 +19,7 @@ class namco_c117_device : { public: //construction/destruction - namco_c117_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_c117_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // configuration template <typename T, typename U> void set_cpu_tags(T &&maintag, U &&subtag) diff --git a/src/mame/namco/cgang.cpp b/src/mame/namco/cgang.cpp index ea0f38afac3..7260adf0f2b 100644 --- a/src/mame/namco/cgang.cpp +++ b/src/mame/namco/cgang.cpp @@ -745,7 +745,7 @@ void cgang_state::cgang(machine_config &config) m_audiocpu->set_addrmap(AS_PROGRAM, &cgang_state::sound_map); m_audiocpu->set_periodic_int(FUNC(cgang_state::nmi_line_pulse), attotime::from_hz(8_MHz_XTAL/4 / 0x1000)); - PIT8253(config, m_pit[0], 0); + PIT8253(config, m_pit[0]); m_pit[0]->set_clk<0>(4_MHz_XTAL/4); m_pit[0]->set_clk<1>(4_MHz_XTAL/4); m_pit[0]->set_clk<2>(4_MHz_XTAL/4); @@ -753,7 +753,7 @@ void cgang_state::cgang(machine_config &config) m_pit[0]->out_handler<1>().set(FUNC(cgang_state::motor_clock_w<1>)); m_pit[0]->out_handler<2>().set(FUNC(cgang_state::motor_clock_w<2>)); - PIT8253(config, m_pit[1], 0); + PIT8253(config, m_pit[1]); m_pit[1]->set_clk<0>(4_MHz_XTAL/4); m_pit[1]->set_clk<1>(4_MHz_XTAL/4); m_pit[1]->set_clk<2>(4_MHz_XTAL/4); diff --git a/src/mame/namco/dkmb.cpp b/src/mame/namco/dkmb.cpp index 715c0c03bbb..0ad4a861566 100644 --- a/src/mame/namco/dkmb.cpp +++ b/src/mame/namco/dkmb.cpp @@ -121,10 +121,10 @@ INPUT_PORTS_END void dkmb_state::dkmb(machine_config &config) { - PPC603R(config, m_maincpu, 75'000'000); // Actually MPC603RRX266LC + PPC603R(config, m_maincpu, XTAL::u(75'000'000)); // Actually MPC603RRX266LC m_maincpu->set_addrmap(AS_PROGRAM, &dkmb_state::main_map); - PIC16C56(config, "pic", 4'000'000); // Actually PIC12C508, clock not verified + PIC16C56(config, "pic", XTAL::u(4'000'000)); // Actually PIC12C508, clock not verified screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); // wrong screen.set_refresh_hz(60); diff --git a/src/mame/namco/gal3.cpp b/src/mame/namco/gal3.cpp index 4c6f43151ac..922e29f5cc8 100644 --- a/src/mame/namco/gal3.cpp +++ b/src/mame/namco/gal3.cpp @@ -604,13 +604,13 @@ void gal3_state::gal3(machine_config &config) m68000_device &sound_cpu(M68000(config, "sound_cpu", 49152000/4)); // ?? sound_cpu.set_addrmap(AS_PROGRAM, &gal3_state::sound_cpu_map); - m68000_device &psn_b1_cpu(M68000(config, "psn_b1_cpu", 12000000)); // ?? + m68000_device &psn_b1_cpu(M68000(config, "psn_b1_cpu", XTAL::u(12000000))); // ?? psn_b1_cpu.set_addrmap(AS_PROGRAM, &gal3_state::psn_b1_cpu_map); /* - m68000_device &psn_b2_cpu(M68000(config, "psn_b2_cpu", 12000000)); // ?? + m68000_device &psn_b2_cpu(M68000(config, "psn_b2_cpu", XTAL::u(12000000))); // ?? psn_b2_cpu.set_addrmap(AS_PROGRAM, &gal3_state::psn_b1_cpu_map); - m68000_device &psn_b3_cpu(M68000(config, "psn_b3_cpu", 12000000)); // ?? + m68000_device &psn_b3_cpu(M68000(config, "psn_b3_cpu", XTAL::u(12000000))); // ?? psn_b3_cpu.set_addrmap(AS_PROGRAM, &gal3_state::psn_b1_cpu_map); */ config.set_maximum_quantum(attotime::from_hz(60*8000)); /* 8000 CPU slices per frame */ @@ -630,7 +630,7 @@ void gal3_state::gal3(machine_config &config) PALETTE(config, m_palette[0]).set_format(palette_device::xBRG_888, 0x10000/2); m_palette[0]->set_membits(16); - NAMCO_C355SPR(config, m_c355spr[0], 0); + NAMCO_C355SPR(config, m_c355spr[0]); m_c355spr[0]->set_screen("lscreen"); m_c355spr[0]->set_palette(m_palette[0]); m_c355spr[0]->set_scroll_offsets(0x26, 0x19); @@ -639,12 +639,12 @@ void gal3_state::gal3(machine_config &config) m_c355spr[0]->set_color_base(0x1000); // TODO : verify palette offset m_c355spr[0]->set_external_prifill(true); - NAMCOS21_3D(config, m_namcos21_3d[0], 0); + NAMCOS21_3D(config, m_namcos21_3d[0]); m_namcos21_3d[0]->set_zz_shift_mult(11, 0x200); m_namcos21_3d[0]->set_depth_reverse(false); m_namcos21_3d[0]->set_framebuffer_size(496,480); - NAMCOS21_DSP_C67(config, m_namcos21_dsp_c67[0], 0); + NAMCOS21_DSP_C67(config, m_namcos21_dsp_c67[0]); m_namcos21_dsp_c67[0]->set_renderer_tag("namcos21_3d_1"); // video chain 2 @@ -660,7 +660,7 @@ void gal3_state::gal3(machine_config &config) PALETTE(config, m_palette[1]).set_format(palette_device::xBRG_888, 0x10000/2); m_palette[1]->set_membits(16); - NAMCO_C355SPR(config, m_c355spr[1], 0); + NAMCO_C355SPR(config, m_c355spr[1]); m_c355spr[1]->set_screen("rscreen"); m_c355spr[1]->set_palette(m_palette[1]); m_c355spr[1]->set_scroll_offsets(0x26, 0x19); @@ -669,12 +669,12 @@ void gal3_state::gal3(machine_config &config) m_c355spr[1]->set_color_base(0x1000); // TODO : verify palette offset m_c355spr[1]->set_external_prifill(true); - NAMCOS21_3D(config, m_namcos21_3d[1], 0); + NAMCOS21_3D(config, m_namcos21_3d[1]); m_namcos21_3d[1]->set_zz_shift_mult(11, 0x200); m_namcos21_3d[1]->set_depth_reverse(false); m_namcos21_3d[1]->set_framebuffer_size(496,480); - NAMCOS21_DSP_C67(config, m_namcos21_dsp_c67[1], 0); + NAMCOS21_DSP_C67(config, m_namcos21_dsp_c67[1]); m_namcos21_dsp_c67[1]->set_renderer_tag("namcos21_3d_2"); diff --git a/src/mame/namco/galaga.cpp b/src/mame/namco/galaga.cpp index 33956e29d09..74ddcff9992 100644 --- a/src/mame/namco/galaga.cpp +++ b/src/mame/namco/galaga.cpp @@ -1643,7 +1643,7 @@ void bosco_state::bosco(machine_config &config) GFXDECODE(config, m_gfxdecode, m_palette, gfx_bosco); PALETTE(config, m_palette, FUNC(bosco_state::bosco_palette), 64*4 + 64*4 + 4 + 64, 32+64); - STARFIELD_05XX(config, m_starfield, 0); + STARFIELD_05XX(config, m_starfield); m_starfield->set_starfield_config(0, STARFIELD_Y_OFFSET_BOSCO, STARFIELD_X_LIMIT_BOSCO); /* sound hardware */ @@ -1720,7 +1720,7 @@ void galaga_state::galaga(machine_config &config) GFXDECODE(config, m_gfxdecode, m_palette, gfx_galaga); PALETTE(config, m_palette, FUNC(galaga_state::galaga_palette), 64*4 + 64*4 + 4 + 64, 32+64); - STARFIELD_05XX(config, m_starfield, 0); + STARFIELD_05XX(config, m_starfield); m_starfield->set_starfield_config(STARFIELD_X_OFFSET_GALAGA, 0, STARFIELD_X_LIMIT_GALAGA); /* sound hardware */ diff --git a/src/mame/namco/gaplus.cpp b/src/mame/namco/gaplus.cpp index 4648c02d0a4..0faa77e9aa2 100644 --- a/src/mame/namco/gaplus.cpp +++ b/src/mame/namco/gaplus.cpp @@ -554,7 +554,7 @@ void gaplus_state::gaplus(machine_config &config) { gaplus_base(config); - NAMCO_56XX(config, m_namco56xx, 0); + NAMCO_56XX(config, m_namco56xx); m_namco56xx->in_callback<0>().set_ioport("COINS"); m_namco56xx->in_callback<1>().set_ioport("P1"); m_namco56xx->in_callback<2>().set_ioport("P2"); @@ -562,7 +562,7 @@ void gaplus_state::gaplus(machine_config &config) m_namco56xx->out_callback<0>().set(FUNC(gaplus_state::out_lamps0)); m_namco56xx->out_callback<1>().set(FUNC(gaplus_state::out_lamps1)); - NAMCO_58XX(config, m_namco58xx, 0); + NAMCO_58XX(config, m_namco58xx); m_namco58xx->in_callback<0>().set_ioport("DSWA_HIGH"); m_namco58xx->in_callback<1>().set_ioport("DSWB_LOW"); m_namco58xx->in_callback<2>().set_ioport("DSWB_HIGH"); @@ -573,13 +573,13 @@ void gaplusd_state::gaplusd(machine_config &config) { gaplus_base(config); - NAMCO_58XX(config, m_namco58xx, 0); + NAMCO_58XX(config, m_namco58xx); m_namco58xx->in_callback<0>().set_ioport("COINS"); m_namco58xx->in_callback<1>().set_ioport("P1"); m_namco58xx->in_callback<2>().set_ioport("P2"); m_namco58xx->in_callback<3>().set_ioport("BUTTONS"); - NAMCO_56XX(config, m_namco56xx, 0); + NAMCO_56XX(config, m_namco56xx); m_namco56xx->in_callback<0>().set_ioport("DSWA_HIGH"); m_namco56xx->in_callback<1>().set_ioport("DSWB_LOW"); m_namco56xx->in_callback<2>().set_ioport("DSWB_HIGH"); @@ -594,13 +594,13 @@ void gapluso_state::gapluso(machine_config &config) m_screen->screen_vblank().set(FUNC(gaplus_base_state::screen_vblank)); m_screen->screen_vblank().append(FUNC(gapluso_state::vblank_irq)); - NAMCO_56XX(config, m_namco56xx, 0); + NAMCO_56XX(config, m_namco56xx); m_namco56xx->in_callback<0>().set_ioport("COINS"); m_namco56xx->in_callback<1>().set_ioport("P1"); m_namco56xx->in_callback<2>().set_ioport("P2"); m_namco56xx->in_callback<3>().set_ioport("BUTTONS"); - NAMCO_58XX(config, m_namco58xx, 0); + NAMCO_58XX(config, m_namco58xx); m_namco58xx->in_callback<0>().set_ioport("DSWA_HIGH"); m_namco58xx->in_callback<1>().set_ioport("DSWB_LOW"); m_namco58xx->in_callback<2>().set_ioport("DSWB_HIGH"); diff --git a/src/mame/namco/geebee.cpp b/src/mame/namco/geebee.cpp index 6a259eb7354..af575931b3d 100644 --- a/src/mame/namco/geebee.cpp +++ b/src/mame/namco/geebee.cpp @@ -15,7 +15,7 @@ DEFINE_DEVICE_TYPE(GEEBEE_SOUND, geebee_sound_device, "geebee_sound", "Gee Bee Custom Sound") -geebee_sound_device::geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +geebee_sound_device::geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, GEEBEE_SOUND, tag, owner, clock), device_sound_interface(mconfig, *this), m_decay(nullptr), diff --git a/src/mame/namco/geebee.h b/src/mame/namco/geebee.h index a0aab1ef412..5505a23c115 100644 --- a/src/mame/namco/geebee.h +++ b/src/mame/namco/geebee.h @@ -8,7 +8,7 @@ class geebee_sound_device : public device_t, public device_sound_interface { public: - geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void sound_w(u8 data); diff --git a/src/mame/namco/kungfur.cpp b/src/mame/namco/kungfur.cpp index cd396109f0e..85fd0cfe7f5 100644 --- a/src/mame/namco/kungfur.cpp +++ b/src/mame/namco/kungfur.cpp @@ -276,7 +276,7 @@ INPUT_PORTS_END void kungfur_state::kungfur(machine_config &config) { /* basic machine hardware */ - MC6809(config, m_maincpu, 4000000); // 4MHz? + MC6809(config, m_maincpu, XTAL::u(4000000)); // 4MHz? m_maincpu->set_addrmap(AS_PROGRAM, &kungfur_state::main_map); const attotime irq_period = attotime::from_hz(4000000 / 0x1000); // = 976.5Hz, accurate diff --git a/src/mame/namco/mappy.cpp b/src/mame/namco/mappy.cpp index fc59e5949b3..b5f354c6489 100644 --- a/src/mame/namco/mappy.cpp +++ b/src/mame/namco/mappy.cpp @@ -1365,13 +1365,13 @@ void mappy_state::superpac(machine_config &config) { superpac_common(config); - NAMCO_56XX(config, m_namcoio[0], 0); + NAMCO_56XX(config, m_namcoio[0]); m_namcoio[0]->in_callback<0>().set_ioport("COINS"); m_namcoio[0]->in_callback<1>().set_ioport("P1"); m_namcoio[0]->in_callback<2>().set_ioport("P2"); m_namcoio[0]->in_callback<3>().set_ioport("BUTTONS"); - NAMCO_56XX(config, m_namcoio[1], 0); + NAMCO_56XX(config, m_namcoio[1]); m_namcoio[1]->in_callback<0>().set("dipmux", FUNC(ls157_device::output_r)); m_namcoio[1]->in_callback<1>().set_ioport("DSW1"); m_namcoio[1]->in_callback<2>().set_ioport("DSW1").rshift(4); @@ -1383,14 +1383,14 @@ void mappy_state::pacnpal(machine_config &config) { superpac_common(config); - NAMCO_56XX(config, m_namcoio[0], 0); + NAMCO_56XX(config, m_namcoio[0]); m_namcoio[0]->in_callback<0>().set_ioport("COINS"); m_namcoio[0]->in_callback<1>().set_ioport("P1"); m_namcoio[0]->in_callback<2>().set_ioport("P2"); m_namcoio[0]->in_callback<3>().set_ioport("BUTTONS"); m_namcoio[0]->out_callback<0>().set(FUNC(mappy_state::out_lamps)); - NAMCO_59XX(config, m_namcoio[1], 0); + NAMCO_59XX(config, m_namcoio[1]); m_namcoio[1]->in_callback<0>().set("dipmux", FUNC(ls157_device::output_r)); m_namcoio[1]->in_callback<1>().set_ioport("DSW1"); m_namcoio[1]->in_callback<2>().set_ioport("DSW1").rshift(4); @@ -1402,13 +1402,13 @@ void mappy_state::grobda(machine_config &config) { superpac_common(config); - NAMCO_58XX(config, m_namcoio[0], 0); + NAMCO_58XX(config, m_namcoio[0]); m_namcoio[0]->in_callback<0>().set_ioport("COINS"); m_namcoio[0]->in_callback<1>().set_ioport("P1"); m_namcoio[0]->in_callback<2>().set_ioport("P2"); m_namcoio[0]->in_callback<3>().set_ioport("BUTTONS"); - NAMCO_56XX(config, m_namcoio[1], 0); + NAMCO_56XX(config, m_namcoio[1]); m_namcoio[1]->in_callback<0>().set("dipmux", FUNC(ls157_device::output_r)); m_namcoio[1]->in_callback<1>().set_ioport("DSW1"); m_namcoio[1]->in_callback<2>().set_ioport("DSW1").rshift(4); @@ -1442,13 +1442,13 @@ void mappy_state::phozon(machine_config &config) config.set_maximum_quantum(attotime::from_hz(6000)); // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs - NAMCO_58XX(config, m_namcoio[0], 0); + NAMCO_58XX(config, m_namcoio[0]); m_namcoio[0]->in_callback<0>().set_ioport("COINS"); m_namcoio[0]->in_callback<1>().set_ioport("P1"); m_namcoio[0]->in_callback<2>().set_ioport("P2"); m_namcoio[0]->in_callback<3>().set_ioport("BUTTONS"); - NAMCO_56XX(config, m_namcoio[1], 0); + NAMCO_56XX(config, m_namcoio[1]); m_namcoio[1]->in_callback<0>().set("dipmux", FUNC(ls157_device::output_r)); m_namcoio[1]->in_callback<1>().set_ioport("DSW1"); m_namcoio[1]->in_callback<2>().set_ioport("DSW1").rshift(4); @@ -1529,13 +1529,13 @@ void mappy_state::mappy(machine_config &config) { mappy_common(config); - NAMCO_58XX(config, m_namcoio[0], 0); + NAMCO_58XX(config, m_namcoio[0]); m_namcoio[0]->in_callback<0>().set_ioport("COINS"); m_namcoio[0]->in_callback<1>().set_ioport("P1"); m_namcoio[0]->in_callback<2>().set_ioport("P2"); m_namcoio[0]->in_callback<3>().set_ioport("BUTTONS"); - NAMCO_58XX(config, m_namcoio[1], 0); + NAMCO_58XX(config, m_namcoio[1]); m_namcoio[1]->in_callback<0>().set("dipmux", FUNC(ls157_device::output_r)); m_namcoio[1]->in_callback<1>().set_ioport("DSW1"); m_namcoio[1]->in_callback<2>().set_ioport("DSW1").rshift(4); @@ -1549,13 +1549,13 @@ void mappy_state::digdug2(machine_config &config) subdevice<watchdog_timer_device>("watchdog")->set_vblank_count("screen", 0); - NAMCO_58XX(config, m_namcoio[0], 0); + NAMCO_58XX(config, m_namcoio[0]); m_namcoio[0]->in_callback<0>().set_ioport("COINS"); m_namcoio[0]->in_callback<1>().set_ioport("P1"); m_namcoio[0]->in_callback<2>().set_ioport("P2"); m_namcoio[0]->in_callback<3>().set_ioport("BUTTONS"); - NAMCO_56XX(config, m_namcoio[1], 0); + NAMCO_56XX(config, m_namcoio[1]); m_namcoio[1]->in_callback<0>().set("dipmux", FUNC(ls157_device::output_r)); m_namcoio[1]->in_callback<1>().set_ioport("DSW1"); m_namcoio[1]->in_callback<2>().set_ioport("DSW1").rshift(4); @@ -1576,14 +1576,14 @@ void mappy_state::motos(machine_config &config) { mappy_common(config); - NAMCO_56XX(config, m_namcoio[0], 0); + NAMCO_56XX(config, m_namcoio[0]); m_namcoio[0]->in_callback<0>().set_ioport("COINS"); m_namcoio[0]->in_callback<1>().set_ioport("P1"); m_namcoio[0]->in_callback<2>().set_ioport("P2"); m_namcoio[0]->in_callback<3>().set_ioport("BUTTONS"); m_namcoio[0]->out_callback<0>().set(FUNC(mappy_state::out_lamps)); - NAMCO_56XX(config, m_namcoio[1], 0); + NAMCO_56XX(config, m_namcoio[1]); m_namcoio[1]->in_callback<0>().set("dipmux", FUNC(ls157_device::output_r)); m_namcoio[1]->in_callback<1>().set_ioport("DSW1"); m_namcoio[1]->in_callback<2>().set_ioport("DSW1").rshift(4); diff --git a/src/mame/namco/namco06.cpp b/src/mame/namco/namco06.cpp index 9f37fafa94a..72dcc1e4390 100644 --- a/src/mame/namco/namco06.cpp +++ b/src/mame/namco/namco06.cpp @@ -243,7 +243,7 @@ void namco_06xx_device::set_nmi(int state) DEFINE_DEVICE_TYPE(NAMCO_06XX, namco_06xx_device, "namco06", "Namco 06xx") -namco_06xx_device::namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_06xx_device::namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_06XX, tag, owner, clock) , m_control(0) , m_next_timer_state(false) diff --git a/src/mame/namco/namco06.h b/src/mame/namco/namco06.h index 30a76e9af2e..b5561f26d32 100644 --- a/src/mame/namco/namco06.h +++ b/src/mame/namco/namco06.h @@ -10,7 +10,7 @@ class namco_06xx_device : public device_t { public: - namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_maincpu(T &&tag) { m_nmicpu.set_tag(std::forward<T>(tag)); } diff --git a/src/mame/namco/namco50.cpp b/src/mame/namco/namco50.cpp index 8baf8cb4bd5..b40ec2f1e4d 100644 --- a/src/mame/namco/namco50.cpp +++ b/src/mame/namco/namco50.cpp @@ -214,7 +214,7 @@ ROM_END DEFINE_DEVICE_TYPE(NAMCO_50XX, namco_50xx_device, "namco50", "Namco 50xx") -namco_50xx_device::namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_50xx_device::namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_50XX, tag, owner, clock), m_cpu(*this, "mcu"), m_rw(0), diff --git a/src/mame/namco/namco50.h b/src/mame/namco/namco50.h index d24a52b8f35..8135237ac70 100644 --- a/src/mame/namco/namco50.h +++ b/src/mame/namco/namco50.h @@ -11,7 +11,7 @@ class namco_50xx_device : public device_t { public: - namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); WRITE_LINE_MEMBER( reset ); WRITE_LINE_MEMBER( chip_select ); diff --git a/src/mame/namco/namco51.cpp b/src/mame/namco/namco51.cpp index 1e574993a89..7e8f8d5dbbd 100644 --- a/src/mame/namco/namco51.cpp +++ b/src/mame/namco/namco51.cpp @@ -158,7 +158,7 @@ ROM_END DEFINE_DEVICE_TYPE(NAMCO_51XX, namco_51xx_device, "namco51", "Namco 51xx") -namco_51xx_device::namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_51xx_device::namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_51XX, tag, owner, clock) , m_cpu(*this, "mcu") , m_portO(0) diff --git a/src/mame/namco/namco51.h b/src/mame/namco/namco51.h index 35cec6458f2..c4c905678e0 100644 --- a/src/mame/namco/namco51.h +++ b/src/mame/namco/namco51.h @@ -11,7 +11,7 @@ class namco_51xx_device : public device_t { public: - namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <unsigned N> auto input_callback() { return m_in[N].bind(); } auto output_callback() { return m_out.bind(); } diff --git a/src/mame/namco/namco52.cpp b/src/mame/namco/namco52.cpp index 564b25cd82c..0924dd71c01 100644 --- a/src/mame/namco/namco52.cpp +++ b/src/mame/namco/namco52.cpp @@ -135,7 +135,7 @@ ROM_END DEFINE_DEVICE_TYPE(NAMCO_52XX, namco_52xx_device, "namco52", "Namco 52xx") -namco_52xx_device::namco_52xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_52xx_device::namco_52xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_52XX, tag, owner, clock), m_cpu(*this, "mcu"), m_discrete(*this, finder_base::DUMMY_TAG), diff --git a/src/mame/namco/namco52.h b/src/mame/namco/namco52.h index a775921b6a7..dfb1eafec93 100644 --- a/src/mame/namco/namco52.h +++ b/src/mame/namco/namco52.h @@ -9,7 +9,7 @@ class namco_52xx_device : public device_t { public: - namco_52xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_52xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_discrete(T &&tag) { m_discrete.set_tag(std::forward<T>(tag)); } void set_basenote(int node) { m_basenode = node; } diff --git a/src/mame/namco/namco53.cpp b/src/mame/namco/namco53.cpp index 7a6a8ea9181..54e0b674ced 100644 --- a/src/mame/namco/namco53.cpp +++ b/src/mame/namco/namco53.cpp @@ -127,7 +127,7 @@ ROM_END DEFINE_DEVICE_TYPE(NAMCO_53XX, namco_53xx_device, "namco53", "Namco 53xx") -namco_53xx_device::namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namco_53xx_device::namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_53XX, tag, owner, clock), m_cpu(*this, "mcu"), m_portO(0), diff --git a/src/mame/namco/namco53.h b/src/mame/namco/namco53.h index 2cd473b3c05..f339642fe90 100644 --- a/src/mame/namco/namco53.h +++ b/src/mame/namco/namco53.h @@ -10,7 +10,7 @@ class namco_53xx_device : public device_t { public: - namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <unsigned N> auto input_callback() { return m_in[N].bind(); } diff --git a/src/mame/namco/namco54.cpp b/src/mame/namco/namco54.cpp index 891cb957d0c..a4a6c3d44c0 100644 --- a/src/mame/namco/namco54.cpp +++ b/src/mame/namco/namco54.cpp @@ -114,7 +114,7 @@ ROM_END DEFINE_DEVICE_TYPE(NAMCO_54XX, namco_54xx_device, "namco54", "Namco 54xx") -namco_54xx_device::namco_54xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_54xx_device::namco_54xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_54XX, tag, owner, clock), m_cpu(*this, "mcu"), m_discrete(*this, finder_base::DUMMY_TAG), diff --git a/src/mame/namco/namco54.h b/src/mame/namco/namco54.h index 6bb0264820f..687932a7d17 100644 --- a/src/mame/namco/namco54.h +++ b/src/mame/namco/namco54.h @@ -10,7 +10,7 @@ class namco_54xx_device : public device_t { public: - namco_54xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_54xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_discrete(T &&tag) { m_discrete.set_tag(std::forward<T>(tag)); } void set_basenote(int node) { m_basenode = node; } diff --git a/src/mame/namco/namco62.cpp b/src/mame/namco/namco62.cpp index 8a7fc1e88ed..d0fcf2ec4d6 100644 --- a/src/mame/namco/namco62.cpp +++ b/src/mame/namco/namco62.cpp @@ -30,7 +30,7 @@ ROM_END DEFINE_DEVICE_TYPE(NAMCO_62XX, namco_62xx_device, "namco62", "Namco 62xx") -namco_62xx_device::namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namco_62xx_device::namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_62XX, tag, owner, clock), m_cpu(*this, "mcu"), m_in(*this), diff --git a/src/mame/namco/namco62.h b/src/mame/namco/namco62.h index a18c1b948cd..19b543c386e 100644 --- a/src/mame/namco/namco62.h +++ b/src/mame/namco/namco62.h @@ -8,7 +8,7 @@ class namco_62xx_device : public device_t { public: - namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <unsigned N> auto input_callback() { return m_in[N].bind(); } diff --git a/src/mame/namco/namco65.cpp b/src/mame/namco/namco65.cpp index 725e6741473..1f8d99ceba4 100644 --- a/src/mame/namco/namco65.cpp +++ b/src/mame/namco/namco65.cpp @@ -13,7 +13,7 @@ some of this can likely be moved into the actual MCU core too DEFINE_DEVICE_TYPE(NAMCOC65, namcoc65_device, "namcoc65", "Namco C65 I/O") -namcoc65_device::namcoc65_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namcoc65_device::namcoc65_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCOC65, tag, owner, clock), m_mcu(*this, "mcu"), m_in_pb_cb(*this), diff --git a/src/mame/namco/namco65.h b/src/mame/namco/namco65.h index ec814a8bbf3..c113a0043e0 100644 --- a/src/mame/namco/namco65.h +++ b/src/mame/namco/namco65.h @@ -15,7 +15,7 @@ class namcoc65_device : public device_t { public: // construction/destruction - namcoc65_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namcoc65_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto in_pb_callback() { return m_in_pb_cb.bind(); } auto in_pc_callback() { return m_in_pc_cb.bind(); } diff --git a/src/mame/namco/namco68.cpp b/src/mame/namco/namco68.cpp index c345638c2d6..a598189dcb3 100644 --- a/src/mame/namco/namco68.cpp +++ b/src/mame/namco/namco68.cpp @@ -13,7 +13,7 @@ output support DEFINE_DEVICE_TYPE(NAMCOC68, namcoc68_device, "namcoc68", "Namco C68 I/O") -namcoc68_device::namcoc68_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namcoc68_device::namcoc68_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCOC68, tag, owner, clock), m_mcu(*this, "mcu"), m_in_pb_cb(*this), diff --git a/src/mame/namco/namco68.h b/src/mame/namco/namco68.h index f078a2263b5..269fa95a2e5 100644 --- a/src/mame/namco/namco68.h +++ b/src/mame/namco/namco68.h @@ -15,7 +15,7 @@ class namcoc68_device : public device_t { public: // construction/destruction - namcoc68_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namcoc68_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto in_pb_callback() { return m_in_pb_cb.bind(); } diff --git a/src/mame/namco/namco_c116.cpp b/src/mame/namco/namco_c116.cpp index 4702e137f60..ca64e687edf 100644 --- a/src/mame/namco/namco_c116.cpp +++ b/src/mame/namco/namco_c116.cpp @@ -76,7 +76,7 @@ DEFINE_DEVICE_TYPE(NAMCO_C116, namco_c116_device, "namco_c116", "Namco C116 Vide // namco_c116_device -- constructor //------------------------------------------------- -namco_c116_device::namco_c116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_c116_device::namco_c116_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_C116, tag, owner, clock) , device_palette_interface(mconfig, *this) , device_video_interface(mconfig, *this) diff --git a/src/mame/namco/namco_c116.h b/src/mame/namco/namco_c116.h index 1fed49db5f4..8debb568801 100644 --- a/src/mame/namco/namco_c116.h +++ b/src/mame/namco/namco_c116.h @@ -17,7 +17,7 @@ class namco_c116_device : { public: //construction/destruction - namco_c116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + namco_c116_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); // configuration void enable_shadows() { m_enable_shadows = true; } diff --git a/src/mame/namco/namco_c123tmap.cpp b/src/mame/namco/namco_c123tmap.cpp index 4537e2be3f1..bbe5d979aa2 100644 --- a/src/mame/namco/namco_c123tmap.cpp +++ b/src/mame/namco/namco_c123tmap.cpp @@ -30,7 +30,7 @@ GFXDECODE_END DEFINE_DEVICE_TYPE(NAMCO_C123TMAP, namco_c123tmap_device, "namco_c123tmap", "Namco C123 (4x + 2x Tilemaps)") -namco_c123tmap_device::namco_c123tmap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : +namco_c123tmap_device::namco_c123tmap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_C123TMAP, tag, owner, clock), device_gfx_interface(mconfig, *this, gfxinfo), m_color_base(0), diff --git a/src/mame/namco/namco_c123tmap.h b/src/mame/namco/namco_c123tmap.h index 3ae46b869b0..c502bf38fc2 100644 --- a/src/mame/namco/namco_c123tmap.h +++ b/src/mame/namco/namco_c123tmap.h @@ -13,7 +13,7 @@ class namco_c123tmap_device : public device_t, public device_gfx_interface { public: // construction/destruction - namco_c123tmap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + namco_c123tmap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); void set_color_base(int color) { m_color_base = color; } void set_offset(int xoffs, int yoffs) diff --git a/src/mame/namco/namco_c139.cpp b/src/mame/namco/namco_c139.cpp index 882b1fb3bc3..43d697ce1dc 100644 --- a/src/mame/namco/namco_c139.cpp +++ b/src/mame/namco/namco_c139.cpp @@ -47,7 +47,7 @@ void namco_c139_device::regs_map(address_map &map) // namco_c139_device - constructor //------------------------------------------------- -namco_c139_device::namco_c139_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_c139_device::namco_c139_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_C139, tag, owner, clock), device_memory_interface(mconfig, *this), m_space_config("data", ENDIANNESS_BIG, 16, 14, 0, address_map_constructor(FUNC(namco_c139_device::data_map), this)) diff --git a/src/mame/namco/namco_c139.h b/src/mame/namco/namco_c139.h index 53c16499624..c414354e177 100644 --- a/src/mame/namco/namco_c139.h +++ b/src/mame/namco/namco_c139.h @@ -28,7 +28,7 @@ class namco_c139_device : public device_t, { public: // construction/destruction - namco_c139_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_c139_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // I/O operations void regs_map(address_map &map); diff --git a/src/mame/namco/namco_c148.cpp b/src/mame/namco/namco_c148.cpp index 047dd52a975..6af5811af47 100644 --- a/src/mame/namco/namco_c148.cpp +++ b/src/mame/namco/namco_c148.cpp @@ -65,7 +65,7 @@ DEFINE_DEVICE_TYPE(NAMCO_C148, namco_c148_device, "namco_c148", "Namco C148 Inte // namco_c148_device - constructor //------------------------------------------------- -namco_c148_device::namco_c148_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namco_c148_device::namco_c148_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_C148, tag, owner, clock), m_out_ext1_cb(*this), m_out_ext2_cb(*this), diff --git a/src/mame/namco/namco_c148.h b/src/mame/namco/namco_c148.h index 0cd79c3e08e..de07b9a7e46 100644 --- a/src/mame/namco/namco_c148.h +++ b/src/mame/namco/namco_c148.h @@ -22,12 +22,12 @@ class namco_c148_device : public device_t public: // construction/destruction template <typename T> - namco_c148_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&hostcpu, bool is_master) + namco_c148_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, T &&hostcpu, bool is_master) : namco_c148_device(mconfig, tag, owner, clock) { set_hostcpu(std::forward<T>(hostcpu), is_master); } - namco_c148_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_c148_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void map(address_map &map); diff --git a/src/mame/namco/namco_c169roz.cpp b/src/mame/namco/namco_c169roz.cpp index 4672121dbfd..48537610e0e 100644 --- a/src/mame/namco/namco_c169roz.cpp +++ b/src/mame/namco/namco_c169roz.cpp @@ -36,7 +36,7 @@ GFXDECODE_END DEFINE_DEVICE_TYPE(NAMCO_C169ROZ, namco_c169roz_device, "namco_c169roz", "Namco C169 (ROZ)") -namco_c169roz_device::namco_c169roz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : +namco_c169roz_device::namco_c169roz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_C169ROZ, tag, owner, clock), device_gfx_interface(mconfig, *this, gfxinfo), m_color_base(0), diff --git a/src/mame/namco/namco_c169roz.h b/src/mame/namco/namco_c169roz.h index 60786c0d159..848ffc040d5 100644 --- a/src/mame/namco/namco_c169roz.h +++ b/src/mame/namco/namco_c169roz.h @@ -13,7 +13,7 @@ class namco_c169roz_device : public device_t, public device_gfx_interface { public: // construction/destruction - namco_c169roz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); + namco_c169roz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); void set_is_namcofl(bool state) { m_is_namcofl = state; } void set_ram_words(uint32_t size) { m_ramsize = size; } diff --git a/src/mame/namco/namco_c45road.cpp b/src/mame/namco/namco_c45road.cpp index 91053377e36..1cb146b359e 100644 --- a/src/mame/namco/namco_c45road.cpp +++ b/src/mame/namco/namco_c45road.cpp @@ -77,7 +77,7 @@ void namco_c45_road_device::map(address_map &map) // namco_c45_road_device -- constructor //------------------------------------------------- -namco_c45_road_device::namco_c45_road_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namco_c45_road_device::namco_c45_road_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_C45_ROAD, tag, owner, clock), device_gfx_interface(mconfig, *this, gfxinfo), device_memory_interface(mconfig, *this), diff --git a/src/mame/namco/namco_c45road.h b/src/mame/namco/namco_c45road.h index 04f7e6d0880..28cc51bf783 100644 --- a/src/mame/namco/namco_c45road.h +++ b/src/mame/namco/namco_c45road.h @@ -19,7 +19,7 @@ class namco_c45_road_device : public device_t, public device_gfx_interface, publ { public: // construction/destruction - namco_c45_road_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + namco_c45_road_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); void map(address_map &map); diff --git a/src/mame/namco/namco_c67.cpp b/src/mame/namco/namco_c67.cpp index 509fd21dc00..d69f3323b67 100644 --- a/src/mame/namco/namco_c67.cpp +++ b/src/mame/namco/namco_c67.cpp @@ -15,7 +15,7 @@ DEFINE_DEVICE_TYPE(NAMCO_C67, namco_c67_device, "namcoc67", "Namco C67 (TMS320C25)") -namco_c67_device::namco_c67_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namco_c67_device::namco_c67_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : tms32025_device(mconfig, NAMCO_C67, tag, owner, clock) { set_mp_mc(false); diff --git a/src/mame/namco/namco_c67.h b/src/mame/namco/namco_c67.h index 9aa54dac090..4789459eee1 100644 --- a/src/mame/namco/namco_c67.h +++ b/src/mame/namco/namco_c67.h @@ -11,7 +11,7 @@ class namco_c67_device : public tms32025_device { public: - namco_c67_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_c67_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/mame/namco/namco_settings.cpp b/src/mame/namco/namco_settings.cpp index 1df580b9574..e112df27b3c 100644 --- a/src/mame/namco/namco_settings.cpp +++ b/src/mame/namco/namco_settings.cpp @@ -5,7 +5,7 @@ DEFINE_DEVICE_TYPE(NAMCO_SETTINGS, namco_settings_device, "namco_settings", "Namco Settings") -namco_settings_device::namco_settings_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namco_settings_device::namco_settings_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_SETTINGS, tag, owner, clock) { } diff --git a/src/mame/namco/namco_settings.h b/src/mame/namco/namco_settings.h index fe5a7f1f0c1..2212919aa2a 100644 --- a/src/mame/namco/namco_settings.h +++ b/src/mame/namco/namco_settings.h @@ -10,7 +10,7 @@ class namco_settings_device : public device_t { public: - namco_settings_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_settings_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_WRITE_LINE_MEMBER( ce_w ); DECLARE_WRITE_LINE_MEMBER( clk_w ); diff --git a/src/mame/namco/namcofl.cpp b/src/mame/namco/namcofl.cpp index 031ca6f25fd..afccd106a2c 100644 --- a/src/mame/namco/namcofl.cpp +++ b/src/mame/namco/namcofl.cpp @@ -687,14 +687,14 @@ void namcofl_state::namcofl(machine_config &config) m_screen->screen_vblank().set(m_c355spr, FUNC(namco_c355spr_device::vblank)); m_screen->set_palette(m_c116); - NAMCO_C169ROZ(config, m_c169roz, 0); + NAMCO_C169ROZ(config, m_c169roz); m_c169roz->set_palette(m_c116); m_c169roz->set_is_namcofl(true); m_c169roz->set_ram_words(0x20000 / 2); m_c169roz->set_tile_callback(namco_c169roz_device::c169_tilemap_delegate(&namcofl_state::roz_cb, this)); m_c169roz->set_color_base(0x1800); - NAMCO_C355SPR(config, m_c355spr, 0); + NAMCO_C355SPR(config, m_c355spr); m_c355spr->set_screen(m_screen); m_c355spr->set_palette(m_c116); m_c355spr->set_scroll_offsets(0, 0); @@ -703,12 +703,12 @@ void namcofl_state::namcofl(machine_config &config) m_c355spr->set_color_base(0); m_c355spr->set_buffer(1); - NAMCO_C123TMAP(config, m_c123tmap, 0); + NAMCO_C123TMAP(config, m_c123tmap); m_c123tmap->set_palette(m_c116); m_c123tmap->set_tile_callback(namco_c123tmap_device::c123_tilemap_delegate(&namcofl_state::tilemap_cb, this)); m_c123tmap->set_color_base(0x1000); - NAMCO_C116(config, m_c116, 0); + NAMCO_C116(config, m_c116); m_c116->enable_shadows(); SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/namco/namcoio.cpp b/src/mame/namco/namcoio.cpp index a7efb5164ff..dd0b0d804f4 100644 --- a/src/mame/namco/namcoio.cpp +++ b/src/mame/namco/namcoio.cpp @@ -122,7 +122,7 @@ DEFINE_DEVICE_TYPE(NAMCO_56XX, namco56xx_device, "namco56", "Namco 56xx I/O") DEFINE_DEVICE_TYPE(NAMCO_58XX, namco58xx_device, "namco58", "Namco 58xx I/O") DEFINE_DEVICE_TYPE(NAMCO_59XX, namco59xx_device, "namco59", "Namco 59xx I/O") -namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int device_type) +namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, int device_type) : device_t(mconfig, type, tag, owner, clock) , m_in_cb(*this) , m_out_cb(*this) @@ -130,17 +130,17 @@ namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, { } -namco56xx_device::namco56xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco56xx_device::namco56xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : namcoio_device(mconfig, NAMCO_56XX, tag, owner, clock, TYPE_NAMCO56XX) { } -namco58xx_device::namco58xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco58xx_device::namco58xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : namcoio_device(mconfig, NAMCO_58XX, tag, owner, clock, TYPE_NAMCO58XX) { } -namco59xx_device::namco59xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco59xx_device::namco59xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : namcoio_device(mconfig, NAMCO_59XX, tag, owner, clock, TYPE_NAMCO59XX) { } diff --git a/src/mame/namco/namcoio.h b/src/mame/namco/namcoio.h index f444e77f076..a590b887395 100644 --- a/src/mame/namco/namcoio.h +++ b/src/mame/namco/namcoio.h @@ -23,7 +23,7 @@ public: virtual void customio_run() = 0; protected: - namcoio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int device_type); + namcoio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, int device_type); // device-level overrides virtual void device_start() override; @@ -58,7 +58,7 @@ private: class namco56xx_device : public namcoio_device { public: - namco56xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco56xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual const tiny_rom_entry *device_rom_region() const override; @@ -68,7 +68,7 @@ public: class namco58xx_device : public namcoio_device { public: - namco58xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco58xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual const tiny_rom_entry *device_rom_region() const override; @@ -78,7 +78,7 @@ public: class namco59xx_device : public namcoio_device { public: - namco59xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco59xx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/mame/namco/namcoio_gearbox.cpp b/src/mame/namco/namcoio_gearbox.cpp index 995129dbb86..3c193b81a76 100644 --- a/src/mame/namco/namcoio_gearbox.cpp +++ b/src/mame/namco/namcoio_gearbox.cpp @@ -50,7 +50,7 @@ DEFINE_DEVICE_TYPE(NAMCOIO_GEARBOX, namcoio_gearbox_device, "namcoio_gearbox", " // namcoio_gearbox_device - constructor //------------------------------------------------- -namcoio_gearbox_device::namcoio_gearbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namcoio_gearbox_device::namcoio_gearbox_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCOIO_GEARBOX, tag, owner, clock) { } diff --git a/src/mame/namco/namcoio_gearbox.h b/src/mame/namco/namcoio_gearbox.h index f234a4fb160..04bfd500e28 100644 --- a/src/mame/namco/namcoio_gearbox.h +++ b/src/mame/namco/namcoio_gearbox.h @@ -21,7 +21,7 @@ class namcoio_gearbox_device : public device_t { public: // construction/destruction - namcoio_gearbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namcoio_gearbox_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // I/O operations DECLARE_CUSTOM_INPUT_MEMBER( in_r ); diff --git a/src/mame/namco/namcomcu.cpp b/src/mame/namco/namcomcu.cpp index eb23789f6cb..60bc7737ee0 100644 --- a/src/mame/namco/namcomcu.cpp +++ b/src/mame/namco/namcomcu.cpp @@ -53,27 +53,27 @@ ROM_START( c76 ) ROM_END -namco_c69_device::namco_c69_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_c69_device::namco_c69_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : m37702m2_device(mconfig, NAMCO_C69, tag, owner, clock) { } -namco_c70_device::namco_c70_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_c70_device::namco_c70_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : m37702m2_device(mconfig, NAMCO_C70, tag, owner, clock) { } -namco_c74_device::namco_c74_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_c74_device::namco_c74_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : m37702m2_device(mconfig, NAMCO_C74, tag, owner, clock) { } -namco_c75_device::namco_c75_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_c75_device::namco_c75_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : m37702m2_device(mconfig, NAMCO_C75, tag, owner, clock) { } -namco_c76_device::namco_c76_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +namco_c76_device::namco_c76_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : m37702m2_device(mconfig, NAMCO_C76, tag, owner, clock) { } diff --git a/src/mame/namco/namcomcu.h b/src/mame/namco/namcomcu.h index c7332e2faeb..c972be1f689 100644 --- a/src/mame/namco/namcomcu.h +++ b/src/mame/namco/namcomcu.h @@ -11,7 +11,7 @@ class namco_c69_device : public m37702m2_device { public: - namco_c69_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_c69_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; }; @@ -20,7 +20,7 @@ protected: class namco_c70_device : public m37702m2_device { public: - namco_c70_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_c70_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; }; @@ -29,7 +29,7 @@ protected: class namco_c74_device : public m37702m2_device { public: - namco_c74_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_c74_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; }; @@ -38,7 +38,7 @@ protected: class namco_c75_device : public m37702m2_device { public: - namco_c75_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_c75_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; }; @@ -47,7 +47,7 @@ protected: class namco_c76_device : public m37702m2_device { public: - namco_c76_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_c76_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; }; diff --git a/src/mame/namco/namcona1.cpp b/src/mame/namco/namcona1.cpp index 3ba9d393def..f1efbd457ac 100644 --- a/src/mame/namco/namcona1.cpp +++ b/src/mame/namco/namcona1.cpp @@ -1067,7 +1067,7 @@ void namcona1_state::namcona_base(machine_config &config) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - C219(config, m_c219, 44100); + C219(config, m_c219, XTAL::u(44100)); m_c219->set_addrmap(0, &namcona1_state::namcona1_c219_map); m_c219->add_route(0, "rspeaker", 1.00); m_c219->add_route(1, "lspeaker", 1.00); diff --git a/src/mame/namco/namcond1.cpp b/src/mame/namco/namcond1.cpp index f8720214d48..6f4494fdb83 100644 --- a/src/mame/namco/namcond1.cpp +++ b/src/mame/namco/namcond1.cpp @@ -509,7 +509,7 @@ void namcond1_state::namcond1(machine_config &config) config.set_maximum_quantum(attotime::from_hz(6000)); - YGV608(config, m_ygv608, 0); + YGV608(config, m_ygv608); m_ygv608->vblank_callback().set_inputline(m_maincpu, 1); m_ygv608->raster_callback().set_inputline(m_maincpu, 2); m_ygv608->set_screen("screen"); @@ -534,7 +534,7 @@ void namcond1_state::namcond1(machine_config &config) //c352.add_route(2, "lspeaker", 1.00); // Second DAC not present. //c352.add_route(3, "rspeaker", 1.00); - AT28C16(config, "at28c16", 0); + AT28C16(config, "at28c16"); } void namcond1_state::abcheck(machine_config &config) diff --git a/src/mame/namco/namcops2.cpp b/src/mame/namco/namcops2.cpp index 721b8d65e7d..fadddfc47bc 100644 --- a/src/mame/namco/namcops2.cpp +++ b/src/mame/namco/namcops2.cpp @@ -921,7 +921,7 @@ INPUT_PORTS_END void namcops2_state::system246(machine_config &config) { - R5000LE(config, m_maincpu, 294000000); // actually R5900 @ 294 MHz + R5000LE(config, m_maincpu, XTAL::u(294000000)); // actually R5900 @ 294 MHz m_maincpu->set_icache_size(16384); m_maincpu->set_dcache_size(16384); m_maincpu->set_addrmap(AS_PROGRAM, &namcops2_state::ps2_map); diff --git a/src/mame/namco/namcos1.cpp b/src/mame/namco/namcos1.cpp index f7c0f7bb3ef..e600f529604 100644 --- a/src/mame/namco/namcos1.cpp +++ b/src/mame/namco/namcos1.cpp @@ -1024,7 +1024,7 @@ void namcos1_state::ns1(machine_config &config) m_mcu->out_p1_cb().set(FUNC(namcos1_state::coin_w)); m_mcu->out_p2_cb().set(FUNC(namcos1_state::dac_gain_w)); - NAMCO_C117(config, m_c117, 0); + NAMCO_C117(config, m_c117); m_c117->set_addrmap(AS_PROGRAM, &namcos1_state::virtual_map); m_c117->set_cpu_tags("maincpu", "subcpu"); m_c117->subres_cb().set(FUNC(namcos1_state::subres_w)); @@ -1034,7 +1034,7 @@ void namcos1_state::ns1(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - LS157(config, m_dsw_sel, 0); // LS257 'A3' + LS157(config, m_dsw_sel); // LS257 'A3' /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -1045,10 +1045,10 @@ void namcos1_state::ns1(machine_config &config) GFXDECODE(config, m_gfxdecode, m_c116, gfx_namcos1); - NAMCO_C116(config, m_c116, 0); + NAMCO_C116(config, m_c116); m_c116->enable_shadows(); - NAMCO_C123TMAP(config, m_c123tmap, 0); + NAMCO_C123TMAP(config, m_c123tmap); m_c123tmap->set_palette(m_c116); m_c123tmap->set_tile_callback(namco_c123tmap_device::c123_tilemap_delegate(&namcos1_state::TilemapCB, this)); m_c123tmap->set_color_base(0x0800); @@ -1070,11 +1070,11 @@ void namcos1_state::ns1(machine_config &config) cus30.add_route(0, "lspeaker", 0.50); cus30.add_route(1, "rspeaker", 0.50); - DAC_8BIT_R2R(config, m_dac[0], 0); // 10-pin 1Kx8R SIP with HC374 latch + DAC_8BIT_R2R(config, m_dac[0]); // 10-pin 1Kx8R SIP with HC374 latch m_dac[0]->add_route(ALL_OUTPUTS, "lspeaker", 0.5); m_dac[0]->add_route(ALL_OUTPUTS, "rspeaker", 0.5); - DAC_8BIT_R2R(config, m_dac[1], 0); // 10-pin 1Kx8R SIP with HC374 latch + DAC_8BIT_R2R(config, m_dac[1]); // 10-pin 1Kx8R SIP with HC374 latch m_dac[1]->add_route(ALL_OUTPUTS, "lspeaker", 0.5); m_dac[1]->add_route(ALL_OUTPUTS, "rspeaker", 0.5); } diff --git a/src/mame/namco/namcos10.cpp b/src/mame/namco/namcos10.cpp index 6986db45c96..75c1580e108 100644 --- a/src/mame/namco/namcos10.cpp +++ b/src/mame/namco/namcos10.cpp @@ -1008,56 +1008,56 @@ void namcos10_state::ns10_mrdrilr2(machine_config &config) { namcos10_memm(config); /* decrypter device (CPLD in hardware?) */ - MRDRILR2_DECRYPTER(config, "decrypter", 0); + MRDRILR2_DECRYPTER(config, "decrypter"); } void namcos10_state::ns10_chocovdr(machine_config &config) { namcos10_memn(config); /* decrypter device (CPLD in hardware?) */ - CHOCOVDR_DECRYPTER(config, "decrypter", 0); + CHOCOVDR_DECRYPTER(config, "decrypter"); } void namcos10_state::ns10_gamshara(machine_config &config) { namcos10_memn(config); /* decrypter device (CPLD in hardware?) */ - GAMSHARA_DECRYPTER(config, "decrypter", 0); + GAMSHARA_DECRYPTER(config, "decrypter"); } void namcos10_state::ns10_gjspace(machine_config &config) { namcos10_memn(config); /* decrypter device (CPLD in hardware?) */ - GJSPACE_DECRYPTER(config, "decrypter", 0); + GJSPACE_DECRYPTER(config, "decrypter"); } void namcos10_state::ns10_knpuzzle(machine_config &config) { namcos10_memn(config); /* decrypter device (CPLD in hardware?) */ - KNPUZZLE_DECRYPTER(config, "decrypter", 0); + KNPUZZLE_DECRYPTER(config, "decrypter"); } void namcos10_state::ns10_konotako(machine_config &config) { namcos10_memn(config); /* decrypter device (CPLD in hardware?) */ - KONOTAKO_DECRYPTER(config, "decrypter", 0); + KONOTAKO_DECRYPTER(config, "decrypter"); } void namcos10_state::ns10_nflclsfb(machine_config &config) { namcos10_memn(config); /* decrypter device (CPLD in hardware?) */ - NFLCLSFB_DECRYPTER(config, "decrypter", 0); + NFLCLSFB_DECRYPTER(config, "decrypter"); } void namcos10_state::ns10_startrgn(machine_config &config) { namcos10_memn(config); /* decrypter device (CPLD in hardware?) */ - STARTRGN_DECRYPTER(config, "decrypter", 0); + STARTRGN_DECRYPTER(config, "decrypter"); } static INPUT_PORTS_START( namcos10 ) diff --git a/src/mame/namco/namcos11.cpp b/src/mame/namco/namcos11.cpp index efe3af41903..197c326bd32 100644 --- a/src/mame/namco/namcos11.cpp +++ b/src/mame/namco/namcos11.cpp @@ -613,7 +613,7 @@ void namcos11_state::coh110(machine_config &config) m_maincpu->subdevice<ram_device>("ram")->set_default_size("4M"); /* basic machine hardware */ - NAMCO_C76(config, m_mcu, 16934400); + NAMCO_C76(config, m_mcu, XTAL::u(16934400)); m_mcu->set_addrmap(AS_PROGRAM, &namcos11_state::c76_map); m_mcu->an0_cb().set_ioport("ADC0"); m_mcu->an1_cb().set_ioport("ADC1"); @@ -641,7 +641,7 @@ void namcos11_state::coh110(machine_config &config) //c352.add_route(2, "lspeaker", 1.00); // Second DAC not present. //c352.add_route(3, "rspeaker", 1.00); - AT28C16(config, "at28c16", 0); + AT28C16(config, "at28c16"); } void namcos11_state::coh100(machine_config &config) @@ -659,83 +659,83 @@ void namcos11_state::tekken(machine_config &config) coh100(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::rom8_map); // TODO: either allow optional devices in memory maps, add another memory map without keycus or add a dummy keycus for tekken - KEYCUS_C406(config, "keycus", 0); + KEYCUS_C406(config, "keycus"); } void namcos11_state::tekken2o(machine_config &config) { coh100(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::rom8_map); - KEYCUS_C406(config, "keycus", 0); + KEYCUS_C406(config, "keycus"); } void namcos11_state::tekken2(machine_config &config) { coh110(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::rom8_map); - KEYCUS_C406(config, "keycus", 0); + KEYCUS_C406(config, "keycus"); } void namcos11_state::souledge(machine_config &config) { coh110(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::rom8_map); - KEYCUS_C409(config, "keycus", 0); + KEYCUS_C409(config, "keycus"); } void namcos11_state::dunkmnia(machine_config &config) { coh110(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::rom8_map); - KEYCUS_C410(config, "keycus", 0); + KEYCUS_C410(config, "keycus"); } void namcos11_state::primglex(machine_config &config) { coh110(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::rom8_map); - KEYCUS_C411(config, "keycus", 0); + KEYCUS_C411(config, "keycus"); } void namcos11_state::xevi3dg(machine_config &config) { coh110(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::rom8_map); - KEYCUS_C430(config, "keycus", 0); + KEYCUS_C430(config, "keycus"); } void namcos11_state::danceyes(machine_config &config) { coh110(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::rom8_map); - KEYCUS_C431(config, "keycus", 0); + KEYCUS_C431(config, "keycus"); } void namcos11_state::pocketrc(machine_config &config) { coh110(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::rom8_map); - KEYCUS_C432(config, "keycus", 0); + KEYCUS_C432(config, "keycus"); } void namcos11_state::starswep(machine_config &config) { coh110(config); - KEYCUS_C442(config, "keycus", 0); + KEYCUS_C442(config, "keycus"); } void namcos11_state::myangel3(machine_config &config) { coh110(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::rom8_64_map); - KEYCUS_C443(config, "keycus", 0); + KEYCUS_C443(config, "keycus"); } void namcos11_state::ptblank2ua(machine_config &config) { coh110(config); m_maincpu->set_addrmap(AS_PROGRAM, &namcos11_state::ptblank2ua_map); - KEYCUS_C443(config, "keycus", 0); + KEYCUS_C443(config, "keycus"); } static INPUT_PORTS_START( namcos11 ) diff --git a/src/mame/namco/namcos12.cpp b/src/mame/namco/namcos12.cpp index a3e798b9721..475b4032553 100644 --- a/src/mame/namco/namcos12.cpp +++ b/src/mame/namco/namcos12.cpp @@ -1746,11 +1746,11 @@ void namcos12_state::init_golgo13() void namcos12_state::namcos12_mobo(machine_config &config) { /* basic machine hardware */ - H83002(config, m_sub, 16934400); // frequency based on research (superctr) + H83002(config, m_sub, XTAL::u(16934400)); // frequency based on research (superctr) m_sub->set_addrmap(AS_PROGRAM, &namcos12_state::s12h8rwmap); m_sub->set_addrmap(AS_IO, &namcos12_state::s12h8iomap); - NAMCO_SETTINGS(config, m_settings, 0); + NAMCO_SETTINGS(config, m_settings); RTC4543(config, m_rtc, XTAL(32'768)); m_rtc->data_cb().set("sub:sci1", FUNC(h8_sci_device::rx_w)); @@ -1761,7 +1761,7 @@ void namcos12_state::namcos12_mobo(machine_config &config) sub_sci1.clk_handler().set(m_rtc, FUNC(rtc4543_device::clk_w)).invert(); sub_sci1.clk_handler().append(m_settings, FUNC(namco_settings_device::clk_w)); - AT28C16(config, "at28c16", 0); + AT28C16(config, "at28c16"); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/namco/namcos2.cpp b/src/mame/namco/namcos2.cpp index 0e9b3323752..36c89d6d173 100644 --- a/src/mame/namco/namcos2.cpp +++ b/src/mame/namco/namcos2.cpp @@ -1710,7 +1710,7 @@ void namcos2_state::configure_common_standard(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); - NAMCO_C139(config, m_sci, 0); + NAMCO_C139(config, m_sci); SCREEN(config, m_screen, SCREEN_TYPE_RASTER); m_screen->set_raw(MAIN_OSC_CLOCK/8, 384, 0*8, 36*8, 264, 0*8, 28*8); @@ -1792,14 +1792,14 @@ void namcos2_state::configure_c45road_standard(machine_config &config) void namcos2_state::configure_namcos2_sprite_standard(machine_config &config) { - NAMCOS2_SPRITE(config, m_ns2sprite, 0); + NAMCOS2_SPRITE(config, m_ns2sprite); m_ns2sprite->set_gfxdecode_tag("gfxdecode"); m_ns2sprite->set_spriteram_tag("spriteram"); } void namcos2_state::configure_namcos2_roz_standard(machine_config &config) { - NAMCOS2_ROZ(config, m_ns2roz, 0); + NAMCOS2_ROZ(config, m_ns2roz); m_ns2roz->set_palette(m_c116); m_ns2roz->set_rozram_tag("rozram"); m_ns2roz->set_rozctrl_tag("rozctrl"); @@ -2064,7 +2064,7 @@ void namcos2_state::metlhawk(machine_config &config) GFXDECODE(config, m_gfxdecode, m_c116, gfx_metlhawk); - NAMCOS2_SPRITE_METALHAWK(config, m_ns2sprite, 0); + NAMCOS2_SPRITE_METALHAWK(config, m_ns2sprite); m_ns2sprite->set_gfxdecode_tag("gfxdecode"); m_ns2sprite->set_spriteram_tag("spriteram"); diff --git a/src/mame/namco/namcos21.cpp b/src/mame/namco/namcos21.cpp index fca06602484..65169b20850 100644 --- a/src/mame/namco/namcos21.cpp +++ b/src/mame/namco/namcos21.cpp @@ -630,7 +630,7 @@ void namcos21_state::c140_map(address_map &map) void namcos21_state::configure_c65_namcos21(machine_config &config) { - NAMCOC65(config, m_c65, 2048000); + NAMCOC65(config, m_c65, XTAL::u(2048000)); m_c65->in_pb_callback().set_ioport("MCUB"); m_c65->in_pc_callback().set_ioport("MCUC"); m_c65->in_ph_callback().set_ioport("MCUH"); @@ -895,7 +895,7 @@ void namcos21_state::winrun(machine_config &config) configure_c65_namcos21(config); - NAMCOS21_DSP(config, m_namcos21_dsp, 0); + NAMCOS21_DSP(config, m_namcos21_dsp); m_namcos21_dsp->set_renderer_tag("namcos21_3d"); m68000_device &gpu(M68000(config, "gpu", 49.152_MHz_XTAL / 4)); /* graphics coprocessor */ @@ -903,7 +903,7 @@ void namcos21_state::winrun(machine_config &config) configure_c148_standard(config); NAMCO_C148(config, m_gpu_intc, 0, "gpu", false); - NAMCO_C139(config, m_sci, 0); + NAMCO_C139(config, m_sci); config.set_maximum_quantum(attotime::from_hz(6000)); /* 100 CPU slices per frame */ @@ -917,7 +917,7 @@ void namcos21_state::winrun(machine_config &config) PALETTE(config, m_palette).set_format(palette_device::xBRG_888, 0x10000/2); - NAMCOS21_3D(config, m_namcos21_3d, 0); + NAMCOS21_3D(config, m_namcos21_3d); m_namcos21_3d->set_fixed_palbase(0x4000); m_namcos21_3d->set_zz_shift_mult(10, 0x100); m_namcos21_3d->set_depth_reverse(true); diff --git a/src/mame/namco/namcos21_3d.cpp b/src/mame/namco/namcos21_3d.cpp index 7e0d17dcc94..23fe7280f14 100644 --- a/src/mame/namco/namcos21_3d.cpp +++ b/src/mame/namco/namcos21_3d.cpp @@ -6,7 +6,7 @@ DEFINE_DEVICE_TYPE(NAMCOS21_3D, namcos21_3d_device, "namcos21_3d", "Namco System 21 3D Rasterizer") -namcos21_3d_device::namcos21_3d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namcos21_3d_device::namcos21_3d_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCOS21_3D, tag, owner, clock), m_fixed_palbase(-1), m_zz_shift(10), diff --git a/src/mame/namco/namcos21_3d.h b/src/mame/namco/namcos21_3d.h index 2973e0a6df2..2a98c5cd272 100644 --- a/src/mame/namco/namcos21_3d.h +++ b/src/mame/namco/namcos21_3d.h @@ -8,7 +8,7 @@ class namcos21_3d_device : public device_t { public: - namcos21_3d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namcos21_3d_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // config void set_fixed_palbase(int base) { m_fixed_palbase = base; } diff --git a/src/mame/namco/namcos21_c67.cpp b/src/mame/namco/namcos21_c67.cpp index 0cd87c0611d..589055c14a0 100644 --- a/src/mame/namco/namcos21_c67.cpp +++ b/src/mame/namco/namcos21_c67.cpp @@ -510,7 +510,7 @@ void namcos21_c67_state::c140_map(address_map &map) void namcos21_c67_state::configure_c68_namcos21(machine_config &config) { - NAMCOC68(config, m_c68, 8000000); + NAMCOC68(config, m_c68, XTAL::u(8000000)); m_c68->in_pb_callback().set_ioport("MCUB"); m_c68->in_pc_callback().set_ioport("MCUC"); m_c68->in_ph_callback().set_ioport("MCUH"); @@ -805,7 +805,7 @@ void namcos21_c67_state::namcos21(machine_config &config) configure_c68_namcos21(config); - NAMCOS21_DSP_C67(config, m_namcos21_dsp_c67, 0); + NAMCOS21_DSP_C67(config, m_namcos21_dsp_c67); m_namcos21_dsp_c67->set_renderer_tag("namcos21_3d"); config.set_maximum_quantum(attotime::from_hz(12000)); @@ -818,17 +818,17 @@ void namcos21_c67_state::namcos21(machine_config &config) m_screen->set_screen_update(FUNC(namcos21_c67_state::screen_update)); m_screen->set_palette(m_palette); - NAMCOS21_3D(config, m_namcos21_3d, 0); + NAMCOS21_3D(config, m_namcos21_3d); m_namcos21_3d->set_zz_shift_mult(11, 0x200); m_namcos21_3d->set_depth_reverse(false); m_namcos21_3d->set_framebuffer_size(496,480); configure_c148_standard(config); - NAMCO_C139(config, m_sci, 0); + NAMCO_C139(config, m_sci); PALETTE(config, m_palette).set_format(palette_device::xBRG_888, 0x10000/2); - NAMCO_C355SPR(config, m_c355spr, 0); + NAMCO_C355SPR(config, m_c355spr); m_c355spr->set_screen(m_screen); m_c355spr->set_palette(m_palette); m_c355spr->set_scroll_offsets(0x26, 0x19); diff --git a/src/mame/namco/namcos21_de.cpp b/src/mame/namco/namcos21_de.cpp index 1df18f70736..bd20ad053c4 100644 --- a/src/mame/namco/namcos21_de.cpp +++ b/src/mame/namco/namcos21_de.cpp @@ -58,7 +58,7 @@ class namco_de_pcbstack_device : public device_t { public: // construction/destruction - namco_de_pcbstack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namco_de_pcbstack_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void configure_c148_standard(machine_config &config); @@ -128,7 +128,7 @@ private: DEFINE_DEVICE_TYPE(NAMCO_DE_PCB, namco_de_pcbstack_device, "namco_de_pcb", "Namco Driver's Eyes PCB stack") -namco_de_pcbstack_device::namco_de_pcbstack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namco_de_pcbstack_device::namco_de_pcbstack_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCO_DE_PCB, tag, owner, clock), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -162,13 +162,13 @@ void namco_de_pcbstack_device::device_add_mconfig(machine_config &config) M68000(config, m_slave, 49.152_MHz_XTAL / 4); /* Slave */ m_slave->set_addrmap(AS_PROGRAM, &namco_de_pcbstack_device::driveyes_slave_map); - MC6809E(config, m_audiocpu, 3072000); /* Sound */ + MC6809E(config, m_audiocpu, XTAL::u(3072000)); /* Sound */ m_audiocpu->set_addrmap(AS_PROGRAM, &namco_de_pcbstack_device::sound_map); m_audiocpu->set_periodic_int(FUNC(namco_de_pcbstack_device::irq0_line_hold), attotime::from_hz(2*60)); configure_c68_namcos21(config); - NAMCOS21_DSP(config, m_namcos21_dsp, 0); + NAMCOS21_DSP(config, m_namcos21_dsp); m_namcos21_dsp->set_renderer_tag("namcos21_3d"); config.set_maximum_quantum(attotime::from_hz(6000)); /* 100 CPU slices per frame */ @@ -176,7 +176,7 @@ void namco_de_pcbstack_device::device_add_mconfig(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); configure_c148_standard(config); - NAMCO_C139(config, m_sci, 0); + NAMCO_C139(config, m_sci); SCREEN(config, m_screen, SCREEN_TYPE_RASTER); // TODO: basic parameters to get 60.606060 Hz, x2 is for interlace @@ -186,13 +186,13 @@ void namco_de_pcbstack_device::device_add_mconfig(machine_config &config) PALETTE(config, m_palette).set_format(palette_device::xBRG_888, 0x10000/2); - NAMCOS21_3D(config, m_namcos21_3d, 0); + NAMCOS21_3D(config, m_namcos21_3d); m_namcos21_3d->set_fixed_palbase(0x3f00); m_namcos21_3d->set_zz_shift_mult(10, 0x100); m_namcos21_3d->set_depth_reverse(false); m_namcos21_3d->set_framebuffer_size(496,480); - NAMCO_C355SPR(config, m_c355spr, 0); + NAMCO_C355SPR(config, m_c355spr); m_c355spr->set_screen(m_screen); m_c355spr->set_palette(m_palette); m_c355spr->set_scroll_offsets(0x26, 0x19); @@ -318,7 +318,7 @@ void namco_de_pcbstack_device::c140_map(address_map &map) void namco_de_pcbstack_device::configure_c68_namcos21(machine_config &config) { - NAMCOC68(config, m_c68, 8000000); + NAMCOC68(config, m_c68, XTAL::u(8000000)); m_c68->in_pb_callback().set_ioport("MCUB"); m_c68->in_pc_callback().set_ioport("MCUC"); m_c68->in_ph_callback().set_ioport("MCUH"); @@ -495,11 +495,11 @@ private: // driveyes only void namcos21_de_state::driveyes(machine_config &config) { - NAMCO_DE_PCB(config, m_pcb[0], 0); - NAMCO_DE_PCB(config, m_pcb[1], 0); - NAMCO_DE_PCB(config, m_pcb[2], 0); + NAMCO_DE_PCB(config, m_pcb[0]); + NAMCO_DE_PCB(config, m_pcb[1]); + NAMCO_DE_PCB(config, m_pcb[2]); - NAMCOIO_GEARBOX(config, m_io_gearbox, 0); + NAMCOIO_GEARBOX(config, m_io_gearbox); } // stacks with the DSWs set to left or right screen will show 'receive error' because they want comms from the main screen diff --git a/src/mame/namco/namcos21_dsp.cpp b/src/mame/namco/namcos21_dsp.cpp index 49ee6e38777..49cdb597da7 100644 --- a/src/mame/namco/namcos21_dsp.cpp +++ b/src/mame/namco/namcos21_dsp.cpp @@ -16,7 +16,7 @@ TODO: handle protection properly and with callbacks DEFINE_DEVICE_TYPE(NAMCOS21_DSP, namcos21_dsp_device, "namcos21_dsp_device", "Namco System 21 DSP Setup (1x TMS320C25 type)") -namcos21_dsp_device::namcos21_dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namcos21_dsp_device::namcos21_dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCOS21_DSP, tag, owner, clock), m_dsp(*this, "dsp"), m_winrun_dspbios(*this,"winrun_dspbios"), diff --git a/src/mame/namco/namcos21_dsp.h b/src/mame/namco/namcos21_dsp.h index fb01c650277..69a2deed9ee 100644 --- a/src/mame/namco/namcos21_dsp.h +++ b/src/mame/namco/namcos21_dsp.h @@ -15,7 +15,7 @@ class namcos21_dsp_device : public device_t { public: - namcos21_dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namcos21_dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // config template <typename T> void set_renderer_tag(T &&tag) { m_renderer.set_tag(std::forward<T>(tag)); } diff --git a/src/mame/namco/namcos21_dsp_c67.cpp b/src/mame/namco/namcos21_dsp_c67.cpp index cf540ebce60..3ed7164d955 100644 --- a/src/mame/namco/namcos21_dsp_c67.cpp +++ b/src/mame/namco/namcos21_dsp_c67.cpp @@ -19,7 +19,7 @@ TODO: handle protection properly and with callbacks DEFINE_DEVICE_TYPE(NAMCOS21_DSP_C67, namcos21_dsp_c67_device, "namcos21_dsp_c67_device", "Namco System 21 DSP Setup (5x C67 type)") -namcos21_dsp_c67_device::namcos21_dsp_c67_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +namcos21_dsp_c67_device::namcos21_dsp_c67_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCOS21_DSP_C67, tag, owner, clock), m_renderer(*this, finder_base::DUMMY_TAG), m_c67master(*this, "dspmaster"), @@ -126,7 +126,7 @@ void namcos21_dsp_c67_device::reset_kickstart() void namcos21_dsp_c67_device::device_add_mconfig(machine_config &config) { - namco_c67_device& dspmaster(NAMCO_C67(config, m_c67master, 24000000)); /* 24 MHz? overclocked */ + namco_c67_device& dspmaster(NAMCO_C67(config, m_c67master, XTAL::u(24000000))); /* 24 MHz? overclocked */ dspmaster.set_addrmap(AS_PROGRAM, &namcos21_dsp_c67_device::master_dsp_program); dspmaster.set_addrmap(AS_DATA, &namcos21_dsp_c67_device::master_dsp_data); dspmaster.set_addrmap(AS_IO, &namcos21_dsp_c67_device::master_dsp_io); @@ -136,7 +136,7 @@ void namcos21_dsp_c67_device::device_add_mconfig(machine_config &config) for (int i = 0; i < 4; i++) { - namco_c67_device& dspslave(NAMCO_C67(config, m_c67slave[i], 24000000)); /* 24 MHz? overclocked */ + namco_c67_device& dspslave(NAMCO_C67(config, m_c67slave[i], XTAL::u(24000000))); /* 24 MHz? overclocked */ dspslave.set_addrmap(AS_PROGRAM, &namcos21_dsp_c67_device::slave_dsp_program); dspslave.set_addrmap(AS_DATA, &namcos21_dsp_c67_device::slave_dsp_data); dspslave.set_addrmap(AS_IO, &namcos21_dsp_c67_device::slave_dsp_io); diff --git a/src/mame/namco/namcos21_dsp_c67.h b/src/mame/namco/namcos21_dsp_c67.h index bbacaa4f337..0245a3a4e73 100644 --- a/src/mame/namco/namcos21_dsp_c67.h +++ b/src/mame/namco/namcos21_dsp_c67.h @@ -27,7 +27,7 @@ public: NAMCOS21_SOLVALOU, }; - namcos21_dsp_c67_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + namcos21_dsp_c67_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // config template <typename T> void set_renderer_tag(T &&tag) { m_renderer.set_tag(std::forward<T>(tag)); } diff --git a/src/mame/namco/namcos23.cpp b/src/mame/namco/namcos23.cpp index 17ff8eb79da..c27263403a5 100644 --- a/src/mame/namco/namcos23.cpp +++ b/src/mame/namco/namcos23.cpp @@ -3716,7 +3716,7 @@ void namcos23_state::gorgon(machine_config &config) config.set_maximum_quantum(attotime::from_hz(2*115200)); - NAMCO_SETTINGS(config, m_settings, 0); + NAMCO_SETTINGS(config, m_settings); RTC4543(config, m_rtc, XTAL(32'768)); m_rtc->data_cb().set("subcpu:sci1", FUNC(h8_sci_device::rx_w)); @@ -3778,7 +3778,7 @@ void namcos23_state::s23(machine_config &config) config.set_maximum_quantum(attotime::from_hz(2*115200)); - NAMCO_SETTINGS(config, m_settings, 0); + NAMCO_SETTINGS(config, m_settings); RTC4543(config, m_rtc, XTAL(32'768)); m_rtc->data_cb().set("subcpu:sci1", FUNC(h8_sci_device::rx_w)); diff --git a/src/mame/namco/namcos2_roz.cpp b/src/mame/namco/namcos2_roz.cpp index 88ba624009f..ab914131432 100644 --- a/src/mame/namco/namcos2_roz.cpp +++ b/src/mame/namco/namcos2_roz.cpp @@ -34,7 +34,7 @@ GFXDECODE_END DEFINE_DEVICE_TYPE(NAMCOS2_ROZ, namcos2_roz_device, "namcos2_roz", "Namco System 2 ROZ (C102)") -namcos2_roz_device::namcos2_roz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : +namcos2_roz_device::namcos2_roz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NAMCOS2_ROZ, tag, owner, clock), device_gfx_interface(mconfig, *this, gfxinfo), m_rozram(*this, finder_base::DUMMY_TAG), diff --git a/src/mame/namco/namcos2_roz.h b/src/mame/namco/namcos2_roz.h index d08225ad4f4..251727a0119 100644 --- a/src/mame/namco/namcos2_roz.h +++ b/src/mame/namco/namcos2_roz.h @@ -14,7 +14,7 @@ class namcos2_roz_device : public device_t, public device_gfx_interface { public: // construction/destruction - namcos2_roz_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + namcos2_roz_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_rozram_tag(T &&tag) { m_rozram.set_tag(std::forward<T>(tag)); } template <typename T> void set_rozctrl_tag(T &&tag) { m_roz_ctrl.set_tag(std::forward<T>(tag)); } diff --git a/src/mame/namco/namcos2_sprite.cpp b/src/mame/namco/namcos2_sprite.cpp index d1a475eb940..50be4e93bd8 100644 --- a/src/mame/namco/namcos2_sprite.cpp +++ b/src/mame/namco/namcos2_sprite.cpp @@ -29,12 +29,12 @@ DEFINE_DEVICE_TYPE(NAMCOS2_SPRITE, namcos2_sprite_device, "namcos2_sprite", "Nam DEFINE_DEVICE_TYPE(NAMCOS2_SPRITE_FINALLAP, namcos2_sprite_finallap_device, "namcos2_sprite_finallap", "Namco System 2 Sprites (C106,C134,C135,C146) (Final Lap)") DEFINE_DEVICE_TYPE(NAMCOS2_SPRITE_METALHAWK, namcos2_sprite_metalhawk_device, "namcos2_sprite_metalhawk", "Namco System 2 Sprites (C106,C134,C135,C146) (Metal Hawk)") -namcos2_sprite_device::namcos2_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : +namcos2_sprite_device::namcos2_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : namcos2_sprite_device(mconfig, NAMCOS2_SPRITE, tag, owner, clock) { } -namcos2_sprite_device::namcos2_sprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) : +namcos2_sprite_device::namcos2_sprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock), m_gfxdecode(*this, finder_base::DUMMY_TAG), m_spriteram(*this, finder_base::DUMMY_TAG) @@ -42,12 +42,12 @@ namcos2_sprite_device::namcos2_sprite_device(const machine_config &mconfig, devi } -namcos2_sprite_metalhawk_device::namcos2_sprite_metalhawk_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : +namcos2_sprite_metalhawk_device::namcos2_sprite_metalhawk_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : namcos2_sprite_device(mconfig, NAMCOS2_SPRITE_METALHAWK, tag, owner, clock) { } -namcos2_sprite_finallap_device::namcos2_sprite_finallap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : +namcos2_sprite_finallap_device::namcos2_sprite_finallap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : namcos2_sprite_device(mconfig, NAMCOS2_SPRITE_FINALLAP, tag, owner, clock) { } diff --git a/src/mame/namco/namcos2_sprite.h b/src/mame/namco/namcos2_sprite.h index 4b9e4a03040..4e4c52ab3e6 100644 --- a/src/mame/namco/namcos2_sprite.h +++ b/src/mame/namco/namcos2_sprite.h @@ -13,7 +13,7 @@ class namcos2_sprite_device : public device_t { public: // construction/destruction - namcos2_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + namcos2_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_gfxdecode_tag(T &&tag) { m_gfxdecode.set_tag(std::forward<T>(tag)); } template <typename T> void set_spriteram_tag(T &&tag) { m_spriteram.set_tag(std::forward<T>(tag)); } @@ -21,7 +21,7 @@ public: virtual void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri, int control ); protected: - namcos2_sprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + namcos2_sprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; @@ -41,7 +41,7 @@ class namcos2_sprite_finallap_device : public namcos2_sprite_device { public: // construction/destruction - namcos2_sprite_finallap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + namcos2_sprite_finallap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void get_tilenum_and_size(const u16 word0, const u16 word1, u32& sprn, bool& is_32) override; @@ -52,7 +52,7 @@ class namcos2_sprite_metalhawk_device : public namcos2_sprite_device { public: // construction/destruction - namcos2_sprite_metalhawk_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + namcos2_sprite_metalhawk_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri, int control ) override; }; diff --git a/src/mame/namco/namcos86.cpp b/src/mame/namco/namcos86.cpp index 2f057f23422..1fbde950e4e 100644 --- a/src/mame/namco/namcos86.cpp +++ b/src/mame/namco/namcos86.cpp @@ -1071,7 +1071,7 @@ void namcos86_state::hopmappy(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - YM2151(config, "ymsnd", 3579580).add_route(0, "mono", 0.0).add_route(1, "mono", 0.60); /* only right channel is connected */ + YM2151(config, "ymsnd", XTAL::u(3579580)).add_route(0, "mono", 0.0).add_route(1, "mono", 0.60); /* only right channel is connected */ NAMCO_CUS30(config, m_cus30, XTAL(49'152'000)/2048); m_cus30->set_voices(8); @@ -1096,7 +1096,7 @@ void namcos86_state::genpeitd(machine_config &config) m_mcu->set_addrmap(AS_PROGRAM, &namcos86_state::genpeitd_mcu_map); /* sound hardware */ - NAMCO_63701X(config, m_63701x, 6000000); + NAMCO_63701X(config, m_63701x, XTAL::u(6000000)); m_63701x->add_route(ALL_OUTPUTS, "mono", 1.0); } @@ -1109,7 +1109,7 @@ void namcos86_state::rthunder(machine_config &config) m_mcu->set_addrmap(AS_PROGRAM, &namcos86_state::rthunder_mcu_map); /* sound hardware */ - NAMCO_63701X(config, m_63701x, 6000000); + NAMCO_63701X(config, m_63701x, XTAL::u(6000000)); m_63701x->add_route(ALL_OUTPUTS, "mono", 1.0); } @@ -1122,7 +1122,7 @@ void namcos86_state::wndrmomo(machine_config &config) m_mcu->set_addrmap(AS_PROGRAM, &namcos86_state::wndrmomo_mcu_map); /* sound hardware */ - NAMCO_63701X(config, m_63701x, 6000000); + NAMCO_63701X(config, m_63701x, XTAL::u(6000000)); m_63701x->add_route(ALL_OUTPUTS, "mono", 1.0); } diff --git a/src/mame/namco/ns10crypt.cpp b/src/mame/namco/ns10crypt.cpp index b542476eaf2..6890fda920b 100644 --- a/src/mame/namco/ns10crypt.cpp +++ b/src/mame/namco/ns10crypt.cpp @@ -129,7 +129,7 @@ DEFINE_DEVICE_TYPE(STARTRGN_DECRYPTER, startrgn_decrypter_device, "startrgn_decr // base class -ns10_decrypter_device::ns10_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +ns10_decrypter_device::ns10_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) { m_active = false; @@ -163,7 +163,7 @@ constexpr int U {UNKNOWN}; // this could perfectly be part of the per-game logic but, with only one known type-1 game, we cannot say anything definitive const int ns10_type1_decrypter_device::initSbox[16] {U,U,U,0,4,9,U,U,U,8,U,1,U,9,U,5}; -ns10_type1_decrypter_device::ns10_type1_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +ns10_type1_decrypter_device::ns10_type1_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : ns10_decrypter_device(mconfig, type, tag, owner, clock) { } @@ -213,7 +213,7 @@ void ns10_type1_decrypter_device::device_start() // this could perfectly be part of the per-game logic; by now, only gamshara seems to use it, so we keep it global const int ns10_type2_decrypter_device::initSbox[16] {0,12,13,6,2,4,9,8,11,1,7,15,10,5,14,3}; -ns10_type2_decrypter_device::ns10_type2_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const ns10_type2_decrypter_device::ns10_crypto_logic &logic) +ns10_type2_decrypter_device::ns10_type2_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const ns10_type2_decrypter_device::ns10_crypto_logic &logic) : ns10_decrypter_device(mconfig, type, tag, owner, clock) , m_logic(logic) { @@ -454,42 +454,42 @@ const ns10_type2_decrypter_device::ns10_crypto_logic startrgn_decrypter_device:: // game-specific devices -mrdrilr2_decrypter_device::mrdrilr2_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mrdrilr2_decrypter_device::mrdrilr2_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns10_type1_decrypter_device(mconfig, MRDRILR2_DECRYPTER, tag, owner, clock) { } -chocovdr_decrypter_device::chocovdr_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +chocovdr_decrypter_device::chocovdr_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns10_type2_decrypter_device(mconfig, CHOCOVDR_DECRYPTER, tag, owner, clock, crypto_logic) { } -gamshara_decrypter_device::gamshara_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +gamshara_decrypter_device::gamshara_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns10_type2_decrypter_device(mconfig, GAMSHARA_DECRYPTER, tag, owner, clock, crypto_logic) { } -gjspace_decrypter_device::gjspace_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +gjspace_decrypter_device::gjspace_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns10_type2_decrypter_device(mconfig, GJSPACE_DECRYPTER, tag, owner, clock, crypto_logic) { } -knpuzzle_decrypter_device::knpuzzle_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +knpuzzle_decrypter_device::knpuzzle_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns10_type2_decrypter_device(mconfig, KNPUZZLE_DECRYPTER, tag, owner, clock, crypto_logic) { } -konotako_decrypter_device::konotako_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +konotako_decrypter_device::konotako_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns10_type2_decrypter_device(mconfig, KONOTAKO_DECRYPTER, tag, owner, clock, crypto_logic) { } -nflclsfb_decrypter_device::nflclsfb_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +nflclsfb_decrypter_device::nflclsfb_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns10_type2_decrypter_device(mconfig, NFLCLSFB_DECRYPTER, tag, owner, clock, crypto_logic) { } -startrgn_decrypter_device::startrgn_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +startrgn_decrypter_device::startrgn_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns10_type2_decrypter_device(mconfig, STARTRGN_DECRYPTER, tag, owner, clock, crypto_logic) { } diff --git a/src/mame/namco/ns10crypt.h b/src/mame/namco/ns10crypt.h index 56e12062d2d..c6fe3eb8446 100644 --- a/src/mame/namco/ns10crypt.h +++ b/src/mame/namco/ns10crypt.h @@ -17,7 +17,7 @@ public: virtual ~ns10_decrypter_device(); protected: - ns10_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + ns10_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void init(int iv)=0; virtual void device_start()override=0; @@ -33,7 +33,7 @@ public: uint16_t decrypt(uint16_t cipherword)override; protected: - ns10_type1_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + ns10_type1_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); private: uint16_t m_mask = 0; @@ -70,7 +70,7 @@ protected: uint16_t(*nonlinear_calculation)(uint64_t, uint64_t, const gf2_reducer&); // preliminary encoding; need research }; - ns10_type2_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const ns10_crypto_logic &logic); + ns10_type2_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const ns10_crypto_logic &logic); private: uint16_t m_mask = 0; @@ -91,13 +91,13 @@ private: class mrdrilr2_decrypter_device : public ns10_type1_decrypter_device { public: - mrdrilr2_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mrdrilr2_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class chocovdr_decrypter_device : public ns10_type2_decrypter_device { public: - chocovdr_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + chocovdr_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); private: static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer); static const ns10_crypto_logic crypto_logic; @@ -106,7 +106,7 @@ private: class gamshara_decrypter_device : public ns10_type2_decrypter_device { public: - gamshara_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + gamshara_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); private: static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer); static const ns10_crypto_logic crypto_logic; @@ -115,7 +115,7 @@ private: class gjspace_decrypter_device : public ns10_type2_decrypter_device { public: - gjspace_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + gjspace_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); private: static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer); static const ns10_crypto_logic crypto_logic; @@ -124,7 +124,7 @@ private: class knpuzzle_decrypter_device : public ns10_type2_decrypter_device { public: - knpuzzle_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + knpuzzle_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); private: static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer); static const ns10_crypto_logic crypto_logic; @@ -133,7 +133,7 @@ private: class konotako_decrypter_device : public ns10_type2_decrypter_device { public: - konotako_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + konotako_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); private: static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer); static const ns10_crypto_logic crypto_logic; @@ -142,7 +142,7 @@ private: class nflclsfb_decrypter_device : public ns10_type2_decrypter_device { public: - nflclsfb_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nflclsfb_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); private: static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer); static const ns10_crypto_logic crypto_logic; @@ -151,7 +151,7 @@ private: class startrgn_decrypter_device : public ns10_type2_decrypter_device { public: - startrgn_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + startrgn_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); private: static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer); static const ns10_crypto_logic crypto_logic; diff --git a/src/mame/namco/ns11prot.cpp b/src/mame/namco/ns11prot.cpp index b39e0dd98ee..2faf7e6e160 100644 --- a/src/mame/namco/ns11prot.cpp +++ b/src/mame/namco/ns11prot.cpp @@ -9,7 +9,7 @@ #include "emu.h" #include "ns11prot.h" -ns11_keycus_device::ns11_keycus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +ns11_keycus_device::ns11_keycus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) { } @@ -30,7 +30,7 @@ void ns11_keycus_device::device_reset() /* tekken 2 */ -keycus_c406_device::keycus_c406_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +keycus_c406_device::keycus_c406_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns11_keycus_device(mconfig, KEYCUS_C406, tag, owner, clock) { } @@ -70,7 +70,7 @@ DEFINE_DEVICE_TYPE(KEYCUS_C406, keycus_c406_device, "keycus_c406", "Namco C406 K /* soul edge */ -keycus_c409_device::keycus_c409_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +keycus_c409_device::keycus_c409_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns11_keycus_device(mconfig, KEYCUS_C409, tag, owner, clock) { } @@ -115,7 +115,7 @@ DEFINE_DEVICE_TYPE(KEYCUS_C409, keycus_c409_device, "keycus_c409", "Namco C409 K /* dunk mania */ -keycus_c410_device::keycus_c410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +keycus_c410_device::keycus_c410_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns11_keycus_device(mconfig, KEYCUS_C410, tag, owner, clock) { } @@ -169,7 +169,7 @@ DEFINE_DEVICE_TYPE(KEYCUS_C410, keycus_c410_device, "keycus_c410", "Namco C410 K /* prime goal ex */ -keycus_c411_device::keycus_c411_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +keycus_c411_device::keycus_c411_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns11_keycus_device(mconfig, KEYCUS_C411, tag, owner, clock) { } @@ -225,7 +225,7 @@ DEFINE_DEVICE_TYPE(KEYCUS_C411, keycus_c411_device, "keycus_c411", "Namco C411 K /* xevious 3d/g */ -keycus_c430_device::keycus_c430_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +keycus_c430_device::keycus_c430_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns11_keycus_device(mconfig, KEYCUS_C430, tag, owner, clock) { } @@ -284,7 +284,7 @@ DEFINE_DEVICE_TYPE(KEYCUS_C430, keycus_c430_device, "keycus_c430", "Namco C430 K /* dancing eyes */ -keycus_c431_device::keycus_c431_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +keycus_c431_device::keycus_c431_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns11_keycus_device(mconfig, KEYCUS_C431, tag, owner, clock) { } @@ -342,7 +342,7 @@ DEFINE_DEVICE_TYPE(KEYCUS_C431, keycus_c431_device, "keycus_c431", "Namco C431 K /* pocket racer */ -keycus_c432_device::keycus_c432_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +keycus_c432_device::keycus_c432_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns11_keycus_device(mconfig, KEYCUS_C432, tag, owner, clock) { } @@ -402,7 +402,7 @@ DEFINE_DEVICE_TYPE(KEYCUS_C432, keycus_c432_device, "keycus_c432", "Namco C432 K /* star sweep */ -keycus_c442_device::keycus_c442_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +keycus_c442_device::keycus_c442_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns11_keycus_device(mconfig, KEYCUS_C442, tag, owner, clock) { } @@ -450,7 +450,7 @@ DEFINE_DEVICE_TYPE(KEYCUS_C442, keycus_c442_device, "keycus_c442", "Namco C442 K /* kosodate quiz my angel 3 / point blank 2 */ -keycus_c443_device::keycus_c443_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +keycus_c443_device::keycus_c443_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ns11_keycus_device(mconfig, KEYCUS_C443, tag, owner, clock) { } diff --git a/src/mame/namco/ns11prot.h b/src/mame/namco/ns11prot.h index 279835ea44f..41efb2f3392 100644 --- a/src/mame/namco/ns11prot.h +++ b/src/mame/namco/ns11prot.h @@ -13,7 +13,7 @@ class ns11_keycus_device : public device_t { protected: - ns11_keycus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + ns11_keycus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; virtual void device_reset() override; @@ -32,7 +32,7 @@ public: class keycus_c406_device : public ns11_keycus_device { public: - keycus_c406_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + keycus_c406_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint16_t read(offs_t offset) override; virtual void write(offs_t offset, uint16_t data) override; @@ -45,7 +45,7 @@ DECLARE_DEVICE_TYPE(KEYCUS_C406, keycus_c406_device) class keycus_c409_device : public ns11_keycus_device { public: - keycus_c409_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + keycus_c409_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint16_t read(offs_t offset) override; virtual void write(offs_t offset, uint16_t data) override; @@ -58,7 +58,7 @@ DECLARE_DEVICE_TYPE(KEYCUS_C409, keycus_c409_device) class keycus_c410_device : public ns11_keycus_device { public: - keycus_c410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + keycus_c410_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint16_t read(offs_t offset) override; virtual void write(offs_t offset, uint16_t data) override; @@ -71,7 +71,7 @@ DECLARE_DEVICE_TYPE(KEYCUS_C410, keycus_c410_device) class keycus_c411_device : public ns11_keycus_device { public: - keycus_c411_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + keycus_c411_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint16_t read(offs_t offset) override; virtual void write(offs_t offset, uint16_t data) override; @@ -84,7 +84,7 @@ DECLARE_DEVICE_TYPE(KEYCUS_C411, keycus_c411_device) class keycus_c430_device : public ns11_keycus_device { public: - keycus_c430_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + keycus_c430_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint16_t read(offs_t offset) override; virtual void write(offs_t offset, uint16_t data) override; @@ -97,7 +97,7 @@ DECLARE_DEVICE_TYPE(KEYCUS_C430, keycus_c430_device) class keycus_c431_device : public ns11_keycus_device { public: - keycus_c431_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + keycus_c431_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint16_t read(offs_t offset) override; virtual void write(offs_t offset, uint16_t data) override; @@ -110,7 +110,7 @@ DECLARE_DEVICE_TYPE(KEYCUS_C431, keycus_c431_device) class keycus_c432_device : public ns11_keycus_device { public: - keycus_c432_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + keycus_c432_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint16_t read(offs_t offset) override; virtual void write(offs_t offset, uint16_t data) override; @@ -123,7 +123,7 @@ DECLARE_DEVICE_TYPE(KEYCUS_C432, keycus_c432_device) class keycus_c442_device : public ns11_keycus_device { public: - keycus_c442_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + keycus_c442_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint16_t read(offs_t offset) override; virtual void write(offs_t offset, uint16_t data) override; @@ -136,7 +136,7 @@ DECLARE_DEVICE_TYPE(KEYCUS_C442, keycus_c442_device) class keycus_c443_device : public ns11_keycus_device { public: - keycus_c443_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + keycus_c443_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint16_t read(offs_t offset) override; virtual void write(offs_t offset, uint16_t data) override; diff --git a/src/mame/namco/polepos.cpp b/src/mame/namco/polepos.cpp index 1a3594e1f79..e7420f63a4b 100644 --- a/src/mame/namco/polepos.cpp +++ b/src/mame/namco/polepos.cpp @@ -1050,11 +1050,11 @@ void polepos_state::topracern(machine_config &config) m_namco_sound->add_route(1, "rspeaker", 0.80); /* engine sound */ - polepos_sound_device &polepos(POLEPOS_SOUND(config, "polepos", 0)); + polepos_sound_device &polepos(POLEPOS_SOUND(config, "polepos")); polepos.add_route(ALL_OUTPUTS, "lspeaker", 0.90 * 0.77); polepos.add_route(ALL_OUTPUTS, "rspeaker", 0.90 * 0.77); - dac_4bit_r2r_device &dac(DAC_4BIT_R2R(config, "dac", 0)); // unknown resistor configuration + dac_4bit_r2r_device &dac(DAC_4BIT_R2R(config, "dac")); // unknown resistor configuration dac.add_route(ALL_OUTPUTS, "lspeaker", 0.12); dac.add_route(ALL_OUTPUTS, "rspeaker", 0.12); } @@ -1071,7 +1071,7 @@ void polepos_state::polepos2bi(machine_config &config) m_soundlatch->data_pending_callback().set_inputline(m_sound_z80, INPUT_LINE_NMI); m_soundlatch->set_separate_acknowledge(true); - TMS5220(config, "tms", 600000) /* ? Mhz */ + TMS5220(config, "tms", XTAL::u(600000)) /* ? Mhz */ .add_route(ALL_OUTPUTS, "lspeaker", 0.80) .add_route(ALL_OUTPUTS, "rspeaker", 0.80); } diff --git a/src/mame/namco/polepos_a.cpp b/src/mame/namco/polepos_a.cpp index 46fc1ca16b0..1c42701222a 100644 --- a/src/mame/namco/polepos_a.cpp +++ b/src/mame/namco/polepos_a.cpp @@ -207,7 +207,7 @@ DEFINE_DEVICE_TYPE(POLEPOS_SOUND, polepos_sound_device, "polepos_sound", "Pole P // polepos_sound_device - constructor //------------------------------------------------- -polepos_sound_device::polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +polepos_sound_device::polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, POLEPOS_SOUND, tag, owner, clock), device_sound_interface(mconfig, *this), m_current_position(0), diff --git a/src/mame/namco/polepos_a.h b/src/mame/namco/polepos_a.h index b8611218284..1c0b95196d4 100644 --- a/src/mame/namco/polepos_a.h +++ b/src/mame/namco/polepos_a.h @@ -10,7 +10,7 @@ class polepos_sound_device : public device_t, public device_sound_interface { public: - polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); ~polepos_sound_device() { } protected: diff --git a/src/mame/namco/rbowlorama.cpp b/src/mame/namco/rbowlorama.cpp index 5469ac61f59..b7c7863e3f2 100644 --- a/src/mame/namco/rbowlorama.cpp +++ b/src/mame/namco/rbowlorama.cpp @@ -89,7 +89,7 @@ void rbowlorama_state::machine_reset() void rbowlorama_state::rbowlorama(machine_config &config) { // Basic machine hardware - PENTIUM4(config, m_maincpu, 120000000); // Celeron, socket 478, 800/533MHz + PENTIUM4(config, m_maincpu, XTAL::u(120000000)); // Celeron, socket 478, 800/533MHz m_maincpu->set_addrmap(AS_PROGRAM, &rbowlorama_state::rbowlorama_map); // Video hardware diff --git a/src/mame/namco/starfield_05xx.cpp b/src/mame/namco/starfield_05xx.cpp index cdba1b1c7ba..0aa2c196eb6 100644 --- a/src/mame/namco/starfield_05xx.cpp +++ b/src/mame/namco/starfield_05xx.cpp @@ -531,7 +531,7 @@ static const int post_vis_cycle_count_values[] = -starfield_05xx_device::starfield_05xx_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock) +starfield_05xx_device::starfield_05xx_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, STARFIELD_05XX, tag, owner, clock) , m_enable(0) , m_lfsr(LFSR_SEED) diff --git a/src/mame/namco/starfield_05xx.h b/src/mame/namco/starfield_05xx.h index 2597166f95c..aa823d09df4 100644 --- a/src/mame/namco/starfield_05xx.h +++ b/src/mame/namco/starfield_05xx.h @@ -7,7 +7,7 @@ class starfield_05xx_device : public device_t { public: - starfield_05xx_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock); + starfield_05xx_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock); void enable_starfield(uint8_t on); void set_scroll_speed(uint8_t index_x, uint8_t index_y); diff --git a/src/mame/namco/tankbatt.cpp b/src/mame/namco/tankbatt.cpp index 37f0925c0d3..95ee65a96d9 100644 --- a/src/mame/namco/tankbatt.cpp +++ b/src/mame/namco/tankbatt.cpp @@ -396,7 +396,7 @@ void tankbatt_state::tankbatt(machine_config &config) // sound hardware SPEAKER(config, "mono").front_center(); - NETLIST_SOUND(config, "sound_nl", 48000) + NETLIST_SOUND(config, "sound_nl", XTAL::u(48000)) .set_source(NETLIST_NAME(tankbatt)) .add_route(ALL_OUTPUTS, "mono", 1.0); diff --git a/src/mame/namco/tceptor.cpp b/src/mame/namco/tceptor.cpp index ca9c83aeef9..882988c5966 100644 --- a/src/mame/namco/tceptor.cpp +++ b/src/mame/namco/tceptor.cpp @@ -333,7 +333,7 @@ void tceptor_state::tceptor(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); - adc0809_device &adc(ADC0809(config, "adc", 1000000)); // unknown clock (needs to >640khz or the wait loop is too fast) + adc0809_device &adc(ADC0809(config, "adc", XTAL::u(1000000))); // unknown clock (needs to >640khz or the wait loop is too fast) adc.in_callback<0>().set_constant(0); // unknown adc.in_callback<1>().set_ioport("PEDAL"); adc.in_callback<2>().set_ioport("STICKX"); @@ -368,7 +368,7 @@ void tceptor_state::tceptor(machine_config &config) m_cus30->add_route(0, "lspeaker", 0.40); m_cus30->add_route(1, "rspeaker", 0.40); - dac_8bit_r2r_device &dac(DAC_8BIT_R2R(config, "dac", 0)); // unknown DAC + dac_8bit_r2r_device &dac(DAC_8BIT_R2R(config, "dac")); // unknown DAC dac.add_route(ALL_OUTPUTS, "lspeaker", 0.4); dac.add_route(ALL_OUTPUTS, "rspeaker", 0.4); } diff --git a/src/mame/namco/toypop.cpp b/src/mame/namco/toypop.cpp index b86cf71fa6d..3aa73003f24 100644 --- a/src/mame/namco/toypop.cpp +++ b/src/mame/namco/toypop.cpp @@ -707,20 +707,20 @@ void namcos16_state::liblrabl(machine_config &config) m_sound_cpu->set_addrmap(AS_PROGRAM, &namcos16_state::sound_map); m_sound_cpu->set_periodic_int(FUNC(namcos16_state::irq0_line_hold), attotime::from_hz(60)); - NAMCO_58XX(config, m_namco58xx, 0); + NAMCO_58XX(config, m_namco58xx); m_namco58xx->in_callback<0>().set_ioport("COINS"); m_namco58xx->in_callback<1>().set_ioport("P1_RIGHT"); m_namco58xx->in_callback<2>().set_ioport("P2_RIGHT"); m_namco58xx->in_callback<3>().set_ioport("BUTTONS"); - NAMCO_56XX(config, m_namco56xx_1, 0); + NAMCO_56XX(config, m_namco56xx_1); m_namco56xx_1->in_callback<0>().set(FUNC(namcos16_state::dipA_h)); m_namco56xx_1->in_callback<1>().set(FUNC(namcos16_state::dipB_l)); m_namco56xx_1->in_callback<2>().set(FUNC(namcos16_state::dipB_h)); m_namco56xx_1->in_callback<3>().set(FUNC(namcos16_state::dipA_l)); m_namco56xx_1->out_callback<0>().set(FUNC(namcos16_state::flip)); - NAMCO_56XX(config, m_namco56xx_2, 0); + NAMCO_56XX(config, m_namco56xx_2); m_namco56xx_2->in_callback<1>().set_ioport("P1_LEFT"); m_namco56xx_2->in_callback<2>().set_ioport("P2_LEFT"); m_namco56xx_2->in_callback<3>().set_ioport("SERVICE"); @@ -736,7 +736,7 @@ void namcos16_state::liblrabl(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - NAMCO_15XX(config, m_namco15xx, 24000); + NAMCO_15XX(config, m_namco15xx, XTAL::u(24000)); m_namco15xx->set_voices(8); m_namco15xx->add_route(ALL_OUTPUTS, "mono", 1.0); } diff --git a/src/mame/namco/turrett.cpp b/src/mame/namco/turrett.cpp index d2acf8ea5e4..4eaa3523f49 100644 --- a/src/mame/namco/turrett.cpp +++ b/src/mame/namco/turrett.cpp @@ -321,7 +321,7 @@ DECLARE_DEVICE_TYPE(TURRETT_HARDDISK, turrett_hdd) class turrett_hdd : public ide_hdd_device { public: - turrett_hdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + turrett_hdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ide_hdd_device(mconfig, TURRETT_HARDDISK, tag, owner, clock) { } @@ -365,7 +365,7 @@ void turrett_state::turrett(machine_config &config) SCREEN(config, m_screen, SCREEN_TYPE_RASTER); // TODO: Likely not correct. Refresh rate empirically determined // to ensure in-sync streaming sound - m_screen->set_raw(4000000, 512, 0, 336, 259, 0, 244); + m_screen->set_raw(XTAL::u(4000000), 512, 0, 336, 259, 0, 244); m_screen->set_screen_update(FUNC(turrett_state::screen_update)); m_screen->set_palette("palette"); diff --git a/src/mame/namco/turrett.h b/src/mame/namco/turrett.h index cd3ef6b3968..ce54a7a3f4e 100644 --- a/src/mame/namco/turrett.h +++ b/src/mame/namco/turrett.h @@ -110,7 +110,7 @@ class turrett_device : public device_t, public: // construction/destruction - turrett_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + turrett_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint32_t read(offs_t offset); void write(offs_t offset, uint32_t data); diff --git a/src/mame/namco/turrett_a.cpp b/src/mame/namco/turrett_a.cpp index 72d0d61e35d..cf12eb9cdc7 100644 --- a/src/mame/namco/turrett_a.cpp +++ b/src/mame/namco/turrett_a.cpp @@ -16,7 +16,7 @@ DEFINE_DEVICE_TYPE(TURRETT, turrett_device, "ttsnd", "Turret Tower Sound") // turrett_device - constructor //------------------------------------------------- -turrett_device::turrett_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +turrett_device::turrett_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, TURRETT, tag, owner, clock) , device_sound_interface(mconfig, *this) , device_memory_interface(mconfig, *this) diff --git a/src/mame/namco/wacky_gator.cpp b/src/mame/namco/wacky_gator.cpp index 1dfbcf2a069..ffab6096bff 100644 --- a/src/mame/namco/wacky_gator.cpp +++ b/src/mame/namco/wacky_gator.cpp @@ -318,7 +318,7 @@ void wackygtr_state::wackygtr(machine_config &config) ppi2.in_pb_callback().set_ioport("IN1"); ppi2.in_pc_callback().set_ioport("IN2"); - PIT8253(config, m_pit8253[0], 0); + PIT8253(config, m_pit8253[0]); m_pit8253[0]->set_clk<0>(XTAL(3'579'545)/16); // this is a guess m_pit8253[0]->out_handler<0>().set(FUNC(wackygtr_state::alligator_ck<0>)); m_pit8253[0]->set_clk<1>(XTAL(3'579'545)/16); // this is a guess @@ -326,7 +326,7 @@ void wackygtr_state::wackygtr(machine_config &config) m_pit8253[0]->set_clk<2>(XTAL(3'579'545)/16); // this is a guess m_pit8253[0]->out_handler<2>().set(FUNC(wackygtr_state::alligator_ck<2>)); - PIT8253(config, m_pit8253[1], 0); + PIT8253(config, m_pit8253[1]); m_pit8253[1]->set_clk<0>(XTAL(3'579'545)/16); // this is a guess m_pit8253[1]->out_handler<0>().set_inputline(m_maincpu, M6809_FIRQ_LINE); m_pit8253[1]->set_clk<1>(XTAL(3'579'545)/16); // this is a guess diff --git a/src/mame/namco/warpwarp_a.cpp b/src/mame/namco/warpwarp_a.cpp index 4be2c5d7f77..2fe3538b7cc 100644 --- a/src/mame/namco/warpwarp_a.cpp +++ b/src/mame/namco/warpwarp_a.cpp @@ -15,7 +15,7 @@ DEFINE_DEVICE_TYPE(WARPWARP_SOUND, warpwarp_sound_device, "warpwarp_sound", "Warp Warp Custom Sound") -warpwarp_sound_device::warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +warpwarp_sound_device::warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WARPWARP_SOUND, tag, owner, clock), device_sound_interface(mconfig, *this), m_decay(nullptr), diff --git a/src/mame/namco/warpwarp_a.h b/src/mame/namco/warpwarp_a.h index 41f369ca2c7..212dad12050 100644 --- a/src/mame/namco/warpwarp_a.h +++ b/src/mame/namco/warpwarp_a.h @@ -9,7 +9,7 @@ class warpwarp_sound_device : public device_t, public device_sound_interface { public: - warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void sound_w(u8 data); void music1_w(u8 data); diff --git a/src/mame/namco/ygv608.cpp b/src/mame/namco/ygv608.cpp index 371d7068e9e..118cb2b21c3 100644 --- a/src/mame/namco/ygv608.cpp +++ b/src/mame/namco/ygv608.cpp @@ -315,7 +315,7 @@ void ygv608_device::port_map(address_map &map) // ygv608_device - constructor //------------------------------------------------- -ygv608_device::ygv608_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) +ygv608_device::ygv608_device( const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock ) : device_t(mconfig, YGV608, tag, owner, clock), device_gfx_interface(mconfig, *this, gfx_ygv608, DEVICE_SELF), device_memory_interface(mconfig, *this), diff --git a/src/mame/namco/ygv608.h b/src/mame/namco/ygv608.h index 0e96f289c1f..aa058b4ae9e 100644 --- a/src/mame/namco/ygv608.h +++ b/src/mame/namco/ygv608.h @@ -21,7 +21,7 @@ class ygv608_device : public device_t, { public: // construction/destruction - ygv608_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ygv608_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void port_map(address_map &map); |