From f27ad69f96806153cf9f2fc8c6b973969de90293 Mon Sep 17 00:00:00 2001
From: ballen4705 <ballen4705@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Fri, 16 Apr 2004 13:48:45 +0000
Subject: [PATCH] More Samsung cleanup (what a mess...)

git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1675 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 sm5/knowndrives.c   | 68 ++++++++++++++++-----------------------------
 sm5/knowndrives.cpp | 68 ++++++++++++++++-----------------------------
 2 files changed, 48 insertions(+), 88 deletions(-)

diff --git a/sm5/knowndrives.c b/sm5/knowndrives.c
index ab8ec5a42..c5c7c976d 100644
--- a/sm5/knowndrives.c
+++ b/sm5/knowndrives.c
@@ -26,7 +26,7 @@
 #include "utility.h" // includes <regex.h>
 #include "config.h"
 
-const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.101 2004/04/16 13:23:48 ballen4705 Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.102 2004/04/16 13:48:45 ballen4705 Exp $"
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
 
 #define MODEL_STRING_LENGTH                         40
@@ -217,30 +217,6 @@ const drivesettings knowndrives[] = {
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { // SAMSUNG SP1213N (TL100-23 firmware)
-    "^SAMSUNG SP1213N$",
-    "^TL100-23$",
-    NULL,
-    vendoropts_Samsung_SV4012H,
-    specialpurpose_reverse_samsung2,
-    same_as_minus_F2
-  },
-  { // SAMSUNG SP0802N (TK100-23 firmware)
-    "^SAMSUNG SP0802N$",
-    "^TK100-23$",
-    NULL,
-    vendoropts_Samsung_SV4012H,
-    specialpurpose_reverse_samsung2,
-    same_as_minus_F2
-  },
-  { // Any other Samsung disk with *-23 *-24 firmware
-    "^SAMSUNG .*$",
-    ".*-2[34]$",
-    may_need_minus_F2_disabled,
-    vendoropts_Samsung_SV4012H,
-    specialpurpose_reverse_samsung2,
-    same_as_minus_F2
-  },
   { // Samsung SV4012H (all other firmware)
     "^SAMSUNG SV4012H$",
     ".*",
@@ -249,47 +225,39 @@ const drivesettings knowndrives[] = {
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { // Samsung SV1204H (known firmware)
-    "^SAMSUNG SV1204H$",
-    "^RK100-1[3-5]$",
+  { // Samsung SV0412H (known firmware)
+    "^SAMSUNG SV0412H$",
+    "^SK100-01$",
     NULL,
     vendoropts_Samsung_SV1204H,
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { //Samsung SV1204H (all other firmware)
-    "^SAMSUNG SV1204H$",
+  { // Samsung SV0412H (all other firmware)
+    "^SAMSUNG SV0412H$",
     ".*",
     may_need_minus_F_disabled,
     vendoropts_Samsung_SV1204H,
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { // Samsung SV0412H (known firmware)
-    "^SAMSUNG SV0412H$",
-    "^SK100-01$",
+  { // Samsung SV1204H (known firmware)
+    "^SAMSUNG SV1204H$",
+    "^RK100-1[3-5]$",
     NULL,
     vendoropts_Samsung_SV1204H,
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { // Samsung SV0412H (all other firmware)
-    "^SAMSUNG SV0412H$",
+  { //Samsung SV1204H (all other firmware)
+    "^SAMSUNG SV1204H$",
     ".*",
     may_need_minus_F_disabled,
     vendoropts_Samsung_SV1204H,
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { //Samsung SP1604N, tested with FW TM100-23 and TM100-24
-    "^SAMSUNG SP1604N$",
-    ".*-2[34]",
-    may_need_minus_F2_disabled,
-    vendoropts_Samsung_SV4012H,
-    specialpurpose_reverse_samsung2,
-    same_as_minus_F2
-  },
-  { //SAMSUNG SV0322A with FW JK200-35
+  { //SAMSUNG SV0322A tested with FW JK200-35
     "^SAMSUNG SV0322A$",
     ".*",
     NULL,
@@ -305,6 +273,18 @@ const drivesettings knowndrives[] = {
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
+  { 
+    // Any other Samsung disk with *-23 *-24 firmware
+    // SAMSUNG SP1213N (TL100-23 firmware)
+    // SAMSUNG SP0802N (TK100-23 firmware)
+    // Samsung SP1604N, tested with FW TM100-23 and TM100-24
+    "^SAMSUNG .*$",
+    ".*-2[34]$",
+    NULL,
+    vendoropts_Samsung_SV4012H,
+    specialpurpose_reverse_samsung2,
+    same_as_minus_F2
+  },
   { // All Samsung drives with '.*-25' firmware
     "^SAMSUNG.*",
     ".*-25$",
diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp
index 0ec8e6193..3f56dd0bb 100644
--- a/sm5/knowndrives.cpp
+++ b/sm5/knowndrives.cpp
@@ -26,7 +26,7 @@
 #include "utility.h" // includes <regex.h>
 #include "config.h"
 
-const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.101 2004/04/16 13:23:48 ballen4705 Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.102 2004/04/16 13:48:45 ballen4705 Exp $"
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
 
 #define MODEL_STRING_LENGTH                         40
@@ -217,30 +217,6 @@ const drivesettings knowndrives[] = {
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { // SAMSUNG SP1213N (TL100-23 firmware)
-    "^SAMSUNG SP1213N$",
-    "^TL100-23$",
-    NULL,
-    vendoropts_Samsung_SV4012H,
-    specialpurpose_reverse_samsung2,
-    same_as_minus_F2
-  },
-  { // SAMSUNG SP0802N (TK100-23 firmware)
-    "^SAMSUNG SP0802N$",
-    "^TK100-23$",
-    NULL,
-    vendoropts_Samsung_SV4012H,
-    specialpurpose_reverse_samsung2,
-    same_as_minus_F2
-  },
-  { // Any other Samsung disk with *-23 *-24 firmware
-    "^SAMSUNG .*$",
-    ".*-2[34]$",
-    may_need_minus_F2_disabled,
-    vendoropts_Samsung_SV4012H,
-    specialpurpose_reverse_samsung2,
-    same_as_minus_F2
-  },
   { // Samsung SV4012H (all other firmware)
     "^SAMSUNG SV4012H$",
     ".*",
@@ -249,47 +225,39 @@ const drivesettings knowndrives[] = {
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { // Samsung SV1204H (known firmware)
-    "^SAMSUNG SV1204H$",
-    "^RK100-1[3-5]$",
+  { // Samsung SV0412H (known firmware)
+    "^SAMSUNG SV0412H$",
+    "^SK100-01$",
     NULL,
     vendoropts_Samsung_SV1204H,
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { //Samsung SV1204H (all other firmware)
-    "^SAMSUNG SV1204H$",
+  { // Samsung SV0412H (all other firmware)
+    "^SAMSUNG SV0412H$",
     ".*",
     may_need_minus_F_disabled,
     vendoropts_Samsung_SV1204H,
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { // Samsung SV0412H (known firmware)
-    "^SAMSUNG SV0412H$",
-    "^SK100-01$",
+  { // Samsung SV1204H (known firmware)
+    "^SAMSUNG SV1204H$",
+    "^RK100-1[3-5]$",
     NULL,
     vendoropts_Samsung_SV1204H,
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { // Samsung SV0412H (all other firmware)
-    "^SAMSUNG SV0412H$",
+  { //Samsung SV1204H (all other firmware)
+    "^SAMSUNG SV1204H$",
     ".*",
     may_need_minus_F_disabled,
     vendoropts_Samsung_SV1204H,
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { //Samsung SP1604N, tested with FW TM100-23 and TM100-24
-    "^SAMSUNG SP1604N$",
-    ".*-2[34]",
-    may_need_minus_F2_disabled,
-    vendoropts_Samsung_SV4012H,
-    specialpurpose_reverse_samsung2,
-    same_as_minus_F2
-  },
-  { //SAMSUNG SV0322A with FW JK200-35
+  { //SAMSUNG SV0322A tested with FW JK200-35
     "^SAMSUNG SV0322A$",
     ".*",
     NULL,
@@ -305,6 +273,18 @@ const drivesettings knowndrives[] = {
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
+  { 
+    // Any other Samsung disk with *-23 *-24 firmware
+    // SAMSUNG SP1213N (TL100-23 firmware)
+    // SAMSUNG SP0802N (TK100-23 firmware)
+    // Samsung SP1604N, tested with FW TM100-23 and TM100-24
+    "^SAMSUNG .*$",
+    ".*-2[34]$",
+    NULL,
+    vendoropts_Samsung_SV4012H,
+    specialpurpose_reverse_samsung2,
+    same_as_minus_F2
+  },
   { // All Samsung drives with '.*-25' firmware
     "^SAMSUNG.*",
     ".*-25$",
-- 
GitLab