diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-10 16:39:38 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-10 16:39:38 -0400 |
commit | 49cac39e71bd6bbcf934c6ba837e21503902c088 (patch) | |
tree | 9096b78a0dc35c70375d4349aabe0f896e681416 /include | |
parent | 2ac07d920604eeee8966d52e70161f9b31fe90a3 (diff) |
ide-floppy: ->{srfp,wp} -> IDE_AFLAG_{SRFP,WP}
Add IDE_AFLAG_{SRFP,WP} drive->atapi_flags and use them
instead of ->{srfp,wp} struct ide_floppy_obj fields.
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ide.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index b5be2368c96e..cc41a885688a 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -356,21 +356,25 @@ enum { | |||
356 | IDE_AFLAG_CLIK_DRIVE = (1 << 19), | 356 | IDE_AFLAG_CLIK_DRIVE = (1 << 19), |
357 | /* Requires BH algorithm for packets */ | 357 | /* Requires BH algorithm for packets */ |
358 | IDE_AFLAG_ZIP_DRIVE = (1 << 20), | 358 | IDE_AFLAG_ZIP_DRIVE = (1 << 20), |
359 | /* Write protect */ | ||
360 | IDE_AFLAG_WP = (1 << 21), | ||
361 | /* Supports format progress report */ | ||
362 | IDE_AFLAG_SRFP = (1 << 22), | ||
359 | 363 | ||
360 | /* ide-tape */ | 364 | /* ide-tape */ |
361 | IDE_AFLAG_IGNORE_DSC = (1 << 21), | 365 | IDE_AFLAG_IGNORE_DSC = (1 << 23), |
362 | /* 0 When the tape position is unknown */ | 366 | /* 0 When the tape position is unknown */ |
363 | IDE_AFLAG_ADDRESS_VALID = (1 << 22), | 367 | IDE_AFLAG_ADDRESS_VALID = (1 << 24), |
364 | /* Device already opened */ | 368 | /* Device already opened */ |
365 | IDE_AFLAG_BUSY = (1 << 23), | 369 | IDE_AFLAG_BUSY = (1 << 25), |
366 | /* Attempt to auto-detect the current user block size */ | 370 | /* Attempt to auto-detect the current user block size */ |
367 | IDE_AFLAG_DETECT_BS = (1 << 24), | 371 | IDE_AFLAG_DETECT_BS = (1 << 26), |
368 | /* Currently on a filemark */ | 372 | /* Currently on a filemark */ |
369 | IDE_AFLAG_FILEMARK = (1 << 25), | 373 | IDE_AFLAG_FILEMARK = (1 << 27), |
370 | /* 0 = no tape is loaded, so we don't rewind after ejecting */ | 374 | /* 0 = no tape is loaded, so we don't rewind after ejecting */ |
371 | IDE_AFLAG_MEDIUM_PRESENT = (1 << 26), | 375 | IDE_AFLAG_MEDIUM_PRESENT = (1 << 28), |
372 | 376 | ||
373 | IDE_AFLAG_NO_AUTOCLOSE = (1 << 27), | 377 | IDE_AFLAG_NO_AUTOCLOSE = (1 << 29), |
374 | }; | 378 | }; |
375 | 379 | ||
376 | struct ide_drive_s { | 380 | struct ide_drive_s { |