xnu-1504.7.4.tar.gz

[apple/xnu.git] / iokit / Kernel / IOCommandQueue.cpp

diff --git a/iokit/Kernel/IOCommandQueue.cpp b/iokit/Kernel/IOCommandQueue.cpp
index e5439a5427bb0c095a44153b4aaf49456fc1cfed..e2cd65b4e601725a80a0a2248c820a78d9b1c673 100644 (file)
--- a/iokit/Kernel/IOCommandQueue.cpp
+++ b/iokit/Kernel/IOCommandQueue.cpp
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 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_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
 Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.
@@ -26,12 +32,16 @@ HISTORY
     1998-7-13  Godfrey van der Linden(gvdl)
         Created.
 ]*/
+
+#if !defined(__LP64__)
+
 #include <IOKit/IOCommandQueue.h>
 #include <IOKit/IOWorkLoop.h>
 #include <IOKit/IOTimeStamp.h>
 
 #include <mach/sync_policy.h>
 
+
 #define NUM_FIELDS_IN_COMMAND  4
 typedef struct commandEntryTag {
     void *f[NUM_FIELDS_IN_COMMAND];
@@ -111,7 +121,7 @@ Returns nil.
 void IOCommandQueue::free()
 {
     if (queue)
-        kfree((vm_offset_t)queue, size * sizeof(commandEntryT));
+        kfree(queue, size * sizeof(commandEntryT));
     if (producerSema)
         semaphore_destroy(kernel_task, producerSema);
     if (producerLock)
@@ -144,7 +154,7 @@ bool IOCommandQueue::checkForWork()
         consumerIndex = 0;
 
     IOTimeStampConstant(IODBG_CMDQ(IOCMDQ_ACTION),
-                       (unsigned int) action, (unsigned int) owner);
+                       (uintptr_t) action, (uintptr_t) owner);
 
     (*(IOCommandQueueAction) action)(owner, field0, field1, field2, field3);
 
@@ -266,3 +276,5 @@ int IOCommandQueue::performAndFlush(OSObject *target,
 
     return numEntries;
 }
+
+#endif /* !defined(__LP64__) */