[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 1/5] PPC: mac99: Fix core99 timer frequency
From: |
Alexander Graf |
Subject: |
[Qemu-ppc] [PATCH 1/5] PPC: mac99: Fix core99 timer frequency |
Date: |
Sun, 13 Jul 2014 18:17:29 +0200 |
There is a special timer in the mac99 machine that we recently started
to emulate. Unfortunately we emulated it in the wrong frequency.
This patch adapts the frequency Mac OS X uses to evaluate results from
this timer, making calculations it bases off of it work.
Signed-off-by: Alexander Graf <address@hidden>
---
hw/misc/macio/macio.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index 47f45f5..35eaa00 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -243,13 +243,18 @@ static void timer_write(void *opaque, hwaddr addr,
uint64_t value,
static uint64_t timer_read(void *opaque, hwaddr addr, unsigned size)
{
uint32_t value = 0;
+ uint64_t systime = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+ uint64_t kltime;
+
+ kltime = muldiv64(systime, 4194300, get_ticks_per_sec() * 4);
+ kltime = muldiv64(kltime, 18432000, 1048575);
switch (addr) {
case 0x38:
- value = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+ value = kltime;
break;
case 0x3c:
- value = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) >> 32;
+ value = kltime >> 32;
break;
}
--
1.8.1.4
- [Qemu-ppc] [PATCH 0/5] PPC: Mac99 emulation fixes, Alexander Graf, 2014/07/13
- [Qemu-ppc] [PATCH 2/5] PPC: mac_nvram: Remove unused functions, Alexander Graf, 2014/07/13
- [Qemu-ppc] [PATCH 4/5] PPC: mac_nvram: Split NVRAM into OF and OSX parts, Alexander Graf, 2014/07/13
- [Qemu-ppc] [PATCH 3/5] PPC: mac_nvram: Allow 2 and 4 byte accesses, Alexander Graf, 2014/07/13
- [Qemu-ppc] [PATCH 1/5] PPC: mac99: Fix core99 timer frequency,
Alexander Graf <=
- [Qemu-ppc] [PATCH 5/5] PPC: mac99: Expose NVRAM linearly, Alexander Graf, 2014/07/13
- Re: [Qemu-ppc] [PATCH 0/5] PPC: Mac99 emulation fixes, Programmingkid, 2014/07/13
- Re: [Qemu-ppc] [Qemu-devel] [PATCH 0/5] PPC: Mac99 emulation fixes, Mark Cave-Ayland, 2014/07/14