From 85af525e59483211c65841380388d44a2b3e56f4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 7 Jan 2006 20:35:13 +0000 Subject: [PATCH] * Added missing call to __ppc_setup_system_time(). system_time() and real_time_clock[_usecs]() finally seem to work (at least in the kernel). * Removed accidentially committed debug output. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15861 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/arch/ppc/arch_platform.cpp | 2 -- src/system/kernel/arch/ppc/arch_real_time_clock.cpp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/system/kernel/arch/ppc/arch_platform.cpp b/src/system/kernel/arch/ppc/arch_platform.cpp index b4e7f09eb6..1defa41a7a 100644 --- a/src/system/kernel/arch/ppc/arch_platform.cpp +++ b/src/system/kernel/arch/ppc/arch_platform.cpp @@ -140,10 +140,8 @@ status_t PPCOpenFirmware::InitRTC(struct kernel_args *kernelArgs, struct real_time_data *data) { -kprintf("PPCOpenFirmware::InitRTC(): opening \"%s\"...\n", kernelArgs->platform_args.rtc_path); // open RTC fRTC = of_open(kernelArgs->platform_args.rtc_path); -kprintf(" of_open() returned: %d\n", fRTC); if (fRTC == OF_FAILED) { dprintf("PPCOpenFirmware::InitRTC(): Failed open RTC device!\n"); return B_ERROR; diff --git a/src/system/kernel/arch/ppc/arch_real_time_clock.cpp b/src/system/kernel/arch/ppc/arch_real_time_clock.cpp index f074536487..463ed511c7 100644 --- a/src/system/kernel/arch/ppc/arch_real_time_clock.cpp +++ b/src/system/kernel/arch/ppc/arch_real_time_clock.cpp @@ -29,6 +29,9 @@ arch_rtc_init(kernel_args *args, struct real_time_data *data) // init spinlock sSetArchDataLock = 0; + // init system_time() conversion factor + __ppc_setup_system_time(&data->arch_data.system_time_conversion_factor); + return B_OK; }