diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-16 14:33:36 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-16 14:33:36 -0400 |
commit | 3be53f3f213223f50d8e29b5e1869685bf040a1e (patch) | |
tree | b87de30d2d63e67ebd15236618de2d70c68a74cf /include/linux/ide.h | |
parent | 71d5161426c26742ba053fe93637559cbe2cea37 (diff) |
ide: move some bits from ide-timing.h to <linux/ide.h>
Move struct ide_timing and IDE_TIMING_* defines to <linux/ide.h>
from drivers/ide/ide-timing.h.
While at it:
- use u8/u16 instead of short for struct ide_timing fields
- use enum for IDE_TIMING_*
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index ac4eeb2932ef..81c6ea436beb 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -1271,6 +1271,34 @@ static inline int ide_dev_is_sata(struct hd_driveid *id) | |||
1271 | u64 ide_get_lba_addr(struct ide_taskfile *, int); | 1271 | u64 ide_get_lba_addr(struct ide_taskfile *, int); |
1272 | u8 ide_dump_status(ide_drive_t *, const char *, u8); | 1272 | u8 ide_dump_status(ide_drive_t *, const char *, u8); |
1273 | 1273 | ||
1274 | struct ide_timing { | ||
1275 | u8 mode; | ||
1276 | u8 setup; /* t1 */ | ||
1277 | u16 act8b; /* t2 for 8-bit io */ | ||
1278 | u16 rec8b; /* t2i for 8-bit io */ | ||
1279 | u16 cyc8b; /* t0 for 8-bit io */ | ||
1280 | u16 active; /* t2 or tD */ | ||
1281 | u16 recover; /* t2i or tK */ | ||
1282 | u16 cycle; /* t0 */ | ||
1283 | u16 udma; /* t2CYCTYP/2 */ | ||
1284 | }; | ||
1285 | |||
1286 | enum { | ||
1287 | IDE_TIMING_SETUP = (1 << 0), | ||
1288 | IDE_TIMING_ACT8B = (1 << 1), | ||
1289 | IDE_TIMING_REC8B = (1 << 2), | ||
1290 | IDE_TIMING_CYC8B = (1 << 3), | ||
1291 | IDE_TIMING_8BIT = IDE_TIMING_ACT8B | IDE_TIMING_REC8B | | ||
1292 | IDE_TIMING_CYC8B, | ||
1293 | IDE_TIMING_ACTIVE = (1 << 4), | ||
1294 | IDE_TIMING_RECOVER = (1 << 5), | ||
1295 | IDE_TIMING_CYCLE = (1 << 6), | ||
1296 | IDE_TIMING_UDMA = (1 << 7), | ||
1297 | IDE_TIMING_ALL = IDE_TIMING_SETUP | IDE_TIMING_8BIT | | ||
1298 | IDE_TIMING_ACTIVE | IDE_TIMING_RECOVER | | ||
1299 | IDE_TIMING_CYCLE | IDE_TIMING_UDMA, | ||
1300 | }; | ||
1301 | |||
1274 | typedef struct ide_pio_timings_s { | 1302 | typedef struct ide_pio_timings_s { |
1275 | int setup_time; /* Address setup (ns) minimum */ | 1303 | int setup_time; /* Address setup (ns) minimum */ |
1276 | int active_time; /* Active pulse (ns) minimum */ | 1304 | int active_time; /* Active pulse (ns) minimum */ |