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 6d1405a9da48618dd0fcccceae41a4e65851104d..0ea5256993aaf65163a1eb99a659271109dd38d1 100644 (file)
--- a/pexpert/gen/device_tree.c
+++ b/pexpert/gen/device_tree.c
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -18,7 +23,7 @@
  * 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@
@@ -34,9 +39,6 @@
 #include <kern/kalloc.h>
 
 #include <sys/types.h>
-#ifdef i386
-#include <i386/fakePPCStructs.h>
-#endif
 
 #ifndef NULL
 #define       NULL    ((void *) 0)
@@ -74,8 +76,6 @@ typedef struct OpaqueDTPropertyIterator {
 static int DTInitialized;
 static RealDTEntry DTRootNode;
 
-void DTInit(void *base);
-
 /*
  * Support Routines
  */
@@ -83,7 +83,7 @@ static RealDTEntry
 skipProperties(RealDTEntry entry)
 {
        DeviceTreeNodeProperty *prop;
-       int k;
+       unsigned int k;
 
        if (entry == NULL || entry->nProperties == 0) {
                return NULL;
@@ -100,7 +100,7 @@ static RealDTEntry
 skipTree(RealDTEntry root)
 {
        RealDTEntry entry;
-       int k;
+       unsigned int k;
 
        entry = skipProperties(root);
        if (entry == NULL) {
@@ -143,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;
@@ -201,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);
@@ -213,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);
@@ -399,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;