aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ide.h
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-10 16:39:21 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-10 16:39:21 -0400
commit3a7d24841ad794ae64c90d7d00d62a83741912aa (patch)
treed71a36678fa88ed1e0b279390b6169f5018186bf /include/linux/ide.h
parentf26b3d75959e9a0e43a2e1e1148c075592746c3d (diff)
ide: use ATA_* defines instead of *_STAT and *_ERR ones
* ERR_STAT -> ATA_ERR * INDEX_STAT -> ATA_IDX * ECC_STAT -> ATA_CORR * DRQ_STAT -> ATA_DRQ * SEEK_STAT -> ATA_DSC * WRERR_STAT -> ATA_DF * READY_STAT -> ATA_DRDY * BUSY_STAT -> ATA_BUSY * MARK_ERR -> ATA_AMNF * TRK0_ERR -> ATA_TRK0NF * ABRT_ERR -> ATA_ABORTED * MCR_ERR -> ATA_MCR * ID_ERR -> ATA_IDNF * MC_ERR -> ATA_MC * ECC_ERR -> ATA_UNC * ICRC_ERR -> ATA_ICRC * BBD_ERR -> ATA_BBK Also: * ILI_ERR -> ATAPI_ILI * EOM_ERR -> ATAPI_EOM * LFS_ERR -> ATAPI_LFS * CD -> ATAPI_COD * IO -> ATAPI_IO Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r--include/linux/ide.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e887927e00e6..d963c1929c84 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -87,12 +87,13 @@ struct ide_io_ports {
87}; 87};
88 88
89#define OK_STAT(stat,good,bad) (((stat)&((good)|(bad)))==(good)) 89#define OK_STAT(stat,good,bad) (((stat)&((good)|(bad)))==(good))
90#define BAD_R_STAT (BUSY_STAT | ERR_STAT)
91#define BAD_W_STAT (BAD_R_STAT | WRERR_STAT)
92#define BAD_STAT (BAD_R_STAT | DRQ_STAT)
93#define DRIVE_READY (READY_STAT | SEEK_STAT)
94 90
95#define BAD_CRC (ABRT_ERR | ICRC_ERR) 91#define BAD_R_STAT (ATA_BUSY | ATA_ERR)
92#define BAD_W_STAT (BAD_R_STAT | ATA_DF)
93#define BAD_STAT (BAD_R_STAT | ATA_DRQ)
94#define DRIVE_READY (ATA_DRDY | ATA_DSC)
95
96#define BAD_CRC (ATA_ABORTED | ATA_ICRC)
96 97
97#define SATA_NR_PORTS (3) /* 16 possible ?? */ 98#define SATA_NR_PORTS (3) /* 16 possible ?? */
98 99
@@ -438,8 +439,8 @@ struct ide_drive_s {
438 u8 mult_req; /* requested multiple sector setting */ 439 u8 mult_req; /* requested multiple sector setting */
439 u8 tune_req; /* requested drive tuning setting */ 440 u8 tune_req; /* requested drive tuning setting */
440 u8 io_32bit; /* 0=16-bit, 1=32-bit, 2/3=32bit+sync */ 441 u8 io_32bit; /* 0=16-bit, 1=32-bit, 2/3=32bit+sync */
441 u8 bad_wstat; /* used for ignoring WRERR_STAT */ 442 u8 bad_wstat; /* used for ignoring ATA_DF */
442 u8 nowerr; /* used for ignoring WRERR_STAT */ 443 u8 nowerr; /* used for ignoring ATA_DF */
443 u8 sect0; /* offset of first sector for DM6:DDO */ 444 u8 sect0; /* offset of first sector for DM6:DDO */
444 u8 head; /* "real" number of heads */ 445 u8 head; /* "real" number of heads */
445 u8 sect; /* "real" sectors per track */ 446 u8 sect; /* "real" sectors per track */