diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-13 00:13:48 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-13 00:13:48 -0500 |
| commit | 3875e1945b55f0eb83fe7359614a801eeb716761 (patch) | |
| tree | 4567aef3fb7d081cb7d7b7c9bcd94e0e44d39557 /include/linux/libata.h | |
| parent | 587005de144acd3007b8e7f2a2a7c6add157c155 (diff) | |
| parent | f1b318793dcd2d9ff6b5ac06e7762098fa079cee (diff) | |
| download | op-kernel-dev-3875e1945b55f0eb83fe7359614a801eeb716761.zip op-kernel-dev-3875e1945b55f0eb83fe7359614a801eeb716761.tar.gz | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 9873f4c..67d07c4 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -122,9 +122,8 @@ enum { /* struct ata_device stuff */ ATA_DFLAG_LBA48 = (1 << 0), /* device supports LBA48 */ ATA_DFLAG_PIO = (1 << 1), /* device currently in PIO mode */ - ATA_DFLAG_LOCK_SECTORS = (1 << 2), /* don't adjust max_sectors */ - ATA_DFLAG_LBA = (1 << 3), /* device supports LBA */ - ATA_DFLAG_CDB_INTR = (1 << 4), /* device asserts INTRQ when ready for CDB */ + ATA_DFLAG_LBA = (1 << 2), /* device supports LBA */ + ATA_DFLAG_CDB_INTR = (1 << 3), /* device asserts INTRQ when ready for CDB */ ATA_DEV_UNKNOWN = 0, /* unknown device */ ATA_DEV_ATA = 1, /* ATA device */ @@ -353,6 +352,8 @@ struct ata_device { unsigned int multi_count; /* sectors count for READ/WRITE MULTIPLE */ + unsigned int max_sectors; /* per-device max sectors */ + unsigned int cdb_len; /* for CHS addressing */ u16 cylinders; /* Number of cylinders */ @@ -382,7 +383,6 @@ struct ata_port { unsigned int mwdma_mask; unsigned int udma_mask; unsigned int cbl; /* cable type; ATA_CBL_xxx */ - unsigned int cdb_len; struct ata_device device[ATA_MAX_DEVICES]; @@ -543,6 +543,8 @@ extern void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg, extern unsigned int ata_dev_classify(const struct ata_taskfile *tf); extern void ata_dev_id_string(const u16 *id, unsigned char *s, unsigned int ofs, unsigned int len); +extern void ata_dev_id_c_string(const u16 *id, unsigned char *s, + unsigned int ofs, unsigned int len); extern void ata_dev_config(struct ata_port *ap, unsigned int i); extern void ata_bmdma_setup (struct ata_queued_cmd *qc); extern void ata_bmdma_start (struct ata_queued_cmd *qc); |
