diff options
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r-- | include/linux/libata.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 7a54244d30aa..047192253c3a 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -358,6 +358,11 @@ struct ata_device { | |||
358 | unsigned int max_sectors; /* per-device max sectors */ | 358 | unsigned int max_sectors; /* per-device max sectors */ |
359 | unsigned int cdb_len; | 359 | unsigned int cdb_len; |
360 | 360 | ||
361 | /* per-dev xfer mask */ | ||
362 | unsigned int pio_mask; | ||
363 | unsigned int mwdma_mask; | ||
364 | unsigned int udma_mask; | ||
365 | |||
361 | /* for CHS addressing */ | 366 | /* for CHS addressing */ |
362 | u16 cylinders; /* Number of cylinders */ | 367 | u16 cylinders; /* Number of cylinders */ |
363 | u16 heads; /* Number of heads */ | 368 | u16 heads; /* Number of heads */ |
@@ -395,6 +400,7 @@ struct ata_port { | |||
395 | 400 | ||
396 | struct ata_host_stats stats; | 401 | struct ata_host_stats stats; |
397 | struct ata_host_set *host_set; | 402 | struct ata_host_set *host_set; |
403 | struct device *dev; | ||
398 | 404 | ||
399 | struct work_struct port_task; | 405 | struct work_struct port_task; |
400 | 406 | ||
@@ -515,9 +521,9 @@ extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); | |||
515 | extern int ata_scsi_release(struct Scsi_Host *host); | 521 | extern int ata_scsi_release(struct Scsi_Host *host); |
516 | extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); | 522 | extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); |
517 | extern int ata_scsi_device_resume(struct scsi_device *); | 523 | extern int ata_scsi_device_resume(struct scsi_device *); |
518 | extern int ata_scsi_device_suspend(struct scsi_device *); | 524 | extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t state); |
519 | extern int ata_device_resume(struct ata_port *, struct ata_device *); | 525 | extern int ata_device_resume(struct ata_port *, struct ata_device *); |
520 | extern int ata_device_suspend(struct ata_port *, struct ata_device *); | 526 | extern int ata_device_suspend(struct ata_port *, struct ata_device *, pm_message_t state); |
521 | extern int ata_ratelimit(void); | 527 | extern int ata_ratelimit(void); |
522 | extern unsigned int ata_busy_sleep(struct ata_port *ap, | 528 | extern unsigned int ata_busy_sleep(struct ata_port *ap, |
523 | unsigned long timeout_pat, | 529 | unsigned long timeout_pat, |
@@ -568,6 +574,8 @@ extern int ata_std_bios_param(struct scsi_device *sdev, | |||
568 | struct block_device *bdev, | 574 | struct block_device *bdev, |
569 | sector_t capacity, int geom[]); | 575 | sector_t capacity, int geom[]); |
570 | extern int ata_scsi_slave_config(struct scsi_device *sdev); | 576 | extern int ata_scsi_slave_config(struct scsi_device *sdev); |
577 | extern struct ata_device *ata_dev_pair(struct ata_port *ap, | ||
578 | struct ata_device *adev); | ||
571 | 579 | ||
572 | /* | 580 | /* |
573 | * Timing helpers | 581 | * Timing helpers |