xnu-1228.5.18.tar.gz

[apple/xnu.git] / iokit / IOKit / IOBufferMemoryDescriptor.h

diff --git a/iokit/IOKit/IOBufferMemoryDescriptor.h b/iokit/IOKit/IOBufferMemoryDescriptor.h
index f976759aaed687792dc8af924593bb042a1d4853..f5922d5a5e4f92ef419f1c1a7d026b414eb1d5a4 100644 (file)
--- a/iokit/IOKit/IOBufferMemoryDescriptor.h
+++ b/iokit/IOKit/IOBufferMemoryDescriptor.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #ifndef _IOBUFFERMEMORYDESCRIPTOR_H
 #define _IOBUFFERMEMORYDESCRIPTOR_H
@@ -43,12 +49,12 @@ class IOBufferMemoryDescriptor : public IOGeneralMemoryDescriptor
 {
     OSDeclareDefaultStructors(IOBufferMemoryDescriptor);
 
-protected:
+private:
 /*! @struct ExpansionData
     @discussion This structure will be used to expand the capablilties of this class in the future.
     */    
     struct ExpansionData {
-       vm_map_t        map;
+       IOMemoryMap *   map;
     };
 
 /*! @var reserved
@@ -69,19 +75,16 @@ private:
                                vm_size_t    capacity,
                                vm_offset_t  alignment,
                               task_t       inTask);
-    OSMetaClassDeclareReservedUsed(IOBufferMemoryDescriptor, 0);
 
-#if !(defined(__ppc__) && defined(KPI_10_4_0_PPC_COMPAT))
     virtual bool initWithPhysicalMask(
                                task_t            inTask,
                                IOOptionBits      options,
                                mach_vm_size_t    capacity,
                                mach_vm_address_t alignment,
                                mach_vm_address_t physicalMask);
+
+    OSMetaClassDeclareReservedUsed(IOBufferMemoryDescriptor, 0);
     OSMetaClassDeclareReservedUsed(IOBufferMemoryDescriptor, 1);
-#else
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 1);
-#endif
     OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 2);
     OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 3);
     OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 4);
@@ -169,7 +172,6 @@ public:
                                             vm_size_t    capacity,
                                             vm_offset_t  alignment = 1);
 
-#if !(defined(__ppc__) && defined(KPI_10_4_0_PPC_COMPAT))
 /*! @function inTaskWithPhysicalMask
     @abstract Creates a memory buffer with memory descriptor for that buffer. 
     @discussion Added in Mac OS X 10.5, this method allocates a memory buffer with a given size and alignment in the task's address space specified, and returns a memory descriptor instance representing the memory. It is recommended that memory allocated for I/O or sharing via mapping be created via IOBufferMemoryDescriptor. Options passed with the request specify the kind of memory to be allocated - pageablity and sharing are specified with option bits. This function may block and so should not be called from interrupt level or while a simple lock is held.
@@ -187,7 +189,6 @@ public:
                                             IOOptionBits      options,
                                             mach_vm_size_t    capacity,
                                             mach_vm_address_t physicalMask);
-#endif
 
     /*
      * withCapacity:
@@ -274,10 +275,8 @@ public:
      */
     virtual bool appendBytes(const void *bytes, vm_size_t withLength);
 
-#if !(defined(__ppc__) && defined(KPI_10_4_0_PPC_COMPAT))
     /* DEPRECATED */ virtual void * getVirtualSegment(IOByteCount offset,
     /* DEPRECATED */                                   IOByteCount * length);
-#endif
 };
 
 #endif /* !_IOBUFFERMEMORYDESCRIPTOR_H */