diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index e919c865f0c7..c69181c61fd8 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -603,7 +603,7 @@ struct ide_drive_s { | |||
| 603 | 603 | ||
| 604 | unsigned int bios_cyl; /* BIOS/fdisk/LILO number of cyls */ | 604 | unsigned int bios_cyl; /* BIOS/fdisk/LILO number of cyls */ |
| 605 | unsigned int cyl; /* "real" number of cyls */ | 605 | unsigned int cyl; /* "real" number of cyls */ |
| 606 | unsigned int drive_data; /* used by set_pio_mode/selectproc */ | 606 | unsigned int drive_data; /* used by set_pio_mode/dev_select() */ |
| 607 | unsigned int failures; /* current failure count */ | 607 | unsigned int failures; /* current failure count */ |
| 608 | unsigned int max_failures; /* maximum allowed failure count */ | 608 | unsigned int max_failures; /* maximum allowed failure count */ |
| 609 | u64 probed_capacity;/* initial reported media capacity (ide-cd only currently) */ | 609 | u64 probed_capacity;/* initial reported media capacity (ide-cd only currently) */ |
| @@ -661,6 +661,7 @@ struct ide_tp_ops { | |||
| 661 | u8 (*read_altstatus)(struct hwif_s *); | 661 | u8 (*read_altstatus)(struct hwif_s *); |
| 662 | void (*write_devctl)(struct hwif_s *, u8); | 662 | void (*write_devctl)(struct hwif_s *, u8); |
| 663 | 663 | ||
| 664 | void (*dev_select)(ide_drive_t *); | ||
| 664 | void (*tf_load)(ide_drive_t *, struct ide_cmd *); | 665 | void (*tf_load)(ide_drive_t *, struct ide_cmd *); |
| 665 | void (*tf_read)(ide_drive_t *, struct ide_cmd *); | 666 | void (*tf_read)(ide_drive_t *, struct ide_cmd *); |
| 666 | 667 | ||
| @@ -678,7 +679,6 @@ extern const struct ide_tp_ops default_tp_ops; | |||
| 678 | * @init_dev: host specific initialization of a device | 679 | * @init_dev: host specific initialization of a device |
| 679 | * @set_pio_mode: routine to program host for PIO mode | 680 | * @set_pio_mode: routine to program host for PIO mode |
| 680 | * @set_dma_mode: routine to program host for DMA mode | 681 | * @set_dma_mode: routine to program host for DMA mode |
| 681 | * @selectproc: tweaks hardware to select drive | ||
| 682 | * @reset_poll: chipset polling based on hba specifics | 682 | * @reset_poll: chipset polling based on hba specifics |
| 683 | * @pre_reset: chipset specific changes to default for device-hba resets | 683 | * @pre_reset: chipset specific changes to default for device-hba resets |
| 684 | * @resetproc: routine to reset controller after a disk reset | 684 | * @resetproc: routine to reset controller after a disk reset |
| @@ -695,7 +695,6 @@ struct ide_port_ops { | |||
| 695 | void (*init_dev)(ide_drive_t *); | 695 | void (*init_dev)(ide_drive_t *); |
| 696 | void (*set_pio_mode)(ide_drive_t *, const u8); | 696 | void (*set_pio_mode)(ide_drive_t *, const u8); |
| 697 | void (*set_dma_mode)(ide_drive_t *, const u8); | 697 | void (*set_dma_mode)(ide_drive_t *, const u8); |
| 698 | void (*selectproc)(ide_drive_t *); | ||
| 699 | int (*reset_poll)(ide_drive_t *); | 698 | int (*reset_poll)(ide_drive_t *); |
| 700 | void (*pre_reset)(ide_drive_t *); | 699 | void (*pre_reset)(ide_drive_t *); |
| 701 | void (*resetproc)(ide_drive_t *); | 700 | void (*resetproc)(ide_drive_t *); |
| @@ -1170,6 +1169,7 @@ u8 ide_read_status(ide_hwif_t *); | |||
| 1170 | u8 ide_read_altstatus(ide_hwif_t *); | 1169 | u8 ide_read_altstatus(ide_hwif_t *); |
| 1171 | void ide_write_devctl(ide_hwif_t *, u8); | 1170 | void ide_write_devctl(ide_hwif_t *, u8); |
| 1172 | 1171 | ||
| 1172 | void ide_dev_select(ide_drive_t *); | ||
| 1173 | void ide_tf_load(ide_drive_t *, struct ide_cmd *); | 1173 | void ide_tf_load(ide_drive_t *, struct ide_cmd *); |
| 1174 | void ide_tf_read(ide_drive_t *, struct ide_cmd *); | 1174 | void ide_tf_read(ide_drive_t *, struct ide_cmd *); |
| 1175 | 1175 | ||
