diff options
author | Darrick J. Wong | 2006-08-11 04:19:47 +0200 |
---|---|---|
committer | James Bottomley | 2007-07-18 18:12:53 +0200 |
commit | fa1c1e8f1ece48c7baa3ba529bfd0d10a0bdf4eb (patch) | |
tree | 8de54ce8b590c720f528c511c2434e71abd34f0c /include/scsi | |
parent | zs: move to the serial subsystem (diff) | |
download | kernel-qcow2-linux-fa1c1e8f1ece48c7baa3ba529bfd0d10a0bdf4eb.tar.gz kernel-qcow2-linux-fa1c1e8f1ece48c7baa3ba529bfd0d10a0bdf4eb.tar.xz kernel-qcow2-linux-fa1c1e8f1ece48c7baa3ba529bfd0d10a0bdf4eb.zip |
[SCSI] Add SATA support to libsas
Hook the scsi_host_template functions in libsas to delegate
functionality to libata when appropriate.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Misc code changes and merge fixes and update for libata->drivers/ata
move
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/libsas.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 2e6bdc4e7a0a..ce20177069a4 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -30,6 +30,7 @@ #include <linux/timer.h> #include <linux/pci.h> #include <scsi/sas.h> +#include <linux/libata.h> #include <linux/list.h> #include <asm/semaphore.h> #include <scsi/scsi_device.h> @@ -165,6 +166,13 @@ struct sata_device { u8 port_no; /* port number, if this is a PM (Port) */ struct list_head children; /* PM Ports if this is a PM */ + + struct ata_port *ap; + struct ata_host ata_host; + struct ata_taskfile tf; + u32 sstatus; + u32 serror; + u32 scontrol; }; /* ---------- Domain device ---------- */ @@ -661,4 +669,8 @@ int __sas_task_abort(struct sas_task *); int sas_eh_device_reset_handler(struct scsi_cmnd *cmd); int sas_eh_bus_reset_handler(struct scsi_cmnd *cmd); +extern void sas_target_destroy(struct scsi_target *); +extern int sas_slave_alloc(struct scsi_device *); +extern int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg); + #endif /* _SASLIB_H_ */ |