Loading...
--- xnu/xnu-124.7/iokit/Kernel/IOUserClient.cpp
+++ xnu/xnu-201.19/iokit/Kernel/IOUserClient.cpp
@@ -802,47 +802,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <IOKit/pci/IOPCIDevice.h>
-
-static void makeMatchingCompatible( OSDictionary * dict )
-{
- const char * key;
- const char * newKey;
- OSObject * value;
- OSString * str;
- int i = 0;
-
- static const char * gratuitousNameChanges[] = {
- "IOImports", kIOProviderClassKey,
- "IOClass Names", kIOClassKey,
- "IOProbe Score", kIOProbeScoreKey,
- "IOKit Debug", kIOKitDebugKey,
- "IONeededResources", kIOResourceMatchKey,
- "IOName Match", kIONameMatchKey,
- "IOPCI Match", kIOPCIMatchKey,
- "IOPCI Primary Match", kIOPCIPrimaryMatchKey,
- "IOPCI Secondary Match",kIOPCISecondaryMatchKey,
- "IOPCI Class Match", kIOPCIClassMatchKey,
- 0
- };
-
- while( (key = gratuitousNameChanges[i++])) {
- newKey = gratuitousNameChanges[i++];
- if( (value = dict->getObject( key))
- && (0 == dict->getObject( newKey))) {
-
- dict->setObject( newKey, value);
- dict->removeObject( key);
-
- if( (str = OSDynamicCast(OSString, dict->getObject("CFBundleIdentifier"))))
- IOLog("kext \"%s\" ", str->getCStringNoCopy());
- IOLog("must change \"%s\" to \"%s\"\n", key, newKey);
- }
- }
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
extern "C" {
#define CHECK(cls,obj,out) \
@@ -970,7 +929,6 @@
obj = OSUnserializeXML( matching );
if( (dict = OSDynamicCast( OSDictionary, obj))) {
- makeMatchingCompatible( dict ); // temp for binary compatibility
*existing = IOService::getMatchingServices( dict );
kr = kIOReturnSuccess;
} else
@@ -1015,7 +973,6 @@
err = kIOReturnBadArgument;
continue;
}
- makeMatchingCompatible( dict ); // temp for binary compatibility
if( (sym == gIOPublishNotification)
|| (sym == gIOFirstPublishNotification))
@@ -1277,15 +1234,43 @@
/* Routine io_registry_entry_get_name_in_plane */
kern_return_t is_io_registry_entry_get_name_in_plane(
io_object_t registry_entry,
- io_name_t plane,
+ io_name_t planeName,
io_name_t name )
{
+ const IORegistryPlane * plane;
CHECK( IORegistryEntry, registry_entry, entry );
- strncpy( name, entry->getName( IORegistryEntry::getPlane( plane )),
- sizeof( io_name_t));
+ if( planeName[0])
+ plane = IORegistryEntry::getPlane( planeName );
+ else
+ plane = 0;
+
+ strncpy( name, entry->getName( plane), sizeof( io_name_t));
return( kIOReturnSuccess );
+}
+
+/* Routine io_registry_entry_get_location_in_plane */
+kern_return_t is_io_registry_entry_get_location_in_plane(
+ io_object_t registry_entry,
+ io_name_t planeName,
+ io_name_t location )
+{
+ const IORegistryPlane * plane;
+ CHECK( IORegistryEntry, registry_entry, entry );
+
+ if( planeName[0])
+ plane = IORegistryEntry::getPlane( planeName );
+ else
+ plane = 0;
+
+ const char * cstr = entry->getLocation( plane );
+
+ if( cstr) {
+ strncpy( location, cstr, sizeof( io_name_t));
+ return( kIOReturnSuccess );
+ } else
+ return( kIOReturnNotFound );
}
// Create a vm_map_copy_t or kalloc'ed data for memory
@@ -1297,85 +1282,18 @@
kern_return_t err;
vm_map_copy_t copy;
- err = vm_map_copyin( kernel_map, (vm_offset_t) data, len,
- false /* src_destroy */, ©);
-
- assert( err == KERN_SUCCESS );
- if( err == KERN_SUCCESS )
- *buf = (char *) copy;
+ err = vm_map_copyin( kernel_map, (vm_offset_t) data, len,
+ false /* src_destroy */, ©);
+
+ assert( err == KERN_SUCCESS );
+ if( err == KERN_SUCCESS )
+ *buf = (char *) copy;
+
return( err );
}
-
-/* Routine io_registry_entry_get_properties */
-kern_return_t is_io_registry_entry_get_properties(
- io_object_t registry_entry,
- io_buf_ptr_t *properties,
- mach_msg_type_number_t *propertiesCnt )
-{
- kern_return_t err;
- vm_size_t len;
-
- CHECK( IORegistryEntry, registry_entry, entry );
-
- OSSerialize * s = OSSerialize::withCapacity(4096);
-
- if( !s)
- return( kIOReturnNoMemory );
-
- s->clearText();
-
- if( entry->serializeProperties( s )) {
- len = s->getLength();
- *propertiesCnt = len;
- err = copyoutkdata( s->text(), len, properties );
-
- } else
- err = kIOReturnUnsupported;
-
- s->release();
-
- return( err );
-}
-
-/* Routine io_registry_entry_set_properties */
-kern_return_t is_io_registry_entry_set_properties
-(
- io_object_t registry_entry,
- io_buf_ptr_t properties,
- mach_msg_type_number_t propertiesCnt,
- natural_t * result)
-{
- OSObject * obj;
- kern_return_t err;
- IOReturn res;
- vm_offset_t data;
-
- CHECK( IORegistryEntry, registry_entry, entry );
-
- err = vm_map_copyout( kernel_map, &data, (vm_map_copy_t) properties );
-
- if( KERN_SUCCESS == err) {
-
- // must return success after vm_map_copyout() succeeds
- obj = OSUnserializeXML( (const char *) data );
- vm_deallocate( kernel_map, data, propertiesCnt );
-
- if( obj) {
- res = entry->setProperties( obj );
- obj->release();
- } else
- res = kIOReturnBadArgument;
- } else
- res = err;
-
- *result = res;
- return( err );
-}
-
-
/* Routine io_registry_entry_get_property */
-kern_return_t is_io_registry_entry_get_property(
+kern_return_t is_io_registry_entry_get_property_bytes(
io_object_t registry_entry,
io_name_t property_name,
io_scalar_inband_t buf,
@@ -1393,7 +1311,14 @@
CHECK( IORegistryEntry, registry_entry, entry );
- obj = entry->getProperty( property_name );
+#if 0
+ // need virtual
+ obj = entry->copyProperty(property_name);
+#else
+ obj = entry->getProperty(property_name);
+ if( obj)
+ obj->retain();
+#endif
if( !obj)
return( kIOReturnNoResources );
@@ -1431,10 +1356,169 @@
bcopy( bytes, buf, len );
}
}
+ obj->release();
return( ret );
}
+/* Routine io_registry_entry_get_property */
+kern_return_t is_io_registry_entry_get_property(
+ io_object_t registry_entry,
+ io_name_t property_name,
+ io_buf_ptr_t *properties,
+ mach_msg_type_number_t *propertiesCnt )
+{
+ kern_return_t err;
+ vm_size_t len;
+ OSObject * obj;
+
+ CHECK( IORegistryEntry, registry_entry, entry );
+
+#if 0
+ // need virtual
+ obj = entry->copyProperty(property_name);
+#else
+ obj = entry->getProperty(property_name);
+ if( obj)
+ obj->retain();
+#endif
+ if( !obj)
+ return( kIOReturnNotFound );
+
+ OSSerialize * s = OSSerialize::withCapacity(4096);
+ if( !s) {
+ obj->release();
+ return( kIOReturnNoMemory );
+ }
+ s->clearText();
+
+ if( obj->serialize( s )) {
+ len = s->getLength();
+ *propertiesCnt = len;
+ err = copyoutkdata( s->text(), len, properties );
+
+ } else
+ err = kIOReturnUnsupported;
+
+ s->release();
+ obj->release();
+
+ return( err );
+}
+
+/* Routine io_registry_entry_get_property_recursively */
+kern_return_t is_io_registry_entry_get_property_recursively(
+ io_object_t registry_entry,
+ io_name_t plane,
+ io_name_t property_name,
+ int options,
+ io_buf_ptr_t *properties,
+ mach_msg_type_number_t *propertiesCnt )
+{
+ kern_return_t err;
+ vm_size_t len;
+ OSObject * obj;
+
+ CHECK( IORegistryEntry, registry_entry, entry );
+
+#if 0
+ obj = entry->copyProperty( property_name,
+ IORegistryEntry::getPlane( plane ), options);
+#else
+ obj = entry->getProperty( property_name,
+ IORegistryEntry::getPlane( plane ), options);
+ if( obj)
+ obj->retain();
+#endif
+ if( !obj)
+ return( kIOReturnNotFound );
+
+ OSSerialize * s = OSSerialize::withCapacity(4096);
+ if( !s) {
+ obj->release();
+ return( kIOReturnNoMemory );
+ }
+
+ s->clearText();
+
+ if( obj->serialize( s )) {
+ len = s->getLength();
+ *propertiesCnt = len;
+ err = copyoutkdata( s->text(), len, properties );
+
+ } else
+ err = kIOReturnUnsupported;
+
+ s->release();
+ obj->release();
+
+ return( err );
+}
+
+/* Routine io_registry_entry_get_properties */
+kern_return_t is_io_registry_entry_get_properties(
+ io_object_t registry_entry,
+ io_buf_ptr_t *properties,
+ mach_msg_type_number_t *propertiesCnt )
+{
+ kern_return_t err;
+ vm_size_t len;
+
+ CHECK( IORegistryEntry, registry_entry, entry );
+
+ OSSerialize * s = OSSerialize::withCapacity(4096);
+ if( !s)
+ return( kIOReturnNoMemory );
+
+ s->clearText();
+
+ if( entry->serializeProperties( s )) {
+ len = s->getLength();
+ *propertiesCnt = len;
+ err = copyoutkdata( s->text(), len, properties );
+
+ } else
+ err = kIOReturnUnsupported;
+
+ s->release();
+
+ return( err );
+}
+
+/* Routine io_registry_entry_set_properties */
+kern_return_t is_io_registry_entry_set_properties
+(
+ io_object_t registry_entry,
+ io_buf_ptr_t properties,
+ mach_msg_type_number_t propertiesCnt,
+ natural_t * result)
+{
+ OSObject * obj;
+ kern_return_t err;
+ IOReturn res;
+ vm_offset_t data;
+
+ CHECK( IORegistryEntry, registry_entry, entry );
+
+ err = vm_map_copyout( kernel_map, &data, (vm_map_copy_t) properties );
+
+ if( KERN_SUCCESS == err) {
+
+ // must return success after vm_map_copyout() succeeds
+ obj = OSUnserializeXML( (const char *) data );
+ vm_deallocate( kernel_map, data, propertiesCnt );
+
+ if( obj) {
+ res = entry->setProperties( obj );
+ obj->release();
+ } else
+ res = kIOReturnBadArgument;
+ } else
+ res = err;
+
+ *result = res;
+ return( err );
+}
/* Routine io_registry_entry_get_child_iterator */
kern_return_t is_io_registry_entry_get_child_iterator(
@@ -1633,8 +1717,8 @@
IOLockLock( gIOObjectPortLock);
if( client->mappings)
client->mappings->removeObject( map);
+ IOLockUnlock( gIOObjectPortLock);
IOMachPort::releasePortForObject( map, IKOT_IOKIT_OBJECT );
- IOLockUnlock( gIOObjectPortLock);
map->release();
} else
err = kIOReturnBadArgument;
@@ -2337,12 +2421,6 @@
array = OSDynamicCast(OSArray, obj);
if ( array ) {
-//--
- OSDictionary * dict;
- int i = 0;
- while( (dict = OSDynamicCast(OSDictionary, array->getObject(i++))))
- makeMatchingCompatible( dict );
-//--
if ( !gIOCatalogue->addDrivers( array ,
flag == kIOCatalogAddDrivers) ) {
kr = kIOReturnError;
@@ -2360,7 +2438,6 @@
dict = OSDynamicCast(OSDictionary, obj);
if ( dict ) {
- makeMatchingCompatible( dict );
if ( !gIOCatalogue->removeDrivers( dict,
flag == kIOCatalogRemoveDrivers ) ) {
kr = kIOReturnError;
@@ -2377,7 +2454,6 @@
dict = OSDynamicCast(OSDictionary, obj);
if ( dict ) {
- makeMatchingCompatible( dict );
if ( !gIOCatalogue->startMatching( dict ) ) {
kr = kIOReturnError;
}
@@ -2568,31 +2644,34 @@
return kIOReturnSuccess;
}
-kern_return_t iokit_user_client_trap(io_object_t userClientRef, UInt32 index, void *p1, void *p2, void *p3, void *p4, void *p5, void *p6)
-{
- kern_return_t result = kIOReturnBadArgument;
- IOUserClient *userClient;
-
- if ((userClient = OSDynamicCast(IOUserClient, iokit_lookup_connect_ref_current_task(userClientRef)))) {
- IOExternalTrap *trap;
- IOService *target = NULL;
-
- trap = userClient->getTargetAndTrapForIndex(&target, index);
-
- if (trap && target) {
- IOTrap func;
-
- func = trap->func;
-
- if (func) {
- result = (target->*func)(p1, p2, p3, p4, p5, p6);
- }
- }
-
- userClient->release();
- }
-
- return result;
+kern_return_t iokit_user_client_trap(io_object_t userClientRef, UInt32 index,
+ void *p1, void *p2, void *p3,
+ void *p4, void *p5, void *p6)
+{
+ kern_return_t result = kIOReturnBadArgument;
+ IOUserClient *userClient;
+
+ if ((userClient = OSDynamicCast(IOUserClient,
+ iokit_lookup_connect_ref_current_task(userClientRef)))) {
+ IOExternalTrap *trap;
+ IOService *target = NULL;
+
+ trap = userClient->getTargetAndTrapForIndex(&target, index);
+
+ if (trap && target) {
+ IOTrap func;
+
+ func = trap->func;
+
+ if (func) {
+ result = (target->*func)(p1, p2, p3, p4, p5, p6);
+ }
+ }
+
+ userClient->release();
+ }
+
+ return result;
}
}; /* extern "C" */