From abbd5e82197c47ae4116cbc7b5d8cc7f6196148e Mon Sep 17 00:00:00 2001 From: manfred99 <manfred99@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Tue, 20 Apr 2010 22:30:00 +0000 Subject: [PATCH] drivedb.h updates: - WD Raptor 80GB variant - correct Regex for some WD AV-GP variants - Hitachi Ultrastar A7K2000 - Hitachi Travelstar 5K500.B - Hitachi Deskstar 7K1000.C - adjust naming of Hitachi Travelstar and Deskstar drives git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@3084 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- smartmontools/CHANGELOG | 8 ++++++++ smartmontools/drivedb.h | 42 ++++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG index 9e058df10..f37a97450 100644 --- a/smartmontools/CHANGELOG +++ b/smartmontools/CHANGELOG @@ -43,6 +43,14 @@ NOTES FOR FUTURE RELEASES: see TODO file. <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE> + [MS] drivedb.h updates: + - WD Raptor 80GB variant + - correct Regex for some WD AV-GP variants + - Hitachi Ultrastar A7K2000 + - Hitachi Travelstar 5K500.B + - Hitachi Deskstar 7K1000.C + - adjust naming of Hitachi Travelstar and Deskstar drives + [CF] Move 'posix/getopt*' to 'getopt/getopt*'. Can be used for platforms with regex() but without getopt_long() (QNX, ticket #1). diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h index 5061cbd66..c90753946 100644 --- a/smartmontools/drivedb.h +++ b/smartmontools/drivedb.h @@ -881,15 +881,15 @@ const drive_settings builtin_knowndrives[] = { "(Hitachi )?(HTS4212(60|80|10|12)H9AT00|HTS421260G9AT00)", "", "", "" }, - { "Hitachi Travelstar 5K80 family", + { "Hitachi Travelstar 5K80", "(Hitachi )?HTS5480[8642]0M9AT00", "", "", "" }, - { "Hitachi Travelstar 5K100 series", + { "Hitachi Travelstar 5K100", "(Hitachi )?HTS5410[1864]0G9(AT|SA)00", "", "", "" }, - { "Hitachi Travelstar E5K100 series", + { "Hitachi Travelstar E5K100", "(Hitachi )?HTE541040G9(AT|SA)00", "", "", "" }, @@ -897,22 +897,26 @@ const drive_settings builtin_knowndrives[] = { "(Hitachi )?HTS5412(60|80|10|12)H9(AT|SA)00", "", "", "" }, - { "Hitachi Travelstar 5K160 series", + { "Hitachi Travelstar 5K160", "(Hitachi |HITACHI )?HTS5416([468]0|1[26])J9(AT|SA)00", "", "", "" }, - { "Hitachi Travelstar E5K160 series", + { "Hitachi Travelstar E5K160", "(Hitachi )?HTE5416(12|16|60|80)J9(AT|SA)00", "", "", "" }, - { "Hitachi Travelstar 5K250 series", + { "Hitachi Travelstar 5K250", "(Hitachi |HITACHI )?HTS5425(80|12|16|20|25)K9(A3|SA)00", "", "", "" }, - { "Hitachi Travelstar 5K320 series", + { "Hitachi Travelstar 5K320", "(Hitachi |HITACHI )?HT(S|E)5432(80|12|16|25|32)L9(A3(00)?|SA01)", "", "", "" }, + { "Hitachi Travelstar 5K500.B", + "(Hitachi )?HT[ES]5450(12|16|25|32|40|50)B9A30[01]", + "", "", "" + }, { "Hitachi Travelstar 7K60", "(Hitachi )?HTS726060M9AT00", "", "", "" @@ -961,7 +965,7 @@ const drive_settings builtin_knowndrives[] = { "(IBM-)?IC35L(030|060|090|120|180)AVV207-[01]", "", "", "" }, - { "Hitachi Deskstar 7K80 series", + { "Hitachi Deskstar 7K80", "(Hitachi )?HDS7280([48]0PLAT20|(40)?PLA320|80PLA380).*", "", "", "" }, @@ -969,7 +973,7 @@ const drive_settings builtin_knowndrives[] = { "(Hitachi )?HDS7216(80|16)PLA[3T]80.*", "", "", "" }, - { "Hitachi Deskstar 7K250 series", + { "Hitachi Deskstar 7K250", "(Hitachi )?HDS7225((40|80|12|16)VLAT20|(12|16|25)VLAT80|(80|12|16|25)VLSA80)", "", "", "" }, @@ -977,19 +981,19 @@ const drive_settings builtin_knowndrives[] = { "HITACHI HDS7225SBSUN250G.*", "", "", "" }, - { "Hitachi Deskstar T7K250 series", + { "Hitachi Deskstar T7K250", "(Hitachi )?HDT7225((25|20|16)DLA(T80|380))", "", "", "" }, - { "Hitachi Deskstar 7K400 series", + { "Hitachi Deskstar 7K400", "(Hitachi )?HDS724040KL(AT|SA)80", "", "", "" }, - { "Hitachi Deskstar 7K500 series", + { "Hitachi Deskstar 7K500", "(Hitachi )?HDS725050KLA(360|T80)", "", "", "" }, - { "Hitachi Deskstar P7K500 series", + { "Hitachi Deskstar P7K500", "(Hitachi )?HDP7250(16|25|32|40|50)GLA(36|38|T8)0", "", "", "" }, @@ -1005,6 +1009,10 @@ const drive_settings builtin_knowndrives[] = { "(Hitachi )?HDT7210((16|25)SLA380|(32|50|64|75|10)SLA360)", "", "", "" }, + { "Hitachi Deskstar 7K1000.C", + "(Hitachi )?HDS7210((16|25)CLA382|(32|50)CLA362|(64|75|10)CLA332)", + "", "", "" + }, { "Hitachi Deskstar 7K2000", "Hitachi HDS722020ALA330", "", "", "" @@ -1013,6 +1021,10 @@ const drive_settings builtin_knowndrives[] = { "(Hitachi )?HUA7210(50|75|10)KLA330", "", "", "" }, + { "Hitachi Ultrastar A7K2000", + "(Hitachi )?HUA7220((50|10)C|20A)LA33[01]", + "", "", "" + }, { "Toshiba 2.5\" HDD series (10-20 GB)", "TOSHIBA MK(101[67]GAP|15[67]GAP|20(1[678]GAP|(18|23)GAS))", "", "", "" @@ -1392,11 +1404,11 @@ const drive_settings builtin_knowndrives[] = { "", "", "" }, { "Western Digital AV-GP family", - "WDC WD((16|25|32|50|64|75)00AVVS|(50|75)00AVCS|10EVVS|(10|20)EVCS|WD(10|15|20)EVDS)-.*", + "WDC WD((16|25|32|50|64|75)00AVVS|(50|75)00AVCS|10EVVS|(10|20)EVCS|(10|15|20)EVDS)-.*", "", "", "" }, { "Western Digital Raptor family", - "WDC WD((360|740|800)GD|(360|740|1500)ADF[DS])-.*", + "WDC WD((360|740|800)GD|(360|740|800|1500)ADF[DS])-.*", "", "", "" }, { "Western Digital Raptor X", -- GitLab