Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ide: use generic ATAPI packet command flags in ide-{floppy,tape}

Browse source 
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Borislav Petkov 2008-04-18 00:46:27 +02:00 committed by Bartlomiej Zolnierkiewicz
parent c2b2b29361
commit eaec3e7ded
3 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/ide/ide-floppy.c
View file

@ -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

16
drivers/ide/ide-tape.c
View file

@ -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

15
include/linux/ide.h
View file

@ -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];