const OSSymbol * gIODTCompatibleKey;
const OSSymbol * gIODTTypeKey;
const OSSymbol * gIODTModelKey;
+const OSSymbol * gIODTTargetTypeKey;
const OSSymbol * gIODTSizeCellKey;
const OSSymbol * gIODTAddressCellKey;
gIODTCompatibleKey = OSSymbol::withCStringNoCopy( "compatible" );
gIODTTypeKey = OSSymbol::withCStringNoCopy( "device_type" );
gIODTModelKey = OSSymbol::withCStringNoCopy( "model" );
+ gIODTTargetTypeKey = OSSymbol::withCStringNoCopy( "target-type" );
gIODTSizeCellKey = OSSymbol::withCStringNoCopy( "#size-cells" );
gIODTAddressCellKey = OSSymbol::withCStringNoCopy( "#address-cells" );
gIODTRangeKey = OSSymbol::withCStringNoCopy( "ranges" );
propPtr = (unsigned int *)propObj->getBytesNoCopy();
if ( propPtr == 0 ) return -1;
- *infoAddr = (void *)propPtr[0] ;
- *infoSize = (int) propPtr[1];
+ *infoAddr = (void *)(uintptr_t) (propPtr[0]);
+ *infoSize = (int) (propPtr[1]);
return 0;
}
OSString *string;
const char *ckey;
UInt32 keyLen;
+ UInt32 nlen;
const char *names;
const char *lastName;
bool wild;
do {
// for each name in the property
+ nlen = strnlen(names, lastName - names);
if( wild)
- matched = (0 == strncmp( ckey, names, keyLen - 1 ));
+ matched = ((nlen >= (keyLen - 1)) && (0 == strncmp(ckey, names, keyLen - 1)));
else
- matched = (keyLen == strlen( names ))
- && (0 == strncmp( ckey, names, keyLen ));
+ matched = (keyLen == nlen) && (0 == strncmp(ckey, names, keyLen));
if( matched)
result = names;
- names = names + strlen( names) + 1;
+ names = names + nlen + 1;
} while( (names < lastName) && (false == matched));
}
cIter = OSCollectionIterator::withCollection( result);
- result->release();
+ if (result) result->release();
return( cIter);
}
return;
}
+#if defined(__arm__) || defined(__i386__) || defined(__x86_64__)
static SInt32 DefaultCompare( UInt32 cellCount, UInt32 left[], UInt32 right[] )
{
cellCount--;
return( left[ cellCount ] - right[ cellCount ] );
}
+#else
+#error Unknown architecture.
+#endif
+
+static void AddLengthToCells( UInt32 numCells, UInt32 *cells, UInt64 offset)
+{
+ if (numCells == 1)
+ {
+ cells[0] += (UInt32)offset;
+ }
+ else {
+ UInt64 sum = cells[numCells - 1] + offset;
+ cells[numCells - 1] = (UInt32)sum;
+ if (sum > UINT32_MAX) {
+ cells[numCells - 2] += (UInt32)(sum >> 32);
+ }
+ }
+}
+
+static IOPhysicalAddress CellsValue( UInt32 numCells, UInt32 *cells)
+{
+ if (numCells == 1) {
+ return IOPhysical32( 0, cells[0] );
+ } else {
+ return IOPhysical32( cells[numCells - 2], cells[numCells - 1] );
+ }
+}
void IODTGetCellCounts( IORegistryEntry * regEntry,
UInt32 * sizeCount, UInt32 * addressCount)
bool IODTResolveAddressCell( IORegistryEntry * regEntry,
UInt32 cellsIn[],
- IOPhysicalAddress * phys, IOPhysicalLength * len )
+ IOPhysicalAddress * phys, IOPhysicalLength * lenOut )
{
IORegistryEntry *parent;
OSData *prop;
// cells in addresses below regEntry
UInt32 childSizeCells, childAddressCells;
UInt32 childCells;
- UInt32 cell[ 8 ], length;
+ UInt32 cell[ 8 ], propLen;
UInt64 offset = 0;
UInt32 endCell[ 8 ];
UInt32 *range;
UInt32 *endRanges;
bool ok = true;
SInt64 diff, diff2, endDiff;
+ UInt64 len, rangeLen;
IODTPersistent *persist;
IODTCompareAddressCellFunc compare;
panic("IODTResolveAddressCell: Invalid device tree (%u,%u)", (uint32_t)childAddressCells, (uint32_t)childSizeCells);
bcopy( cellsIn, cell, sizeof(UInt32) * childCells );
- if( childSizeCells > 1)
- *len = IOPhysical32( cellsIn[ childAddressCells + 1],
- cellsIn[ childAddressCells] );
- else
- *len = IOPhysical32( 0, cellsIn[ childAddressCells ] );
+ *lenOut = CellsValue( childSizeCells, cellsIn + childAddressCells );
do
{
- prop = OSDynamicCast( OSData, regEntry->getProperty( gIODTRangeKey ));
- if( 0 == prop) {
+ prop = OSDynamicCast( OSData, regEntry->getProperty( gIODTRangeKey ));
+ if( 0 == prop) {
/* end of the road */
- if (childAddressCells == 2) {
- *phys = IOPhysical32( cell[ childAddressCells - 1 ], cell [ childAddressCells - 2 ]);
- } else {
- *phys = IOPhysical32( 0, cell[ childAddressCells - 1 ]);
- }
+ *phys = CellsValue( childAddressCells, cell );
*phys += offset;
- break;
- }
+ break;
+ }
- parent = regEntry->getParentEntry( gIODTPlane );
- IODTGetCellCounts( parent, &sizeCells, &addressCells );
-
- if( (length = prop->getLength())) {
- // search
- startRange = (UInt32 *) prop->getBytesNoCopy();
- range = startRange;
- endRanges = range + (length / sizeof(UInt32));
-
- prop = (OSData *) regEntry->getProperty( gIODTPersistKey );
- if( prop) {
- persist = (IODTPersistent *) prop->getBytesNoCopy();
- compare = persist->compareFunc;
- } else if (addressCells == childAddressCells) {
- compare = DefaultCompare;
- } else {
- panic("There is no mixed comparison function yet...");
- }
+ parent = regEntry->getParentEntry( gIODTPlane );
+ IODTGetCellCounts( parent, &sizeCells, &addressCells );
+
+ if( (propLen = prop->getLength())) {
+ // search
+ startRange = (UInt32 *) prop->getBytesNoCopy();
+ range = startRange;
+ endRanges = range + (propLen / sizeof(UInt32));
+
+ prop = (OSData *) regEntry->getProperty( gIODTPersistKey );
+ if( prop) {
+ persist = (IODTPersistent *) prop->getBytesNoCopy();
+ compare = persist->compareFunc;
+ } else if (addressCells == childAddressCells) {
+ compare = DefaultCompare;
+ } else {
+ panic("There is no mixed comparison function yet...");
+ }
- for( ok = false;
- range < endRanges;
- range += (childCells + addressCells) ) {
-
- // is cell start within range?
- diff = (*compare)( childAddressCells, cell, range );
-
- if (childAddressCells > sizeof(endCell)/sizeof(endCell[0]))
- panic("IODTResolveAddressCell: Invalid device tree (%u)", (uint32_t)childAddressCells);
-
- bcopy(range, endCell, childAddressCells * sizeof(UInt32));
-
- if (childAddressCells == 2) {
- uint64_t sum = endCell[childAddressCells - 2] + IOPhysical32(range[childCells + addressCells - 1], range[childCells + addressCells - 2]);
- endCell[childAddressCells - 2] = (uint32_t)(sum & 0x00000000FFFFFFFFULL);
- if (sum > UINT32_MAX) {
- endCell[childAddressCells - 1] += (uint32_t)((sum & 0xFFFFFFFF00000000ULL) >> 32);
- }
- } else {
- endCell[childAddressCells - 1] += range[childCells + addressCells - 1];
- }
-
- diff2 = (*compare)( childAddressCells, cell, endCell );
-
- if ((diff < 0) || (diff2 >= 0))
- continue;
-
- ok = (0 == cell[childCells - 1]);
- if (!ok)
- {
- // search for cell end
- bcopy(cell, endCell, childAddressCells * sizeof(UInt32));
-
- if (childSizeCells == 2) {
- uint64_t sum;
- sum = endCell[childAddressCells - 2] + IOPhysical32(cell[childCells - 1], cell[childCells - 2]) - 1;
- endCell[childAddressCells - 2] = (uint32_t)(sum & 0x00000000FFFFFFFFULL);
- if (sum > UINT32_MAX) {
- endCell[childAddressCells - 1] += (uint32_t)((sum & 0xFFFFFFFF00000000ULL) >> 32);
- }
- } else {
- endCell[childAddressCells - 1] += cell[childCells - 1] - 1;
- }
- lookRange = startRange;
- for( ;
- lookRange < endRanges;
- lookRange += (childCells + addressCells) )
- {
- // is cell >= range start?
- endDiff = (*compare)( childAddressCells, endCell, lookRange );
- if( endDiff < 0)
- continue;
- if ((endDiff - cell[childCells - 1] + 1 + lookRange[childAddressCells + addressCells - 1])
- == (diff + range[childAddressCells + addressCells - 1]))
- {
- ok = true;
- break;
- }
- }
- if (!ok)
- continue;
- }
- offset += diff;
- break;
- }
+ for( ok = false;
+ range < endRanges;
+ range += (childCells + addressCells) ) {
+
+ // is cell start within range?
+ diff = (*compare)( childAddressCells, cell, range );
+
+ if (childAddressCells > sizeof(endCell)/sizeof(endCell[0]))
+ panic("IODTResolveAddressCell: Invalid device tree (%u)", (uint32_t)childAddressCells);
+
+ bcopy(range, endCell, childAddressCells * sizeof(UInt32));
+
+ rangeLen = CellsValue(childSizeCells, range + childAddressCells + addressCells);
+ AddLengthToCells(childAddressCells, endCell, rangeLen);
+
+ diff2 = (*compare)( childAddressCells, cell, endCell );
+
+ // if start of cell < start of range, or end of range >= start of cell, skip
+ if ((diff < 0) || (diff2 >= 0))
+ continue;
+
+ len = CellsValue(childSizeCells, cell + childAddressCells);
+ ok = (0 == len);
+
+ if (!ok)
+ {
+ // search for cell end
+ bcopy(cell, endCell, childAddressCells * sizeof(UInt32));
+
+ AddLengthToCells(childAddressCells, endCell, len - 1);
+
+ for( lookRange = startRange;
+ lookRange < endRanges;
+ lookRange += (childCells + addressCells) )
+ {
+ // make sure end of cell >= range start
+ endDiff = (*compare)( childAddressCells, endCell, lookRange );
+ if( endDiff < 0)
+ continue;
+
+ UInt64 rangeStart = CellsValue(addressCells, range + childAddressCells);
+ UInt64 lookRangeStart = CellsValue(addressCells, lookRange + childAddressCells);
+ if ((endDiff - len + 1 + lookRangeStart) == (diff + rangeStart))
+ {
+ ok = true;
+ break;
+ }
+ }
+ if (!ok)
+ continue;
+ }
+ offset += diff;
+ break;
+ }
- if (addressCells + sizeCells > sizeof(cell)/sizeof(cell[0]))
- panic("IODTResolveAddressCell: Invalid device tree (%u, %u)", (uint32_t)addressCells, (uint32_t)sizeCells);
+ if (addressCells + sizeCells > sizeof(cell)/sizeof(cell[0]))
+ panic("IODTResolveAddressCell: Invalid device tree (%u, %u)", (uint32_t)addressCells, (uint32_t)sizeCells);
- // Get the physical start of the range from our parent
- bcopy( range + childAddressCells, cell, sizeof(UInt32) * addressCells );
- bzero( cell + addressCells, sizeof(UInt32) * sizeCells );
+ // Get the physical start of the range from our parent
+ bcopy( range + childAddressCells, cell, sizeof(UInt32) * addressCells );
+ bzero( cell + addressCells, sizeof(UInt32) * sizeCells );
- } /* else zero length range => pass thru to parent */
+ } /* else zero length range => pass thru to parent */
- regEntry = parent;
- childSizeCells = sizeCells;
- childAddressCells = addressCells;
- childCells = childAddressCells + childSizeCells;
+ regEntry = parent;
+ childSizeCells = sizeCells;
+ childAddressCells = addressCells;
+ childCells = childAddressCells + childSizeCells;
}
while( ok && regEntry);
OSData *ret = 0;
UInt32 *bits;
UInt32 i;
+ size_t nlen;
char *names;
char *lastName;
UInt32 mask;
for( i = 0; (i <= deviceNumber) && (names < lastName); i++ ) {
if( mask & (1 << i)) {
+ nlen = 1 + strnlen(names, lastName - names);
if( i == deviceNumber) {
- data = OSData::withBytesNoCopy( names, 1 + strlen( names));
+ data = OSData::withBytesNoCopy(names, nlen);
if( data) {
regEntry->setProperty("AAPL,slot-name", data);
ret = data;
data->release();
}
} else
- names += 1 + strlen( names);
+ names += nlen;
}
}
projects / apple / xnu.git / blobdiff