diff options
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 34c128f0a33c..fc61328a4cdb 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -218,21 +218,12 @@ static inline void ide_std_init_ports(hw_regs_t *hw, | |||
218 | 218 | ||
219 | /* | 219 | /* |
220 | * Special Driver Flags | 220 | * Special Driver Flags |
221 | * | ||
222 | * set_geometry : respecify drive geometry | ||
223 | * recalibrate : seek to cyl 0 | ||
224 | * set_multmode : set multmode count | ||
225 | * reserved : unused | ||
226 | */ | 221 | */ |
227 | typedef union { | 222 | enum { |
228 | unsigned all : 8; | 223 | IDE_SFLAG_SET_GEOMETRY = (1 << 0), |
229 | struct { | 224 | IDE_SFLAG_RECALIBRATE = (1 << 1), |
230 | unsigned set_geometry : 1; | 225 | IDE_SFLAG_SET_MULTMODE = (1 << 2), |
231 | unsigned recalibrate : 1; | 226 | }; |
232 | unsigned set_multmode : 1; | ||
233 | unsigned reserved : 5; | ||
234 | } b; | ||
235 | } special_t; | ||
236 | 227 | ||
237 | /* | 228 | /* |
238 | * Status returned from various ide_ functions | 229 | * Status returned from various ide_ functions |
@@ -530,7 +521,7 @@ struct ide_drive_s { | |||
530 | unsigned long sleep; /* sleep until this time */ | 521 | unsigned long sleep; /* sleep until this time */ |
531 | unsigned long timeout; /* max time to wait for irq */ | 522 | unsigned long timeout; /* max time to wait for irq */ |
532 | 523 | ||
533 | special_t special; /* special action flags */ | 524 | u8 special_flags; /* special action flags */ |
534 | 525 | ||
535 | u8 select; /* basic drive/head select reg value */ | 526 | u8 select; /* basic drive/head select reg value */ |
536 | u8 retry_pio; /* retrying dma capable host in pio */ | 527 | u8 retry_pio; /* retrying dma capable host in pio */ |