--- xnu/xnu-792.25.20/iokit/Kernel/IOTimerEventSource.cpp
+++ xnu/xnu-201/iokit/Kernel/IOTimerEventSource.cpp
@@ -57,11 +57,6 @@
 OSMetaClassDefineReservedUnused(IOTimerEventSource, 6);
 OSMetaClassDefineReservedUnused(IOTimerEventSource, 7);
 
-// 
-// 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
@@ -71,59 +66,22 @@
 {
     IOTimerEventSource *me = (IOTimerEventSource *) self;
 
-    if (me->enabled && me->action)
-    {
-        IOWorkLoop *
-        wl = me->workLoop;
-        if (wl)
-        {
-            Action doit;
-            wl->closeGate();
-            doit = (Action) me->action;
-            if (doit && me->enabled && AbsoluteTime_to_scalar(&me->abstime))
-            {
-                IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
-                                    (unsigned int) doit, (unsigned int) me->owner);
-                (*doit)(me->owner, me);
-            }
-            wl->openGate();
+    if (me->enabled) {
+        Action doit = (Action) me->action;
+
+        if (doit) {
+            IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
+                                (unsigned int) doit, (unsigned int) me->owner);
+            me->closeGate();
+            (*doit)(me->owner, me);
+            me->openGate();
         }
     }
 }
 
-void IOTimerEventSource::timeoutAndRelease(void * self, void * count)
-{
-    IOTimerEventSource *me = (IOTimerEventSource *) self;
-
-    if (me->enabled && me->action)
-    {
-        IOWorkLoop *
-        wl = me->reserved->workLoop;
-        if (wl)
-        {
-            Action doit;
-            wl->closeGate();
-            doit = (Action) me->action;
-            if (doit && (me->reserved->calloutGeneration == (SInt32) count))
-            {
-                IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
-                                    (unsigned int) doit, (unsigned int) me->owner);
-                (*doit)(me->owner, me);
-            }
-            wl->openGate();
-        }
-    }
-
-    me->reserved->workLoop->release();
-    me->release();
-}
-
 void IOTimerEventSource::setTimeoutFunc()
 {
-    // reserved != 0 means IOTimerEventSource::timeoutAndRelease is being used,
-    // not a subclassed implementation
-    reserved = IONew(ExpansionData, 1);
-    calloutEntry = (void *) thread_call_allocate((thread_call_func_t) &IOTimerEventSource::timeoutAndRelease,
+    calloutEntry = (void *) thread_call_allocate((thread_call_func_t) timeout,
                                                  (thread_call_param_t) this);
 }
 
@@ -145,7 +103,7 @@
     IOTimerEventSource *me = new IOTimerEventSource;
 
     if (me && !me->init(inOwner, inAction)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -159,23 +117,13 @@
         thread_call_free((thread_call_t) calloutEntry);    
     }
 
-    if (reserved)
-        IODelete(reserved, ExpansionData, 1);
-
     super::free();
 }
 
 void IOTimerEventSource::cancelTimeout()
 {
-    if (reserved)
-        reserved->calloutGeneration++;
-    bool active = thread_call_cancel((thread_call_t) calloutEntry);
+    thread_call_cancel((thread_call_t) calloutEntry);
     AbsoluteTime_to_scalar(&abstime) = 0;
-    if (active && reserved)
-    {
-        release();
-        workLoop->release();
-    }
 }
 
 void IOTimerEventSource::enable()
@@ -187,20 +135,13 @@
 
 void IOTimerEventSource::disable()
 {
-    if (reserved)
-        reserved->calloutGeneration++;
-    bool active = thread_call_cancel((thread_call_t) calloutEntry);
+    thread_call_cancel((thread_call_t) calloutEntry);
     super::disable();
-    if (active && reserved)
-    {
-        release();
-        workLoop->release();
-    }
 }
 
 IOReturn IOTimerEventSource::setTimeoutTicks(UInt32 ticks)
 {
-    return setTimeout(ticks, kTickScale);
+    return setTimeout(ticks, NSEC_PER_SEC/hz);
 }
 
 IOReturn IOTimerEventSource::setTimeoutMS(UInt32 ms)
@@ -246,7 +187,7 @@
 
 IOReturn IOTimerEventSource::wakeAtTimeTicks(UInt32 ticks)
 {
-    return wakeAtTime(ticks, kTickScale);
+    return wakeAtTime(ticks, NSEC_PER_SEC/hz);
 }
 
 IOReturn IOTimerEventSource::wakeAtTimeMS(UInt32 ms)
@@ -259,32 +200,25 @@
     return wakeAtTime(us, kMicrosecondScale);
 }
 
-IOReturn IOTimerEventSource::wakeAtTime(UInt32 inAbstime, UInt32 scale_factor)
+IOReturn IOTimerEventSource::wakeAtTime(UInt32 abstime, UInt32 scale_factor)
 {
     AbsoluteTime end;
-    clock_interval_to_absolutetime_interval(inAbstime, scale_factor, &end);
-
-    return wakeAtTime(end);
-}
-
-IOReturn IOTimerEventSource::wakeAtTime(mach_timespec_t inAbstime)
+    clock_interval_to_absolutetime_interval(abstime, scale_factor, &end);
+
+    return wakeAtTime(end);
+}
+
+IOReturn IOTimerEventSource::wakeAtTime(mach_timespec_t abstime)
 {
     AbsoluteTime end, nsecs;
 
     clock_interval_to_absolutetime_interval
-        (inAbstime.tv_nsec, kNanosecondScale, &nsecs);
+        (abstime.tv_nsec, kNanosecondScale, &nsecs);
     clock_interval_to_absolutetime_interval
-        (inAbstime.tv_sec, kSecondScale, &end);
+        (abstime.tv_sec, kSecondScale, &end);
     ADD_ABSOLUTETIME(&end, &nsecs);
 
     return wakeAtTime(end);
-}
-
-void IOTimerEventSource::setWorkLoop(IOWorkLoop *inWorkLoop)
-{
-    super::setWorkLoop(inWorkLoop);
-    if ( enabled && AbsoluteTime_to_scalar(&abstime) && workLoop )
-        wakeAtTime(abstime);
 }
 
 IOReturn IOTimerEventSource::wakeAtTime(AbsoluteTime inAbstime)
@@ -293,24 +227,8 @@
         return kIOReturnNoResources;
 
     abstime = inAbstime;
-    if ( enabled && AbsoluteTime_to_scalar(&abstime) && workLoop )
-    {
-        if (reserved)
-        {
-            retain();
-            workLoop->retain();
-            reserved->workLoop = workLoop;
-            reserved->calloutGeneration++;
-            if (thread_call_enter1_delayed((thread_call_t) calloutEntry, 
-                    (void *) reserved->calloutGeneration, abstime))
-            {
-                release();
-                workLoop->release();
-            }
-        }
-        else
-            thread_call_enter_delayed((thread_call_t) calloutEntry, abstime);
-    }
+    if ( enabled && AbsoluteTime_to_scalar(&abstime) )
+        thread_call_enter_delayed((thread_call_t) calloutEntry, abstime);
 
     return kIOReturnSuccess;
 }