sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. UINTN & INTN issue for EBC architecture:

Browse Source 
The MAX_BIT of EBC will no longer be fixed to bit 63. It is defined as (1ULL << (sizeof (INTN) * 8 - 1)).
	Make EdkModulePkg & MdePkg EBC compiler clean: treat all EFI_STATUS error code as variable.
2. PrintLib
	Complete all missing ASSERT()s.
	Fix “\n” & “%\n” issue thanks to the clarification of MWG 0.56d.
	Adjust StatusString array to support EBC build.
3. BaseMemoryLib
	Adjust ASSERT () & function header of ComparaMem, SetMemXX, ScanMemXX to synchronize with MWG 0.56d.
4.SmbusLib
	Change Pec bit to bit 22 SmBusAddress to synchronize MWG 0.56d.
	Add ASSERT()s to check if length is illegal for SmBusBlockWrite() & SmBusProcessBlock() since it is 6 bit now.
5. PerformanceLib
	Rename “EdkDxePerformanceLib” & “EdkPeiPerformanceLib” to “DxePerformanceLib” & “PeiPerformanceLib” respectively.
	Synchronize the function header of GetPerformanceMeasurement() with MWG 0.56d.
6. BasePeCoffLoaderLib.
	Make PeCoffLoaderLoadImage () Assert() if ImageContext is NULL>
	Make PeCoffLoaderLoadImage () return RETURN_INVALID_PARAMETER if the ImageAddress in ImageContext is 0.
	Adjust some coding style.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@593 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8
2006-06-22 06:08:00 +00:00
parent f7c3054530
commit 4ba61e5e2a
89 changed files with 2076 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.c
View File

@@ -874,43 +874,34 @@ Returns:
&InquiryDataLength,
FALSE
);
switch (Status) {
//
// no need to check HostAdapterStatus and TargetStatus
//
case EFI_SUCCESS:
case EFI_WARN_BUFFER_TOO_SMALL:
if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {
//
// no need to check HostAdapterStatus and TargetStatus
//
ParseInquiryData (ScsiDiskDevice);
return EFI_SUCCESS;
case EFI_NOT_READY:
} else if (Status == EFI_NOT_READY) {
//
// no need to check HostAdapterStatus and TargetStatus
//
*NeedRetry = TRUE;
return EFI_DEVICE_ERROR;
case EFI_INVALID_PARAMETER:
case EFI_UNSUPPORTED:
} else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {
//
// no need to check HostAdapterStatus and TargetStatus
//
*NeedRetry = FALSE;
return EFI_DEVICE_ERROR;
}
//
// go ahead to check HostAdapterStatus and TargetStatus
// (EFI_TIMEOUT, EFI_DEVICE_ERROR)
//
default:
break;
}
Status = CheckHostAdapterStatus (HostAdapterStatus);
switch (Status) {
case EFI_SUCCESS:
break;
case EFI_TIMEOUT:
case EFI_NOT_READY:
if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {
*NeedRetry = TRUE;
return EFI_DEVICE_ERROR;
case EFI_DEVICE_ERROR:
} else if (Status == EFI_DEVICE_ERROR) {
//
// reset the scsi channel
//
@@ -920,19 +911,14 @@ Returns:
}
Status = CheckTargetStatus (TargetStatus);
switch (Status) {
case EFI_SUCCESS:
break;
case EFI_NOT_READY:
if (Status == EFI_NOT_READY) {
//
// reset the scsi device
//
ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);
*NeedRetry = TRUE;
return EFI_DEVICE_ERROR;
case EFI_DEVICE_ERROR:
} else if (Status == EFI_DEVICE_ERROR) {
*NeedRetry = FALSE;
return EFI_DEVICE_ERROR;
}
@@ -1022,37 +1008,27 @@ ScsiDiskTestUnitReady (
&HostAdapterStatus,
&TargetStatus
);
switch (Status) {
//
// no need to check HostAdapterStatus and TargetStatus
//
case EFI_NOT_READY:
if (Status == EFI_NOT_READY) {
//
// no need to check HostAdapterStatus and TargetStatus
//
*NeedRetry = TRUE;
return EFI_DEVICE_ERROR;
case EFI_INVALID_PARAMETER:
case EFI_UNSUPPORTED:
} else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {
//
// no need to check HostAdapterStatus and TargetStatus
//
*NeedRetry = FALSE;
return EFI_DEVICE_ERROR;
}
//
// go ahead to check HostAdapterStatus and TargetStatus
//
default:
break;
}
Status = CheckHostAdapterStatus (HostAdapterStatus);
switch (Status) {
case EFI_SUCCESS:
break;
case EFI_TIMEOUT:
case EFI_NOT_READY:
if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {
*NeedRetry = TRUE;
return EFI_DEVICE_ERROR;
case EFI_DEVICE_ERROR:
} else if (Status == EFI_DEVICE_ERROR) {
//
// reset the scsi channel
//
@@ -1062,19 +1038,14 @@ ScsiDiskTestUnitReady (
}
Status = CheckTargetStatus (TargetStatus);
switch (Status) {
case EFI_SUCCESS:
break;
case EFI_NOT_READY:
if (Status == EFI_NOT_READY) {
//
// reset the scsi device
//
ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);
*NeedRetry = TRUE;
return EFI_DEVICE_ERROR;
case EFI_DEVICE_ERROR:
} else if (Status == EFI_DEVICE_ERROR) {
*NeedRetry = FALSE;
return EFI_DEVICE_ERROR;
}
@@ -1258,42 +1229,35 @@ Returns:
&DataLength,
FALSE
);
switch (CommandStatus) {
//
// no need to check HostAdapterStatus and TargetStatus
//
case EFI_SUCCESS:
if (CommandStatus == EFI_SUCCESS) {
//
// no need to check HostAdapterStatus and TargetStatus
//
GetMediaInfo (ScsiDiskDevice, &CapacityData);
return EFI_SUCCESS;
case EFI_NOT_READY:
} else if (CommandStatus == EFI_NOT_READY) {
//
// no need to check HostAdapterStatus and TargetStatus
//
*NeedRetry = TRUE;
return EFI_DEVICE_ERROR;
case EFI_INVALID_PARAMETER:
case EFI_UNSUPPORTED:
} else if ((CommandStatus == EFI_INVALID_PARAMETER) || (CommandStatus == EFI_UNSUPPORTED)) {
//
// no need to check HostAdapterStatus and TargetStatus
//
*NeedRetry = FALSE;
return EFI_DEVICE_ERROR;
}
//
// go ahead to check HostAdapterStatus and TargetStatus
// (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)
//
default:
break;
}
Status = CheckHostAdapterStatus (HostAdapterStatus);
switch (Status) {
case EFI_SUCCESS:
break;
case EFI_TIMEOUT:
case EFI_NOT_READY:
if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {
*NeedRetry = TRUE;
return EFI_DEVICE_ERROR;
case EFI_DEVICE_ERROR:
} else if (Status == EFI_DEVICE_ERROR) {
//
// reset the scsi channel
//
@@ -1303,19 +1267,14 @@ Returns:
}
Status = CheckTargetStatus (TargetStatus);
switch (Status) {
case EFI_SUCCESS:
break;
case EFI_NOT_READY:
if (Status == EFI_NOT_READY) {
//
// reset the scsi device
//
ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);
*NeedRetry = TRUE;
return EFI_DEVICE_ERROR;
case EFI_DEVICE_ERROR:
} else if (Status == EFI_DEVICE_ERROR) {
*NeedRetry = FALSE;
return EFI_DEVICE_ERROR;
}
@@ -1506,40 +1465,20 @@ ScsiDiskRequestSenseKeys (
&HostAdapterStatus,
&TargetStatus
);
switch (Status) {
case EFI_SUCCESS:
//
// fall through
//
case EFI_WARN_BUFFER_TOO_SMALL:
if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {
FallStatus = EFI_SUCCESS;
break;
case EFI_TIMEOUT:
//
// fall through
//
case EFI_NOT_READY:
} else if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {
*NeedRetry = TRUE;
FallStatus = EFI_DEVICE_ERROR;
break;
case EFI_INVALID_PARAMETER:
case EFI_UNSUPPORTED:
} else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {
*NeedRetry = FALSE;
FallStatus = EFI_DEVICE_ERROR;
break;
case EFI_DEVICE_ERROR:
} else if (Status == EFI_DEVICE_ERROR) {
if (AskResetIfError) {
ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);
}
FallStatus = EFI_DEVICE_ERROR;
break;
}
if (EFI_ERROR (FallStatus)) {