aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/libata.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-24 12:29:39 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-24 12:29:39 -0500
commit4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99 (patch)
treec4ff89dc09abe69d58db1e14da22ecda9fdd3ce8 /include/linux/libata.h
parent84ac69e8bf9f36eb0166817373336d14fa58f5cc (diff)
parentaec5c3c1a929d7d79a420e943285cf3ba26a7c0d (diff)
Merge branch 'upstream'
Conflicts: drivers/scsi/libata-core.c
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r--include/linux/libata.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index b3d4c906e242..70ca99bbc6c7 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -162,7 +162,6 @@ enum {
162 ATA_QCFLAG_EH_SCHEDULED = (1 << 5), /* EH scheduled */ 162 ATA_QCFLAG_EH_SCHEDULED = (1 << 5), /* EH scheduled */
163 163
164 /* various lengths of time */ 164 /* various lengths of time */
165 ATA_TMOUT_EDD = 5 * HZ, /* heuristic */
166 ATA_TMOUT_PIO = 30 * HZ, 165 ATA_TMOUT_PIO = 30 * HZ,
167 ATA_TMOUT_BOOT = 30 * HZ, /* heuristic */ 166 ATA_TMOUT_BOOT = 30 * HZ, /* heuristic */
168 ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */ 167 ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */
@@ -363,6 +362,11 @@ struct ata_device {
363 unsigned int max_sectors; /* per-device max sectors */ 362 unsigned int max_sectors; /* per-device max sectors */
364 unsigned int cdb_len; 363 unsigned int cdb_len;
365 364
365 /* per-dev xfer mask */
366 unsigned int pio_mask;
367 unsigned int mwdma_mask;
368 unsigned int udma_mask;
369
366 /* for CHS addressing */ 370 /* for CHS addressing */
367 u16 cylinders; /* Number of cylinders */ 371 u16 cylinders; /* Number of cylinders */
368 u16 heads; /* Number of heads */ 372 u16 heads; /* Number of heads */
@@ -400,6 +404,7 @@ struct ata_port {
400 404
401 struct ata_host_stats stats; 405 struct ata_host_stats stats;
402 struct ata_host_set *host_set; 406 struct ata_host_set *host_set;
407 struct device *dev;
403 408
404 struct work_struct port_task; 409 struct work_struct port_task;
405 410
@@ -520,9 +525,9 @@ extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
520extern int ata_scsi_release(struct Scsi_Host *host); 525extern int ata_scsi_release(struct Scsi_Host *host);
521extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); 526extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
522extern int ata_scsi_device_resume(struct scsi_device *); 527extern int ata_scsi_device_resume(struct scsi_device *);
523extern int ata_scsi_device_suspend(struct scsi_device *); 528extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t state);
524extern int ata_device_resume(struct ata_port *, struct ata_device *); 529extern int ata_device_resume(struct ata_port *, struct ata_device *);
525extern int ata_device_suspend(struct ata_port *, struct ata_device *); 530extern int ata_device_suspend(struct ata_port *, struct ata_device *, pm_message_t state);
526extern int ata_ratelimit(void); 531extern int ata_ratelimit(void);
527extern unsigned int ata_busy_sleep(struct ata_port *ap, 532extern unsigned int ata_busy_sleep(struct ata_port *ap,
528 unsigned long timeout_pat, 533 unsigned long timeout_pat,
@@ -573,6 +578,8 @@ extern int ata_std_bios_param(struct scsi_device *sdev,
573 struct block_device *bdev, 578 struct block_device *bdev,
574 sector_t capacity, int geom[]); 579 sector_t capacity, int geom[]);
575extern int ata_scsi_slave_config(struct scsi_device *sdev); 580extern int ata_scsi_slave_config(struct scsi_device *sdev);
581extern struct ata_device *ata_dev_pair(struct ata_port *ap,
582 struct ata_device *adev);
576 583
577/* 584/*
578 * Timing helpers 585 * Timing helpers