diff options
-rw-r--r-- | drivers/ide/ide-lib.c | 17 | ||||
-rw-r--r-- | include/linux/ide.h | 8 |
2 files changed, 0 insertions, 25 deletions
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c index efa5bfa64d01..3e12f229bd5f 100644 --- a/drivers/ide/ide-lib.c +++ b/drivers/ide/ide-lib.c | |||
@@ -76,23 +76,6 @@ static u8 ide_rate_filter(ide_drive_t *drive, u8 speed) | |||
76 | } | 76 | } |
77 | 77 | ||
78 | /* | 78 | /* |
79 | * Standard (generic) timings for PIO modes, from ATA2 specification. | ||
80 | * These timings are for access to the IDE data port register *only*. | ||
81 | * Some drives may specify a mode, while also specifying a different | ||
82 | * value for cycle_time (from drive identification data). | ||
83 | */ | ||
84 | const ide_pio_timings_t ide_pio_timings[6] = { | ||
85 | { 70, 165, 600 }, /* PIO Mode 0 */ | ||
86 | { 50, 125, 383 }, /* PIO Mode 1 */ | ||
87 | { 30, 100, 240 }, /* PIO Mode 2 */ | ||
88 | { 30, 80, 180 }, /* PIO Mode 3 with IORDY */ | ||
89 | { 25, 70, 120 }, /* PIO Mode 4 with IORDY */ | ||
90 | { 20, 50, 100 } /* PIO Mode 5 with IORDY (nonstandard) */ | ||
91 | }; | ||
92 | |||
93 | EXPORT_SYMBOL_GPL(ide_pio_timings); | ||
94 | |||
95 | /* | ||
96 | * Shared data/functions for determining best PIO mode for an IDE drive. | 79 | * Shared data/functions for determining best PIO mode for an IDE drive. |
97 | * Most of this stuff originally lived in cmd640.c, and changes to the | 80 | * Most of this stuff originally lived in cmd640.c, and changes to the |
98 | * ide_pio_blacklist[] table should be made with EXTREME CAUTION to avoid | 81 | * ide_pio_blacklist[] table should be made with EXTREME CAUTION to avoid |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 3899c761b302..4e44525fa5ca 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -1305,15 +1305,7 @@ void ide_timing_merge(struct ide_timing *, struct ide_timing *, | |||
1305 | struct ide_timing *, unsigned int); | 1305 | struct ide_timing *, unsigned int); |
1306 | int ide_timing_compute(ide_drive_t *, u8, struct ide_timing *, int, int); | 1306 | int ide_timing_compute(ide_drive_t *, u8, struct ide_timing *, int, int); |
1307 | 1307 | ||
1308 | typedef struct ide_pio_timings_s { | ||
1309 | int setup_time; /* Address setup (ns) minimum */ | ||
1310 | int active_time; /* Active pulse (ns) minimum */ | ||
1311 | int cycle_time; /* Cycle time (ns) minimum = */ | ||
1312 | /* active + recovery (+ setup for some chips) */ | ||
1313 | } ide_pio_timings_t; | ||
1314 | |||
1315 | u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8); | 1308 | u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8); |
1316 | extern const ide_pio_timings_t ide_pio_timings[6]; | ||
1317 | 1309 | ||
1318 | int ide_set_pio_mode(ide_drive_t *, u8); | 1310 | int ide_set_pio_mode(ide_drive_t *, u8); |
1319 | int ide_set_dma_mode(ide_drive_t *, u8); | 1311 | int ide_set_dma_mode(ide_drive_t *, u8); |