]> git.proxmox.com Git - mirror_smartmontools-debian.git/blobdiff - drivedb.h
Merge branch 'upstream' of git.debian.org:/git/collab-maint/smartmontools into upstream
[mirror_smartmontools-debian.git] / drivedb.h
index 65c1c4527fa0b78cca0519148de2f3848e9870fa..b61d0283812821c2c1723fc8487b173eb4839f83 100644 (file)
--- a/drivedb.h
+++ b/drivedb.h
@@ -4,7 +4,11 @@
  * Home page of code is: http://www.smartmontools.org
  *
  * Copyright (C) 2003-11 Philip Williams, Bruce Allen
+<<<<<<< HEAD
  * Copyright (C) 2008-16 Christian Franke
+=======
+ * Copyright (C) 2008-15 Christian Franke
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 /*
 const drive_settings builtin_knowndrives[] = {
  */
+<<<<<<< HEAD
   { "$Id: drivedb.h 4324 2016-05-31 20:45:50Z chrfranke $",
+=======
+  { "$Id: drivedb.h 4105 2015-06-03 19:32:30Z chrfranke $",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "-", "-",
     "This is a dummy entry to hold the SVN-Id of drivedb.h",
     ""
@@ -281,12 +289,19 @@ const drive_settings builtin_knowndrives[] = {
   },
   { "Crucial/Micron MX100/MX200/M5x0/M600 Client SSDs",
     "Crucial_CT(128|256|512)MX100SSD1|"// tested with Crucial_CT256MX100SSD1/MU01
+<<<<<<< HEAD
     "Crucial_CT(200|250|256|500|512|1000|1024)MX200SSD[1346]|" // tested with Crucial_CT500MX200SSD1/MU01,
       // Crucial_CT1024MX200SSD1/MU01, Crucial_CT250MX200SSD3/MU01, Crucial_CT250MX200SSD1/MU03
     "Crucial_CT(120|240|480|960)M500SSD[134]|" // tested with Crucial_CT960M500SSD1/MU03,
       // Crucial_CT240M500SSD4/MU05
     "Crucial_CT(128|256|512|1024)M550SSD[13]|" // tested with Crucial_CT512M550SSD3/MU01,
       // Crucial_CT1024M550SSD1/MU01
+=======
+    "Crucial_CT(200|256|500|512|1000|1024)MX200SSD[1346]|" // tested with Crucial_CT500MX200SSD1/MU01,
+      // Crucial_CT1024MX200SSD1/MU01
+    "Crucial_CT(120|240|480|960)M500SSD1|" // tested with Crucial_CT960M500SSD1/MU03
+    "Crucial_CT(128|256|512|1024)M550SSD[13]|" // tested with Crucial_CT512M550SSD3/MU01, Crucial_CT1024M550SSD1/MU01
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "Micron_M500_MTFDDA[KTV](120|240|480|960)MAV|"// tested with Micron_M500_MTFDDAK960MAV/MU05
     "(Micron_)?M510[_-]MTFDDA[KTV](128|256)MAZ|" // tested with M510-MTFDDAK256MAZ/MU01
     "(Micron_)?M550[_-]MTFDDA[KTV](064|128|256|512|1T0)MAY|" // tested with M550-MTFDDAK256MAY/MU01
@@ -400,9 +415,14 @@ const drive_settings builtin_knowndrives[] = {
     "KINGSTON SMS200S3(30|60|120)G|" // mSATA, SF-2241, tested with SMS200S3120G/KC3ABBF0
     "KINGSTON SMS450S3(32|64|128)G|" // mSATA, SF-2281, tested with SMS450S3128G/503ABBF0
     "KINGSTON (SV300|SKC100|SE100)S3.*G|" // other SF-2281
+<<<<<<< HEAD
     "MKNSSDCR(45|60|90|120|180|240|360|480)GB(-(7|DX7?|MX|G2))?|" // Mushkin Chronos (7mm/Deluxe/MX/G2),
       // SF-2281, tested with MKNSSDCR120GB, MKNSSDCR120GB-MX/560ABBF0, MKNSSDCR480GB-DX7/603ABBF0
     "MKNSSDEC(60|120|240|480|512)GB|" // Mushkin Enhanced ECO2, tested with MKNSSDEC120GB/604ABBF0
+=======
+    "MKNSSDCR(45|60|90|120|180|240|480)GB(-[DM]X)?|" // Mushkin Chronos (Deluxe/Enhanced), SF-2281,
+      // tested with MKNSSDCR120GB, MKNSSDCR120GB-MX/560ABBF0
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "MKNSSDAT(30|40|60|120|180|240|480)GB(-(DX|V))?|" // Mushkin Atlas (Deluxe/Value), mSATA, SF-2281,
       // tested with MKNSSDAT120GB-V/540ABBF0
     "Mushkin MKNSSDCL(40|60|80|90|115|120|180|240|480)GB-DX2?|" // Mushkin Callisto deluxe,
@@ -580,10 +600,15 @@ const drive_settings builtin_knowndrives[] = {
   //"-v 233,raw48,Media_Wearout_Indicator"
   },
   { "Indilinx Barefoot 3 based SSDs",
+<<<<<<< HEAD
     "OCZ-VECTOR(1[58]0)?|" // tested with OCZ-VECTOR/1.03, OCZ-VECTOR150/1.2, OCZ-VECTOR180
     "OCZ-VERTEX4[56]0A?|" // Barefoot 3 M10, tested with OCZ-VERTEX450/1.0, OCZ-VERTEX460/1.0, VERTEX460A
     "OCZ-SABER1000|"
     "OCZ-ARC100|"
+=======
+    "OCZ-VECTOR(150)?|" // tested with OCZ-VECTOR/1.03, OCZ-VECTOR150/1.2
+    "OCZ-VERTEX4[56]0|" // Barefoot 3 M10, tested with OCZ-VERTEX450/1.0, OCZ-VERTEX460/1.0
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "Radeon R7", // Barefoot 3 M00, tested with Radeon R7/1.00
     "", "",
     "-v 5,raw48,Runtime_Bad_Block "
@@ -613,11 +638,18 @@ const drive_settings builtin_knowndrives[] = {
     "-v 233,raw48,Remaining_Lifetime_Perc "
     "-v 241,raw48,Host_Writes_GiB " // M00/M10
     "-v 242,raw48,Host_Reads_GiB "  // M00/M10
+<<<<<<< HEAD
     "-v 249,raw48,Total_NAND_Prog_Ct_GiB "
     "-v 251,raw48,Total_NAND_Read_Ct_GiB"
   },
   { "OCZ Intrepid 3000 SSDs", // tested with OCZ INTREPID 3600/1.4.3.6, 3800/1.4.3.0, 3700/1.5.0.4
     "OCZ INTREPID 3[678]00",
+=======
+    "-v 249,raw48,Total_NAND_Prog_Ct_GiB"
+  },
+  { "OCZ Intrepid 3000 SSDs", // tested with OCZ INTREPID 3600/1.4.3.6, 3800/1.4.3.0
+    "OCZ INTREPID 3[68]00",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", "",
     "-v 5,raw48,Runtime_Bad_Block "
   //"-v 9,raw24(raw8),Power_On_Hours "
@@ -688,6 +720,7 @@ const drive_settings builtin_knowndrives[] = {
     "-v 236,raw48,Unstable_Power_Count "
     "-v 240,raw48,Write_Head"
   },
+<<<<<<< HEAD
   { "Innodisk 3ME SSDs", // tested with 2.5" SATA SSD 3ME/S140714
     "((1\\.8|2\\.5)\"? SATA SSD|SATA Slim) 3ME",
     "", "",
@@ -797,6 +830,8 @@ const drive_settings builtin_knowndrives[] = {
     "-v 241,raw48,Host_Writes_32MiB "
     "-v 242,raw48,Host_Reads_32MiB"
   },
+=======
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   { "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",
@@ -887,9 +922,14 @@ const drive_settings builtin_knowndrives[] = {
     "-v 228,raw48,Workload_Minutes"
   },
   { "Intel 311/313 Series SSDs", // tested with INTEL SSDSA2VP020G2/2CV102M5,
+<<<<<<< HEAD
       // INTEL SSDSA2VP020G3/9CV10379, INTEL SSDMAEXC024G3H/9CV10379
     "INTEL SSD(SA2VP|MAEXC)(020|024)G[23]H?",
       // SA2VP = 2.5", MAEXC = mSATA, G2 = 311, G3 = 313
+=======
+      // INTEL SSDSA2VP020G3/9CV10379,
+    "INTEL SSDSA2VP(020|024)G[23]", // G3 = 313 Series
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", "",
   //"-v 3,raw16(avg16),Spin_Up_Time "
   //"-v 4,raw48,Start_Stop_Count "
@@ -1031,11 +1071,17 @@ const drive_settings builtin_knowndrives[] = {
     "-v 242,raw48,Host_Reads_32MiB "
     "-v 249,raw48,NAND_Writes_1GiB"
   },
+<<<<<<< HEAD
   { "Intel 53x and Pro 2500 Series SSDs", // SandForce SF-2281, tested with
       // INTEL SSDSC2BW180A4/DC12, SSDSC2BW240A4/DC12, SSDMCEAW120A4/DC33
       // INTEL SSDMCEAW240A4/DC33, SSDSC2BF480A5/TG26, SSDSC2BW240H6/RG21
     "INTEL SSD(MCEA|SC2B|SCKJ)[WF](056|080|120|180|240|360|480)(A4|A5|H6)",
       // SC2B = 2.5", MCEA = mSATA, SCKJ = M.2; A4 = 530, A5 = Pro 2500, H6 = 535
+=======
+  { "Intel 530 Series SSDs", // tested with INTEL SSDSC2BW180A4/DC12, SSDSC2BW240A4/DC12,
+      // INTEL SSDMCEAW120A4/DC33, INTEL SSDMCEAW240A4/DC33
+    "INTEL SSD(MCEA|SC2B)W(080|120|180|240|360|480)A4", // MCEA = mSATA
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", "",
   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
     "-v 9,msec24hour32,Power_On_Hours_and_Msec "
@@ -1243,6 +1289,7 @@ const drive_settings builtin_knowndrives[] = {
     "MZ7PC(512|256|128|064)HA(GH|FU|DR)-000.*|" // probably PM830, tested with SAMSUNG MZ7PC128HAFU-000L1/CXM04L1Q
     "Samsung SSD 840 (PRO )?Series|" // tested with Samsung SSD 840 PRO Series 128GB/DXM04B0Q,
       // Samsung SSD 840 Series/DXT06B0Q
+<<<<<<< HEAD
     "Samsung SSD 8[45]0 EVO (mSATA |M\\.2 )?((120|250|500|750)G|1T)B( mSATA)?|" // tested with
       // Samsung SSD 840 EVO (120|250|500|750)GB/EXT0AB0Q,
       // Samsung SSD 840 EVO (120|250)GB/EXT0BB6Q, 1TB/EXT0BB0Q, 120GB mSATA/EXT41B6Q,
@@ -1259,6 +1306,17 @@ const drive_settings builtin_knowndrives[] = {
       // SAMSUNG MZ7LM960HCHP-0E003/GXT3003Q
     "SAMSUNG MZ7KM(120|240|480|960|1T9)HA(JM|HP|GR|FD|JM)-.*|" // SM863, tested with MZ7KM480HAHP-0E005/GXM1003Q
     "SAMSUNG MZ[7N]LN(128|256|512)HC(HP|GR|JH)-.*", // PM871 Series, tested with SAMSUNG MZ7LN128HCHP
+=======
+    "Samsung SSD 8[45]0 EVO ((120|250|500)G|1T)B( mSATA)?|" // tested with Samsung SSD 840 EVO (120|250|500)GB/EXT0AB0Q,
+      // Samsung SSD 840 EVO (120|250)GB/EXT0BB6Q, 1TB/EXT0BB0Q, 120GB mSATA/EXT41B6Q,
+      // Samsung SSD 850 EVO 250GB/EMT01B6Q
+    "Samsung SSD 850 PRO ((128|256|512)G|1T)B|" // tested with Samsung SSD 850 PRO 128GB/EXM01B6Q,
+      // Samsung SSD 850 PRO 1TB/EXM01B6Q
+    "SAMSUNG MZ7WD((120|240)HAFV|480HAGM|960HAGP)-00003|" // SM843T Series, tested with
+      // SAMSUNG MZ7WD120HAFV-00003/DXM85W3Q
+    "SAMSUNG MZ7GE(240HMGR|(480|960)HMHP)-00003", // SM853T Series, tested with
+      // SAMSUNG MZ7GE240HMGR-00003/EXT0303Q
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", "",
   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
   //"-v 9,raw24(raw8),Power_On_Hours "
@@ -1284,6 +1342,7 @@ const drive_settings builtin_knowndrives[] = {
     "-v 235,raw48,POR_Recovery_Count " // 830/840/850 Series
   //"-v 241,raw48,Total_LBAs_Written "
   //"-v 242,raw48,Total_LBAs_Read " // PM851, SM841N
+<<<<<<< HEAD
     "-v 243,raw48,SATA_Downshift_Ct " // PM863
     "-v 244,raw48,Thermal_Throttle_St " // PM863
     "-v 245,raw48,Timed_Workld_Media_Wear " // PM863
@@ -1291,6 +1350,8 @@ const drive_settings builtin_knowndrives[] = {
     "-v 247,raw48,Timed_Workld_Timer " // PM863
     "-v 250,raw48,SATA_Iface_Downshift " // from the spec
     "-v 251,raw48,NAND_Writes" // PM863
+=======
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   },
   { "Marvell based SanDisk SSDs",
     "SanDisk SD5SG2[0-9]*G1052E|" // X100 (88SS9174), tested with SanDisk SD5SG2256G1052E/10.04.01
@@ -1357,6 +1418,7 @@ const drive_settings builtin_knowndrives[] = {
     "-v 244,raw48,Thermal_Throttle "
   },
   { "SiliconMotion based SSDs", // SM2246EN (Transcend TS6500)
+<<<<<<< HEAD
     "CT(120|250|500|1000)BX100SSD1|" // Crucial BX100, tested with CT250BX100SSD1/MU02,
       // CT500BX100SSD1/MU02, CT1000BX100SSD1/MU02
     "CT(240|480|960)BX200SSD1|" // Crucial BX200 Solid State Drive, tested with CT480BX200SSD1/MU02.6
@@ -1364,15 +1426,22 @@ const drive_settings builtin_knowndrives[] = {
       // tested with TS32GMSA370/20140402, TS16GMSA370/20140516, TS64GSSD370/20140516,
       // TS256GSSD370/N0815B, TS256GSSD370S/N1114H, TS512GSSD370S/N1114H, TS32GSSD420I/N1114H
     "ADATA SP550", // ADATA SP550/O0803B5a
+=======
+    "TS((16|32|64|128|256|512)G|1T)(SSD|MSA)370", // Transcend SSD370 SATA/mSATA, TS6500, tested with
+      // TS32GMSA370/20140402, TS16GMSA370/20140516, TS64GSSD370/20140516, TS256GSSD370/N0815B
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", "",
   //"-v 1,raw48,Raw_Read_Error_Rate "
   //"-v 2,raw48,Throughput_Performance "
   //"-v 9,raw24(raw8),Power_On_Hours "
   //"-v 12,raw48,Power_Cycle_Count "
+<<<<<<< HEAD
     "-v 148,raw48,Total_SLC_Erase_Ct "
     "-v 149,raw48,Max_SLC_Erase_Ct "
     "-v 150,raw48,Min_SLC_Erase_Ct "
     "-v 151,raw48,Average_SLC_Erase_Ct "
+=======
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "-v 160,raw48,Uncorrectable_Error_Cnt "
     "-v 161,raw48,Valid_Spare_Block_Cnt "
     "-v 163,raw48,Initial_Bad_Block_Count "
@@ -1400,9 +1469,13 @@ const drive_settings builtin_knowndrives[] = {
   //"-v 232,raw48,Available_Reservd_Space "
     "-v 241,raw48,Host_Writes_32MiB "
     "-v 242,raw48,Host_Reads_32MiB "
+<<<<<<< HEAD
     "-v 245,raw48,TLC_Writes_32MiB " // FW N0815B, N1114H
     "-v 246,raw48,SLC_Writes_32MiB "
     "-v 247,raw48,Raid_Recoverty_Ct"
+=======
+    "-v 245,raw48,Unkn_SiliconMotion_Attr" // FW N0815B
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   },
   { "Smart Storage Systems Xcel-10 SSDs",  // based on http://www.smartm.com/files/salesLiterature/storage/xcel10.pdf
     "SMART A25FD-(32|64|128)GI32N", // tested with SMART A25FD-128GI32N/B9F23D4K
@@ -2296,6 +2369,7 @@ const drive_settings builtin_knowndrives[] = {
   },
   { "Hitachi/HGST Travelstar Z5K320", // tested with Hitachi HTS543232A7A384/ES2OA70K
     "(Hitachi|HGST) HT[ES]5432(16|25|32)A7A38[145]",
+<<<<<<< HEAD
     "", "", ""
   },
   { "Hitachi Travelstar 5K500.B", // tested with Hitachi HTS545050B9SA00/PB4OC60X
@@ -2306,6 +2380,17 @@ const drive_settings builtin_knowndrives[] = {
       // Hitachi HTS545032A7E380/GGBOA7A0, HGST HTS545050A7E680/GR2OA230,
       // APPLE HDD HTS545050A7E362/GG2AB990
     "(Hitachi|HGST|APPLE HDD) HT[ES]5450(25|32|50)A7E(362|38[01]|680)",
+=======
+    "", "", ""
+  },
+  { "Hitachi Travelstar 5K500.B", // tested with Hitachi HTS545050B9SA00/PB4OC60X
+    "(Hitachi )?HT[ES]5450(12|16|25|32|40|50)B9(A30[01]|SA00)",
+    "", "", ""
+  },
+  { "Hitachi/HGST Travelstar Z5K500", // tested with HGST HTS545050A7E380/GG2OAC90,
+      // Hitachi HTS545032A7E380/GGBOA7A0, APPLE HDD HTS545050A7E362/GG2AB990
+    "(Hitachi|HGST|APPLE HDD) HT[ES]5450(25|32|50)A7E3(62|8[01])",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", "", ""
   },
   { "Hitachi/HGST Travelstar 5K750", // tested with Hitachi HTS547575A9E384/JE4OA60A,
@@ -2355,9 +2440,14 @@ const drive_settings builtin_knowndrives[] = {
     "(HITACHI )?HT[ES]7232(16|25|32)A7A36[145]",
     "", "", ""
   },
+<<<<<<< HEAD
   { "Hitachi Travelstar 7K500", // tested with Hitachi HTS725050A9A360/PC4OC70D,
     // HITACHI HTS725032A9A364/PC3ZC70F
     "(Hitachi |HITACHI )?HT[ES]7250(12|16|25|32|50)A9A36[02-5]",
+=======
+  { "Hitachi Travelstar 7K500", // tested with Hitachi HTS725050A9A360/PC4OC70D
+    "(Hitachi )?HT[ES]7250(12|16|25|32|50)A9A36[02-5]",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", "", ""
   },
   { "Hitachi/HGST Travelstar Z7K500", // tested with HITACHI HTS725050A7E630/GH2ZB390,
@@ -2503,6 +2593,7 @@ const drive_settings builtin_knowndrives[] = {
   },
   { "HGST Ultrastar He6", // tested with HGST HUS726060ALA640/AHGNT1E2
     "HGST HUS726060ALA64[01]",
+<<<<<<< HEAD
     "", "",
     "-v 22,raw48,Helium_Level"
   },
@@ -2510,6 +2601,9 @@ const drive_settings builtin_knowndrives[] = {
     "HGST HUH7280(60|80)AL[EN]60[014]",
     "", "",
     "-v 22,raw48,Helium_Level"
+=======
+    "", "", ""
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   },
   { "HGST MegaScale 4000", // tested with HGST HMS5C4040ALE640/MPAOA580
     "HGST HMS5C4040[AB]LE64[01]", // B = DC 4000.B
@@ -2601,6 +2695,7 @@ const drive_settings builtin_knowndrives[] = {
     "TOSHIBA MQ01ABC(100|150|200)",
     "", "", ""
   },
+<<<<<<< HEAD
   { "Toshiba 2.5\" HDD MQ01ABD...", // tested with TOSHIBA MQ01ABD100/AX001U,
       // TOSHIBA MQ01ABD100V/AX001Q
     "TOSHIBA MQ01ABD(025|032|050|064|075|100)V?",
@@ -2614,6 +2709,20 @@ const drive_settings builtin_knowndrives[] = {
     "TOSHIBA MQ01UBB200",
     "", "", ""
   },
+=======
+  { "Toshiba 2.5\" HDD MQ01ABD...", // tested with TOSHIBA MQ01ABD100/AX001U
+    "TOSHIBA MQ01ABD(025|032|050|064|075|100)",
+    "", "", ""
+  },
+  { "Toshiba 2.5\" HDD MQ01ABF...", // tested with TOSHIBA MQ01ABF050/AM001J
+    "TOSHIBA MQ01ABF(050|075|100)",
+    "", "", ""
+  },
+  { "Toshiba 2.5\" HDD MQ01UBB... (USB 3.0)", // tested with TOSHIBA MQ01UBB200/AY000U (0x0480:0xa100)
+    "TOSHIBA MQ01UBB200",
+    "", "", ""
+  },
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   { "Toshiba 2.5\" HDD MQ01UBD... (USB 3.0)", // tested with TOSHIBA MQ01UBD050/AX001U (0x0480:0xa007),
       // TOSHIBA MQ01UBD100/AX001U (0x0480:0x0201, 0x0480:0xa200)
     "TOSHIBA MQ01UBD(050|075|100)",
@@ -3052,6 +3161,13 @@ const drive_settings builtin_knowndrives[] = {
   { "Seagate Constellation.2 (SATA)", // 2.5", tested with ST91000640NS/SN02, MM1000GBKAL/HPGB
     "ST9(25061|50062|100064)[012]NS|" // *SS = SAS
     "MM1000GBKAL", // HP OEM
+<<<<<<< HEAD
+=======
+    "", "", ""
+  },
+  { "Seagate Enterprise Capacity 3.5 HDD", // tested with ST6000NM0024-1HT17Z/SN02
+    "ST[2456]000NM0[01][248]4-.*", // *[069]4 = 4Kn
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", "", ""
   },
   { "Seagate Enterprise Capacity 3.5 HDD", // tested with ST6000NM0024-1HT17Z/SN02
@@ -3226,8 +3342,13 @@ const drive_settings builtin_knowndrives[] = {
     "", "", ""
   },
   { "Western Digital Blue", // tested with WDC WD5000AZLX-00K4KA0/80.00A80,
+<<<<<<< HEAD
       // 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 WD((25|32|50)00AAK|5000AZL|7500AAL|10EAL|10EZE)X-.*",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", "", ""
   },
   { "Western Digital RE Serial ATA",
@@ -3370,15 +3491,28 @@ const drive_settings builtin_knowndrives[] = {
   },
   { "Western Digital Red", // tested with WDC WD10EFRX-68JCSN0/01.01A01,
       // WDC WD10JFCX-68N6GN0/01.01A01, WDC WD40EFRX-68WT0N0/80.00A80,
+<<<<<<< HEAD
       // WDC WD60EFRX-68MYMN1/82.00A82, WDC WD80EFZX-68UW8N0/83.H0A83
     "WDC WD(7500BFC|10JFC|[1-6]0EFR|80EFZ)X-.*",
     "", "",
     "-v 22,raw48,Helium_Level" // WD80EFZX
   },
+  { "Western Digital Red Pro", // tested with WDC WD2001FFSX-68JNUN0/81.00A81
+    "WDC WD[234]001FFSX-.*",
+=======
+      // WDC WD60EFRX-68MYMN1/82.00A82
+    "WDC WD(7500BFC|10JFC|(10|20|30|40|50|60)EFR)X-.*",
+    "", "", ""
+  },
   { "Western Digital Red Pro", // tested with WDC WD2001FFSX-68JNUN0/81.00A81
     "WDC WD[234]001FFSX-.*",
     "", "", ""
   },
+  { "Western Digital Purple", // tested with WDC WD40PURX-64GVNY0/80.00A80
+    "WDC WD[123456]0PURX-.*",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
+    "", "", ""
+  },
   { "Western Digital Purple", // tested with WDC WD40PURX-64GVNY0/80.00A80
     "WDC WD[123456]0PURX-.*",
     "", "", ""
@@ -3562,8 +3696,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+<<<<<<< HEAD
   { "USB: Toshiba Canvio; ", // 0x0210: TOSHIBA MQ03UBB300
     "0x0480:0x02(01|10)",
+=======
+  { "USB: Toshiba Canvio Basics; ", // TOSHIBA MQ01UBD100
+    "0x0480:0x(0201|a200)",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "",
     "",
     "-d sat"
@@ -3586,8 +3725,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+<<<<<<< HEAD
   { "USB: Toshiba Stor.E; ",
     "0x0480:0xa00[9ace]",
+=======
+  { "USB: Toshiba Stor.E Basics; ",
+    "0x0480:0xa00[9ce]",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", // 0x0000 (0xa00e)
     "",
     "-d sat"
@@ -3598,6 +3742,15 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+<<<<<<< HEAD
+=======
+  { "USB: Toshiba Canvio ALU; ", // TOSHIBA MQ01UBB200
+    "0x0480:0xa100",
+    "",
+    "",
+    "-d sat"
+  },
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   { "USB: Toshiba Canvio Desktop; ",
     "0x0480:0xd0(00|10|11)",
     "", // 0x0316 (0xd011)
@@ -3755,7 +3908,11 @@ const drive_settings builtin_knowndrives[] = {
     "-d usbsunplus"
   },
   { "USB: Iomega; JMicron",
+<<<<<<< HEAD
     "0x059b:0x0(47[05]|575)", // 0x0470: LPHD-UP, 0x0475: GDHDU2 (0x0100), 0x0575: LDHD-UP
+=======
+    "0x059b:0x0[45]75", // 0x0475: Iomega GDHDU2 (0x0100), 0x0575: LDHD-UP
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "",
     "",
     "-d usbjmicron"
@@ -3782,6 +3939,14 @@ const drive_settings builtin_knowndrives[] = {
   { "USB: LaCie Rugged Triple Interface; ",
     "0x059f:0x100c",
     "", // 0x0001
+<<<<<<< HEAD
+=======
+    "",
+    "-d sat"
+  },
+  { "USB: LaCie hard disk (Neil Poulton design);",
+    "0x059f:0x1018",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "",
     "-d sat"
   },
@@ -3871,12 +4036,15 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+<<<<<<< HEAD
   { "USB: ; Genesys Logic",
     "0x05e3:0x0735",
     "", // 0x1003
     "",
     "-d sat"
   },
+=======
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   // Micron
   { "USB: Micron USB SSD; ",
     "0x0634:0x0655",
@@ -3912,7 +4080,11 @@ const drive_settings builtin_knowndrives[] = {
   },
   // SanDisk
   { "USB: SanDisk SDCZ80 Flash Drive; Fujitsu", // ATA ID: SanDisk pSSD
+<<<<<<< HEAD
     "0x0781:0x558[08]",
+=======
+    "0x0781:0x5580",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "",
     "",
     "-d sat"
@@ -4032,8 +4204,13 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat"
   },
   { "USB: Seagate Expansion Portable; ",
+<<<<<<< HEAD
     "0x0bc2:0x23(00|12|20|21|22)",
     "", // 12=0x0219, 22=0x0000
+=======
+    "0x0bc2:0x23(00|12|20|21)",
+    "", // 0x0219 (0x2312)
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "",
     "-d sat"
   },
@@ -4117,10 +4294,20 @@ const drive_settings builtin_knowndrives[] = {
   },
   { "USB: Seagate Backup Plus Desktop USB 3.0; ",
     "0x0bc2:0xa(0a[14]|b31)", // 4TB, 3TB (8 LBA/1 PBA offset), 5TB
+<<<<<<< HEAD
+=======
     "",
     "",
     "-d sat"
   },
+  { "USB: Seagate Slim Portable Drive; ", // SRD00F1
+    "0x0bc2:0xab00",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
+    "",
+    "",
+    "-d sat"
+  },
+<<<<<<< HEAD
   { "USB: Seagate Slim Portable Drive; ", // SRD00F1
     "0x0bc2:0xab00",
     "",
@@ -4129,6 +4316,10 @@ const drive_settings builtin_knowndrives[] = {
   },
   { "USB: Seagate Backup Plus USB 3.0; ",
     "0x0bc2:0xab2[0145]", // 0xab24: Slim (ticket #443), 0xab25: Mac
+=======
+  { "USB: Seagate Backup Plus Slim USB 3.0; ", // (ticket #443)
+    "0x0bc2:0xab2[14]",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "", // 0x0100
     "",
     "-d sat"
@@ -4232,8 +4423,13 @@ const drive_settings builtin_knowndrives[] = {
     "-d usbcypress"
   },
   { "USB: WD My Passport; ",
+<<<<<<< HEAD
     "0x1058:0x0(70[245a]|71a|730|74[0128a]|7a[8e]|81[06]|82[02]|83[37a])",
     "", // 822=0x1007, 837=0x1072
+=======
+    "0x1058:0x0(70[245a]|730|74[0128a]|7a8|8[123]0)",
+    "",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "",
     "-d sat"
   },
@@ -4256,6 +4452,7 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat"
   },
   { "USB: WD My Book; ",
+<<<<<<< HEAD
     "0x1058:0x11(0[01245]|1[0d]|30|40)",
     "", // 00/01=0x0165, 02=0x1028, 10=0x1030, 1d=0x1020, 30=0x1012, 40=0x1003
     "",
@@ -4264,6 +4461,10 @@ const drive_settings builtin_knowndrives[] = {
   { "USB: WD Elements; ",
     "0x1058:0x25a2",
     "", // 0x1004
+=======
+    "0x1058:0x11(00|01|02|04|05|10|30|40)",
+    "", // 00/01=0x0165, 02=0x1028, 10=0x1030, 30=0x1012, 40=0x1003
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "",
     "-d sat"
   },
@@ -4276,8 +4477,13 @@ const drive_settings builtin_knowndrives[] = {
   },
   // ADATA
   { "USB: ADATA; ",
+<<<<<<< HEAD
     "0x125f:0xa(11|31|35|15)a", // 0xa11a: Classic CH11 1TB, 0xa31a: HV620 2TB (0x0100)
     "", // 0xa35a: HD650 2TB (0x6503), 0xa15a: HD710 1TB
+=======
+    "0x125f:0xa(11|31|35)a", // 0xa11a: Classic CH11 1TB, 0xa31a: HV620 2TB (0x0100)
+    "", // 0xa35a: HD650 2TB (0x6503)
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "",
     "-d sat"
   },
@@ -4343,9 +4549,15 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat"
   },
   { "USB: ; Initio",
+<<<<<<< HEAD
     "0x13fd:0x39[124]0", // 0x3910: Seagate Expansion Portable SRD00F1 (0x0100)
     "", // 0x3920: ezDISK EZ370 (0x0205)
     "", // 0x3940: MS-TECH LU-275S (0x0306)
+=======
+    "0x13fd:0x39[14]0", // 0x3910: Seagate Expansion Portable SRD00F1 (0x0100)
+    "", // 0x3940: MS-TECH LU-275S (0x0306)
+    "",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "-d sat"
   },
   // Super Top
@@ -4364,7 +4576,11 @@ const drive_settings builtin_knowndrives[] = {
   },
   { "USB: ; JMicron JMS539", // USB2/3->SATA (new firmware)
     "0x152d:0x0539",
+<<<<<<< HEAD
     "0x020[56]|"   //  2.05, ZTC USB 3.0 enclosure (ticket #338)
+=======
+    "0x020[56]|"   //  2.05, ticket #338
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "0x28(03|12)", // 28.03, Mediasonic ProBox HF2-SU3S2 Rev 2 (port multiplier, ticket #504)
     "",            // 28.12, Mediasonic ProBox H82-SU3S2 (port multiplier)
     "-d sat"
@@ -4375,12 +4591,15 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d usbjmicron,x"
   },
+<<<<<<< HEAD
   { "USB: ; JMicron", // USB2/3->2xSATA
     "0x152d:0x0565",
     "", // 0x9114, Akasa DuoDock X (ticket #607)
     "",
     "-d sat"
   },
+=======
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   { "USB: ; JMicron JMS567", // USB2/3->SATA
     "0x152d:0x0567",
     "", // 0x0114
@@ -4613,12 +4832,15 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat" // ATA output registers missing
   },
+<<<<<<< HEAD
   { "USB: ; VIA VL711", // USB2/3->SATA
     "0x2109:0x0711",
     "", // 0x0114, Mediasonic ProBox K32-SU3 (ticket #594)
     "", // 0x0507, Intenso 2,5" Memory Case 2TB USB3
     "-d sat"
   },
+=======
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   // 0x2537 (?)
   { "USB: ; ", // USB 3.0
     "0x2537:0x106[68]", // 0x1066: Orico 2599US3, 0x1068: Fantec ER-35U3
@@ -4654,6 +4876,7 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat" // ATA output registers missing
   },
   { "USB: Hitachi Touro Mobile; ", // 1TB
+<<<<<<< HEAD
     "0x4971:0x102[04]",
     "", // 0x0100
     "",
@@ -4661,6 +4884,9 @@ const drive_settings builtin_knowndrives[] = {
   },
   { "USB: SimpleTech;", // USB 3.0 HDD BOX Agestar,  Rock External HDD 3,5" UASP
     "0x4971:0x8017",
+=======
+    "0x4971:0x1020",
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     "",
     "",
     "-d sat"