Added ModeParameterHeader10 / LongLBAModeParameterBlockDescriptor

ISCSI/ISCSI.csproj

@@ -105,8 +105,10 @@
     <Compile Include="SCSI\SCSIReturnParameters\ModePages\CachingParametersPage.cs" />
     <Compile Include="SCSI\SCSIReturnParameters\ModePages\ControlModePage.cs" />
     <Compile Include="SCSI\SCSIReturnParameters\ModePages\InformationalExceptionsControlModePage.cs" />
+    <Compile Include="SCSI\SCSIReturnParameters\ModePages\LongLBAModeParameterBlockDescriptor.cs" />
     <Compile Include="SCSI\SCSIReturnParameters\ModePages\ModePage.cs" />
     <Compile Include="SCSI\SCSIReturnParameters\ModePages\ModePage0.cs" />
+    <Compile Include="SCSI\SCSIReturnParameters\ModePages\ModeParameterHeader10.cs" />
     <Compile Include="SCSI\SCSIReturnParameters\ModePages\ModeParameterHeader6.cs" />
     <Compile Include="SCSI\SCSIReturnParameters\ModePages\PowerConditionModePage.cs" />
     <Compile Include="SCSI\SCSIReturnParameters\ModePages\PowerConsumptionModePage.cs" />

ISCSI/SCSI/SCSIReturnParameters/ModePages/LongLBAModeParameterBlockDescriptor.cs

@@ -0,0 +1,42 @@
+/* Copyright (C) 2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+ * 
+ * You can redistribute this program and/or modify it under the terms of
+ * the GNU Lesser Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Utilities;
+
+namespace SCSI
+{
+    public class LongLBAModeParameterBlockDescriptor
+    {
+        public const int Length = 16;
+
+        public ulong NumberOfBlocks;
+        public uint Reserved;
+        public uint LogicalBlockLength;
+
+        public LongLBAModeParameterBlockDescriptor()
+        { 
+        }
+
+        public LongLBAModeParameterBlockDescriptor(byte[] buffer, int offset)
+        {
+            NumberOfBlocks = BigEndianConverter.ToUInt64(buffer, offset + 0);
+            Reserved = BigEndianConverter.ToUInt32(buffer, offset + 8);
+            LogicalBlockLength = BigEndianConverter.ToUInt32(buffer, offset + 12);
+        }
+
+        public byte[] GetBytes()
+        {
+            byte[] buffer = new byte[Length];
+            BigEndianWriter.WriteUInt64(buffer, 0, NumberOfBlocks);
+            BigEndianWriter.WriteUInt32(buffer, 8, Reserved);
+            BigEndianWriter.WriteUInt32(buffer, 12, LogicalBlockLength);
+            return buffer;
+        }
+    }
+}

ISCSI/SCSI/SCSIReturnParameters/ModePages/ModeParameterHeader10.cs

@@ -0,0 +1,61 @@
+/* Copyright (C) 2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+ * 
+ * You can redistribute this program and/or modify it under the terms of
+ * the GNU Lesser Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Utilities;
+
+namespace SCSI
+{
+    public class ModeParameterHeader10
+    {
+        public const int Length = 8;
+
+        public ushort ModeDataLength; // Excluding this field
+        public byte MediumType;
+        public bool WP;               // Write Protect, indicates that the medium is write-protected
+        public bool DPOFUA;         // DPO and FUA support
+        public bool LongLBA;
+        public ushort BlockDescriptorLength;
+
+        public ModeParameterHeader10()
+        {
+            ModeDataLength = 6;
+        }
+
+        public ModeParameterHeader10(byte[] buffer, int offset)
+        {
+            ModeDataLength = BigEndianConverter.ToUInt16(buffer, offset + 0);
+            MediumType = ByteReader.ReadByte(buffer, offset + 2);
+            WP = ((buffer[offset + 3] & 0x80) != 0);
+            DPOFUA = ((buffer[offset + 3] & 0x10) != 0);
+            LongLBA = ((buffer[offset + 4] & 0x01) != 0);
+            BlockDescriptorLength = BigEndianConverter.ToUInt16(buffer, offset + 6);
+        }
+
+        public byte[] GetBytes()
+        {
+            byte[] buffer = new byte[Length];
+            BigEndianWriter.WriteUInt16(buffer, 0, ModeDataLength);
+            ByteWriter.WriteByte(buffer, 2, MediumType);
+            if (WP)
+            {
+                buffer[3] |= 0x80;
+            }
+            if (DPOFUA)
+            {
+                buffer[3] |= 0x10;
+            }
+            if (LongLBA)
+            {
+                buffer[4] |= 0x01;
+            }
+            BigEndianWriter.WriteUInt16(buffer, 6, BlockDescriptorLength);
+            return buffer;
+        }
+    }
+}

ISCSI/SCSI/SCSIReturnParameters/ModePages/ModeParameterHeader6.cs

@@ -15,10 +15,10 @@ namespace SCSI
     {
         public const int Length = 4;
 
-        public byte ModeDataLength; // excluding this byte
+        public byte ModeDataLength; // Excluding this byte
         public byte MediumType;
-        public bool WP;     // Write Protect, indicates that the medium is write-protected
-        public bool DPOFUA; // DPO and FUA support
+        public bool WP;             // Write Protect, indicates that the medium is write-protected
+        public bool DPOFUA;         // DPO and FUA support
         public byte BlockDescriptorLength;
 
         public ModeParameterHeader6()
@@ -30,8 +30,8 @@ namespace SCSI
         {
             ModeDataLength = buffer[offset + 0];
             MediumType = buffer[offset + 1];
-            WP = (buffer[offset + 2] & 0x80) != 0;
-            DPOFUA = (buffer[offset + 2] & 0x10) != 0;
+            WP = ((buffer[offset + 2] & 0x80) != 0);
+            DPOFUA = ((buffer[offset + 2] & 0x10) != 0);
             BlockDescriptorLength = buffer[offset + 3];
         }