Sync code with MdePkg spec for Scsi library class and CustomDecompress library class.

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

diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
index 061222dae00b683e3108338ef99caaa04aaa65d8..6a1d212d626846c26cb3eae6da46fd80b85b32e2 100644 (file)
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
@@ -851,8 +851,7 @@ Returns:
   @param[in, out]  AlgorithmGuidTable   The decompress method guid list.
   @param[in, out]  NumberOfAlgorithms   The number of decompress methods.
 
-  @retval  RETURN_SUCCESS            Get all algorithmes list successfully.
-  @retval  RETURN_INVALID_PARAMETER  Input paramter error.\r
+  @retval  RETURN_SUCCESS            Get all algorithmes list successfully.\r
   @retval  RETURN_OUT_OF_RESOURCES   Source is not enough.\r
 \r
 **/\r
@@ -863,18 +862,14 @@ CustomDecompressGetAlgorithms (
    IN OUT  UINT32  *NumberOfAlgorithms\r
   )\r
 {\r
-  if (NumberOfAlgorithms == NULL) {\r
-    return RETURN_INVALID_PARAMETER;\r
-  }\r
+  ASSERT (NumberOfAlgorithms != NULL);\r
   \r
   if (*NumberOfAlgorithms < 1) {\r
     *NumberOfAlgorithms = 1;\r
     return RETURN_OUT_OF_RESOURCES;\r
   }\r
   \r
-  if (AlgorithmGuidTable == NULL) {\r
-    return RETURN_INVALID_PARAMETER;\r
-  }\r
+  ASSERT (AlgorithmGuidTable != NULL);\r
 \r
   AlgorithmGuidTable [0] = &gTianoCustomDecompressGuid;\r
   *NumberOfAlgorithms = 1;\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 1b895cb427d60510acfb5588d67c5b15786ce383..58bcb25440680aca8406a578fbe7102e0d6371ac 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -1075,7 +1075,7 @@ Returns:
   InquiryDataLength = sizeof (EFI_SCSI_INQUIRY_DATA);\r
   SenseDataLength   = sizeof (EFI_SCSI_SENSE_DATA);\r
 \r
-  Status = SubmitInquiryCommand (\r
+  Status = ScsiInquiryCommand (\r
             &ScsiIoDevice->ScsiIo,\r
             EfiScsiStallSeconds (1),\r
             (VOID *) &SenseData,\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 0ecbd50724572d42e30c57182e7b8399e6a7882f..61d6e4068efd1ffe7b506fca412fdafa97eedb90 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -920,7 +920,7 @@ Returns:
   InquiryDataLength = sizeof (EFI_SCSI_INQUIRY_DATA);\r
   SenseDataLength   = 0;\r
 \r
-  Status = SubmitInquiryCommand (\r
+  Status = ScsiInquiryCommand (\r
             ScsiDiskDevice->ScsiIo,\r
             EfiScsiStallSeconds (1),\r
             NULL,\r
@@ -981,9 +981,9 @@ Returns:
   }\r
   \r
   //\r
-  // if goes here, meant SubmitInquiryCommand() failed.\r
+  // if goes here, meant ScsiInquiryCommand() failed.\r
   // if ScsiDiskRequestSenseKeys() succeeds at last,\r
-  // better retry SubmitInquiryCommand(). (by setting *NeedRetry = TRUE)\r
+  // better retry ScsiInquiryCommand(). (by setting *NeedRetry = TRUE)\r
   //\r
   MaxRetry = 3;\r
   for (Index = 0; Index < MaxRetry; Index++) {\r
@@ -1057,7 +1057,7 @@ ScsiDiskTestUnitReady (
   //\r
   // Parameter 3 and 4: do not require sense data, retrieve it when needed.\r
   //\r
-  Status = SubmitTestUnitReadyCommand (\r
+  Status = ScsiTestUnitReadyCommand (\r
             ScsiDiskDevice->ScsiIo,\r
             EfiScsiStallSeconds (1),\r
             NULL,\r
@@ -1275,7 +1275,7 @@ Returns:
   //\r
   // submit Read Capacity Command. in this call,not request sense data\r
   //\r
-  CommandStatus = SubmitReadCapacityCommand (\r
+  CommandStatus = ScsiReadCapacityCommand (\r
                     ScsiDiskDevice->ScsiIo,\r
                     EfiScsiStallSeconds (1),\r
                     NULL,\r
@@ -1337,9 +1337,9 @@ Returns:
   }\r
   \r
   //\r
-  // if goes here, meant SubmitReadCapacityCommand() failed.\r
+  // if goes here, meant ScsiReadCapacityCommand() failed.\r
   // if ScsiDiskRequestSenseKeys() succeeds at last,\r
-  // better retry SubmitReadCapacityCommand(). (by setting *NeedRetry = TRUE)\r
+  // better retry ScsiReadCapacityCommand(). (by setting *NeedRetry = TRUE)\r
   //\r
   MaxRetry = 3;\r
   for (Index = 0; Index < MaxRetry; Index++) {\r
@@ -1514,7 +1514,7 @@ ScsiDiskRequestSenseKeys (
 \r
   for (SenseReq = TRUE; SenseReq;) {\r
 \r
-    Status = SubmitRequestSenseCommand (\r
+    Status = ScsiRequestSenseCommand (\r
               ScsiDiskDevice->ScsiIo,\r
               EfiScsiStallSeconds (2),\r
               PtrSenseData,\r
@@ -1894,7 +1894,7 @@ Returns:
   *NeedRetry          = FALSE;\r
   *NumberOfSenseKeys  = 0;\r
   SenseDataLength     = 0;\r
-  Status = SubmitRead10Command (\r
+  Status = ScsiRead10Command (\r
             ScsiDiskDevice->ScsiIo,\r
             Timeout,\r
             NULL,\r
@@ -1953,7 +1953,7 @@ Returns:
   *NeedRetry          = FALSE;\r
   *NumberOfSenseKeys  = 0;\r
   SenseDataLength     = 0;\r
-  Status = SubmitWrite10Command (\r
+  Status = ScsiWrite10Command (\r
             ScsiDiskDevice->ScsiIo,\r
             Timeout,\r
             NULL,\r

diff --git a/MdePkg/Include/Library/ScsiLib.h b/MdePkg/Include/Library/ScsiLib.h
index 607a67cef841205312e00dc407be80de9946dbab..97634f616b2e6b0c696e734d3c6fbff630c01feb 100644 (file)
--- a/MdePkg/Include/Library/ScsiLib.h
+++ b/MdePkg/Include/Library/ScsiLib.h
@@ -61,7 +61,7 @@
 
 **/\r
 EFI_STATUS\r
-SubmitTestUnitReadyCommand (\r
+ScsiTestUnitReadyCommand (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   OUT VOID                  *SenseData,\r
@@ -103,7 +103,7 @@ SubmitTestUnitReadyCommand (
 
 **/\r
 EFI_STATUS\r
-SubmitInquiryCommand (\r
+ScsiInquiryCommand (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   IN  VOID                  *SenseData,\r
@@ -150,7 +150,7 @@ SubmitInquiryCommand (
 
 **/\r
 EFI_STATUS\r
-SubmitModeSense10Command (\r
+ScsiModeSense10Command (\r
   IN  EFI_SCSI_IO_PROTOCOL    *ScsiIo,\r
   IN  UINT64                  Timeout,\r
   IN  VOID                    *SenseData,\r
@@ -202,7 +202,7 @@ SubmitModeSense10Command (
 
 **/\r
 EFI_STATUS\r
-SubmitRequestSenseCommand (\r
+ScsiRequestSenseCommand (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   IN  VOID                  *SenseData,\r
@@ -244,7 +244,7 @@ SubmitRequestSenseCommand (
 
 **/\r
 EFI_STATUS\r
-SubmitReadCapacityCommand (\r
+ScsiReadCapacityCommand (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   IN  VOID                  *SenseData,\r
@@ -290,7 +290,7 @@ SubmitReadCapacityCommand (
 
 **/\r
 EFI_STATUS\r
-SubmitRead10Command (\r
+ScsiRead10Command (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   IN  VOID                  *SenseData,\r
@@ -337,7 +337,7 @@ SubmitRead10Command (
 
 **/\r
 EFI_STATUS\r
-SubmitWrite10Command (\r
+ScsiWrite10Command (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   IN  VOID                  *SenseData,\r

diff --git a/MdePkg/Include/Library/UsbLib.h b/MdePkg/Include/Library/UsbLib.h
index 276a3c87e5c26816a4670e721fbb8ed9a1f5b913..f3b56fbb80f4ebf551abb44281dbda27028458cc 100644 (file)
--- a/MdePkg/Include/Library/UsbLib.h
+++ b/MdePkg/Include/Library/UsbLib.h
@@ -96,11 +96,6 @@ UsbGetReportRequest (
   IN UINT8                   *Report\r
   );\r
 \r
-typedef enum {\r
-  EfiUsbEndpointHalt,\r
-  EfiUsbDeviceRemoteWakeup\r
-} EFI_USB_STANDARD_FEATURE_SELECTOR;\r
-\r
 EFI_STATUS\r
 UsbGetDescriptor (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
@@ -186,17 +181,6 @@ UsbGetStatus (
   OUT UINT32                  *Status\r
   );\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-UsbGetHubDescriptor (\r
-  IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
-  IN  UINT16                  Value,\r
-  IN  UINT16                  Index,\r
-  IN  UINT16                  DescriptorLength,\r
-  OUT VOID                    *Descriptor,\r
-  OUT UINT32                  *Status\r
-  );\r
-\r
 //\r
 // Clear endpoint stall\r
 //\r

diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
index 2eaa4c95c130ba5bf57ba38b7604fda27855f5a6..e01bd9e273eaa22270c284eb5f6413fded85e395 100644 (file)
--- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
+++ b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
@@ -57,7 +57,7 @@ CustomDecompressGetInfo (
 RETURN_STATUS\r
 EFIAPI\r
 CustomDecompress (\r
-  IN const GUID  *DecompressGuid,\r
+  IN CONST GUID  *DecompressGuid,\r
   IN CONST VOID  *Source,\r
   IN OUT VOID    *Destination,\r
   IN OUT VOID    *Scratch\r
@@ -81,6 +81,8 @@ CustomDecompressGetAlgorithms (
    IN OUT  UINT32  *NumberOfAlgorithms\r
   )\r
 {\r
+  ASSERT (NumberOfAlgorithms != NULL);\r
+\r
   *NumberOfAlgorithms = 0;\r
   return RETURN_SUCCESS; \r
 }\r

diff --git a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
index ed8ca82335e717f1ce77661b770710e25d7a45e6..20088d5cbfa7d2f490c511e3952af3e83a4c5c4b 100644 (file)
--- a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
+++ b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
@@ -49,7 +49,7 @@
 
 **/\r
 EFI_STATUS\r
-SubmitTestUnitReadyCommand (\r
+ScsiTestUnitReadyCommand (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   OUT VOID                  *SenseData,\r
@@ -129,7 +129,7 @@ SubmitTestUnitReadyCommand (
 
 **/\r
 EFI_STATUS\r
-SubmitInquiryCommand (\r
+ScsiInquiryCommand (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   IN  VOID                  *SenseData,\r
@@ -220,7 +220,7 @@ SubmitInquiryCommand (
 
 **/\r
 EFI_STATUS\r
-SubmitModeSense10Command (\r
+ScsiModeSense10Command (\r
   IN  EFI_SCSI_IO_PROTOCOL    *ScsiIo,\r
   IN  UINT64                  Timeout,\r
   IN  VOID                    *SenseData,\r
@@ -312,7 +312,7 @@ SubmitModeSense10Command (
 
 **/\r
 EFI_STATUS\r
-SubmitRequestSenseCommand (\r
+ScsiRequestSenseCommand (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   IN  VOID                  *SenseData,\r
@@ -392,7 +392,7 @@ SubmitRequestSenseCommand (
 
 **/\r
 EFI_STATUS\r
-SubmitReadCapacityCommand (\r
+ScsiReadCapacityCommand (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   IN  VOID                  *SenseData,\r
@@ -484,7 +484,7 @@ SubmitReadCapacityCommand (
 
 **/\r
 EFI_STATUS\r
-SubmitRead10Command (\r
+ScsiRead10Command (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   IN  VOID                  *SenseData,\r
@@ -575,7 +575,7 @@ SubmitRead10Command (
 
 **/\r
 EFI_STATUS\r
-SubmitWrite10Command (\r
+ScsiWrite10Command (\r
   IN  EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN  UINT64                Timeout,\r
   IN  VOID                  *SenseData,\r

diff --git a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
index 07fe0fe0f8df0e230f3013f30d04dddc0f974ade..90b0fd3ea5cc29233723f5ee269a5c5a1fd897ec 100644 (file)
--- a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
+++ b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
@@ -564,7 +564,7 @@ UsbClearEndpointHalt (
   Result = UsbClearFeature (\r
             UsbIo,\r
             USB_TARGET_ENDPOINT,\r
-            EfiUsbEndpointHalt,\r
+            USB_FEATURE_ENDPOINT_HALT,\r
             EndpointDescriptor.EndpointAddress,\r
             Status\r
             );\r