patch-2.4.21 linux-2.4.21/drivers/usb/storage/isd200.c
Next file: linux-2.4.21/drivers/usb/storage/jumpshot.c
Previous file: linux-2.4.21/drivers/usb/storage/freecom.c
Back to the patch index
Back to the overall index
- Lines: 96
- Date:
2003-06-13 07:51:37.000000000 -0700
- Orig file:
linux-2.4.20/drivers/usb/storage/isd200.c
- Orig date:
2002-08-02 17:39:45.000000000 -0700
diff -urN linux-2.4.20/drivers/usb/storage/isd200.c linux-2.4.21/drivers/usb/storage/isd200.c
@@ -102,13 +102,6 @@
#define REG_STATUS 0x80
#define REG_COMMAND 0x80
-/* ATA error definitions not in <linux/hdreg.h> */
-#define ATA_ERROR_MEDIA_CHANGE 0x20
-
-/* ATA command definitions not in <linux/hdreg.h> */
-#define ATA_COMMAND_GET_MEDIA_STATUS 0xDA
-#define ATA_COMMAND_MEDIA_EJECT 0xED
-
/* ATA drive control definitions */
#define ATA_DC_DISABLE_INTERRUPTS 0x02
#define ATA_DC_RESET_CONTROLLER 0x04
@@ -353,7 +346,7 @@
struct sense_data *buf = (struct sense_data *) &srb->sense_buffer[0];
unsigned char error = info->ATARegs[IDE_ERROR_OFFSET];
- if(error & ATA_ERROR_MEDIA_CHANGE) {
+ if(error & MC_ERR) {
buf->ErrorCode = 0x70 | SENSE_ERRCODE_VALID;
buf->AdditionalSenseLength = 0xb;
buf->Flags = UNIT_ATTENTION;
@@ -442,8 +435,8 @@
return ISD200_TRANSPORT_FAILED;
}
- /* -ENOENT -- we canceled this transfer */
- if (result == -ENOENT) {
+ /* -ECONNRESET -- we canceled this transfer */
+ if (result == -ECONNRESET) {
US_DEBUGP("isd200_transfer_partial(): transfer aborted\n");
return ISD200_TRANSPORT_ABORTED;
}
@@ -581,7 +574,7 @@
&partial);
US_DEBUGP("Bulk command transfer result=%d\n", result);
- if (result == -ENOENT)
+ if (result == -ECONNRESET)
return ISD200_TRANSPORT_ABORTED;
else if (result == -EPIPE) {
/* if we stall, we need to clear it before we go on */
@@ -610,7 +603,7 @@
US_DEBUGP("Attempting to get CSW...\n");
result = usb_stor_bulk_msg(us, &bcs, pipe, US_BULK_CS_WRAP_LEN,
&partial);
- if (result == -ENOENT)
+ if (result == -ECONNRESET)
return ISD200_TRANSPORT_ABORTED;
/* did the attempt to read the CSW fail? */
@@ -624,7 +617,7 @@
US_BULK_CS_WRAP_LEN, &partial);
/* if the command was aborted, indicate that */
- if (result == -ENOENT)
+ if (result == -ECONNRESET)
return ISD200_TRANSPORT_ABORTED;
/* if it fails again, we need a reset and return an error*/
@@ -1472,7 +1465,7 @@
ataCdb->generic.SignatureByte1 = info->ConfigData.ATAMinorCommand;
ataCdb->generic.TransferBlockSize = 1;
ataCdb->generic.RegisterSelect = REG_COMMAND;
- ataCdb->write.CommandByte = ATA_COMMAND_GET_MEDIA_STATUS;
+ ataCdb->write.CommandByte = WIN_GETMEDIASTATUS;
srb->request_bufflen = 0;
} else {
US_DEBUGP(" Media Status not supported, just report okay\n");
@@ -1493,7 +1486,7 @@
ataCdb->generic.SignatureByte1 = info->ConfigData.ATAMinorCommand;
ataCdb->generic.TransferBlockSize = 1;
ataCdb->generic.RegisterSelect = REG_COMMAND;
- ataCdb->write.CommandByte = ATA_COMMAND_GET_MEDIA_STATUS;
+ ataCdb->write.CommandByte = WIN_GETMEDIASTATUS;
srb->request_bufflen = 0;
} else {
US_DEBUGP(" Media Status not supported, just report okay\n");
@@ -1625,14 +1618,14 @@
ataCdb->generic.SignatureByte1 = info->ConfigData.ATAMinorCommand;
ataCdb->generic.TransferBlockSize = 0;
ataCdb->generic.RegisterSelect = REG_COMMAND;
- ataCdb->write.CommandByte = ATA_COMMAND_MEDIA_EJECT;
+ ataCdb->write.CommandByte = WIN_MEDIAEJECT;
} else if ((srb->cmnd[4] & 0x3) == 0x1) {
US_DEBUGP(" Get Media Status\n");
ataCdb->generic.SignatureByte0 = info->ConfigData.ATAMajorCommand;
ataCdb->generic.SignatureByte1 = info->ConfigData.ATAMinorCommand;
ataCdb->generic.TransferBlockSize = 1;
ataCdb->generic.RegisterSelect = REG_COMMAND;
- ataCdb->write.CommandByte = ATA_COMMAND_GET_MEDIA_STATUS;
+ ataCdb->write.CommandByte = WIN_GETMEDIASTATUS;
srb->request_bufflen = 0;
} else {
US_DEBUGP(" Nothing to do, just report okay\n");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)