--- xnu/xnu-1699.24.23/iokit/Kernel/IOTimerEventSource.cpp
+++ xnu/xnu-1228/iokit/Kernel/IOTimerEventSource.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000, 2009-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -25,6 +25,17 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
+ *
+ * IOTimerEventSource.cpp
+ *
+ * HISTORY
+ * 2-Feb-1999		Joe Liu (jliu) created.
+ * 1999-10-14		Godfrey van der Linden(gvdl)
+ *		Revamped to use thread_call APIs
+ *
+ */
 
 #include <sys/cdefs.h>
 
@@ -40,7 +51,6 @@
 #include <IOKit/IOWorkLoop.h>
 
 #include <IOKit/IOTimeStamp.h>
-#include <IOKit/IOKitDebug.h>
 
 #define super IOEventSource
 OSDefineMetaClassAndStructors(IOTimerEventSource, IOEventSource)
@@ -53,50 +63,19 @@
 OSMetaClassDefineReservedUnused(IOTimerEventSource, 6);
 OSMetaClassDefineReservedUnused(IOTimerEventSource, 7);
 
-#if IOKITSTATS
-
-#define IOStatisticsInitializeCounter() \
-do { \
-	IOStatistics::setCounterType(IOEventSource::reserved->counter, kIOStatisticsTimerEventSourceCounter); \
-} while (0)
-
-#define IOStatisticsOpenGate() \
-do { \
-	IOStatistics::countOpenGate(me->IOEventSource::reserved->counter); \
-} while (0)
-
-#define IOStatisticsCloseGate() \
-do { \
-	IOStatistics::countCloseGate(me->IOEventSource::reserved->counter); \
-} while (0)
-
-#define IOStatisticsTimeout() \
-do { \
-	IOStatistics::countTimerTimeout(me->IOEventSource::reserved->counter); \
-} while (0)
-
-#else
-
-#define IOStatisticsInitializeCounter()
-#define IOStatisticsOpenGate()
-#define IOStatisticsCloseGate()
-#define IOStatisticsTimeout()
-
-#endif /* IOKITSTATS */
-
 // 
 // reserved != 0 means IOTimerEventSource::timeoutAndRelease is being used,
 // not a subclassed implementation. 
 //
 
+bool IOTimerEventSource::checkForWork() { return false; }
+
 // Timeout handler function. This function is called by the kernel when
 // the timeout interval expires.
 //
 void IOTimerEventSource::timeout(void *self)
 {
     IOTimerEventSource *me = (IOTimerEventSource *) self;
-
-    IOStatisticsTimeout();
 
     if (me->enabled && me->action)
     {
@@ -106,37 +85,22 @@
         {
             Action doit;
             wl->closeGate();
-            IOStatisticsCloseGate();
             doit = (Action) me->action;
             if (doit && me->enabled && AbsoluteTime_to_scalar(&me->abstime))
             {
-            	bool    trace = (gIOKitTrace & kIOTraceTimers) ? true : false;
-            	
-            	if (trace)
-                	IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
-											 (uintptr_t) doit, (uintptr_t) me->owner);
-				
+                IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
+                                    (unsigned int) doit, (unsigned int) me->owner);
                 (*doit)(me->owner, me);
-                
-				if (trace)
-                	IOTimeStampEndConstant(IODBG_TIMES(IOTIMES_ACTION),
-										   (uintptr_t) doit, (uintptr_t) me->owner);
             }
-            IOStatisticsOpenGate();
             wl->openGate();
         }
     }
 }
 
-void IOTimerEventSource::timeoutAndRelease(void * self, void * c)
+void IOTimerEventSource::timeoutAndRelease(void * self, void * count)
 {
     IOTimerEventSource *me = (IOTimerEventSource *) self;
-	/* The second parameter (a pointer) gets abused to carry an SInt32, so on LP64, "count"
-	   must be cast to "long" before, in order to tell GCC we're not truncating a pointer. */
-	SInt32 count = (SInt32) (long) c;
-
-    IOStatisticsTimeout();
-	
+
     if (me->enabled && me->action)
     {
         IOWorkLoop *
@@ -145,23 +109,13 @@
         {
             Action doit;
             wl->closeGate();
-            IOStatisticsCloseGate();
             doit = (Action) me->action;
-            if (doit && (me->reserved->calloutGeneration == count))
+            if (doit && (me->reserved->calloutGeneration == (SInt32) count))
             {
-            	bool    trace = (gIOKitTrace & kIOTraceTimers) ? true : false;
-            	
-            	if (trace)
-                	IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
-											 (uintptr_t) doit, (uintptr_t) me->owner);
-				
+                IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
+                                    (unsigned int) doit, (unsigned int) me->owner);
                 (*doit)(me->owner, me);
-                
-				if (trace)
-                	IOTimeStampEndConstant(IODBG_TIMES(IOTIMES_ACTION),
-										   (uintptr_t) doit, (uintptr_t) me->owner);
             }
-            IOStatisticsOpenGate();
             wl->openGate();
         }
     }
@@ -188,8 +142,6 @@
     if (!calloutEntry)
         return false;
 
-    IOStatisticsInitializeCounter();
-
     return true;
 }
 
@@ -275,7 +227,6 @@
     return wakeAtTime(end);
 }
 
-#if !defined(__LP64__)
 IOReturn IOTimerEventSource::setTimeout(mach_timespec_t interval)
 {
     AbsoluteTime end, nsecs;
@@ -288,7 +239,6 @@
 
     return wakeAtTime(end);
 }
-#endif
 
 IOReturn IOTimerEventSource::setTimeout(AbsoluteTime interval)
 {
@@ -323,7 +273,6 @@
     return wakeAtTime(end);
 }
 
-#if !defined(__LP64__)
 IOReturn IOTimerEventSource::wakeAtTime(mach_timespec_t inAbstime)
 {
     AbsoluteTime end, nsecs;
@@ -336,7 +285,6 @@
 
     return wakeAtTime(end);
 }
-#endif
 
 void IOTimerEventSource::setWorkLoop(IOWorkLoop *inWorkLoop)
 {
@@ -351,7 +299,7 @@
         return kIOReturnNoResources;
 
     abstime = inAbstime;
-    if ( enabled && AbsoluteTime_to_scalar(&inAbstime) && AbsoluteTime_to_scalar(&abstime) && workLoop )
+    if ( enabled && AbsoluteTime_to_scalar(&abstime) && workLoop )
     {
         if (reserved)
         {
@@ -360,14 +308,14 @@
             reserved->workLoop = workLoop;
             reserved->calloutGeneration++;
             if (thread_call_enter1_delayed((thread_call_t) calloutEntry, 
-                    (void *) reserved->calloutGeneration, inAbstime))
+                    (void *) reserved->calloutGeneration, abstime))
             {
                 release();
                 workLoop->release();
             }
         }
         else
-            thread_call_enter_delayed((thread_call_t) calloutEntry, inAbstime);
+            thread_call_enter_delayed((thread_call_t) calloutEntry, abstime);
     }
 
     return kIOReturnSuccess;