diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:20:42 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:20:42 -0500 |
| commit | 2af5920b81a4cd0a22d40b6b2c38356d3df03e13 (patch) | |
| tree | 7ee66d514e394f70f12a608548487353d506215d /include/linux/libata.h | |
| parent | 000080c3499cd5037e60c08a8053efb9e48aa9c0 (diff) | |
| parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 5aa8b133f011..6282bd553c45 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -127,16 +127,19 @@ enum { ATA_FLAG_SUSPENDED = (1 << 12), /* port is suspended */ + ATA_FLAG_PIO_LBA48 = (1 << 13), /* Host DMA engine is LBA28 only */ + ATA_FLAG_IRQ_MASK = (1 << 14), /* Mask IRQ in PIO xfers */ + ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */ ATA_QCFLAG_SG = (1 << 3), /* have s/g table? */ ATA_QCFLAG_SINGLE = (1 << 4), /* no s/g, just a single buffer */ ATA_QCFLAG_DMAMAP = ATA_QCFLAG_SG | ATA_QCFLAG_SINGLE, /* various lengths of time */ - ATA_TMOUT_EDD = 5 * HZ, /* hueristic */ + ATA_TMOUT_EDD = 5 * HZ, /* heuristic */ ATA_TMOUT_PIO = 30 * HZ, - ATA_TMOUT_BOOT = 30 * HZ, /* hueristic */ - ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* hueristic */ + ATA_TMOUT_BOOT = 30 * HZ, /* heuristic */ + ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */ ATA_TMOUT_DATAOUT = 30 * HZ, ATA_TMOUT_DATAOUT_QUICK = 5 * HZ, ATA_TMOUT_CDB = 30 * HZ, |