summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c11
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c2
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c20
-rw-r--r--MdePkg/Include/Library/ScsiLib.h14
-rw-r--r--MdePkg/Include/Library/UsbLib.h16
-rw-r--r--MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c4
-rw-r--r--MdePkg/Library/UefiScsiLib/UefiScsiLib.c14
-rw-r--r--MdePkg/Library/UefiUsbLib/UsbDxeLib.c2
8 files changed, 32 insertions, 51 deletions
diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
index 061222d..6a1d212 100644
--- 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.
+ @retval RETURN_SUCCESS Get all algorithmes list successfully.
@retval RETURN_OUT_OF_RESOURCES Source is not enough.
**/
@@ -863,18 +862,14 @@ CustomDecompressGetAlgorithms (
IN OUT UINT32 *NumberOfAlgorithms
)
{
- if (NumberOfAlgorithms == NULL) {
- return RETURN_INVALID_PARAMETER;
- }
+ ASSERT (NumberOfAlgorithms != NULL);
if (*NumberOfAlgorithms < 1) {
*NumberOfAlgorithms = 1;
return RETURN_OUT_OF_RESOURCES;
}
- if (AlgorithmGuidTable == NULL) {
- return RETURN_INVALID_PARAMETER;
- }
+ ASSERT (AlgorithmGuidTable != NULL);
AlgorithmGuidTable [0] = &gTianoCustomDecompressGuid;
*NumberOfAlgorithms = 1;
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 1b895cb..58bcb25 100644
--- 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);
SenseDataLength = sizeof (EFI_SCSI_SENSE_DATA);
- Status = SubmitInquiryCommand (
+ Status = ScsiInquiryCommand (
&ScsiIoDevice->ScsiIo,
EfiScsiStallSeconds (1),
(VOID *) &SenseData,
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 0ecbd50..61d6e40 100644
--- 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);
SenseDataLength = 0;
- Status = SubmitInquiryCommand (
+ Status = ScsiInquiryCommand (
ScsiDiskDevice->ScsiIo,
EfiScsiStallSeconds (1),
NULL,
@@ -981,9 +981,9 @@ Returns:
}
//
- // if goes here, meant SubmitInquiryCommand() failed.
+ // if goes here, meant ScsiInquiryCommand() failed.
// if ScsiDiskRequestSenseKeys() succeeds at last,
- // better retry SubmitInquiryCommand(). (by setting *NeedRetry = TRUE)
+ // better retry ScsiInquiryCommand(). (by setting *NeedRetry = TRUE)
//
MaxRetry = 3;
for (Index = 0; Index < MaxRetry; Index++) {
@@ -1057,7 +1057,7 @@ ScsiDiskTestUnitReady (
//
// Parameter 3 and 4: do not require sense data, retrieve it when needed.
//
- Status = SubmitTestUnitReadyCommand (
+ Status = ScsiTestUnitReadyCommand (
ScsiDiskDevice->ScsiIo,
EfiScsiStallSeconds (1),
NULL,
@@ -1275,7 +1275,7 @@ Returns:
//
// submit Read Capacity Command. in this call,not request sense data
//
- CommandStatus = SubmitReadCapacityCommand (
+ CommandStatus = ScsiReadCapacityCommand (
ScsiDiskDevice->ScsiIo,
EfiScsiStallSeconds (1),
NULL,
@@ -1337,9 +1337,9 @@ Returns:
}
//
- // if goes here, meant SubmitReadCapacityCommand() failed.
+ // if goes here, meant ScsiReadCapacityCommand() failed.
// if ScsiDiskRequestSenseKeys() succeeds at last,
- // better retry SubmitReadCapacityCommand(). (by setting *NeedRetry = TRUE)
+ // better retry ScsiReadCapacityCommand(). (by setting *NeedRetry = TRUE)
//
MaxRetry = 3;
for (Index = 0; Index < MaxRetry; Index++) {
@@ -1514,7 +1514,7 @@ ScsiDiskRequestSenseKeys (
for (SenseReq = TRUE; SenseReq;) {
- Status = SubmitRequestSenseCommand (
+ Status = ScsiRequestSenseCommand (
ScsiDiskDevice->ScsiIo,
EfiScsiStallSeconds (2),
PtrSenseData,
@@ -1894,7 +1894,7 @@ Returns:
*NeedRetry = FALSE;
*NumberOfSenseKeys = 0;
SenseDataLength = 0;
- Status = SubmitRead10Command (
+ Status = ScsiRead10Command (
ScsiDiskDevice->ScsiIo,
Timeout,
NULL,
@@ -1953,7 +1953,7 @@ Returns:
*NeedRetry = FALSE;
*NumberOfSenseKeys = 0;
SenseDataLength = 0;
- Status = SubmitWrite10Command (
+ Status = ScsiWrite10Command (
ScsiDiskDevice->ScsiIo,
Timeout,
NULL,
diff --git a/MdePkg/Include/Library/ScsiLib.h b/MdePkg/Include/Library/ScsiLib.h
index 607a67c..97634f6 100644
--- a/MdePkg/Include/Library/ScsiLib.h
+++ b/MdePkg/Include/Library/ScsiLib.h
@@ -61,7 +61,7 @@
**/
EFI_STATUS
-SubmitTestUnitReadyCommand (
+ScsiTestUnitReadyCommand (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
OUT VOID *SenseData,
@@ -103,7 +103,7 @@ SubmitTestUnitReadyCommand (
**/
EFI_STATUS
-SubmitInquiryCommand (
+ScsiInquiryCommand (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
@@ -150,7 +150,7 @@ SubmitInquiryCommand (
**/
EFI_STATUS
-SubmitModeSense10Command (
+ScsiModeSense10Command (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
@@ -202,7 +202,7 @@ SubmitModeSense10Command (
**/
EFI_STATUS
-SubmitRequestSenseCommand (
+ScsiRequestSenseCommand (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
@@ -244,7 +244,7 @@ SubmitRequestSenseCommand (
**/
EFI_STATUS
-SubmitReadCapacityCommand (
+ScsiReadCapacityCommand (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
@@ -290,7 +290,7 @@ SubmitReadCapacityCommand (
**/
EFI_STATUS
-SubmitRead10Command (
+ScsiRead10Command (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
@@ -337,7 +337,7 @@ SubmitRead10Command (
**/
EFI_STATUS
-SubmitWrite10Command (
+ScsiWrite10Command (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
diff --git a/MdePkg/Include/Library/UsbLib.h b/MdePkg/Include/Library/UsbLib.h
index 276a3c8..f3b56fb 100644
--- a/MdePkg/Include/Library/UsbLib.h
+++ b/MdePkg/Include/Library/UsbLib.h
@@ -96,11 +96,6 @@ UsbGetReportRequest (
IN UINT8 *Report
);
-typedef enum {
- EfiUsbEndpointHalt,
- EfiUsbDeviceRemoteWakeup
-} EFI_USB_STANDARD_FEATURE_SELECTOR;
-
EFI_STATUS
UsbGetDescriptor (
IN EFI_USB_IO_PROTOCOL *UsbIo,
@@ -186,17 +181,6 @@ UsbGetStatus (
OUT UINT32 *Status
);
-EFI_STATUS
-EFIAPI
-UsbGetHubDescriptor (
- IN EFI_USB_IO_PROTOCOL *UsbIo,
- IN UINT16 Value,
- IN UINT16 Index,
- IN UINT16 DescriptorLength,
- OUT VOID *Descriptor,
- OUT UINT32 *Status
- );
-
//
// Clear endpoint stall
//
diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
index 2eaa4c9..e01bd9e 100644
--- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
+++ b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
@@ -57,7 +57,7 @@ CustomDecompressGetInfo (
RETURN_STATUS
EFIAPI
CustomDecompress (
- IN const GUID *DecompressGuid,
+ IN CONST GUID *DecompressGuid,
IN CONST VOID *Source,
IN OUT VOID *Destination,
IN OUT VOID *Scratch
@@ -81,6 +81,8 @@ CustomDecompressGetAlgorithms (
IN OUT UINT32 *NumberOfAlgorithms
)
{
+ ASSERT (NumberOfAlgorithms != NULL);
+
*NumberOfAlgorithms = 0;
return RETURN_SUCCESS;
}
diff --git a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
index ed8ca82..20088d5 100644
--- a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
+++ b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
@@ -49,7 +49,7 @@
**/
EFI_STATUS
-SubmitTestUnitReadyCommand (
+ScsiTestUnitReadyCommand (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
OUT VOID *SenseData,
@@ -129,7 +129,7 @@ SubmitTestUnitReadyCommand (
**/
EFI_STATUS
-SubmitInquiryCommand (
+ScsiInquiryCommand (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
@@ -220,7 +220,7 @@ SubmitInquiryCommand (
**/
EFI_STATUS
-SubmitModeSense10Command (
+ScsiModeSense10Command (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
@@ -312,7 +312,7 @@ SubmitModeSense10Command (
**/
EFI_STATUS
-SubmitRequestSenseCommand (
+ScsiRequestSenseCommand (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
@@ -392,7 +392,7 @@ SubmitRequestSenseCommand (
**/
EFI_STATUS
-SubmitReadCapacityCommand (
+ScsiReadCapacityCommand (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
@@ -484,7 +484,7 @@ SubmitReadCapacityCommand (
**/
EFI_STATUS
-SubmitRead10Command (
+ScsiRead10Command (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
@@ -575,7 +575,7 @@ SubmitRead10Command (
**/
EFI_STATUS
-SubmitWrite10Command (
+ScsiWrite10Command (
IN EFI_SCSI_IO_PROTOCOL *ScsiIo,
IN UINT64 Timeout,
IN VOID *SenseData,
diff --git a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
index 07fe0fe..90b0fd3 100644
--- a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
+++ b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
@@ -564,7 +564,7 @@ UsbClearEndpointHalt (
Result = UsbClearFeature (
UsbIo,
USB_TARGET_ENDPOINT,
- EfiUsbEndpointHalt,
+ USB_FEATURE_ENDPOINT_HALT,
EndpointDescriptor.EndpointAddress,
Status
);
generated by cgit v1.1 at 2024-07-30 02:12:08 +0000