&InquiryDataLength,\r
FALSE\r
);\r
- switch (Status) {\r
- //\r
- // no need to check HostAdapterStatus and TargetStatus\r
- //\r
- case EFI_SUCCESS:\r
- case EFI_WARN_BUFFER_TOO_SMALL:\r
+ if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {\r
+ //\r
+ // no need to check HostAdapterStatus and TargetStatus\r
+ //\r
ParseInquiryData (ScsiDiskDevice);\r
return EFI_SUCCESS;\r
-\r
- case EFI_NOT_READY:\r
+ } else if (Status == EFI_NOT_READY) {\r
+ //\r
+ // no need to check HostAdapterStatus and TargetStatus\r
+ //\r
*NeedRetry = TRUE;\r
return EFI_DEVICE_ERROR;\r
-\r
- case EFI_INVALID_PARAMETER:\r
- case EFI_UNSUPPORTED:\r
+ } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
+ //\r
+ // no need to check HostAdapterStatus and TargetStatus\r
+ //\r
*NeedRetry = FALSE;\r
return EFI_DEVICE_ERROR;\r
-\r
+ }\r
//\r
// go ahead to check HostAdapterStatus and TargetStatus\r
// (EFI_TIMEOUT, EFI_DEVICE_ERROR)\r
//\r
- default:\r
- break;\r
- }\r
-\r
Status = CheckHostAdapterStatus (HostAdapterStatus);\r
- switch (Status) {\r
- case EFI_SUCCESS:\r
- break;\r
-\r
- case EFI_TIMEOUT:\r
- case EFI_NOT_READY:\r
+ if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
*NeedRetry = TRUE;\r
return EFI_DEVICE_ERROR;\r
-\r
- case EFI_DEVICE_ERROR:\r
+ } else if (Status == EFI_DEVICE_ERROR) {\r
//\r
// reset the scsi channel\r
//\r
}\r
\r
Status = CheckTargetStatus (TargetStatus);\r
- switch (Status) {\r
- case EFI_SUCCESS:\r
- break;\r
-\r
- case EFI_NOT_READY:\r
+ if (Status == EFI_NOT_READY) {\r
//\r
// reset the scsi device\r
//\r
ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
*NeedRetry = TRUE;\r
return EFI_DEVICE_ERROR;\r
-\r
- case EFI_DEVICE_ERROR:\r
+ } else if (Status == EFI_DEVICE_ERROR) {\r
*NeedRetry = FALSE;\r
return EFI_DEVICE_ERROR;\r
}\r
&HostAdapterStatus,\r
&TargetStatus\r
);\r
- switch (Status) {\r
- //\r
- // no need to check HostAdapterStatus and TargetStatus\r
- //\r
- case EFI_NOT_READY:\r
+ if (Status == EFI_NOT_READY) {\r
+ //\r
+ // no need to check HostAdapterStatus and TargetStatus\r
+ //\r
*NeedRetry = TRUE;\r
return EFI_DEVICE_ERROR;\r
-\r
- case EFI_INVALID_PARAMETER:\r
- case EFI_UNSUPPORTED:\r
+ } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
+ //\r
+ // no need to check HostAdapterStatus and TargetStatus\r
+ //\r
*NeedRetry = FALSE;\r
return EFI_DEVICE_ERROR;\r
-\r
+ }\r
//\r
// go ahead to check HostAdapterStatus and TargetStatus\r
//\r
- default:\r
- break;\r
- }\r
-\r
Status = CheckHostAdapterStatus (HostAdapterStatus);\r
- switch (Status) {\r
- case EFI_SUCCESS:\r
- break;\r
-\r
- case EFI_TIMEOUT:\r
- case EFI_NOT_READY:\r
+ if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
*NeedRetry = TRUE;\r
return EFI_DEVICE_ERROR;\r
-\r
- case EFI_DEVICE_ERROR:\r
+ } else if (Status == EFI_DEVICE_ERROR) {\r
//\r
// reset the scsi channel\r
//\r
}\r
\r
Status = CheckTargetStatus (TargetStatus);\r
- switch (Status) {\r
- case EFI_SUCCESS:\r
- break;\r
-\r
- case EFI_NOT_READY:\r
+ if (Status == EFI_NOT_READY) {\r
//\r
// reset the scsi device\r
//\r
ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
*NeedRetry = TRUE;\r
return EFI_DEVICE_ERROR;\r
-\r
- case EFI_DEVICE_ERROR:\r
+ } else if (Status == EFI_DEVICE_ERROR) {\r
*NeedRetry = FALSE;\r
return EFI_DEVICE_ERROR;\r
}\r
&DataLength,\r
FALSE\r
);\r
- switch (CommandStatus) {\r
- //\r
- // no need to check HostAdapterStatus and TargetStatus\r
- //\r
- case EFI_SUCCESS:\r
+ if (CommandStatus == EFI_SUCCESS) {\r
+ //\r
+ // no need to check HostAdapterStatus and TargetStatus\r
+ //\r
GetMediaInfo (ScsiDiskDevice, &CapacityData);\r
return EFI_SUCCESS;\r
-\r
- case EFI_NOT_READY:\r
+ } else if (CommandStatus == EFI_NOT_READY) {\r
+ //\r
+ // no need to check HostAdapterStatus and TargetStatus\r
+ //\r
*NeedRetry = TRUE;\r
return EFI_DEVICE_ERROR;\r
-\r
- case EFI_INVALID_PARAMETER:\r
- case EFI_UNSUPPORTED:\r
+ } else if ((CommandStatus == EFI_INVALID_PARAMETER) || (CommandStatus == EFI_UNSUPPORTED)) {\r
+ //\r
+ // no need to check HostAdapterStatus and TargetStatus\r
+ //\r
*NeedRetry = FALSE;\r
return EFI_DEVICE_ERROR;\r
-\r
+ }\r
//\r
// go ahead to check HostAdapterStatus and TargetStatus\r
// (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)\r
//\r
- default:\r
- break;\r
- }\r
-\r
+ \r
Status = CheckHostAdapterStatus (HostAdapterStatus);\r
- switch (Status) {\r
- case EFI_SUCCESS:\r
- break;\r
-\r
- case EFI_TIMEOUT:\r
- case EFI_NOT_READY:\r
+ if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
*NeedRetry = TRUE;\r
return EFI_DEVICE_ERROR;\r
-\r
- case EFI_DEVICE_ERROR:\r
+ } else if (Status == EFI_DEVICE_ERROR) {\r
//\r
// reset the scsi channel\r
//\r
}\r
\r
Status = CheckTargetStatus (TargetStatus);\r
- switch (Status) {\r
- case EFI_SUCCESS:\r
- break;\r
-\r
- case EFI_NOT_READY:\r
+ if (Status == EFI_NOT_READY) {\r
//\r
// reset the scsi device\r
//\r
ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
*NeedRetry = TRUE;\r
return EFI_DEVICE_ERROR;\r
-\r
- case EFI_DEVICE_ERROR:\r
+ } else if (Status == EFI_DEVICE_ERROR) {\r
*NeedRetry = FALSE;\r
return EFI_DEVICE_ERROR;\r
}\r
&HostAdapterStatus,\r
&TargetStatus\r
);\r
- switch (Status) {\r
-\r
- case EFI_SUCCESS:\r
-\r
- //\r
- // fall through\r
- //\r
- case EFI_WARN_BUFFER_TOO_SMALL:\r
+ if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {\r
FallStatus = EFI_SUCCESS;\r
- break;\r
-\r
- case EFI_TIMEOUT:\r
-\r
- //\r
- // fall through\r
- //\r
- case EFI_NOT_READY:\r
+ } else if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) { \r
*NeedRetry = TRUE;\r
FallStatus = EFI_DEVICE_ERROR;\r
- break;\r
-\r
- case EFI_INVALID_PARAMETER:\r
- case EFI_UNSUPPORTED:\r
+ } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
*NeedRetry = FALSE;\r
FallStatus = EFI_DEVICE_ERROR;\r
- break;\r
-\r
- case EFI_DEVICE_ERROR:\r
+ } else if (Status == EFI_DEVICE_ERROR) {\r
if (AskResetIfError) {\r
ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
}\r
\r
FallStatus = EFI_DEVICE_ERROR;\r
- break;\r
}\r
\r
if (EFI_ERROR (FallStatus)) {\r