diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ata.h | 6 | ||||
| -rw-r--r-- | include/linux/libata.h | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index 968d54214248..2858d0c02c24 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -105,10 +105,8 @@ enum { /* ATA taskfile protocols */ ATA_PROT_UNKNOWN = 0, ATA_PROT_NODATA = 1, - ATA_PROT_PIO_READ = 2, - ATA_PROT_PIO_WRITE = 3, - ATA_PROT_DMA_READ = 4, - ATA_PROT_DMA_WRITE = 5, + ATA_PROT_PIO = 2, + ATA_PROT_DMA = 4, ATA_PROT_ATAPI = 6, ATA_PROT_ATAPI_DMA = 7, diff --git a/include/linux/libata.h b/include/linux/libata.h index 6a99ef6ceb66..478de5b0e9f5 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -108,11 +108,11 @@ enum { ATA_FLAG_SATA_RESET = (1 << 7), /* use COMRESET */ /* struct ata_taskfile flags */ - ATA_TFLAG_LBA48 = (1 << 0), + ATA_TFLAG_LBA48 = (1 << 0), /* enable 48-bit LBA and "HOB" */ ATA_TFLAG_ISADDR = (1 << 1), /* enable r/w to nsect/lba regs */ ATA_TFLAG_DEVICE = (1 << 2), /* enable r/w to device reg */ + ATA_TFLAG_WRITE = (1 << 3), /* data dir: host->dev==1 (write) */ - ATA_QCFLAG_WRITE = (1 << 0), /* read==0, write==1 */ ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */ ATA_QCFLAG_DMA = (1 << 2), /* data delivered via DMA */ ATA_QCFLAG_ATAPI = (1 << 3), /* is ATAPI packet command? */ @@ -295,8 +295,7 @@ struct ata_device { */ /* cache info about current transfer mode */ - u8 r_protocol; /* taskfile read protocol */ - u8 w_protocol; /* taskfile write protocol */ + u8 xfer_protocol; /* taskfile xfer protocol */ u8 read_cmd; /* opcode to use on read */ u8 write_cmd; /* opcode to use on write */ }; |