diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-30 02:59:39 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-30 02:59:39 +0200 |
| commit | 4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2 (patch) | |
| tree | 664564736e52a88e14d9c699c5c723b89785f4cb /include | |
| parent | Merge branch 'upstream' (diff) | |
| parent | Merge branch 'mv-merge' (diff) | |
| download | linux-4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2.tar.xz linux-4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2.zip | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/sata_mv.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 0eb71c1773a1..b248cb020f87 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -161,6 +161,9 @@ enum { ATA_QCFLAG_DMAMAP = ATA_QCFLAG_SG | ATA_QCFLAG_SINGLE, ATA_QCFLAG_EH_SCHEDULED = (1 << 5), /* EH scheduled */ + /* host set flags */ + ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host_set only */ + /* various lengths of time */ ATA_TMOUT_BOOT = 30 * HZ, /* heuristic */ ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */ @@ -275,6 +278,7 @@ struct ata_probe_ent { unsigned long irq; unsigned int irq_flags; unsigned long host_flags; + unsigned long host_set_flags; void __iomem *mmio_base; void *private_data; }; @@ -287,6 +291,9 @@ struct ata_host_set { unsigned int n_ports; void *private_data; const struct ata_port_operations *ops; + unsigned long flags; + int simplex_claimed; /* Keep seperate in case we + ever need to do this locked */ struct ata_port * ports[0]; }; @@ -415,6 +422,7 @@ struct ata_port_operations { void (*set_piomode) (struct ata_port *, struct ata_device *); void (*set_dmamode) (struct ata_port *, struct ata_device *); + unsigned long (*mode_filter) (const struct ata_port *, struct ata_device *, unsigned long); void (*tf_load) (struct ata_port *ap, const struct ata_taskfile *tf); void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf); @@ -425,6 +433,7 @@ struct ata_port_operations { void (*dev_select)(struct ata_port *ap, unsigned int device); void (*phy_reset) (struct ata_port *ap); /* obsolete */ + void (*set_mode) (struct ata_port *ap); int (*probe_reset) (struct ata_port *ap, unsigned int *classes); void (*post_set_mode) (struct ata_port *ap); |