Merge r5252 r5254 into 5.41-7.2 drivedb.h branches.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_5_41_DRIVEDB@5275 4ea69e1a-61f1-4043-bf83-b5c94c648137

smartmontools/drivedb.h

@@ -68,7 +68,7 @@
 /*
 const drive_settings builtin_knowndrives[] = {
  */
-  { "VERSION: 5.41/5236 2021-09-14 13:17:47 $Id$",
+  { "VERSION: 5.41/5254 2021-11-24 08:48:38 $Id$",
     "-", "-",
     "Version information",
     ""
@@ -1592,7 +1592,8 @@ const drive_settings builtin_knowndrives[] = {
   { "Intel S4510/S4610/S4500/S4600 Series SSDs", // INTEL SSDSC2KB480G7/SCV10100,
       // INTEL SSDSC2KB960G7/SCV10100, INTEL SSDSC2KB038T7/SCV10100,
       // INTEL SSDSC2KB038T7/SCV10121, INTEL SSDSC2KG240G7/SCV10100
-    "INTEL SSDSC(2K|KK)(B|G)(240G|480G|960G|019T|038T)(7|8).?",
+      // INTEL SSDSC2KB480GZ/7CV10100
+    "INTEL SSDSC(2K|KK)(B|G)(240G|480G|960G|019T|038T)(7|8|Z).?",
     "", "",
   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
   //"-v 9,raw24(raw8),Power_On_Hours "
@@ -1774,8 +1775,8 @@ const drive_settings builtin_knowndrives[] = {
       // PX-128M5M/1.05, PX-128M5S/1.05, PX-128M5Pro/1.05, PX-512M5Pro/1.06, PX-256M5P/1.01, PX-128M6S/1.03
       // (1.04/5 Firmware self-test log lifetime unit is bogus, possibly 1/256 hours)
       // PLEXTOR PX-256M6S+/1.00, PLEXTOR  PX-128M3/1.00, PLEXTOR PX-128M3/1.07, PLEXTOR PX-128M6V/1.04,
-      // PLEXTOR PX-128M6G-2242/1.01, PLEXTOR PX-512M7VC/1.05
-    "PLEXTOR  ?PX-(64|128|256|512|768)M(3P?|5[MPS]|5Pro|6[GMSV]|7VC)(\\+|-.*)?",
+      // PLEXTOR PX-128M6G-2242/1.01, PLEXTOR PX-512M7VC/1.05, PLEXTOR PX-512M8VC +/1.00
+    "PLEXTOR  ?PX-(64|128|256|512|768)M(3P?|5[MPS]|5Pro|6[GMSV]|[78]VC)(\\+|-.*| )?",
     "", "",
   //"-v 1,raw48,Raw_Read_Error_Rate "
   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "

smartmontools/drivedb.h.raw.asc

 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAABAgAGBQJhQKOqAAoJEPOHY87f0iVZjL0H/3Fq+VF1KbDo9Atu6fCmphI2
-7TC7Tbv8a8W53iB9nF6gMmf9KB69Eaky+3h6ne6EP33Zz2VSR01U5jALCCr7vLdd
-ZnRhJQY1P6NaIOIhoC9YbqGHQk2KtzjOOIBG3NjDFvZKtxNl9jfhb32BKstU1udg
-dzBlShKlKiQYz0D2gc2iHYuqlhX0cbcECnEMXwW0JpMD4nFwc0g+VbHxvZow8Laj
-vF50VvFdTXyKGhdMmY0vnN3IxLRgH/gyKDfU7ZJgTdDzCv1iv5DPOwIkUYh4YhaS
-Zeg23mxfNOAh2vb9QY7oPRWwovPPVoASOPxNRhQz8E+7bTjGhAl49FqijJZvKuU=
-=kU1Z
+iQEcBAABAgAGBQJhzH3MAAoJEPOHY87f0iVZIRQIAJjSS2eCgLRGFhpYPNAhfoMH
+PSGlF2mNy5mk29cfAYCJYin7QYZQMvxS9CYARMeJMK1h31sypyaYzm17nCFM/Gy1
+UY6x43CdNZWwNHJz43//R9MpoCaXiUrWY2/OQGDe0cZviFPEQMgYqACVncMwTVW1
+k4zCLV5VO6fBDeUtJDhmIWFhaLWwvTvzoOfgiu7OHUn9JWWtqaUZQwzJFz9++OLG
+OppYkaMrB520Dh2ot6D4pcTNpFtMQY24iMcASWBtk7b7O045Q9oI3riiwKNCJ1+2
+IqPERz+Wh/F4//BiJUBqnzb4NZRnt5rTHw2GMqFHKRTQvXuecxS792uInAB1b5E=
+=qjfQ
 -----END PGP SIGNATURE-----