--- xnu/xnu-792.25.20/iokit/Kernel/IOEventSource.cpp
+++ xnu/xnu-4903.221.2/iokit/Kernel/IOEventSource.cpp
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2000, 2009 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * 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.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @APPLE_OSREFERENCE_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.
+ * 
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
 Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.
@@ -30,10 +36,12 @@
 
 #include <IOKit/IOEventSource.h>
 #include <IOKit/IOWorkLoop.h>
+#include <libkern/Block.h>
 
 #define super OSObject
 
 OSDefineMetaClassAndAbstractStructors(IOEventSource, OSObject)
+
 OSMetaClassDefineReservedUnused(IOEventSource, 0);
 OSMetaClassDefineReservedUnused(IOEventSource, 1);
 OSMetaClassDefineReservedUnused(IOEventSource, 2);
@@ -43,15 +51,88 @@
 OSMetaClassDefineReservedUnused(IOEventSource, 6);
 OSMetaClassDefineReservedUnused(IOEventSource, 7);
 
+bool IOEventSource::checkForWork() { return false; }
+
 /* inline function implementations */
-void IOEventSource::signalWorkAvailable()	{ workLoop->signalWorkAvailable(); }
-void IOEventSource::openGate()			{ workLoop->openGate(); }
-void IOEventSource::closeGate()			{ workLoop->closeGate(); }
-bool IOEventSource::tryCloseGate()		{ return workLoop->tryCloseGate(); }
+
+#if IOKITSTATS
+
+#define IOStatisticsRegisterCounter() \
+do { \
+	reserved->counter = IOStatistics::registerEventSource(inOwner); \
+} while (0)
+
+#define IOStatisticsUnregisterCounter() \
+do { \
+	if (reserved) \
+		IOStatistics::unregisterEventSource(reserved->counter); \
+} while (0)
+
+#define IOStatisticsOpenGate() \
+do { \
+	IOStatistics::countOpenGate(reserved->counter); \
+} while (0)
+
+#define IOStatisticsCloseGate() \
+do { \
+	IOStatistics::countCloseGate(reserved->counter); \
+} while (0)
+
+#else
+
+#define IOStatisticsRegisterCounter()
+#define IOStatisticsUnregisterCounter()
+#define IOStatisticsOpenGate()
+#define IOStatisticsCloseGate()
+
+#endif /* IOKITSTATS */
+
+void IOEventSource::signalWorkAvailable() 
+{ 
+	workLoop->signalWorkAvailable(); 
+}
+
+void IOEventSource::openGate() 
+{ 
+	IOStatisticsOpenGate();
+	workLoop->openGate(); 
+}
+
+void IOEventSource::closeGate()	
+{ 
+	workLoop->closeGate(); 
+	IOStatisticsCloseGate(); 
+}
+
+bool IOEventSource::tryCloseGate() 
+{ 
+	bool res; 
+	if ((res = workLoop->tryCloseGate())) {
+		IOStatisticsCloseGate(); 
+	}
+	return res; 
+}
+
 int IOEventSource::sleepGate(void *event, UInt32 type)
-        { return workLoop->sleepGate(event, type); }
-void IOEventSource::wakeupGate(void *event, bool oneThread)
-        { workLoop->wakeupGate(event, oneThread); }
+{ 
+	int res; 
+	IOStatisticsOpenGate(); 
+	res = workLoop->sleepGate(event, type); 
+	IOStatisticsCloseGate(); 
+	return res; 
+}
+
+int IOEventSource::sleepGate(void *event, AbsoluteTime deadline, UInt32 type)
+{ 
+	int res; 
+	IOStatisticsOpenGate(); 
+	res = workLoop->sleepGate(event, deadline, type);
+	IOStatisticsCloseGate(); 
+	return res; 
+}
+  
+void IOEventSource::wakeupGate(void *event, bool oneThread) { workLoop->wakeupGate(event, oneThread); }
+
 
 bool IOEventSource::init(OSObject *inOwner,
                          Action inAction)
@@ -67,14 +148,63 @@
     (void) setAction(inAction);
     enabled = true;
 
+    if(!reserved) {
+        reserved = IONew(ExpansionData, 1);
+        if (!reserved) {
+            return false;
+        }
+    }
+
+    IOStatisticsRegisterCounter();
+		
     return true;
 }
 
-IOEventSource::Action IOEventSource::getAction () const { return action; };
+void IOEventSource::free( void )
+{
+    IOStatisticsUnregisterCounter();
+
+	if ((kActionBlock & flags) && actionBlock) Block_release(actionBlock);
+	
+    if (reserved)
+		IODelete(reserved, ExpansionData, 1);
+
+    super::free();
+}
+
+void IOEventSource::setRefcon(void *newrefcon)
+{
+	refcon = newrefcon;
+}
+
+void * IOEventSource::getRefcon() const
+{
+	return refcon;
+}
+
+IOEventSource::Action IOEventSource::getAction() const
+{
+	if (kActionBlock & flags) return NULL;
+	return (action);
+}
+
+IOEventSource::ActionBlock IOEventSource::getActionBlock(ActionBlock) const
+{
+	if (kActionBlock & flags) return actionBlock;
+	return (NULL);
+}
 
 void IOEventSource::setAction(Action inAction)
 {
+	if ((kActionBlock & flags) && actionBlock) Block_release(actionBlock);
     action = inAction;
+}
+
+void IOEventSource::setActionBlock(ActionBlock block)
+{
+	if ((kActionBlock & flags) && actionBlock) Block_release(actionBlock);
+	actionBlock = Block_copy(block);
+	flags |= kActionBlock;
 }
 
 IOEventSource *IOEventSource::getNext() const { return eventChainNext; };