diff options
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index feabeae1cfc0..53ce430954da 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -28,6 +28,7 @@ #include <asm/io.h> #include <linux/ata.h> + /* * compile-time options */ @@ -66,8 +67,6 @@ /* defines only for the constants which don't work well as enums */ #define ATA_TAG_POISON 0xfafbfcfdU -#define ATA_DMA_BOUNDARY 0xffffUL -#define ATA_DMA_MASK 0xffffffffULL enum { /* various global constants */ @@ -171,6 +170,7 @@ enum { }; /* forward declarations */ +struct scsi_device; struct ata_port_operations; struct ata_port; struct ata_queued_cmd; @@ -247,8 +247,8 @@ struct ata_queued_cmd { struct ata_port *ap; struct ata_device *dev; - Scsi_Cmnd *scsicmd; - void (*scsidone)(Scsi_Cmnd *); + struct scsi_cmnd *scsicmd; + void (*scsidone)(struct scsi_cmnd *); struct list_head node; unsigned long flags; /* ATA_QCFLAG_xxx */ @@ -403,7 +403,7 @@ extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_i extern void ata_pci_remove_one (struct pci_dev *pdev); extern int ata_device_add(struct ata_probe_ent *ent); extern int ata_scsi_detect(Scsi_Host_Template *sht); -extern int ata_scsi_queuecmd(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *)); +extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 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); @@ -427,6 +427,9 @@ extern void ata_bmdma_start_pio (struct ata_queued_cmd *qc); extern int pci_test_config_bits(struct pci_dev *pdev, struct pci_bits *bits); extern void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat, unsigned int done_late); extern void ata_eng_timeout(struct ata_port *ap); +extern int ata_std_bios_param(struct scsi_device *sdev, + struct block_device *bdev, + sector_t capacity, int geom[]); static inline unsigned long msecs_to_jiffies(unsigned long msecs) |