From d35be2a434d347c0ff112f89c120a5c8a79c89a7 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Tue, 14 Aug 2007 07:58:32 +0000 Subject: 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 --- MdePkg/Include/Library/ScsiLib.h | 14 +++++++------- MdePkg/Include/Library/UsbLib.h | 16 ---------------- .../BaseCustomDecompressLibNull.c | 4 +++- MdePkg/Library/UefiScsiLib/UefiScsiLib.c | 14 +++++++------- MdePkg/Library/UefiUsbLib/UsbDxeLib.c | 2 +- 5 files changed, 18 insertions(+), 32 deletions(-) (limited to 'MdePkg') diff --git a/MdePkg/Include/Library/ScsiLib.h b/MdePkg/Include/Library/ScsiLib.h index 607a67cef8..97634f616b 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 276a3c87e5..f3b56fbb80 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 2eaa4c95c1..e01bd9e273 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 ed8ca82335..20088d5cbf 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 07fe0fe0f8..90b0fd3ea5 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 ); -- cgit v1.2.3