diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-11 20:53:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-11 20:53:05 -0800 |
| commit | a8b828f4f202557dbdc8455f525ae8a02f8b43a2 (patch) | |
| tree | 0aefcd8e597ed5e203b02fd924ac9a34d32ae312 /include/linux | |
| parent | 2d0512a44c24ea3e51118158503ab24c4b872175 (diff) | |
| parent | 3f9d4e0f0e28691b42995a7e78035425632d4743 (diff) | |
Merge bk://gkernel.bkbits.net/libata-2.5
into ppc970.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 37d958f2554e..52ff5c1198f2 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -183,12 +183,15 @@ struct ata_ioports { unsigned long cmd_addr; unsigned long data_addr; unsigned long error_addr; + unsigned long feature_addr; unsigned long nsect_addr; unsigned long lbal_addr; unsigned long lbam_addr; unsigned long lbah_addr; unsigned long device_addr; - unsigned long cmdstat_addr; + unsigned long status_addr; + unsigned long command_addr; + unsigned long altstatus_addr; unsigned long ctl_addr; unsigned long bmdma_addr; unsigned long scr_addr; @@ -408,6 +411,7 @@ extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn extern int ata_scsi_error(struct Scsi_Host *host); extern int ata_scsi_release(struct Scsi_Host *host); extern int ata_scsi_slave_config(struct scsi_device *sdev); +extern inline unsigned int ata_host_intr (struct ata_port *ap, struct ata_queued_cmd *qc); /* * Default driver ops implementations */ @@ -465,8 +469,8 @@ static inline u8 ata_chk_status(struct ata_port *ap) static inline u8 ata_altstatus(struct ata_port *ap) { if (ap->flags & ATA_FLAG_MMIO) - return readb(ap->ioaddr.ctl_addr); - return inb(ap->ioaddr.ctl_addr); + return readb(ap->ioaddr.altstatus_addr); + return inb(ap->ioaddr.altstatus_addr); } static inline void ata_pause(struct ata_port *ap) @@ -494,7 +498,7 @@ static inline u8 ata_wait_idle(struct ata_port *ap) u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000); if (status & (ATA_BUSY | ATA_DRQ)) { - unsigned long l = ap->ioaddr.cmdstat_addr; + unsigned long l = ap->ioaddr.status_addr; printk(KERN_WARNING "ATA: abnormal status 0x%X on port 0x%lX\n", status, l); |