From 3fa1cac1a481cefa74f3bdcf5674079828a6525d Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 28 Sep 2017 19:48:23 +0000 Subject: [PATCH] Corrected how CSD is prettyfied. --- MMC/CSD.cs | 7 ++++--- SecureDigital/CSD.cs | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/MMC/CSD.cs b/MMC/CSD.cs index dcd983f..5aed6bb 100644 --- a/MMC/CSD.cs +++ b/MMC/CSD.cs @@ -491,15 +491,16 @@ namespace DiscImageChef.Decoders.MMC break; } - unitFactor = Convert.ToDouble(string.Format("{0:X}", csd.EraseGroupSize)); - multiplier = Convert.ToDouble(string.Format("{0:X}", csd.EraseGroupSizeMultiplier)); + // TODO: Check specification + unitFactor = Convert.ToDouble(csd.EraseGroupSize); + multiplier = Convert.ToDouble(csd.EraseGroupSizeMultiplier); result = (unitFactor + 1) * (multiplier + 1); sb.AppendFormat("\tDevice can erase a minimum of {0} blocks at a time", (int)result).AppendLine(); if(csd.WriteProtectGroupEnable) { sb.AppendLine("\tDevice can write protect regions"); - unitFactor = Convert.ToDouble(string.Format("{0:X}", csd.WriteProtectGroupSize)); + unitFactor = Convert.ToDouble(csd.WriteProtectGroupSize); sb.AppendFormat("\tDevice can write protect a minimum of {0} blocks at a time", (int)(result + 1)).AppendLine(); } else diff --git a/SecureDigital/CSD.cs b/SecureDigital/CSD.cs index 3bf580a..e2eb53f 100644 --- a/SecureDigital/CSD.cs +++ b/SecureDigital/CSD.cs @@ -500,13 +500,14 @@ namespace DiscImageChef.Decoders.SecureDigital if(csd.EraseBlockEnable) sb.AppendLine("\tDevice can erase multiple blocks"); - sb.AppendFormat("\tDevice must erase a minimum of {0} blocks at a time", Convert.ToUInt32(string.Format("{0:X}", csd.EraseSectorSize)) + 1).AppendLine(); - + // TODO: Check specification + sb.AppendFormat("\tDevice must erase a minimum of {0} blocks at a time", Convert.ToUInt32(csd.EraseSectorSize) + 1).AppendLine(); if(csd.WriteProtectGroupEnable) { sb.AppendLine("\tDevice can write protect regions"); - unitFactor = Convert.ToDouble(string.Format("{0:X}", csd.WriteProtectGroupSize)); + // TODO: Check specification + unitFactor = Convert.ToDouble(csd.WriteProtectGroupSize); sb.AppendFormat("\tDevice can write protect a minimum of {0} blocks at a time", (int)(result + 1)).AppendLine(); } else