Loading...
--- xnu/xnu-1228.3.13/iokit/Kernel/IODeviceTreeSupport.cpp
+++ xnu/xnu-792.6.22/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -1,29 +1,23 @@
/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_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. 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.
+ * 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.
*
- * 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
#include <IOKit/IODeviceTreeSupport.h>
@@ -94,7 +88,7 @@
OSObject * obj;
OSDictionary * allInts;
vm_offset_t * dtMap;
- unsigned int propSize;
+ int propSize;
bool intMap;
bool freeDT;
@@ -144,7 +138,7 @@
freeDT = (kSuccess == DTLookupEntry( 0, "/chosen/memory-map", &mapEntry ))
&& (kSuccess == DTGetProperty( mapEntry,
"DeviceTree", (void **) &dtMap, &propSize ))
- && ((2 * sizeof(vm_offset_t)) == propSize);
+ && ((2 * sizeof( vm_offset_t)) == propSize);
parent = MakeReferenceTable( (DTEntry)dtTop, freeDT );
@@ -222,7 +216,7 @@
if( (obj = child->getProperty( "driver,AAPL,MacOS,PowerPC"))) {
if( (0 == (prop = (OSData *)child->getProperty( gIODTTypeKey )))
- || (strncmp("display", (char *)prop->getBytesNoCopy(), sizeof("display"))) ) {
+ || (strcmp( "display", (char *) prop->getBytesNoCopy())) ) {
child->removeProperty( "driver,AAPL,MacOS,PowerPC");
}
}
@@ -308,11 +302,7 @@
{
vm_offset_t virt;
-#if defined (__i386__)
- virt = ml_boot_ptovirt( range[0] );
-#else
virt = ml_static_ptovirt( range[0] );
-#endif
if( virt) {
ml_static_mfree( virt, range[1] );
}
@@ -328,7 +318,7 @@
const OSSymbol *sym;
DTPropertyIterator dtIter;
void *prop;
- unsigned int propSize;
+ int propSize;
char *name;
char location[ 32 ];
bool noLocation = true;
@@ -373,17 +363,17 @@
} else if( nameKey == gIODTUnitKey ) {
// all OF strings are null terminated... except this one
- if( propSize >= (int) sizeof(location))
- propSize = sizeof(location) - 1;
+ if( propSize >= (int) sizeof( location))
+ propSize = sizeof( location) - 1;
strncpy( location, (const char *) prop, propSize );
location[ propSize ] = 0;
regEntry->setLocation( location );
propTable->removeObject( gIODTUnitKey );
noLocation = false;
- } else if(noLocation && (!strncmp(name, "reg", sizeof("reg")))) {
+ } else if( noLocation && (0 == strcmp( name, "reg"))) {
// default location - override later
- snprintf(location, sizeof(location), "%lX", *((UInt32 *) prop));
+ sprintf( location, "%lX", *((UInt32 *) prop) );
regEntry->setLocation( location );
}
}
@@ -435,21 +425,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;
@@ -468,7 +452,7 @@
assert( ok );
if( ok) {
- snprintf(buf, sizeof(buf), "IOInterruptController%08lX", phandle);
+ sprintf( buf, "IOInterruptController%08lX", phandle);
sym = OSSymbol::withCString( buf );
} else
sym = 0;
@@ -487,8 +471,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,12 +484,12 @@
UInt32 i, original_icells;
bool cmp, ok = false;
- parent = IODTFindInterruptParent( regEntry, index );
+ parent = IODTFindInterruptParent( regEntry );
IODTGetICellCounts( parent, &icells, &acells );
addrCmp = 0;
if( acells) {
data = OSDynamicCast( OSData, regEntry->getProperty( "reg" ));
- if( data && (data->getLength() >= (acells * sizeof(UInt32))))
+ if( data && (data->getLength() >= (acells * sizeof( UInt32))))
addrCmp = (UInt32 *) data->getBytesNoCopy();
}
original_icells = icells;
@@ -526,7 +510,7 @@
// found a controller - don't want to follow cascaded controllers
parent = 0;
*spec = OSData::withBytesNoCopy( (void *) intSpec,
- icells * sizeof(UInt32));
+ icells * sizeof( UInt32));
*controller = IODTInterruptControllerName( regEntry );
ok = (*spec && *controller);
} else if( parent && (data = OSDynamicCast( OSData,
@@ -535,7 +519,7 @@
map = (UInt32 *) data->getBytesNoCopy();
endMap = map + (data->getLength() / sizeof(UInt32));
data = OSDynamicCast( OSData, regEntry->getProperty( "interrupt-map-mask" ));
- if( data && (data->getLength() >= ((acells + icells) * sizeof(UInt32))))
+ if( data && (data->getLength() >= ((acells + icells) * sizeof( UInt32))))
maskCmp = (UInt32 *) data->getBytesNoCopy();
else
maskCmp = 0;
@@ -646,12 +630,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;
@@ -672,8 +655,7 @@
}
localBits = (UInt32 *) local->getBytesNoCopy();
- localEnd = localBits + (local->getLength() / sizeof(UInt32));
- index = 0;
+ localEnd = localBits + (local->getLength() / sizeof( UInt32));
mapped = OSArray::withCapacity( 1 );
controllers = OSArray::withCapacity( 1 );
@@ -681,20 +663,19 @@
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());
break;
}
} else {
- map = OSData::withData( local, mapped->getCount() * sizeof(UInt32),
- sizeof(UInt32));
+ map = OSData::withData( local, mapped->getCount() * sizeof( UInt32),
+ sizeof( UInt32));
controller = gIODTDefaultInterruptController;
controller->retain();
}
- index++;
localBits += skip;
mapped->setObject( map );
controllers->setObject( controller );
@@ -916,7 +897,7 @@
persist.compareFunc = compareFunc;
persist.locationFunc = locationFunc;
- prop = OSData::withBytes( &persist, sizeof(persist));
+ prop = OSData::withBytes( &persist, sizeof( persist));
if( !prop)
return;
@@ -965,7 +946,7 @@
UInt32 *startRange;
UInt32 *endRanges;
bool ok = true;
- SInt32 diff, diff2, endDiff;
+ SInt32 diff, endDiff;
IODTPersistent *persist;
IODTCompareAddressCellFunc compare;
@@ -973,7 +954,7 @@
IODTGetCellCounts( regEntry, &childSizeCells, &childAddressCells );
childCells = childAddressCells + childSizeCells;
- bcopy( cellsIn, cell, sizeof(UInt32) * childCells );
+ bcopy( cellsIn, cell, 4 * childCells );
if( childSizeCells > 1)
*len = IOPhysical32( cellsIn[ childAddressCells ],
cellsIn[ childAddressCells + 1 ] );
@@ -996,7 +977,7 @@
// search
startRange = (UInt32 *) prop->getBytesNoCopy();
range = startRange;
- endRanges = range + (length / sizeof(UInt32));
+ endRanges = range + (length / 4);
prop = (OSData *) regEntry->getProperty( gIODTPersistKey );
if( prop) {
@@ -1009,14 +990,9 @@
range < endRanges;
range += (childCells + addressCells) ) {
- // is cell start within range?
+ // is cell start >= range start?
diff = (*compare)( childAddressCells, cell, range );
-
- bcopy(range, endCell, childAddressCells * sizeof(UInt32));
- endCell[childAddressCells - 1] += range[childCells + addressCells - 1];
- diff2 = (*compare)( childAddressCells, cell, endCell );
-
- if ((diff < 0) || (diff2 >= 0))
+ if( diff < 0)
continue;
ok = (0 == cell[childCells - 1]);
@@ -1049,8 +1025,8 @@
}
// Get the physical start of the range from our parent
- bcopy( range + childAddressCells, cell, sizeof(UInt32) * addressCells );
- bzero( cell + addressCells, sizeof(UInt32) * sizeCells );
+ bcopy( range + childAddressCells, cell, 4 * addressCells );
+ bzero( cell + addressCells, 4 * sizeCells );
} /* else zero length range => pass thru to parent */