diff options
| -rw-r--r-- | drivers/ide/ide-floppy.c | 14 | ||||
| -rw-r--r-- | drivers/ide/ide-tape.c | 16 | ||||
| -rw-r--r-- | include/linux/ide.h | 15 |
3 files changed, 15 insertions, 30 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index bf1ef60a5a07..5f133dfb541c 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -78,20 +78,6 @@ */ #define IDEFLOPPY_PC_STACK (10 + IDEFLOPPY_MAX_PC_RETRIES) -/* Packet command flag bits. */ -enum { - /* 1 when we prefer to use DMA if possible */ - PC_FLAG_DMA_RECOMMENDED = (1 << 0), - /* 1 while DMA in progress */ - PC_FLAG_DMA_IN_PROGRESS = (1 << 1), - /* 1 when encountered problem during DMA */ - PC_FLAG_DMA_ERROR = (1 << 2), - /* Data direction */ - PC_FLAG_WRITING = (1 << 3), - /* Suppress error reporting */ - PC_FLAG_SUPPRESS_ERROR = (1 << 4), -}; - /* format capacities descriptor codes */ #define CAPACITY_INVALID 0x00 #define CAPACITY_UNFORMATTED 0x01 diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 3f9dcca6f092..f43fd070f1b6 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c @@ -181,22 +181,6 @@ struct idetape_bh { char *b_data; }; -/* Packet command flag bits. */ -enum { - /* Set when an error is considered normal - We won't retry */ - PC_FLAG_ABORT = (1 << 0), - /* 1 When polling for DSC on a media access command */ - PC_FLAG_WAIT_FOR_DSC = (1 << 1), - /* 1 when we prefer to use DMA if possible */ - PC_FLAG_DMA_RECOMMENDED = (1 << 2), - /* 1 while DMA in progress */ - PC_FLAG_DMA_IN_PROGRESS = (1 << 3), - /* 1 when encountered problem during DMA */ - PC_FLAG_DMA_ERROR = (1 << 4), - /* Data direction */ - PC_FLAG_WRITING = (1 << 5), -}; - /* Tape door status */ #define DOOR_UNLOCKED 0 #define DOOR_LOCKED 1 diff --git a/include/linux/ide.h b/include/linux/ide.h index e9b1def1e66a..65445b7efc63 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -595,6 +595,21 @@ int set_io_32bit(ide_drive_t *, int); int set_pio_mode(ide_drive_t *, int); int set_using_dma(ide_drive_t *, int); +/* ATAPI packet command flags */ +enum { + /* set when an error is considered normal - no retry (ide-tape) */ + PC_FLAG_ABORT = (1 << 0), + PC_FLAG_SUPPRESS_ERROR = (1 << 1), + PC_FLAG_WAIT_FOR_DSC = (1 << 2), + PC_FLAG_DMA_OK = (1 << 3), + PC_FLAG_DMA_RECOMMENDED = (1 << 4), + PC_FLAG_DMA_IN_PROGRESS = (1 << 5), + PC_FLAG_DMA_ERROR = (1 << 6), + PC_FLAG_WRITING = (1 << 7), + /* command timed out */ + PC_FLAG_TIMEDOUT = (1 << 8), +}; + struct ide_atapi_pc { /* actual packet bytes */ u8 c[12]; |