X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..935ed37a5c468c8a1c07408573c08b8b7ef80e8b:/pexpert/gen/device_tree.c

diff --git a/pexpert/gen/device_tree.c b/pexpert/gen/device_tree.c
index ab3a1a1f5..0ea525699 100644
--- a/pexpert/gen/device_tree.c
+++ b/pexpert/gen/device_tree.c
@@ -39,9 +39,6 @@
 #include <kern/kalloc.h>
 
 #include <sys/types.h>
-#ifdef i386
-#include <i386/fakePPCStructs.h>
-#endif
 
 #ifndef NULL
 #define       NULL    ((void *) 0)
@@ -79,8 +76,6 @@ typedef struct OpaqueDTPropertyIterator {
 static int DTInitialized;
 static RealDTEntry DTRootNode;
 
-void DTInit(void *base);
-
 /*
  * Support Routines
  */
@@ -88,7 +83,7 @@ static RealDTEntry
 skipProperties(RealDTEntry entry)
 {
 	DeviceTreeNodeProperty *prop;
-	int k;
+	unsigned int k;
 
 	if (entry == NULL || entry->nProperties == 0) {
 		return NULL;
@@ -105,7 +100,7 @@ static RealDTEntry
 skipTree(RealDTEntry root)
 {
 	RealDTEntry entry;
-	int k;
+	unsigned int k;
 
 	entry = skipProperties(root);
 	if (entry == NULL) {
@@ -148,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;
@@ -206,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);
@@ -218,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);
@@ -404,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;