aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@googlemail.com>2009-01-02 10:12:50 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-02 10:12:50 -0500
commitbf64741fe89280bd81a9e3a1beadec1570861848 (patch)
treee6b624e6879de8190f00b96b979bc41fff1af0bf
parent0f38aaa4980fdf5de215e0a8bf6d6032164a6c4b (diff)
ide: make IDE_AFLAG_.. numbering continuous again
Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--include/linux/ide.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 5f86ad40ee7e..eb4c01f7f253 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -473,53 +473,53 @@ enum {
473 473
474 /* ide-cd */ 474 /* ide-cd */
475 /* Drive cannot eject the disc. */ 475 /* Drive cannot eject the disc. */
476 IDE_AFLAG_NO_EJECT = (1 << 3), 476 IDE_AFLAG_NO_EJECT = (1 << 1),
477 /* Drive is a pre ATAPI 1.2 drive. */ 477 /* Drive is a pre ATAPI 1.2 drive. */
478 IDE_AFLAG_PRE_ATAPI12 = (1 << 4), 478 IDE_AFLAG_PRE_ATAPI12 = (1 << 2),
479 /* TOC addresses are in BCD. */ 479 /* TOC addresses are in BCD. */
480 IDE_AFLAG_TOCADDR_AS_BCD = (1 << 5), 480 IDE_AFLAG_TOCADDR_AS_BCD = (1 << 3),
481 /* TOC track numbers are in BCD. */ 481 /* TOC track numbers are in BCD. */
482 IDE_AFLAG_TOCTRACKS_AS_BCD = (1 << 6), 482 IDE_AFLAG_TOCTRACKS_AS_BCD = (1 << 4),
483 /* 483 /*
484 * Drive does not provide data in multiples of SECTOR_SIZE 484 * Drive does not provide data in multiples of SECTOR_SIZE
485 * when more than one interrupt is needed. 485 * when more than one interrupt is needed.
486 */ 486 */
487 IDE_AFLAG_LIMIT_NFRAMES = (1 << 7), 487 IDE_AFLAG_LIMIT_NFRAMES = (1 << 5),
488 /* Saved TOC information is current. */ 488 /* Saved TOC information is current. */
489 IDE_AFLAG_TOC_VALID = (1 << 9), 489 IDE_AFLAG_TOC_VALID = (1 << 6),
490 /* We think that the drive door is locked. */ 490 /* We think that the drive door is locked. */
491 IDE_AFLAG_DOOR_LOCKED = (1 << 10), 491 IDE_AFLAG_DOOR_LOCKED = (1 << 7),
492 /* SET_CD_SPEED command is unsupported. */ 492 /* SET_CD_SPEED command is unsupported. */
493 IDE_AFLAG_NO_SPEED_SELECT = (1 << 11), 493 IDE_AFLAG_NO_SPEED_SELECT = (1 << 8),
494 IDE_AFLAG_VERTOS_300_SSD = (1 << 12), 494 IDE_AFLAG_VERTOS_300_SSD = (1 << 9),
495 IDE_AFLAG_VERTOS_600_ESD = (1 << 13), 495 IDE_AFLAG_VERTOS_600_ESD = (1 << 10),
496 IDE_AFLAG_SANYO_3CD = (1 << 14), 496 IDE_AFLAG_SANYO_3CD = (1 << 11),
497 IDE_AFLAG_FULL_CAPS_PAGE = (1 << 15), 497 IDE_AFLAG_FULL_CAPS_PAGE = (1 << 12),
498 IDE_AFLAG_PLAY_AUDIO_OK = (1 << 16), 498 IDE_AFLAG_PLAY_AUDIO_OK = (1 << 13),
499 IDE_AFLAG_LE_SPEED_FIELDS = (1 << 17), 499 IDE_AFLAG_LE_SPEED_FIELDS = (1 << 14),
500 500
501 /* ide-floppy */ 501 /* ide-floppy */
502 /* Avoid commands not supported in Clik drive */ 502 /* Avoid commands not supported in Clik drive */
503 IDE_AFLAG_CLIK_DRIVE = (1 << 19), 503 IDE_AFLAG_CLIK_DRIVE = (1 << 15),
504 /* Requires BH algorithm for packets */ 504 /* Requires BH algorithm for packets */
505 IDE_AFLAG_ZIP_DRIVE = (1 << 20), 505 IDE_AFLAG_ZIP_DRIVE = (1 << 16),
506 /* Supports format progress report */ 506 /* Supports format progress report */
507 IDE_AFLAG_SRFP = (1 << 22), 507 IDE_AFLAG_SRFP = (1 << 17),
508 508
509 /* ide-tape */ 509 /* ide-tape */
510 IDE_AFLAG_IGNORE_DSC = (1 << 23), 510 IDE_AFLAG_IGNORE_DSC = (1 << 18),
511 /* 0 When the tape position is unknown */ 511 /* 0 When the tape position is unknown */
512 IDE_AFLAG_ADDRESS_VALID = (1 << 24), 512 IDE_AFLAG_ADDRESS_VALID = (1 << 19),
513 /* Device already opened */ 513 /* Device already opened */
514 IDE_AFLAG_BUSY = (1 << 25), 514 IDE_AFLAG_BUSY = (1 << 20),
515 /* Attempt to auto-detect the current user block size */ 515 /* Attempt to auto-detect the current user block size */
516 IDE_AFLAG_DETECT_BS = (1 << 26), 516 IDE_AFLAG_DETECT_BS = (1 << 21),
517 /* Currently on a filemark */ 517 /* Currently on a filemark */
518 IDE_AFLAG_FILEMARK = (1 << 27), 518 IDE_AFLAG_FILEMARK = (1 << 22),
519 /* 0 = no tape is loaded, so we don't rewind after ejecting */ 519 /* 0 = no tape is loaded, so we don't rewind after ejecting */
520 IDE_AFLAG_MEDIUM_PRESENT = (1 << 28), 520 IDE_AFLAG_MEDIUM_PRESENT = (1 << 23),
521 521
522 IDE_AFLAG_NO_AUTOCLOSE = (1 << 29), 522 IDE_AFLAG_NO_AUTOCLOSE = (1 << 24),
523}; 523};
524 524
525/* device flags */ 525/* device flags */