xnu-1228.3.13.tar.gz

[apple/xnu.git] / osfmk / ppc / rtclock.c

diff --git a/osfmk/ppc/rtclock.c b/osfmk/ppc/rtclock.c
index b294ae1b04669b2731244196773238ab2dfa1f88..90a5754ae3cf898d877b3519e9a8c280f68ad2aa 100644 (file)
--- a/osfmk/ppc/rtclock.c
+++ b/osfmk/ppc/rtclock.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -44,12 +44,12 @@
 #include <kern/processor.h>
 #include <kern/macro_help.h>
 #include <kern/spl.h>
 #include <kern/processor.h>
 #include <kern/macro_help.h>
 #include <kern/spl.h>

+#include <kern/pms.h>

 
 #include <machine/commpage.h>
 #include <machine/machine_routines.h>
 #include <ppc/exception.h>
 #include <ppc/proc_reg.h>
 
 #include <machine/commpage.h>
 #include <machine/machine_routines.h>
 #include <ppc/exception.h>
 #include <ppc/proc_reg.h>

-#include <ppc/pms.h>

 #include <ppc/rtclock.h>
 
 #include <sys/kdebug.h>
 #include <ppc/rtclock.h>
 
 #include <sys/kdebug.h>


@@ -91,12 +91,11 @@ timebase_callback(
        struct timebase_freq_t  *freq)
 {
        uint32_t        numer, denom;
        struct timebase_freq_t  *freq)
 {
        uint32_t        numer, denom;

-       uint64_t        abstime;

        spl_t           s;
 
        if (    freq->timebase_den < 1 || freq->timebase_den > 4        ||
                        freq->timebase_num < freq->timebase_den                         )                       
        spl_t           s;
 
        if (    freq->timebase_den < 1 || freq->timebase_den > 4        ||
                        freq->timebase_num < freq->timebase_den                         )                       

-               panic("rtclock timebase_callback: invalid constant %d / %d",
+               panic("rtclock timebase_callback: invalid constant %lu / %lu",

                                        freq->timebase_num, freq->timebase_den);
 
        denom = freq->timebase_num;
                                        freq->timebase_num, freq->timebase_den);
 
        denom = freq->timebase_num;


@@ -110,9 +109,6 @@ timebase_callback(
                rtclock_timebase_const.denom = denom;
                rtclock_sec_divisor = freq->timebase_num / freq->timebase_den;
 
                rtclock_timebase_const.denom = denom;
                rtclock_sec_divisor = freq->timebase_num / freq->timebase_den;
 

-               nanoseconds_to_absolutetime(NSEC_PER_HZ, &abstime);
-               rtclock_tick_interval = abstime;
-

                ml_init_lock_timeout();
        }
        else {
                ml_init_lock_timeout();
        }
        else {


@@ -146,14 +142,6 @@ rtclock_config(void)
 int
 rtclock_init(void)
 {
 int
 rtclock_init(void)
 {

-       uint64_t                                abstime;
-       struct per_proc_info    *pp;
-
-       pp = getPerProc();
-
-       abstime = mach_absolute_time();
-       pp->rtclock_intr_deadline = abstime + rtclock_tick_interval;    /* Get the time we need to pop */
-       

        etimer_resync_deadlines();                      /* Start the timers going */
 
        return (1);
        etimer_resync_deadlines();                      /* Start the timers going */
 
        return (1);