--- xnu/xnu-3248.30.4/iokit/Kernel/IOCommandQueue.cpp
+++ xnu/xnu-792/iokit/Kernel/IOCommandQueue.cpp
@@ -1,54 +1,36 @@
 /*
- * Copyright (c) 1998-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2004 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@
  */
-
-#if !defined(__LP64__)
-
+/*
+Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.
+
+HISTORY
+    1998-7-13	Godfrey van der Linden(gvdl)
+        Created.
+]*/
 #include <IOKit/IOCommandQueue.h>
 #include <IOKit/IOWorkLoop.h>
 #include <IOKit/IOTimeStamp.h>
-#include <IOKit/IOKitDebug.h>
 
 #include <mach/sync_policy.h>
-
-#if IOKITSTATS
-
-#define IOStatisticsInitializeCounter() \
-	IOStatistics::setCounterType(reserved->counter, kIOStatisticsCommandQueueCounter)
-
-#define IOStatisticsActionCall() \
-	IOStatistics::countCommandQueueActionCall(reserved->counter)
-
-#else
-
-#define IOStatisticsInitializeCounter()
-#define IOStatisticsActionCall()
-
-#endif /* IOKITSTATS */
 
 #define NUM_FIELDS_IN_COMMAND	4
 typedef struct commandEntryTag {
@@ -100,8 +82,6 @@
         return false;
 
     producerIndex = consumerIndex = 0;
-
-    IOStatisticsInitializeCounter();
 
     return true;
 }
@@ -146,8 +126,7 @@
 
 bool IOCommandQueue::checkForWork()
 {
-    void	*field0, *field1, *field2, *field3;
-	bool	trace = ( gIOKitTrace & kIOTraceCommandGates ) ? true : false;
+    void *field0, *field1, *field2, *field3;
 
     if (!enabled || consumerIndex == producerIndex)
         return false;
@@ -164,17 +143,11 @@
     if (++consumerIndex >= size)
         consumerIndex = 0;
 
-	if (trace)
-		IOTimeStampStartConstant(IODBG_CMDQ(IOCMDQ_ACTION),
-								 (uintptr_t) action, (uintptr_t) owner);
-	
-    IOStatisticsActionCall();
+    IOTimeStampConstant(IODBG_CMDQ(IOCMDQ_ACTION),
+			(unsigned int) action, (unsigned int) owner);
+
     (*(IOCommandQueueAction) action)(owner, field0, field1, field2, field3);
-	
-	if (trace)
-		IOTimeStampEndConstant(IODBG_CMDQ(IOCMDQ_ACTION),
-							   (uintptr_t) action, (uintptr_t) owner);
-	
+
     return (consumerIndex != producerIndex);
 }
 
@@ -293,5 +266,3 @@
 
     return numEntries;
 }
-
-#endif /* !defined(__LP64__) */