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

Change BlockIo drivers to return EFI_NO_MEDIA or EFI_MEDIA_CHANGED even the Buffer/BufferSize/Lba is invalid so that caller can probe the media status easier.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11584 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
niruiyu
2011-04-25 09:31:57 +00:00
parent fd776d390d
commit fcf5e49dc9
4 changed files with 106 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
View File

@@ -1,7 +1,7 @@
/** @file
SCSI disk driver that layers on every SCSI IO protocol in the system.
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -454,17 +454,8 @@ ScsiDiskReadBlocks (
BOOLEAN MediaChange;
EFI_TPL OldTpl;
MediaChange = FALSE;
if (Buffer == NULL) {
return EFI_INVALID_PARAMETER;
}
if (BufferSize == 0) {
return EFI_SUCCESS;
}
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_THIS (This);
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@@ -502,6 +493,16 @@ ScsiDiskReadBlocks (
goto Done;
}
if (Buffer == NULL) {
Status = EFI_INVALID_PARAMETER;
goto Done;
}
if (BufferSize == 0) {
Status = EFI_SUCCESS;
goto Done;
}
if (BufferSize % BlockSize != 0) {
Status = EFI_BAD_BUFFER_SIZE;
goto Done;
@@ -569,17 +570,8 @@ ScsiDiskWriteBlocks (
BOOLEAN MediaChange;
EFI_TPL OldTpl;
MediaChange = FALSE;
if (Buffer == NULL) {
return EFI_INVALID_PARAMETER;
}
if (BufferSize == 0) {
return EFI_SUCCESS;
}
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_THIS (This);
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@@ -617,6 +609,16 @@ ScsiDiskWriteBlocks (
goto Done;
}
if (BufferSize == 0) {
Status = EFI_SUCCESS;
goto Done;
}
if (Buffer == NULL) {
Status = EFI_INVALID_PARAMETER;
goto Done;
}
if (BufferSize % BlockSize != 0) {
Status = EFI_BAD_BUFFER_SIZE;
goto Done;