From 65e1edb5b2621e2ae0c39a672265fc57faa73bd9 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sat, 15 May 2004 11:07:11 +0000
Subject: [PATCH] Fix bus frequency detection for more realistic timers. Also
 add bus-frequency and timebase-frequency values to the Name Registry.

---
 SheepShaver/src/Unix/main_unix.cpp | 21 +++++++++++++++------
 SheepShaver/src/name_registry.cpp  |  4 ++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/SheepShaver/src/Unix/main_unix.cpp b/SheepShaver/src/Unix/main_unix.cpp
index c99b509e..14e88a9f 100644
--- a/SheepShaver/src/Unix/main_unix.cpp
+++ b/SheepShaver/src/Unix/main_unix.cpp
@@ -533,6 +533,15 @@ int main(int argc, char **argv)
 		sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno));
 		WarningAlert(str);
 	}
+
+	// Get actual bus frequency
+	proc_file = fopen("/proc/device-tree/clock-frequency", "r");
+	if (proc_file) {
+		union { uint8 b[4]; uint32 l; } value;
+		if (fread(value.b, sizeof(value), 1, proc_file) == 1)
+			BusClockSpeed = value.l;
+		fclose(proc_file);
+	}
 #endif
 	D(bug("PVR: %08x (assumed)\n", PVR));
 
@@ -792,9 +801,9 @@ int main(int argc, char **argv)
 		kernel_data->v[0xc50 >> 2] = htonl(RAMBase);
 		kernel_data->v[0xc54 >> 2] = htonl(RAMSize);
 		kernel_data->v[0xf60 >> 2] = htonl(PVR);
-		kernel_data->v[0xf64 >> 2] = htonl(CPUClockSpeed);
-		kernel_data->v[0xf68 >> 2] = htonl(BusClockSpeed);
-		kernel_data->v[0xf6c >> 2] = htonl(CPUClockSpeed);
+		kernel_data->v[0xf64 >> 2] = htonl(CPUClockSpeed);			// clock-frequency
+		kernel_data->v[0xf68 >> 2] = htonl(BusClockSpeed);			// bus-frequency
+		kernel_data->v[0xf6c >> 2] = htonl(BusClockSpeed / 4);		// timebase-frequency
 	} else {
 		kernel_data->v[0xc80 >> 2] = htonl(RAMSize);
 		kernel_data->v[0xc84 >> 2] = htonl(RAMSize);
@@ -806,9 +815,9 @@ int main(int argc, char **argv)
 		kernel_data->v[0xcb0 >> 2] = htonl(RAMBase);
 		kernel_data->v[0xcb4 >> 2] = htonl(RAMSize);
 		kernel_data->v[0xf80 >> 2] = htonl(PVR);
-		kernel_data->v[0xf84 >> 2] = htonl(CPUClockSpeed);
-		kernel_data->v[0xf88 >> 2] = htonl(BusClockSpeed);
-		kernel_data->v[0xf8c >> 2] = htonl(CPUClockSpeed);
+		kernel_data->v[0xf84 >> 2] = htonl(CPUClockSpeed);			// clock-frequency
+		kernel_data->v[0xf88 >> 2] = htonl(BusClockSpeed);			// bus-frequency
+		kernel_data->v[0xf8c >> 2] = htonl(BusClockSpeed / 4);		// timebase-frequency
 	}
 
 	// Initialize extra low memory
diff --git a/SheepShaver/src/name_registry.cpp b/SheepShaver/src/name_registry.cpp
index 51dfb94a..8fad055b 100644
--- a/SheepShaver/src/name_registry.cpp
+++ b/SheepShaver/src/name_registry.cpp
@@ -136,6 +136,10 @@ void DoPatchNameRegistry(void)
 		if (!RegistryCStrEntryCreate(device_tree.ptr(), str, power_pc.ptr())) {
 			u32.set_value(CPUClockSpeed);
 			RegistryPropertyCreate(power_pc.ptr(), "clock-frequency", u32.ptr(), 4);
+			u32.set_value(BusClockSpeed);
+			RegistryPropertyCreate(power_pc.ptr(), "bus-frequency", u32.ptr(), 4);
+			u32.set_value(BusClockSpeed / 4);
+			RegistryPropertyCreate(power_pc.ptr(), "timebase-frequency", u32.ptr(), 4);
 			u32.set_value(PVR);
 			RegistryPropertyCreate(power_pc.ptr(), "cpu-version", u32.ptr(), 4);
 			RegistryPropertyCreateStr(power_pc.ptr(), "device_type", "cpu");