tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@784 6f19259b-4bc3-4df7-8a09-765794883524

This commit is contained in:
lgao4 2006-07-06 04:02:57 +00:00
parent 702c120a17
commit 36122070ec
10 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c
View File

@ -366,7 +366,7 @@ EFI_STATUS
EFIAPI
ScsiGetDeviceLocation (
IN EFI_SCSI_IO_PROTOCOL *This,
OUT UINT8 **Target,
OUT UINT32 *Target,
OUT UINT64 *Lun
)
/*++
@ -393,7 +393,7 @@ ScsiGetDeviceLocation (
ScsiIoDevice = SCSI_IO_DEV_FROM_THIS (This);
*Target = (UINT8 *) (UINTN) ScsiIoDevice->Pun;
*Target = ScsiIoDevice->Pun;
*Lun = ScsiIoDevice->Lun;
return EFI_SUCCESS;

2
EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
View File

@ -79,7 +79,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
</Protocol>
</Protocols>
<Externs>
<Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
<Specification>EFI_SPECIFICATION_VERSION 0x00010010</Specification>
<Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
<Extern>
<DriverBinding>gSCSIBusDriverBinding</DriverBinding>

2
EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
View File

@ -76,7 +76,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
</Protocol>
</Protocols>
<Externs>
<Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
<Specification>EFI_SPECIFICATION_VERSION 0x00010010</Specification>
<Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
<Extern>
<DriverBinding>gScsiDiskDriverBinding</DriverBinding>

2
EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
View File

@ -308,7 +308,7 @@ EFI_RUNTIME_SERVICES mEfiRuntimeServicesTableTemplate = {
(EFI_RESET_SYSTEM) CoreEfiNotAvailableYetArg4 // ResetSystem
#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000))
,
(TIANO_REPORT_STATUS_CODE) CoreEfiNotAvailableYetArg5 // ReportStatusCode
(EFI_REPORT_STATUS_CODE) CoreEfiNotAvailableYetArg5 // ReportStatusCode
#elif (EFI_SPECIFICATION_VERSION >= 0x00020000)
,
(EFI_UPDATE_CAPSULE) CoreEfiNotAvailableYetArg3, // UpdateCapsule

5
EdkModulePkg/EdkModulePkg.spd
View File

@ -486,6 +486,11 @@
<GuidValue>76B6BDFA-2ACD-4462-9E3F-CB58C969D937</GuidValue>
<HelpText/>
</Entry>
<Entry Name="ScsiIo">
<C_Name>gEfiScsiIoProtocolGuid</C_Name>
<GuidValue>403CD195-F233-48EC-8455-B2E52F1D9E02</GuidValue>
<HelpText/>
</Entry>
</ProtocolDeclarations>
<PpiDeclarations>
<Entry Name="PeiInMemory">

2
EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.msa
View File

@ -37,7 +37,7 @@
<Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
</PackageDependencies>
<Externs>
<Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
<Specification>EFI_SPECIFICATION_VERSION 0x00010010</Specification>
<Specification>EDK_RELEASE_VERSION 0x00090000</Specification>
</Externs>
</ModuleSurfaceArea>

61
EdkModulePkg/Library/EdkScsiLib/ScsiLib.c
View File

@ -68,7 +68,7 @@ Returns:
{
EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;
UINT64 Lun;
UINT8 *Target;
UINT32 Target;
EFI_STATUS Status;
UINT8 Cdb[6];
@ -76,10 +76,11 @@ Returns:
ZeroMem (Cdb, 6);
CommandPacket.Timeout = Timeout;
CommandPacket.InDataBuffer = NULL;
CommandPacket.DataBuffer = NULL;
CommandPacket.SenseData = SenseData;
CommandPacket.InTransferLength= 0;
CommandPacket.TransferLength = 0;
CommandPacket.Cdb = Cdb;
//
// Fill Cdb for Test Unit Ready Command
//
@ -151,7 +152,7 @@ Returns:
{
EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;
UINT64 Lun;
UINT8 *Target;
UINT32 Target;
EFI_STATUS Status;
UINT8 Cdb[6];
@ -159,8 +160,8 @@ Returns:
ZeroMem (Cdb, 6);
CommandPacket.Timeout = Timeout;
CommandPacket.InDataBuffer = InquiryDataBuffer;
CommandPacket.InTransferLength= *InquiryDataLength;
CommandPacket.DataBuffer = InquiryDataBuffer;
CommandPacket.TransferLength = *InquiryDataLength;
CommandPacket.SenseData = SenseData;
CommandPacket.SenseDataLength = *SenseDataLength;
CommandPacket.Cdb = Cdb;
@ -186,7 +187,7 @@ Returns:
*HostAdapterStatus = CommandPacket.HostAdapterStatus;
*TargetStatus = CommandPacket.TargetStatus;
*SenseDataLength = CommandPacket.SenseDataLength;
*InquiryDataLength = CommandPacket.InTransferLength;
*InquiryDataLength = CommandPacket.TransferLength;
return Status;
}
@ -247,7 +248,7 @@ Returns:
{
EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;
UINT64 Lun;
UINT8 *Target;
UINT32 Target;
EFI_STATUS Status;
UINT8 Cdb[10];
@ -255,9 +256,9 @@ Returns:
ZeroMem (Cdb, 10);
CommandPacket.Timeout = Timeout;
CommandPacket.InDataBuffer = DataBuffer;
CommandPacket.DataBuffer = DataBuffer;
CommandPacket.SenseData = SenseData;
CommandPacket.InTransferLength= *DataLength;
CommandPacket.TransferLength = *DataLength;
CommandPacket.Cdb = Cdb;
//
// Fill Cdb for Mode Sense (10) Command
@ -279,7 +280,7 @@ Returns:
*HostAdapterStatus = CommandPacket.HostAdapterStatus;
*TargetStatus = CommandPacket.TargetStatus;
*SenseDataLength = CommandPacket.SenseDataLength;
*DataLength = CommandPacket.InTransferLength;
*DataLength = CommandPacket.TransferLength;
return Status;
}
@ -330,21 +331,17 @@ Returns:
{
EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;
UINT64 Lun;
UINT8 *Target;
UINT32 Target;
EFI_STATUS Status;
UINT8 Cdb[6];
ZeroMem (&CommandPacket, sizeof (EFI_SCSI_IO_SCSI_REQUEST_PACKET));
ZeroMem (Cdb, 6);
/*
if (*SenseDataLength > 0xff) {
*SenseDataLength = 0xff;
}
*/
CommandPacket.Timeout = Timeout;
CommandPacket.InDataBuffer = SenseData;
CommandPacket.DataBuffer = SenseData;
CommandPacket.SenseData = NULL;
CommandPacket.InTransferLength= *SenseDataLength;
CommandPacket.TransferLength = *SenseDataLength;
CommandPacket.Cdb = Cdb;
//
// Fill Cdb for Request Sense Command
@ -363,7 +360,7 @@ Returns:
*HostAdapterStatus = CommandPacket.HostAdapterStatus;
*TargetStatus = CommandPacket.TargetStatus;
*SenseDataLength = (UINT8) CommandPacket.InTransferLength;
*SenseDataLength = (UINT8) CommandPacket.TransferLength;
return Status;
}
@ -420,7 +417,7 @@ Returns:
{
EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;
UINT64 Lun;
UINT8 *Target;
UINT32 Target;
EFI_STATUS Status;
UINT8 Cdb[10];
@ -428,9 +425,9 @@ Returns:
ZeroMem (Cdb, 10);
CommandPacket.Timeout = Timeout;
CommandPacket.InDataBuffer = DataBuffer;
CommandPacket.DataBuffer = DataBuffer;
CommandPacket.SenseData = SenseData;
CommandPacket.InTransferLength= *DataLength;
CommandPacket.TransferLength = *DataLength;
CommandPacket.Cdb = Cdb;
//
// Fill Cdb for Read Capacity Command
@ -457,7 +454,7 @@ Returns:
*HostAdapterStatus = CommandPacket.HostAdapterStatus;
*TargetStatus = CommandPacket.TargetStatus;
*SenseDataLength = CommandPacket.SenseDataLength;
*DataLength = CommandPacket.InTransferLength;
*DataLength = CommandPacket.TransferLength;
return Status;
}
@ -516,7 +513,7 @@ Returns:
{
EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;
UINT64 Lun;
UINT8 *Target;
UINT32 Target;
EFI_STATUS Status;
UINT8 Cdb[10];
@ -524,9 +521,9 @@ Returns:
ZeroMem (Cdb, 10);
CommandPacket.Timeout = Timeout;
CommandPacket.InDataBuffer = DataBuffer;
CommandPacket.DataBuffer = DataBuffer;
CommandPacket.SenseData = SenseData;
CommandPacket.InTransferLength= *DataLength;
CommandPacket.TransferLength = *DataLength;
CommandPacket.Cdb = Cdb;
//
// Fill Cdb for Read (10) Command
@ -551,7 +548,7 @@ Returns:
*HostAdapterStatus = CommandPacket.HostAdapterStatus;
*TargetStatus = CommandPacket.TargetStatus;
*SenseDataLength = CommandPacket.SenseDataLength;
*DataLength = CommandPacket.InTransferLength;
*DataLength = CommandPacket.TransferLength;
return Status;
}
@ -610,7 +607,7 @@ Returns:
{
EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;
UINT64 Lun;
UINT8 *Target;
UINT32 Target;
EFI_STATUS Status;
UINT8 Cdb[10];
@ -618,9 +615,9 @@ Returns:
ZeroMem (Cdb, 10);
CommandPacket.Timeout = Timeout;
CommandPacket.InDataBuffer = DataBuffer;
CommandPacket.DataBuffer = DataBuffer;
CommandPacket.SenseData = SenseData;
CommandPacket.InTransferLength= *DataLength;
CommandPacket.TransferLength = *DataLength;
CommandPacket.Cdb = Cdb;
//
// Fill Cdb for Write (10) Command
@ -645,7 +642,7 @@ Returns:
*HostAdapterStatus = CommandPacket.HostAdapterStatus;
*TargetStatus = CommandPacket.TargetStatus;
*SenseDataLength = CommandPacket.SenseDataLength;
*DataLength = CommandPacket.InTransferLength;
*DataLength = CommandPacket.TransferLength;
return Status;
}

2
MdePkg/Include/Protocol/ScsiIo.h → MdePkg/Include/Protocol/ScsiIoExt.h
View File

@ -10,7 +10,7 @@
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name: ScsiIo.h
Module Name: ScsiIoExt.h
**/

4
MdePkg/Include/Uefi/UefiSpec.h
View File

@ -1648,7 +1648,7 @@ typedef struct {
// It was moved to a protocol to not conflict with UEFI 2.0
// If Tiano is disabled this item is not enabled for EFI 1.10
//
TIANO_REPORT_STATUS_CODE ReportStatusCode;
EFI_REPORT_STATUS_CODE ReportStatusCode;
#endif
} EFI_RUNTIME_SERVICES;
@ -2393,7 +2393,7 @@ typedef enum {
#include <Protocol/EdidDiscovered.h>
#include <Protocol/EdidActive.h>
#include <Protocol/EdidOverride.h>
#include <Protocol/ScsiIo.h>
#include <Protocol/ScsiIoExt.h>
#include <Protocol/ScsiPassThruExt.h>
#include <Protocol/IScsiInitatorName.h>
#include <Protocol/Usb2HostController.h>

2
MdePkg/MdePkg.spd
View File

@ -1022,7 +1022,7 @@
<GuidValue>A6A72875-2962-4C18-9F46-8DA644CCFE00</GuidValue>
<HelpText/>
</Entry>
<Entry Name="ScsiIo">
<Entry Name="ScsiIoExt">
<C_Name>gEfiScsiIoProtocolGuid</C_Name>
<GuidValue>932F4736-2362-4002-803E-3CD54B138F85</GuidValue>
<HelpText/>