git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@784 6f19259b...

[mirror_edk2.git] / EdkModulePkg / Library / EdkScsiLib / ScsiLib.c

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