|
@@ -548,14 +548,14 @@ static int isd200_action( struct us_data *us, int action,
|
|
ata.generic.ActionSelect = ACTION_SELECT_1|ACTION_SELECT_5;
|
|
ata.generic.ActionSelect = ACTION_SELECT_1|ACTION_SELECT_5;
|
|
ata.generic.RegisterSelect = REG_DEVICE_HEAD | REG_COMMAND;
|
|
ata.generic.RegisterSelect = REG_DEVICE_HEAD | REG_COMMAND;
|
|
ata.write.DeviceHeadByte = info->DeviceHead;
|
|
ata.write.DeviceHeadByte = info->DeviceHead;
|
|
- ata.write.CommandByte = WIN_SRST;
|
|
|
|
|
|
+ ata.write.CommandByte = ATA_CMD_DEV_RESET;
|
|
isd200_set_srb(info, DMA_NONE, NULL, 0);
|
|
isd200_set_srb(info, DMA_NONE, NULL, 0);
|
|
break;
|
|
break;
|
|
|
|
|
|
case ACTION_IDENTIFY:
|
|
case ACTION_IDENTIFY:
|
|
US_DEBUGP(" isd200_action(IDENTIFY)\n");
|
|
US_DEBUGP(" isd200_action(IDENTIFY)\n");
|
|
ata.generic.RegisterSelect = REG_COMMAND;
|
|
ata.generic.RegisterSelect = REG_COMMAND;
|
|
- ata.write.CommandByte = WIN_IDENTIFY;
|
|
|
|
|
|
+ ata.write.CommandByte = ATA_CMD_ID_ATA;
|
|
isd200_set_srb(info, DMA_FROM_DEVICE, info->id,
|
|
isd200_set_srb(info, DMA_FROM_DEVICE, info->id,
|
|
ATA_ID_WORDS * 2);
|
|
ATA_ID_WORDS * 2);
|
|
break;
|
|
break;
|
|
@@ -1335,7 +1335,7 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
|
|
ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8);
|
|
ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8);
|
|
ataCdb->write.CylinderLowByte = (unsigned char)cylinder;
|
|
ataCdb->write.CylinderLowByte = (unsigned char)cylinder;
|
|
ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD);
|
|
ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD);
|
|
- ataCdb->write.CommandByte = WIN_READ;
|
|
|
|
|
|
+ ataCdb->write.CommandByte = ATA_CMD_PIO_READ;
|
|
break;
|
|
break;
|
|
|
|
|
|
case WRITE_10:
|
|
case WRITE_10:
|
|
@@ -1367,7 +1367,7 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
|
|
ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8);
|
|
ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8);
|
|
ataCdb->write.CylinderLowByte = (unsigned char)cylinder;
|
|
ataCdb->write.CylinderLowByte = (unsigned char)cylinder;
|
|
ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD);
|
|
ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD);
|
|
- ataCdb->write.CommandByte = WIN_WRITE;
|
|
|
|
|
|
+ ataCdb->write.CommandByte = ATA_CMD_PIO_WRITE;
|
|
break;
|
|
break;
|
|
|
|
|
|
case ALLOW_MEDIUM_REMOVAL:
|
|
case ALLOW_MEDIUM_REMOVAL:
|
|
@@ -1381,7 +1381,7 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
|
|
ataCdb->generic.TransferBlockSize = 1;
|
|
ataCdb->generic.TransferBlockSize = 1;
|
|
ataCdb->generic.RegisterSelect = REG_COMMAND;
|
|
ataCdb->generic.RegisterSelect = REG_COMMAND;
|
|
ataCdb->write.CommandByte = (srb->cmnd[4] & 0x1) ?
|
|
ataCdb->write.CommandByte = (srb->cmnd[4] & 0x1) ?
|
|
- WIN_DOORLOCK : WIN_DOORUNLOCK;
|
|
|
|
|
|
+ ATA_CMD_MEDIA_LOCK : ATA_CMD_MEDIA_UNLOCK;
|
|
isd200_srb_set_bufflen(srb, 0);
|
|
isd200_srb_set_bufflen(srb, 0);
|
|
} else {
|
|
} else {
|
|
US_DEBUGP(" Not removeable media, just report okay\n");
|
|
US_DEBUGP(" Not removeable media, just report okay\n");
|