xnu-4903.241.1.tar.gz

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

diff --git a/iokit/Kernel/IOMemoryCursor.cpp b/iokit/Kernel/IOMemoryCursor.cpp
index 36a15009d6b4cd16bee266e0ccca655eabce94f3..3314a68a1587a0100794adf86658424501746b57 100644 (file)
--- a/iokit/Kernel/IOMemoryCursor.cpp
+++ b/iokit/Kernel/IOMemoryCursor.cpp
@@ -244,8 +244,13 @@ IOBigMemoryCursor::outputSegment(PhysicalSegment inSegment,
     IOPhysicalAddress * segment;
 
     segment = &((PhysicalSegment *) inSegments)[inSegmentIndex].location;
+#if IOPhysSize == 64
+    OSWriteBigInt64(segment, 0, inSegment.location);
+    OSWriteBigInt64(segment, sizeof(IOPhysicalAddress), inSegment.length);
+#else
     OSWriteBigInt(segment, 0, inSegment.location);
     OSWriteBigInt(segment, sizeof(IOPhysicalAddress), inSegment.length);
+#endif
 }
 
 IOBigMemoryCursor *
@@ -291,8 +296,13 @@ IOLittleMemoryCursor::outputSegment(PhysicalSegment inSegment,
     IOPhysicalAddress * segment;
 
     segment = &((PhysicalSegment *) inSegments)[inSegmentIndex].location;
+#if IOPhysSize == 64
+    OSWriteLittleInt64(segment, 0, inSegment.location);
+    OSWriteLittleInt64(segment, sizeof(IOPhysicalAddress), inSegment.length);
+#else
     OSWriteLittleInt(segment, 0, inSegment.location);
     OSWriteLittleInt(segment, sizeof(IOPhysicalAddress), inSegment.length);
+#endif
 }
 
 IOLittleMemoryCursor *
@@ -325,66 +335,3 @@ IOLittleMemoryCursor::initWithSpecification(IOPhysicalLength inMaxSegmentSize,
                                         inMaxTransferSize,
                                         inAlignment);
 }
-
-/************************* class IODBDMAMemoryCursor *************************/
-
-#if defined(__ppc__)
-
-#include <IOKit/ppc/IODBDMA.h>
-
-#undef super
-#define super IOMemoryCursor
-OSDefineMetaClassAndStructors(IODBDMAMemoryCursor, IOMemoryCursor)
-
-void 
-IODBDMAMemoryCursor::outputSegment(PhysicalSegment inSegment,
-                                   void *         inSegments,
-                                   UInt32         inSegmentIndex)
-{
-    IODBDMADescriptor *segment;
-
-    segment = &((IODBDMADescriptor *) inSegments)[inSegmentIndex];
-
-    // Write location into address field
-    OSWriteSwapInt32((UInt32 *) segment, 4, inSegment.location);
-
-    // Write count into 1st two bytes of operation field.
-    // DO NOT touch rest of operation field as it should contain a STOP command.
-    OSWriteSwapInt16((UInt16 *) segment, 0, inSegment.length);
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-IODBDMAMemoryCursor *
-IODBDMAMemoryCursor::withSpecification(IOPhysicalLength inMaxSegmentSize,
-                                       IOPhysicalLength inMaxTransferSize,
-                                       IOPhysicalLength inAlignment)
-{
-    IODBDMAMemoryCursor *me = new IODBDMAMemoryCursor;
-
-    if (me && !me->initWithSpecification(inMaxSegmentSize,
-                                         inMaxTransferSize,
-                                         inAlignment))
-    {
-        me->release();
-        return 0;
-    }
-
-    return me;
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-bool
-IODBDMAMemoryCursor::initWithSpecification(IOPhysicalLength inMaxSegmentSize,
-                                           IOPhysicalLength inMaxTransferSize,
-                                           IOPhysicalLength inAlignment)
-{
-    return super::initWithSpecification(&IODBDMAMemoryCursor::outputSegment,
-                                        inMaxSegmentSize,
-                                        inMaxTransferSize,
-                                        inAlignment);
-}
-
-#endif /* defined(__ppc__) */
-