diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:45:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:45:00 -0500 |
| commit | f6ef65e6d004b77d516037424c7ccc209d0d3509 (patch) | |
| tree | 394bac3559237abb94be5051828b3e45315d6489 /include | |
| parent | 7103c7bc863c10dd2a26c19c8cf4d7d2846da947 (diff) | |
| parent | c19ba8af4f104cca28d548cac55c128b28dd31fb (diff) | |
| download | op-kernel-dev-f6ef65e6d004b77d516037424c7ccc209d0d3509.zip op-kernel-dev-f6ef65e6d004b77d516037424c7ccc209d0d3509.tar.gz | |
Merge branch 'upstream-2.6.17'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 88f0a27c..f8a04ef5 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -149,9 +149,9 @@ enum { ATA_FLAG_PORT_DISABLED = (1 << 2), /* port is disabled, ignore it */ ATA_FLAG_SATA = (1 << 3), ATA_FLAG_NO_LEGACY = (1 << 4), /* no legacy mode check */ - ATA_FLAG_SRST = (1 << 5), /* use ATA SRST, not E.D.D. */ + ATA_FLAG_SRST = (1 << 5), /* (obsolete) use ATA SRST, not E.D.D. */ ATA_FLAG_MMIO = (1 << 6), /* use MMIO, not PIO */ - ATA_FLAG_SATA_RESET = (1 << 7), /* use COMRESET */ + ATA_FLAG_SATA_RESET = (1 << 7), /* (obsolete) use COMRESET */ ATA_FLAG_PIO_DMA = (1 << 8), /* PIO cmds via DMA */ ATA_FLAG_PIO_POLLING = (1 << 9), /* use polling PIO if LLD * doesn't handle PIO interrupts */ @@ -422,7 +422,9 @@ struct ata_port_operations { u8 (*check_altstatus)(struct ata_port *ap); void (*dev_select)(struct ata_port *ap, unsigned int device); - void (*phy_reset) (struct ata_port *ap); + void (*phy_reset) (struct ata_port *ap); /* obsolete */ + int (*probe_reset) (struct ata_port *ap, unsigned int *classes); + void (*post_set_mode) (struct ata_port *ap); int (*check_atapi_dma) (struct ata_queued_cmd *qc); @@ -503,6 +505,9 @@ extern int ata_scsi_device_suspend(struct scsi_device *); extern int ata_device_resume(struct ata_port *, struct ata_device *); extern int ata_device_suspend(struct ata_port *, struct ata_device *); extern int ata_ratelimit(void); +extern unsigned int ata_busy_sleep(struct ata_port *ap, + unsigned long timeout_pat, + unsigned long timeout); /* * Default driver ops implementations |
