From 36122070ec3bde97d90ad1c4773a24ae6507c9cb Mon Sep 17 00:00:00 2001 From: lgao4 Date: Thu, 6 Jul 2006 04:02:57 +0000 Subject: [PATCH] git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@784 6f19259b-4bc3-4df7-8a09-765794883524 --- EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c | 4 +- EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa | 2 +- .../Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa | 2 +- EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c | 2 +- EdkModulePkg/EdkModulePkg.spd | 5 ++ .../Library/EdkScsiLib/EdkScsiLib.msa | 2 +- EdkModulePkg/Library/EdkScsiLib/ScsiLib.c | 61 +++++++++---------- .../Protocol/{ScsiIo.h => ScsiIoExt.h} | 2 +- MdePkg/Include/Uefi/UefiSpec.h | 4 +- MdePkg/MdePkg.spd | 2 +- 10 files changed, 44 insertions(+), 42 deletions(-) rename MdePkg/Include/Protocol/{ScsiIo.h => ScsiIoExt.h} (97%) diff --git a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.c index 866c796925..6a3778c919 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 b3db037744..bf8495b807 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.--> - EFI_SPECIFICATION_VERSION 0x00020000 + EFI_SPECIFICATION_VERSION 0x00010010 EDK_RELEASE_VERSION 0x00090000 gSCSIBusDriverBinding diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa index 51af7a90bd..311913ebe9 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.--> - EFI_SPECIFICATION_VERSION 0x00020000 + EFI_SPECIFICATION_VERSION 0x00010010 EDK_RELEASE_VERSION 0x00090000 gScsiDiskDriverBinding diff --git a/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c b/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c index fc2f6a9024..9b8402b561 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 0fb3d5109d..4b865a5630 100644 --- a/EdkModulePkg/EdkModulePkg.spd +++ b/EdkModulePkg/EdkModulePkg.spd @@ -486,6 +486,11 @@ 76B6BDFA-2ACD-4462-9E3F-CB58C969D937 + + gEfiScsiIoProtocolGuid + 403CD195-F233-48EC-8455-B2E52F1D9E02 + + diff --git a/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.msa b/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.msa index 856cf02bf9..985b3e8b82 100644 --- a/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.msa +++ b/EdkModulePkg/Library/EdkScsiLib/EdkScsiLib.msa @@ -37,7 +37,7 @@ - EFI_SPECIFICATION_VERSION 0x00020000 + EFI_SPECIFICATION_VERSION 0x00010010 EDK_RELEASE_VERSION 0x00090000 \ No newline at end of file diff --git a/EdkModulePkg/Library/EdkScsiLib/ScsiLib.c b/EdkModulePkg/Library/EdkScsiLib/ScsiLib.c index 9a6eb6751e..55b950390a 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; } diff --git a/MdePkg/Include/Protocol/ScsiIo.h b/MdePkg/Include/Protocol/ScsiIoExt.h similarity index 97% rename from MdePkg/Include/Protocol/ScsiIo.h rename to MdePkg/Include/Protocol/ScsiIoExt.h index e1019bac44..872b60c2a9 100644 --- a/MdePkg/Include/Protocol/ScsiIo.h +++ b/MdePkg/Include/Protocol/ScsiIoExt.h @@ -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 **/ diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h index edb35111df..9993cd44e7 100644 --- a/MdePkg/Include/Uefi/UefiSpec.h +++ b/MdePkg/Include/Uefi/UefiSpec.h @@ -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 #include #include -#include +#include #include #include #include diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd index 0c98aef5fb..7dde8bcf53 100644 --- a/MdePkg/MdePkg.spd +++ b/MdePkg/MdePkg.spd @@ -1022,7 +1022,7 @@ A6A72875-2962-4C18-9F46-8DA644CCFE00 - + gEfiScsiIoProtocolGuid 932F4736-2362-4002-803E-3CD54B138F85 -- 2.39.2