Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaec3e7d authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

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



Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent c2b2b293

drivers/ide/ide-floppy.c

+0 −14
Original line number Diff line number Diff line
@@ -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

drivers/ide/ide-tape.c

+0 −16
Original line number Diff line number Diff line
@@ -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

include/linux/ide.h

+15 −0
Original line number Diff line number Diff line
@@ -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];