From a1a844a9f9a47e7543a2f875d331ff6987bc8db5 Mon Sep 17 00:00:00 2001 From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Sat, 6 Aug 2016 19:46:27 +0000 Subject: [PATCH] Merge r4326 r4327 into 5.40-6.4 drivedb.h branches. git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4328 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- smartmontools/drivedb.h | 49 ++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h index ddb287953..bce3bf75c 100644 --- a/smartmontools/drivedb.h +++ b/smartmontools/drivedb.h @@ -649,8 +649,9 @@ const drive_settings builtin_knowndrives[] = { "-v 251,raw48,Total_NAND_Read_Ct_GiB" }, { - "OCZ Trion SSDs", - "OCZ-TRION1[05]0", // tested with OCZ-TRION100/SAFM11.2A, TRION150/SAFZ72.2 + "OCZ/Toshiba Trion SSDs", + "OCZ-TRION1[05]0|" // tested with OCZ-TRION100/SAFM11.2A, TRION150/SAFZ72.2 + "TOSHIBA-TR150", // tested with TOSHIBA-TR150/SAFZ12.3 "", "", //"-v 9,raw24(raw8),Power_On_Hours " //"-v 12,raw48,Power_Cycle_Count " @@ -2499,6 +2500,10 @@ const drive_settings builtin_knowndrives[] = { "(Hitachi|HGST) HUS7240(20|30|40)AL[AE]64[01]", "", "", "" }, + { "HGST Ultrastar 7K6000", // tested with HGST HUS726060ALE614/APGNW517 + "HGST HUS7260[2456]0AL[AEN]61[014]", + "", "", "" + }, { "HGST Ultrastar He6", // tested with HGST HUS726060ALA640/AHGNT1E2 "HGST HUS726060ALA64[01]", "", "", @@ -2509,6 +2514,11 @@ const drive_settings builtin_knowndrives[] = { "", "", "-v 22,raw48,Helium_Level" }, + { "HGST Ultrastar He10", // tested with HGST HUH7210100ALE600/0F27452 + "HGST HUH7210(08|10)AL[EN]60[014]", + "", "", + "-v 22,raw48,Helium_Level" + }, { "HGST MegaScale 4000", // tested with HGST HMS5C4040ALE640/MPAOA580 "HGST HMS5C4040[AB]LE64[01]", // B = DC 4000.B "", "", "" @@ -2953,8 +2963,9 @@ const drive_settings builtin_knowndrives[] = { "", "", "-v 188,raw16 -v 240,msec24hour32" }, - { "Seagate Desktop HDD.15", // tested with ST4000DM000-1CD168/CC43, ST5000DM000-1FK178/CC44 - "ST[45]000DM000-.*", + { "Seagate Desktop HDD.15", // tested with ST4000DM000-1CD168/CC43, ST5000DM000-1FK178/CC44, + // ST6000DM001-1XY17Z/CC48 + "ST[4568]000DM00[012]-.*", "", "", "-v 188,raw16 -v 240,msec24hour32" }, @@ -3052,10 +3063,11 @@ const drive_settings builtin_knowndrives[] = { "MM1000GBKAL", // HP OEM "", "", "" }, - { "Seagate Enterprise Capacity 3.5 HDD", // tested with ST6000NM0024-1HT17Z/SN02 - "ST[2456]000NM0[01][248]4-.*", // *[069]4 = 4Kn + { "Seagate Enterprise Capacity 3.5 HDD", // tested with ST6000NM0024-1HT17Z/SN02, + // ST10000NM0016-1TT101/SNB0 + "ST([24568]|10)000NM0[01][1248][46]-.*", // *[069]4 = 4Kn "", "", - "-v 188,raw16" + "-v 188,raw16 -v 240,msec24hour32" }, { "Seagate NAS HDD", // tested with ST2000VN000-1H3164/SC42, ST3000VN000-1H4167/SC43 "ST[234]000VN000-.*", @@ -3101,8 +3113,9 @@ const drive_settings builtin_knowndrives[] = { "ST3(250311|500410|1000525)SV", "", "", "" }, - { "Seagate SV35", // tested with ST1000VX001-1HH162/CV11, ST2000VX000-9YW164/CV12 - "ST([123]000VX00[012]|31000526SV|3500411SV)(-.*)?", + { "Seagate SV35", // tested with ST1000VX001-1HH162/CV11, ST2000VX000-9YW164/CV12, + // ST4000VX000-1F4168/CV14 + "ST([1-4]000VX00[012]|31000526SV|3500411SV)(-.*)?", "", "", "" }, { "Seagate DB35", // tested with ST3250823ACE/3.03, ST3300831SCE/3.03 @@ -3381,6 +3394,10 @@ const drive_settings builtin_knowndrives[] = { "WDC WD[123456]0PURX-.*", "", "", "" }, + { "Western Digital Gold", // tested with WDC WD4002FYYZ-01B7CB0/01.01M02 + "WDC WD(101KR|[68]002FR|4002FY)YZ-.*", + "", "", "" + }, { "Western Digital Blue Mobile", // tested with WDC WD5000LPVX-08V0TT2/03.01A03, // WDC WD20NPVZ-00WFZT0/01.01A01 "WDC WD((25|32|50|75)00[BLM]|10[JS]|20N)P[CV][TXZ]-.*", @@ -3838,8 +3855,8 @@ const drive_settings builtin_knowndrives[] = { "-d sat" }, { "USB: LaCie; ", - "0x059f:0x106f", - "", // 0x0001 + "0x059f:0x10(6f|75)", + "", // 6f=0x0001, 75=0x0000 "", "-d sat" }, @@ -4060,7 +4077,7 @@ const drive_settings builtin_knowndrives[] = { "-d sat" }, { "USB: Seagate Expansion External; ", - "0x0bc2:0x33(00|12|20|21|32)", // 0x3321: Expansion Desktop 4TB + "0x0bc2:0x33(00|12|2[012]|32)", // 0x3321: Expansion Desktop 4TB "", "", "-d sat" @@ -4071,6 +4088,12 @@ const drive_settings builtin_knowndrives[] = { "", "-d sat" }, + { "USB: Seagate FreeAgent GoFlex USB 3.0; ", + "0x0bc2:0x5030", + "", // 0x0100 + "", + "-d sat" + }, { "USB: Seagate FreeAgent GoFlex USB 3.0; ", "0x0bc2:0x5031", "", @@ -4114,7 +4137,7 @@ const drive_settings builtin_knowndrives[] = { "-d sat" }, { "USB: Seagate Backup Plus Desktop USB 3.0; ", - "0x0bc2:0xa(0a[14]|b31)", // 4TB, 3TB (8 LBA/1 PBA offset), 5TB + "0x0bc2:0xa(0a[14]|b3[14])", // 4TB, 3TB (8 LBA/1 PBA offset), 5TB, ? "", "", "-d sat" -- GitLab