aaru-dps/Aaru.Decoders
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Decoders.git synced 2025-12-16 19:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use object initializer.

Browse Source
This commit is contained in:
Natalia Portillo
2022-11-14 01:23:52 +00:00
parent 83612d6084
commit f9e9b07584
3 changed files with 82 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
DVD/PRI.cs
View File

@@ -63,17 +63,17 @@ public static class PRI
if(response.Length < 67)
return null;
var pri = new PreRecordedInformation();
pri.DataLength = (ushort)((response[0] << 8) + response[1]);
pri.Reserved1 = response[2];
pri.Reserved2 = response[3];
pri.FieldId1 = response[4];
pri.FieldId2 = response[12];
pri.FieldId3 = response[20];
pri.FieldId4 = response[28];
pri.FieldId5 = response[36];
var pri = new PreRecordedInformation
{
DataLength = (ushort)((response[0] << 8) + response[1]),
Reserved1 = response[2],
Reserved2 = response[3],
FieldId1 = response[4],
FieldId2 = response[12],
FieldId3 = response[20],
FieldId4 = response[28],
FieldId5 = response[36]
};
if(pri.FieldId1 != 1 ||
pri.FieldId2 != 2 ||

68
LisaTag.cs
View File

@@ -185,22 +185,24 @@ public static class LisaTag
if(snTag == null)
return null;
pmTag = new PriamTag();
pmTag.AbsPage = 0;
pmTag.Checksum = 0;
pmTag.DiskSize = 0;
pmTag.FileId = snTag.Value.FileId;
pmTag.Kind = snTag.Value.Kind;
pmTag.NextBlock = snTag.Value.NextBlock;
pmTag.PrevBlock = snTag.Value.PrevBlock;
pmTag.RelPage = snTag.Value.RelPage;
pmTag.Reserved = snTag.Value.Reserved;
pmTag.UsedBytes = 0;
pmTag.ValidChk = false;
pmTag.Version = snTag.Value.Version;
pmTag.Volume = snTag.Value.Volume;
pmTag.IsFirst = snTag.Value.IsFirst;
pmTag.IsLast = snTag.Value.IsLast;
pmTag = new PriamTag
{
AbsPage = 0,
Checksum = 0,
DiskSize = 0,
FileId = snTag.Value.FileId,
Kind = snTag.Value.Kind,
NextBlock = snTag.Value.NextBlock,
PrevBlock = snTag.Value.PrevBlock,
RelPage = snTag.Value.RelPage,
Reserved = snTag.Value.Reserved,
UsedBytes = 0,
ValidChk = false,
Version = snTag.Value.Version,
Volume = snTag.Value.Volume,
IsFirst = snTag.Value.IsFirst,
IsLast = snTag.Value.IsLast
};
return pmTag;
case 20:
@@ -209,22 +211,24 @@ public static class LisaTag
if(phTag == null)
return null;
pmTag = new PriamTag();
pmTag.AbsPage = phTag.Value.AbsPage;
pmTag.Checksum = phTag.Value.Checksum;
pmTag.DiskSize = 0;
pmTag.FileId = phTag.Value.FileId;
pmTag.Kind = phTag.Value.Kind;
pmTag.NextBlock = phTag.Value.NextBlock;
pmTag.PrevBlock = phTag.Value.PrevBlock;
pmTag.RelPage = phTag.Value.RelPage;
pmTag.Reserved = phTag.Value.Reserved;
pmTag.UsedBytes = phTag.Value.UsedBytes;
pmTag.ValidChk = phTag.Value.ValidChk;
pmTag.Version = phTag.Value.Version;
pmTag.Volume = phTag.Value.Volume;
pmTag.IsFirst = phTag.Value.IsFirst;
pmTag.IsLast = phTag.Value.IsLast;
pmTag = new PriamTag
{
AbsPage = phTag.Value.AbsPage,
Checksum = phTag.Value.Checksum,
DiskSize = 0,
FileId = phTag.Value.FileId,
Kind = phTag.Value.Kind,
NextBlock = phTag.Value.NextBlock,
PrevBlock = phTag.Value.PrevBlock,
RelPage = phTag.Value.RelPage,
Reserved = phTag.Value.Reserved,
UsedBytes = phTag.Value.UsedBytes,
ValidChk = phTag.Value.ValidChk,
Version = phTag.Value.Version,
Volume = phTag.Value.Volume,
IsFirst = phTag.Value.IsFirst,
IsLast = phTag.Value.IsLast
};
return pmTag;
case 24: return DecodePriamTag(tag);

65
SCSI/MMC/AACS.cs
View File

@@ -59,13 +59,14 @@ public static class AACS
if(AACSVIResponse == null)
return null;
var decoded = new AACSVolumeIdentifier();
var decoded = new AACSVolumeIdentifier
{
VolumeIdentifier = new byte[AACSVIResponse.Length - 4],
DataLength = BigEndianBitConverter.ToUInt16(AACSVIResponse, 0),
Reserved1 = AACSVIResponse[2],
Reserved2 = AACSVIResponse[3]
};
decoded.VolumeIdentifier = new byte[AACSVIResponse.Length - 4];
decoded.DataLength = BigEndianBitConverter.ToUInt16(AACSVIResponse, 0);
decoded.Reserved1 = AACSVIResponse[2];
decoded.Reserved2 = AACSVIResponse[3];
Array.Copy(AACSVIResponse, 4, decoded.VolumeIdentifier, 0, AACSVIResponse.Length - 4);
return decoded;
@@ -105,13 +106,14 @@ public static class AACS
if(AACSMSNResponse == null)
return null;
var decoded = new AACSMediaSerialNumber();
var decoded = new AACSMediaSerialNumber
{
MediaSerialNumber = new byte[AACSMSNResponse.Length - 4],
DataLength = BigEndianBitConverter.ToUInt16(AACSMSNResponse, 0),
Reserved1 = AACSMSNResponse[2],
Reserved2 = AACSMSNResponse[3]
};
decoded.MediaSerialNumber = new byte[AACSMSNResponse.Length - 4];
decoded.DataLength = BigEndianBitConverter.ToUInt16(AACSMSNResponse, 0);
decoded.Reserved1 = AACSMSNResponse[2];
decoded.Reserved2 = AACSMSNResponse[3];
Array.Copy(AACSMSNResponse, 4, decoded.MediaSerialNumber, 0, AACSMSNResponse.Length - 4);
return decoded;
@@ -151,13 +153,14 @@ public static class AACS
if(AACSMIResponse == null)
return null;
var decoded = new AACSMediaIdentifier();
var decoded = new AACSMediaIdentifier
{
MediaIdentifier = new byte[AACSMIResponse.Length - 4],
DataLength = BigEndianBitConverter.ToUInt16(AACSMIResponse, 0),
Reserved1 = AACSMIResponse[2],
Reserved2 = AACSMIResponse[3]
};
decoded.MediaIdentifier = new byte[AACSMIResponse.Length - 4];
decoded.DataLength = BigEndianBitConverter.ToUInt16(AACSMIResponse, 0);
decoded.Reserved1 = AACSMIResponse[2];
decoded.Reserved2 = AACSMIResponse[3];
Array.Copy(AACSMIResponse, 4, decoded.MediaIdentifier, 0, AACSMIResponse.Length - 4);
return decoded;
@@ -197,13 +200,14 @@ public static class AACS
if(AACSMKBResponse == null)
return null;
var decoded = new AACSMediaKeyBlock();
var decoded = new AACSMediaKeyBlock
{
MediaKeyBlockPacks = new byte[AACSMKBResponse.Length - 4],
DataLength = BigEndianBitConverter.ToUInt16(AACSMKBResponse, 0),
Reserved = AACSMKBResponse[2],
TotalPacks = AACSMKBResponse[3]
};
decoded.MediaKeyBlockPacks = new byte[AACSMKBResponse.Length - 4];
decoded.DataLength = BigEndianBitConverter.ToUInt16(AACSMKBResponse, 0);
decoded.Reserved = AACSMKBResponse[2];
decoded.TotalPacks = AACSMKBResponse[3];
Array.Copy(AACSMKBResponse, 4, decoded.MediaKeyBlockPacks, 0, AACSMKBResponse.Length - 4);
return decoded;
@@ -242,13 +246,14 @@ public static class AACS
if(AACSDKResponse == null)
return null;
var decoded = new AACSDataKeys();
var decoded = new AACSDataKeys
{
DataKeys = new byte[AACSDKResponse.Length - 4],
DataLength = BigEndianBitConverter.ToUInt16(AACSDKResponse, 0),
Reserved1 = AACSDKResponse[2],
Reserved2 = AACSDKResponse[3]
};
decoded.DataKeys = new byte[AACSDKResponse.Length - 4];
decoded.DataLength = BigEndianBitConverter.ToUInt16(AACSDKResponse, 0);
decoded.Reserved1 = AACSDKResponse[2];
decoded.Reserved2 = AACSDKResponse[3];
Array.Copy(AACSDKResponse, 4, decoded.DataKeys, 0, AACSDKResponse.Length - 4);
return decoded;