--- xnu/xnu-1228.3.13/iokit/Kernel/IODeviceTreeSupport.cpp
+++ xnu/xnu-1228/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -435,21 +435,15 @@
         return( false );
 }
 
-static IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry, IOItemCount index )
+IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry )
 {
     IORegistryEntry *	parent;
     UInt32		phandle;
-    OSData	    *	data;
-    unsigned int	len;
-
-    if( (data = OSDynamicCast( OSData, regEntry->getProperty( gIODTInterruptParentKey )))
-      && (sizeof(UInt32) <= (len = data->getLength()))) {
-	if (((index + 1) * sizeof(UInt32)) > len)
-	    index = 0;
-	phandle = ((UInt32 *) data->getBytesNoCopy())[index];
-	parent = FindPHandle( phandle );
-
-    } else if( 0 == regEntry->getProperty( "interrupt-controller"))
+
+    if( GetUInt32( regEntry, gIODTInterruptParentKey, &phandle))
+        parent = FindPHandle( phandle );
+
+    else if( 0 == regEntry->getProperty( "interrupt-controller"))
         parent = regEntry->getParentEntry( gIODTPlane);
     else
         parent = 0;
@@ -487,8 +481,8 @@
         *aCellCount = 0;
 }
 
-static UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec, UInt32 index,
-				    OSData ** spec, const OSSymbol ** controller )
+UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec,
+				OSData ** spec, const OSSymbol ** controller )
 {
     IORegistryEntry *parent = 0;
     OSData			*data;
@@ -500,7 +494,7 @@
     UInt32			i, original_icells;
     bool			cmp, ok = false;
 
-    parent = IODTFindInterruptParent( regEntry, index );    
+    parent = IODTFindInterruptParent( regEntry );    
     IODTGetICellCounts( parent, &icells, &acells );
     addrCmp = 0;
     if( acells) {
@@ -646,12 +640,11 @@
     OSData *		local2;
     UInt32 *		localBits;
     UInt32 *		localEnd;
-    IOItemCount		index;
     OSData * 		map;
     OSObject *		oneMap;
     OSArray *		mapped;
     OSArray *		controllerInts;
-    const OSSymbol *	controller = 0;
+    const OSSymbol *	controller;
     OSArray *		controllers;
     UInt32		skip = 1;
     bool		ok, nw;
@@ -673,7 +666,6 @@
 
     localBits = (UInt32 *) local->getBytesNoCopy();
     localEnd = localBits + (local->getLength() / sizeof(UInt32));
-    index = 0;
     mapped = OSArray::withCapacity( 1 );
     controllers = OSArray::withCapacity( 1 );
 
@@ -681,7 +673,7 @@
 
     if( ok) do {
         if( nw) {
-            skip = IODTMapOneInterrupt( regEntry, localBits, index, &map, &controller );
+            skip = IODTMapOneInterrupt( regEntry, localBits, &map, &controller );
             if( 0 == skip) {
                 IOLog("%s: error mapping interrupt[%d]\n",
                         regEntry->getName(), mapped->getCount());
@@ -694,7 +686,6 @@
             controller->retain();
         }
 
-	index++;
         localBits += skip;
         mapped->setObject( map );
         controllers->setObject( controller );