aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ide.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 079b6f9405ed..f0af504dfa42 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -462,7 +462,7 @@ typedef struct hwif_s {
462 void (*rw_disk)(ide_drive_t *, struct request *); 462 void (*rw_disk)(ide_drive_t *, struct request *);
463 463
464 const struct ide_port_ops *port_ops; 464 const struct ide_port_ops *port_ops;
465 struct ide_dma_ops *dma_ops; 465 const struct ide_dma_ops *dma_ops;
466 466
467 void (*ata_input_data)(ide_drive_t *, void *, u32); 467 void (*ata_input_data)(ide_drive_t *, void *, u32);
468 void (*ata_output_data)(ide_drive_t *, void *, u32); 468 void (*ata_output_data)(ide_drive_t *, void *, u32);
@@ -1118,7 +1118,7 @@ struct ide_port_info {
1118 const struct ide_port_info *); 1118 const struct ide_port_info *);
1119 1119
1120 const struct ide_port_ops *port_ops; 1120 const struct ide_port_ops *port_ops;
1121 struct ide_dma_ops *dma_ops; 1121 const struct ide_dma_ops *dma_ops;
1122 1122
1123 ide_pci_enablebit_t enablebits[2]; 1123 ide_pci_enablebit_t enablebits[2];
1124 hwif_chipset_t chipset; 1124 hwif_chipset_t chipset;
@@ -1170,12 +1170,14 @@ void ide_destroy_dmatable(ide_drive_t *);
1170extern int ide_build_dmatable(ide_drive_t *, struct request *); 1170extern int ide_build_dmatable(ide_drive_t *, struct request *);
1171int ide_allocate_dma_engine(ide_hwif_t *); 1171int ide_allocate_dma_engine(ide_hwif_t *);
1172void ide_release_dma_engine(ide_hwif_t *); 1172void ide_release_dma_engine(ide_hwif_t *);
1173void ide_setup_dma(ide_hwif_t *, unsigned long, const struct ide_port_info *); 1173void ide_setup_dma(ide_hwif_t *, unsigned long);
1174 1174
1175void ide_dma_host_set(ide_drive_t *, int); 1175void ide_dma_host_set(ide_drive_t *, int);
1176extern int ide_dma_setup(ide_drive_t *); 1176extern int ide_dma_setup(ide_drive_t *);
1177void ide_dma_exec_cmd(ide_drive_t *, u8);
1177extern void ide_dma_start(ide_drive_t *); 1178extern void ide_dma_start(ide_drive_t *);
1178extern int __ide_dma_end(ide_drive_t *); 1179extern int __ide_dma_end(ide_drive_t *);
1180int ide_dma_test_irq(ide_drive_t *);
1179extern void ide_dma_lost_irq(ide_drive_t *); 1181extern void ide_dma_lost_irq(ide_drive_t *);
1180extern void ide_dma_timeout(ide_drive_t *); 1182extern void ide_dma_timeout(ide_drive_t *);
1181#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */ 1183#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */