summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/apple/sonora.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/apple/sonora.cpp')
-rw-r--r--src/mame/apple/sonora.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/apple/sonora.cpp b/src/mame/apple/sonora.cpp
index 96c97269d2a..b5e973b1f0a 100644
--- a/src/mame/apple/sonora.cpp
+++ b/src/mame/apple/sonora.cpp
@@ -29,8 +29,8 @@
#include "formats/ap_dsk35.h"
-static constexpr u32 C7M = 7833600;
-static constexpr u32 C15M = (C7M * 2);
+static constexpr XTAL C7M = XTAL::u(7833600);
+static constexpr XTAL C15M = (C7M * 2);
//**************************************************************************
// DEVICE DEFINITIONS
@@ -92,7 +92,7 @@ void sonora_device::device_add_mconfig(machine_config &config)
// sonora_device - constructor
//-------------------------------------------------
-sonora_device::sonora_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+sonora_device::sonora_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, SONORA, tag, owner, clock),
write_pb4(*this),
write_pb5(*this),
@@ -530,13 +530,13 @@ void sonora_device::via_sync()
u64 cycle = m_maincpu->total_cycles();
// Get the number of the cycle the via is in at that time
- u64 via_cycle = cycle * m_via1->clock() / m_maincpu->clock();
+ u64 via_cycle = cycle * m_via1->clock().value() / m_maincpu->clock().value();
// The access is going to start at via_cycle+1 and end at
// via_cycle+1.5, compute what that means in maincpu cycles (the
// +1 rounds up, since the clocks are too different to ever be
// synced).
- u64 main_cycle = (via_cycle * 2 + 3) * m_maincpu->clock() / (2 * m_via1->clock()) + 1;
+ u64 main_cycle = (via_cycle * 2 + 3) * m_maincpu->clock().value() / (2 * m_via1->clock().value()) + 1;
// Finally adjust the main cpu icount as needed.
m_maincpu->adjust_icount(-int(main_cycle - cycle));