xnu-792.25.20.tar.gz

[apple/xnu.git] / osfmk / i386 / hpet.c

diff --git a/osfmk/i386/hpet.c b/osfmk/i386/hpet.c
index a3d45b877e95e59f9a7609f28bbffdaa1e43fe23..c6eec35abf581fe1eed634b07ee35cd366eecf75 100644 (file)
--- a/osfmk/i386/hpet.c
+++ b/osfmk/i386/hpet.c
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 2005-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 
 #include <string.h>
@@ -117,6 +111,8 @@ void
 hpet_init(void)
 {
        unsigned int    *xmod;
+       uint64_t        now;
+       uint64_t        initialHPET;
 
        map_rcbaArea();
 
@@ -208,14 +204,14 @@ hpet_init(void)
         * Convert current TSC to HPET value,
         * set it, and start it ticking.
         */
-       uint64_t currtsc = rdtsc64();
-       uint64_t tscInHPET = tmrCvt(currtsc, tsc2hpet);
-       ((hpetReg_t *)hpetArea)->MAIN_CNT = tscInHPET;
+       now = mach_absolute_time();
+       initialHPET = tmrCvt(now, hpetCvtn2t);
+       ((hpetReg_t *)hpetArea)->MAIN_CNT = initialHPET;
        hpetcon = hpetcon | 1;
        ((hpetReg_t *)hpetArea)->GEN_CONF = hpetcon;
-       kprintf("HPET started: TSC = %08X.%08X, HPET = %08X.%08X\n", 
-               (uint32_t)(currtsc >> 32), (uint32_t)currtsc,
-               (uint32_t)(tscInHPET >> 32), (uint32_t)tscInHPET);
+       kprintf("HPET started: now = %08X.%08X, HPET = %08X.%08X\n",
+               (uint32_t)(now >> 32), (uint32_t)now,
+               (uint32_t)(initialHPET >> 32), (uint32_t)initialHPET);
 
 #if MACH_KDB
        db_display_hpet((hpetReg_t *)hpetArea); /* (BRINGUP) */
@@ -342,7 +338,7 @@ void hpet_restore( void )
        to->TIM2_CONF = from->TIM2_CONF;
        to->TIM2_COMP = from->TIM2_COMP;
        to->GINTR_STA = -1ULL;
-       to->MAIN_CNT  = from->MAIN_CNT;
+       to->MAIN_CNT  = tmrCvt(mach_absolute_time(), hpetCvtn2t);
 
        to->GEN_CONF = from->GEN_CONF;
 }