diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 25e16b0e602aadb708edae61c9d11e6ebc6f92c3..da5b4a99abcfb04769f0b6d2813756e9d461fced 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -715,8 +715,9 @@ const drive_settings builtin_knowndrives[] = {
"GOODRAM IRIDIUM PRO|" // tested with GOODRAM IRIDIUM PRO/SAFM01.5
"IR-SSDPR-S25A-(120|240|480|960)|" // Goodram IRIDM, tested with IR-SSDPR-S25A-120/SBFM91.3,
// IR-SSDPR-S25A-240/SBFM91.2
- "KINGSTON O(C|M8)P0S3(64|128|256|512)B-A0|" // tested with KINGSTON OCP0S364B-A0/SBFK62A3,
- // KINGSTON OM8P0S364B-A0/SBFK62A3
+ "KINGSTON O(C|M[48S])P0S3(64|128|256|512)B-[0A]0|" // tested with KINGSTON OCP0S364B-A0/SBFK62A3,
+ // KINGSTON OM4P0S3256B-A0/SBFK62A3, KINGSTON OM8P0S364B-A0/SBFK62A3,
+ // KINGSTON OMSP0S3128B-00/SBFK62A3
"KINGSTON SEDC400S37(400|480|800|960|1600|1800)G|" // DC400, tested with
// KINGSTON SEDC400S37480G/SAFM02.[GH], KINGSTON SEDC400S37960G/SAFM32.I
"KINGSTON SEDC(450R|500[MR])(480|960|1920|3840|7680)G|" // DC450R, DC500M/R, tested with
@@ -1113,9 +1114,9 @@ const drive_settings builtin_knowndrives[] = {
"-v 241,raw48,Host_Writes_32MiB "
"-v 242,raw48,Host_Reads_32MiB"
},
- { "InnoDisk iCF 9000 CompactFlash Cards", // tested with InnoDisk Corp. - iCF9000 1GB/140808,
- // ..., InnoDisk Corp. - iCF9000 64GB/140808
- "InnoDisk Corp\\. - iCF9000 (1|2|4|8|16|32|64)GB",
+ { "InnoDisk iCF 9000 / 1SE2 Cards", // tested with InnoDisk Corp. - iCF9000 1GB/140808,
+ // InnoDisk Corp. - iCF9000 64GB/140808, InnoDisk Corp. - EDC 1SE2 H 64GB/131216
+ "InnoDisk Corp\\. - (iCF9000|EDC 1SE2 H) (1|2|4|8|16|32|64)GB",
"", "",
//"-v 1,raw48,Raw_Read_Error_Rate "
//"-v 5,raw16(raw16),Reallocated_Sector_Ct "
@@ -1928,10 +1929,12 @@ const drive_settings builtin_knowndrives[] = {
"SanDisk (SDSSDHII|Ultra II )[0-9]*GB?|" // Ultra II (88SS9190/88SS9189), tested with
// SanDisk SDSSDHII120G/X31200RL, SanDisk Ultra II 960GB/X41100RL
"SanDisk SDSSDH2(128|256)G|" // SanDisk SDSSDH2128G/X211200
- "SanDisk SDSSDH3((250|500|1000|1024|2000)G| 4T00)|" // Ultra 3D, tested with SanDisk SDSSDH3250G/X61170RL,
- // SanDisk SDSSDH3500G/X61110RL, SanDisk SDSSDH31024G/X6107000, SanDisk SDSSDH3 4T00/411040RL
+ "SanDisk SDSSDH3((250|500|1000|1024|2000)G| [24]T00)|" // Ultra 3D, tested with SanDisk SDSSDH3250G/X61170RL,
+ // SanDisk SDSSDH3500G/X61110RL, SanDisk SDSSDH31024G/X6107000, SanDisk SDSSDH3 2T00/411040RL,
+ // SanDisk SDSSDH3 4T00/411040RL
"SanDisk SDSSDXPS?[0-9]*G|" // Extreme II/Pro (88SS9187), tested with SanDisk SDSSDXP480G/R1311,
// SanDisk SDSSDXPS480G/X21200RL
+ "SanDisk SSD G5 BICS4|" // WD Blue SSD WDS100T2B0A (#1378), tested with SanDisk SSD G5 BICS4/415000WD
"SanDisk SSD PLUS (120|240|480|1000) ?GB|" // Plus (88SS1074), tested with SanDisk SSD PLUS 120 GB/UE3000RL,
// SanDisk SSD PLUS 120 GB/UE4500RL, SanDisk SSD PLUS 1000GB/UH4400RL
"SSD SATAIII 16GB", // SSD SATAIII 16GB/i221100 (see #923)
@@ -1974,7 +1977,7 @@ const drive_settings builtin_knowndrives[] = {
"SanDisk SSD i100 [0-9]*GB|" // tested with SanDisk SSD i100 8GB/11.56.04, 24GB/11.56.04
"SanDisk SSD U100 ([0-9]*GB|SMG2)|" // tested with SanDisk SSD U100 8GB/10.56.00, 256GB/10.01.02, SMG2/10.56.04
"SanDisk SSD U110 (8|16|24|32|64|128)GB|" // tested with SanDisk SSD U110 32GB/U221000
- "SanDisk SDSA6MM-.*|" // tested with SanDisk SDSA6MM-016G-1006/U221006
+ "SanDisk SDSA6[GM]M-[0-9]*G-.*|" // tested with SanDisk SDSA6GM-016G-1006/U221006, SanDisk SDSA6MM-016G-1006/U221006
"SanDisk SD7[SU]B[23]Q(064|128|256|512)G.*", // tested with SD7SB3Q064G1122/SD7UB3Q256G1122/SD7SB3Q128G/SD7UB2Q512G1122
"", "",
//"-v 5,raw16(raw16),Reallocated_Sector_Ct "
@@ -3596,6 +3599,11 @@ const drive_settings builtin_knowndrives[] = {
"TOSHIBA MK(32|50|64|75)75GSX",
"", "", ""
},
+ { "Toshiba 2.5\" HDD MK..76GSX/GS001A", // tested with TOSHIBA MK2576GSX/GS001A
+ "TOSHIBA MK(16|25|32|50|64)76GSX",
+ "GS001A",
+ "", ""
+ },
{ "Toshiba 2.5\" HDD MK..76GSX", // tested with TOSHIBA MK3276GSX/GS002D
"TOSHIBA MK(16|25|32|50|64)76GSX",
"",
@@ -3690,6 +3698,14 @@ const drive_settings builtin_knowndrives[] = {
"TOSHIBA HDWD1(30|20|10|05)",
"", "", ""
},
+ { "Toshiba L200 (CMR)",
+ "TOSHIBA HDW[JK]1(05|10)",
+ "", "", ""
+ },
+ { "Toshiba L200 (SMR)", // tested with TOSHIBA HDWL110/JU000A. TOSHIBA HDWL120/JT000A
+ "TOSHIBA HDWL1[12]0",
+ "", "", ""
+ },
{ "Toshiba 1.8\" HDD",
"TOSHIBA MK[23468]00[4-9]GA[HL]",
"", "", ""
@@ -4504,8 +4520,9 @@ const drive_settings builtin_knowndrives[] = {
"", "", ""
},
{ "Western Digital Blue", // tested with WDC WD5000AZLX-00K4KA0/80.00A80,
- // WDC WD10EZEX-00RKKA0/80.00A80, WDC WD10EZEX-75M2NA0/01.01A01, WDC WD40EZRZ-00WN9B0/80.00A80
- "WDC WD((25|32|50)00AAKX|5000AZ(LX|RZ)|7500A(AL|ZE)X|10E(AL|ZE)X|[1-6]0EZRZ)-.*",
+ // WDC WD10EZEX-00RKKA0/80.00A80, WDC WD10EZEX-75M2NA0/01.01A01, WDC WD40EZRZ-00WN9B0/80.00A80,
+ // APPLE HDD WDC WD10EALX-408EA0/07.01D03
+ "(APPLE HDD )?WDC WD((25|32|50)00AAKX|5000AZ(LX|RZ)|7500A(AL|ZE)X|10E(AL|ZE)X|[1-6]0EZRZ)-.*",
"", "", ""
},
{ "Western Digital Blue (SMR)", // ticket #1313
@@ -4642,8 +4659,8 @@ const drive_settings builtin_knowndrives[] = {
"WDC WD(4|6|8|10|12|16|25)00BEAS-.*",
"", "", ""
},
- { "Western Digital Scorpio Blue Serial ATA",
- "WDC WD((4|6|8|10|12|16|25)00BEVS|(8|12|16|25|32|40|50|64)00BEVT|7500KEVT|10TEVT)-.*",
+ { "Western Digital Scorpio Blue Serial ATA", // tested with WDC WD3200BEVS-08VAT2/14.01A14
+ "WDC WD((4|6|8|10|12|16|25|32)00BEVS|(8|12|16|25|32|40|50|64)00BEVT|7500KEVT|10TEVT)-.*",
"", "", ""
},
{ "Western Digital Scorpio Blue Serial ATA (AF)", // tested with
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index b2bc1cc4c751ef1a7223ea794ac4fe3b5a36e9cb..40f038109efdd0d64f0dda725328928c6c83bca2 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAABAgAGBQJflFQHAAoJEPOHY87f0iVZlLsIAKUgOfEpp9+ONDz5NCofEvZJ
-Z78PmCjNYMCm2+wqGWmJZ5vkIb078F7eG/AtzTYNz7rfB0U1QlOlv0fnXTe3Q3v6
-QeBMhZprfIGMQOKK4REVA9bUMuw4KstTE48IjVsCHSkTTMXuQCCAc/UeszbXRIhk
-x+T5R4V6a/qwZZP1U9gTqGkr3Y0J5PlIhtG7BRky49ky+fVuJLbbl4TX69NNmUZT
-yQPnYOxzCjO1VkU92QX+ZaAlcUCwQFD9866KfE2Fy6po8B9mCRkLxcKs830TUJpU
-2oZXy0eTAQalh1REddQXuvwn6UPY8oI2xlPJudU/ykQUiXyRYME6/fLbtFgG64U=
-=YvhO
+iQEcBAABAgAGBQJfnty6AAoJEPOHY87f0iVZvRkIAJUQ3rP2DinVLGz8Qh4VPFRW
+qAdbAl+pv04nYcVm98qCHVksFFNsAgkWaqGpO3Lkc+F5GhMGBq5klI/H08Eqg9XG
+FuHNZJhHa6lxIafZOAK2/DFvBNwxCkZRrzrfvSA1nsXruLIdcjLFasi0SDp/tfcj
+4kbK5YEuEnpobEvniYHDbgfkOgYJCS4PIqhB+OId1bm6JBpr4i4vcATqQwAWnuwV
+klq1MMcH/ttSWpUlsuX/r0eKKn2W+eHLjtsXMQsKnctBojVduarc3HpV/T94BVt/
+ChZFhHrmI7zvsa7hXmKSF6TxiktxNYcyrpAmIL8MfryEkiknL/Q8jsFkLeg4byI=
+=hPO6
-----END PGP SIGNATURE-----