Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-27 02:49:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix bus frequency detection for more realistic timers.

Browse Source 
Also add bus-frequency and timebase-frequency values to the Name Registry.
This commit is contained in:
gbeauche 2004-05-15 11:07:11 +00:00
parent 3904a421d4
commit 65e1edb5b2
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SheepShaver/src/Unix/main_unix.cpp
View File

@ -533,6 +533,15 @@ int main(int argc, char **argv)
sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno)); sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno));
WarningAlert(str); 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 #endif
D(bug("PVR: %08x (assumed)\n", PVR)); 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[0xc50 >> 2] = htonl(RAMBase);
kernel_data->v[0xc54 >> 2] = htonl(RAMSize); kernel_data->v[0xc54 >> 2] = htonl(RAMSize);
kernel_data->v[0xf60 >> 2] = htonl(PVR); kernel_data->v[0xf60 >> 2] = htonl(PVR);
kernel_data->v[0xf64 >> 2] = htonl(CPUClockSpeed); kernel_data->v[0xf64 >> 2] = htonl(CPUClockSpeed); // clock-frequency
kernel_data->v[0xf68 >> 2] = htonl(BusClockSpeed); kernel_data->v[0xf68 >> 2] = htonl(BusClockSpeed); // bus-frequency
kernel_data->v[0xf6c >> 2] = htonl(CPUClockSpeed); kernel_data->v[0xf6c >> 2] = htonl(BusClockSpeed / 4); // timebase-frequency
} else { } else {
kernel_data->v[0xc80 >> 2] = htonl(RAMSize); kernel_data->v[0xc80 >> 2] = htonl(RAMSize);
kernel_data->v[0xc84 >> 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[0xcb0 >> 2] = htonl(RAMBase);
kernel_data->v[0xcb4 >> 2] = htonl(RAMSize); kernel_data->v[0xcb4 >> 2] = htonl(RAMSize);
kernel_data->v[0xf80 >> 2] = htonl(PVR); kernel_data->v[0xf80 >> 2] = htonl(PVR);
kernel_data->v[0xf84 >> 2] = htonl(CPUClockSpeed); kernel_data->v[0xf84 >> 2] = htonl(CPUClockSpeed); // clock-frequency
kernel_data->v[0xf88 >> 2] = htonl(BusClockSpeed); kernel_data->v[0xf88 >> 2] = htonl(BusClockSpeed); // bus-frequency
kernel_data->v[0xf8c >> 2] = htonl(CPUClockSpeed); kernel_data->v[0xf8c >> 2] = htonl(BusClockSpeed / 4); // timebase-frequency
} }
// Initialize extra low memory // Initialize extra low memory

4
SheepShaver/src/name_registry.cpp
View File

@ -136,6 +136,10 @@ void DoPatchNameRegistry(void)
if (!RegistryCStrEntryCreate(device_tree.ptr(), str, power_pc.ptr())) { if (!RegistryCStrEntryCreate(device_tree.ptr(), str, power_pc.ptr())) {
u32.set_value(CPUClockSpeed); u32.set_value(CPUClockSpeed);
RegistryPropertyCreate(power_pc.ptr(), "clock-frequency", u32.ptr(), 4); 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); u32.set_value(PVR);
RegistryPropertyCreate(power_pc.ptr(), "cpu-version", u32.ptr(), 4); RegistryPropertyCreate(power_pc.ptr(), "cpu-version", u32.ptr(), 4);
RegistryPropertyCreateStr(power_pc.ptr(), "device_type", "cpu"); RegistryPropertyCreateStr(power_pc.ptr(), "device_type", "cpu");