xnu-792.21.3.tar.gz

[apple/xnu.git] / iokit / Kernel / IOUserClient.cpp

diff --git a/iokit/Kernel/IOUserClient.cpp b/iokit/Kernel/IOUserClient.cpp
index 45a4f3c22f33458937113a4b027f2432369022f4..7506a0cc4cbff4dc399d0adb10b947f00864466e 100644 (file)
--- a/iokit/Kernel/IOUserClient.cpp
+++ b/iokit/Kernel/IOUserClient.cpp
@@ -31,6 +31,7 @@
 #include <IOKit/IOKitKeysPrivate.h>
 #include <IOKit/IOUserClient.h>
 #include <IOKit/IOService.h>
+#include <IOKit/IOService.h>
 #include <IOKit/IORegistryEntry.h>
 #include <IOKit/IOCatalogue.h>
 #include <IOKit/IOMemoryDescriptor.h>
@@ -836,22 +837,6 @@ IOReturn IOUserClient::clientHasPrivilege( void * securityToken,
     return (kr);
 }
 
-bool IOUserClient::init()
-{
-    if( getPropertyTable())
-        return true;
-    else
-        return super::init();
-}
-
-bool IOUserClient::init(OSDictionary * dictionary)
-{
-    if( getPropertyTable())
-        return true;
-    else
-        return super::init(dictionary);
-}
-
 bool IOUserClient::initWithTask(task_t owningTask,
                                 void * securityID,
                                 UInt32 type )
@@ -1775,7 +1760,6 @@ kern_return_t is_io_registry_entry_get_property_bytes(
     return( ret );
 }
 
-
 /* Routine io_registry_entry_get_property */
 kern_return_t is_io_registry_entry_get_property(
        io_object_t registry_entry,
@@ -2009,7 +1993,7 @@ kern_return_t is_io_service_open(
     CHECK( IOService, _service, service );
 
     err = service->newUserClient( owningTask, (void *) owningTask,
-               connect_type, 0, &client );
+               connect_type, &client );
 
     if( err == kIOReturnSuccess) {
        assert( OSDynamicCast(IOUserClient, client) );
@@ -2019,101 +2003,6 @@ kern_return_t is_io_service_open(
     return( err);
 }
 
-/* Routine io_service_open_ndr */
-kern_return_t is_io_service_open_extended(
-       io_object_t _service,
-       task_t owningTask,
-       int connect_type,
-       NDR_record_t ndr,
-       io_buf_ptr_t properties,
-       mach_msg_type_number_t propertiesCnt,
-        natural_t * result,
-       io_object_t *connection )
-{
-    IOUserClient * client = 0;
-    kern_return_t  err = KERN_SUCCESS;
-    IOReturn      res = kIOReturnSuccess;
-    OSDictionary * propertiesDict = 0;
-    bool          crossEndian;
-    bool          disallowAccess;
-
-    CHECK( IOService, _service, service );
-
-    do
-    {
-       if (properties)
-       {
-           OSObject *      obj;
-           vm_offset_t     data;
-           vm_map_offset_t map_data;
-
-           err = vm_map_copyout( kernel_map, &map_data, (vm_map_copy_t) properties );
-           res = err;
-           data = CAST_DOWN(vm_offset_t, map_data);
-           if (KERN_SUCCESS == err)
-           {
-               // must return success after vm_map_copyout() succeeds
-               obj = OSUnserializeXML( (const char *) data );
-               vm_deallocate( kernel_map, data, propertiesCnt );
-               propertiesDict = OSDynamicCast(OSDictionary, obj);
-               if (!propertiesDict)
-               {
-                   res = kIOReturnBadArgument;
-                   if (obj)
-                       obj->release();
-               }
-           }
-           if (kIOReturnSuccess != res)
-               break;
-       }
-
-       crossEndian = (ndr.int_rep != NDR_record.int_rep);
-       if (crossEndian)
-       {
-           if (!propertiesDict)
-               propertiesDict = OSDictionary::withCapacity(4);
-           OSData * data = OSData::withBytes(&ndr, sizeof(ndr));
-           if (data)
-           {
-               if (propertiesDict)
-                   propertiesDict->setObject(kIOUserClientCrossEndianKey, data);
-               data->release();
-           }
-       }
-
-       res = service->newUserClient( owningTask, (void *) owningTask,
-                   connect_type, propertiesDict, &client );
-
-       if (propertiesDict)
-           propertiesDict->release();
-
-       if (res == kIOReturnSuccess)
-       {
-           assert( OSDynamicCast(IOUserClient, client) );
-
-           disallowAccess = (crossEndian
-               && (kOSBooleanTrue != service->getProperty(kIOUserClientCrossEndianCompatibleKey))
-               && (kOSBooleanTrue != client->getProperty(kIOUserClientCrossEndianCompatibleKey)));
-
-           if (disallowAccess)
-           {
-               client->clientClose();
-               client->release();
-               client = 0;
-               res = kIOReturnUnsupported;
-               break;
-           }
-           client->sharedInstance = (0 != client->getProperty(kIOUserClientSharedInstanceKey));
-       }
-    }
-    while (false);
-
-    *connection = client;
-    *result = res;
-
-    return (err);
-}
-
 /* Routine io_service_close */
 kern_return_t is_io_service_close(
        io_object_t connection )
@@ -2180,8 +2069,7 @@ kern_return_t is_io_connect_map_memory(
         if( mapSize)
             *mapSize = map->getLength();
 
-        if( client->sharedInstance
-           || (task != current_task())) {
+        if( task != current_task()) {
             // push a name out to the task owning the map,
             // so we can clean up maps
 #if IOASSERT