tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-26 23:24:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ScsiLib build break by << operator, which is replaced by LShiftU64 of BaseLib.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8363 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2009-05-21 03:26:42 +00:00
parent 7b2cc5499f
commit 3e0c79b57b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MdePkg/Library/UefiScsiLib/UefiScsiLib.c
View File

@ -14,6 +14,7 @@
#include <Uefi.h> #include <Uefi.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/UefiScsiLib.h> #include <Library/UefiScsiLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
@ -143,7 +144,7 @@ ScsiTestUnitReadyCommand (
ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun); ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);
Cdb[0] = EFI_SCSI_OP_TEST_UNIT_READY; Cdb[0] = EFI_SCSI_OP_TEST_UNIT_READY;
Cdb[1] = (UINT8) ((Lun << 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK); Cdb[1] = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);
CommandPacket.CdbLength = (UINT8) EFI_SCSI_OP_LENGTH_SIX; CommandPacket.CdbLength = (UINT8) EFI_SCSI_OP_LENGTH_SIX;
CommandPacket.SenseDataLength = *SenseDataLength; CommandPacket.SenseDataLength = *SenseDataLength;
@ -276,7 +277,7 @@ ScsiInquiryCommand (
ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun); ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);
Cdb[0] = EFI_SCSI_OP_INQUIRY; Cdb[0] = EFI_SCSI_OP_INQUIRY;
Cdb[1] = (UINT8) ((Lun << 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK); Cdb[1] = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);
if (EnableVitalProductData) { if (EnableVitalProductData) {
Cdb[1] |= 0x01; Cdb[1] |= 0x01;
} }
@ -428,7 +429,7 @@ ScsiModeSense10Command (
// //
// DBDField is in Cdb[1] bit3 of (bit7..0) // DBDField is in Cdb[1] bit3 of (bit7..0)
// //
Cdb[1] = (UINT8) (((Lun << 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK) + ((DBDField << 3) & 0x08)); Cdb[1] = (UINT8) ((LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK) + ((DBDField << 3) & 0x08));
// //
// PageControl is in Cdb[2] bit7..6, PageCode is in Cdb[2] bit5..0 // PageControl is in Cdb[2] bit7..6, PageCode is in Cdb[2] bit5..0
// //
@ -516,7 +517,7 @@ ScsiRequestSenseCommand (
ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun); ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);
Cdb[0] = EFI_SCSI_OP_REQUEST_SENSE; Cdb[0] = EFI_SCSI_OP_REQUEST_SENSE;
Cdb[1] = (UINT8) ((Lun << 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK); Cdb[1] = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);
Cdb[4] = (UINT8) (*SenseDataLength); Cdb[4] = (UINT8) (*SenseDataLength);
CommandPacket.CdbLength = (UINT8) EFI_SCSI_OP_LENGTH_SIX; CommandPacket.CdbLength = (UINT8) EFI_SCSI_OP_LENGTH_SIX;
@ -610,7 +611,7 @@ ScsiReadCapacityCommand (
ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun); ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);
Cdb[0] = EFI_SCSI_OP_READ_CAPACITY; Cdb[0] = EFI_SCSI_OP_READ_CAPACITY;
Cdb[1] = (UINT8) ((Lun << 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK); Cdb[1] = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);
if (!Pmi) { if (!Pmi) {
// //
// Partial medium indicator,if Pmi is FALSE, the Cdb.2 ~ Cdb.5 MUST BE ZERO. // Partial medium indicator,if Pmi is FALSE, the Cdb.2 ~ Cdb.5 MUST BE ZERO.
@ -812,7 +813,7 @@ ScsiRead10Command (
ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun); ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);
Cdb[0] = EFI_SCSI_OP_READ10; Cdb[0] = EFI_SCSI_OP_READ10;
Cdb[1] = (UINT8) ((Lun << 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK); Cdb[1] = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);
Cdb[2] = (UINT8) (StartLba >> 24); Cdb[2] = (UINT8) (StartLba >> 24);
Cdb[3] = (UINT8) (StartLba >> 16); Cdb[3] = (UINT8) (StartLba >> 16);
Cdb[4] = (UINT8) (StartLba >> 8); Cdb[4] = (UINT8) (StartLba >> 8);
@ -914,7 +915,7 @@ ScsiWrite10Command (
ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun); ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);
Cdb[0] = EFI_SCSI_OP_WRITE10; Cdb[0] = EFI_SCSI_OP_WRITE10;
Cdb[1] = (UINT8) ((Lun << 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK); Cdb[1] = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);
Cdb[2] = (UINT8) (StartLba >> 24); Cdb[2] = (UINT8) (StartLba >> 24);
Cdb[3] = (UINT8) (StartLba >> 16); Cdb[3] = (UINT8) (StartLba >> 16);
Cdb[4] = (UINT8) (StartLba >> 8); Cdb[4] = (UINT8) (StartLba >> 8);

1
MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
View File

@ -40,4 +40,5 @@
[LibraryClasses] [LibraryClasses]
BaseMemoryLib BaseMemoryLib
DebugLib DebugLib
BaseLib