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_43_DRIVEDB@5275 4ea69e1a-61f1-4043-bf83-b5c94c648137

smartmontools/drivedb.h

@@ -68,7 +68,7 @@
 /*
 const drive_settings builtin_knowndrives[] = {
  */
-  { "VERSION: 5.43/5236 2021-09-14 13:17:47 $Id$",
+  { "VERSION: 5.43/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-----
 
-iQEcBAABAgAGBQJhQKOqAAoJEPOHY87f0iVZF3EH/3eqildqkpe4F63dOEC7f73g
-1pCjfinInOT6U2X5QeI0YjgyzjM8y0y1ecl9575tLvJCcs9TZ3bCWYVGNZoEJ0vF
-5i/u6TArPBGSB6MB0NCYKw69fskSsIBlRS0TaFJ2GjgeygtoRH4sdDG+9+RlTbgt
-jukRHm5QhOFCJlYRJH2PpURe6HCzw9Tpq2OP6thgYq/1ERezR/ubPUx0qQFltYqe
-0h0p9V5QBQYtqSfgQ1t1t8Twey/Xj2hWxAdjlSG0rNea9F65UufkHWYY7YxFoi4Z
-W1ynNKjfDwY49DhBG6h/yPhUa99gO87e+VMPnffNrc24Tl/gZUPKIsFrZuXEfSk=
-=/Oyc
+iQEcBAABAgAGBQJhzH3MAAoJEPOHY87f0iVZq4IH/RZa/Sf9/t1RMsQ5wiLPeUwB
+N6C9Y1qro/l6N36Wk6V9xBbfQIDDZSLyFUjnT1IK06Y6Gq2jUVeQ9UH7t5tdelz9
+iGbLpCRmtPgQX6a49ld13fbkVcE2pZxXvGK3Vt7t3mRYZzykZwBl4bJXPvzuY7LN
+5M9N45p3eaSNYN2Fm6DEEGeprszFsHVIXKpRn1pCKUJGL4j4qhEkQL3zntThb2JD
+0T53ZRngZR52jdlM5kqL7C65uVnH1L6FUhpIqiMrcT/riYGjY2x5KzcHJkfJ0ReG
+vZBU+/xKHNWMPradZpc4EmzkAcp38DSSfwMGualksc0r8CULZt6Gwnz6RCZk9FI=
+=KbDD
 -----END PGP SIGNATURE-----