xnu-1228.7.58.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..0ea5256993aaf65163a1eb99a659271109dd38d1 100644 (file)
--- a/pexpert/gen/device_tree.c
+++ b/pexpert/gen/device_tree.c
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-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@
  */
 /*
  * @OSF_FREE_COPYRIGHT@
@@ -26,11 +32,13 @@
 #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>
-#endif
 
 #ifndef NULL
 #define       NULL    ((void *) 0)
@@ -68,8 +76,6 @@ typedef struct OpaqueDTPropertyIterator {
 static int DTInitialized;
 static RealDTEntry DTRootNode;
 
-void DTInit(void *base);
-
 /*
  * Support Routines
  */
@@ -77,7 +83,7 @@ static RealDTEntry
 skipProperties(RealDTEntry entry)
 {
        DeviceTreeNodeProperty *prop;
-       int k;
+       unsigned int k;
 
        if (entry == NULL || entry->nProperties == 0) {
                return NULL;
@@ -94,7 +100,7 @@ static RealDTEntry
 skipTree(RealDTEntry root)
 {
        RealDTEntry entry;
-       int k;
+       unsigned int k;
 
        entry = skipProperties(root);
        if (entry == NULL) {
@@ -137,8 +143,8 @@ FindChild(RealDTEntry cur, char *buf)
 {
        RealDTEntry     child;
        unsigned long   index;
-       char *          str;
-       int             dummy;
+       char *                  str;
+       unsigned int    dummy;
 
        if (cur->nChildren == 0) {
                return NULL;
@@ -195,7 +201,7 @@ int DTFindEntry(const char *propName, const char *propValue, DTEntry *entryH)
 int find_entry(const char *propName, const char *propValue, DTEntry *entryH)
 {
        DeviceTreeNode *nodeP = (DeviceTreeNode *) startingP;
-       int k;
+       unsigned int k;
 
        if (nodeP->nProperties == 0) return(kError);    // End of the list of nodes
        startingP = (char *) (nodeP + 1);
@@ -207,7 +213,7 @@ int find_entry(const char *propName, const char *propValue, DTEntry *entryH)
                startingP += sizeof (*propP) + ((propP->length + 3) & -4);
 
                if (strcmp (propP->name, propName) == 0) {
-                       if (strcmp( (char *)(propP + 1), propValue) == 0)
+                       if (propValue == NULL || strcmp( (char *)(propP + 1), propValue) == 0)
                        {
                                *entryH = (DTEntry)nodeP;
                                return(kSuccess);
@@ -299,9 +305,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 +350,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;
 }
@@ -393,10 +399,10 @@ DTRestartEntryIteration(DTEntryIterator iterator)
 }
 
 int
-DTGetProperty(const DTEntry entry, const char *propertyName, void **propertyValue, int *propertySize)
+DTGetProperty(const DTEntry entry, const char *propertyName, void **propertyValue, unsigned int *propertySize)
 {
        DeviceTreeNodeProperty *prop;
-       int k;
+       unsigned int k;
 
        if (entry == NULL || entry->nProperties == 0) {
                return kError;
@@ -432,7 +438,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;
 }