Loading...
--- xnu/xnu-2050.9.2/iokit/Kernel/IOBufferMemoryDescriptor.cpp
+++ xnu/xnu-792.13.8/iokit/Kernel/IOBufferMemoryDescriptor.cpp
@@ -1,56 +1,52 @@
/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ * 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.
+ *
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
* limitations under the License.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#define _IOMEMORYDESCRIPTOR_INTERNAL_
-
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ */
#include <IOKit/assert.h>
#include <IOKit/system.h>
#include <IOKit/IOLib.h>
#include <IOKit/IOMapper.h>
#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <libkern/OSDebug.h>
#include "IOKitKernelInternal.h"
+#include "IOCopyMapper.h"
__BEGIN_DECLS
void ipc_port_release_send(ipc_port_t port);
#include <vm/pmap.h>
+vm_map_t IOPageableMapForAddress( vm_address_t address );
__END_DECLS
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-enum
-{
- kInternalFlagPhysical = 0x00000001,
- kInternalFlagPageSized = 0x00000002
-};
+volatile ppnum_t gIOHighestAllocatedPage;
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -58,9 +54,50 @@
OSDefineMetaClassAndStructors(IOBufferMemoryDescriptor,
IOGeneralMemoryDescriptor);
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef __LP64__
+bool IOBufferMemoryDescriptor::initWithAddress(
+ void * /* address */ ,
+ IOByteCount /* withLength */ ,
+ IODirection /* withDirection */ )
+{
+ return false;
+}
+
+bool IOBufferMemoryDescriptor::initWithAddress(
+ vm_address_t /* address */ ,
+ IOByteCount /* withLength */ ,
+ IODirection /* withDirection */ ,
+ task_t /* withTask */ )
+{
+ return false;
+}
+
+bool IOBufferMemoryDescriptor::initWithPhysicalAddress(
+ IOPhysicalAddress /* address */ ,
+ IOByteCount /* withLength */ ,
+ IODirection /* withDirection */ )
+{
+ return false;
+}
+
+bool IOBufferMemoryDescriptor::initWithPhysicalRanges(
+ IOPhysicalRange * /* ranges */ ,
+ UInt32 /* withCount */ ,
+ IODirection /* withDirection */ ,
+ bool /* asReference */ )
+{
+ return false;
+}
+
+bool IOBufferMemoryDescriptor::initWithRanges(
+ IOVirtualRange * /* ranges */ ,
+ UInt32 /* withCount */ ,
+ IODirection /* withDirection */ ,
+ task_t /* withTask */ ,
+ bool /* asReference */ )
+{
+ return false;
+}
+
bool IOBufferMemoryDescriptor::initWithOptions(
IOOptionBits options,
vm_size_t capacity,
@@ -70,7 +107,6 @@
mach_vm_address_t physicalMask = 0;
return (initWithPhysicalMask(inTask, options, capacity, alignment, physicalMask));
}
-#endif /* !__LP64__ */
bool IOBufferMemoryDescriptor::initWithPhysicalMask(
task_t inTask,
@@ -80,145 +116,82 @@
mach_vm_address_t physicalMask)
{
kern_return_t kr;
- task_t mapTask = NULL;
- vm_map_t vmmap = NULL;
- mach_vm_address_t highestMask = 0;
- IOOptionBits iomdOptions = kIOMemoryTypeVirtual64 | kIOMemoryAsReference;
+ addr64_t lastIOAddr;
+ vm_map_t vmmap = 0;
+ IOOptionBits iomdOptions = kIOMemoryAsReference | kIOMemoryTypeVirtual;
if (!capacity)
return false;
- _options = options;
- _capacity = capacity;
- _internalFlags = 0;
- _internalReserved = 0;
- _buffer = 0;
-
- _ranges.v64 = IONew(IOAddressRange, 1);
- if (!_ranges.v64)
- return (false);
- _ranges.v64->address = 0;
- _ranges.v64->length = 0;
- // make sure super::free doesn't dealloc _ranges before super::init
- _flags = kIOMemoryAsReference;
-
- // Grab IOMD bits from the Buffer MD options
- iomdOptions |= (options & kIOBufferDescriptorMemoryFlags);
+ _options = options;
+ _capacity = capacity;
+ _physAddrs = 0;
+ _physSegCount = 0;
+ _buffer = 0;
+
+ // Grab the direction and the Auto Prepare bits from the Buffer MD options
+ iomdOptions |= options & (kIOMemoryDirectionMask | kIOMemoryAutoPrepare);
+
+ if ((options & kIOMemorySharingTypeMask) && (alignment < page_size))
+ alignment = page_size;
+
+ if ((inTask != kernel_task) && !(options & kIOMemoryPageable))
+ return false;
if (physicalMask && (alignment <= 1))
- {
- alignment = ((physicalMask ^ (-1ULL)) & (physicalMask - 1));
- highestMask = (physicalMask | alignment);
- alignment++;
- if (alignment < page_size)
- alignment = page_size;
- }
-
- if ((options & (kIOMemorySharingTypeMask | kIOMapCacheMask | kIOMemoryClearEncrypt)) && (alignment < page_size))
- alignment = page_size;
-
- if (alignment >= page_size)
- capacity = round_page(capacity);
-
- if (alignment > page_size)
- options |= kIOMemoryPhysicallyContiguous;
+ alignment = ((physicalMask ^ PAGE_MASK) & PAGE_MASK) + 1;
+
+ if ((options & kIOMemoryPhysicallyContiguous) && !physicalMask)
+ physicalMask = 0xFFFFFFFF;
_alignment = alignment;
-
- if ((inTask != kernel_task) && !(options & kIOMemoryPageable))
- return false;
-
- // set flags for entry + object create
- vm_prot_t memEntryCacheMode = VM_PROT_READ | VM_PROT_WRITE;
-
- // set memory entry cache mode
- switch (options & kIOMapCacheMask)
- {
- case kIOMapInhibitCache:
- SET_MAP_MEM(MAP_MEM_IO, memEntryCacheMode);
- break;
-
- case kIOMapWriteThruCache:
- SET_MAP_MEM(MAP_MEM_WTHRU, memEntryCacheMode);
- break;
-
- case kIOMapWriteCombineCache:
- SET_MAP_MEM(MAP_MEM_WCOMB, memEntryCacheMode);
- break;
-
- case kIOMapCopybackCache:
- SET_MAP_MEM(MAP_MEM_COPYBACK, memEntryCacheMode);
- break;
-
- case kIOMapCopybackInnerCache:
- SET_MAP_MEM(MAP_MEM_INNERWBACK, memEntryCacheMode);
- break;
-
- case kIOMapDefaultCache:
- default:
- SET_MAP_MEM(MAP_MEM_NOOP, memEntryCacheMode);
- break;
- }
-
if (options & kIOMemoryPageable)
{
- iomdOptions |= kIOMemoryBufferPageable;
-
- // must create the entry before any pages are allocated
+ iomdOptions |= kIOMemoryBufferPageable;
+
+ ipc_port_t sharedMem;
+ vm_size_t size = round_page_32(capacity);
+
+ // must create the entry before any pages are allocated
// set flags for entry + object create
- memEntryCacheMode |= MAP_MEM_NAMED_CREATE;
-
- if (options & kIOMemoryPurgeable)
- memEntryCacheMode |= MAP_MEM_PURGABLE;
- }
- else
- {
- memEntryCacheMode |= MAP_MEM_NAMED_REUSE;
- vmmap = kernel_map;
-
- // Buffer shouldn't auto prepare they should be prepared explicitly
- // But it never was enforced so what are you going to do?
- iomdOptions |= kIOMemoryAutoPrepare;
-
- /* Allocate a wired-down buffer inside kernel space. */
-
- if ((options & kIOMemoryPhysicallyContiguous) || highestMask || (alignment > page_size))
- {
- _internalFlags |= kInternalFlagPhysical;
- if (highestMask)
- {
- _internalFlags |= kInternalFlagPageSized;
- capacity = round_page(capacity);
- }
- _buffer = (void *) IOKernelAllocateWithPhysicalRestrict(capacity, highestMask, alignment,
- (0 != (options & kIOMemoryPhysicallyContiguous)));
- }
- else if (alignment > 1)
- {
- _buffer = IOMallocAligned(capacity, alignment);
- }
- else
- {
- _buffer = IOMalloc(capacity);
- }
-
- if (!_buffer)
- {
- return false;
- }
- }
-
- if( (options & (kIOMemoryPageable | kIOMapCacheMask))) {
- ipc_port_t sharedMem;
- vm_size_t size = round_page(capacity);
-
- kr = mach_make_memory_entry(vmmap,
- &size, (vm_offset_t)_buffer,
- memEntryCacheMode, &sharedMem,
- NULL );
-
- if( (KERN_SUCCESS == kr) && (size != round_page(capacity))) {
+ vm_prot_t memEntryCacheMode = VM_PROT_READ | VM_PROT_WRITE
+ | MAP_MEM_NAMED_CREATE;
+
+ if (options & kIOMemoryPurgeable)
+ memEntryCacheMode |= MAP_MEM_PURGABLE;
+
+ // set memory entry cache mode
+ switch (options & kIOMapCacheMask)
+ {
+ case kIOMapInhibitCache:
+ SET_MAP_MEM(MAP_MEM_IO, memEntryCacheMode);
+ break;
+
+ case kIOMapWriteThruCache:
+ SET_MAP_MEM(MAP_MEM_WTHRU, memEntryCacheMode);
+ break;
+
+ case kIOMapWriteCombineCache:
+ SET_MAP_MEM(MAP_MEM_WCOMB, memEntryCacheMode);
+ break;
+
+ case kIOMapCopybackCache:
+ SET_MAP_MEM(MAP_MEM_COPYBACK, memEntryCacheMode);
+ break;
+
+ case kIOMapDefaultCache:
+ default:
+ SET_MAP_MEM(MAP_MEM_NOOP, memEntryCacheMode);
+ break;
+ }
+
+ kr = mach_make_memory_entry( vmmap,
+ &size, 0,
+ memEntryCacheMode, &sharedMem,
+ NULL );
+
+ if( (KERN_SUCCESS == kr) && (size != round_page_32(capacity))) {
ipc_port_release_send( sharedMem );
kr = kIOReturnVMError;
}
@@ -226,61 +199,139 @@
return( false );
_memEntry = (void *) sharedMem;
-
- if( options & kIOMemoryPageable) {
#if IOALLOCDEBUG
- debug_iomallocpageable_size += size;
+ debug_iomallocpageable_size += size;
#endif
- mapTask = inTask;
- if (NULL == inTask)
- inTask = kernel_task;
- }
- else if (options & kIOMapCacheMask)
- {
- // Prefetch each page to put entries into the pmap
- volatile UInt8 * startAddr = (UInt8 *)_buffer;
- volatile UInt8 * endAddr = (UInt8 *)_buffer + capacity;
-
- while (startAddr < endAddr)
+ if (NULL == inTask)
+ inTask = kernel_task;
+ else if (inTask == kernel_task)
+ {
+ vmmap = kernel_map;
+ }
+ else
+ {
+ if( !reserved) {
+ reserved = IONew( ExpansionData, 1 );
+ if( !reserved)
+ return( false );
+ }
+ vmmap = get_task_map(inTask);
+ vm_map_reference(vmmap);
+ reserved->map = vmmap;
+ }
+ }
+ else
+ {
+ if (IOMapper::gSystem)
+ // assuming mapped space is 2G
+ lastIOAddr = (1UL << 31) - PAGE_SIZE;
+ else
+ lastIOAddr = ptoa_64(gIOHighestAllocatedPage);
+
+ if (physicalMask && (lastIOAddr != (lastIOAddr & physicalMask)))
+ {
+ mach_vm_address_t address;
+ iomdOptions &= ~kIOMemoryTypeVirtual;
+ iomdOptions |= kIOMemoryTypePhysical;
+
+ address = IOMallocPhysical(capacity, physicalMask);
+ _buffer = (void *) address;
+ if (!_buffer)
+ return false;
+
+ if (inTask == kernel_task)
{
- *startAddr;
- startAddr += page_size;
- }
- }
- }
-
- _ranges.v64->address = (mach_vm_address_t) _buffer;;
- _ranges.v64->length = _capacity;
-
- if (!super::initWithOptions(_ranges.v64, 1, 0,
- inTask, iomdOptions, /* System mapper */ 0))
+ vmmap = kernel_map;
+ }
+ else if (NULL != inTask)
+ {
+ if( !reserved) {
+ reserved = IONew( ExpansionData, 1 );
+ if( !reserved)
+ return( false );
+ }
+ vmmap = get_task_map(inTask);
+ vm_map_reference(vmmap);
+ reserved->map = vmmap;
+ }
+ inTask = 0;
+ }
+ else
+ {
+ // Buffer shouldn't auto prepare they should be prepared explicitly
+ // But it never was enforced so what are you going to do?
+ iomdOptions |= kIOMemoryAutoPrepare;
+
+ /* Allocate a wired-down buffer inside kernel space. */
+ if (options & kIOMemoryPhysicallyContiguous)
+ _buffer = (void *) IOKernelAllocateContiguous(capacity, alignment);
+ else if (alignment > 1)
+ _buffer = IOMallocAligned(capacity, alignment);
+ else
+ _buffer = IOMalloc(capacity);
+ if (!_buffer)
+ return false;
+ }
+ }
+
+ _singleRange.v.address = (vm_address_t) _buffer;
+ _singleRange.v.length = capacity;
+
+ if (!super::initWithOptions(&_singleRange.v, 1, 0,
+ inTask, iomdOptions, /* System mapper */ 0))
return false;
- if (mapTask)
- {
- if (!reserved) {
- reserved = IONew( ExpansionData, 1 );
- if( !reserved)
- return( false );
- }
- reserved->map = createMappingInTask(mapTask, 0,
- kIOMapAnywhere | (options & kIOMapCacheMask), 0, 0);
- if (!reserved->map)
+ if (physicalMask && !IOMapper::gSystem)
+ {
+ IOMDDMACharacteristics mdSummary;
+
+ bzero(&mdSummary, sizeof(mdSummary));
+ IOReturn rtn = dmaCommandOperation(
+ kIOMDGetCharacteristics,
+ &mdSummary, sizeof(mdSummary));
+ if (rtn)
+ return false;
+
+ if (mdSummary.fHighestPage)
+ {
+ ppnum_t highest;
+ while (mdSummary.fHighestPage > (highest = gIOHighestAllocatedPage))
+ {
+ if (OSCompareAndSwap(highest, mdSummary.fHighestPage,
+ (UInt32 *) &gIOHighestAllocatedPage))
+ break;
+ }
+ lastIOAddr = ptoa_64(mdSummary.fHighestPage);
+ }
+ else
+ lastIOAddr = ptoa_64(gIOLastPage);
+
+ if (lastIOAddr != (lastIOAddr & physicalMask))
+ {
+ if (kIOMemoryTypePhysical != (_flags & kIOMemoryTypeMask))
+ {
+ // flag a retry
+ _physSegCount = 1;
+ }
+ return false;
+ }
+ }
+
+ if (vmmap)
+ {
+ kr = doMap(vmmap, (IOVirtualAddress *) &_buffer, kIOMapAnywhere, 0, capacity);
+ if (KERN_SUCCESS != kr)
{
_buffer = 0;
return( false );
}
- release(); // map took a retain on this
- reserved->map->retain();
- removeMapping(reserved->map);
- mach_vm_address_t buffer = reserved->map->getAddress();
- _buffer = (void *) buffer;
- if (kIOMemoryTypeVirtual64 == (kIOMemoryTypeMask & iomdOptions))
- _ranges.v64->address = buffer;
- }
-
- setLength(_capacity);
-
+
+ if (kIOMemoryTypeVirtual & iomdOptions)
+ _singleRange.v.address = (vm_address_t) _buffer;
+ }
+
+ setLength(capacity);
+
return true;
}
@@ -292,9 +343,19 @@
{
IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
- if (me && !me->initWithPhysicalMask(inTask, options, capacity, alignment, 0)) {
+ if (me && !me->initWithOptions(options, capacity, alignment, inTask)) {
+ bool retry = me->_physSegCount;
me->release();
me = 0;
+ if (retry)
+ {
+ me = new IOBufferMemoryDescriptor;
+ if (me && !me->initWithOptions(options, capacity, alignment, inTask))
+ {
+ me->release();
+ me = 0;
+ }
+ }
}
return me;
}
@@ -309,34 +370,36 @@
if (me && !me->initWithPhysicalMask(inTask, options, capacity, 1, physicalMask))
{
+ bool retry = me->_physSegCount;
me->release();
me = 0;
+ if (retry)
+ {
+ me = new IOBufferMemoryDescriptor;
+ if (me && !me->initWithPhysicalMask(inTask, options, capacity, 1, physicalMask))
+ {
+ me->release();
+ me = 0;
+ }
+ }
}
return me;
}
-#ifndef __LP64__
bool IOBufferMemoryDescriptor::initWithOptions(
IOOptionBits options,
vm_size_t capacity,
vm_offset_t alignment)
{
- return (initWithPhysicalMask(kernel_task, options, capacity, alignment, (mach_vm_address_t)0));
-}
-#endif /* !__LP64__ */
+ return( initWithOptions(options, capacity, alignment, kernel_task) );
+}
IOBufferMemoryDescriptor * IOBufferMemoryDescriptor::withOptions(
IOOptionBits options,
vm_size_t capacity,
vm_offset_t alignment)
{
- IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
-
- if (me && !me->initWithPhysicalMask(kernel_task, options, capacity, alignment, 0)) {
- me->release();
- me = 0;
- }
- return me;
+ return(IOBufferMemoryDescriptor::inTaskWithOptions(kernel_task, options, capacity, alignment));
}
@@ -357,7 +420,6 @@
inCapacity, inContiguous ? inCapacity : 1 ));
}
-#ifndef __LP64__
/*
* initWithBytes:
*
@@ -369,9 +431,10 @@
IODirection inDirection,
bool inContiguous)
{
- if (!initWithPhysicalMask(kernel_task, inDirection | kIOMemoryUnshared
- | (inContiguous ? kIOMemoryPhysicallyContiguous : 0),
- inLength, inLength, (mach_vm_address_t)0))
+ if (!initWithOptions(
+ inDirection | kIOMemoryUnshared
+ | (inContiguous ? kIOMemoryPhysicallyContiguous : 0),
+ inLength, inLength ))
return false;
// start out with no data
@@ -382,7 +445,6 @@
return true;
}
-#endif /* !__LP64__ */
/*
* withBytes:
@@ -398,25 +460,21 @@
{
IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
- if (me && !me->initWithPhysicalMask(
- kernel_task, inDirection | kIOMemoryUnshared
- | (inContiguous ? kIOMemoryPhysicallyContiguous : 0),
- inLength, inLength, 0 ))
- {
+ if (me && !me->initWithBytes(inBytes, inLength, inDirection, inContiguous))
+ {
+ bool retry = me->_physSegCount;
me->release();
me = 0;
- }
-
- if (me)
- {
- // start out with no data
- me->setLength(0);
-
- if (!me->appendBytes(inBytes, inLength))
- {
- me->release();
- me = 0;
- }
+ if (retry)
+ {
+ me = new IOBufferMemoryDescriptor;
+ if (me && !me->initWithBytes(inBytes, inLength, inDirection, inContiguous))
+ {
+ me->release();
+ me = 0;
+ }
+ }
+
}
return me;
}
@@ -430,24 +488,18 @@
{
// Cache all of the relevant information on the stack for use
// after we call super::free()!
- IOOptionBits flags = _flags;
- IOOptionBits internalFlags = _internalFlags;
+ IOOptionBits flags = _flags;
IOOptionBits options = _options;
vm_size_t size = _capacity;
void * buffer = _buffer;
- IOMemoryMap * map = 0;
- IOAddressRange * range = _ranges.v64;
+ IOVirtualAddress source = _singleRange.v.address;
+ vm_map_t vmmap = 0;
vm_offset_t alignment = _alignment;
- if (alignment >= page_size)
- size = round_page(size);
-
if (reserved)
{
- map = reserved->map;
+ vmmap = reserved->map;
IODelete( reserved, ExpansionData, 1 );
- if (map)
- map->release();
}
/* super::free may unwire - deallocate buffer afterwards */
@@ -456,24 +508,34 @@
if (options & kIOMemoryPageable)
{
#if IOALLOCDEBUG
- debug_iomallocpageable_size -= round_page(size);
+ if (!buffer || vmmap)
+ debug_iomallocpageable_size -= round_page_32(size);
#endif
+ if (buffer)
+ {
+ if (vmmap)
+ vm_deallocate(vmmap, (vm_address_t) buffer, round_page_32(size));
+ else
+ IOFreePageable(buffer, size);
+ }
}
else if (buffer)
{
- if (internalFlags & kInternalFlagPhysical)
- {
- if (kInternalFlagPageSized & internalFlags)
- size = round_page(size);
- IOKernelFreePhysical((mach_vm_address_t) buffer, size);
- }
+ if (kIOMemoryTypePhysical == (flags & kIOMemoryTypeMask))
+ {
+ if (vmmap)
+ vm_deallocate(vmmap, (vm_address_t) buffer, round_page_32(size));
+ IOFreePhysical((mach_vm_address_t) source, size);
+ }
+ else if (options & kIOMemoryPhysicallyContiguous)
+ IOKernelFreeContiguous((mach_vm_address_t) buffer, size);
else if (alignment > 1)
IOFreeAligned(buffer, size);
else
IOFree(buffer, size);
}
- if (range && (kIOMemoryAsReference & flags))
- IODelete(range, IOAddressRange, 1);
+ if (vmmap)
+ vm_map_deallocate(vmmap);
}
/*
@@ -501,7 +563,7 @@
assert(length <= _capacity);
_length = length;
- _ranges.v64->length = length;
+ _singleRange.v.length = length;
}
/*
@@ -513,10 +575,7 @@
*/
void IOBufferMemoryDescriptor::setDirection(IODirection direction)
{
- _flags = (_flags & ~kIOMemoryDirectionMask) | direction;
-#ifndef __LP64__
- _direction = (IODirection) (_flags & kIOMemoryDirectionMask);
-#endif /* !__LP64__ */
+ _direction = direction;
}
/*
@@ -536,10 +595,10 @@
offset = _length;
_length += actualBytesToCopy;
- _ranges.v64->length += actualBytesToCopy;
+ _singleRange.v.length += actualBytesToCopy;
if (_task == kernel_task)
- bcopy(/* from */ bytes, (void *)(_ranges.v64->address + offset),
+ bcopy(/* from */ bytes, (void *)(_singleRange.v.address + offset),
actualBytesToCopy);
else
writeBytes(offset, bytes, actualBytesToCopy);
@@ -554,10 +613,10 @@
*/
void * IOBufferMemoryDescriptor::getBytesNoCopy()
{
- if (kIOMemoryTypePhysical64 == (_flags & kIOMemoryTypeMask))
+ if (kIOMemoryTypePhysical == (_flags & kIOMemoryTypeMask))
return _buffer;
else
- return (void *)_ranges.v64->address;
+ return (void *)_singleRange.v.address;
}
@@ -570,19 +629,18 @@
IOBufferMemoryDescriptor::getBytesNoCopy(vm_size_t start, vm_size_t withLength)
{
IOVirtualAddress address;
- if (kIOMemoryTypePhysical64 == (_flags & kIOMemoryTypeMask))
+ if (kIOMemoryTypePhysical == (_flags & kIOMemoryTypeMask))
address = (IOVirtualAddress) _buffer;
else
- address = _ranges.v64->address;
+ address = _singleRange.v.address;
if (start < _length && (start + withLength) <= _length)
return (void *)(address + start);
return 0;
}
-#ifndef __LP64__
-void * IOBufferMemoryDescriptor::getVirtualSegment(IOByteCount offset,
- IOByteCount * lengthOfSegment)
+/* DEPRECATED */ void * IOBufferMemoryDescriptor::getVirtualSegment(IOByteCount offset,
+/* DEPRECATED */ IOByteCount * lengthOfSegment)
{
void * bytes = getBytesNoCopy(offset, 0);
@@ -591,15 +649,9 @@
return bytes;
}
-#endif /* !__LP64__ */
-
-#ifdef __LP64__
-OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 0);
-OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 1);
-#else /* !__LP64__ */
+
OSMetaClassDefineReservedUsed(IOBufferMemoryDescriptor, 0);
OSMetaClassDefineReservedUsed(IOBufferMemoryDescriptor, 1);
-#endif /* !__LP64__ */
OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 2);
OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 3);
OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 4);