xnu-792.13.8.tar.gz

[apple/xnu.git] / pexpert / gen / device_tree.c

diff --git a/pexpert/gen/device_tree.c b/pexpert/gen/device_tree.c
index a26878559dfa3810a7ece9aecabb89153810e018..e872931767ad79c3741e60e773b630d1e87c8f01 100644 (file)
--- a/pexpert/gen/device_tree.c
+++ b/pexpert/gen/device_tree.c
@@ -1,23 +1,31 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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
- * 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@
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /*
  * @OSF_FREE_COPYRIGHT@
@@ -26,7 +34,12 @@
 #include <pexpert/protos.h>
 #include <pexpert/boot.h>
 #include <pexpert/device_tree.h>
+
+#include <mach/mach_types.h>
 #include <mach/machine/vm_types.h>
+#include <kern/kern_types.h>
+#include <kern/kalloc.h>
+
 #include <sys/types.h>
 #ifdef i386
 #include <i386/fakePPCStructs.h>
@@ -299,9 +312,9 @@ DTDisposeEntryIterator(DTEntryIterator iterator)
 
        while ((scope = iter->savedScope) != NULL) {
                iter->savedScope = scope->nextScope;
-               kfree((vm_offset_t) scope, sizeof(struct DTSavedScope));
+               kfree(scope, sizeof(struct DTSavedScope));
        }
-       kfree((vm_offset_t) iterator, sizeof(struct OpaqueDTEntryIterator));
+       kfree(iterator, sizeof(struct OpaqueDTEntryIterator));
        return kSuccess;
 }
 
@@ -344,7 +357,7 @@ DTExitEntry(DTEntryIterator iterator, DTEntry *currentPosition)
        iter->currentIndex = newScope->index;
        *currentPosition = iter->currentEntry;
 
-       kfree((vm_offset_t) newScope, sizeof(struct DTSavedScope));
+       kfree(newScope, sizeof(struct DTSavedScope));
 
        return kSuccess;
 }
@@ -432,7 +445,7 @@ DTCreatePropertyIterator(const DTEntry entry, DTPropertyIterator *iterator)
 int
 DTDisposePropertyIterator(DTPropertyIterator iterator)
 {
-       kfree((vm_offset_t)iterator, sizeof(struct OpaqueDTPropertyIterator));
+       kfree(iterator, sizeof(struct OpaqueDTPropertyIterator));
        return kSuccess;
 }