adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

isd200: use ATA_* defines instead of *_STAT and *_ERR ones

Browse source 
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-04-01 21:42:25 +02:00
parent dafd01cc14
commit fcd3ec6960
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/usb/storage/isd200.c
View file

@ -420,19 +420,19 @@ static void isd200_build_sense(struct us_data *us, struct scsi_cmnd *srb)
buf->Flags = UNIT_ATTENTION; buf->Flags = UNIT_ATTENTION;
buf->AdditionalSenseCode = 0; buf->AdditionalSenseCode = 0;
buf->AdditionalSenseCodeQualifier = 0; buf->AdditionalSenseCodeQualifier = 0;
} else if(error & MCR_ERR) { } else if (error & ATA_MCR) {
buf->ErrorCode = 0x70 | SENSE_ERRCODE_VALID; buf->ErrorCode = 0x70 | SENSE_ERRCODE_VALID;
buf->AdditionalSenseLength = 0xb; buf->AdditionalSenseLength = 0xb;
buf->Flags = UNIT_ATTENTION; buf->Flags = UNIT_ATTENTION;
buf->AdditionalSenseCode = 0; buf->AdditionalSenseCode = 0;
buf->AdditionalSenseCodeQualifier = 0; buf->AdditionalSenseCodeQualifier = 0;
} else if(error & TRK0_ERR) { } else if (error & ATA_TRK0NF) {
buf->ErrorCode = 0x70 | SENSE_ERRCODE_VALID; buf->ErrorCode = 0x70 | SENSE_ERRCODE_VALID;
buf->AdditionalSenseLength = 0xb; buf->AdditionalSenseLength = 0xb;
buf->Flags = NOT_READY; buf->Flags = NOT_READY;
buf->AdditionalSenseCode = 0; buf->AdditionalSenseCode = 0;
buf->AdditionalSenseCodeQualifier = 0; buf->AdditionalSenseCodeQualifier = 0;
} else if(error & ECC_ERR) { } else if (error & ATA_UNC) {
buf->ErrorCode = 0x70 | SENSE_ERRCODE_VALID; buf->ErrorCode = 0x70 | SENSE_ERRCODE_VALID;
buf->AdditionalSenseLength = 0xb; buf->AdditionalSenseLength = 0xb;
buf->Flags = DATA_PROTECT; buf->Flags = DATA_PROTECT;
@ -945,22 +945,22 @@ static int isd200_try_enum(struct us_data *us, unsigned char master_slave,
break; break;
if (!detect) { if (!detect) {
if (regs[ATA_REG_STATUS_OFFSET] & BUSY_STAT) { if (regs[ATA_REG_STATUS_OFFSET] & ATA_BUSY) {
US_DEBUGP(" %s status is still BSY, try again...\n",mstr); US_DEBUGP(" %s status is still BSY, try again...\n",mstr);
} else { } else {
US_DEBUGP(" %s status !BSY, continue with next operation\n",mstr); US_DEBUGP(" %s status !BSY, continue with next operation\n",mstr);
break; break;
} }
} }
/* check for BUSY_STAT and */ /* check for ATA_BUSY and */
/* WRERR_STAT (workaround ATA Zip drive) and */ /* ATA_DF (workaround ATA Zip drive) and */
/* ERR_STAT (workaround for Archos CD-ROM) */ /* ATA_ERR (workaround for Archos CD-ROM) */
else if (regs[ATA_REG_STATUS_OFFSET] & else if (regs[ATA_REG_STATUS_OFFSET] &
(BUSY_STAT | WRERR_STAT | ERR_STAT )) { (ATA_BUSY | ATA_DF | ATA_ERR)) {
US_DEBUGP(" Status indicates it is not ready, try again...\n"); US_DEBUGP(" Status indicates it is not ready, try again...\n");
} }
/* check for DRDY, ATA devices set DRDY after SRST */ /* check for DRDY, ATA devices set DRDY after SRST */
else if (regs[ATA_REG_STATUS_OFFSET] & READY_STAT) { else if (regs[ATA_REG_STATUS_OFFSET] & ATA_DRDY) {
US_DEBUGP(" Identified ATA device\n"); US_DEBUGP(" Identified ATA device\n");
info->DeviceFlags |= DF_ATA_DEVICE; info->DeviceFlags |= DF_ATA_DEVICE;
info->DeviceHead = master_slave; info->DeviceHead = master_slave;