summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/dynax/royalmah.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/dynax/royalmah.cpp')
-rw-r--r--src/mame/dynax/royalmah.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/dynax/royalmah.cpp b/src/mame/dynax/royalmah.cpp
index 7a16f84948a..f29489afa59 100644
--- a/src/mame/dynax/royalmah.cpp
+++ b/src/mame/dynax/royalmah.cpp
@@ -3720,7 +3720,7 @@ INPUT_PORTS_END
void royalmah_state::royalmah(machine_config &config)
{
// basic machine hardware
- Z80(config, m_maincpu, 18432000 / 6); // 3.072 MHz
+ Z80(config, m_maincpu, XTAL::u(18432000) / 6); // 3.072 MHz
m_maincpu->set_addrmap(AS_PROGRAM, &royalmah_state::royalmah_map);
m_maincpu->set_addrmap(AS_IO, &royalmah_state::royalmah_iomap);
m_maincpu->set_vblank_int("screen", FUNC(royalmah_state::irq0_line_hold));
@@ -3740,7 +3740,7 @@ void royalmah_state::royalmah(machine_config &config)
// sound hardware
SPEAKER(config, "speaker").front_center();
- AY8910(config, m_ay, 18432000 / 12);
+ AY8910(config, m_ay, XTAL::u(18432000) / 12);
m_ay->port_a_read_callback().set(FUNC(royalmah_state::player_1_port_r));
m_ay->port_b_read_callback().set(FUNC(royalmah_state::player_2_port_r));
m_ay->add_route(ALL_OUTPUTS, "speaker", 0.33);
@@ -3750,17 +3750,17 @@ void royalmah_state::royalmah(machine_config &config)
void royalmah_state::janoh(machine_config &config)
{
royalmah(config);
- m_maincpu->set_clock(8000000 / 2); // 4 MHz ?
+ m_maincpu->set_clock(XTAL::u(8000000) / 2); // 4 MHz ?
m_maincpu->set_addrmap(AS_PROGRAM, &royalmah_state::janoh_map);
}
void royalmah_state::janoha(machine_config &config)
{
royalmah(config);
- m_maincpu->set_clock(8000000 / 2); // 4 MHz ?
+ m_maincpu->set_clock(XTAL::u(8000000) / 2); // 4 MHz ?
m_maincpu->set_addrmap(AS_PROGRAM, &royalmah_state::janoh_map);
- z80_device &sub(Z80(config, "sub", 4000000)); // 4 MHz ?
+ z80_device &sub(Z80(config, "sub", XTAL::u(4000000))); // 4 MHz ?
sub.set_addrmap(AS_PROGRAM, &royalmah_state::janoh_sub_map);
sub.set_addrmap(AS_IO, &royalmah_state::janoh_sub_iomap);
sub.set_vblank_int("screen", FUNC(royalmah_state::irq0_line_hold));
@@ -3773,20 +3773,20 @@ void royalmah_state::jansou(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &royalmah_state::jansou_map);
m_maincpu->set_addrmap(AS_IO, &royalmah_state::royalmah_iomap);
- Z80(config, m_audiocpu, 4000000); // 4.000 MHz
+ Z80(config, m_audiocpu, XTAL::u(4000000)); // 4.000 MHz
m_audiocpu->set_addrmap(AS_PROGRAM, &royalmah_state::jansou_sub_map);
m_audiocpu->set_addrmap(AS_IO, &royalmah_state::jansou_sub_iomap);
m_audiocpu->set_periodic_int(FUNC(royalmah_state::irq0_line_hold), attotime::from_hz(4000000 / 512));
GENERIC_LATCH_8(config, m_soundlatch);
- DAC_8BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.25); // unknown DAC
+ DAC_8BIT_R2R(config, "dac").add_route(ALL_OUTPUTS, "speaker", 0.25); // unknown DAC
}
void royalmah_state::dondenmj(machine_config &config)
{
royalmah(config);
- m_maincpu->set_clock(8000000 / 2); // 4 MHz ?
+ m_maincpu->set_clock(XTAL::u(8000000) / 2); // 4 MHz ?
m_maincpu->set_addrmap(AS_PROGRAM, &royalmah_state::royalmah_banked_map);
m_maincpu->set_addrmap(AS_IO, &royalmah_state::dondenmj_iomap);
}
@@ -3794,7 +3794,7 @@ void royalmah_state::dondenmj(machine_config &config)
void royalmah_state::tahjong(machine_config &config)
{
royalmah(config);
- m_maincpu->set_clock(8000000 / 2); // 4 MHz ?
+ m_maincpu->set_clock(XTAL::u(8000000) / 2); // 4 MHz ?
m_maincpu->set_addrmap(AS_PROGRAM, &royalmah_state::tahjong_map);
m_maincpu->set_addrmap(AS_IO, &royalmah_state::tahjong_iomap);
}
@@ -3802,7 +3802,7 @@ void royalmah_state::tahjong(machine_config &config)
void royalmah_state::makaijan(machine_config &config)
{
royalmah(config);
- m_maincpu->set_clock(8000000 / 2); // 4 MHz ?
+ m_maincpu->set_clock(XTAL::u(8000000) / 2); // 4 MHz ?
m_maincpu->set_addrmap(AS_PROGRAM, &royalmah_state::royalmah_banked_map);
m_maincpu->set_addrmap(AS_IO, &royalmah_state::makaijan_iomap);
}
@@ -3810,7 +3810,7 @@ void royalmah_state::makaijan(machine_config &config)
void royalmah_state::daisyari(machine_config &config)
{
royalmah(config);
- m_maincpu->set_clock(8000000 / 2); // 4 MHz ?
+ m_maincpu->set_clock(XTAL::u(8000000) / 2); // 4 MHz ?
m_maincpu->set_addrmap(AS_PROGRAM, &royalmah_state::royalmah_banked_map);
m_maincpu->set_addrmap(AS_IO, &royalmah_state::daisyari_iomap);
}
@@ -3818,7 +3818,7 @@ void royalmah_state::daisyari(machine_config &config)
void royalmah_state::mjclub(machine_config &config)
{
royalmah(config);
- m_maincpu->set_clock(8000000 / 2); // 4 MHz ?
+ m_maincpu->set_clock(XTAL::u(8000000) / 2); // 4 MHz ?
m_maincpu->set_addrmap(AS_PROGRAM, &royalmah_state::royalmah_banked_map);
m_maincpu->set_addrmap(AS_IO, &royalmah_state::mjclub_iomap);
}
@@ -3965,7 +3965,7 @@ void royalmah_state::janptr96(machine_config &config)
void royalmah_state::mjifb(machine_config &config)
{
mjderngr(config);
- tmp90841_device &tmp(TMP90841(config.replace(), m_maincpu, 8000000)); // ?
+ tmp90841_device &tmp(TMP90841(config.replace(), m_maincpu, XTAL::u(8000000))); // ?
tmp.set_addrmap(AS_PROGRAM, &royalmah_state::mjifb_map);
tmp.port_read<3>().set_ioport("PORT3_5").rshift(6);
tmp.port_write<3>().set(FUNC(royalmah_state::mjifb_p3_w));
@@ -3985,7 +3985,7 @@ void royalmah_state::mjifb(machine_config &config)
void royalmah_state::mjdejavu(machine_config &config)
{
mjderngr(config);
- tmp90841_device &tmp(TMP90841(config.replace(), m_maincpu, 8000000)); // ?
+ tmp90841_device &tmp(TMP90841(config.replace(), m_maincpu, XTAL::u(8000000))); // ?
tmp.set_addrmap(AS_PROGRAM, &royalmah_state::mjdejavu_map);
tmp.port_read<3>().set_ioport("PORT3_5").rshift(6);
tmp.port_write<3>().set(FUNC(royalmah_state::mjifb_p3_w));
@@ -4005,7 +4005,7 @@ void royalmah_state::mjdejavu(machine_config &config)
void royalmah_state::mjtensin(machine_config &config)
{
mjderngr(config);
- tmp90841_device &tmp(TMP90841(config.replace(), m_maincpu, 12000000)); // ?
+ tmp90841_device &tmp(TMP90841(config.replace(), m_maincpu, XTAL::u(12000000))); // ?
tmp.set_addrmap(AS_PROGRAM, &royalmah_state::mjtensin_map);
tmp.port_read<3>().set(FUNC(royalmah_state::mjtensin_p3_r));
tmp.port_write<4>().set(FUNC(royalmah_state::mjtensin_p4_w));
@@ -4021,7 +4021,7 @@ void royalmah_state::mjtensin(machine_config &config)
void royalmah_state::cafetime(machine_config &config)
{
mjderngr(config);
- tmp90841_device &tmp(TMP90841(config.replace(), m_maincpu, 12000000)); // ?
+ tmp90841_device &tmp(TMP90841(config.replace(), m_maincpu, XTAL::u(12000000))); // ?
tmp.set_addrmap(AS_PROGRAM, &royalmah_state::cafetime_map);
tmp.port_write<3>().set(FUNC(royalmah_state::cafetime_p3_w));
tmp.port_write<4>().set(FUNC(royalmah_state::cafetime_p4_w));
@@ -4107,7 +4107,7 @@ void royalmah_state::pongboo2(machine_config &config)
// sound hardware
SPEAKER(config, "mono").front_center();
- OKIM6295(config, "oki", 1'000'000, okim6295_device::PIN7_LOW).add_route(ALL_OUTPUTS, "mono", 0.5); // frequency and pin 7 not verified
+ OKIM6295(config, "oki", XTAL::u(1'000'000), okim6295_device::PIN7_LOW).add_route(ALL_OUTPUTS, "mono", 0.5); // frequency and pin 7 not verified
}