← Back to branch summary

~dannf/ubuntu/saucy/libatasmart/lp1234343

« back to all changes in this revision

Viewing changes to atasmart.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-09-18 09:31:34 UTC
  • mto: (12.1.3 sid)
  • mto: This revision was merged to the branch mainline in revision 6.
  • Revision ID: james.westby@ubuntu.com-20090918093134-tfh8d2gggwyczain
Tags: upstream-0.15
Import upstream version 0.15

Show diffs side-by-side

added added

removed removed

Lines of Context:
atasmart.c
1183
1183
                a->pretty_value = (fourtyeight & 0xFFFF)*100 + 273150;
1184
1184
        else if (!strcmp(a->name, "power-on-minutes"))
1185
1185
                a->pretty_value = fourtyeight * 60 * 1000;
1186
 
        else if (!strcmp(a->name, "power-on-seconds"))
 
1186
        else if (!strcmp(a->name, "power-on-seconds") ||
 
1187
                 !strcmp(a->name, "power-on-seconds-2"))
1187
1188
                a->pretty_value = fourtyeight * 1000;
1188
1189
        else if (!strcmp(a->name, "power-on-half-minutes"))
1189
1190
                a->pretty_value = fourtyeight * 30 * 1000;
1309
1310
        [228] = { "power-off-retract-count-2",   SK_SMART_ATTRIBUTE_UNIT_NONE,     NULL },
1310
1311
        [230] = { "head-amplitude",              SK_SMART_ATTRIBUTE_UNIT_UNKNOWN,  NULL },
1311
1312
        [231] = { "temperature-celsius",         SK_SMART_ATTRIBUTE_UNIT_MKELVIN,  verify_temperature },
 
1313
 
 
1314
        /* http://www.adtron.com/pdf/SMART_for_XceedLite_SATA_RevA.pdf */
 
1315
        [232] = { "endurance-remaining",         SK_SMART_ATTRIBUTE_UNIT_UNKNOWN,  NULL },
 
1316
        [233] = { "power-on-seconds-2",          SK_SMART_ATTRIBUTE_UNIT_UNKNOWN,  NULL },
 
1317
        [234] = { "uncorrectable-ecc-count",     SK_SMART_ATTRIBUTE_UNIT_SECTORS,  NULL },
 
1318
        [235] = { "good-block-rate",             SK_SMART_ATTRIBUTE_UNIT_UNKNOWN,  NULL },
 
1319
 
1312
1320
        [240] = { "head-flying-hours",           SK_SMART_ATTRIBUTE_UNIT_MSECONDS, verify_long_time },
1313
1321
        [250] = { "read-error-retry-rate",       SK_SMART_ATTRIBUTE_UNIT_NONE,     NULL }
1314
1322
};
1911
1919
 
1912
1920
        if (!strcmp(a->name, "power-on-minutes") ||
1913
1921
            !strcmp(a->name, "power-on-seconds") ||
 
1922
            !strcmp(a->name, "power-on-seconds-2") ||
1914
1923
            !strcmp(a->name, "power-on-half-minutes") ||
1915
1924
            !strcmp(a->name, "power-on-hours")) {
1916
1925
 
2465
2474
                        goto finish;
2466
2475
                }
2467
2476
 
2468
 
                if ((vid == 0x0c0b && pid == 0xb159) ||
 
2477
                if ((vid == 0x152d && pid == 0x2329)) {
 
2478
                        /* Some JMicron bridges seem to choke on SMART
 
2479
                         * commands, so let's explicitly black list
 
2480
                         * them here.
 
2481
                         *
 
2482
                         * https://bugzilla.redhat.com/show_bug.cgi?id=515881 */
 
2483
                        d->type = SK_DISK_TYPE_NONE;
 
2484
                } else if ((vid == 0x0c0b && pid == 0xb159) ||
2469
2485
                    (vid == 0x04fc && pid == 0x0c25) ||
2470
2486
                    (vid == 0x04fc && pid == 0x0c15))
2471
2487
                        d->type = SK_DISK_TYPE_SUNPLUS;
2472
 
                else if ((vid == 0x152d && pid == 0x2329) ||
2473
 
                    (vid == 0x152d && pid == 0x2336) ||
 
2488
                else if ((vid == 0x152d && pid == 0x2336) ||
2474
2489
                    (vid == 0x152d && pid == 0x2338) ||
2475
2490
                    (vid == 0x152d && pid == 0x2339))
2476
2491
                        d->type = SK_DISK_TYPE_JMICRON;