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 ab3a1a1f5e006e1b76373ccd2ed46e27e1d7570d..0ea5256993aaf65163a1eb99a659271109dd38d1 100644 (file)
--- a/pexpert/gen/device_tree.c
+++ b/pexpert/gen/device_tree.c
@@ -39,9 +39,6 @@
 #include <kern/kalloc.h>
 
 #include <sys/types.h>
 #include <kern/kalloc.h>
 
 #include <sys/types.h>

-#ifdef i386
-#include <i386/fakePPCStructs.h>
-#endif

 
 #ifndef NULL
 #define       NULL    ((void *) 0)
 
 #ifndef NULL
 #define       NULL    ((void *) 0)


@@ -79,8 +76,6 @@ typedef struct OpaqueDTPropertyIterator {
 static int DTInitialized;
 static RealDTEntry DTRootNode;
 
 static int DTInitialized;
 static RealDTEntry DTRootNode;
 

-void DTInit(void *base);
-

 /*
  * Support Routines
  */
 /*
  * Support Routines
  */


@@ -88,7 +83,7 @@ static RealDTEntry
 skipProperties(RealDTEntry entry)
 {
        DeviceTreeNodeProperty *prop;
 skipProperties(RealDTEntry entry)
 {
        DeviceTreeNodeProperty *prop;

-       int k;
+       unsigned int k;

 
        if (entry == NULL || entry->nProperties == 0) {
                return NULL;
 
        if (entry == NULL || entry->nProperties == 0) {
                return NULL;


@@ -105,7 +100,7 @@ static RealDTEntry
 skipTree(RealDTEntry root)
 {
        RealDTEntry entry;
 skipTree(RealDTEntry root)
 {
        RealDTEntry entry;

-       int k;
+       unsigned int k;

 
        entry = skipProperties(root);
        if (entry == NULL) {
 
        entry = skipProperties(root);
        if (entry == NULL) {


@@ -148,8 +143,8 @@ FindChild(RealDTEntry cur, char *buf)
 {
        RealDTEntry     child;
        unsigned long   index;
 {
        RealDTEntry     child;
        unsigned long   index;

-       char *          str;
-       int             dummy;
+       char *                  str;
+       unsigned int    dummy;

 
        if (cur->nChildren == 0) {
                return NULL;
 
        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 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);
 
        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) {
                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);
                        {
                                *entryH = (DTEntry)nodeP;
                                return(kSuccess);


@@ -404,10 +399,10 @@ DTRestartEntryIteration(DTEntryIterator iterator)
 }
 
 int
 }
 
 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;
 {
        DeviceTreeNodeProperty *prop;

-       int k;
+       unsigned int k;

 
        if (entry == NULL || entry->nProperties == 0) {
                return kError;
 
        if (entry == NULL || entry->nProperties == 0) {
                return kError;