From bc6ce2372d54167c3734c7801cf97f785b2f0ef6 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 4 Nov 2020 19:08:37 +0000 Subject: [PATCH] Add detection of SyQuest SQ400. --- MediaTypeFromDevice/FromSbc.cs | 10 +++++----- Metadata/Dimensions.cs | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/MediaTypeFromDevice/FromSbc.cs b/MediaTypeFromDevice/FromSbc.cs index 751e70ac5..b74999e71 100644 --- a/MediaTypeFromDevice/FromSbc.cs +++ b/MediaTypeFromDevice/FromSbc.cs @@ -348,11 +348,6 @@ namespace Aaru.CommonTypes blocks); return MediaType.Bernoulli10; - case 173400 when vendor.ToLowerInvariant() == "syquest": - AaruConsole.DebugWriteLine("Media detection", - "Drive manufacturer is SyQuest, media has 173400 blocks of 256 bytes, setting media type to SQ400."); - - return MediaType.SQ400; } break; @@ -519,6 +514,11 @@ namespace Aaru.CommonTypes "Drive manufacturer is IOMEGA, media has 78882 blocks of 512 bytes, setting media type to PocketZIP."); return MediaType.PocketZip; + case 86700 when vendor.ToLowerInvariant() == "syquest": + AaruConsole.DebugWriteLine("Media detection", + "Drive manufacturer is SyQuest, media has 86700 blocks of 512 bytes, setting media type to SQ400."); + + return MediaType.SQ400; case 87040 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase): AaruConsole.DebugWriteLine("Media detection", "Drive manufacturer is IOMEGA, media has 87040 blocks of 512 bytes, setting media type to 44Mb Bernoulli Box II."); diff --git a/Metadata/Dimensions.cs b/Metadata/Dimensions.cs index 9552349c1..9e2faf13f 100644 --- a/Metadata/Dimensions.cs +++ b/Metadata/Dimensions.cs @@ -703,7 +703,9 @@ namespace Aaru.CommonTypes.Metadata dmns.Thickness = 9.5; return dmns; + case CommonTypes.MediaType.SQ400: case CommonTypes.MediaType.SQ800: + case CommonTypes.MediaType.SQ2000: dmns.Height = 137; dmns.HeightSpecified = true; dmns.Width = 137;