← Back to branch summary

~ubuntu-branches/ubuntu/trusty/hdparm/trusty-proposed

« back to all changes in this revision

Viewing changes to identify.c

  • Committer: Steve Langasek
  • Date: 2012-10-25 03:08:04 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: steve.langasek@canonical.com-20121025030804-l50mshoma6jtp6kg
Merging shared upstream rev into target branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
identify.c
514
514
        "SCT Data Tables (AC5)",                        /* word 206 bit  5 */
515
515
        "SCT Features Control (AC4)",                   /* word 206 bit  4 */
516
516
        "SCT Error Recovery Control (AC3)",             /* word 206 bit  3 */
517
 
        "SCT LBA Segment Access (AC2)",                 /* word 206 bit  2 */
518
 
        "SCT Long Sector Access (AC1)",                 /* word 206 bit  1 */
 
517
        "SCT Write Same (AC2)",                         /* word 206 bit  2 */
 
518
        "SCT Read/Write Long (AC1), obsolete",          /* word 206 bit  1: obsolete per T13/e08153r1 */
519
519
        "SMART Command Transport (SCT) feature set"     /* word 206 bit  0 */
520
520
};
521
521
 
1330
1330
                kk =  val[ENH_ERASE_TIME];
1331
1331
                if((jj && jj <= 0x00ff) || (kk && kk <= 0x00ff)) {
1332
1332
                        printf("\t");
1333
 
                        if(jj) printf("%umin for SECURITY ERASE UNIT. ",         (jj == 0xff) ? 508 : (jj * 2));
1334
 
                        if(kk) printf("%umin for ENHANCED SECURITY ERASE UNIT.", (kk == 0xff) ? 508 : (kk * 2));
 
1333
                        if (jj) {
 
1334
                                if (jj == 0xff)
 
1335
                                        printf("more than 508");
 
1336
                                else
 
1337
                                        printf("%u", jj * 2);
 
1338
                                printf("min for SECURITY ERASE UNIT. ");
 
1339
                        }
 
1340
                        if (kk) {
 
1341
                                if (kk == 0xff)
 
1342
                                        printf("more than 508");
 
1343
                                else
 
1344
                                        printf("%u", kk * 2);
 
1345
                                printf("min for ENHANCED SECURITY ERASE UNIT. ");
 
1346
                        }
1335
1347
                        printf("\n");
1336
1348
                }
1337
1349
        }
1461
1473
        }
1462
1474
        putchar('\n');
1463
1475
 
1464
 
        if (dco[8] && 0x1f) {
 
1476
        if (dco[8] & 0x1f) {
1465
1477
                printf("\tSATA command/feature sets:\n\t\t");
1466
1478
                if (dco[0] < 2)
1467
1479
                        printf(" (?):");