summaryrefslogtreecommitdiff
path: root/EdkModulePkg
diff options
context:
space:
mode:
Diffstat (limited to 'EdkModulePkg')
-rw-r--r--EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c4
-rw-r--r--EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa2
-rw-r--r--EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa2
-rw-r--r--EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c2
-rw-r--r--EdkModulePkg/EdkModulePkg.spd5
-rw-r--r--EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.msa2
-rw-r--r--EdkModulePkg/Library/EdkScsiLib/ScsiLib.c61
7 files changed, 40 insertions, 38 deletions
diff --git a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c
index 866c796..6a3778c 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c
+++ b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c
@@ -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;
diff --git a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
index b3db037..bf8495b 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
+++ b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
@@ -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>
diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
index 51af7a9..311913e 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
@@ -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>
diff --git a/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c b/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
index fc2f6a9..9b8402b 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -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
diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 0fb3d51..4b865a5 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -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">
diff --git a/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.msa b/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.msa
index 856cf02..985b3e8 100644
--- a/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.msa
+++ b/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.msa
@@ -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> \ No newline at end of file
diff --git a/EdkModulePkg/Library/EdkScsiLib/ScsiLib.c b/EdkModulePkg/Library/EdkScsiLib/ScsiLib.c
index 9a6eb67..55b9503 100644
--- a/EdkModulePkg/Library/EdkScsiLib/ScsiLib.c
+++ b/EdkModulePkg/Library/EdkScsiLib/ScsiLib.c
@@ -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;
}
generated by cgit v1.1 at 2024-11-13 21:40:13 +0000