From 2f88bd3a1296c522317f1c21377876de63de5be7 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Sun, 5 Dec 2021 14:54:05 -0800 Subject: MdePkg: Apply uncrustify changes REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the MdePkg package Cc: Andrew Fish Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Michael Kubacki Reviewed-by: Liming Gao --- MdePkg/Include/Protocol/AbsolutePointer.h | 64 +- .../Include/Protocol/AcpiSystemDescriptionTable.h | 54 +- MdePkg/Include/Protocol/AcpiTable.h | 13 +- MdePkg/Include/Protocol/AdapterInformation.h | 42 +- MdePkg/Include/Protocol/Arp.h | 47 +- MdePkg/Include/Protocol/AtaPassThru.h | 144 ++- MdePkg/Include/Protocol/AuthenticationInfo.h | 34 +- MdePkg/Include/Protocol/Bds.h | 6 +- MdePkg/Include/Protocol/Bis.h | 65 +- MdePkg/Include/Protocol/BlockIo.h | 53 +- MdePkg/Include/Protocol/BlockIo2.h | 31 +- MdePkg/Include/Protocol/BlockIoCrypto.h | 97 +- MdePkg/Include/Protocol/BluetoothAttribute.h | 113 ++- MdePkg/Include/Protocol/BluetoothConfig.h | 49 +- MdePkg/Include/Protocol/BluetoothHc.h | 29 +- MdePkg/Include/Protocol/BluetoothIo.h | 24 +- MdePkg/Include/Protocol/BluetoothLeConfig.h | 100 +-- MdePkg/Include/Protocol/BootManagerPolicy.h | 16 +- .../Include/Protocol/BusSpecificDriverOverride.h | 6 +- MdePkg/Include/Protocol/Capsule.h | 2 +- MdePkg/Include/Protocol/ComponentName.h | 12 +- MdePkg/Include/Protocol/ComponentName2.h | 12 +- MdePkg/Include/Protocol/Cpu.h | 32 +- MdePkg/Include/Protocol/CpuIo2.h | 10 +- MdePkg/Include/Protocol/DebugPort.h | 21 +- MdePkg/Include/Protocol/DebugSupport.h | 993 ++++++++++----------- MdePkg/Include/Protocol/Decompress.h | 8 +- MdePkg/Include/Protocol/DeferredImageLoad.h | 6 +- MdePkg/Include/Protocol/DeviceIo.h | 26 +- MdePkg/Include/Protocol/DevicePath.h | 570 ++++++------ MdePkg/Include/Protocol/DevicePathFromText.h | 11 +- MdePkg/Include/Protocol/DevicePathToText.h | 12 +- MdePkg/Include/Protocol/DevicePathUtilities.h | 33 +- MdePkg/Include/Protocol/Dhcp4.h | 184 ++-- MdePkg/Include/Protocol/Dhcp6.h | 144 +-- MdePkg/Include/Protocol/DiskInfo.h | 28 +- MdePkg/Include/Protocol/DiskIo.h | 12 +- MdePkg/Include/Protocol/DiskIo2.h | 26 +- MdePkg/Include/Protocol/Dns4.h | 121 ++- MdePkg/Include/Protocol/Dns6.h | 98 +- MdePkg/Include/Protocol/DriverBinding.h | 16 +- MdePkg/Include/Protocol/DriverConfiguration.h | 14 +- MdePkg/Include/Protocol/DriverConfiguration2.h | 26 +- MdePkg/Include/Protocol/DriverDiagnostics.h | 16 +- MdePkg/Include/Protocol/DriverDiagnostics2.h | 8 +- MdePkg/Include/Protocol/DriverFamilyOverride.h | 7 +- MdePkg/Include/Protocol/DriverHealth.h | 18 +- .../Include/Protocol/DriverSupportedEfiVersion.h | 7 +- MdePkg/Include/Protocol/DxeMmReadyToLock.h | 2 +- MdePkg/Include/Protocol/DxeSmmReadyToLock.h | 4 +- MdePkg/Include/Protocol/Eap.h | 18 +- MdePkg/Include/Protocol/EapConfiguration.h | 12 +- MdePkg/Include/Protocol/EapManagement.h | 55 +- MdePkg/Include/Protocol/EapManagement2.h | 4 +- MdePkg/Include/Protocol/Ebc.h | 88 +- MdePkg/Include/Protocol/EdidActive.h | 4 +- MdePkg/Include/Protocol/EdidDiscovered.h | 4 +- MdePkg/Include/Protocol/EdidOverride.h | 8 +- MdePkg/Include/Protocol/EraseBlock.h | 16 +- MdePkg/Include/Protocol/FirmwareManagement.h | 116 ++- MdePkg/Include/Protocol/FirmwareVolume2.h | 167 ++-- MdePkg/Include/Protocol/FirmwareVolumeBlock.h | 58 +- MdePkg/Include/Protocol/FormBrowser2.h | 45 +- MdePkg/Include/Protocol/Ftp4.h | 51 +- MdePkg/Include/Protocol/GraphicsOutput.h | 54 +- MdePkg/Include/Protocol/GuidedSectionExtraction.h | 7 +- MdePkg/Include/Protocol/Hash.h | 48 +- MdePkg/Include/Protocol/Hash2.h | 38 +- MdePkg/Include/Protocol/HiiConfigAccess.h | 50 +- MdePkg/Include/Protocol/HiiConfigKeyword.h | 29 +- MdePkg/Include/Protocol/HiiConfigRouting.h | 42 +- MdePkg/Include/Protocol/HiiDatabase.h | 68 +- MdePkg/Include/Protocol/HiiFont.h | 68 +- MdePkg/Include/Protocol/HiiImage.h | 63 +- MdePkg/Include/Protocol/HiiImageDecoder.h | 28 +- MdePkg/Include/Protocol/HiiImageEx.h | 14 +- MdePkg/Include/Protocol/HiiPackageList.h | 8 +- MdePkg/Include/Protocol/HiiPopup.h | 13 +- MdePkg/Include/Protocol/HiiString.h | 27 +- MdePkg/Include/Protocol/Http.h | 74 +- MdePkg/Include/Protocol/HttpBootCallback.h | 10 +- MdePkg/Include/Protocol/HttpUtilities.h | 12 +- .../Protocol/I2cBusConfigurationManagement.h | 9 +- MdePkg/Include/Protocol/I2cEnumerate.h | 16 +- MdePkg/Include/Protocol/I2cHost.h | 11 +- MdePkg/Include/Protocol/I2cIo.h | 21 +- MdePkg/Include/Protocol/I2cMaster.h | 20 +- MdePkg/Include/Protocol/IScsiInitiatorName.h | 9 +- MdePkg/Include/Protocol/IdeControllerInit.h | 30 +- .../Protocol/IncompatiblePciDeviceSupport.h | 4 +- MdePkg/Include/Protocol/Ip4.h | 166 ++-- MdePkg/Include/Protocol/Ip4Config.h | 18 +- MdePkg/Include/Protocol/Ip4Config2.h | 41 +- MdePkg/Include/Protocol/Ip6.h | 231 +++-- MdePkg/Include/Protocol/Ip6Config.h | 37 +- MdePkg/Include/Protocol/IpSec.h | 31 +- MdePkg/Include/Protocol/IpSecConfig.h | 175 ++-- MdePkg/Include/Protocol/IsaHc.h | 20 +- MdePkg/Include/Protocol/Kms.h | 217 +++-- MdePkg/Include/Protocol/LegacyRegion2.h | 60 +- MdePkg/Include/Protocol/LegacySpiController.h | 38 +- MdePkg/Include/Protocol/LegacySpiFlash.h | 24 +- MdePkg/Include/Protocol/LegacySpiSmmController.h | 4 +- MdePkg/Include/Protocol/LegacySpiSmmFlash.h | 4 +- MdePkg/Include/Protocol/LoadFile.h | 8 +- MdePkg/Include/Protocol/LoadFile2.h | 7 +- MdePkg/Include/Protocol/LoadedImage.h | 40 +- MdePkg/Include/Protocol/ManagedNetwork.h | 76 +- MdePkg/Include/Protocol/Metronome.h | 12 +- MdePkg/Include/Protocol/MmAccess.h | 18 +- MdePkg/Include/Protocol/MmBase.h | 9 +- MdePkg/Include/Protocol/MmCommunication.h | 13 +- MdePkg/Include/Protocol/MmCommunication2.h | 7 +- MdePkg/Include/Protocol/MmConfiguration.h | 9 +- MdePkg/Include/Protocol/MmControl.h | 11 +- MdePkg/Include/Protocol/MmCpu.h | 172 ++-- MdePkg/Include/Protocol/MmCpuIo.h | 12 +- MdePkg/Include/Protocol/MmEndOfDxe.h | 2 +- MdePkg/Include/Protocol/MmGpiDispatch.h | 11 +- MdePkg/Include/Protocol/MmIoTrapDispatch.h | 17 +- MdePkg/Include/Protocol/MmMp.h | 58 +- MdePkg/Include/Protocol/MmPciRootBridgeIo.h | 5 +- MdePkg/Include/Protocol/MmPeriodicTimerDispatch.h | 17 +- MdePkg/Include/Protocol/MmPowerButtonDispatch.h | 9 +- MdePkg/Include/Protocol/MmReadyToLock.h | 2 +- .../Include/Protocol/MmReportStatusCodeHandler.h | 8 +- MdePkg/Include/Protocol/MmStandbyButtonDispatch.h | 9 +- MdePkg/Include/Protocol/MmStatusCode.h | 8 +- MdePkg/Include/Protocol/MmSwDispatch.h | 20 +- MdePkg/Include/Protocol/MmSxDispatch.h | 12 +- MdePkg/Include/Protocol/MmUsbDispatch.h | 11 +- MdePkg/Include/Protocol/MonotonicCounter.h | 2 +- MdePkg/Include/Protocol/MpService.h | 90 +- MdePkg/Include/Protocol/Mtftp4.h | 159 ++-- MdePkg/Include/Protocol/Mtftp6.h | 142 ++- .../Include/Protocol/NetworkInterfaceIdentifier.h | 64 +- MdePkg/Include/Protocol/NvdimmLabel.h | 100 +-- MdePkg/Include/Protocol/NvmExpressPassthru.h | 108 +-- MdePkg/Include/Protocol/PartitionInfo.h | 23 +- MdePkg/Include/Protocol/Pcd.h | 139 +-- MdePkg/Include/Protocol/PcdInfo.h | 23 +- MdePkg/Include/Protocol/PciEnumerationComplete.h | 2 +- .../Protocol/PciHostBridgeResourceAllocation.h | 22 +- MdePkg/Include/Protocol/PciHotPlugInit.h | 18 +- MdePkg/Include/Protocol/PciHotPlugRequest.h | 6 +- MdePkg/Include/Protocol/PciIo.h | 96 +- MdePkg/Include/Protocol/PciOverride.h | 3 +- MdePkg/Include/Protocol/PciPlatform.h | 22 +- MdePkg/Include/Protocol/PciRootBridgeIo.h | 86 +- MdePkg/Include/Protocol/PiPcd.h | 78 +- MdePkg/Include/Protocol/PiPcdInfo.h | 13 +- MdePkg/Include/Protocol/Pkcs7Verify.h | 11 +- MdePkg/Include/Protocol/PlatformDriverOverride.h | 10 +- .../Protocol/PlatformToDriverConfiguration.h | 99 +- MdePkg/Include/Protocol/PxeBaseCode.h | 266 +++--- MdePkg/Include/Protocol/PxeBaseCodeCallBack.h | 13 +- MdePkg/Include/Protocol/RamDisk.h | 12 +- MdePkg/Include/Protocol/RealTimeClock.h | 2 +- MdePkg/Include/Protocol/RedfishDiscover.h | 76 +- .../Include/Protocol/RegularExpressionProtocol.h | 28 +- MdePkg/Include/Protocol/ReportStatusCodeHandler.h | 12 +- MdePkg/Include/Protocol/Reset.h | 2 +- MdePkg/Include/Protocol/ResetNotification.h | 16 +- MdePkg/Include/Protocol/Rest.h | 10 +- MdePkg/Include/Protocol/RestEx.h | 110 +-- MdePkg/Include/Protocol/RestJsonStructure.h | 41 +- MdePkg/Include/Protocol/Rng.h | 22 +- MdePkg/Include/Protocol/Runtime.h | 50 +- MdePkg/Include/Protocol/S3SaveState.h | 55 +- MdePkg/Include/Protocol/S3SmmSaveState.h | 4 +- MdePkg/Include/Protocol/ScsiIo.h | 106 ++- MdePkg/Include/Protocol/ScsiPassThru.h | 66 +- MdePkg/Include/Protocol/ScsiPassThruExt.h | 86 +- MdePkg/Include/Protocol/SdMmcPassThru.h | 66 +- MdePkg/Include/Protocol/Security.h | 6 +- MdePkg/Include/Protocol/Security2.h | 10 +- MdePkg/Include/Protocol/SecurityPolicy.h | 2 +- MdePkg/Include/Protocol/SerialIo.h | 52 +- MdePkg/Include/Protocol/ServiceBinding.h | 4 +- MdePkg/Include/Protocol/Shell.h | 207 +++-- MdePkg/Include/Protocol/ShellDynamicCommand.h | 18 +- MdePkg/Include/Protocol/ShellParameters.h | 12 +- MdePkg/Include/Protocol/SimpleFileSystem.h | 91 +- MdePkg/Include/Protocol/SimpleNetwork.h | 142 +-- MdePkg/Include/Protocol/SimplePointer.h | 32 +- MdePkg/Include/Protocol/SimpleTextIn.h | 18 +- MdePkg/Include/Protocol/SimpleTextInEx.h | 123 ++- MdePkg/Include/Protocol/SimpleTextOut.h | 90 +- MdePkg/Include/Protocol/SmartCardEdge.h | 147 ++- MdePkg/Include/Protocol/SmartCardReader.h | 79 +- MdePkg/Include/Protocol/Smbios.h | 148 +-- MdePkg/Include/Protocol/SmbusHc.h | 26 +- MdePkg/Include/Protocol/SmmAccess2.h | 7 +- MdePkg/Include/Protocol/SmmBase2.h | 9 +- MdePkg/Include/Protocol/SmmCommunication.h | 6 +- MdePkg/Include/Protocol/SmmConfiguration.h | 11 +- MdePkg/Include/Protocol/SmmControl2.h | 7 +- MdePkg/Include/Protocol/SmmCpu.h | 27 +- MdePkg/Include/Protocol/SmmCpuIo2.h | 16 +- MdePkg/Include/Protocol/SmmEndOfDxe.h | 4 +- MdePkg/Include/Protocol/SmmGpiDispatch2.h | 9 +- MdePkg/Include/Protocol/SmmIoTrapDispatch2.h | 5 +- MdePkg/Include/Protocol/SmmPciRootBridgeIo.h | 7 +- .../Include/Protocol/SmmPeriodicTimerDispatch2.h | 17 +- MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h | 5 +- MdePkg/Include/Protocol/SmmReadyToLock.h | 4 +- .../Include/Protocol/SmmReportStatusCodeHandler.h | 4 +- .../Include/Protocol/SmmStandbyButtonDispatch2.h | 5 +- MdePkg/Include/Protocol/SmmStatusCode.h | 7 +- MdePkg/Include/Protocol/SmmSwDispatch2.h | 22 +- MdePkg/Include/Protocol/SmmSxDispatch2.h | 6 +- MdePkg/Include/Protocol/SmmUsbDispatch2.h | 5 +- MdePkg/Include/Protocol/SpiConfiguration.h | 56 +- MdePkg/Include/Protocol/SpiHc.h | 20 +- MdePkg/Include/Protocol/SpiIo.h | 38 +- MdePkg/Include/Protocol/SpiNorFlash.h | 36 +- MdePkg/Include/Protocol/SpiSmmConfiguration.h | 4 +- MdePkg/Include/Protocol/SpiSmmHc.h | 4 +- MdePkg/Include/Protocol/SpiSmmNorFlash.h | 4 +- MdePkg/Include/Protocol/StatusCode.h | 4 +- MdePkg/Include/Protocol/StorageSecurityCommand.h | 12 +- MdePkg/Include/Protocol/SuperIo.h | 26 +- MdePkg/Include/Protocol/SuperIoControl.h | 12 +- MdePkg/Include/Protocol/Supplicant.h | 48 +- MdePkg/Include/Protocol/TapeIo.h | 52 +- MdePkg/Include/Protocol/Tcg2Protocol.h | 96 +- MdePkg/Include/Protocol/TcgService.h | 26 +- MdePkg/Include/Protocol/Tcp4.h | 142 ++- MdePkg/Include/Protocol/Tcp6.h | 136 ++- MdePkg/Include/Protocol/Timer.h | 15 +- MdePkg/Include/Protocol/Timestamp.h | 16 +- MdePkg/Include/Protocol/Tls.h | 77 +- MdePkg/Include/Protocol/TlsConfig.h | 10 +- MdePkg/Include/Protocol/TrEEProtocol.h | 60 +- MdePkg/Include/Protocol/Udp4.h | 94 +- MdePkg/Include/Protocol/Udp6.h | 80 +- MdePkg/Include/Protocol/UfsDeviceConfig.h | 10 +- MdePkg/Include/Protocol/UgaDraw.h | 25 +- MdePkg/Include/Protocol/UgaIo.h | 70 +- MdePkg/Include/Protocol/UnicodeCollation.h | 28 +- MdePkg/Include/Protocol/Usb2HostController.h | 89 +- MdePkg/Include/Protocol/UsbFunctionIo.h | 137 ++- MdePkg/Include/Protocol/UsbHostController.h | 33 +- MdePkg/Include/Protocol/UsbIo.h | 61 +- MdePkg/Include/Protocol/UserCredential.h | 30 +- MdePkg/Include/Protocol/UserCredential2.h | 38 +- MdePkg/Include/Protocol/UserManager.h | 170 ++-- MdePkg/Include/Protocol/Variable.h | 2 +- MdePkg/Include/Protocol/VariableWrite.h | 2 +- MdePkg/Include/Protocol/VlanConfig.h | 15 +- MdePkg/Include/Protocol/WatchdogTimer.h | 12 +- MdePkg/Include/Protocol/WiFi.h | 284 +++--- MdePkg/Include/Protocol/WiFi2.h | 78 +- 253 files changed, 6026 insertions(+), 6409 deletions(-) (limited to 'MdePkg/Include/Protocol') diff --git a/MdePkg/Include/Protocol/AbsolutePointer.h b/MdePkg/Include/Protocol/AbsolutePointer.h index d59ac975da..4928e8f12a 100644 --- a/MdePkg/Include/Protocol/AbsolutePointer.h +++ b/MdePkg/Include/Protocol/AbsolutePointer.h @@ -13,18 +13,14 @@ #ifndef __ABSOLUTE_POINTER_H__ #define __ABSOLUTE_POINTER_H__ - #define EFI_ABSOLUTE_POINTER_PROTOCOL_GUID \ { 0x8D59D32B, 0xC655, 0x4AE9, { 0x9B, 0x15, 0xF2, 0x59, 0x04, 0x99, 0x2A, 0x43 } } - typedef struct _EFI_ABSOLUTE_POINTER_PROTOCOL EFI_ABSOLUTE_POINTER_PROTOCOL; - -//******************************************************* +// ******************************************************* // EFI_ABSOLUTE_POINTER_MODE -//******************************************************* - +// ******************************************************* /** The following data values in the EFI_ABSOLUTE_POINTER_MODE @@ -32,31 +28,30 @@ typedef struct _EFI_ABSOLUTE_POINTER_PROTOCOL EFI_ABSOLUTE_POINTER_PROTOCOL; interface functions. **/ typedef struct { - UINT64 AbsoluteMinX; ///< The Absolute Minimum of the device on the x-axis - UINT64 AbsoluteMinY; ///< The Absolute Minimum of the device on the y axis. - UINT64 AbsoluteMinZ; ///< The Absolute Minimum of the device on the z-axis - UINT64 AbsoluteMaxX; ///< The Absolute Maximum of the device on the x-axis. If 0, and the - ///< AbsoluteMinX is 0, then the pointer device does not support a xaxis - UINT64 AbsoluteMaxY; ///< The Absolute Maximum of the device on the y -axis. If 0, and the - ///< AbsoluteMinX is 0, then the pointer device does not support a yaxis. - UINT64 AbsoluteMaxZ; ///< The Absolute Maximum of the device on the z-axis. If 0 , and the - ///< AbsoluteMinX is 0, then the pointer device does not support a zaxis - UINT32 Attributes; ///< The following bits are set as needed (or'd together) to indicate the - ///< capabilities of the device supported. The remaining bits are undefined - ///< and should be 0 + UINT64 AbsoluteMinX; ///< The Absolute Minimum of the device on the x-axis + UINT64 AbsoluteMinY; ///< The Absolute Minimum of the device on the y axis. + UINT64 AbsoluteMinZ; ///< The Absolute Minimum of the device on the z-axis + UINT64 AbsoluteMaxX; ///< The Absolute Maximum of the device on the x-axis. If 0, and the + ///< AbsoluteMinX is 0, then the pointer device does not support a xaxis + UINT64 AbsoluteMaxY; ///< The Absolute Maximum of the device on the y -axis. If 0, and the + ///< AbsoluteMinX is 0, then the pointer device does not support a yaxis. + UINT64 AbsoluteMaxZ; ///< The Absolute Maximum of the device on the z-axis. If 0 , and the + ///< AbsoluteMinX is 0, then the pointer device does not support a zaxis + UINT32 Attributes; ///< The following bits are set as needed (or'd together) to indicate the + ///< capabilities of the device supported. The remaining bits are undefined + ///< and should be 0 } EFI_ABSOLUTE_POINTER_MODE; /// /// If set, indicates this device supports an alternate button input. /// -#define EFI_ABSP_SupportsAltActive 0x00000001 +#define EFI_ABSP_SupportsAltActive 0x00000001 /// /// If set, indicates this device returns pressure data in parameter CurrentZ. /// #define EFI_ABSP_SupportsPressureAsZ 0x00000002 - /** This function resets the pointer device hardware. As part of initialization process, the firmware/device will make a quick @@ -87,7 +82,7 @@ EFI_STATUS (EFIAPI *EFI_ABSOLUTE_POINTER_RESET)( IN EFI_ABSOLUTE_POINTER_PROTOCOL *This, IN BOOLEAN ExtendedVerification -); + ); /// /// This bit is set if the touch sensor is active. @@ -97,8 +92,7 @@ EFI_STATUS /// /// This bit is set if the alt sensor, such as pen-side button, is active /// -#define EFI_ABS_AltActive 0x00000002 - +#define EFI_ABS_AltActive 0x00000002 /** Definition of EFI_ABSOLUTE_POINTER_STATE. @@ -110,7 +104,7 @@ typedef struct { /// both 0, then this pointer device does not support an x-axis, and this field /// must be ignored. /// - UINT64 CurrentX; + UINT64 CurrentX; /// /// The unsigned position of the activation on the y axis. If the AboluteMinY @@ -118,7 +112,7 @@ typedef struct { /// both 0, then this pointer device does not support an y-axis, and this field /// must be ignored. /// - UINT64 CurrentY; + UINT64 CurrentY; /// /// The unsigned position of the activation on the z axis, or the pressure @@ -126,13 +120,13 @@ typedef struct { /// EFI_ABSOLUTE_POINTER_MODE structure are both 0, then this pointer device /// does not support an z-axis, and this field must be ignored. /// - UINT64 CurrentZ; + UINT64 CurrentZ; /// /// Bits are set to 1 in this structure item to indicate that device buttons are /// active. /// - UINT32 ActiveButtons; + UINT32 ActiveButtons; } EFI_ABSOLUTE_POINTER_STATE; /** @@ -170,8 +164,7 @@ EFI_STATUS (EFIAPI *EFI_ABSOLUTE_POINTER_GET_STATE)( IN EFI_ABSOLUTE_POINTER_PROTOCOL *This, OUT EFI_ABSOLUTE_POINTER_STATE *State -); - + ); /// /// The EFI_ABSOLUTE_POINTER_PROTOCOL provides a set of services @@ -182,21 +175,18 @@ EFI_STATUS /// device. The service also provides certain data items describing the device. /// struct _EFI_ABSOLUTE_POINTER_PROTOCOL { - EFI_ABSOLUTE_POINTER_RESET Reset; - EFI_ABSOLUTE_POINTER_GET_STATE GetState; + EFI_ABSOLUTE_POINTER_RESET Reset; + EFI_ABSOLUTE_POINTER_GET_STATE GetState; /// /// Event to use with WaitForEvent() to wait for input from the pointer device. /// - EFI_EVENT WaitForInput; + EFI_EVENT WaitForInput; /// /// Pointer to EFI_ABSOLUTE_POINTER_MODE data. /// - EFI_ABSOLUTE_POINTER_MODE *Mode; + EFI_ABSOLUTE_POINTER_MODE *Mode; }; - -extern EFI_GUID gEfiAbsolutePointerProtocolGuid; - +extern EFI_GUID gEfiAbsolutePointerProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h b/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h index a8e0b24c6c..9e134200da 100644 --- a/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h +++ b/MdePkg/Include/Protocol/AcpiSystemDescriptionTable.h @@ -18,12 +18,12 @@ typedef UINT32 EFI_ACPI_TABLE_VERSION; typedef VOID *EFI_ACPI_HANDLE; -#define EFI_ACPI_TABLE_VERSION_NONE (1 << 0) -#define EFI_ACPI_TABLE_VERSION_1_0B (1 << 1) -#define EFI_ACPI_TABLE_VERSION_2_0 (1 << 2) -#define EFI_ACPI_TABLE_VERSION_3_0 (1 << 3) -#define EFI_ACPI_TABLE_VERSION_4_0 (1 << 4) -#define EFI_ACPI_TABLE_VERSION_5_0 (1 << 5) +#define EFI_ACPI_TABLE_VERSION_NONE (1 << 0) +#define EFI_ACPI_TABLE_VERSION_1_0B (1 << 1) +#define EFI_ACPI_TABLE_VERSION_2_0 (1 << 2) +#define EFI_ACPI_TABLE_VERSION_3_0 (1 << 3) +#define EFI_ACPI_TABLE_VERSION_4_0 (1 << 4) +#define EFI_ACPI_TABLE_VERSION_5_0 (1 << 5) typedef UINT32 EFI_ACPI_DATA_TYPE; #define EFI_ACPI_DATA_TYPE_NONE 0 @@ -52,7 +52,7 @@ EFI_STATUS IN EFI_ACPI_SDT_HEADER *Table, ///< A pointer to the ACPI table header. IN EFI_ACPI_TABLE_VERSION Version, ///< The ACPI table's version. IN UINTN TableKey ///< The table key for this ACPI table. -); + ); /** Returns a requested ACPI table. @@ -87,7 +87,7 @@ EFI_STATUS OUT EFI_ACPI_SDT_HEADER **Table, OUT EFI_ACPI_TABLE_VERSION *Version, OUT UINTN *TableKey -); + ); /** Register or unregister a callback when an ACPI table is installed. @@ -108,7 +108,7 @@ EFI_STATUS (EFIAPI *EFI_ACPI_REGISTER_NOTIFY)( IN BOOLEAN Register, IN EFI_ACPI_NOTIFICATION_FN Notification -); + ); /** Create a handle from an ACPI opcode @@ -126,7 +126,7 @@ EFI_STATUS (EFIAPI *EFI_ACPI_OPEN)( IN VOID *Buffer, OUT EFI_ACPI_HANDLE *Handle -); + ); /** Create a handle for the first ACPI opcode in an ACPI system description table. @@ -142,7 +142,7 @@ EFI_STATUS (EFIAPI *EFI_ACPI_OPEN_SDT)( IN UINTN TableKey, OUT EFI_ACPI_HANDLE *Handle -); + ); /** Close an ACPI handle. @@ -156,7 +156,7 @@ typedef EFI_STATUS (EFIAPI *EFI_ACPI_CLOSE)( IN EFI_ACPI_HANDLE Handle -); + ); /** Return the child ACPI objects. @@ -174,7 +174,7 @@ EFI_STATUS (EFIAPI *EFI_ACPI_GET_CHILD)( IN EFI_ACPI_HANDLE ParentHandle, IN OUT EFI_ACPI_HANDLE *Handle -); + ); /** Retrieve information about an ACPI object. @@ -197,7 +197,7 @@ EFI_STATUS OUT EFI_ACPI_DATA_TYPE *DataType, OUT CONST VOID **Data, OUT UINTN *DataSize -); + ); /** Change information about an ACPI object. @@ -221,7 +221,7 @@ EFI_STATUS IN UINTN Index, IN CONST VOID *Data, IN UINTN DataSize -); + ); /** Returns the handle of the ACPI object representing the specified ACPI path @@ -240,24 +240,24 @@ EFI_STATUS IN EFI_ACPI_HANDLE HandleIn, IN VOID *AcpiPath, OUT EFI_ACPI_HANDLE *HandleOut -); + ); typedef struct _EFI_ACPI_SDT_PROTOCOL { /// /// A bit map containing all the ACPI versions supported by this protocol. /// - EFI_ACPI_TABLE_VERSION AcpiVersion; - EFI_ACPI_GET_ACPI_TABLE2 GetAcpiTable; - EFI_ACPI_REGISTER_NOTIFY RegisterNotify; - EFI_ACPI_OPEN Open; - EFI_ACPI_OPEN_SDT OpenSdt; - EFI_ACPI_CLOSE Close; - EFI_ACPI_GET_CHILD GetChild; - EFI_ACPI_GET_OPTION GetOption; - EFI_ACPI_SET_OPTION SetOption; - EFI_ACPI_FIND_PATH FindPath; + EFI_ACPI_TABLE_VERSION AcpiVersion; + EFI_ACPI_GET_ACPI_TABLE2 GetAcpiTable; + EFI_ACPI_REGISTER_NOTIFY RegisterNotify; + EFI_ACPI_OPEN Open; + EFI_ACPI_OPEN_SDT OpenSdt; + EFI_ACPI_CLOSE Close; + EFI_ACPI_GET_CHILD GetChild; + EFI_ACPI_GET_OPTION GetOption; + EFI_ACPI_SET_OPTION SetOption; + EFI_ACPI_FIND_PATH FindPath; } EFI_ACPI_SDT_PROTOCOL; -extern EFI_GUID gEfiAcpiSdtProtocolGuid; +extern EFI_GUID gEfiAcpiSdtProtocolGuid; #endif // __ACPI_SYSTEM_DESCRIPTION_TABLE_H___ diff --git a/MdePkg/Include/Protocol/AcpiTable.h b/MdePkg/Include/Protocol/AcpiTable.h index 98680c0704..3c4f0d23bc 100644 --- a/MdePkg/Include/Protocol/AcpiTable.h +++ b/MdePkg/Include/Protocol/AcpiTable.h @@ -16,7 +16,6 @@ #define EFI_ACPI_TABLE_PROTOCOL_GUID \ { 0xffe06bdd, 0x6107, 0x46a6, { 0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c }} - typedef struct _EFI_ACPI_TABLE_PROTOCOL EFI_ACPI_TABLE_PROTOCOL; /** @@ -75,8 +74,7 @@ EFI_STATUS IN VOID *AcpiTableBuffer, IN UINTN AcpiTableBufferSize, OUT UINTN *TableKey -); - + ); /** @@ -107,18 +105,17 @@ EFI_STATUS (EFIAPI *EFI_ACPI_TABLE_UNINSTALL_ACPI_TABLE)( IN EFI_ACPI_TABLE_PROTOCOL *This, IN UINTN TableKey -); + ); /// /// The EFI_ACPI_TABLE_PROTOCOL provides the ability for a component /// to install and uninstall ACPI tables from a platform. /// struct _EFI_ACPI_TABLE_PROTOCOL { - EFI_ACPI_TABLE_INSTALL_ACPI_TABLE InstallAcpiTable; - EFI_ACPI_TABLE_UNINSTALL_ACPI_TABLE UninstallAcpiTable; + EFI_ACPI_TABLE_INSTALL_ACPI_TABLE InstallAcpiTable; + EFI_ACPI_TABLE_UNINSTALL_ACPI_TABLE UninstallAcpiTable; }; -extern EFI_GUID gEfiAcpiTableProtocolGuid; +extern EFI_GUID gEfiAcpiTableProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/AdapterInformation.h b/MdePkg/Include/Protocol/AdapterInformation.h index 3fd0b9a4f0..ed19e5736c 100644 --- a/MdePkg/Include/Protocol/AdapterInformation.h +++ b/MdePkg/Include/Protocol/AdapterInformation.h @@ -14,7 +14,6 @@ #ifndef __EFI_ADAPTER_INFORMATION_PROTOCOL_H__ #define __EFI_ADAPTER_INFORMATION_PROTOCOL_H__ - #define EFI_ADAPTER_INFORMATION_PROTOCOL_GUID \ { \ 0xE5DD1403, 0xD622, 0xC24E, {0x84, 0x88, 0xC7, 0x1B, 0x17, 0xF5, 0xE8, 0x02 } \ @@ -45,7 +44,6 @@ 0x8484472f, 0x71ec, 0x411a, { 0xb3, 0x9c, 0x62, 0xcd, 0x94, 0xd9, 0x91, 0x6e } \ } - typedef struct _EFI_ADAPTER_INFORMATION_PROTOCOL EFI_ADAPTER_INFORMATION_PROTOCOL; /// @@ -58,7 +56,7 @@ typedef struct { /// There was media attached to the network adapter, but it was removed and reattached. EFI_NO_MEDIA: There is /// not any media attached to the network. /// - EFI_STATUS MediaState; + EFI_STATUS MediaState; } EFI_ADAPTER_INFO_MEDIA_STATE; /// @@ -71,7 +69,7 @@ typedef struct { /// 2: Ethernet Wireless Network Adapter /// 3~255: Reserved /// - UINT8 MediaType; + UINT8 MediaType; } EFI_ADAPTER_INFO_MEDIA_TYPE; /// @@ -81,39 +79,39 @@ typedef struct { /// /// TRUE if the adapter supports booting from iSCSI IPv4 targets. /// - BOOLEAN iScsiIpv4BootCapablity; + BOOLEAN iScsiIpv4BootCapablity; /// /// TRUE if the adapter supports booting from iSCSI IPv6 targets. /// - BOOLEAN iScsiIpv6BootCapablity; + BOOLEAN iScsiIpv6BootCapablity; /// /// TRUE if the adapter supports booting from FCoE targets. /// - BOOLEAN FCoeBootCapablity; + BOOLEAN FCoeBootCapablity; /// /// TRUE if the adapter supports an offload engine (such as TCP /// Offload Engine (TOE)) for its iSCSI or FCoE boot operations. /// - BOOLEAN OffloadCapability; + BOOLEAN OffloadCapability; /// /// TRUE if the adapter supports multipath I/O (MPIO) for its iSCSI /// boot operations. /// - BOOLEAN iScsiMpioCapability; + BOOLEAN iScsiMpioCapability; /// /// TRUE if the adapter is currently configured to boot from iSCSI /// IPv4 targets. /// - BOOLEAN iScsiIpv4Boot; + BOOLEAN iScsiIpv4Boot; /// /// TRUE if the adapter is currently configured to boot from iSCSI /// IPv6 targets. /// - BOOLEAN iScsiIpv6Boot; + BOOLEAN iScsiIpv6Boot; /// /// TRUE if the adapter is currently configured to boot from FCoE targets. /// - BOOLEAN FCoeBoot; + BOOLEAN FCoeBoot; } EFI_ADAPTER_INFO_NETWORK_BOOT; /// @@ -124,7 +122,7 @@ typedef struct { /// Returns the SAN MAC address for the adapter.For adapters that support today's 802.3 ethernet /// networking and Fibre-Channel Over Ethernet (FCOE), this conveys the FCOE SAN MAC address from the adapter. /// - EFI_MAC_ADDRESS SanMacAddress; + EFI_MAC_ADDRESS SanMacAddress; } EFI_ADAPTER_INFO_SAN_MAC_ADDRESS; /// @@ -134,7 +132,7 @@ typedef struct { /// /// Returns capability of UNDI to support IPv6 traffic. /// - BOOLEAN Ipv6Support; + BOOLEAN Ipv6Support; } EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT; /** @@ -236,19 +234,19 @@ EFI_STATUS /// - Gets a list of supported information types for this instance of the protocol. /// struct _EFI_ADAPTER_INFORMATION_PROTOCOL { - EFI_ADAPTER_INFO_GET_INFO GetInformation; - EFI_ADAPTER_INFO_SET_INFO SetInformation; - EFI_ADAPTER_INFO_GET_SUPPORTED_TYPES GetSupportedTypes; + EFI_ADAPTER_INFO_GET_INFO GetInformation; + EFI_ADAPTER_INFO_SET_INFO SetInformation; + EFI_ADAPTER_INFO_GET_SUPPORTED_TYPES GetSupportedTypes; }; -extern EFI_GUID gEfiAdapterInformationProtocolGuid; +extern EFI_GUID gEfiAdapterInformationProtocolGuid; -extern EFI_GUID gEfiAdapterInfoMediaStateGuid; +extern EFI_GUID gEfiAdapterInfoMediaStateGuid; -extern EFI_GUID gEfiAdapterInfoNetworkBootGuid; +extern EFI_GUID gEfiAdapterInfoNetworkBootGuid; -extern EFI_GUID gEfiAdapterInfoSanMacAddressGuid; +extern EFI_GUID gEfiAdapterInfoSanMacAddressGuid; -extern EFI_GUID gEfiAdapterInfoUndiIpv6SupportGuid; +extern EFI_GUID gEfiAdapterInfoUndiIpv6SupportGuid; #endif diff --git a/MdePkg/Include/Protocol/Arp.h b/MdePkg/Include/Protocol/Arp.h index ff2cfac089..168a2d1920 100644 --- a/MdePkg/Include/Protocol/Arp.h +++ b/MdePkg/Include/Protocol/Arp.h @@ -34,51 +34,51 @@ typedef struct { /// /// Length in bytes of this entry. /// - UINT32 Size; + UINT32 Size; /// /// Set to TRUE if this entry is a "deny" entry. /// Set to FALSE if this entry is a "normal" entry. /// - BOOLEAN DenyFlag; + BOOLEAN DenyFlag; /// /// Set to TRUE if this entry will not time out. /// Set to FALSE if this entry will time out. /// - BOOLEAN StaticFlag; + BOOLEAN StaticFlag; /// /// 16-bit ARP hardware identifier number. /// - UINT16 HwAddressType; + UINT16 HwAddressType; /// /// 16-bit protocol type number. /// - UINT16 SwAddressType; + UINT16 SwAddressType; /// /// The length of the hardware address. /// - UINT8 HwAddressLength; + UINT8 HwAddressLength; /// /// The length of the protocol address. /// - UINT8 SwAddressLength; + UINT8 SwAddressLength; } EFI_ARP_FIND_DATA; typedef struct { /// /// 16-bit protocol type number in host byte order. /// - UINT16 SwAddressType; + UINT16 SwAddressType; /// /// The length in bytes of the station's protocol address to register. /// - UINT8 SwAddressLength; + UINT8 SwAddressLength; /// /// The pointer to the first byte of the protocol address to register. For @@ -86,30 +86,29 @@ typedef struct { /// StationAddress points to the first byte of this station's IP /// address stored in network byte order. /// - VOID *StationAddress; + VOID *StationAddress; /// /// The timeout value in 100-ns units that is associated with each /// new dynamic ARP cache entry. If it is set to zero, the value is /// implementation-specific. /// - UINT32 EntryTimeOut; + UINT32 EntryTimeOut; /// /// The number of retries before a MAC address is resolved. If it is /// set to zero, the value is implementation-specific. /// - UINT32 RetryCount; + UINT32 RetryCount; /// /// The timeout value in 100-ns units that is used to wait for the ARP /// reply packet or the timeout value between two retries. Set to zero /// to use implementation-specific value. /// - UINT32 RetryTimeOut; + UINT32 RetryTimeOut; } EFI_ARP_CONFIG_DATA; - /** This function is used to assign a station address to the ARP cache for this instance of the ARP driver. @@ -247,7 +246,6 @@ EFI_STATUS IN BOOLEAN Refresh ); - /** This function removes specified ARP cache entries. @@ -363,17 +361,16 @@ EFI_STATUS /// network hardware addresses. /// struct _EFI_ARP_PROTOCOL { - EFI_ARP_CONFIGURE Configure; - EFI_ARP_ADD Add; - EFI_ARP_FIND Find; - EFI_ARP_DELETE Delete; - EFI_ARP_FLUSH Flush; - EFI_ARP_REQUEST Request; - EFI_ARP_CANCEL Cancel; + EFI_ARP_CONFIGURE Configure; + EFI_ARP_ADD Add; + EFI_ARP_FIND Find; + EFI_ARP_DELETE Delete; + EFI_ARP_FLUSH Flush; + EFI_ARP_REQUEST Request; + EFI_ARP_CANCEL Cancel; }; - -extern EFI_GUID gEfiArpServiceBindingProtocolGuid; -extern EFI_GUID gEfiArpProtocolGuid; +extern EFI_GUID gEfiArpServiceBindingProtocolGuid; +extern EFI_GUID gEfiArpProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/AtaPassThru.h b/MdePkg/Include/Protocol/AtaPassThru.h index 888dff2d73..33d0e21b84 100644 --- a/MdePkg/Include/Protocol/AtaPassThru.h +++ b/MdePkg/Include/Protocol/AtaPassThru.h @@ -22,89 +22,88 @@ typedef struct _EFI_ATA_PASS_THRU_PROTOCOL EFI_ATA_PASS_THRU_PROTOCOL; typedef struct { - UINT32 Attributes; - UINT32 IoAlign; + UINT32 Attributes; + UINT32 IoAlign; } EFI_ATA_PASS_THRU_MODE; /// /// If this bit is set, then the EFI_ATA_PASS_THRU_PROTOCOL interface is for physical /// devices on the ATA controller. /// -#define EFI_ATA_PASS_THRU_ATTRIBUTES_PHYSICAL 0x0001 +#define EFI_ATA_PASS_THRU_ATTRIBUTES_PHYSICAL 0x0001 /// /// If this bit is set, then the EFI_ATA_PASS_THRU_PROTOCOL interface is for logical /// devices on the ATA controller. /// -#define EFI_ATA_PASS_THRU_ATTRIBUTES_LOGICAL 0x0002 +#define EFI_ATA_PASS_THRU_ATTRIBUTES_LOGICAL 0x0002 /// /// If this bit is set, then the EFI_ATA_PASS_THRU_PROTOCOL interface supports non blocking /// I/O. Every EFI_ATA_PASS_THRU_PROTOCOL must support blocking I/O. The support of non-blocking /// I/O is optional. /// -#define EFI_ATA_PASS_THRU_ATTRIBUTES_NONBLOCKIO 0x0004 +#define EFI_ATA_PASS_THRU_ATTRIBUTES_NONBLOCKIO 0x0004 typedef struct _EFI_ATA_COMMAND_BLOCK { - UINT8 Reserved1[2]; - UINT8 AtaCommand; - UINT8 AtaFeatures; - UINT8 AtaSectorNumber; - UINT8 AtaCylinderLow; - UINT8 AtaCylinderHigh; - UINT8 AtaDeviceHead; - UINT8 AtaSectorNumberExp; - UINT8 AtaCylinderLowExp; - UINT8 AtaCylinderHighExp; - UINT8 AtaFeaturesExp; - UINT8 AtaSectorCount; - UINT8 AtaSectorCountExp; - UINT8 Reserved2[6]; + UINT8 Reserved1[2]; + UINT8 AtaCommand; + UINT8 AtaFeatures; + UINT8 AtaSectorNumber; + UINT8 AtaCylinderLow; + UINT8 AtaCylinderHigh; + UINT8 AtaDeviceHead; + UINT8 AtaSectorNumberExp; + UINT8 AtaCylinderLowExp; + UINT8 AtaCylinderHighExp; + UINT8 AtaFeaturesExp; + UINT8 AtaSectorCount; + UINT8 AtaSectorCountExp; + UINT8 Reserved2[6]; } EFI_ATA_COMMAND_BLOCK; typedef struct _EFI_ATA_STATUS_BLOCK { - UINT8 Reserved1[2]; - UINT8 AtaStatus; - UINT8 AtaError; - UINT8 AtaSectorNumber; - UINT8 AtaCylinderLow; - UINT8 AtaCylinderHigh; - UINT8 AtaDeviceHead; - UINT8 AtaSectorNumberExp; - UINT8 AtaCylinderLowExp; - UINT8 AtaCylinderHighExp; - UINT8 Reserved2; - UINT8 AtaSectorCount; - UINT8 AtaSectorCountExp; - UINT8 Reserved3[6]; + UINT8 Reserved1[2]; + UINT8 AtaStatus; + UINT8 AtaError; + UINT8 AtaSectorNumber; + UINT8 AtaCylinderLow; + UINT8 AtaCylinderHigh; + UINT8 AtaDeviceHead; + UINT8 AtaSectorNumberExp; + UINT8 AtaCylinderLowExp; + UINT8 AtaCylinderHighExp; + UINT8 Reserved2; + UINT8 AtaSectorCount; + UINT8 AtaSectorCountExp; + UINT8 Reserved3[6]; } EFI_ATA_STATUS_BLOCK; typedef UINT8 EFI_ATA_PASS_THRU_CMD_PROTOCOL; -#define EFI_ATA_PASS_THRU_PROTOCOL_ATA_HARDWARE_RESET 0x00 -#define EFI_ATA_PASS_THRU_PROTOCOL_ATA_SOFTWARE_RESET 0x01 -#define EFI_ATA_PASS_THRU_PROTOCOL_ATA_NON_DATA 0x02 -#define EFI_ATA_PASS_THRU_PROTOCOL_PIO_DATA_IN 0x04 -#define EFI_ATA_PASS_THRU_PROTOCOL_PIO_DATA_OUT 0x05 -#define EFI_ATA_PASS_THRU_PROTOCOL_DMA 0x06 -#define EFI_ATA_PASS_THRU_PROTOCOL_DMA_QUEUED 0x07 -#define EFI_ATA_PASS_THRU_PROTOCOL_DEVICE_DIAGNOSTIC 0x08 -#define EFI_ATA_PASS_THRU_PROTOCOL_DEVICE_RESET 0x09 -#define EFI_ATA_PASS_THRU_PROTOCOL_UDMA_DATA_IN 0x0A -#define EFI_ATA_PASS_THRU_PROTOCOL_UDMA_DATA_OUT 0x0B -#define EFI_ATA_PASS_THRU_PROTOCOL_FPDMA 0x0C -#define EFI_ATA_PASS_THRU_PROTOCOL_RETURN_RESPONSE 0xFF +#define EFI_ATA_PASS_THRU_PROTOCOL_ATA_HARDWARE_RESET 0x00 +#define EFI_ATA_PASS_THRU_PROTOCOL_ATA_SOFTWARE_RESET 0x01 +#define EFI_ATA_PASS_THRU_PROTOCOL_ATA_NON_DATA 0x02 +#define EFI_ATA_PASS_THRU_PROTOCOL_PIO_DATA_IN 0x04 +#define EFI_ATA_PASS_THRU_PROTOCOL_PIO_DATA_OUT 0x05 +#define EFI_ATA_PASS_THRU_PROTOCOL_DMA 0x06 +#define EFI_ATA_PASS_THRU_PROTOCOL_DMA_QUEUED 0x07 +#define EFI_ATA_PASS_THRU_PROTOCOL_DEVICE_DIAGNOSTIC 0x08 +#define EFI_ATA_PASS_THRU_PROTOCOL_DEVICE_RESET 0x09 +#define EFI_ATA_PASS_THRU_PROTOCOL_UDMA_DATA_IN 0x0A +#define EFI_ATA_PASS_THRU_PROTOCOL_UDMA_DATA_OUT 0x0B +#define EFI_ATA_PASS_THRU_PROTOCOL_FPDMA 0x0C +#define EFI_ATA_PASS_THRU_PROTOCOL_RETURN_RESPONSE 0xFF typedef UINT8 EFI_ATA_PASS_THRU_LENGTH; -#define EFI_ATA_PASS_THRU_LENGTH_BYTES 0x80 +#define EFI_ATA_PASS_THRU_LENGTH_BYTES 0x80 +#define EFI_ATA_PASS_THRU_LENGTH_MASK 0x70 +#define EFI_ATA_PASS_THRU_LENGTH_NO_DATA_TRANSFER 0x00 +#define EFI_ATA_PASS_THRU_LENGTH_FEATURES 0x10 +#define EFI_ATA_PASS_THRU_LENGTH_SECTOR_COUNT 0x20 +#define EFI_ATA_PASS_THRU_LENGTH_TPSIU 0x30 -#define EFI_ATA_PASS_THRU_LENGTH_MASK 0x70 -#define EFI_ATA_PASS_THRU_LENGTH_NO_DATA_TRANSFER 0x00 -#define EFI_ATA_PASS_THRU_LENGTH_FEATURES 0x10 -#define EFI_ATA_PASS_THRU_LENGTH_SECTOR_COUNT 0x20 -#define EFI_ATA_PASS_THRU_LENGTH_TPSIU 0x30 - -#define EFI_ATA_PASS_THRU_LENGTH_COUNT 0x0F +#define EFI_ATA_PASS_THRU_LENGTH_COUNT 0x0F typedef struct { /// @@ -112,12 +111,12 @@ typedef struct { /// command. It must be aligned to the boundary specified in the IoAlign field /// in the EFI_ATA_PASS_THRU_MODE structure. /// - EFI_ATA_STATUS_BLOCK *Asb; + EFI_ATA_STATUS_BLOCK *Asb; /// /// A pointer to buffer that contains the Command Data Block to send to the ATA /// device specified by Port and PortMultiplierPort. /// - EFI_ATA_COMMAND_BLOCK *Acb; + EFI_ATA_COMMAND_BLOCK *Acb; /// /// The timeout, in 100 ns units, to use for the execution of this ATA command. /// A Timeout value of 0 means that this function will wait indefinitely for the @@ -125,7 +124,7 @@ typedef struct { /// will return EFI_TIMEOUT if the time required to execute the ATA command is /// greater than Timeout. /// - UINT64 Timeout; + UINT64 Timeout; /// /// A pointer to the data buffer to transfer between the ATA controller and the /// ATA device for read and bidirectional commands. For all write and non data @@ -133,7 +132,7 @@ typedef struct { /// If this field is not NULL, then it must be aligned on the boundary specified /// by the IoAlign field in the EFI_ATA_PASS_THRU_MODE structure. /// - VOID *InDataBuffer; + VOID *InDataBuffer; /// /// A pointer to the data buffer to transfer between the ATA controller and the /// ATA device for write or bidirectional commands. For all read and non data @@ -141,7 +140,7 @@ typedef struct { /// If this field is not NULL, then it must be aligned on the boundary specified /// by the IoAlign field in the EFI_ATA_PASS_THRU_MODE structure. /// - VOID *OutDataBuffer; + VOID *OutDataBuffer; /// /// On input, the size, in bytes, of InDataBuffer. On output, the number of bytes /// transferred between the ATA controller and the ATA device. If InTransferLength @@ -149,7 +148,7 @@ typedef struct { /// InTransferLength will be updated to contain the number of bytes that the ATA /// controller is able to transfer, and EFI_BAD_BUFFER_SIZE will be returned. /// - UINT32 InTransferLength; + UINT32 InTransferLength; /// /// On Input, the size, in bytes of OutDataBuffer. On Output, the Number of bytes /// transferred between ATA Controller and the ATA device. If OutTransferLength is @@ -157,18 +156,17 @@ typedef struct { /// OutTransferLength will be updated to contain the number of bytes that the ATA /// controller is able to transfer, and EFI_BAD_BUFFER_SIZE will be returned. /// - UINT32 OutTransferLength; + UINT32 OutTransferLength; /// /// Specifies the protocol used when the ATA device executes the command. /// - EFI_ATA_PASS_THRU_CMD_PROTOCOL Protocol; + EFI_ATA_PASS_THRU_CMD_PROTOCOL Protocol; /// /// Specifies the way in which the ATA command length is encoded. /// - EFI_ATA_PASS_THRU_LENGTH Length; + EFI_ATA_PASS_THRU_LENGTH Length; } EFI_ATA_PASS_THRU_COMMAND_PACKET; - /** Sends an ATA command to an ATA device that is attached to the ATA controller. This function supports both blocking I/O and non-blocking I/O. The blocking I/O functionality is required, @@ -453,16 +451,16 @@ EFI_STATUS ); struct _EFI_ATA_PASS_THRU_PROTOCOL { - EFI_ATA_PASS_THRU_MODE *Mode; - EFI_ATA_PASS_THRU_PASSTHRU PassThru; - EFI_ATA_PASS_THRU_GET_NEXT_PORT GetNextPort; - EFI_ATA_PASS_THRU_GET_NEXT_DEVICE GetNextDevice; - EFI_ATA_PASS_THRU_BUILD_DEVICE_PATH BuildDevicePath; - EFI_ATA_PASS_THRU_GET_DEVICE GetDevice; - EFI_ATA_PASS_THRU_RESET_PORT ResetPort; - EFI_ATA_PASS_THRU_RESET_DEVICE ResetDevice; + EFI_ATA_PASS_THRU_MODE *Mode; + EFI_ATA_PASS_THRU_PASSTHRU PassThru; + EFI_ATA_PASS_THRU_GET_NEXT_PORT GetNextPort; + EFI_ATA_PASS_THRU_GET_NEXT_DEVICE GetNextDevice; + EFI_ATA_PASS_THRU_BUILD_DEVICE_PATH BuildDevicePath; + EFI_ATA_PASS_THRU_GET_DEVICE GetDevice; + EFI_ATA_PASS_THRU_RESET_PORT ResetPort; + EFI_ATA_PASS_THRU_RESET_DEVICE ResetDevice; }; -extern EFI_GUID gEfiAtaPassThruProtocolGuid; +extern EFI_GUID gEfiAtaPassThruProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/AuthenticationInfo.h b/MdePkg/Include/Protocol/AuthenticationInfo.h index 07aaa0bc01..b298e2aa6d 100644 --- a/MdePkg/Include/Protocol/AuthenticationInfo.h +++ b/MdePkg/Include/Protocol/AuthenticationInfo.h @@ -33,41 +33,41 @@ typedef struct { /// /// Authentication Type GUID. /// - EFI_GUID Guid; + EFI_GUID Guid; /// /// Length of this structure in bytes. /// - UINT16 Length; + UINT16 Length; } AUTH_NODE_HEADER; typedef struct { - AUTH_NODE_HEADER Header; + AUTH_NODE_HEADER Header; /// /// RADIUS Server IPv4 or IPv6 Address. /// - UINT8 RadiusIpAddr[16]; ///< IPv4 or IPv6 address. + UINT8 RadiusIpAddr[16]; ///< IPv4 or IPv6 address. /// /// Reserved for future use. /// - UINT16 Reserved; + UINT16 Reserved; /// /// Network Access Server IPv4 or IPv6 Address (OPTIONAL). /// - UINT8 NasIpAddr[16]; ///< IPv4 or IPv6 address. + UINT8 NasIpAddr[16]; ///< IPv4 or IPv6 address. /// /// Network Access Server Secret Length in bytes (OPTIONAL). /// - UINT16 NasSecretLength; + UINT16 NasSecretLength; /// /// Network Access Server Secret (OPTIONAL). /// - UINT8 NasSecret[1]; + UINT8 NasSecret[1]; /// /// CHAP Initiator Secret Length in bytes on offset NasSecret + NasSecretLength. @@ -105,22 +105,22 @@ typedef struct { } CHAP_RADIUS_AUTH_NODE; typedef struct { - AUTH_NODE_HEADER Header; + AUTH_NODE_HEADER Header; /// /// Reserved for future use. /// - UINT16 Reserved; + UINT16 Reserved; /// /// User Secret Length in bytes. /// - UINT16 UserSecretLength; + UINT16 UserSecretLength; /// /// User Secret. /// - UINT8 UserSecret[1]; + UINT8 UserSecret[1]; /// /// User Name Length in bytes on offset UserSecret + UserSecretLength. @@ -220,12 +220,12 @@ EFI_STATUS /// information associated with the physical or logical device. /// struct _EFI_AUTHENTICATION_INFO_PROTOCOL { - EFI_AUTHENTICATION_INFO_PROTOCOL_GET Get; - EFI_AUTHENTICATION_INFO_PROTOCOL_SET Set; + EFI_AUTHENTICATION_INFO_PROTOCOL_GET Get; + EFI_AUTHENTICATION_INFO_PROTOCOL_SET Set; }; -extern EFI_GUID gEfiAuthenticationInfoProtocolGuid; -extern EFI_GUID gEfiAuthenticationChapRadiusGuid; -extern EFI_GUID gEfiAuthenticationChapLocalGuid; +extern EFI_GUID gEfiAuthenticationInfoProtocolGuid; +extern EFI_GUID gEfiAuthenticationChapRadiusGuid; +extern EFI_GUID gEfiAuthenticationChapLocalGuid; #endif diff --git a/MdePkg/Include/Protocol/Bds.h b/MdePkg/Include/Protocol/Bds.h index bda2c37c08..ae37173ee9 100644 --- a/MdePkg/Include/Protocol/Bds.h +++ b/MdePkg/Include/Protocol/Bds.h @@ -20,7 +20,7 @@ /// /// Declare forward reference for the BDS Architectural Protocol /// -typedef struct _EFI_BDS_ARCH_PROTOCOL EFI_BDS_ARCH_PROTOCOL; +typedef struct _EFI_BDS_ARCH_PROTOCOL EFI_BDS_ARCH_PROTOCOL; /** This function uses policy data from the platform to determine what operating @@ -58,9 +58,9 @@ VOID /// the boot device can be used to load and invoke an OS or a system utility. /// struct _EFI_BDS_ARCH_PROTOCOL { - EFI_BDS_ENTRY Entry; + EFI_BDS_ENTRY Entry; }; -extern EFI_GUID gEfiBdsArchProtocolGuid; +extern EFI_GUID gEfiBdsArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Bis.h b/MdePkg/Include/Protocol/Bis.h index 2be6718f4b..329084d450 100644 --- a/MdePkg/Include/Protocol/Bis.h +++ b/MdePkg/Include/Protocol/Bis.h @@ -29,32 +29,29 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0xedd35e31, 0x7b9, 0x11d2, { 0x83,0xa3,0x0,0xa0,0xc9,0x1f,0xad,0xcf } \ } - - -typedef struct _EFI_BIS_PROTOCOL EFI_BIS_PROTOCOL; - +typedef struct _EFI_BIS_PROTOCOL EFI_BIS_PROTOCOL; // // Basic types // -typedef VOID *BIS_APPLICATION_HANDLE; -typedef UINT16 BIS_ALG_ID; -typedef UINT32 BIS_CERT_ID; +typedef VOID *BIS_APPLICATION_HANDLE; +typedef UINT16 BIS_ALG_ID; +typedef UINT32 BIS_CERT_ID; /// /// EFI_BIS_DATA instances obtained from BIS must be freed by calling Free( ). /// typedef struct { - UINT32 Length; ///< The length of Data in 8 bit bytes. - UINT8 *Data; ///< 32 Bit Flat Address of data. + UINT32 Length; ///< The length of Data in 8 bit bytes. + UINT8 *Data; ///< 32 Bit Flat Address of data. } EFI_BIS_DATA; /// /// EFI_BIS_VERSION type. /// typedef struct { - UINT32 Major; ///< The major BIS version number. - UINT32 Minor; ///< A minor BIS version number. + UINT32 Major; ///< The major BIS version number. + UINT32 Minor; ///< A minor BIS version number. } EFI_BIS_VERSION; // @@ -63,16 +60,16 @@ typedef struct { // and to interpret results of Initialize. // ----------------------------------------------------// // -#define BIS_CURRENT_VERSION_MAJOR BIS_VERSION_1 -#define BIS_VERSION_1 1 +#define BIS_CURRENT_VERSION_MAJOR BIS_VERSION_1 +#define BIS_VERSION_1 1 /// /// EFI_BIS_SIGNATURE_INFO type. /// typedef struct { - BIS_CERT_ID CertificateID; ///< Truncated hash of platform Boot Object - BIS_ALG_ID AlgorithmID; ///< A signature algorithm number. - UINT16 KeyLength; ///< The length of alg. keys in bits. + BIS_CERT_ID CertificateID; ///< Truncated hash of platform Boot Object + BIS_ALG_ID AlgorithmID; ///< A signature algorithm number. + UINT16 KeyLength; ///< The length of alg. keys in bits. } EFI_BIS_SIGNATURE_INFO; /// @@ -80,13 +77,13 @@ typedef struct { /// The exact numeric values come from the /// "Common Data Security Architecture (CDSA) Specification". /// -#define BIS_ALG_DSA (41) // CSSM_ALGID_DSA -#define BIS_ALG_RSA_MD5 (42) // CSSM_ALGID_MD5_WITH_RSA +#define BIS_ALG_DSA (41) // CSSM_ALGID_DSA +#define BIS_ALG_RSA_MD5 (42) // CSSM_ALGID_MD5_WITH_RSA /// /// values for EFI_BIS_SIGNATURE_INFO.CertificateId. /// -#define BIS_CERT_ID_DSA BIS_ALG_DSA // CSSM_ALGID_DSA -#define BIS_CERT_ID_RSA_MD5 BIS_ALG_RSA_MD5 // CSSM_ALGID_MD5_WITH_RSA +#define BIS_CERT_ID_DSA BIS_ALG_DSA // CSSM_ALGID_DSA +#define BIS_CERT_ID_RSA_MD5 BIS_ALG_RSA_MD5 // CSSM_ALGID_MD5_WITH_RSA /// /// The mask value that gets applied to the truncated hash of a /// platform Boot Object Authorization Certificate to create the certificateID. @@ -102,13 +99,13 @@ typedef struct { /// elements are contained in a EFI_BIS_DATA struct pointed to /// by the provided EFI_BIS_DATA*. /// -#define BIS_GET_SIGINFO_COUNT(BisDataPtr) ((BisDataPtr)->Length / sizeof (EFI_BIS_SIGNATURE_INFO)) +#define BIS_GET_SIGINFO_COUNT(BisDataPtr) ((BisDataPtr)->Length / sizeof (EFI_BIS_SIGNATURE_INFO)) /// /// BIS_GET_SIGINFO_ARRAY - produces a EFI_BIS_SIGNATURE_INFO* /// from a given EFI_BIS_DATA*. /// -#define BIS_GET_SIGINFO_ARRAY(BisDataPtr) ((EFI_BIS_SIGNATURE_INFO *) (BisDataPtr)->Data) +#define BIS_GET_SIGINFO_ARRAY(BisDataPtr) ((EFI_BIS_SIGNATURE_INFO *) (BisDataPtr)->Data) /// /// Support an old name for backward compatibility. @@ -427,19 +424,19 @@ EFI_STATUS /// certificate for the purpose of an integrity and authorization check. /// struct _EFI_BIS_PROTOCOL { - EFI_BIS_INITIALIZE Initialize; - EFI_BIS_SHUTDOWN Shutdown; - EFI_BIS_FREE Free; - EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_CERTIFICATE GetBootObjectAuthorizationCertificate; - EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_CHECKFLAG GetBootObjectAuthorizationCheckFlag; - EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_UPDATE_TOKEN GetBootObjectAuthorizationUpdateToken; - EFI_BIS_GET_SIGNATURE_INFO GetSignatureInfo; - EFI_BIS_UPDATE_BOOT_OBJECT_AUTHORIZATION UpdateBootObjectAuthorization; - EFI_BIS_VERIFY_BOOT_OBJECT VerifyBootObject; - EFI_BIS_VERIFY_OBJECT_WITH_CREDENTIAL VerifyObjectWithCredential; + EFI_BIS_INITIALIZE Initialize; + EFI_BIS_SHUTDOWN Shutdown; + EFI_BIS_FREE Free; + EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_CERTIFICATE GetBootObjectAuthorizationCertificate; + EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_CHECKFLAG GetBootObjectAuthorizationCheckFlag; + EFI_BIS_GET_BOOT_OBJECT_AUTHORIZATION_UPDATE_TOKEN GetBootObjectAuthorizationUpdateToken; + EFI_BIS_GET_SIGNATURE_INFO GetSignatureInfo; + EFI_BIS_UPDATE_BOOT_OBJECT_AUTHORIZATION UpdateBootObjectAuthorization; + EFI_BIS_VERIFY_BOOT_OBJECT VerifyBootObject; + EFI_BIS_VERIFY_OBJECT_WITH_CREDENTIAL VerifyObjectWithCredential; }; -extern EFI_GUID gEfiBisProtocolGuid; -extern EFI_GUID gBootObjectAuthorizationParmsetGuid; +extern EFI_GUID gEfiBisProtocolGuid; +extern EFI_GUID gBootObjectAuthorizationParmsetGuid; #endif diff --git a/MdePkg/Include/Protocol/BlockIo.h b/MdePkg/Include/Protocol/BlockIo.h index 3bd76885e1..ac9adf7a9c 100644 --- a/MdePkg/Include/Protocol/BlockIo.h +++ b/MdePkg/Include/Protocol/BlockIo.h @@ -17,17 +17,17 @@ 0x964e5b21, 0x6459, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \ } -typedef struct _EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL; +typedef struct _EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL; /// /// Protocol GUID name defined in EFI1.1. /// -#define BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL_GUID +#define BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL_GUID /// /// Protocol defined in EFI1.1. /// -typedef EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO; +typedef EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO; /** Reset the Block Device. @@ -129,84 +129,84 @@ typedef struct { /// /// The curent media Id. If the media changes, this value is changed. /// - UINT32 MediaId; + UINT32 MediaId; /// /// TRUE if the media is removable; otherwise, FALSE. /// - BOOLEAN RemovableMedia; + BOOLEAN RemovableMedia; /// /// TRUE if there is a media currently present in the device; /// othersise, FALSE. THis field shows the media present status /// as of the most recent ReadBlocks() or WriteBlocks() call. /// - BOOLEAN MediaPresent; + BOOLEAN MediaPresent; /// /// TRUE if LBA 0 is the first block of a partition; otherwise /// FALSE. For media with only one partition this would be TRUE. /// - BOOLEAN LogicalPartition; + BOOLEAN LogicalPartition; /// /// TRUE if the media is marked read-only otherwise, FALSE. /// This field shows the read-only status as of the most recent WriteBlocks () call. /// - BOOLEAN ReadOnly; + BOOLEAN ReadOnly; /// /// TRUE if the WriteBlock () function caches write data. /// - BOOLEAN WriteCaching; + BOOLEAN WriteCaching; /// /// The intrinsic block size of the device. If the media changes, then /// this field is updated. /// - UINT32 BlockSize; + UINT32 BlockSize; /// /// Supplies the alignment requirement for any buffer to read or write block(s). /// - UINT32 IoAlign; + UINT32 IoAlign; /// /// The last logical block address on the device. /// If the media changes, then this field is updated. /// - EFI_LBA LastBlock; + EFI_LBA LastBlock; /// /// Only present if EFI_BLOCK_IO_PROTOCOL.Revision is greater than or equal to /// EFI_BLOCK_IO_PROTOCOL_REVISION2. Returns the first LBA is aligned to /// a physical block boundary. /// - EFI_LBA LowestAlignedLba; + EFI_LBA LowestAlignedLba; /// /// Only present if EFI_BLOCK_IO_PROTOCOL.Revision is greater than or equal to /// EFI_BLOCK_IO_PROTOCOL_REVISION2. Returns the number of logical blocks /// per physical block. /// - UINT32 LogicalBlocksPerPhysicalBlock; + UINT32 LogicalBlocksPerPhysicalBlock; /// /// Only present if EFI_BLOCK_IO_PROTOCOL.Revision is greater than or equal to /// EFI_BLOCK_IO_PROTOCOL_REVISION3. Returns the optimal transfer length /// granularity as a number of logical blocks. /// - UINT32 OptimalTransferLengthGranularity; + UINT32 OptimalTransferLengthGranularity; } EFI_BLOCK_IO_MEDIA; -#define EFI_BLOCK_IO_PROTOCOL_REVISION 0x00010000 -#define EFI_BLOCK_IO_PROTOCOL_REVISION2 0x00020001 -#define EFI_BLOCK_IO_PROTOCOL_REVISION3 0x0002001F +#define EFI_BLOCK_IO_PROTOCOL_REVISION 0x00010000 +#define EFI_BLOCK_IO_PROTOCOL_REVISION2 0x00020001 +#define EFI_BLOCK_IO_PROTOCOL_REVISION3 0x0002001F /// /// Revision defined in EFI1.1. /// -#define EFI_BLOCK_IO_INTERFACE_REVISION EFI_BLOCK_IO_PROTOCOL_REVISION +#define EFI_BLOCK_IO_INTERFACE_REVISION EFI_BLOCK_IO_PROTOCOL_REVISION /// /// This protocol provides control over block devices. @@ -217,19 +217,18 @@ struct _EFI_BLOCK_IO_PROTOCOL { /// revisions must be backwards compatible. If a future version is not /// back wards compatible, it is not the same GUID. /// - UINT64 Revision; + UINT64 Revision; /// /// Pointer to the EFI_BLOCK_IO_MEDIA data for this device. /// - EFI_BLOCK_IO_MEDIA *Media; - - EFI_BLOCK_RESET Reset; - EFI_BLOCK_READ ReadBlocks; - EFI_BLOCK_WRITE WriteBlocks; - EFI_BLOCK_FLUSH FlushBlocks; + EFI_BLOCK_IO_MEDIA *Media; + EFI_BLOCK_RESET Reset; + EFI_BLOCK_READ ReadBlocks; + EFI_BLOCK_WRITE WriteBlocks; + EFI_BLOCK_FLUSH FlushBlocks; }; -extern EFI_GUID gEfiBlockIoProtocolGuid; +extern EFI_GUID gEfiBlockIoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/BlockIo2.h b/MdePkg/Include/Protocol/BlockIo2.h index a2868b9895..d25f51f733 100644 --- a/MdePkg/Include/Protocol/BlockIo2.h +++ b/MdePkg/Include/Protocol/BlockIo2.h @@ -20,27 +20,25 @@ 0xa77b2472, 0xe282, 0x4e9f, {0xa2, 0x45, 0xc2, 0xc0, 0xe2, 0x7b, 0xbc, 0xc1} \ } -typedef struct _EFI_BLOCK_IO2_PROTOCOL EFI_BLOCK_IO2_PROTOCOL; +typedef struct _EFI_BLOCK_IO2_PROTOCOL EFI_BLOCK_IO2_PROTOCOL; /** The struct of Block IO2 Token. **/ typedef struct { - /// /// If Event is NULL, then blocking I/O is performed.If Event is not NULL and /// non-blocking I/O is supported, then non-blocking I/O is performed, and /// Event will be signaled when the read request is completed. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Defines whether or not the signaled event encountered an error. /// - EFI_STATUS TransactionStatus; + EFI_STATUS TransactionStatus; } EFI_BLOCK_IO2_TOKEN; - /** Reset the block device hardware. @@ -56,7 +54,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_RESET_EX) ( +(EFIAPI *EFI_BLOCK_RESET_EX)( IN EFI_BLOCK_IO2_PROTOCOL *This, IN BOOLEAN ExtendedVerification ); @@ -96,13 +94,13 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_READ_EX) ( +(EFIAPI *EFI_BLOCK_READ_EX)( IN EFI_BLOCK_IO2_PROTOCOL *This, IN UINT32 MediaId, IN EFI_LBA LBA, IN OUT EFI_BLOCK_IO2_TOKEN *Token, IN UINTN BufferSize, - OUT VOID *Buffer + OUT VOID *Buffer ); /** @@ -138,7 +136,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_WRITE_EX) ( +(EFIAPI *EFI_BLOCK_WRITE_EX)( IN EFI_BLOCK_IO2_PROTOCOL *This, IN UINT32 MediaId, IN EFI_LBA LBA, @@ -171,7 +169,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_FLUSH_EX) ( +(EFIAPI *EFI_BLOCK_FLUSH_EX)( IN EFI_BLOCK_IO2_PROTOCOL *This, IN OUT EFI_BLOCK_IO2_TOKEN *Token ); @@ -186,15 +184,14 @@ struct _EFI_BLOCK_IO2_PROTOCOL { /// A pointer to the EFI_BLOCK_IO_MEDIA data for this device. /// Type EFI_BLOCK_IO_MEDIA is defined in BlockIo.h. /// - EFI_BLOCK_IO_MEDIA *Media; + EFI_BLOCK_IO_MEDIA *Media; - EFI_BLOCK_RESET_EX Reset; - EFI_BLOCK_READ_EX ReadBlocksEx; - EFI_BLOCK_WRITE_EX WriteBlocksEx; - EFI_BLOCK_FLUSH_EX FlushBlocksEx; + EFI_BLOCK_RESET_EX Reset; + EFI_BLOCK_READ_EX ReadBlocksEx; + EFI_BLOCK_WRITE_EX WriteBlocksEx; + EFI_BLOCK_FLUSH_EX FlushBlocksEx; }; -extern EFI_GUID gEfiBlockIo2ProtocolGuid; +extern EFI_GUID gEfiBlockIo2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/BlockIoCrypto.h b/MdePkg/Include/Protocol/BlockIoCrypto.h index 2387771f96..bcc0ed40be 100644 --- a/MdePkg/Include/Protocol/BlockIoCrypto.h +++ b/MdePkg/Include/Protocol/BlockIoCrypto.h @@ -20,7 +20,7 @@ 0xa00490ba, 0x3f1a, 0x4b4c, {0xab, 0x90, 0x4f, 0xa9, 0x97, 0x26, 0xa1, 0xe8} \ } -typedef struct _EFI_BLOCK_IO_CRYPTO_PROTOCOL EFI_BLOCK_IO_CRYPTO_PROTOCOL; +typedef struct _EFI_BLOCK_IO_CRYPTO_PROTOCOL EFI_BLOCK_IO_CRYPTO_PROTOCOL; /// /// The struct of Block I/O Crypto Token. @@ -32,27 +32,27 @@ typedef struct { // Event will be signaled when the read request is completed and data was // decrypted (when Index was specified). // - EFI_EVENT Event; + EFI_EVENT Event; // // Defines whether or not the signaled event encountered an error. // - EFI_STATUS TransactionStatus; + EFI_STATUS TransactionStatus; } EFI_BLOCK_IO_CRYPTO_TOKEN; typedef struct { // // GUID of the algorithm. // - EFI_GUID Algorithm; + EFI_GUID Algorithm; // // Specifies KeySizein bits used with this Algorithm. // - UINT64 KeySize; + UINT64 KeySize; // // Specifies bitmask of block sizes supported by this algorithm. // Bit j being set means that 2^j bytes crypto block size is supported. // - UINT64 CryptoBlockSizeBitMask; + UINT64 CryptoBlockSizeBitMask; } EFI_BLOCK_IO_CRYPTO_CAPABILITY; /// @@ -63,7 +63,7 @@ typedef struct { /// the Inline Cryptographic Interface. /// typedef struct { - UINT64 InputSize; + UINT64 InputSize; } EFI_BLOCK_IO_CRYPTO_IV_INPUT; #define EFI_BLOCK_IO_CRYPTO_ALGO_GUID_AES_XTS \ @@ -71,12 +71,12 @@ typedef struct { 0x2f87ba6a, 0x5c04, 0x4385, {0xa7, 0x80, 0xf3, 0xbf, 0x78, 0xa9, 0x7b, 0xec} \ } -extern EFI_GUID gEfiBlockIoCryptoAlgoAesXtsGuid; +extern EFI_GUID gEfiBlockIoCryptoAlgoAesXtsGuid; typedef struct { - EFI_BLOCK_IO_CRYPTO_IV_INPUT Header; - UINT64 CryptoBlockNumber; - UINT64 CryptoBlockByteSize; + EFI_BLOCK_IO_CRYPTO_IV_INPUT Header; + UINT64 CryptoBlockNumber; + UINT64 CryptoBlockByteSize; } EFI_BLOCK_IO_CRYPTO_IV_INPUT_AES_XTS; #define EFI_BLOCK_IO_CRYPTO_ALGO_GUID_AES_CBC_MICROSOFT_BITLOCKER \ @@ -84,33 +84,33 @@ typedef struct { 0x689e4c62, 0x70bf, 0x4cf3, {0x88, 0xbb, 0x33, 0xb3, 0x18, 0x26, 0x86, 0x70} \ } -extern EFI_GUID gEfiBlockIoCryptoAlgoAesCbcMsBitlockerGuid; +extern EFI_GUID gEfiBlockIoCryptoAlgoAesCbcMsBitlockerGuid; typedef struct { - EFI_BLOCK_IO_CRYPTO_IV_INPUT Header; - UINT64 CryptoBlockByteOffset; - UINT64 CryptoBlockByteSize; + EFI_BLOCK_IO_CRYPTO_IV_INPUT Header; + UINT64 CryptoBlockByteOffset; + UINT64 CryptoBlockByteSize; } EFI_BLOCK_IO_CRYPTO_IV_INPUT_AES_CBC_MICROSOFT_BITLOCKER; -#define EFI_BLOCK_IO_CRYPTO_INDEX_ANY 0xFFFFFFFFFFFFFFFF +#define EFI_BLOCK_IO_CRYPTO_INDEX_ANY 0xFFFFFFFFFFFFFFFF typedef struct { // // Is inline cryptographic capability supported on this device. // - BOOLEAN Supported; + BOOLEAN Supported; // // Maximum number of keys that can be configured at the same time. // - UINT64 KeyCount; + UINT64 KeyCount; // // Number of supported capabilities. // - UINT64 CapabilityCount; + UINT64 CapabilityCount; // // Array of supported capabilities. // - EFI_BLOCK_IO_CRYPTO_CAPABILITY Capabilities[1]; + EFI_BLOCK_IO_CRYPTO_CAPABILITY Capabilities[1]; } EFI_BLOCK_IO_CRYPTO_CAPABILITIES; typedef struct { @@ -118,38 +118,38 @@ typedef struct { // Configuration table index. A special Index EFI_BLOCK_IO_CRYPTO_INDEX_ANY can be // used to set any available entry in the configuration table. // - UINT64 Index; + UINT64 Index; // // Identifies the owner of the configuration table entry. Entry can also be used // with the Nil value to clear key from the configuration table index. // - EFI_GUID KeyOwnerGuid; + EFI_GUID KeyOwnerGuid; // // A supported capability to be used. The CryptoBlockSizeBitMask field of the // structure should have only one bit set from the supported mask. // - EFI_BLOCK_IO_CRYPTO_CAPABILITY Capability; + EFI_BLOCK_IO_CRYPTO_CAPABILITY Capability; // // Pointer to the key. The size of the key is defined by the KeySize field of // the capability specified by the Capability parameter. // - VOID *CryptoKey; + VOID *CryptoKey; } EFI_BLOCK_IO_CRYPTO_CONFIGURATION_TABLE_ENTRY; typedef struct { // // Configuration table index. // - UINT64 Index; + UINT64 Index; // // Identifies the current owner of the entry. // - EFI_GUID KeyOwnerGuid; + EFI_GUID KeyOwnerGuid; // // The capability to be used. The CryptoBlockSizeBitMask field of the structure // has only one bit set from the supported mask. // - EFI_BLOCK_IO_CRYPTO_CAPABILITY Capability; + EFI_BLOCK_IO_CRYPTO_CAPABILITY Capability; } EFI_BLOCK_IO_CRYPTO_RESPONSE_CONFIGURATION_ENTRY; /** @@ -179,7 +179,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_IO_CRYPTO_RESET) ( +(EFIAPI *EFI_BLOCK_IO_CRYPTO_RESET)( IN EFI_BLOCK_IO_CRYPTO_PROTOCOL *This, IN BOOLEAN ExtendedVerification ); @@ -212,9 +212,9 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_IO_CRYPTO_GET_CAPABILITIES) ( +(EFIAPI *EFI_BLOCK_IO_CRYPTO_GET_CAPABILITIES)( IN EFI_BLOCK_IO_CRYPTO_PROTOCOL *This, - OUT EFI_BLOCK_IO_CRYPTO_CAPABILITIES *Capabilities + OUT EFI_BLOCK_IO_CRYPTO_CAPABILITIES *Capabilities ); /** @@ -281,11 +281,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_IO_CRYPTO_SET_CONFIGURATION) ( +(EFIAPI *EFI_BLOCK_IO_CRYPTO_SET_CONFIGURATION)( IN EFI_BLOCK_IO_CRYPTO_PROTOCOL *This, IN UINT64 ConfigurationCount, IN EFI_BLOCK_IO_CRYPTO_CONFIGURATION_TABLE_ENTRY *ConfigurationTable, - OUT EFI_BLOCK_IO_CRYPTO_RESPONSE_CONFIGURATION_ENTRY *ResultingTable OPTIONAL + OUT EFI_BLOCK_IO_CRYPTO_RESPONSE_CONFIGURATION_ENTRY *ResultingTable OPTIONAL ); /** @@ -322,13 +322,13 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_IO_CRYPTO_GET_CONFIGURATION) ( +(EFIAPI *EFI_BLOCK_IO_CRYPTO_GET_CONFIGURATION)( IN EFI_BLOCK_IO_CRYPTO_PROTOCOL *This, IN UINT64 StartIndex, IN UINT64 ConfigurationCount, IN EFI_GUID *KeyOwnerGuid OPTIONAL, - OUT EFI_BLOCK_IO_CRYPTO_RESPONSE_CONFIGURATION_ENTRY *ConfigurationTable -); + OUT EFI_BLOCK_IO_CRYPTO_RESPONSE_CONFIGURATION_ENTRY *ConfigurationTable + ); /** Reads the requested number of blocks from the device and optionally decrypts @@ -387,13 +387,13 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_IO_CRYPTO_READ_EXTENDED) ( +(EFIAPI *EFI_BLOCK_IO_CRYPTO_READ_EXTENDED)( IN EFI_BLOCK_IO_CRYPTO_PROTOCOL *This, IN UINT32 MediaId, IN EFI_LBA LBA, IN OUT EFI_BLOCK_IO_CRYPTO_TOKEN *Token, IN UINT64 BufferSize, - OUT VOID *Buffer, + OUT VOID *Buffer, IN UINT64 *Index OPTIONAL, IN VOID *CryptoIvInput OPTIONAL ); @@ -453,7 +453,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_IO_CRYPTO_WRITE_EXTENDED) ( +(EFIAPI *EFI_BLOCK_IO_CRYPTO_WRITE_EXTENDED)( IN EFI_BLOCK_IO_CRYPTO_PROTOCOL *This, IN UINT32 MediaId, IN EFI_LBA LBA, @@ -498,7 +498,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_IO_CRYPTO_FLUSH) ( +(EFIAPI *EFI_BLOCK_IO_CRYPTO_FLUSH)( IN EFI_BLOCK_IO_CRYPTO_PROTOCOL *This, IN OUT EFI_BLOCK_IO_CRYPTO_TOKEN *Token ); @@ -508,17 +508,16 @@ EFI_STATUS /// drivers and applications to perform block encryption on a storage device, such as UFS. /// struct _EFI_BLOCK_IO_CRYPTO_PROTOCOL { - EFI_BLOCK_IO_MEDIA *Media; - EFI_BLOCK_IO_CRYPTO_RESET Reset; - EFI_BLOCK_IO_CRYPTO_GET_CAPABILITIES GetCapabilities; - EFI_BLOCK_IO_CRYPTO_SET_CONFIGURATION SetConfiguration; - EFI_BLOCK_IO_CRYPTO_GET_CONFIGURATION GetConfiguration; - EFI_BLOCK_IO_CRYPTO_READ_EXTENDED ReadExtended; - EFI_BLOCK_IO_CRYPTO_WRITE_EXTENDED WriteExtended; - EFI_BLOCK_IO_CRYPTO_FLUSH FlushBlocks; + EFI_BLOCK_IO_MEDIA *Media; + EFI_BLOCK_IO_CRYPTO_RESET Reset; + EFI_BLOCK_IO_CRYPTO_GET_CAPABILITIES GetCapabilities; + EFI_BLOCK_IO_CRYPTO_SET_CONFIGURATION SetConfiguration; + EFI_BLOCK_IO_CRYPTO_GET_CONFIGURATION GetConfiguration; + EFI_BLOCK_IO_CRYPTO_READ_EXTENDED ReadExtended; + EFI_BLOCK_IO_CRYPTO_WRITE_EXTENDED WriteExtended; + EFI_BLOCK_IO_CRYPTO_FLUSH FlushBlocks; }; -extern EFI_GUID gEfiBlockIoCryptoProtocolGuid; +extern EFI_GUID gEfiBlockIoCryptoProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/BluetoothAttribute.h b/MdePkg/Include/Protocol/BluetoothAttribute.h index 88f125808c..829e66609c 100644 --- a/MdePkg/Include/Protocol/BluetoothAttribute.h +++ b/MdePkg/Include/Protocol/BluetoothAttribute.h @@ -32,100 +32,99 @@ typedef struct _EFI_BLUETOOTH_ATTRIBUTE_PROTOCOL EFI_BLUETOOTH_ATTRIBUTE_PROTOCO // Bluetooth UUID // typedef struct { - UINT8 Length; + UINT8 Length; union { - UINT16 Uuid16; - UINT32 Uuid32; - UINT8 Uuid128[16]; + UINT16 Uuid16; + UINT32 Uuid32; + UINT8 Uuid128[16]; } Data; } EFI_BLUETOOTH_UUID; - #define UUID_16BIT_TYPE_LEN 2 #define UUID_32BIT_TYPE_LEN 4 #define UUID_128BIT_TYPE_LEN 16 -#define BLUETOOTH_IS_ATTRIBUTE_OF_TYPE(a,t) ((a)->Type.Length == UUID_16BIT_TYPE_LEN && (a)->Type.Data.Uuid16 == (t)) +#define BLUETOOTH_IS_ATTRIBUTE_OF_TYPE(a, t) ((a)->Type.Length == UUID_16BIT_TYPE_LEN && (a)->Type.Data.Uuid16 == (t)) // // Bluetooth Attribute Permission // typedef union { struct { - UINT16 Readable : 1; - UINT16 ReadEncryption : 1; - UINT16 ReadAuthentication : 1; - UINT16 ReadAuthorization : 1; - UINT16 ReadKeySize : 5; - UINT16 Reserved1 : 7; - UINT16 Writeable : 1; - UINT16 WriteEncryption : 1; - UINT16 WriteAuthentication : 1; - UINT16 WriteAuthorization : 1; - UINT16 WriteKeySize : 5; - UINT16 Reserved2 : 7; + UINT16 Readable : 1; + UINT16 ReadEncryption : 1; + UINT16 ReadAuthentication : 1; + UINT16 ReadAuthorization : 1; + UINT16 ReadKeySize : 5; + UINT16 Reserved1 : 7; + UINT16 Writeable : 1; + UINT16 WriteEncryption : 1; + UINT16 WriteAuthentication : 1; + UINT16 WriteAuthorization : 1; + UINT16 WriteKeySize : 5; + UINT16 Reserved2 : 7; } Permission; - UINT32 Data32; + UINT32 Data32; } EFI_BLUETOOTH_ATTRIBUTE_PERMISSION; typedef struct { - EFI_BLUETOOTH_UUID Type; - UINT16 Length; - UINT16 AttributeHandle; - EFI_BLUETOOTH_ATTRIBUTE_PERMISSION AttributePermission; + EFI_BLUETOOTH_UUID Type; + UINT16 Length; + UINT16 AttributeHandle; + EFI_BLUETOOTH_ATTRIBUTE_PERMISSION AttributePermission; } EFI_BLUETOOTH_ATTRIBUTE_HEADER; typedef struct { - EFI_BLUETOOTH_ATTRIBUTE_HEADER Header; - UINT16 EndGroupHandle; - EFI_BLUETOOTH_UUID ServiceUuid; + EFI_BLUETOOTH_ATTRIBUTE_HEADER Header; + UINT16 EndGroupHandle; + EFI_BLUETOOTH_UUID ServiceUuid; } EFI_BLUETOOTH_GATT_PRIMARY_SERVICE_INFO; typedef struct { - EFI_BLUETOOTH_ATTRIBUTE_HEADER Header; - UINT16 StartGroupHandle; - UINT16 EndGroupHandle; - EFI_BLUETOOTH_UUID ServiceUuid; + EFI_BLUETOOTH_ATTRIBUTE_HEADER Header; + UINT16 StartGroupHandle; + UINT16 EndGroupHandle; + EFI_BLUETOOTH_UUID ServiceUuid; } EFI_BLUETOOTH_GATT_INCLUDE_SERVICE_INFO; typedef struct { - EFI_BLUETOOTH_ATTRIBUTE_HEADER Header; - UINT8 CharacteristicProperties; - UINT16 CharacteristicValueHandle; - EFI_BLUETOOTH_UUID CharacteristicUuid; + EFI_BLUETOOTH_ATTRIBUTE_HEADER Header; + UINT8 CharacteristicProperties; + UINT16 CharacteristicValueHandle; + EFI_BLUETOOTH_UUID CharacteristicUuid; } EFI_BLUETOOTH_GATT_CHARACTERISTIC_INFO; typedef struct { - EFI_BLUETOOTH_ATTRIBUTE_HEADER Header; - EFI_BLUETOOTH_UUID CharacteristicDescriptorUuid; + EFI_BLUETOOTH_ATTRIBUTE_HEADER Header; + EFI_BLUETOOTH_UUID CharacteristicDescriptorUuid; } EFI_BLUETOOTH_GATT_CHARACTERISTIC_DESCRIPTOR_INFO; #pragma pack() typedef struct { - UINT16 AttributeHandle; + UINT16 AttributeHandle; } EFI_BLUETOOTH_ATTRIBUTE_CALLBACK_PARAMETER_NOTIFICATION; typedef struct { - UINT16 AttributeHandle; + UINT16 AttributeHandle; } EFI_BLUETOOTH_ATTRIBUTE_CALLBACK_PARAMETER_INDICATION; typedef struct { - UINT32 Version; - UINT8 AttributeOpCode; + UINT32 Version; + UINT8 AttributeOpCode; union { - EFI_BLUETOOTH_ATTRIBUTE_CALLBACK_PARAMETER_NOTIFICATION Notification; - EFI_BLUETOOTH_ATTRIBUTE_CALLBACK_PARAMETER_INDICATION Indication; + EFI_BLUETOOTH_ATTRIBUTE_CALLBACK_PARAMETER_NOTIFICATION Notification; + EFI_BLUETOOTH_ATTRIBUTE_CALLBACK_PARAMETER_INDICATION Indication; } Parameter; } EFI_BLUETOOTH_ATTRIBUTE_CALLBACK_PARAMETER; typedef struct { - UINT32 Version; - BLUETOOTH_LE_ADDRESS BD_ADDR; - BLUETOOTH_LE_ADDRESS DirectAddress; - UINT8 RSSI; - UINTN AdvertisementDataSize; - VOID *AdvertisementData; + UINT32 Version; + BLUETOOTH_LE_ADDRESS BD_ADDR; + BLUETOOTH_LE_ADDRESS DirectAddress; + UINT8 RSSI; + UINTN AdvertisementDataSize; + VOID *AdvertisementData; } EFI_BLUETOOTH_LE_DEVICE_INFO; /** @@ -143,7 +142,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_ATTRIBUTE_CALLBACK_FUNCTION) ( +(EFIAPI *EFI_BLUETOOTH_ATTRIBUTE_CALLBACK_FUNCTION)( IN EFI_BLUETOOTH_ATTRIBUTE_PROTOCOL *This, IN VOID *Data, IN UINTN DataLength, @@ -177,7 +176,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_ATTRIBUTE_SEND_REQUEST) ( +(EFIAPI *EFI_BLUETOOTH_ATTRIBUTE_SEND_REQUEST)( IN EFI_BLUETOOTH_ATTRIBUTE_PROTOCOL *This, IN VOID *Data, IN UINTN DataLength, @@ -263,15 +262,13 @@ EFI_STATUS ); struct _EFI_BLUETOOTH_ATTRIBUTE_PROTOCOL { - EFI_BLUETOOTH_ATTRIBUTE_SEND_REQUEST SendRequest; - EFI_BLUETOOTH_ATTRIBUTE_REGISTER_FOR_SERVER_NOTIFICATION RegisterForServerNotification; - EFI_BLUETOOTH_ATTRIBUTE_GET_SERVICE_INFO GetServiceInfo; - EFI_BLUETOOTH_ATTRIBUTE_GET_DEVICE_INFO GetDeviceInfo; + EFI_BLUETOOTH_ATTRIBUTE_SEND_REQUEST SendRequest; + EFI_BLUETOOTH_ATTRIBUTE_REGISTER_FOR_SERVER_NOTIFICATION RegisterForServerNotification; + EFI_BLUETOOTH_ATTRIBUTE_GET_SERVICE_INFO GetServiceInfo; + EFI_BLUETOOTH_ATTRIBUTE_GET_DEVICE_INFO GetDeviceInfo; }; - -extern EFI_GUID gEfiBluetoothAttributeProtocolGuid; -extern EFI_GUID gEfiBluetoothAttributeServiceBindingProtocolGuid; +extern EFI_GUID gEfiBluetoothAttributeProtocolGuid; +extern EFI_GUID gEfiBluetoothAttributeServiceBindingProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/BluetoothConfig.h b/MdePkg/Include/Protocol/BluetoothConfig.h index 052b860137..57ff991670 100644 --- a/MdePkg/Include/Protocol/BluetoothConfig.h +++ b/MdePkg/Include/Protocol/BluetoothConfig.h @@ -22,9 +22,9 @@ typedef struct _EFI_BLUETOOTH_CONFIG_PROTOCOL EFI_BLUETOOTH_CONFIG_PROTOCOL; -typedef UINT32 EFI_BLUETOOTH_CONFIG_REMOTE_DEVICE_STATE_TYPE; -#define EFI_BLUETOOTH_CONFIG_REMOTE_DEVICE_STATE_CONNECTED 0x1 -#define EFI_BLUETOOTH_CONFIG_REMOTE_DEVICE_STATE_PAIRED 0x2 +typedef UINT32 EFI_BLUETOOTH_CONFIG_REMOTE_DEVICE_STATE_TYPE; +#define EFI_BLUETOOTH_CONFIG_REMOTE_DEVICE_STATE_CONNECTED 0x1 +#define EFI_BLUETOOTH_CONFIG_REMOTE_DEVICE_STATE_PAIRED 0x2 /// /// EFI_BLUETOOTH_SCAN_CALLBACK_INFORMATION @@ -33,19 +33,19 @@ typedef struct { /// /// 48bit Bluetooth device address. /// - BLUETOOTH_ADDRESS BDAddr; + BLUETOOTH_ADDRESS BDAddr; /// /// State of the remote deive /// - UINT8 RemoteDeviceState; + UINT8 RemoteDeviceState; /// /// Bluetooth ClassOfDevice. See Bluetooth specification for detail. /// - BLUETOOTH_CLASS_OF_DEVICE ClassOfDevice; + BLUETOOTH_CLASS_OF_DEVICE ClassOfDevice; /// /// Remote device name /// - UINT8 RemoteDeviceName[BLUETOOTH_HCI_COMMAND_LOCAL_READABLE_NAME_MAX_SIZE]; + UINT8 RemoteDeviceName[BLUETOOTH_HCI_COMMAND_LOCAL_READABLE_NAME_MAX_SIZE]; } EFI_BLUETOOTH_SCAN_CALLBACK_INFORMATION; /// @@ -85,19 +85,19 @@ typedef enum { /// EfiBluetoothConfigDataTypeAvailableDeviceList, EfiBluetoothConfigDataTypeRandomAddress, /* Relevant for LE*/ - EfiBluetoothConfigDataTypeRSSI, /* Relevant for LE*/ + EfiBluetoothConfigDataTypeRSSI, /* Relevant for LE*/ /// /// Advertisement report. Data structure is UNIT8[]. /// EfiBluetoothConfigDataTypeAdvertisementData, /* Relevant for LE*/ - EfiBluetoothConfigDataTypeIoCapability, /* Relevant for LE*/ - EfiBluetoothConfigDataTypeOOBDataFlag, /* Relevant for LE*/ + EfiBluetoothConfigDataTypeIoCapability, /* Relevant for LE*/ + EfiBluetoothConfigDataTypeOOBDataFlag, /* Relevant for LE*/ /// /// KeyType of Authentication Requirements flag of local /// device as UINT8, indicating requested security properties. /// See Bluetooth specification 3.H.3.5.1. BIT0: MITM, BIT1:SC. /// - EfiBluetoothConfigDataTypeKeyType, /* Relevant for LE*/ + EfiBluetoothConfigDataTypeKeyType, /* Relevant for LE*/ EfiBluetoothConfigDataTypeEncKeySize, /* Relevant for LE*/ EfiBluetoothConfigDataTypeMax, } EFI_BLUETOOTH_CONFIG_DATA_TYPE; @@ -154,7 +154,6 @@ typedef enum { EfiBluetoothConnCallbackTypeEncrypted } EFI_BLUETOOTH_CONNECT_COMPLETE_CALLBACK_TYPE; - /** Initialize Bluetooth host controller and local device. @@ -183,7 +182,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_CONFIG_SCAN_CALLBACK_FUNCTION) ( +(EFIAPI *EFI_BLUETOOTH_CONFIG_SCAN_CALLBACK_FUNCTION)( IN EFI_BLUETOOTH_CONFIG_PROTOCOL *This, IN VOID *Context, IN EFI_BLUETOOTH_SCAN_CALLBACK_INFORMATION *CallbackInfo @@ -505,19 +504,19 @@ EFI_STATUS /// This protocol abstracts user interface configuration for Bluetooth device. /// struct _EFI_BLUETOOTH_CONFIG_PROTOCOL { - EFI_BLUETOOTH_CONFIG_INIT Init; - EFI_BLUETOOTH_CONFIG_SCAN Scan; - EFI_BLUETOOTH_CONFIG_CONNECT Connect; - EFI_BLUETOOTH_CONFIG_DISCONNECT Disconnect; - EFI_BLUETOOTH_CONFIG_GET_DATA GetData; - EFI_BLUETOOTH_CONFIG_SET_DATA SetData; - EFI_BLUETOOTH_CONFIG_GET_REMOTE_DATA GetRemoteData; - EFI_BLUETOOTH_CONFIG_REGISTER_PIN_CALLBACK RegisterPinCallback; - EFI_BLUETOOTH_CONFIG_REGISTER_GET_LINK_KEY_CALLBACK RegisterGetLinkKeyCallback; - EFI_BLUETOOTH_CONFIG_REGISTER_SET_LINK_KEY_CALLBACK RegisterSetLinkKeyCallback; - EFI_BLUETOOTH_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK RegisterLinkConnectCompleteCallback; + EFI_BLUETOOTH_CONFIG_INIT Init; + EFI_BLUETOOTH_CONFIG_SCAN Scan; + EFI_BLUETOOTH_CONFIG_CONNECT Connect; + EFI_BLUETOOTH_CONFIG_DISCONNECT Disconnect; + EFI_BLUETOOTH_CONFIG_GET_DATA GetData; + EFI_BLUETOOTH_CONFIG_SET_DATA SetData; + EFI_BLUETOOTH_CONFIG_GET_REMOTE_DATA GetRemoteData; + EFI_BLUETOOTH_CONFIG_REGISTER_PIN_CALLBACK RegisterPinCallback; + EFI_BLUETOOTH_CONFIG_REGISTER_GET_LINK_KEY_CALLBACK RegisterGetLinkKeyCallback; + EFI_BLUETOOTH_CONFIG_REGISTER_SET_LINK_KEY_CALLBACK RegisterSetLinkKeyCallback; + EFI_BLUETOOTH_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK RegisterLinkConnectCompleteCallback; }; -extern EFI_GUID gEfiBluetoothConfigProtocolGuid; +extern EFI_GUID gEfiBluetoothConfigProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/BluetoothHc.h b/MdePkg/Include/Protocol/BluetoothHc.h index 035b272564..d75cb08f89 100644 --- a/MdePkg/Include/Protocol/BluetoothHc.h +++ b/MdePkg/Include/Protocol/BluetoothHc.h @@ -110,7 +110,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_HC_ASYNC_FUNC_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_HC_ASYNC_FUNC_CALLBACK)( IN VOID *Data, IN UINTN DataLength, IN VOID *Context @@ -142,7 +142,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_HC_ASYNC_RECEIVE_EVENT) ( +(EFIAPI *EFI_BLUETOOTH_HC_ASYNC_RECEIVE_EVENT)( IN EFI_BLUETOOTH_HC_PROTOCOL *This, IN BOOLEAN IsNewTransfer, IN UINTN PollingInterval, @@ -255,7 +255,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_HC_ASYNC_RECEIVE_ACL_DATA) ( +(EFIAPI *EFI_BLUETOOTH_HC_ASYNC_RECEIVE_ACL_DATA)( IN EFI_BLUETOOTH_HC_PROTOCOL *This, IN BOOLEAN IsNewTransfer, IN UINTN PollingInterval, @@ -361,7 +361,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_HC_ASYNC_RECEIVE_SCO_DATA) ( +(EFIAPI *EFI_BLUETOOTH_HC_ASYNC_RECEIVE_SCO_DATA)( IN EFI_BLUETOOTH_HC_PROTOCOL *This, IN BOOLEAN IsNewTransfer, IN UINTN PollingInterval, @@ -377,42 +377,41 @@ struct _EFI_BLUETOOTH_HC_PROTOCOL { // // Send HCI command packet. // - EFI_BLUETOOTH_HC_SEND_COMMAND SendCommand; + EFI_BLUETOOTH_HC_SEND_COMMAND SendCommand; // // Receive HCI event packets. // - EFI_BLUETOOTH_HC_RECEIVE_EVENT ReceiveEvent; + EFI_BLUETOOTH_HC_RECEIVE_EVENT ReceiveEvent; // // Non-blocking receive HCI event packets. // - EFI_BLUETOOTH_HC_ASYNC_RECEIVE_EVENT AsyncReceiveEvent; + EFI_BLUETOOTH_HC_ASYNC_RECEIVE_EVENT AsyncReceiveEvent; // // Send HCI ACL (asynchronous connection-oriented) data packets. // - EFI_BLUETOOTH_HC_SEND_ACL_DATA SendACLData; + EFI_BLUETOOTH_HC_SEND_ACL_DATA SendACLData; // // Receive HCI ACL data packets. // - EFI_BLUETOOTH_HC_RECEIVE_ACL_DATA ReceiveACLData; + EFI_BLUETOOTH_HC_RECEIVE_ACL_DATA ReceiveACLData; // // Non-blocking receive HCI ACL data packets. // - EFI_BLUETOOTH_HC_ASYNC_RECEIVE_ACL_DATA AsyncReceiveACLData; + EFI_BLUETOOTH_HC_ASYNC_RECEIVE_ACL_DATA AsyncReceiveACLData; // // Send HCI synchronous (SCO and eSCO) data packets. // - EFI_BLUETOOTH_HC_SEND_SCO_DATA SendSCOData; + EFI_BLUETOOTH_HC_SEND_SCO_DATA SendSCOData; // // Receive HCI synchronous data packets. // - EFI_BLUETOOTH_HC_RECEIVE_SCO_DATA ReceiveSCOData; + EFI_BLUETOOTH_HC_RECEIVE_SCO_DATA ReceiveSCOData; // // Non-blocking receive HCI synchronous data packets. // - EFI_BLUETOOTH_HC_ASYNC_RECEIVE_SCO_DATA AsyncReceiveSCOData; + EFI_BLUETOOTH_HC_ASYNC_RECEIVE_SCO_DATA AsyncReceiveSCOData; }; -extern EFI_GUID gEfiBluetoothHcProtocolGuid; +extern EFI_GUID gEfiBluetoothHcProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/BluetoothIo.h b/MdePkg/Include/Protocol/BluetoothIo.h index 7b9a2d6f59..620bfbc961 100644 --- a/MdePkg/Include/Protocol/BluetoothIo.h +++ b/MdePkg/Include/Protocol/BluetoothIo.h @@ -36,31 +36,31 @@ typedef struct { /// /// The version of the structure /// - UINT32 Version; + UINT32 Version; /// /// 48bit Bluetooth device address. /// - BLUETOOTH_ADDRESS BD_ADDR; + BLUETOOTH_ADDRESS BD_ADDR; /// /// Bluetooth PageScanRepetitionMode. See Bluetooth specification for detail. /// - UINT8 PageScanRepetitionMode; + UINT8 PageScanRepetitionMode; /// /// Bluetooth ClassOfDevice. See Bluetooth specification for detail. /// - BLUETOOTH_CLASS_OF_DEVICE ClassOfDevice; + BLUETOOTH_CLASS_OF_DEVICE ClassOfDevice; /// /// Bluetooth CloseOffset. See Bluetooth specification for detail. /// - UINT16 ClockOffset; + UINT16 ClockOffset; /// /// Bluetooth RSSI. See Bluetooth specification for detail. /// - UINT8 RSSI; + UINT8 RSSI; /// /// Bluetooth ExtendedInquiryResponse. See Bluetooth specification for detail. /// - UINT8 ExtendedInquiryResponse[240]; + UINT8 ExtendedInquiryResponse[240]; } EFI_BLUETOOTH_DEVICE_INFO; /** @@ -172,7 +172,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_IO_ASYNC_FUNC_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_IO_ASYNC_FUNC_CALLBACK)( IN UINT16 ChannelID, IN VOID *Data, IN UINTN DataLength, @@ -282,7 +282,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_IO_CHANNEL_SERVICE_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_IO_CHANNEL_SERVICE_CALLBACK)( IN VOID *Data, IN UINTN DataLength, IN VOID *Context @@ -311,7 +311,7 @@ EFI_STATUS IN EFI_BLUETOOTH_IO_PROTOCOL *This, IN EFI_HANDLE Handle, IN EFI_BLUETOOTH_IO_CHANNEL_SERVICE_CALLBACK Callback, - IN VOID* Context + IN VOID *Context ); /** @@ -405,7 +405,7 @@ struct _EFI_BLUETOOTH_IO_PROTOCOL { EFI_BLUETOOTH_IO_L2CAP_REGISTER_SERVICE L2CapRegisterService; }; -extern EFI_GUID gEfiBluetoothIoServiceBindingProtocolGuid; -extern EFI_GUID gEfiBluetoothIoProtocolGuid; +extern EFI_GUID gEfiBluetoothIoServiceBindingProtocolGuid; +extern EFI_GUID gEfiBluetoothIoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/BluetoothLeConfig.h b/MdePkg/Include/Protocol/BluetoothLeConfig.h index 5ecb45efc7..6331e60a86 100644 --- a/MdePkg/Include/Protocol/BluetoothLeConfig.h +++ b/MdePkg/Include/Protocol/BluetoothLeConfig.h @@ -47,38 +47,38 @@ typedef struct { /// structure as defined here. Future version of this specification may extend this data structure in a /// backward compatible way and increase the value of Version. /// - UINT32 Version; + UINT32 Version; /// /// Passive scanning or active scanning. See Bluetooth specification. /// - UINT8 ScanType; + UINT8 ScanType; /// /// Recommended scan interval to be used while performing scan. /// - UINT16 ScanInterval; + UINT16 ScanInterval; /// /// Recommended scan window to be used while performing a scan. /// - UINT16 ScanWindow; + UINT16 ScanWindow; /// /// Recommended scanning filter policy to be used while performing a scan. /// - UINT8 ScanningFilterPolicy; + UINT8 ScanningFilterPolicy; /// /// This is one byte flag to serve as a filter to remove unneeded scan /// result. For example, set BIT0 means scan in LE Limited Discoverable /// Mode. Set BIT1 means scan in LE General Discoverable Mode. /// - UINT8 AdvertisementFlagFilter; + UINT8 AdvertisementFlagFilter; } EFI_BLUETOOTH_LE_CONFIG_SCAN_PARAMETER; -typedef struct{ - BLUETOOTH_LE_ADDRESS BDAddr; - BLUETOOTH_LE_ADDRESS DirectAddress; - UINT8 RemoteDeviceState; - INT8 RSSI; - UINTN AdvertisementDataSize; - VOID *AdvertisementData; +typedef struct { + BLUETOOTH_LE_ADDRESS BDAddr; + BLUETOOTH_LE_ADDRESS DirectAddress; + UINT8 RemoteDeviceState; + INT8 RSSI; + UINTN AdvertisementDataSize; + VOID *AdvertisementData; } EFI_BLUETOOTH_LE_SCAN_CALLBACK_INFORMATION; /** @@ -93,7 +93,7 @@ typedef struct{ **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_SCAN_CALLBACK_FUNCTION) ( +(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_SCAN_CALLBACK_FUNCTION)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN VOID *Context, IN EFI_BLUETOOTH_LE_SCAN_CALLBACK_INFORMATION *CallbackInfo @@ -141,31 +141,31 @@ typedef struct { /// extend this data structure in a backward compatible way and /// increase the value of Version. /// - UINT32 Version; + UINT32 Version; /// /// Recommended scan interval to be used while performing scan before connect. /// - UINT16 ScanInterval; + UINT16 ScanInterval; /// /// Recommended scan window to be used while performing a connection /// - UINT16 ScanWindow; + UINT16 ScanWindow; /// /// Minimum allowed connection interval. Shall be less than or equal to ConnIntervalMax. /// - UINT16 ConnIntervalMin; + UINT16 ConnIntervalMin; /// /// Maximum allowed connection interval. Shall be greater than or equal to ConnIntervalMin. /// - UINT16 ConnIntervalMax; + UINT16 ConnIntervalMax; /// /// Slave latency for the connection in number of connection events. /// - UINT16 ConnLatency; + UINT16 ConnLatency; /// /// Link supervision timeout for the connection. /// - UINT16 SupervisionTimeout; + UINT16 SupervisionTimeout; } EFI_BLUETOOTH_LE_CONFIG_CONNECT_PARAMETER; /** @@ -250,7 +250,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_GET_DATA) ( +(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_GET_DATA)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN EFI_BLUETOOTH_CONFIG_DATA_TYPE DataType, IN OUT UINTN *DataSize, @@ -278,7 +278,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_SET_DATA) ( +(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_SET_DATA)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN EFI_BLUETOOTH_CONFIG_DATA_TYPE DataType, IN UINTN DataSize, @@ -309,7 +309,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_GET_REMOTE_DATA) ( +(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_GET_REMOTE_DATA)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN EFI_BLUETOOTH_CONFIG_DATA_TYPE DataType, IN BLUETOOTH_LE_ADDRESS *BDAddr, @@ -369,7 +369,7 @@ typedef enum { **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_LE_SMP_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_LE_SMP_CALLBACK)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN VOID *Context, IN BLUETOOTH_LE_ADDRESS *BDAddr, @@ -397,7 +397,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_LE_REGISTER_SMP_AUTH_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_LE_REGISTER_SMP_AUTH_CALLBACK)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN EFI_BLUETOOTH_LE_SMP_CALLBACK Callback, IN VOID *Context @@ -423,7 +423,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_LE_SEND_SMP_AUTH_DATA) ( +(EFIAPI *EFI_BLUETOOTH_LE_SEND_SMP_AUTH_DATA)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN BLUETOOTH_LE_ADDRESS *BDAddr, IN EFI_BLUETOOTH_LE_SMP_EVENT_DATA_TYPE EventDataType, @@ -433,8 +433,8 @@ EFI_STATUS typedef enum { // For local device only - EfiBluetoothSmpLocalIR, /* If Key hierarchy is supported */ - EfiBluetoothSmpLocalER, /* If Key hierarchy is supported */ + EfiBluetoothSmpLocalIR, /* If Key hierarchy is supported */ + EfiBluetoothSmpLocalER, /* If Key hierarchy is supported */ EfiBluetoothSmpLocalDHK, /* If Key hierarchy is supported. OPTIONAL */ // For peer specific EfiBluetoothSmpKeysDistributed = 0x1000, @@ -446,8 +446,8 @@ typedef enum { EfiBluetoothSmpPeerRand, EfiBluetoothSmpPeerEDIV, EfiBluetoothSmpPeerSignCounter, - EfiBluetoothSmpLocalLTK, /* If Key hierarchy not supported */ - EfiBluetoothSmpLocalIRK, /* If Key hierarchy not supported */ + EfiBluetoothSmpLocalLTK, /* If Key hierarchy not supported */ + EfiBluetoothSmpLocalIRK, /* If Key hierarchy not supported */ EfiBluetoothSmpLocalCSRK, /* If Key hierarchy not supported */ EfiBluetoothSmpLocalSignCounter, EfiBluetoothSmpLocalDIV, @@ -473,7 +473,7 @@ typedef enum { **/ typedef EFI_STATUS -(EFIAPI * EFI_BLUETOOTH_LE_CONFIG_SMP_GET_DATA_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_SMP_GET_DATA_CALLBACK)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN VOID *Context, IN BLUETOOTH_LE_ADDRESS *BDAddr, @@ -499,7 +499,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_BLUETOOTH_LE_CONFIG_REGISTER_SMP_GET_DATA_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_REGISTER_SMP_GET_DATA_CALLBACK)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN EFI_BLUETOOTH_LE_CONFIG_SMP_GET_DATA_CALLBACK Callback, IN VOID *Context @@ -521,7 +521,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_BLUETOOTH_LE_CONFIG_SMP_SET_DATA_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_SMP_SET_DATA_CALLBACK)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN VOID *Context, IN BLUETOOTH_LE_ADDRESS *BDAddr, @@ -547,7 +547,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_BLUETOOTH_LE_CONFIG_REGISTER_SMP_SET_DATA_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_REGISTER_SMP_SET_DATA_CALLBACK)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN EFI_BLUETOOTH_LE_CONFIG_SMP_SET_DATA_CALLBACK Callback, IN VOID *Context @@ -569,7 +569,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_CONNECT_COMPLETE_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_CONNECT_COMPLETE_CALLBACK)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN VOID *Context, IN EFI_BLUETOOTH_CONNECT_COMPLETE_CALLBACK_TYPE CallbackType, @@ -600,7 +600,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK) ( +(EFIAPI *EFI_BLUETOOTH_LE_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK)( IN EFI_BLUETOOTH_LE_CONFIG_PROTOCOL *This, IN EFI_BLUETOOTH_LE_CONFIG_CONNECT_COMPLETE_CALLBACK Callback, IN VOID *Context @@ -610,20 +610,20 @@ EFI_STATUS /// This protocol abstracts user interface configuration for BluetoothLe device. /// struct _EFI_BLUETOOTH_LE_CONFIG_PROTOCOL { - EFI_BLUETOOTH_LE_CONFIG_INIT Init; - EFI_BLUETOOTH_LE_CONFIG_SCAN Scan; - EFI_BLUETOOTH_LE_CONFIG_CONNECT Connect; - EFI_BLUETOOTH_LE_CONFIG_DISCONNECT Disconnect; - EFI_BLUETOOTH_LE_CONFIG_GET_DATA GetData; - EFI_BLUETOOTH_LE_CONFIG_SET_DATA SetData; - EFI_BLUETOOTH_LE_CONFIG_GET_REMOTE_DATA GetRemoteData; - EFI_BLUETOOTH_LE_REGISTER_SMP_AUTH_CALLBACK RegisterSmpAuthCallback; - EFI_BLUETOOTH_LE_SEND_SMP_AUTH_DATA SendSmpAuthData; - EFI_BLUETOOTH_LE_CONFIG_REGISTER_SMP_GET_DATA_CALLBACK RegisterSmpGetDataCallback; - EFI_BLUETOOTH_LE_CONFIG_REGISTER_SMP_SET_DATA_CALLBACK RegisterSmpSetDataCallback; - EFI_BLUETOOTH_LE_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK RegisterLinkConnectCompleteCallback; + EFI_BLUETOOTH_LE_CONFIG_INIT Init; + EFI_BLUETOOTH_LE_CONFIG_SCAN Scan; + EFI_BLUETOOTH_LE_CONFIG_CONNECT Connect; + EFI_BLUETOOTH_LE_CONFIG_DISCONNECT Disconnect; + EFI_BLUETOOTH_LE_CONFIG_GET_DATA GetData; + EFI_BLUETOOTH_LE_CONFIG_SET_DATA SetData; + EFI_BLUETOOTH_LE_CONFIG_GET_REMOTE_DATA GetRemoteData; + EFI_BLUETOOTH_LE_REGISTER_SMP_AUTH_CALLBACK RegisterSmpAuthCallback; + EFI_BLUETOOTH_LE_SEND_SMP_AUTH_DATA SendSmpAuthData; + EFI_BLUETOOTH_LE_CONFIG_REGISTER_SMP_GET_DATA_CALLBACK RegisterSmpGetDataCallback; + EFI_BLUETOOTH_LE_CONFIG_REGISTER_SMP_SET_DATA_CALLBACK RegisterSmpSetDataCallback; + EFI_BLUETOOTH_LE_CONFIG_REGISTER_CONNECT_COMPLETE_CALLBACK RegisterLinkConnectCompleteCallback; }; -extern EFI_GUID gEfiBluetoothLeConfigProtocolGuid; +extern EFI_GUID gEfiBluetoothLeConfigProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/BootManagerPolicy.h b/MdePkg/Include/Protocol/BootManagerPolicy.h index 34032a3293..13f1a7fcd3 100644 --- a/MdePkg/Include/Protocol/BootManagerPolicy.h +++ b/MdePkg/Include/Protocol/BootManagerPolicy.h @@ -33,7 +33,7 @@ typedef struct _EFI_BOOT_MANAGER_POLICY_PROTOCOL EFI_BOOT_MANAGER_POLICY_PROTOCOL; -#define EFI_BOOT_MANAGER_POLICY_PROTOCOL_REVISION 0x00010000 +#define EFI_BOOT_MANAGER_POLICY_PROTOCOL_REVISION 0x00010000 /** Connect a device path following the platforms EFI Boot Manager policy. @@ -118,15 +118,15 @@ EFI_STATUS ); struct _EFI_BOOT_MANAGER_POLICY_PROTOCOL { - UINT64 Revision; - EFI_BOOT_MANAGER_POLICY_CONNECT_DEVICE_PATH ConnectDevicePath; - EFI_BOOT_MANAGER_POLICY_CONNECT_DEVICE_CLASS ConnectDeviceClass; + UINT64 Revision; + EFI_BOOT_MANAGER_POLICY_CONNECT_DEVICE_PATH ConnectDevicePath; + EFI_BOOT_MANAGER_POLICY_CONNECT_DEVICE_CLASS ConnectDeviceClass; }; -extern EFI_GUID gEfiBootManagerPolicyProtocolGuid; +extern EFI_GUID gEfiBootManagerPolicyProtocolGuid; -extern EFI_GUID gEfiBootManagerPolicyConsoleGuid; -extern EFI_GUID gEfiBootManagerPolicyNetworkGuid; -extern EFI_GUID gEfiBootManagerPolicyConnectAllGuid; +extern EFI_GUID gEfiBootManagerPolicyConsoleGuid; +extern EFI_GUID gEfiBootManagerPolicyNetworkGuid; +extern EFI_GUID gEfiBootManagerPolicyConnectAllGuid; #endif diff --git a/MdePkg/Include/Protocol/BusSpecificDriverOverride.h b/MdePkg/Include/Protocol/BusSpecificDriverOverride.h index 57894b4b20..869643b1e9 100644 --- a/MdePkg/Include/Protocol/BusSpecificDriverOverride.h +++ b/MdePkg/Include/Protocol/BusSpecificDriverOverride.h @@ -22,7 +22,7 @@ 0x3bc1b285, 0x8a15, 0x4a82, {0xaa, 0xbf, 0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65 } \ } -typedef struct _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL; +typedef struct _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL; // // Prototypes for the Bus Specific Driver Override Protocol @@ -58,9 +58,9 @@ EFI_STATUS /// drivers to controllers. /// struct _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL { - EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_GET_DRIVER GetDriver; + EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_GET_DRIVER GetDriver; }; -extern EFI_GUID gEfiBusSpecificDriverOverrideProtocolGuid; +extern EFI_GUID gEfiBusSpecificDriverOverrideProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Capsule.h b/MdePkg/Include/Protocol/Capsule.h index e698278aee..6fcbc2cceb 100644 --- a/MdePkg/Include/Protocol/Capsule.h +++ b/MdePkg/Include/Protocol/Capsule.h @@ -24,6 +24,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define EFI_CAPSULE_ARCH_PROTOCOL_GUID \ { 0x5053697e, 0x2cbc, 0x4819, {0x90, 0xd9, 0x05, 0x80, 0xde, 0xee, 0x57, 0x54 }} -extern EFI_GUID gEfiCapsuleArchProtocolGuid; +extern EFI_GUID gEfiCapsuleArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/ComponentName.h b/MdePkg/Include/Protocol/ComponentName.h index 14c1343d4c..46fa5e7ad8 100644 --- a/MdePkg/Include/Protocol/ComponentName.h +++ b/MdePkg/Include/Protocol/ComponentName.h @@ -19,8 +19,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0x107a772c, 0xd5e1, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ } -typedef struct _EFI_COMPONENT_NAME_PROTOCOL EFI_COMPONENT_NAME_PROTOCOL; - +typedef struct _EFI_COMPONENT_NAME_PROTOCOL EFI_COMPONENT_NAME_PROTOCOL; /** Retrieves a Unicode string that is the user-readable name of the EFI Driver. @@ -52,7 +51,6 @@ EFI_STATUS OUT CHAR16 **DriverName ); - /** Retrieves a Unicode string that is the user readable name of the controller that is being managed by an EFI Driver. @@ -108,16 +106,16 @@ EFI_STATUS /// and controllers managed by UEFI Drivers. /// struct _EFI_COMPONENT_NAME_PROTOCOL { - EFI_COMPONENT_NAME_GET_DRIVER_NAME GetDriverName; - EFI_COMPONENT_NAME_GET_CONTROLLER_NAME GetControllerName; + EFI_COMPONENT_NAME_GET_DRIVER_NAME GetDriverName; + EFI_COMPONENT_NAME_GET_CONTROLLER_NAME GetControllerName; /// /// A Null-terminated ASCII string that contains one or more /// ISO 639-2 language codes. This is the list of language codes /// that this protocol supports. /// - CHAR8 *SupportedLanguages; + CHAR8 *SupportedLanguages; }; -extern EFI_GUID gEfiComponentNameProtocolGuid; +extern EFI_GUID gEfiComponentNameProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/ComponentName2.h b/MdePkg/Include/Protocol/ComponentName2.h index 1ebebfd15a..2fb2f83549 100644 --- a/MdePkg/Include/Protocol/ComponentName2.h +++ b/MdePkg/Include/Protocol/ComponentName2.h @@ -17,8 +17,7 @@ #define EFI_COMPONENT_NAME2_PROTOCOL_GUID \ {0x6a7a5cff, 0xe8d9, 0x4f70, { 0xba, 0xda, 0x75, 0xab, 0x30, 0x25, 0xce, 0x14 } } -typedef struct _EFI_COMPONENT_NAME2_PROTOCOL EFI_COMPONENT_NAME2_PROTOCOL; - +typedef struct _EFI_COMPONENT_NAME2_PROTOCOL EFI_COMPONENT_NAME2_PROTOCOL; /** Retrieves a string that is the user readable name of @@ -64,7 +63,6 @@ EFI_STATUS OUT CHAR16 **DriverName ); - /** Retrieves a string that is the user readable name of the controller that is being managed by an EFI Driver. @@ -148,8 +146,8 @@ EFI_STATUS /// and controllers managed by UEFI Drivers. /// struct _EFI_COMPONENT_NAME2_PROTOCOL { - EFI_COMPONENT_NAME2_GET_DRIVER_NAME GetDriverName; - EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME GetControllerName; + EFI_COMPONENT_NAME2_GET_DRIVER_NAME GetDriverName; + EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME GetControllerName; /// /// A Null-terminated ASCII string array that contains one or more @@ -158,9 +156,9 @@ struct _EFI_COMPONENT_NAME2_PROTOCOL { /// driver is up to the driver writer. SupportedLanguages is /// specified in RFC 4646 format. /// - CHAR8 *SupportedLanguages; + CHAR8 *SupportedLanguages; }; -extern EFI_GUID gEfiComponentName2ProtocolGuid; +extern EFI_GUID gEfiComponentName2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Cpu.h b/MdePkg/Include/Protocol/Cpu.h index e392f4cd9a..3d25ad08f8 100644 --- a/MdePkg/Include/Protocol/Cpu.h +++ b/MdePkg/Include/Protocol/Cpu.h @@ -16,7 +16,7 @@ #define EFI_CPU_ARCH_PROTOCOL_GUID \ { 0x26baccb1, 0x6f42, 0x11d4, {0xbc, 0xe7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } } -typedef struct _EFI_CPU_ARCH_PROTOCOL EFI_CPU_ARCH_PROTOCOL; +typedef struct _EFI_CPU_ARCH_PROTOCOL EFI_CPU_ARCH_PROTOCOL; /// /// The type of flush operation @@ -90,7 +90,6 @@ EFI_STATUS IN EFI_CPU_FLUSH_TYPE FlushType ); - /** This function enables interrupt processing by the processor. @@ -106,7 +105,6 @@ EFI_STATUS IN EFI_CPU_ARCH_PROTOCOL *This ); - /** This function disables interrupt processing by the processor. @@ -122,7 +120,6 @@ EFI_STATUS IN EFI_CPU_ARCH_PROTOCOL *This ); - /** This function retrieves the processor's current interrupt state a returns it in State. If interrupts are currently enabled, then TRUE is returned. If interrupts @@ -143,7 +140,6 @@ EFI_STATUS OUT BOOLEAN *State ); - /** This function generates an INIT on the processor. If this function succeeds, then the processor will be reset, and control will not be returned to the caller. If InitType is @@ -167,7 +163,6 @@ EFI_STATUS IN EFI_CPU_INIT_TYPE InitType ); - /** This function registers and enables the handler specified by InterruptHandler for a processor interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the @@ -197,7 +192,6 @@ EFI_STATUS IN EFI_CPU_INTERRUPT_HANDLER InterruptHandler ); - /** This function reads the processor timer specified by TimerIndex and returns it in TimerValue. @@ -224,7 +218,6 @@ EFI_STATUS OUT UINT64 *TimerPeriod OPTIONAL ); - /** This function modifies the attributes for the memory region specified by BaseAddress and Length from their current attributes to the attributes specified by Attributes. @@ -257,7 +250,6 @@ EFI_STATUS IN UINT64 Attributes ); - /// /// The EFI_CPU_ARCH_PROTOCOL is used to abstract processor-specific functions from the DXE /// Foundation. This includes flushing caches, enabling and disabling interrupts, hooking interrupt @@ -265,20 +257,20 @@ EFI_STATUS /// determining the processor frequency. /// struct _EFI_CPU_ARCH_PROTOCOL { - EFI_CPU_FLUSH_DATA_CACHE FlushDataCache; - EFI_CPU_ENABLE_INTERRUPT EnableInterrupt; - EFI_CPU_DISABLE_INTERRUPT DisableInterrupt; - EFI_CPU_GET_INTERRUPT_STATE GetInterruptState; - EFI_CPU_INIT Init; - EFI_CPU_REGISTER_INTERRUPT_HANDLER RegisterInterruptHandler; - EFI_CPU_GET_TIMER_VALUE GetTimerValue; - EFI_CPU_SET_MEMORY_ATTRIBUTES SetMemoryAttributes; + EFI_CPU_FLUSH_DATA_CACHE FlushDataCache; + EFI_CPU_ENABLE_INTERRUPT EnableInterrupt; + EFI_CPU_DISABLE_INTERRUPT DisableInterrupt; + EFI_CPU_GET_INTERRUPT_STATE GetInterruptState; + EFI_CPU_INIT Init; + EFI_CPU_REGISTER_INTERRUPT_HANDLER RegisterInterruptHandler; + EFI_CPU_GET_TIMER_VALUE GetTimerValue; + EFI_CPU_SET_MEMORY_ATTRIBUTES SetMemoryAttributes; /// /// The number of timers that are available in a processor. The value in this /// field is a constant that must not be modified after the CPU Architectural /// Protocol is installed. All consumers must treat this as a read-only field. /// - UINT32 NumberOfTimers; + UINT32 NumberOfTimers; /// /// The size, in bytes, of the alignment required for DMA buffer allocations. /// This is typically the size of the largest data cache line in the platform. @@ -286,9 +278,9 @@ struct _EFI_CPU_ARCH_PROTOCOL { /// CPU Architectural Protocol is installed. All consumers must treat this as /// a read-only field. /// - UINT32 DmaBufferAlignment; + UINT32 DmaBufferAlignment; }; -extern EFI_GUID gEfiCpuArchProtocolGuid; +extern EFI_GUID gEfiCpuArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/CpuIo2.h b/MdePkg/Include/Protocol/CpuIo2.h index 2eac429f3b..39ddda62bf 100644 --- a/MdePkg/Include/Protocol/CpuIo2.h +++ b/MdePkg/Include/Protocol/CpuIo2.h @@ -109,11 +109,11 @@ typedef struct { /// /// This service provides the various modalities of memory and I/O read. /// - EFI_CPU_IO_PROTOCOL_IO_MEM Read; + EFI_CPU_IO_PROTOCOL_IO_MEM Read; /// /// This service provides the various modalities of memory and I/O write. /// - EFI_CPU_IO_PROTOCOL_IO_MEM Write; + EFI_CPU_IO_PROTOCOL_IO_MEM Write; } EFI_CPU_IO_PROTOCOL_ACCESS; /// @@ -124,13 +124,13 @@ struct _EFI_CPU_IO2_PROTOCOL { /// /// Enables a driver to access memory-mapped registers in the EFI system memory space. /// - EFI_CPU_IO_PROTOCOL_ACCESS Mem; + EFI_CPU_IO_PROTOCOL_ACCESS Mem; /// /// Enables a driver to access registers in the EFI CPU I/O space. /// - EFI_CPU_IO_PROTOCOL_ACCESS Io; + EFI_CPU_IO_PROTOCOL_ACCESS Io; }; -extern EFI_GUID gEfiCpuIo2ProtocolGuid; +extern EFI_GUID gEfiCpuIo2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DebugPort.h b/MdePkg/Include/Protocol/DebugPort.h index d6accb5d3a..f90a40424a 100644 --- a/MdePkg/Include/Protocol/DebugPort.h +++ b/MdePkg/Include/Protocol/DebugPort.h @@ -12,7 +12,6 @@ #ifndef __DEBUG_PORT_H__ #define __DEBUG_PORT_H__ - /// /// DebugPortIo protocol {EBA4E8D2-3858-41EC-A281-2647BA9660D0} /// @@ -21,7 +20,7 @@ 0xEBA4E8D2, 0x3858, 0x41EC, {0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 } \ } -extern EFI_GUID gEfiDebugPortProtocolGuid; +extern EFI_GUID gEfiDebugPortProtocolGuid; typedef struct _EFI_DEBUGPORT_PROTOCOL EFI_DEBUGPORT_PROTOCOL; @@ -111,30 +110,30 @@ EFI_STATUS /// This protocol provides the communication link between the debug agent and the remote host. /// struct _EFI_DEBUGPORT_PROTOCOL { - EFI_DEBUGPORT_RESET Reset; - EFI_DEBUGPORT_WRITE Write; - EFI_DEBUGPORT_READ Read; - EFI_DEBUGPORT_POLL Poll; + EFI_DEBUGPORT_RESET Reset; + EFI_DEBUGPORT_WRITE Write; + EFI_DEBUGPORT_READ Read; + EFI_DEBUGPORT_POLL Poll; }; // // DEBUGPORT variable definitions... // -#define EFI_DEBUGPORT_VARIABLE_NAME L"DEBUGPORT" -#define EFI_DEBUGPORT_VARIABLE_GUID EFI_DEBUGPORT_PROTOCOL_GUID +#define EFI_DEBUGPORT_VARIABLE_NAME L"DEBUGPORT" +#define EFI_DEBUGPORT_VARIABLE_GUID EFI_DEBUGPORT_PROTOCOL_GUID extern EFI_GUID gEfiDebugPortVariableGuid; // // DebugPort device path definitions... // -#define DEVICE_PATH_MESSAGING_DEBUGPORT EFI_DEBUGPORT_PROTOCOL_GUID +#define DEVICE_PATH_MESSAGING_DEBUGPORT EFI_DEBUGPORT_PROTOCOL_GUID extern EFI_GUID gEfiDebugPortDevicePathGuid; typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - EFI_GUID Guid; + EFI_DEVICE_PATH_PROTOCOL Header; + EFI_GUID Guid; } DEBUGPORT_DEVICE_PATH; #endif diff --git a/MdePkg/Include/Protocol/DebugSupport.h b/MdePkg/Include/Protocol/DebugSupport.h index 7fb1d3b3e4..ec5b92a5c5 100644 --- a/MdePkg/Include/Protocol/DebugSupport.h +++ b/MdePkg/Include/Protocol/DebugSupport.h @@ -32,221 +32,221 @@ typedef struct _EFI_DEBUG_SUPPORT_PROTOCOL EFI_DEBUG_SUPPORT_PROTOCOL; /// Processor exception to be hooked. /// All exception types for IA32, X64, Itanium and EBC processors are defined. /// -typedef INTN EFI_EXCEPTION_TYPE; +typedef INTN EFI_EXCEPTION_TYPE; /// /// IA-32 processor exception types. /// -#define EXCEPT_IA32_DIVIDE_ERROR 0 -#define EXCEPT_IA32_DEBUG 1 -#define EXCEPT_IA32_NMI 2 -#define EXCEPT_IA32_BREAKPOINT 3 -#define EXCEPT_IA32_OVERFLOW 4 -#define EXCEPT_IA32_BOUND 5 -#define EXCEPT_IA32_INVALID_OPCODE 6 -#define EXCEPT_IA32_DOUBLE_FAULT 8 -#define EXCEPT_IA32_INVALID_TSS 10 -#define EXCEPT_IA32_SEG_NOT_PRESENT 11 -#define EXCEPT_IA32_STACK_FAULT 12 -#define EXCEPT_IA32_GP_FAULT 13 -#define EXCEPT_IA32_PAGE_FAULT 14 -#define EXCEPT_IA32_FP_ERROR 16 -#define EXCEPT_IA32_ALIGNMENT_CHECK 17 -#define EXCEPT_IA32_MACHINE_CHECK 18 -#define EXCEPT_IA32_SIMD 19 +#define EXCEPT_IA32_DIVIDE_ERROR 0 +#define EXCEPT_IA32_DEBUG 1 +#define EXCEPT_IA32_NMI 2 +#define EXCEPT_IA32_BREAKPOINT 3 +#define EXCEPT_IA32_OVERFLOW 4 +#define EXCEPT_IA32_BOUND 5 +#define EXCEPT_IA32_INVALID_OPCODE 6 +#define EXCEPT_IA32_DOUBLE_FAULT 8 +#define EXCEPT_IA32_INVALID_TSS 10 +#define EXCEPT_IA32_SEG_NOT_PRESENT 11 +#define EXCEPT_IA32_STACK_FAULT 12 +#define EXCEPT_IA32_GP_FAULT 13 +#define EXCEPT_IA32_PAGE_FAULT 14 +#define EXCEPT_IA32_FP_ERROR 16 +#define EXCEPT_IA32_ALIGNMENT_CHECK 17 +#define EXCEPT_IA32_MACHINE_CHECK 18 +#define EXCEPT_IA32_SIMD 19 /// /// FXSAVE_STATE. /// FP / MMX / XMM registers (see fxrstor instruction definition). /// typedef struct { - UINT16 Fcw; - UINT16 Fsw; - UINT16 Ftw; - UINT16 Opcode; - UINT32 Eip; - UINT16 Cs; - UINT16 Reserved1; - UINT32 DataOffset; - UINT16 Ds; - UINT8 Reserved2[10]; - UINT8 St0Mm0[10], Reserved3[6]; - UINT8 St1Mm1[10], Reserved4[6]; - UINT8 St2Mm2[10], Reserved5[6]; - UINT8 St3Mm3[10], Reserved6[6]; - UINT8 St4Mm4[10], Reserved7[6]; - UINT8 St5Mm5[10], Reserved8[6]; - UINT8 St6Mm6[10], Reserved9[6]; - UINT8 St7Mm7[10], Reserved10[6]; - UINT8 Xmm0[16]; - UINT8 Xmm1[16]; - UINT8 Xmm2[16]; - UINT8 Xmm3[16]; - UINT8 Xmm4[16]; - UINT8 Xmm5[16]; - UINT8 Xmm6[16]; - UINT8 Xmm7[16]; - UINT8 Reserved11[14 * 16]; + UINT16 Fcw; + UINT16 Fsw; + UINT16 Ftw; + UINT16 Opcode; + UINT32 Eip; + UINT16 Cs; + UINT16 Reserved1; + UINT32 DataOffset; + UINT16 Ds; + UINT8 Reserved2[10]; + UINT8 St0Mm0[10], Reserved3[6]; + UINT8 St1Mm1[10], Reserved4[6]; + UINT8 St2Mm2[10], Reserved5[6]; + UINT8 St3Mm3[10], Reserved6[6]; + UINT8 St4Mm4[10], Reserved7[6]; + UINT8 St5Mm5[10], Reserved8[6]; + UINT8 St6Mm6[10], Reserved9[6]; + UINT8 St7Mm7[10], Reserved10[6]; + UINT8 Xmm0[16]; + UINT8 Xmm1[16]; + UINT8 Xmm2[16]; + UINT8 Xmm3[16]; + UINT8 Xmm4[16]; + UINT8 Xmm5[16]; + UINT8 Xmm6[16]; + UINT8 Xmm7[16]; + UINT8 Reserved11[14 * 16]; } EFI_FX_SAVE_STATE_IA32; /// /// IA-32 processor context definition. /// typedef struct { - UINT32 ExceptionData; - EFI_FX_SAVE_STATE_IA32 FxSaveState; - UINT32 Dr0; - UINT32 Dr1; - UINT32 Dr2; - UINT32 Dr3; - UINT32 Dr6; - UINT32 Dr7; - UINT32 Cr0; - UINT32 Cr1; /* Reserved */ - UINT32 Cr2; - UINT32 Cr3; - UINT32 Cr4; - UINT32 Eflags; - UINT32 Ldtr; - UINT32 Tr; - UINT32 Gdtr[2]; - UINT32 Idtr[2]; - UINT32 Eip; - UINT32 Gs; - UINT32 Fs; - UINT32 Es; - UINT32 Ds; - UINT32 Cs; - UINT32 Ss; - UINT32 Edi; - UINT32 Esi; - UINT32 Ebp; - UINT32 Esp; - UINT32 Ebx; - UINT32 Edx; - UINT32 Ecx; - UINT32 Eax; + UINT32 ExceptionData; + EFI_FX_SAVE_STATE_IA32 FxSaveState; + UINT32 Dr0; + UINT32 Dr1; + UINT32 Dr2; + UINT32 Dr3; + UINT32 Dr6; + UINT32 Dr7; + UINT32 Cr0; + UINT32 Cr1; /* Reserved */ + UINT32 Cr2; + UINT32 Cr3; + UINT32 Cr4; + UINT32 Eflags; + UINT32 Ldtr; + UINT32 Tr; + UINT32 Gdtr[2]; + UINT32 Idtr[2]; + UINT32 Eip; + UINT32 Gs; + UINT32 Fs; + UINT32 Es; + UINT32 Ds; + UINT32 Cs; + UINT32 Ss; + UINT32 Edi; + UINT32 Esi; + UINT32 Ebp; + UINT32 Esp; + UINT32 Ebx; + UINT32 Edx; + UINT32 Ecx; + UINT32 Eax; } EFI_SYSTEM_CONTEXT_IA32; /// /// x64 processor exception types. /// -#define EXCEPT_X64_DIVIDE_ERROR 0 -#define EXCEPT_X64_DEBUG 1 -#define EXCEPT_X64_NMI 2 -#define EXCEPT_X64_BREAKPOINT 3 -#define EXCEPT_X64_OVERFLOW 4 -#define EXCEPT_X64_BOUND 5 -#define EXCEPT_X64_INVALID_OPCODE 6 -#define EXCEPT_X64_DOUBLE_FAULT 8 -#define EXCEPT_X64_INVALID_TSS 10 -#define EXCEPT_X64_SEG_NOT_PRESENT 11 -#define EXCEPT_X64_STACK_FAULT 12 -#define EXCEPT_X64_GP_FAULT 13 -#define EXCEPT_X64_PAGE_FAULT 14 -#define EXCEPT_X64_FP_ERROR 16 -#define EXCEPT_X64_ALIGNMENT_CHECK 17 -#define EXCEPT_X64_MACHINE_CHECK 18 -#define EXCEPT_X64_SIMD 19 +#define EXCEPT_X64_DIVIDE_ERROR 0 +#define EXCEPT_X64_DEBUG 1 +#define EXCEPT_X64_NMI 2 +#define EXCEPT_X64_BREAKPOINT 3 +#define EXCEPT_X64_OVERFLOW 4 +#define EXCEPT_X64_BOUND 5 +#define EXCEPT_X64_INVALID_OPCODE 6 +#define EXCEPT_X64_DOUBLE_FAULT 8 +#define EXCEPT_X64_INVALID_TSS 10 +#define EXCEPT_X64_SEG_NOT_PRESENT 11 +#define EXCEPT_X64_STACK_FAULT 12 +#define EXCEPT_X64_GP_FAULT 13 +#define EXCEPT_X64_PAGE_FAULT 14 +#define EXCEPT_X64_FP_ERROR 16 +#define EXCEPT_X64_ALIGNMENT_CHECK 17 +#define EXCEPT_X64_MACHINE_CHECK 18 +#define EXCEPT_X64_SIMD 19 /// /// FXSAVE_STATE. /// FP / MMX / XMM registers (see fxrstor instruction definition). /// typedef struct { - UINT16 Fcw; - UINT16 Fsw; - UINT16 Ftw; - UINT16 Opcode; - UINT64 Rip; - UINT64 DataOffset; - UINT8 Reserved1[8]; - UINT8 St0Mm0[10], Reserved2[6]; - UINT8 St1Mm1[10], Reserved3[6]; - UINT8 St2Mm2[10], Reserved4[6]; - UINT8 St3Mm3[10], Reserved5[6]; - UINT8 St4Mm4[10], Reserved6[6]; - UINT8 St5Mm5[10], Reserved7[6]; - UINT8 St6Mm6[10], Reserved8[6]; - UINT8 St7Mm7[10], Reserved9[6]; - UINT8 Xmm0[16]; - UINT8 Xmm1[16]; - UINT8 Xmm2[16]; - UINT8 Xmm3[16]; - UINT8 Xmm4[16]; - UINT8 Xmm5[16]; - UINT8 Xmm6[16]; - UINT8 Xmm7[16]; + UINT16 Fcw; + UINT16 Fsw; + UINT16 Ftw; + UINT16 Opcode; + UINT64 Rip; + UINT64 DataOffset; + UINT8 Reserved1[8]; + UINT8 St0Mm0[10], Reserved2[6]; + UINT8 St1Mm1[10], Reserved3[6]; + UINT8 St2Mm2[10], Reserved4[6]; + UINT8 St3Mm3[10], Reserved5[6]; + UINT8 St4Mm4[10], Reserved6[6]; + UINT8 St5Mm5[10], Reserved7[6]; + UINT8 St6Mm6[10], Reserved8[6]; + UINT8 St7Mm7[10], Reserved9[6]; + UINT8 Xmm0[16]; + UINT8 Xmm1[16]; + UINT8 Xmm2[16]; + UINT8 Xmm3[16]; + UINT8 Xmm4[16]; + UINT8 Xmm5[16]; + UINT8 Xmm6[16]; + UINT8 Xmm7[16]; // // NOTE: UEFI 2.0 spec definition as follows. // - UINT8 Reserved11[14 * 16]; + UINT8 Reserved11[14 * 16]; } EFI_FX_SAVE_STATE_X64; /// /// x64 processor context definition. /// typedef struct { - UINT64 ExceptionData; - EFI_FX_SAVE_STATE_X64 FxSaveState; - UINT64 Dr0; - UINT64 Dr1; - UINT64 Dr2; - UINT64 Dr3; - UINT64 Dr6; - UINT64 Dr7; - UINT64 Cr0; - UINT64 Cr1; /* Reserved */ - UINT64 Cr2; - UINT64 Cr3; - UINT64 Cr4; - UINT64 Cr8; - UINT64 Rflags; - UINT64 Ldtr; - UINT64 Tr; - UINT64 Gdtr[2]; - UINT64 Idtr[2]; - UINT64 Rip; - UINT64 Gs; - UINT64 Fs; - UINT64 Es; - UINT64 Ds; - UINT64 Cs; - UINT64 Ss; - UINT64 Rdi; - UINT64 Rsi; - UINT64 Rbp; - UINT64 Rsp; - UINT64 Rbx; - UINT64 Rdx; - UINT64 Rcx; - UINT64 Rax; - UINT64 R8; - UINT64 R9; - UINT64 R10; - UINT64 R11; - UINT64 R12; - UINT64 R13; - UINT64 R14; - UINT64 R15; + UINT64 ExceptionData; + EFI_FX_SAVE_STATE_X64 FxSaveState; + UINT64 Dr0; + UINT64 Dr1; + UINT64 Dr2; + UINT64 Dr3; + UINT64 Dr6; + UINT64 Dr7; + UINT64 Cr0; + UINT64 Cr1; /* Reserved */ + UINT64 Cr2; + UINT64 Cr3; + UINT64 Cr4; + UINT64 Cr8; + UINT64 Rflags; + UINT64 Ldtr; + UINT64 Tr; + UINT64 Gdtr[2]; + UINT64 Idtr[2]; + UINT64 Rip; + UINT64 Gs; + UINT64 Fs; + UINT64 Es; + UINT64 Ds; + UINT64 Cs; + UINT64 Ss; + UINT64 Rdi; + UINT64 Rsi; + UINT64 Rbp; + UINT64 Rsp; + UINT64 Rbx; + UINT64 Rdx; + UINT64 Rcx; + UINT64 Rax; + UINT64 R8; + UINT64 R9; + UINT64 R10; + UINT64 R11; + UINT64 R12; + UINT64 R13; + UINT64 R14; + UINT64 R15; } EFI_SYSTEM_CONTEXT_X64; /// /// Itanium Processor Family Exception types. /// -#define EXCEPT_IPF_VHTP_TRANSLATION 0 -#define EXCEPT_IPF_INSTRUCTION_TLB 1 -#define EXCEPT_IPF_DATA_TLB 2 -#define EXCEPT_IPF_ALT_INSTRUCTION_TLB 3 -#define EXCEPT_IPF_ALT_DATA_TLB 4 -#define EXCEPT_IPF_DATA_NESTED_TLB 5 -#define EXCEPT_IPF_INSTRUCTION_KEY_MISSED 6 -#define EXCEPT_IPF_DATA_KEY_MISSED 7 -#define EXCEPT_IPF_DIRTY_BIT 8 -#define EXCEPT_IPF_INSTRUCTION_ACCESS_BIT 9 -#define EXCEPT_IPF_DATA_ACCESS_BIT 10 -#define EXCEPT_IPF_BREAKPOINT 11 -#define EXCEPT_IPF_EXTERNAL_INTERRUPT 12 +#define EXCEPT_IPF_VHTP_TRANSLATION 0 +#define EXCEPT_IPF_INSTRUCTION_TLB 1 +#define EXCEPT_IPF_DATA_TLB 2 +#define EXCEPT_IPF_ALT_INSTRUCTION_TLB 3 +#define EXCEPT_IPF_ALT_DATA_TLB 4 +#define EXCEPT_IPF_DATA_NESTED_TLB 5 +#define EXCEPT_IPF_INSTRUCTION_KEY_MISSED 6 +#define EXCEPT_IPF_DATA_KEY_MISSED 7 +#define EXCEPT_IPF_DIRTY_BIT 8 +#define EXCEPT_IPF_INSTRUCTION_ACCESS_BIT 9 +#define EXCEPT_IPF_DATA_ACCESS_BIT 10 +#define EXCEPT_IPF_BREAKPOINT 11 +#define EXCEPT_IPF_EXTERNAL_INTERRUPT 12 // // 13 - 19 reserved // @@ -272,9 +272,9 @@ typedef struct { // // 37 - 44 reserved // -#define EXCEPT_IPF_IA32_EXCEPTION 45 -#define EXCEPT_IPF_IA32_INTERCEPT 46 -#define EXCEPT_IPF_IA32_INTERRUPT 47 +#define EXCEPT_IPF_IA32_EXCEPTION 45 +#define EXCEPT_IPF_IA32_INTERCEPT 46 +#define EXCEPT_IPF_IA32_INTERRUPT 47 /// /// IPF processor context definition. @@ -284,391 +284,387 @@ typedef struct { // The first reserved field is necessary to preserve alignment for the correct // bits in UNAT and to insure F2 is 16 byte aligned. // - UINT64 Reserved; - UINT64 R1; - UINT64 R2; - UINT64 R3; - UINT64 R4; - UINT64 R5; - UINT64 R6; - UINT64 R7; - UINT64 R8; - UINT64 R9; - UINT64 R10; - UINT64 R11; - UINT64 R12; - UINT64 R13; - UINT64 R14; - UINT64 R15; - UINT64 R16; - UINT64 R17; - UINT64 R18; - UINT64 R19; - UINT64 R20; - UINT64 R21; - UINT64 R22; - UINT64 R23; - UINT64 R24; - UINT64 R25; - UINT64 R26; - UINT64 R27; - UINT64 R28; - UINT64 R29; - UINT64 R30; - UINT64 R31; - - UINT64 F2[2]; - UINT64 F3[2]; - UINT64 F4[2]; - UINT64 F5[2]; - UINT64 F6[2]; - UINT64 F7[2]; - UINT64 F8[2]; - UINT64 F9[2]; - UINT64 F10[2]; - UINT64 F11[2]; - UINT64 F12[2]; - UINT64 F13[2]; - UINT64 F14[2]; - UINT64 F15[2]; - UINT64 F16[2]; - UINT64 F17[2]; - UINT64 F18[2]; - UINT64 F19[2]; - UINT64 F20[2]; - UINT64 F21[2]; - UINT64 F22[2]; - UINT64 F23[2]; - UINT64 F24[2]; - UINT64 F25[2]; - UINT64 F26[2]; - UINT64 F27[2]; - UINT64 F28[2]; - UINT64 F29[2]; - UINT64 F30[2]; - UINT64 F31[2]; - - UINT64 Pr; - - UINT64 B0; - UINT64 B1; - UINT64 B2; - UINT64 B3; - UINT64 B4; - UINT64 B5; - UINT64 B6; - UINT64 B7; + UINT64 Reserved; + UINT64 R1; + UINT64 R2; + UINT64 R3; + UINT64 R4; + UINT64 R5; + UINT64 R6; + UINT64 R7; + UINT64 R8; + UINT64 R9; + UINT64 R10; + UINT64 R11; + UINT64 R12; + UINT64 R13; + UINT64 R14; + UINT64 R15; + UINT64 R16; + UINT64 R17; + UINT64 R18; + UINT64 R19; + UINT64 R20; + UINT64 R21; + UINT64 R22; + UINT64 R23; + UINT64 R24; + UINT64 R25; + UINT64 R26; + UINT64 R27; + UINT64 R28; + UINT64 R29; + UINT64 R30; + UINT64 R31; + + UINT64 F2[2]; + UINT64 F3[2]; + UINT64 F4[2]; + UINT64 F5[2]; + UINT64 F6[2]; + UINT64 F7[2]; + UINT64 F8[2]; + UINT64 F9[2]; + UINT64 F10[2]; + UINT64 F11[2]; + UINT64 F12[2]; + UINT64 F13[2]; + UINT64 F14[2]; + UINT64 F15[2]; + UINT64 F16[2]; + UINT64 F17[2]; + UINT64 F18[2]; + UINT64 F19[2]; + UINT64 F20[2]; + UINT64 F21[2]; + UINT64 F22[2]; + UINT64 F23[2]; + UINT64 F24[2]; + UINT64 F25[2]; + UINT64 F26[2]; + UINT64 F27[2]; + UINT64 F28[2]; + UINT64 F29[2]; + UINT64 F30[2]; + UINT64 F31[2]; + + UINT64 Pr; + + UINT64 B0; + UINT64 B1; + UINT64 B2; + UINT64 B3; + UINT64 B4; + UINT64 B5; + UINT64 B6; + UINT64 B7; // // application registers // - UINT64 ArRsc; - UINT64 ArBsp; - UINT64 ArBspstore; - UINT64 ArRnat; + UINT64 ArRsc; + UINT64 ArBsp; + UINT64 ArBspstore; + UINT64 ArRnat; - UINT64 ArFcr; + UINT64 ArFcr; - UINT64 ArEflag; - UINT64 ArCsd; - UINT64 ArSsd; - UINT64 ArCflg; - UINT64 ArFsr; - UINT64 ArFir; - UINT64 ArFdr; + UINT64 ArEflag; + UINT64 ArCsd; + UINT64 ArSsd; + UINT64 ArCflg; + UINT64 ArFsr; + UINT64 ArFir; + UINT64 ArFdr; - UINT64 ArCcv; + UINT64 ArCcv; - UINT64 ArUnat; + UINT64 ArUnat; - UINT64 ArFpsr; + UINT64 ArFpsr; - UINT64 ArPfs; - UINT64 ArLc; - UINT64 ArEc; + UINT64 ArPfs; + UINT64 ArLc; + UINT64 ArEc; // // control registers // - UINT64 CrDcr; - UINT64 CrItm; - UINT64 CrIva; - UINT64 CrPta; - UINT64 CrIpsr; - UINT64 CrIsr; - UINT64 CrIip; - UINT64 CrIfa; - UINT64 CrItir; - UINT64 CrIipa; - UINT64 CrIfs; - UINT64 CrIim; - UINT64 CrIha; + UINT64 CrDcr; + UINT64 CrItm; + UINT64 CrIva; + UINT64 CrPta; + UINT64 CrIpsr; + UINT64 CrIsr; + UINT64 CrIip; + UINT64 CrIfa; + UINT64 CrItir; + UINT64 CrIipa; + UINT64 CrIfs; + UINT64 CrIim; + UINT64 CrIha; // // debug registers // - UINT64 Dbr0; - UINT64 Dbr1; - UINT64 Dbr2; - UINT64 Dbr3; - UINT64 Dbr4; - UINT64 Dbr5; - UINT64 Dbr6; - UINT64 Dbr7; - - UINT64 Ibr0; - UINT64 Ibr1; - UINT64 Ibr2; - UINT64 Ibr3; - UINT64 Ibr4; - UINT64 Ibr5; - UINT64 Ibr6; - UINT64 Ibr7; + UINT64 Dbr0; + UINT64 Dbr1; + UINT64 Dbr2; + UINT64 Dbr3; + UINT64 Dbr4; + UINT64 Dbr5; + UINT64 Dbr6; + UINT64 Dbr7; + + UINT64 Ibr0; + UINT64 Ibr1; + UINT64 Ibr2; + UINT64 Ibr3; + UINT64 Ibr4; + UINT64 Ibr5; + UINT64 Ibr6; + UINT64 Ibr7; // // virtual registers - nat bits for R1-R31 // - UINT64 IntNat; - + UINT64 IntNat; } EFI_SYSTEM_CONTEXT_IPF; /// /// EBC processor exception types. /// -#define EXCEPT_EBC_UNDEFINED 0 -#define EXCEPT_EBC_DIVIDE_ERROR 1 -#define EXCEPT_EBC_DEBUG 2 -#define EXCEPT_EBC_BREAKPOINT 3 -#define EXCEPT_EBC_OVERFLOW 4 -#define EXCEPT_EBC_INVALID_OPCODE 5 ///< Opcode out of range. -#define EXCEPT_EBC_STACK_FAULT 6 -#define EXCEPT_EBC_ALIGNMENT_CHECK 7 -#define EXCEPT_EBC_INSTRUCTION_ENCODING 8 ///< Malformed instruction. -#define EXCEPT_EBC_BAD_BREAK 9 ///< BREAK 0 or undefined BREAK. -#define EXCEPT_EBC_STEP 10 ///< To support debug stepping. +#define EXCEPT_EBC_UNDEFINED 0 +#define EXCEPT_EBC_DIVIDE_ERROR 1 +#define EXCEPT_EBC_DEBUG 2 +#define EXCEPT_EBC_BREAKPOINT 3 +#define EXCEPT_EBC_OVERFLOW 4 +#define EXCEPT_EBC_INVALID_OPCODE 5 ///< Opcode out of range. +#define EXCEPT_EBC_STACK_FAULT 6 +#define EXCEPT_EBC_ALIGNMENT_CHECK 7 +#define EXCEPT_EBC_INSTRUCTION_ENCODING 8 ///< Malformed instruction. +#define EXCEPT_EBC_BAD_BREAK 9 ///< BREAK 0 or undefined BREAK. +#define EXCEPT_EBC_STEP 10 ///< To support debug stepping. /// /// For coding convenience, define the maximum valid EBC exception. /// -#define MAX_EBC_EXCEPTION EXCEPT_EBC_STEP +#define MAX_EBC_EXCEPTION EXCEPT_EBC_STEP /// /// EBC processor context definition. /// typedef struct { - UINT64 R0; - UINT64 R1; - UINT64 R2; - UINT64 R3; - UINT64 R4; - UINT64 R5; - UINT64 R6; - UINT64 R7; - UINT64 Flags; - UINT64 ControlFlags; - UINT64 Ip; + UINT64 R0; + UINT64 R1; + UINT64 R2; + UINT64 R3; + UINT64 R4; + UINT64 R5; + UINT64 R6; + UINT64 R7; + UINT64 Flags; + UINT64 ControlFlags; + UINT64 Ip; } EFI_SYSTEM_CONTEXT_EBC; - - /// /// ARM processor exception types. /// -#define EXCEPT_ARM_RESET 0 -#define EXCEPT_ARM_UNDEFINED_INSTRUCTION 1 -#define EXCEPT_ARM_SOFTWARE_INTERRUPT 2 -#define EXCEPT_ARM_PREFETCH_ABORT 3 -#define EXCEPT_ARM_DATA_ABORT 4 -#define EXCEPT_ARM_RESERVED 5 -#define EXCEPT_ARM_IRQ 6 -#define EXCEPT_ARM_FIQ 7 +#define EXCEPT_ARM_RESET 0 +#define EXCEPT_ARM_UNDEFINED_INSTRUCTION 1 +#define EXCEPT_ARM_SOFTWARE_INTERRUPT 2 +#define EXCEPT_ARM_PREFETCH_ABORT 3 +#define EXCEPT_ARM_DATA_ABORT 4 +#define EXCEPT_ARM_RESERVED 5 +#define EXCEPT_ARM_IRQ 6 +#define EXCEPT_ARM_FIQ 7 /// /// For coding convenience, define the maximum valid ARM exception. /// -#define MAX_ARM_EXCEPTION EXCEPT_ARM_FIQ +#define MAX_ARM_EXCEPTION EXCEPT_ARM_FIQ /// /// ARM processor context definition. /// typedef struct { - UINT32 R0; - UINT32 R1; - UINT32 R2; - UINT32 R3; - UINT32 R4; - UINT32 R5; - UINT32 R6; - UINT32 R7; - UINT32 R8; - UINT32 R9; - UINT32 R10; - UINT32 R11; - UINT32 R12; - UINT32 SP; - UINT32 LR; - UINT32 PC; - UINT32 CPSR; - UINT32 DFSR; - UINT32 DFAR; - UINT32 IFSR; - UINT32 IFAR; + UINT32 R0; + UINT32 R1; + UINT32 R2; + UINT32 R3; + UINT32 R4; + UINT32 R5; + UINT32 R6; + UINT32 R7; + UINT32 R8; + UINT32 R9; + UINT32 R10; + UINT32 R11; + UINT32 R12; + UINT32 SP; + UINT32 LR; + UINT32 PC; + UINT32 CPSR; + UINT32 DFSR; + UINT32 DFAR; + UINT32 IFSR; + UINT32 IFAR; } EFI_SYSTEM_CONTEXT_ARM; - /// /// AARCH64 processor exception types. /// -#define EXCEPT_AARCH64_SYNCHRONOUS_EXCEPTIONS 0 -#define EXCEPT_AARCH64_IRQ 1 -#define EXCEPT_AARCH64_FIQ 2 -#define EXCEPT_AARCH64_SERROR 3 +#define EXCEPT_AARCH64_SYNCHRONOUS_EXCEPTIONS 0 +#define EXCEPT_AARCH64_IRQ 1 +#define EXCEPT_AARCH64_FIQ 2 +#define EXCEPT_AARCH64_SERROR 3 /// /// For coding convenience, define the maximum valid ARM exception. /// -#define MAX_AARCH64_EXCEPTION EXCEPT_AARCH64_SERROR +#define MAX_AARCH64_EXCEPTION EXCEPT_AARCH64_SERROR typedef struct { // General Purpose Registers - UINT64 X0; - UINT64 X1; - UINT64 X2; - UINT64 X3; - UINT64 X4; - UINT64 X5; - UINT64 X6; - UINT64 X7; - UINT64 X8; - UINT64 X9; - UINT64 X10; - UINT64 X11; - UINT64 X12; - UINT64 X13; - UINT64 X14; - UINT64 X15; - UINT64 X16; - UINT64 X17; - UINT64 X18; - UINT64 X19; - UINT64 X20; - UINT64 X21; - UINT64 X22; - UINT64 X23; - UINT64 X24; - UINT64 X25; - UINT64 X26; - UINT64 X27; - UINT64 X28; - UINT64 FP; // x29 - Frame pointer - UINT64 LR; // x30 - Link Register - UINT64 SP; // x31 - Stack pointer + UINT64 X0; + UINT64 X1; + UINT64 X2; + UINT64 X3; + UINT64 X4; + UINT64 X5; + UINT64 X6; + UINT64 X7; + UINT64 X8; + UINT64 X9; + UINT64 X10; + UINT64 X11; + UINT64 X12; + UINT64 X13; + UINT64 X14; + UINT64 X15; + UINT64 X16; + UINT64 X17; + UINT64 X18; + UINT64 X19; + UINT64 X20; + UINT64 X21; + UINT64 X22; + UINT64 X23; + UINT64 X24; + UINT64 X25; + UINT64 X26; + UINT64 X27; + UINT64 X28; + UINT64 FP; // x29 - Frame pointer + UINT64 LR; // x30 - Link Register + UINT64 SP; // x31 - Stack pointer // FP/SIMD Registers - UINT64 V0[2]; - UINT64 V1[2]; - UINT64 V2[2]; - UINT64 V3[2]; - UINT64 V4[2]; - UINT64 V5[2]; - UINT64 V6[2]; - UINT64 V7[2]; - UINT64 V8[2]; - UINT64 V9[2]; - UINT64 V10[2]; - UINT64 V11[2]; - UINT64 V12[2]; - UINT64 V13[2]; - UINT64 V14[2]; - UINT64 V15[2]; - UINT64 V16[2]; - UINT64 V17[2]; - UINT64 V18[2]; - UINT64 V19[2]; - UINT64 V20[2]; - UINT64 V21[2]; - UINT64 V22[2]; - UINT64 V23[2]; - UINT64 V24[2]; - UINT64 V25[2]; - UINT64 V26[2]; - UINT64 V27[2]; - UINT64 V28[2]; - UINT64 V29[2]; - UINT64 V30[2]; - UINT64 V31[2]; - - UINT64 ELR; // Exception Link Register - UINT64 SPSR; // Saved Processor Status Register - UINT64 FPSR; // Floating Point Status Register - UINT64 ESR; // Exception syndrome register - UINT64 FAR; // Fault Address Register + UINT64 V0[2]; + UINT64 V1[2]; + UINT64 V2[2]; + UINT64 V3[2]; + UINT64 V4[2]; + UINT64 V5[2]; + UINT64 V6[2]; + UINT64 V7[2]; + UINT64 V8[2]; + UINT64 V9[2]; + UINT64 V10[2]; + UINT64 V11[2]; + UINT64 V12[2]; + UINT64 V13[2]; + UINT64 V14[2]; + UINT64 V15[2]; + UINT64 V16[2]; + UINT64 V17[2]; + UINT64 V18[2]; + UINT64 V19[2]; + UINT64 V20[2]; + UINT64 V21[2]; + UINT64 V22[2]; + UINT64 V23[2]; + UINT64 V24[2]; + UINT64 V25[2]; + UINT64 V26[2]; + UINT64 V27[2]; + UINT64 V28[2]; + UINT64 V29[2]; + UINT64 V30[2]; + UINT64 V31[2]; + + UINT64 ELR; // Exception Link Register + UINT64 SPSR; // Saved Processor Status Register + UINT64 FPSR; // Floating Point Status Register + UINT64 ESR; // Exception syndrome register + UINT64 FAR; // Fault Address Register } EFI_SYSTEM_CONTEXT_AARCH64; /// /// RISC-V processor exception types. /// -#define EXCEPT_RISCV_INST_MISALIGNED 0 -#define EXCEPT_RISCV_INST_ACCESS_FAULT 1 -#define EXCEPT_RISCV_ILLEGAL_INST 2 -#define EXCEPT_RISCV_BREAKPOINT 3 -#define EXCEPT_RISCV_LOAD_ADDRESS_MISALIGNED 4 -#define EXCEPT_RISCV_LOAD_ACCESS_FAULT 5 -#define EXCEPT_RISCV_STORE_AMO_ADDRESS_MISALIGNED 6 -#define EXCEPT_RISCV_STORE_AMO_ACCESS_FAULT 7 -#define EXCEPT_RISCV_ENV_CALL_FROM_UMODE 8 -#define EXCEPT_RISCV_ENV_CALL_FROM_SMODE 9 -#define EXCEPT_RISCV_ENV_CALL_FROM_HMODE 10 -#define EXCEPT_RISCV_ENV_CALL_FROM_MMODE 11 - -#define EXCEPT_RISCV_SOFTWARE_INT 0x0 -#define EXCEPT_RISCV_TIMER_INT 0x1 +#define EXCEPT_RISCV_INST_MISALIGNED 0 +#define EXCEPT_RISCV_INST_ACCESS_FAULT 1 +#define EXCEPT_RISCV_ILLEGAL_INST 2 +#define EXCEPT_RISCV_BREAKPOINT 3 +#define EXCEPT_RISCV_LOAD_ADDRESS_MISALIGNED 4 +#define EXCEPT_RISCV_LOAD_ACCESS_FAULT 5 +#define EXCEPT_RISCV_STORE_AMO_ADDRESS_MISALIGNED 6 +#define EXCEPT_RISCV_STORE_AMO_ACCESS_FAULT 7 +#define EXCEPT_RISCV_ENV_CALL_FROM_UMODE 8 +#define EXCEPT_RISCV_ENV_CALL_FROM_SMODE 9 +#define EXCEPT_RISCV_ENV_CALL_FROM_HMODE 10 +#define EXCEPT_RISCV_ENV_CALL_FROM_MMODE 11 + +#define EXCEPT_RISCV_SOFTWARE_INT 0x0 +#define EXCEPT_RISCV_TIMER_INT 0x1 typedef struct { - UINT64 X0; - UINT64 X1; - UINT64 X2; - UINT64 X3; - UINT64 X4; - UINT64 X5; - UINT64 X6; - UINT64 X7; - UINT64 X8; - UINT64 X9; - UINT64 X10; - UINT64 X11; - UINT64 X12; - UINT64 X13; - UINT64 X14; - UINT64 X15; - UINT64 X16; - UINT64 X17; - UINT64 X18; - UINT64 X19; - UINT64 X20; - UINT64 X21; - UINT64 X22; - UINT64 X23; - UINT64 X24; - UINT64 X25; - UINT64 X26; - UINT64 X27; - UINT64 X28; - UINT64 X29; - UINT64 X30; - UINT64 X31; + UINT64 X0; + UINT64 X1; + UINT64 X2; + UINT64 X3; + UINT64 X4; + UINT64 X5; + UINT64 X6; + UINT64 X7; + UINT64 X8; + UINT64 X9; + UINT64 X10; + UINT64 X11; + UINT64 X12; + UINT64 X13; + UINT64 X14; + UINT64 X15; + UINT64 X16; + UINT64 X17; + UINT64 X18; + UINT64 X19; + UINT64 X20; + UINT64 X21; + UINT64 X22; + UINT64 X23; + UINT64 X24; + UINT64 X25; + UINT64 X26; + UINT64 X27; + UINT64 X28; + UINT64 X29; + UINT64 X30; + UINT64 X31; } EFI_SYSTEM_CONTEXT_RISCV64; /// /// Universal EFI_SYSTEM_CONTEXT definition. /// typedef union { - EFI_SYSTEM_CONTEXT_EBC *SystemContextEbc; - EFI_SYSTEM_CONTEXT_IA32 *SystemContextIa32; - EFI_SYSTEM_CONTEXT_X64 *SystemContextX64; - EFI_SYSTEM_CONTEXT_IPF *SystemContextIpf; - EFI_SYSTEM_CONTEXT_ARM *SystemContextArm; - EFI_SYSTEM_CONTEXT_AARCH64 *SystemContextAArch64; - EFI_SYSTEM_CONTEXT_RISCV64 *SystemContextRiscV64; + EFI_SYSTEM_CONTEXT_EBC *SystemContextEbc; + EFI_SYSTEM_CONTEXT_IA32 *SystemContextIa32; + EFI_SYSTEM_CONTEXT_X64 *SystemContextX64; + EFI_SYSTEM_CONTEXT_IPF *SystemContextIpf; + EFI_SYSTEM_CONTEXT_ARM *SystemContextArm; + EFI_SYSTEM_CONTEXT_AARCH64 *SystemContextAArch64; + EFI_SYSTEM_CONTEXT_RISCV64 *SystemContextRiscV64; } EFI_SYSTEM_CONTEXT; // @@ -705,15 +701,14 @@ VOID /// Machine type definition /// typedef enum { - IsaIa32 = IMAGE_FILE_MACHINE_I386, ///< 0x014C - IsaX64 = IMAGE_FILE_MACHINE_X64, ///< 0x8664 - IsaIpf = IMAGE_FILE_MACHINE_IA64, ///< 0x0200 - IsaEbc = IMAGE_FILE_MACHINE_EBC, ///< 0x0EBC - IsaArm = IMAGE_FILE_MACHINE_ARMTHUMB_MIXED, ///< 0x01c2 - IsaAArch64 = IMAGE_FILE_MACHINE_ARM64 ///< 0xAA64 + IsaIa32 = IMAGE_FILE_MACHINE_I386, ///< 0x014C + IsaX64 = IMAGE_FILE_MACHINE_X64, ///< 0x8664 + IsaIpf = IMAGE_FILE_MACHINE_IA64, ///< 0x0200 + IsaEbc = IMAGE_FILE_MACHINE_EBC, ///< 0x0EBC + IsaArm = IMAGE_FILE_MACHINE_ARMTHUMB_MIXED, ///< 0x01c2 + IsaAArch64 = IMAGE_FILE_MACHINE_ARM64 ///< 0xAA64 } EFI_INSTRUCTION_SET_ARCHITECTURE; - // // DebugSupport member function definitions // @@ -815,13 +810,13 @@ struct _EFI_DEBUG_SUPPORT_PROTOCOL { /// /// Declares the processor architecture for this instance of the EFI Debug Support protocol. /// - EFI_INSTRUCTION_SET_ARCHITECTURE Isa; - EFI_GET_MAXIMUM_PROCESSOR_INDEX GetMaximumProcessorIndex; - EFI_REGISTER_PERIODIC_CALLBACK RegisterPeriodicCallback; - EFI_REGISTER_EXCEPTION_CALLBACK RegisterExceptionCallback; - EFI_INVALIDATE_INSTRUCTION_CACHE InvalidateInstructionCache; + EFI_INSTRUCTION_SET_ARCHITECTURE Isa; + EFI_GET_MAXIMUM_PROCESSOR_INDEX GetMaximumProcessorIndex; + EFI_REGISTER_PERIODIC_CALLBACK RegisterPeriodicCallback; + EFI_REGISTER_EXCEPTION_CALLBACK RegisterExceptionCallback; + EFI_INVALIDATE_INSTRUCTION_CACHE InvalidateInstructionCache; }; -extern EFI_GUID gEfiDebugSupportProtocolGuid; +extern EFI_GUID gEfiDebugSupportProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Decompress.h b/MdePkg/Include/Protocol/Decompress.h index 9e6726ef93..964c8f60df 100644 --- a/MdePkg/Include/Protocol/Decompress.h +++ b/MdePkg/Include/Protocol/Decompress.h @@ -14,7 +14,7 @@ 0xd8117cfe, 0x94a6, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ } -typedef struct _EFI_DECOMPRESS_PROTOCOL EFI_DECOMPRESS_PROTOCOL; +typedef struct _EFI_DECOMPRESS_PROTOCOL EFI_DECOMPRESS_PROTOCOL; /** The GetInfo() function retrieves the size of the uncompressed buffer @@ -107,10 +107,10 @@ EFI_STATUS /// Provides a decompression service. /// struct _EFI_DECOMPRESS_PROTOCOL { - EFI_DECOMPRESS_GET_INFO GetInfo; - EFI_DECOMPRESS_DECOMPRESS Decompress; + EFI_DECOMPRESS_GET_INFO GetInfo; + EFI_DECOMPRESS_DECOMPRESS Decompress; }; -extern EFI_GUID gEfiDecompressProtocolGuid; +extern EFI_GUID gEfiDecompressProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DeferredImageLoad.h b/MdePkg/Include/Protocol/DeferredImageLoad.h index 4a201af77f..61c60f41fc 100644 --- a/MdePkg/Include/Protocol/DeferredImageLoad.h +++ b/MdePkg/Include/Protocol/DeferredImageLoad.h @@ -22,7 +22,7 @@ 0x15853d7c, 0x3ddf, 0x43e0, { 0xa1, 0xcb, 0xeb, 0xf8, 0x5b, 0x8f, 0x87, 0x2c } \ }; -typedef struct _EFI_DEFERRED_IMAGE_LOAD_PROTOCOL EFI_DEFERRED_IMAGE_LOAD_PROTOCOL; +typedef struct _EFI_DEFERRED_IMAGE_LOAD_PROTOCOL EFI_DEFERRED_IMAGE_LOAD_PROTOCOL; /** Returns information about a deferred image. @@ -66,9 +66,9 @@ EFI_STATUS /// This protocol returns information about a deferred image. /// struct _EFI_DEFERRED_IMAGE_LOAD_PROTOCOL { - EFI_DEFERRED_IMAGE_INFO GetImageInfo; + EFI_DEFERRED_IMAGE_INFO GetImageInfo; }; -extern EFI_GUID gEfiDeferredImageLoadProtocolGuid; +extern EFI_GUID gEfiDeferredImageLoadProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DeviceIo.h b/MdePkg/Include/Protocol/DeviceIo.h index e157997929..c25b437f72 100644 --- a/MdePkg/Include/Protocol/DeviceIo.h +++ b/MdePkg/Include/Protocol/DeviceIo.h @@ -27,7 +27,7 @@ typedef struct _EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_PROTOCOL; /// /// Protocol defined in EFI1.1. /// -typedef EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_INTERFACE; +typedef EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_INTERFACE; /// /// Device IO Access Width @@ -76,8 +76,8 @@ EFI_STATUS ); typedef struct { - EFI_DEVICE_IO Read; - EFI_DEVICE_IO Write; + EFI_DEVICE_IO Read; + EFI_DEVICE_IO Write; } EFI_IO_ACCESS; /** @@ -240,23 +240,23 @@ struct _EFI_DEVICE_IO_PROTOCOL { /// /// Allows reads and writes to memory mapped I/O space. /// - EFI_IO_ACCESS Mem; + EFI_IO_ACCESS Mem; /// /// Allows reads and writes to I/O space. /// - EFI_IO_ACCESS Io; + EFI_IO_ACCESS Io; /// /// Allows reads and writes to PCI configuration space. /// - EFI_IO_ACCESS Pci; - EFI_IO_MAP Map; - EFI_PCI_DEVICE_PATH PciDevicePath; - EFI_IO_UNMAP Unmap; - EFI_IO_ALLOCATE_BUFFER AllocateBuffer; - EFI_IO_FLUSH Flush; - EFI_IO_FREE_BUFFER FreeBuffer; + EFI_IO_ACCESS Pci; + EFI_IO_MAP Map; + EFI_PCI_DEVICE_PATH PciDevicePath; + EFI_IO_UNMAP Unmap; + EFI_IO_ALLOCATE_BUFFER AllocateBuffer; + EFI_IO_FLUSH Flush; + EFI_IO_FREE_BUFFER FreeBuffer; }; -extern EFI_GUID gEfiDeviceIoProtocolGuid; +extern EFI_GUID gEfiDeviceIoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h index 5914cde304..9060dd782e 100644 --- a/MdePkg/Include/Protocol/DevicePath.h +++ b/MdePkg/Include/Protocol/DevicePath.h @@ -41,97 +41,96 @@ SPDX-License-Identifier: BSD-2-Clause-Patent that make up the Device Path. **/ typedef struct { - UINT8 Type; ///< 0x01 Hardware Device Path. + UINT8 Type; ///< 0x01 Hardware Device Path. ///< 0x02 ACPI Device Path. ///< 0x03 Messaging Device Path. ///< 0x04 Media Device Path. ///< 0x05 BIOS Boot Specification Device Path. ///< 0x7F End of Hardware Device Path. - UINT8 SubType; ///< Varies by Type + UINT8 SubType; ///< Varies by Type ///< 0xFF End Entire Device Path, or ///< 0x01 End This Instance of a Device Path and start a new ///< Device Path. - UINT8 Length[2]; ///< Specific Device Path data. Type and Sub-Type define - ///< type of data. Size of data is included in Length. - + UINT8 Length[2]; ///< Specific Device Path data. Type and Sub-Type define + ///< type of data. Size of data is included in Length. } EFI_DEVICE_PATH_PROTOCOL; /// /// Device Path protocol definition for backward-compatible with EFI1.1. /// -typedef EFI_DEVICE_PATH_PROTOCOL EFI_DEVICE_PATH; +typedef EFI_DEVICE_PATH_PROTOCOL EFI_DEVICE_PATH; /// /// Hardware Device Paths. /// -#define HARDWARE_DEVICE_PATH 0x01 +#define HARDWARE_DEVICE_PATH 0x01 /// /// PCI Device Path SubType. /// -#define HW_PCI_DP 0x01 +#define HW_PCI_DP 0x01 /// /// PCI Device Path. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// PCI Function Number. /// - UINT8 Function; + UINT8 Function; /// /// PCI Device Number. /// - UINT8 Device; + UINT8 Device; } PCI_DEVICE_PATH; /// /// PCCARD Device Path SubType. /// -#define HW_PCCARD_DP 0x02 +#define HW_PCCARD_DP 0x02 /// /// PCCARD Device Path. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Function Number (0 = First Function). /// - UINT8 FunctionNumber; + UINT8 FunctionNumber; } PCCARD_DEVICE_PATH; /// /// Memory Mapped Device Path SubType. /// -#define HW_MEMMAP_DP 0x03 +#define HW_MEMMAP_DP 0x03 /// /// Memory Mapped Device Path. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// EFI_MEMORY_TYPE /// - UINT32 MemoryType; + UINT32 MemoryType; /// /// Starting Memory Address. /// - EFI_PHYSICAL_ADDRESS StartingAddress; + EFI_PHYSICAL_ADDRESS StartingAddress; /// /// Ending Memory Address. /// - EFI_PHYSICAL_ADDRESS EndingAddress; + EFI_PHYSICAL_ADDRESS EndingAddress; } MEMMAP_DEVICE_PATH; /// /// Hardware Vendor Device Path SubType. /// -#define HW_VENDOR_DP 0x04 +#define HW_VENDOR_DP 0x04 /// /// The Vendor Device Path allows the creation of vendor-defined Device Paths. A vendor must @@ -139,11 +138,11 @@ typedef struct { /// contents on the n bytes that follow in the Vendor Device Path node. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Vendor-assigned GUID that defines the data that follows. /// - EFI_GUID Guid; + EFI_GUID Guid; /// /// Vendor-defined variable size data. /// @@ -152,56 +151,56 @@ typedef struct { /// /// Controller Device Path SubType. /// -#define HW_CONTROLLER_DP 0x05 +#define HW_CONTROLLER_DP 0x05 /// /// Controller Device Path. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Controller number. /// - UINT32 ControllerNumber; + UINT32 ControllerNumber; } CONTROLLER_DEVICE_PATH; /// /// BMC Device Path SubType. /// -#define HW_BMC_DP 0x06 +#define HW_BMC_DP 0x06 /// /// BMC Device Path. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Interface Type. /// - UINT8 InterfaceType; + UINT8 InterfaceType; /// /// Base Address. /// - UINT8 BaseAddress[8]; + UINT8 BaseAddress[8]; } BMC_DEVICE_PATH; /// /// ACPI Device Paths. /// -#define ACPI_DEVICE_PATH 0x02 +#define ACPI_DEVICE_PATH 0x02 /// /// ACPI Device Path SubType. /// -#define ACPI_DP 0x01 +#define ACPI_DP 0x01 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Device's PnP hardware ID stored in a numeric 32-bit /// compressed EISA-type ID. This value must match the /// corresponding _HID in the ACPI name space. /// - UINT32 HID; + UINT32 HID; /// /// Unique ID that is required by ACPI if two devices have the /// same _HID. This value must also match the corresponding @@ -209,34 +208,34 @@ typedef struct { /// numeric value type of _UID is supported. Thus, strings must /// not be used for the _UID in the ACPI name space. /// - UINT32 UID; + UINT32 UID; } ACPI_HID_DEVICE_PATH; /// /// Expanded ACPI Device Path SubType. /// -#define ACPI_EXTENDED_DP 0x02 +#define ACPI_EXTENDED_DP 0x02 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Device's PnP hardware ID stored in a numeric 32-bit /// compressed EISA-type ID. This value must match the /// corresponding _HID in the ACPI name space. /// - UINT32 HID; + UINT32 HID; /// /// Unique ID that is required by ACPI if two devices have the /// same _HID. This value must also match the corresponding /// _UID/_HID pair in the ACPI name space. /// - UINT32 UID; + UINT32 UID; /// /// Device's compatible PnP hardware ID stored in a numeric /// 32-bit compressed EISA-type ID. This value must match at /// least one of the compatible device IDs returned by the /// corresponding _CID in the ACPI name space. /// - UINT32 CID; + UINT32 CID; /// /// Optional variable length _HIDSTR. /// Optional variable length _UIDSTR. @@ -251,18 +250,18 @@ typedef struct { // bits[31:16] - binary number // Compressed ASCII is 5 bits per character 0b00001 = 'A' 0b11010 = 'Z' // -#define PNP_EISA_ID_CONST 0x41d0 -#define EISA_ID(_Name, _Num) ((UINT32)((_Name) | (_Num) << 16)) -#define EISA_PNP_ID(_PNPId) (EISA_ID(PNP_EISA_ID_CONST, (_PNPId))) -#define EFI_PNP_ID(_PNPId) (EISA_ID(PNP_EISA_ID_CONST, (_PNPId))) +#define PNP_EISA_ID_CONST 0x41d0 +#define EISA_ID(_Name, _Num) ((UINT32)((_Name) | (_Num) << 16)) +#define EISA_PNP_ID(_PNPId) (EISA_ID(PNP_EISA_ID_CONST, (_PNPId))) +#define EFI_PNP_ID(_PNPId) (EISA_ID(PNP_EISA_ID_CONST, (_PNPId))) -#define PNP_EISA_ID_MASK 0xffff -#define EISA_ID_TO_NUM(_Id) ((_Id) >> 16) +#define PNP_EISA_ID_MASK 0xffff +#define EISA_ID_TO_NUM(_Id) ((_Id) >> 16) /// /// ACPI _ADR Device Path SubType. /// -#define ACPI_ADR_DP 0x03 +#define ACPI_ADR_DP 0x03 /// /// The _ADR device path is used to contain video output device attributes to support the Graphics @@ -270,13 +269,13 @@ typedef struct { /// devices are displaying the same output. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// _ADR value. For video output devices the value of this /// field comes from Table B-2 of the ACPI 3.0 specification. At /// least one _ADR value is required. /// - UINT32 ADR; + UINT32 ADR; // // This device path may optionally contain more than one _ADR entry. // @@ -285,16 +284,16 @@ typedef struct { /// /// ACPI NVDIMM Device Path SubType. /// -#define ACPI_NVDIMM_DP 0x04 +#define ACPI_NVDIMM_DP 0x04 /// /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// NFIT Device Handle, the _ADR of the NVDIMM device. /// The value of this field comes from Section 9.20.3 of the ACPI 6.2A specification. /// - UINT32 NFITDeviceHandle; + UINT32 NFITDeviceHandle; } ACPI_NVDIMM_DEVICE_PATH; #define ACPI_ADR_DISPLAY_TYPE_OTHER 0 @@ -319,171 +318,171 @@ typedef struct { /// system. This Device Path can describe physical messaging information like SCSI ID, or abstract /// information like networking protocol IP addresses. /// -#define MESSAGING_DEVICE_PATH 0x03 +#define MESSAGING_DEVICE_PATH 0x03 /// /// ATAPI Device Path SubType /// -#define MSG_ATAPI_DP 0x01 +#define MSG_ATAPI_DP 0x01 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Set to zero for primary, or one for secondary. /// - UINT8 PrimarySecondary; + UINT8 PrimarySecondary; /// /// Set to zero for master, or one for slave mode. /// - UINT8 SlaveMaster; + UINT8 SlaveMaster; /// /// Logical Unit Number. /// - UINT16 Lun; + UINT16 Lun; } ATAPI_DEVICE_PATH; /// /// SCSI Device Path SubType. /// -#define MSG_SCSI_DP 0x02 +#define MSG_SCSI_DP 0x02 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Target ID on the SCSI bus (PUN). /// - UINT16 Pun; + UINT16 Pun; /// /// Logical Unit Number (LUN). /// - UINT16 Lun; + UINT16 Lun; } SCSI_DEVICE_PATH; /// /// Fibre Channel SubType. /// -#define MSG_FIBRECHANNEL_DP 0x03 +#define MSG_FIBRECHANNEL_DP 0x03 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Reserved for the future. /// - UINT32 Reserved; + UINT32 Reserved; /// /// Fibre Channel World Wide Number. /// - UINT64 WWN; + UINT64 WWN; /// /// Fibre Channel Logical Unit Number. /// - UINT64 Lun; + UINT64 Lun; } FIBRECHANNEL_DEVICE_PATH; /// /// Fibre Channel Ex SubType. /// -#define MSG_FIBRECHANNELEX_DP 0x15 +#define MSG_FIBRECHANNELEX_DP 0x15 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Reserved for the future. /// - UINT32 Reserved; + UINT32 Reserved; /// /// 8 byte array containing Fibre Channel End Device Port Name. /// - UINT8 WWN[8]; + UINT8 WWN[8]; /// /// 8 byte array containing Fibre Channel Logical Unit Number. /// - UINT8 Lun[8]; + UINT8 Lun[8]; } FIBRECHANNELEX_DEVICE_PATH; /// /// 1394 Device Path SubType /// -#define MSG_1394_DP 0x04 +#define MSG_1394_DP 0x04 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Reserved for the future. /// - UINT32 Reserved; + UINT32 Reserved; /// /// 1394 Global Unique ID (GUID). /// - UINT64 Guid; + UINT64 Guid; } F1394_DEVICE_PATH; /// /// USB Device Path SubType. /// -#define MSG_USB_DP 0x05 +#define MSG_USB_DP 0x05 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// USB Parent Port Number. /// - UINT8 ParentPortNumber; + UINT8 ParentPortNumber; /// /// USB Interface Number. /// - UINT8 InterfaceNumber; + UINT8 InterfaceNumber; } USB_DEVICE_PATH; /// /// USB Class Device Path SubType. /// -#define MSG_USB_CLASS_DP 0x0f +#define MSG_USB_CLASS_DP 0x0f typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Vendor ID assigned by USB-IF. A value of 0xFFFF will /// match any Vendor ID. /// - UINT16 VendorId; + UINT16 VendorId; /// /// Product ID assigned by USB-IF. A value of 0xFFFF will /// match any Product ID. /// - UINT16 ProductId; + UINT16 ProductId; /// /// The class code assigned by the USB-IF. A value of 0xFF /// will match any class code. /// - UINT8 DeviceClass; + UINT8 DeviceClass; /// /// The subclass code assigned by the USB-IF. A value of /// 0xFF will match any subclass code. /// - UINT8 DeviceSubClass; + UINT8 DeviceSubClass; /// /// The protocol code assigned by the USB-IF. A value of /// 0xFF will match any protocol code. /// - UINT8 DeviceProtocol; + UINT8 DeviceProtocol; } USB_CLASS_DEVICE_PATH; /// /// USB WWID Device Path SubType. /// -#define MSG_USB_WWID_DP 0x10 +#define MSG_USB_WWID_DP 0x10 /// /// This device path describes a USB device using its serial number. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// USB interface number. /// - UINT16 InterfaceNumber; + UINT16 InterfaceNumber; /// /// USB vendor id of the device. /// - UINT16 VendorId; + UINT16 VendorId; /// /// USB product id of the device. /// - UINT16 ProductId; + UINT16 ProductId; /// /// Last 64-or-fewer UTF-16 characters of the USB /// serial number. The length of the string is @@ -498,136 +497,136 @@ typedef struct { /// #define MSG_DEVICE_LOGICAL_UNIT_DP 0x11 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Logical Unit Number for the interface. /// - UINT8 Lun; + UINT8 Lun; } DEVICE_LOGICAL_UNIT_DEVICE_PATH; /// /// SATA Device Path SubType. /// -#define MSG_SATA_DP 0x12 +#define MSG_SATA_DP 0x12 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// The HBA port number that facilitates the connection to the /// device or a port multiplier. The value 0xFFFF is reserved. /// - UINT16 HBAPortNumber; + UINT16 HBAPortNumber; /// /// The Port multiplier port number that facilitates the connection /// to the device. Must be set to 0xFFFF if the device is directly /// connected to the HBA. /// - UINT16 PortMultiplierPortNumber; + UINT16 PortMultiplierPortNumber; /// /// Logical Unit Number. /// - UINT16 Lun; + UINT16 Lun; } SATA_DEVICE_PATH; /// /// Flag for if the device is directly connected to the HBA. /// -#define SATA_HBA_DIRECT_CONNECT_FLAG 0x8000 +#define SATA_HBA_DIRECT_CONNECT_FLAG 0x8000 /// /// I2O Device Path SubType. /// -#define MSG_I2O_DP 0x06 +#define MSG_I2O_DP 0x06 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Target ID (TID) for a device. /// - UINT32 Tid; + UINT32 Tid; } I2O_DEVICE_PATH; /// /// MAC Address Device Path SubType. /// -#define MSG_MAC_ADDR_DP 0x0b +#define MSG_MAC_ADDR_DP 0x0b typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// The MAC address for a network interface padded with 0s. /// - EFI_MAC_ADDRESS MacAddress; + EFI_MAC_ADDRESS MacAddress; /// /// Network interface type(i.e. 802.3, FDDI). /// - UINT8 IfType; + UINT8 IfType; } MAC_ADDR_DEVICE_PATH; /// /// IPv4 Device Path SubType /// -#define MSG_IPv4_DP 0x0c +#define MSG_IPv4_DP 0x0c typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// The local IPv4 address. /// - EFI_IPv4_ADDRESS LocalIpAddress; + EFI_IPv4_ADDRESS LocalIpAddress; /// /// The remote IPv4 address. /// - EFI_IPv4_ADDRESS RemoteIpAddress; + EFI_IPv4_ADDRESS RemoteIpAddress; /// /// The local port number. /// - UINT16 LocalPort; + UINT16 LocalPort; /// /// The remote port number. /// - UINT16 RemotePort; + UINT16 RemotePort; /// /// The network protocol(i.e. UDP, TCP). /// - UINT16 Protocol; + UINT16 Protocol; /// /// 0x00 - The Source IP Address was assigned though DHCP. /// 0x01 - The Source IP Address is statically bound. /// - BOOLEAN StaticIpAddress; + BOOLEAN StaticIpAddress; /// /// The gateway IP address /// - EFI_IPv4_ADDRESS GatewayIpAddress; + EFI_IPv4_ADDRESS GatewayIpAddress; /// /// The subnet mask /// - EFI_IPv4_ADDRESS SubnetMask; + EFI_IPv4_ADDRESS SubnetMask; } IPv4_DEVICE_PATH; /// /// IPv6 Device Path SubType. /// -#define MSG_IPv6_DP 0x0d +#define MSG_IPv6_DP 0x0d typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// The local IPv6 address. /// - EFI_IPv6_ADDRESS LocalIpAddress; + EFI_IPv6_ADDRESS LocalIpAddress; /// /// The remote IPv6 address. /// - EFI_IPv6_ADDRESS RemoteIpAddress; + EFI_IPv6_ADDRESS RemoteIpAddress; /// /// The local port number. /// - UINT16 LocalPort; + UINT16 LocalPort; /// /// The remote port number. /// - UINT16 RemotePort; + UINT16 RemotePort; /// /// The network protocol(i.e. UDP, TCP). /// - UINT16 Protocol; + UINT16 Protocol; /// /// 0x00 - The Local IP Address was manually configured. /// 0x01 - The Local IP Address is assigned through IPv6 @@ -635,23 +634,23 @@ typedef struct { /// 0x02 - The Local IP Address is assigned through IPv6 /// stateful configuration. /// - UINT8 IpAddressOrigin; + UINT8 IpAddressOrigin; /// /// The prefix length /// - UINT8 PrefixLength; + UINT8 PrefixLength; /// /// The gateway IP address /// - EFI_IPv6_ADDRESS GatewayIpAddress; + EFI_IPv6_ADDRESS GatewayIpAddress; } IPv6_DEVICE_PATH; /// /// InfiniBand Device Path SubType. /// -#define MSG_INFINIBAND_DP 0x09 +#define MSG_INFINIBAND_DP 0x09 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Flags to help identify/manage InfiniBand device path elements: /// Bit 0 - IOC/Service (0b = IOC, 1b = Service). @@ -661,24 +660,24 @@ typedef struct { /// Bit 4 - Network Protocol. /// All other bits are reserved. /// - UINT32 ResourceFlags; + UINT32 ResourceFlags; /// /// 128-bit Global Identifier for remote fabric port. /// - UINT8 PortGid[16]; + UINT8 PortGid[16]; /// /// 64-bit unique identifier to remote IOC or server process. /// Interpretation of field specified by Resource Flags (bit 0). /// - UINT64 ServiceId; + UINT64 ServiceId; /// /// 64-bit persistent ID of remote IOC port. /// - UINT64 TargetPortId; + UINT64 TargetPortId; /// /// 64-bit persistent ID of remote device. /// - UINT64 DeviceId; + UINT64 DeviceId; } INFINIBAND_DEVICE_PATH; #define INFINIBAND_RESOURCE_FLAG_IOC_SERVICE 0x01 @@ -690,23 +689,23 @@ typedef struct { /// /// UART Device Path SubType. /// -#define MSG_UART_DP 0x0e +#define MSG_UART_DP 0x0e typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Reserved. /// - UINT32 Reserved; + UINT32 Reserved; /// /// The baud rate setting for the UART style device. A value of 0 /// means that the device's default baud rate will be used. /// - UINT64 BaudRate; + UINT64 BaudRate; /// /// The number of data bits for the UART style device. A value /// of 0 means that the device's default number of data bits will be used. /// - UINT8 DataBits; + UINT8 DataBits; /// /// The parity setting for the UART style device. /// Parity 0x00 - Default Parity. @@ -716,7 +715,7 @@ typedef struct { /// Parity 0x04 - Mark Parity. /// Parity 0x05 - Space Parity. /// - UINT8 Parity; + UINT8 Parity; /// /// The number of stop bits for the UART style device. /// Stop Bits 0x00 - Default Stop Bits. @@ -724,205 +723,205 @@ typedef struct { /// Stop Bits 0x02 - 1.5 Stop Bits. /// Stop Bits 0x03 - 2 Stop Bits. /// - UINT8 StopBits; + UINT8 StopBits; } UART_DEVICE_PATH; /// /// NVDIMM Namespace Device Path SubType. /// -#define NVDIMM_NAMESPACE_DP 0x20 +#define NVDIMM_NAMESPACE_DP 0x20 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Namespace unique label identifier UUID. /// - EFI_GUID Uuid; + EFI_GUID Uuid; } NVDIMM_NAMESPACE_DEVICE_PATH; // // Use VENDOR_DEVICE_PATH struct // -#define MSG_VENDOR_DP 0x0a -typedef VENDOR_DEVICE_PATH VENDOR_DEFINED_DEVICE_PATH; +#define MSG_VENDOR_DP 0x0a +typedef VENDOR_DEVICE_PATH VENDOR_DEFINED_DEVICE_PATH; -#define DEVICE_PATH_MESSAGING_PC_ANSI EFI_PC_ANSI_GUID -#define DEVICE_PATH_MESSAGING_VT_100 EFI_VT_100_GUID -#define DEVICE_PATH_MESSAGING_VT_100_PLUS EFI_VT_100_PLUS_GUID -#define DEVICE_PATH_MESSAGING_VT_UTF8 EFI_VT_UTF8_GUID +#define DEVICE_PATH_MESSAGING_PC_ANSI EFI_PC_ANSI_GUID +#define DEVICE_PATH_MESSAGING_VT_100 EFI_VT_100_GUID +#define DEVICE_PATH_MESSAGING_VT_100_PLUS EFI_VT_100_PLUS_GUID +#define DEVICE_PATH_MESSAGING_VT_UTF8 EFI_VT_UTF8_GUID /// /// A new device path node is defined to declare flow control characteristics. /// UART Flow Control Messaging Device Path /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL GUID. /// - EFI_GUID Guid; + EFI_GUID Guid; /// /// Bitmap of supported flow control types. /// Bit 0 set indicates hardware flow control. /// Bit 1 set indicates Xon/Xoff flow control. /// All other bits are reserved and are clear. /// - UINT32 FlowControlMap; + UINT32 FlowControlMap; } UART_FLOW_CONTROL_DEVICE_PATH; -#define UART_FLOW_CONTROL_HARDWARE 0x00000001 -#define UART_FLOW_CONTROL_XON_XOFF 0x00000010 +#define UART_FLOW_CONTROL_HARDWARE 0x00000001 +#define UART_FLOW_CONTROL_XON_XOFF 0x00000010 -#define DEVICE_PATH_MESSAGING_SAS EFI_SAS_DEVICE_PATH_GUID +#define DEVICE_PATH_MESSAGING_SAS EFI_SAS_DEVICE_PATH_GUID /// /// Serial Attached SCSI (SAS) Device Path. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// DEVICE_PATH_MESSAGING_SAS GUID. /// - EFI_GUID Guid; + EFI_GUID Guid; /// /// Reserved for future use. /// - UINT32 Reserved; + UINT32 Reserved; /// /// SAS Address for Serial Attached SCSI Target. /// - UINT64 SasAddress; + UINT64 SasAddress; /// /// SAS Logical Unit Number. /// - UINT64 Lun; + UINT64 Lun; /// /// More Information about the device and its interconnect. /// - UINT16 DeviceTopology; + UINT16 DeviceTopology; /// /// Relative Target Port (RTP). /// - UINT16 RelativeTargetPort; + UINT16 RelativeTargetPort; } SAS_DEVICE_PATH; /// /// Serial Attached SCSI (SAS) Ex Device Path SubType /// -#define MSG_SASEX_DP 0x16 +#define MSG_SASEX_DP 0x16 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// 8-byte array of the SAS Address for Serial Attached SCSI Target Port. /// - UINT8 SasAddress[8]; + UINT8 SasAddress[8]; /// /// 8-byte array of the SAS Logical Unit Number. /// - UINT8 Lun[8]; + UINT8 Lun[8]; /// /// More Information about the device and its interconnect. /// - UINT16 DeviceTopology; + UINT16 DeviceTopology; /// /// Relative Target Port (RTP). /// - UINT16 RelativeTargetPort; + UINT16 RelativeTargetPort; } SASEX_DEVICE_PATH; /// /// NvmExpress Namespace Device Path SubType. /// -#define MSG_NVME_NAMESPACE_DP 0x17 +#define MSG_NVME_NAMESPACE_DP 0x17 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - UINT32 NamespaceId; - UINT64 NamespaceUuid; + EFI_DEVICE_PATH_PROTOCOL Header; + UINT32 NamespaceId; + UINT64 NamespaceUuid; } NVME_NAMESPACE_DEVICE_PATH; /// /// DNS Device Path SubType /// -#define MSG_DNS_DP 0x1F +#define MSG_DNS_DP 0x1F typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Indicates the DNS server address is IPv4 or IPv6 address. /// - UINT8 IsIPv6; + UINT8 IsIPv6; /// /// Instance of the DNS server address. /// - EFI_IP_ADDRESS DnsServerIp[]; + EFI_IP_ADDRESS DnsServerIp[]; } DNS_DEVICE_PATH; /// /// Uniform Resource Identifiers (URI) Device Path SubType /// -#define MSG_URI_DP 0x18 +#define MSG_URI_DP 0x18 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Instance of the URI pursuant to RFC 3986. /// - CHAR8 Uri[]; + CHAR8 Uri[]; } URI_DEVICE_PATH; /// /// Universal Flash Storage (UFS) Device Path SubType. /// -#define MSG_UFS_DP 0x19 +#define MSG_UFS_DP 0x19 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Target ID on the UFS bus (PUN). /// - UINT8 Pun; + UINT8 Pun; /// /// Logical Unit Number (LUN). /// - UINT8 Lun; + UINT8 Lun; } UFS_DEVICE_PATH; /// /// SD (Secure Digital) Device Path SubType. /// -#define MSG_SD_DP 0x1A +#define MSG_SD_DP 0x1A typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - UINT8 SlotNumber; + EFI_DEVICE_PATH_PROTOCOL Header; + UINT8 SlotNumber; } SD_DEVICE_PATH; /// /// EMMC (Embedded MMC) Device Path SubType. /// -#define MSG_EMMC_DP 0x1D +#define MSG_EMMC_DP 0x1D typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - UINT8 SlotNumber; + EFI_DEVICE_PATH_PROTOCOL Header; + UINT8 SlotNumber; } EMMC_DEVICE_PATH; /// /// iSCSI Device Path SubType /// -#define MSG_ISCSI_DP 0x13 +#define MSG_ISCSI_DP 0x13 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Network Protocol (0 = TCP, 1+ = reserved). /// - UINT16 NetworkProtocol; + UINT16 NetworkProtocol; /// /// iSCSI Login Options. /// - UINT16 LoginOption; + UINT16 LoginOption; /// /// iSCSI Logical Unit Number. /// - UINT64 Lun; + UINT64 Lun; /// /// iSCSI Target Portal group tag the initiator intends /// to establish a session with. /// - UINT16 TargetPortalGroupTag; + UINT16 TargetPortalGroupTag; /// /// iSCSI NodeTarget Name. The length of the name /// is determined by subtracting the offset of this field from Length. @@ -930,90 +929,90 @@ typedef struct { /// CHAR8 iSCSI Target Name. } ISCSI_DEVICE_PATH; -#define ISCSI_LOGIN_OPTION_NO_HEADER_DIGEST 0x0000 -#define ISCSI_LOGIN_OPTION_HEADER_DIGEST_USING_CRC32C 0x0002 -#define ISCSI_LOGIN_OPTION_NO_DATA_DIGEST 0x0000 -#define ISCSI_LOGIN_OPTION_DATA_DIGEST_USING_CRC32C 0x0008 -#define ISCSI_LOGIN_OPTION_AUTHMETHOD_CHAP 0x0000 -#define ISCSI_LOGIN_OPTION_AUTHMETHOD_NON 0x1000 -#define ISCSI_LOGIN_OPTION_CHAP_BI 0x0000 -#define ISCSI_LOGIN_OPTION_CHAP_UNI 0x2000 +#define ISCSI_LOGIN_OPTION_NO_HEADER_DIGEST 0x0000 +#define ISCSI_LOGIN_OPTION_HEADER_DIGEST_USING_CRC32C 0x0002 +#define ISCSI_LOGIN_OPTION_NO_DATA_DIGEST 0x0000 +#define ISCSI_LOGIN_OPTION_DATA_DIGEST_USING_CRC32C 0x0008 +#define ISCSI_LOGIN_OPTION_AUTHMETHOD_CHAP 0x0000 +#define ISCSI_LOGIN_OPTION_AUTHMETHOD_NON 0x1000 +#define ISCSI_LOGIN_OPTION_CHAP_BI 0x0000 +#define ISCSI_LOGIN_OPTION_CHAP_UNI 0x2000 /// /// VLAN Device Path SubType. /// -#define MSG_VLAN_DP 0x14 +#define MSG_VLAN_DP 0x14 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// VLAN identifier (0-4094). /// - UINT16 VlanId; + UINT16 VlanId; } VLAN_DEVICE_PATH; /// /// Bluetooth Device Path SubType. /// -#define MSG_BLUETOOTH_DP 0x1b +#define MSG_BLUETOOTH_DP 0x1b typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// 48bit Bluetooth device address. /// - BLUETOOTH_ADDRESS BD_ADDR; + BLUETOOTH_ADDRESS BD_ADDR; } BLUETOOTH_DEVICE_PATH; /// /// Wi-Fi Device Path SubType. /// -#define MSG_WIFI_DP 0x1C +#define MSG_WIFI_DP 0x1C typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Service set identifier. A 32-byte octets string. /// - UINT8 SSId[32]; + UINT8 SSId[32]; } WIFI_DEVICE_PATH; /// /// Bluetooth LE Device Path SubType. /// -#define MSG_BLUETOOTH_LE_DP 0x1E +#define MSG_BLUETOOTH_LE_DP 0x1E typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - BLUETOOTH_LE_ADDRESS Address; + EFI_DEVICE_PATH_PROTOCOL Header; + BLUETOOTH_LE_ADDRESS Address; } BLUETOOTH_LE_DEVICE_PATH; // // Media Device Path // -#define MEDIA_DEVICE_PATH 0x04 +#define MEDIA_DEVICE_PATH 0x04 /// /// Hard Drive Media Device Path SubType. /// -#define MEDIA_HARDDRIVE_DP 0x01 +#define MEDIA_HARDDRIVE_DP 0x01 /// /// The Hard Drive Media Device Path is used to represent a partition on a hard drive. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Describes the entry in a partition table, starting with entry 1. /// Partition number zero represents the entire device. Valid /// partition numbers for a MBR partition are [1, 4]. Valid /// partition numbers for a GPT partition are [1, NumberOfPartitionEntries]. /// - UINT32 PartitionNumber; + UINT32 PartitionNumber; /// /// Starting LBA of the partition on the hard drive. /// - UINT64 PartitionStart; + UINT64 PartitionStart; /// /// Size of the partition in units of Logical Blocks. /// - UINT64 PartitionSize; + UINT64 PartitionSize; /// /// Signature unique to this partition: /// If SignatureType is 0, this field has to be initialized with 16 zeros. @@ -1021,68 +1020,68 @@ typedef struct { /// The other 12 bytes are initialized with zeros. /// If SignatureType is 2, this field contains a 16 byte signature. /// - UINT8 Signature[16]; + UINT8 Signature[16]; /// /// Partition Format: (Unused values reserved). /// 0x01 - PC-AT compatible legacy MBR. /// 0x02 - GUID Partition Table. /// - UINT8 MBRType; + UINT8 MBRType; /// /// Type of Disk Signature: (Unused values reserved). /// 0x00 - No Disk Signature. /// 0x01 - 32-bit signature from address 0x1b8 of the type 0x01 MBR. /// 0x02 - GUID signature. /// - UINT8 SignatureType; + UINT8 SignatureType; } HARDDRIVE_DEVICE_PATH; -#define MBR_TYPE_PCAT 0x01 -#define MBR_TYPE_EFI_PARTITION_TABLE_HEADER 0x02 +#define MBR_TYPE_PCAT 0x01 +#define MBR_TYPE_EFI_PARTITION_TABLE_HEADER 0x02 -#define NO_DISK_SIGNATURE 0x00 -#define SIGNATURE_TYPE_MBR 0x01 -#define SIGNATURE_TYPE_GUID 0x02 +#define NO_DISK_SIGNATURE 0x00 +#define SIGNATURE_TYPE_MBR 0x01 +#define SIGNATURE_TYPE_GUID 0x02 /// /// CD-ROM Media Device Path SubType. /// -#define MEDIA_CDROM_DP 0x02 +#define MEDIA_CDROM_DP 0x02 /// /// The CD-ROM Media Device Path is used to define a system partition that exists on a CD-ROM. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Boot Entry number from the Boot Catalog. The Initial/Default entry is defined as zero. /// - UINT32 BootEntry; + UINT32 BootEntry; /// /// Starting RBA of the partition on the medium. CD-ROMs use Relative logical Block Addressing. /// - UINT64 PartitionStart; + UINT64 PartitionStart; /// /// Size of the partition in units of Blocks, also called Sectors. /// - UINT64 PartitionSize; + UINT64 PartitionSize; } CDROM_DEVICE_PATH; // // Use VENDOR_DEVICE_PATH struct // -#define MEDIA_VENDOR_DP 0x03 ///< Media vendor device path subtype. +#define MEDIA_VENDOR_DP 0x03 ///< Media vendor device path subtype. /// /// File Path Media Device Path SubType /// -#define MEDIA_FILEPATH_DP 0x04 +#define MEDIA_FILEPATH_DP 0x04 typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// A NULL-terminated Path string including directory and file names. /// - CHAR16 PathName[1]; + CHAR16 PathName[1]; } FILEPATH_DEVICE_PATH; #define SIZE_OF_FILEPATH_DEVICE_PATH OFFSET_OF(FILEPATH_DEVICE_PATH,PathName) @@ -1090,7 +1089,7 @@ typedef struct { /// /// Media Protocol Device Path SubType. /// -#define MEDIA_PROTOCOL_DP 0x05 +#define MEDIA_PROTOCOL_DP 0x05 /// /// The Media Protocol Device Path is used to denote the protocol that is being @@ -1098,157 +1097,156 @@ typedef struct { /// Many protocols are inherent to the style of device path. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// The ID of the protocol. /// - EFI_GUID Protocol; + EFI_GUID Protocol; } MEDIA_PROTOCOL_DEVICE_PATH; /// /// PIWG Firmware File SubType. /// -#define MEDIA_PIWG_FW_FILE_DP 0x06 +#define MEDIA_PIWG_FW_FILE_DP 0x06 /// /// This device path is used by systems implementing the UEFI PI Specification 1.0 to describe a firmware file. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Firmware file name /// - EFI_GUID FvFileName; + EFI_GUID FvFileName; } MEDIA_FW_VOL_FILEPATH_DEVICE_PATH; /// /// PIWG Firmware Volume Device Path SubType. /// -#define MEDIA_PIWG_FW_VOL_DP 0x07 +#define MEDIA_PIWG_FW_VOL_DP 0x07 /// /// This device path is used by systems implementing the UEFI PI Specification 1.0 to describe a firmware volume. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Firmware volume name. /// - EFI_GUID FvName; + EFI_GUID FvName; } MEDIA_FW_VOL_DEVICE_PATH; /// /// Media relative offset range device path. /// -#define MEDIA_RELATIVE_OFFSET_RANGE_DP 0x08 +#define MEDIA_RELATIVE_OFFSET_RANGE_DP 0x08 /// /// Used to describe the offset range of media relative. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - UINT32 Reserved; - UINT64 StartingOffset; - UINT64 EndingOffset; + EFI_DEVICE_PATH_PROTOCOL Header; + UINT32 Reserved; + UINT64 StartingOffset; + UINT64 EndingOffset; } MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH; /// /// This GUID defines a RAM Disk supporting a raw disk format in volatile memory. /// -#define EFI_VIRTUAL_DISK_GUID EFI_ACPI_6_0_NFIT_GUID_RAM_DISK_SUPPORTING_VIRTUAL_DISK_REGION_VOLATILE +#define EFI_VIRTUAL_DISK_GUID EFI_ACPI_6_0_NFIT_GUID_RAM_DISK_SUPPORTING_VIRTUAL_DISK_REGION_VOLATILE -extern EFI_GUID gEfiVirtualDiskGuid; +extern EFI_GUID gEfiVirtualDiskGuid; /// /// This GUID defines a RAM Disk supporting an ISO image in volatile memory. /// -#define EFI_VIRTUAL_CD_GUID EFI_ACPI_6_0_NFIT_GUID_RAM_DISK_SUPPORTING_VIRTUAL_CD_REGION_VOLATILE +#define EFI_VIRTUAL_CD_GUID EFI_ACPI_6_0_NFIT_GUID_RAM_DISK_SUPPORTING_VIRTUAL_CD_REGION_VOLATILE -extern EFI_GUID gEfiVirtualCdGuid; +extern EFI_GUID gEfiVirtualCdGuid; /// /// This GUID defines a RAM Disk supporting a raw disk format in persistent memory. /// -#define EFI_PERSISTENT_VIRTUAL_DISK_GUID EFI_ACPI_6_0_NFIT_GUID_RAM_DISK_SUPPORTING_VIRTUAL_DISK_REGION_PERSISTENT +#define EFI_PERSISTENT_VIRTUAL_DISK_GUID EFI_ACPI_6_0_NFIT_GUID_RAM_DISK_SUPPORTING_VIRTUAL_DISK_REGION_PERSISTENT -extern EFI_GUID gEfiPersistentVirtualDiskGuid; +extern EFI_GUID gEfiPersistentVirtualDiskGuid; /// /// This GUID defines a RAM Disk supporting an ISO image in persistent memory. /// -#define EFI_PERSISTENT_VIRTUAL_CD_GUID EFI_ACPI_6_0_NFIT_GUID_RAM_DISK_SUPPORTING_VIRTUAL_CD_REGION_PERSISTENT +#define EFI_PERSISTENT_VIRTUAL_CD_GUID EFI_ACPI_6_0_NFIT_GUID_RAM_DISK_SUPPORTING_VIRTUAL_CD_REGION_PERSISTENT -extern EFI_GUID gEfiPersistentVirtualCdGuid; +extern EFI_GUID gEfiPersistentVirtualCdGuid; /// /// Media ram disk device path. /// -#define MEDIA_RAM_DISK_DP 0x09 +#define MEDIA_RAM_DISK_DP 0x09 /// /// Used to describe the ram disk device path. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Starting Memory Address. /// - UINT32 StartingAddr[2]; + UINT32 StartingAddr[2]; /// /// Ending Memory Address. /// - UINT32 EndingAddr[2]; + UINT32 EndingAddr[2]; /// /// GUID that defines the type of the RAM Disk. /// - EFI_GUID TypeGuid; + EFI_GUID TypeGuid; /// /// RAM Diskinstance number, if supported. The default value is zero. /// - UINT16 Instance; + UINT16 Instance; } MEDIA_RAM_DISK_DEVICE_PATH; /// /// BIOS Boot Specification Device Path. /// -#define BBS_DEVICE_PATH 0x05 +#define BBS_DEVICE_PATH 0x05 /// /// BIOS Boot Specification Device Path SubType. /// -#define BBS_BBS_DP 0x01 +#define BBS_BBS_DP 0x01 /// /// This Device Path is used to describe the booting of non-EFI-aware operating systems. /// typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; + EFI_DEVICE_PATH_PROTOCOL Header; /// /// Device Type as defined by the BIOS Boot Specification. /// - UINT16 DeviceType; + UINT16 DeviceType; /// /// Status Flags as defined by the BIOS Boot Specification. /// - UINT16 StatusFlag; + UINT16 StatusFlag; /// /// Null-terminated ASCII string that describes the boot device to a user. /// - CHAR8 String[1]; + CHAR8 String[1]; } BBS_BBS_DEVICE_PATH; // // DeviceType definitions - from BBS specification // -#define BBS_TYPE_FLOPPY 0x01 -#define BBS_TYPE_HARDDRIVE 0x02 -#define BBS_TYPE_CDROM 0x03 -#define BBS_TYPE_PCMCIA 0x04 -#define BBS_TYPE_USB 0x05 -#define BBS_TYPE_EMBEDDED_NETWORK 0x06 -#define BBS_TYPE_BEV 0x80 -#define BBS_TYPE_UNKNOWN 0xFF - +#define BBS_TYPE_FLOPPY 0x01 +#define BBS_TYPE_HARDDRIVE 0x02 +#define BBS_TYPE_CDROM 0x03 +#define BBS_TYPE_PCMCIA 0x04 +#define BBS_TYPE_USB 0x05 +#define BBS_TYPE_EMBEDDED_NETWORK 0x06 +#define BBS_TYPE_BEV 0x80 +#define BBS_TYPE_UNKNOWN 0xFF /// /// Union of all possible Device Paths and pointers to Device Paths. @@ -1309,8 +1307,6 @@ typedef union { BBS_BBS_DEVICE_PATH Bbs; } EFI_DEV_PATH; - - typedef union { EFI_DEVICE_PATH_PROTOCOL *DevPath; PCI_DEVICE_PATH *Pci; @@ -1370,10 +1366,10 @@ typedef union { #pragma pack() -#define END_DEVICE_PATH_TYPE 0x7f -#define END_ENTIRE_DEVICE_PATH_SUBTYPE 0xFF -#define END_INSTANCE_DEVICE_PATH_SUBTYPE 0x01 +#define END_DEVICE_PATH_TYPE 0x7f +#define END_ENTIRE_DEVICE_PATH_SUBTYPE 0xFF +#define END_INSTANCE_DEVICE_PATH_SUBTYPE 0x01 -extern EFI_GUID gEfiDevicePathProtocolGuid; +extern EFI_GUID gEfiDevicePathProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DevicePathFromText.h b/MdePkg/Include/Protocol/DevicePathFromText.h index 5698020c44..f2abf617b7 100644 --- a/MdePkg/Include/Protocol/DevicePathFromText.h +++ b/MdePkg/Include/Protocol/DevicePathFromText.h @@ -30,12 +30,11 @@ **/ typedef -EFI_DEVICE_PATH_PROTOCOL* +EFI_DEVICE_PATH_PROTOCOL * (EFIAPI *EFI_DEVICE_PATH_FROM_TEXT_NODE)( IN CONST CHAR16 *TextDeviceNode ); - /** Convert text to the binary representation of a device node. @@ -48,7 +47,7 @@ EFI_DEVICE_PATH_PROTOCOL* **/ typedef -EFI_DEVICE_PATH_PROTOCOL* +EFI_DEVICE_PATH_PROTOCOL * (EFIAPI *EFI_DEVICE_PATH_FROM_TEXT_PATH)( IN CONST CHAR16 *TextDevicePath ); @@ -57,10 +56,10 @@ EFI_DEVICE_PATH_PROTOCOL* /// This protocol converts text to device paths and device nodes. /// typedef struct { - EFI_DEVICE_PATH_FROM_TEXT_NODE ConvertTextToDeviceNode; - EFI_DEVICE_PATH_FROM_TEXT_PATH ConvertTextToDevicePath; + EFI_DEVICE_PATH_FROM_TEXT_NODE ConvertTextToDeviceNode; + EFI_DEVICE_PATH_FROM_TEXT_PATH ConvertTextToDevicePath; } EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL; -extern EFI_GUID gEfiDevicePathFromTextProtocolGuid; +extern EFI_GUID gEfiDevicePathFromTextProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DevicePathToText.h b/MdePkg/Include/Protocol/DevicePathToText.h index 245dae4b80..ef3770a543 100644 --- a/MdePkg/Include/Protocol/DevicePathToText.h +++ b/MdePkg/Include/Protocol/DevicePathToText.h @@ -34,7 +34,7 @@ **/ typedef -CHAR16* +CHAR16 * (EFIAPI *EFI_DEVICE_PATH_TO_TEXT_NODE)( IN CONST EFI_DEVICE_PATH_PROTOCOL *DeviceNode, IN BOOLEAN DisplayOnly, @@ -57,7 +57,7 @@ CHAR16* **/ typedef -CHAR16* +CHAR16 * (EFIAPI *EFI_DEVICE_PATH_TO_TEXT_PATH)( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath, IN BOOLEAN DisplayOnly, @@ -68,12 +68,10 @@ CHAR16* /// This protocol converts device paths and device nodes to text. /// typedef struct { - EFI_DEVICE_PATH_TO_TEXT_NODE ConvertDeviceNodeToText; - EFI_DEVICE_PATH_TO_TEXT_PATH ConvertDevicePathToText; + EFI_DEVICE_PATH_TO_TEXT_NODE ConvertDeviceNodeToText; + EFI_DEVICE_PATH_TO_TEXT_PATH ConvertDevicePathToText; } EFI_DEVICE_PATH_TO_TEXT_PROTOCOL; -extern EFI_GUID gEfiDevicePathToTextProtocolGuid; +extern EFI_GUID gEfiDevicePathToTextProtocolGuid; #endif - - diff --git a/MdePkg/Include/Protocol/DevicePathUtilities.h b/MdePkg/Include/Protocol/DevicePathUtilities.h index be12f2be4c..780ea52e1d 100644 --- a/MdePkg/Include/Protocol/DevicePathUtilities.h +++ b/MdePkg/Include/Protocol/DevicePathUtilities.h @@ -33,7 +33,6 @@ UINTN IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath ); - /** Create a duplicate of the specified path. @@ -44,7 +43,7 @@ UINTN **/ typedef -EFI_DEVICE_PATH_PROTOCOL* +EFI_DEVICE_PATH_PROTOCOL * (EFIAPI *EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH)( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath ); @@ -63,7 +62,7 @@ EFI_DEVICE_PATH_PROTOCOL* **/ typedef -EFI_DEVICE_PATH_PROTOCOL* +EFI_DEVICE_PATH_PROTOCOL * (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_PATH)( IN CONST EFI_DEVICE_PATH_PROTOCOL *Src1, IN CONST EFI_DEVICE_PATH_PROTOCOL *Src2 @@ -83,7 +82,7 @@ EFI_DEVICE_PATH_PROTOCOL* **/ typedef -EFI_DEVICE_PATH_PROTOCOL* +EFI_DEVICE_PATH_PROTOCOL * (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_NODE)( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath, IN CONST EFI_DEVICE_PATH_PROTOCOL *DeviceNode @@ -100,7 +99,7 @@ EFI_DEVICE_PATH_PROTOCOL* **/ typedef -EFI_DEVICE_PATH_PROTOCOL* +EFI_DEVICE_PATH_PROTOCOL * (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE)( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath, IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePathInstance @@ -123,7 +122,7 @@ EFI_DEVICE_PATH_PROTOCOL* **/ typedef -EFI_DEVICE_PATH_PROTOCOL* +EFI_DEVICE_PATH_PROTOCOL * (EFIAPI *EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCE)( IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePathInstance, OUT UINTN *DevicePathInstanceSize @@ -145,12 +144,12 @@ EFI_DEVICE_PATH_PROTOCOL* **/ typedef -EFI_DEVICE_PATH_PROTOCOL* +EFI_DEVICE_PATH_PROTOCOL * (EFIAPI *EFI_DEVICE_PATH_UTILS_CREATE_NODE)( IN UINT8 NodeType, IN UINT8 NodeSubType, IN UINT16 NodeLength -); + ); /** Returns whether a device path is multi-instance. @@ -171,16 +170,16 @@ BOOLEAN /// This protocol is used to creates and manipulates device paths and device nodes. /// typedef struct { - EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE GetDevicePathSize; - EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH DuplicateDevicePath; - EFI_DEVICE_PATH_UTILS_APPEND_PATH AppendDevicePath; - EFI_DEVICE_PATH_UTILS_APPEND_NODE AppendDeviceNode; - EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE AppendDevicePathInstance; - EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCE GetNextDevicePathInstance; - EFI_DEVICE_PATH_UTILS_IS_MULTI_INSTANCE IsDevicePathMultiInstance; - EFI_DEVICE_PATH_UTILS_CREATE_NODE CreateDeviceNode; + EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE GetDevicePathSize; + EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH DuplicateDevicePath; + EFI_DEVICE_PATH_UTILS_APPEND_PATH AppendDevicePath; + EFI_DEVICE_PATH_UTILS_APPEND_NODE AppendDeviceNode; + EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE AppendDevicePathInstance; + EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCE GetNextDevicePathInstance; + EFI_DEVICE_PATH_UTILS_IS_MULTI_INSTANCE IsDevicePathMultiInstance; + EFI_DEVICE_PATH_UTILS_CREATE_NODE CreateDeviceNode; } EFI_DEVICE_PATH_UTILITIES_PROTOCOL; -extern EFI_GUID gEfiDevicePathUtilitiesProtocolGuid; +extern EFI_GUID gEfiDevicePathUtilitiesProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Dhcp4.h b/MdePkg/Include/Protocol/Dhcp4.h index 83aae13a61..3b2c615edf 100644 --- a/MdePkg/Include/Protocol/Dhcp4.h +++ b/MdePkg/Include/Protocol/Dhcp4.h @@ -27,151 +27,146 @@ SPDX-License-Identifier: BSD-2-Clause-Patent typedef struct _EFI_DHCP4_PROTOCOL EFI_DHCP4_PROTOCOL; - #pragma pack(1) typedef struct { /// /// DHCP option code. /// - UINT8 OpCode; + UINT8 OpCode; /// /// Length of the DHCP option data. Not present if OpCode is 0 or 255. /// - UINT8 Length; + UINT8 Length; /// /// Start of the DHCP option data. Not present if OpCode is 0 or 255 or if Length is zero. /// - UINT8 Data[1]; + UINT8 Data[1]; } EFI_DHCP4_PACKET_OPTION; #pragma pack() - #pragma pack(1) /// /// EFI_DHCP4_PACKET defines the format of DHCPv4 packets. See RFC 2131 for more information. /// typedef struct { - UINT8 OpCode; - UINT8 HwType; - UINT8 HwAddrLen; - UINT8 Hops; - UINT32 Xid; - UINT16 Seconds; - UINT16 Reserved; - EFI_IPv4_ADDRESS ClientAddr; ///< Client IP address from client. - EFI_IPv4_ADDRESS YourAddr; ///< Client IP address from server. - EFI_IPv4_ADDRESS ServerAddr; ///< IP address of next server in bootstrap. - EFI_IPv4_ADDRESS GatewayAddr; ///< Relay agent IP address. - UINT8 ClientHwAddr[16]; ///< Client hardware address. - CHAR8 ServerName[64]; - CHAR8 BootFileName[128]; -}EFI_DHCP4_HEADER; + UINT8 OpCode; + UINT8 HwType; + UINT8 HwAddrLen; + UINT8 Hops; + UINT32 Xid; + UINT16 Seconds; + UINT16 Reserved; + EFI_IPv4_ADDRESS ClientAddr; ///< Client IP address from client. + EFI_IPv4_ADDRESS YourAddr; ///< Client IP address from server. + EFI_IPv4_ADDRESS ServerAddr; ///< IP address of next server in bootstrap. + EFI_IPv4_ADDRESS GatewayAddr; ///< Relay agent IP address. + UINT8 ClientHwAddr[16]; ///< Client hardware address. + CHAR8 ServerName[64]; + CHAR8 BootFileName[128]; +} EFI_DHCP4_HEADER; #pragma pack() - #pragma pack(1) typedef struct { /// /// Size of the EFI_DHCP4_PACKET buffer. /// - UINT32 Size; + UINT32 Size; /// /// Length of the EFI_DHCP4_PACKET from the first byte of the Header field /// to the last byte of the Option[] field. /// - UINT32 Length; + UINT32 Length; struct { /// /// DHCP packet header. /// - EFI_DHCP4_HEADER Header; + EFI_DHCP4_HEADER Header; /// /// DHCP magik cookie in network byte order. /// - UINT32 Magik; + UINT32 Magik; /// /// Start of the DHCP packed option data. /// - UINT8 Option[1]; + UINT8 Option[1]; } Dhcp4; } EFI_DHCP4_PACKET; #pragma pack() - typedef enum { /// /// The EFI DHCPv4 Protocol driver is stopped. /// - Dhcp4Stopped = 0x0, + Dhcp4Stopped = 0x0, /// /// The EFI DHCPv4 Protocol driver is inactive. /// - Dhcp4Init = 0x1, + Dhcp4Init = 0x1, /// /// The EFI DHCPv4 Protocol driver is collecting DHCP offer packets from DHCP servers. /// - Dhcp4Selecting = 0x2, + Dhcp4Selecting = 0x2, /// /// The EFI DHCPv4 Protocol driver has sent the request to the DHCP server and is waiting for a response. /// - Dhcp4Requesting = 0x3, + Dhcp4Requesting = 0x3, /// /// The DHCP configuration has completed. /// - Dhcp4Bound = 0x4, + Dhcp4Bound = 0x4, /// /// The DHCP configuration is being renewed and another request has /// been sent out, but it has not received a response from the server yet. /// - Dhcp4Renewing = 0x5, + Dhcp4Renewing = 0x5, /// /// The DHCP configuration has timed out and the EFI DHCPv4 /// Protocol driver is trying to extend the lease time. /// - Dhcp4Rebinding = 0x6, + Dhcp4Rebinding = 0x6, /// /// The EFI DHCPv4 Protocol driver was initialized with a previously /// allocated or known IP address. /// - Dhcp4InitReboot = 0x7, + Dhcp4InitReboot = 0x7, /// /// The EFI DHCPv4 Protocol driver is seeking to reuse the previously /// allocated IP address by sending a request to the DHCP server. /// - Dhcp4Rebooting = 0x8 + Dhcp4Rebooting = 0x8 } EFI_DHCP4_STATE; - -typedef enum{ +typedef enum { /// /// The packet to start the configuration sequence is about to be sent. /// - Dhcp4SendDiscover = 0x01, + Dhcp4SendDiscover = 0x01, /// /// A reply packet was just received. /// - Dhcp4RcvdOffer = 0x02, + Dhcp4RcvdOffer = 0x02, /// /// It is time for Dhcp4Callback to select an offer. /// - Dhcp4SelectOffer = 0x03, + Dhcp4SelectOffer = 0x03, /// /// A request packet is about to be sent. /// - Dhcp4SendRequest = 0x04, + Dhcp4SendRequest = 0x04, /// /// A DHCPACK packet was received and will be passed to Dhcp4Callback. /// - Dhcp4RcvdAck = 0x05, + Dhcp4RcvdAck = 0x05, /// /// A DHCPNAK packet was received and will be passed to Dhcp4Callback. /// - Dhcp4RcvdNak = 0x06, + Dhcp4RcvdNak = 0x06, /// /// A decline packet is about to be sent. /// - Dhcp4SendDecline = 0x07, + Dhcp4SendDecline = 0x07, /// /// The DHCP configuration process has completed. No packet is associated with this event. /// @@ -180,7 +175,7 @@ typedef enum{ /// It is time to enter the Dhcp4Renewing state and to contact the server /// that originally issued the network address. No packet is associated with this event. /// - Dhcp4EnterRenewing = 0x09, + Dhcp4EnterRenewing = 0x09, /// /// It is time to enter the Dhcp4Rebinding state and to contact any server. /// No packet is associated with this event. @@ -191,13 +186,13 @@ typedef enum{ /// the user released the configuration, or a DHCPNAK packet was received in /// the Dhcp4Renewing or Dhcp4Rebinding state. No packet is associated with this event. /// - Dhcp4AddressLost = 0x0b, + Dhcp4AddressLost = 0x0b, /// /// The DHCP process failed because a DHCPNAK packet was received or the user /// aborted the DHCP process at a time when the configuration was not available yet. /// No packet is associated with this event. /// - Dhcp4Fail = 0x0c + Dhcp4Fail = 0x0c } EFI_DHCP4_EVENT; /** @@ -249,25 +244,25 @@ typedef struct { /// event and waiting for a response during the Dhcp4RcvdOffer event. /// Set to zero to use the default try counts and timeout values. /// - UINT32 DiscoverTryCount; + UINT32 DiscoverTryCount; /// /// The maximum amount of time (in seconds) to wait for returned packets in each /// of the retries. Timeout values of zero will default to a timeout value /// of one second. Set to NULL to use default timeout values. /// - UINT32 *DiscoverTimeout; + UINT32 *DiscoverTimeout; /// /// The number of times to try sending a packet during the Dhcp4SendRequest event /// and waiting for a response during the Dhcp4RcvdAck event before accepting /// failure. Set to zero to use the default try counts and timeout values. /// - UINT32 RequestTryCount; + UINT32 RequestTryCount; /// /// The maximum amount of time (in seconds) to wait for return packets in each of the retries. /// Timeout values of zero will default to a timeout value of one second. /// Set to NULL to use default timeout values. /// - UINT32 *RequestTimeout; + UINT32 *RequestTimeout; /// /// For a DHCPDISCOVER, setting this parameter to the previously allocated IP /// address will cause the EFI DHCPv4 Protocol driver to enter the Dhcp4InitReboot state. @@ -275,20 +270,20 @@ typedef struct { /// For a DHCPINFORM this parameter should be set to the client network address /// which was assigned to the client during a DHCPDISCOVER. /// - EFI_IPv4_ADDRESS ClientAddress; + EFI_IPv4_ADDRESS ClientAddress; /// /// The callback function to intercept various events that occurred in /// the DHCP configuration process. Set to NULL to ignore all those events. /// - EFI_DHCP4_CALLBACK Dhcp4Callback; + EFI_DHCP4_CALLBACK Dhcp4Callback; /// /// The pointer to the context that will be passed to Dhcp4Callback when it is called. /// - VOID *CallbackContext; + VOID *CallbackContext; /// /// Number of DHCP options in the OptionList. /// - UINT32 OptionCount; + UINT32 OptionCount; /// /// List of DHCP options to be included in every packet that is sent during the /// Dhcp4SendDiscover event. Pad options are appended automatically by DHCP driver @@ -296,122 +291,118 @@ typedef struct { /// ignored by the driver. OptionList can be freed after EFI_DHCP4_PROTOCOL.Configure() /// returns. Ignored if OptionCount is zero. /// - EFI_DHCP4_PACKET_OPTION **OptionList; + EFI_DHCP4_PACKET_OPTION **OptionList; } EFI_DHCP4_CONFIG_DATA; - typedef struct { /// /// The EFI DHCPv4 Protocol driver operating state. /// - EFI_DHCP4_STATE State; + EFI_DHCP4_STATE State; /// /// The configuration data of the current EFI DHCPv4 Protocol driver instance. /// - EFI_DHCP4_CONFIG_DATA ConfigData; + EFI_DHCP4_CONFIG_DATA ConfigData; /// /// The client IP address that was acquired from the DHCP server. If it is zero, /// the DHCP acquisition has not completed yet and the following fields in this structure are undefined. /// - EFI_IPv4_ADDRESS ClientAddress; + EFI_IPv4_ADDRESS ClientAddress; /// /// The local hardware address. /// - EFI_MAC_ADDRESS ClientMacAddress; + EFI_MAC_ADDRESS ClientMacAddress; /// /// The server IP address that is providing the DHCP service to this client. /// - EFI_IPv4_ADDRESS ServerAddress; + EFI_IPv4_ADDRESS ServerAddress; /// /// The router IP address that was acquired from the DHCP server. /// May be zero if the server does not offer this address. /// - EFI_IPv4_ADDRESS RouterAddress; + EFI_IPv4_ADDRESS RouterAddress; /// /// The subnet mask of the connected network that was acquired from the DHCP server. /// - EFI_IPv4_ADDRESS SubnetMask; + EFI_IPv4_ADDRESS SubnetMask; /// /// The lease time (in 1-second units) of the configured IP address. /// The value 0xFFFFFFFF means that the lease time is infinite. /// A default lease of 7 days is used if the DHCP server does not provide a value. /// - UINT32 LeaseTime; + UINT32 LeaseTime; /// /// The cached latest DHCPACK or DHCPNAK or BOOTP REPLY packet. May be NULL if no packet is cached. /// - EFI_DHCP4_PACKET *ReplyPacket; + EFI_DHCP4_PACKET *ReplyPacket; } EFI_DHCP4_MODE_DATA; - typedef struct { /// /// Alternate listening address. It can be a unicast, multicast, or broadcast address. /// - EFI_IPv4_ADDRESS ListenAddress; + EFI_IPv4_ADDRESS ListenAddress; /// /// The subnet mask of above listening unicast/broadcast IP address. /// Ignored if ListenAddress is a multicast address. /// - EFI_IPv4_ADDRESS SubnetMask; + EFI_IPv4_ADDRESS SubnetMask; /// /// Alternate station source (or listening) port number. /// If zero, then the default station port number (68) will be used. /// - UINT16 ListenPort; + UINT16 ListenPort; } EFI_DHCP4_LISTEN_POINT; - typedef struct { /// /// The completion status of transmitting and receiving. /// - EFI_STATUS Status; + EFI_STATUS Status; /// /// If not NULL, the event that will be signaled when the collection process /// completes. If NULL, this function will busy-wait until the collection process competes. /// - EFI_EVENT CompletionEvent; + EFI_EVENT CompletionEvent; /// /// The pointer to the server IP address. This address may be a unicast, multicast, or broadcast address. /// - EFI_IPv4_ADDRESS RemoteAddress; + EFI_IPv4_ADDRESS RemoteAddress; /// /// The server listening port number. If zero, the default server listening port number (67) will be used. /// - UINT16 RemotePort; + UINT16 RemotePort; /// /// The pointer to the gateway address to override the existing setting. /// - EFI_IPv4_ADDRESS GatewayAddress; + EFI_IPv4_ADDRESS GatewayAddress; /// /// The number of entries in ListenPoints. If zero, the default station address and port number 68 are used. /// - UINT32 ListenPointCount; + UINT32 ListenPointCount; /// /// An array of station address and port number pairs that are used as receiving filters. /// The first entry is also used as the source address and source port of the outgoing packet. /// - EFI_DHCP4_LISTEN_POINT *ListenPoints; + EFI_DHCP4_LISTEN_POINT *ListenPoints; /// /// The number of seconds to collect responses. Zero is invalid. /// - UINT32 TimeoutValue; + UINT32 TimeoutValue; /// /// The pointer to the packet to be transmitted. /// - EFI_DHCP4_PACKET *Packet; + EFI_DHCP4_PACKET *Packet; /// /// Number of received packets. /// - UINT32 ResponseCount; + UINT32 ResponseCount; /// /// The pointer to the allocated list of received packets. /// - EFI_DHCP4_PACKET *ResponseList; + EFI_DHCP4_PACKET *ResponseList; } EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN; - /** Returns the current operating mode and cached data packet for the EFI DHCPv4 Protocol driver. @@ -487,7 +478,6 @@ EFI_STATUS IN EFI_DHCP4_CONFIG_DATA *Dhcp4CfgData OPTIONAL ); - /** Starts the DHCP configuration process. @@ -677,7 +667,6 @@ EFI_STATUS OUT EFI_DHCP4_PACKET **NewPacket ); - /** Transmits a DHCP formatted packet and optionally waits for responses. @@ -710,7 +699,6 @@ EFI_STATUS IN EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN *Token ); - /** Parses the packed DHCP option data. @@ -757,18 +745,18 @@ EFI_STATUS /// and to provide DHCPv4 server and PXE boot server discovery services. /// struct _EFI_DHCP4_PROTOCOL { - EFI_DHCP4_GET_MODE_DATA GetModeData; - EFI_DHCP4_CONFIGURE Configure; - EFI_DHCP4_START Start; - EFI_DHCP4_RENEW_REBIND RenewRebind; - EFI_DHCP4_RELEASE Release; - EFI_DHCP4_STOP Stop; - EFI_DHCP4_BUILD Build; - EFI_DHCP4_TRANSMIT_RECEIVE TransmitReceive; - EFI_DHCP4_PARSE Parse; + EFI_DHCP4_GET_MODE_DATA GetModeData; + EFI_DHCP4_CONFIGURE Configure; + EFI_DHCP4_START Start; + EFI_DHCP4_RENEW_REBIND RenewRebind; + EFI_DHCP4_RELEASE Release; + EFI_DHCP4_STOP Stop; + EFI_DHCP4_BUILD Build; + EFI_DHCP4_TRANSMIT_RECEIVE TransmitReceive; + EFI_DHCP4_PARSE Parse; }; -extern EFI_GUID gEfiDhcp4ProtocolGuid; -extern EFI_GUID gEfiDhcp4ServiceBindingProtocolGuid; +extern EFI_GUID gEfiDhcp4ProtocolGuid; +extern EFI_GUID gEfiDhcp4ServiceBindingProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Dhcp6.h b/MdePkg/Include/Protocol/Dhcp6.h index e10c7fdfa0..808b14f06d 100644 --- a/MdePkg/Include/Protocol/Dhcp6.h +++ b/MdePkg/Include/Protocol/Dhcp6.h @@ -30,47 +30,47 @@ typedef enum { /// The EFI DHCPv6 Protocol instance is configured, and start() needs /// to be called /// - Dhcp6Init = 0x0, + Dhcp6Init = 0x0, /// /// A Solicit packet is sent out to discover DHCPv6 server, and the EFI /// DHCPv6 Protocol instance is collecting Advertise packets. /// - Dhcp6Selecting = 0x1, + Dhcp6Selecting = 0x1, /// /// A Request is sent out to the DHCPv6 server, and the EFI DHCPv6 /// Protocol instance is waiting for Reply packet. /// - Dhcp6Requesting = 0x2, + Dhcp6Requesting = 0x2, /// /// A Decline packet is sent out to indicate one or more addresses of the /// configured IA are in use by another node, and the EFI DHCPv6. /// Protocol instance is waiting for Reply packet. /// - Dhcp6Declining = 0x3, + Dhcp6Declining = 0x3, /// /// A Confirm packet is sent out to confirm the IPv6 addresses of the /// configured IA, and the EFI DHCPv6 Protocol instance is waiting for Reply packet. /// - Dhcp6Confirming = 0x4, + Dhcp6Confirming = 0x4, /// /// A Release packet is sent out to release one or more IPv6 addresses of /// the configured IA, and the EFI DHCPv6 Protocol instance is waiting for Reply packet. /// - Dhcp6Releasing = 0x5, + Dhcp6Releasing = 0x5, /// /// The DHCPv6 S.A.R.R process is completed for the configured IA. /// - Dhcp6Bound = 0x6, + Dhcp6Bound = 0x6, /// /// A Renew packet is sent out to extend lifetime for the IPv6 addresses of /// the configured IA, and the EFI DHCPv6 Protocol instance is waiting for Reply packet. /// - Dhcp6Renewing = 0x7, + Dhcp6Renewing = 0x7, /// /// A Rebind packet is sent out to extend lifetime for the IPv6 addresses of /// the configured IA, and the EFI DHCPv6 Protocol instance is waiting for Reply packet. /// - Dhcp6Rebinding = 0x8 + Dhcp6Rebinding = 0x8 } EFI_DHCP6_STATE; typedef enum { @@ -78,64 +78,64 @@ typedef enum { /// A Solicit packet is about to be sent. The packet is passed to Dhcp6Callback and /// can be modified or replaced in Dhcp6Callback. /// - Dhcp6SendSolicit = 0x0, + Dhcp6SendSolicit = 0x0, /// /// An Advertise packet is received and will be passed to Dhcp6Callback. /// - Dhcp6RcvdAdvertise = 0x1, + Dhcp6RcvdAdvertise = 0x1, /// /// It is time for Dhcp6Callback to determine whether select the default Advertise /// packet by RFC 3315 policy, or overwrite it by specific user policy. /// - Dhcp6SelectAdvertise = 0x2, + Dhcp6SelectAdvertise = 0x2, /// /// A Request packet is about to be sent. The packet is passed to Dhcp6Callback and /// can be modified or replaced in Dhcp6Callback. /// - Dhcp6SendRequest = 0x3, + Dhcp6SendRequest = 0x3, /// /// A Reply packet is received and will be passed to Dhcp6Callback. /// - Dhcp6RcvdReply = 0x4, + Dhcp6RcvdReply = 0x4, /// /// A Reconfigure packet is received and will be passed to Dhcp6Callback. /// - Dhcp6RcvdReconfigure = 0x5, + Dhcp6RcvdReconfigure = 0x5, /// /// A Decline packet is about to be sent. The packet is passed to Dhcp6Callback and /// can be modified or replaced in Dhcp6Callback. /// - Dhcp6SendDecline = 0x6, + Dhcp6SendDecline = 0x6, /// /// A Confirm packet is about to be sent. The packet is passed to Dhcp6Callback and /// can be modified or replaced in Dhcp6Callback. /// - Dhcp6SendConfirm = 0x7, + Dhcp6SendConfirm = 0x7, /// /// A Release packet is about to be sent. The packet is passed to Dhcp6Callback and /// can be modified or replaced in Dhcp6Callback. /// - Dhcp6SendRelease = 0x8, + Dhcp6SendRelease = 0x8, /// /// A Renew packet is about to be sent. The packet is passed to Dhcp6Callback and /// can be modified or replaced in Dhcp6Callback. /// - Dhcp6EnterRenewing = 0x9, + Dhcp6EnterRenewing = 0x9, /// /// A Rebind packet is about to be sent. The packet is passed to Dhcp6Callback and /// can be modified or replaced in Dhcp6Callback. /// - Dhcp6EnterRebinding = 0xa + Dhcp6EnterRebinding = 0xa } EFI_DHCP6_EVENT; /// /// An IA which carries assigned not temporary address. /// -#define EFI_DHCP6_IA_TYPE_NA 3 +#define EFI_DHCP6_IA_TYPE_NA 3 /// /// An IA which carries assigned temporary address. /// -#define EFI_DHCP6_IA_TYPE_TA 4 +#define EFI_DHCP6_IA_TYPE_TA 4 #pragma pack(1) /// @@ -147,31 +147,31 @@ typedef struct { /// /// The DHCPv6 option code, stored in network order. /// - UINT16 OpCode; + UINT16 OpCode; /// /// Length of the DHCPv6 option data, stored in network order. /// From the first byte to the last byte of the Data field. /// - UINT16 OpLen; + UINT16 OpLen; /// /// The data for the DHCPv6 option, stored in network order. /// - UINT8 Data[1]; + UINT8 Data[1]; } EFI_DHCP6_PACKET_OPTION; /// /// EFI_DHCP6_HEADER /// defines the format of the DHCPv6 header. See RFC 3315 for more information. /// -typedef struct{ +typedef struct { /// /// The DHCPv6 transaction ID. /// - UINT32 MessageType:8; + UINT32 MessageType : 8; /// /// The DHCPv6 message type. /// - UINT32 TransactionId:24; + UINT32 TransactionId : 24; } EFI_DHCP6_HEADER; /// @@ -182,21 +182,21 @@ typedef struct { /// /// Size of the EFI_DHCP6_PACKET buffer. /// - UINT32 Size; + UINT32 Size; /// /// Length of the EFI_DHCP6_PACKET from the first byte of the Header field to the last /// byte of the Option[] field. /// - UINT32 Length; - struct{ + UINT32 Length; + struct { /// /// The DHCPv6 packet header. /// - EFI_DHCP6_HEADER Header; + EFI_DHCP6_HEADER Header; /// /// Start of the DHCPv6 packed option data. /// - UINT8 Option[1]; + UINT8 Option[1]; } Dhcp6; } EFI_DHCP6_PACKET; @@ -206,91 +206,91 @@ typedef struct { /// /// Length of DUID in octects. /// - UINT16 Length; + UINT16 Length; /// /// Array of DUID octects. /// - UINT8 Duid[1]; + UINT8 Duid[1]; } EFI_DHCP6_DUID; typedef struct { /// /// Initial retransmission timeout. /// - UINT32 Irt; + UINT32 Irt; /// /// Maximum retransmission count for one packet. If Mrc is zero, there's no upper limit /// for retransmission count. /// - UINT32 Mrc; + UINT32 Mrc; /// /// Maximum retransmission timeout for each retry. It's the upper bound of the number of /// retransmission timeout. If Mrt is zero, there is no upper limit for retransmission /// timeout. /// - UINT32 Mrt; + UINT32 Mrt; /// /// Maximum retransmission duration for one packet. It's the upper bound of the numbers /// the client may retransmit a message. If Mrd is zero, there's no upper limit for /// retransmission duration. /// - UINT32 Mrd; + UINT32 Mrd; } EFI_DHCP6_RETRANSMISSION; typedef struct { /// /// The IPv6 address. /// - EFI_IPv6_ADDRESS IpAddress; + EFI_IPv6_ADDRESS IpAddress; /// /// The preferred lifetime in unit of seconds for the IPv6 address. /// - UINT32 PreferredLifetime; + UINT32 PreferredLifetime; /// /// The valid lifetime in unit of seconds for the IPv6 address. /// - UINT32 ValidLifetime; + UINT32 ValidLifetime; } EFI_DHCP6_IA_ADDRESS; typedef struct { - UINT16 Type; ///< Type for an IA. - UINT32 IaId; ///< The identifier for an IA. + UINT16 Type; ///< Type for an IA. + UINT32 IaId; ///< The identifier for an IA. } EFI_DHCP6_IA_DESCRIPTOR; typedef struct { /// /// The descriptor for IA. /// - EFI_DHCP6_IA_DESCRIPTOR Descriptor; + EFI_DHCP6_IA_DESCRIPTOR Descriptor; /// /// The state of the configured IA. /// - EFI_DHCP6_STATE State; + EFI_DHCP6_STATE State; /// /// Pointer to the cached latest Reply packet. May be NULL if no packet is cached. /// - EFI_DHCP6_PACKET *ReplyPacket; + EFI_DHCP6_PACKET *ReplyPacket; /// /// Number of IPv6 addresses of the configured IA. /// - UINT32 IaAddressCount; + UINT32 IaAddressCount; /// /// List of the IPv6 addresses of the configured IA. When the state of the configured IA is /// in Dhcp6Bound, Dhcp6Renewing and Dhcp6Rebinding, the IPv6 addresses are usable. /// - EFI_DHCP6_IA_ADDRESS IaAddress[1]; + EFI_DHCP6_IA_ADDRESS IaAddress[1]; } EFI_DHCP6_IA; typedef struct { /// /// Pointer to the DHCPv6 unique identifier. The caller is responsible for freeing this buffer. /// - EFI_DHCP6_DUID *ClientId; + EFI_DHCP6_DUID *ClientId; /// /// Pointer to the configured IA of current instance. The caller can free this buffer after /// using it. /// - EFI_DHCP6_IA *Ia; + EFI_DHCP6_IA *Ia; } EFI_DHCP6_MODE_DATA; /** @@ -329,15 +329,15 @@ typedef struct { /// The callback function is to intercept various events that occur in the DHCPv6 S.A.R.R /// process. Set to NULL to ignore all those events. /// - EFI_DHCP6_CALLBACK Dhcp6Callback; + EFI_DHCP6_CALLBACK Dhcp6Callback; /// /// Pointer to the context that will be passed to Dhcp6Callback. /// - VOID *CallbackContext; + VOID *CallbackContext; /// /// Number of the DHCPv6 options in the OptionList. /// - UINT32 OptionCount; + UINT32 OptionCount; /// /// List of the DHCPv6 options to be included in Solicit and Request packet. The buffer /// can be freed after EFI_DHCP6_PROTOCOL.Configure() returns. Ignored if @@ -345,11 +345,11 @@ typedef struct { /// and any IA option, which will be appended by EFI DHCPv6 Protocol instance /// automatically. /// - EFI_DHCP6_PACKET_OPTION **OptionList; + EFI_DHCP6_PACKET_OPTION **OptionList; /// /// The descriptor for the IA of the EFI DHCPv6 Protocol instance. /// - EFI_DHCP6_IA_DESCRIPTOR IaDescriptor; + EFI_DHCP6_IA_DESCRIPTOR IaDescriptor; /// /// If not NULL, the event will be signaled when any IPv6 address information of the /// configured IA is updated, including IPv6 address, preferred lifetime and valid @@ -357,24 +357,24 @@ typedef struct { /// renewrebind(), decline(), release() and stop() will be blocking /// operations, and they will wait for the exchange process completion or failure. /// - EFI_EVENT IaInfoEvent; + EFI_EVENT IaInfoEvent; /// /// If TRUE, the EFI DHCPv6 Protocol instance is willing to accept Reconfigure packet. /// Otherwise, it will ignore it. Reconfigure Accept option can not be specified through /// OptionList parameter. /// - BOOLEAN ReconfigureAccept; + BOOLEAN ReconfigureAccept; /// /// If TRUE, the EFI DHCPv6 Protocol instance will send Solicit packet with Rapid /// Commit option. Otherwise, Rapid Commit option will not be included in Solicit /// packet. Rapid Commit option can not be specified through OptionList parameter. /// - BOOLEAN RapidCommit; + BOOLEAN RapidCommit; /// /// Parameter to control Solicit packet retransmission behavior. The /// buffer can be freed after EFI_DHCP6_PROTOCOL.Configure() returns. /// - EFI_DHCP6_RETRANSMISSION *SolicitRetransmission; + EFI_DHCP6_RETRANSMISSION *SolicitRetransmission; } EFI_DHCP6_CONFIG_DATA; /** @@ -756,25 +756,25 @@ EFI_STATUS IN EFI_DHCP6_PACKET *Packet, IN OUT UINT32 *OptionCount, OUT EFI_DHCP6_PACKET_OPTION *PacketOptionList[] OPTIONAL -); + ); /// /// The EFI DHCPv6 Protocol is used to get IPv6 addresses and other configuration parameters /// from DHCPv6 servers. /// struct _EFI_DHCP6_PROTOCOL { - EFI_DHCP6_GET_MODE_DATA GetModeData; - EFI_DHCP6_CONFIGURE Configure; - EFI_DHCP6_START Start; - EFI_DHCP6_INFO_REQUEST InfoRequest; - EFI_DHCP6_RENEW_REBIND RenewRebind; - EFI_DHCP6_DECLINE Decline; - EFI_DHCP6_RELEASE Release; - EFI_DHCP6_STOP Stop; - EFI_DHCP6_PARSE Parse; + EFI_DHCP6_GET_MODE_DATA GetModeData; + EFI_DHCP6_CONFIGURE Configure; + EFI_DHCP6_START Start; + EFI_DHCP6_INFO_REQUEST InfoRequest; + EFI_DHCP6_RENEW_REBIND RenewRebind; + EFI_DHCP6_DECLINE Decline; + EFI_DHCP6_RELEASE Release; + EFI_DHCP6_STOP Stop; + EFI_DHCP6_PARSE Parse; }; -extern EFI_GUID gEfiDhcp6ProtocolGuid; -extern EFI_GUID gEfiDhcp6ServiceBindingProtocolGuid; +extern EFI_GUID gEfiDhcp6ProtocolGuid; +extern EFI_GUID gEfiDhcp6ServiceBindingProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DiskInfo.h b/MdePkg/Include/Protocol/DiskInfo.h index 9027909dd1..32fe7140da 100644 --- a/MdePkg/Include/Protocol/DiskInfo.h +++ b/MdePkg/Include/Protocol/DiskInfo.h @@ -25,7 +25,7 @@ /// /// Forward declaration for EFI_DISK_INFO_PROTOCOL /// -typedef struct _EFI_DISK_INFO_PROTOCOL EFI_DISK_INFO_PROTOCOL; +typedef struct _EFI_DISK_INFO_PROTOCOL EFI_DISK_INFO_PROTOCOL; /// /// Global ID for an IDE interface. Used to fill in EFI_DISK_INFO_PROTOCOL.Interface @@ -186,36 +186,36 @@ struct _EFI_DISK_INFO_PROTOCOL { /// A GUID that defines the format of buffers for the other member functions /// of this protocol. /// - EFI_GUID Interface; + EFI_GUID Interface; /// /// Return the results of the Inquiry command to a drive in InquiryData. Data /// format of Inquiry data is defined by the Interface GUID. /// - EFI_DISK_INFO_INQUIRY Inquiry; + EFI_DISK_INFO_INQUIRY Inquiry; /// /// Return the results of the Identify command to a drive in IdentifyData. Data /// format of Identify data is defined by the Interface GUID. /// - EFI_DISK_INFO_IDENTIFY Identify; + EFI_DISK_INFO_IDENTIFY Identify; /// /// Return the results of the Request Sense command to a drive in SenseData. Data /// format of Sense data is defined by the Interface GUID. /// - EFI_DISK_INFO_SENSE_DATA SenseData; + EFI_DISK_INFO_SENSE_DATA SenseData; /// /// Specific controller. /// - EFI_DISK_INFO_WHICH_IDE WhichIde; + EFI_DISK_INFO_WHICH_IDE WhichIde; }; -extern EFI_GUID gEfiDiskInfoProtocolGuid; +extern EFI_GUID gEfiDiskInfoProtocolGuid; -extern EFI_GUID gEfiDiskInfoIdeInterfaceGuid; -extern EFI_GUID gEfiDiskInfoScsiInterfaceGuid; -extern EFI_GUID gEfiDiskInfoUsbInterfaceGuid; -extern EFI_GUID gEfiDiskInfoAhciInterfaceGuid; -extern EFI_GUID gEfiDiskInfoNvmeInterfaceGuid; -extern EFI_GUID gEfiDiskInfoUfsInterfaceGuid; -extern EFI_GUID gEfiDiskInfoSdMmcInterfaceGuid; +extern EFI_GUID gEfiDiskInfoIdeInterfaceGuid; +extern EFI_GUID gEfiDiskInfoScsiInterfaceGuid; +extern EFI_GUID gEfiDiskInfoUsbInterfaceGuid; +extern EFI_GUID gEfiDiskInfoAhciInterfaceGuid; +extern EFI_GUID gEfiDiskInfoNvmeInterfaceGuid; +extern EFI_GUID gEfiDiskInfoUfsInterfaceGuid; +extern EFI_GUID gEfiDiskInfoSdMmcInterfaceGuid; #endif diff --git a/MdePkg/Include/Protocol/DiskIo.h b/MdePkg/Include/Protocol/DiskIo.h index c051eef3a9..eaa5cbcea2 100644 --- a/MdePkg/Include/Protocol/DiskIo.h +++ b/MdePkg/Include/Protocol/DiskIo.h @@ -28,7 +28,7 @@ typedef struct _EFI_DISK_IO_PROTOCOL EFI_DISK_IO_PROTOCOL; /// /// Protocol defined in EFI1.1. /// -typedef EFI_DISK_IO_PROTOCOL EFI_DISK_IO; +typedef EFI_DISK_IO_PROTOCOL EFI_DISK_IO; /** Read BufferSize bytes from Offset into Buffer. @@ -85,7 +85,7 @@ EFI_STATUS IN VOID *Buffer ); -#define EFI_DISK_IO_PROTOCOL_REVISION 0x00010000 +#define EFI_DISK_IO_PROTOCOL_REVISION 0x00010000 /// /// Revision defined in EFI1.1 @@ -101,11 +101,11 @@ struct _EFI_DISK_IO_PROTOCOL { /// revisions must be backwards compatible. If a future version is not /// backwards compatible, it is not the same GUID. /// - UINT64 Revision; - EFI_DISK_READ ReadDisk; - EFI_DISK_WRITE WriteDisk; + UINT64 Revision; + EFI_DISK_READ ReadDisk; + EFI_DISK_WRITE WriteDisk; }; -extern EFI_GUID gEfiDiskIoProtocolGuid; +extern EFI_GUID gEfiDiskIoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DiskIo2.h b/MdePkg/Include/Protocol/DiskIo2.h index 08f2aabcd4..c989bb5f45 100644 --- a/MdePkg/Include/Protocol/DiskIo2.h +++ b/MdePkg/Include/Protocol/DiskIo2.h @@ -30,12 +30,12 @@ typedef struct { // The caller must be prepared to handle the case where the callback associated with Event occurs // before the original asynchronous I/O request call returns. // - EFI_EVENT Event; + EFI_EVENT Event; // // Defines whether or not the signaled event encountered an error. // - EFI_STATUS TransactionStatus; + EFI_STATUS TransactionStatus; } EFI_DISK_IO2_TOKEN; /** @@ -49,7 +49,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_DISK_CANCEL_EX) ( +(EFIAPI *EFI_DISK_CANCEL_EX)( IN EFI_DISK_IO2_PROTOCOL *This ); @@ -77,7 +77,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DISK_READ_EX) ( +(EFIAPI *EFI_DISK_READ_EX)( IN EFI_DISK_IO2_PROTOCOL *This, IN UINT32 MediaId, IN UINT64 Offset, @@ -110,7 +110,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DISK_WRITE_EX) ( +(EFIAPI *EFI_DISK_WRITE_EX)( IN EFI_DISK_IO2_PROTOCOL *This, IN UINT32 MediaId, IN UINT64 Offset, @@ -138,12 +138,12 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DISK_FLUSH_EX) ( +(EFIAPI *EFI_DISK_FLUSH_EX)( IN EFI_DISK_IO2_PROTOCOL *This, IN OUT EFI_DISK_IO2_TOKEN *Token ); -#define EFI_DISK_IO2_PROTOCOL_REVISION 0x00020000 +#define EFI_DISK_IO2_PROTOCOL_REVISION 0x00020000 /// /// This protocol is used to abstract Block I/O interfaces. @@ -154,13 +154,13 @@ struct _EFI_DISK_IO2_PROTOCOL { /// revisions must be backwards compatible. If a future version is not /// backwards compatible, it is not the same GUID. /// - UINT64 Revision; - EFI_DISK_CANCEL_EX Cancel; - EFI_DISK_READ_EX ReadDiskEx; - EFI_DISK_WRITE_EX WriteDiskEx; - EFI_DISK_FLUSH_EX FlushDiskEx; + UINT64 Revision; + EFI_DISK_CANCEL_EX Cancel; + EFI_DISK_READ_EX ReadDiskEx; + EFI_DISK_WRITE_EX WriteDiskEx; + EFI_DISK_FLUSH_EX FlushDiskEx; }; -extern EFI_GUID gEfiDiskIo2ProtocolGuid; +extern EFI_GUID gEfiDiskIo2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Dns4.h b/MdePkg/Include/Protocol/Dns4.h index c92c30ab0b..43eeff1671 100644 --- a/MdePkg/Include/Protocol/Dns4.h +++ b/MdePkg/Include/Protocol/Dns4.h @@ -39,7 +39,7 @@ typedef struct { /// DnsServerListCount is zero, the DNS server configuration /// will be retrieved from DHCP server automatically. /// - UINTN DnsServerListCount; + UINTN DnsServerListCount; /// /// Pointer to DNS server list containing DnsServerListCount entries or NULL /// if DnsServerListCountis 0. For Configure(), this will be NULL when there are @@ -51,16 +51,16 @@ typedef struct { /// freed by the caller. When used with Configure(), the buffer /// containing the list will be allocated and released by the caller. /// - EFI_IPv4_ADDRESS *DnsServerList; + EFI_IPv4_ADDRESS *DnsServerList; /// /// Set to TRUE to use the default IP address/subnet mask and default routing table. /// - BOOLEAN UseDefaultSetting; + BOOLEAN UseDefaultSetting; /// /// If TRUE, enable DNS cache function for this DNS instance. If FALSE, all DNS /// query will not lookup local DNS cache. /// - BOOLEAN EnableDnsCache; + BOOLEAN EnableDnsCache; /// /// Use the protocol number defined in "Links to UEFI-Related /// Documents"(http://uefi.org/uefi) under the heading "IANA @@ -68,31 +68,30 @@ typedef struct { /// protocol values are invalid. An implementation can choose to /// support only UDP, or both TCP and UDP. /// - UINT8 Protocol; + UINT8 Protocol; /// /// If UseDefaultSetting is FALSE indicates the station address to use. /// - EFI_IPv4_ADDRESS StationIp; + EFI_IPv4_ADDRESS StationIp; /// /// If UseDefaultSetting is FALSE indicates the subnet mask to use. /// - EFI_IPv4_ADDRESS SubnetMask; + EFI_IPv4_ADDRESS SubnetMask; /// /// Local port number. Set to zero to use the automatically assigned port number. /// - UINT16 LocalPort; + UINT16 LocalPort; /// /// Retry number if no response received after RetryInterval. /// - UINT32 RetryCount; + UINT32 RetryCount; /// /// Minimum interval of retry is 2 second. If the retry interval is less than 2 /// seconds, then use the 2 seconds. /// - UINT32 RetryInterval; + UINT32 RetryInterval; } EFI_DNS4_CONFIG_DATA; - /// /// EFI_DNS4_CACHE_ENTRY /// @@ -100,11 +99,11 @@ typedef struct { /// /// Host name. /// - CHAR16 *HostName; + CHAR16 *HostName; /// /// IP address of this host. /// - EFI_IPv4_ADDRESS *IpAddress; + EFI_IPv4_ADDRESS *IpAddress; /// /// Time in second unit that this entry will remain in DNS cache. A value of zero /// means that this entry is permanent. A nonzero value will override the existing @@ -112,7 +111,7 @@ typedef struct { /// default timeout value for the dynamically created DNS cache entry after one DNS /// resolve succeeds. /// - UINT32 Timeout; + UINT32 Timeout; } EFI_DNS4_CACHE_ENTRY; /// @@ -122,12 +121,12 @@ typedef struct { /// /// The configuration data of this instance. /// - EFI_DNS4_CONFIG_DATA DnsConfigData; + EFI_DNS4_CONFIG_DATA DnsConfigData; /// /// Number of configured DNS server. Each DNS instance has its own DNS server /// configuration. /// - UINT32 DnsServerCount; + UINT32 DnsServerCount; /// /// Pointer to common list of addresses of all configured DNS server /// used by EFI_DNS4_PROTOCOL instances. List will include @@ -135,17 +134,17 @@ typedef struct { /// The storage for this list is allocated by the driver publishing this /// protocol, and must be freed by the caller. /// - EFI_IPv4_ADDRESS *DnsServerList; + EFI_IPv4_ADDRESS *DnsServerList; /// /// Number of DNS Cache entries. The DNS Cache is shared among all DNS instances. /// - UINT32 DnsCacheCount; + UINT32 DnsCacheCount; /// /// Pointer to a buffer containing DnsCacheCount DNS Cache /// entry structures. The storage for this list is allocated by the driver /// publishing this protocol and must be freed by caller. /// - EFI_DNS4_CACHE_ENTRY *DnsCacheList; + EFI_DNS4_CACHE_ENTRY *DnsCacheList; } EFI_DNS4_MODE_DATA; /// @@ -155,11 +154,11 @@ typedef struct { /// /// Number of the returned IP addresses. /// - UINT32 IpCount; + UINT32 IpCount; /// /// Pointer to the all the returned IP addresses. /// - EFI_IPv4_ADDRESS *IpList; + EFI_IPv4_ADDRESS *IpList; } DNS_HOST_TO_ADDR_DATA; /// @@ -170,7 +169,7 @@ typedef struct { /// Pointer to the primary name for this host address. It's the caller's /// responsibility to free the response memory. /// - CHAR16 *HostName; + CHAR16 *HostName; } DNS_ADDR_TO_HOST_DATA; /// @@ -180,30 +179,30 @@ typedef struct { /// /// The Owner name. /// - CHAR8 *QName; + CHAR8 *QName; /// /// The Type Code of this RR. /// - UINT16 QType; + UINT16 QType; /// /// The CLASS code of this RR. /// - UINT16 QClass; + UINT16 QClass; /// /// 32 bit integer which specify the time interval that the resource record may be /// cached before the source of the information should again be consulted. Zero means /// this RR can not be cached. /// - UINT32 TTL; + UINT32 TTL; /// /// 16 big integer which specify the length of RData. /// - UINT16 DataLength; + UINT16 DataLength; /// /// A string of octets that describe the resource, the format of this information /// varies according to QType and QClass difference. /// - CHAR8 *RData; + CHAR8 *RData; } DNS_RESOURCE_RECORD; /// @@ -213,12 +212,12 @@ typedef struct { /// /// Number of returned matching RRs. /// - UINTN RRCount; + UINTN RRCount; /// /// Pointer to the all the returned matching RRs. It's caller responsibility to free /// the allocated memory to hold the returned RRs. /// - DNS_RESOURCE_RECORD *RRList; + DNS_RESOURCE_RECORD *RRList; } DNS_GENERAL_LOOKUP_DATA; /// @@ -229,7 +228,7 @@ typedef struct { /// This Event will be signaled after the Status field is updated by the EFI DNS /// protocol driver. The type of Event must be EFI_NOTIFY_SIGNAL. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Will be set to one of the following values: /// EFI_SUCCESS: The host name to address translation completed successfully. @@ -239,17 +238,17 @@ typedef struct { /// EFI_DEVICE_ERROR: An unexpected system or network error occurred. /// EFI_NO_MEDIA: There was a media error. /// - EFI_STATUS Status; + EFI_STATUS Status; /// /// Retry number if no response received after RetryInterval. If zero, use the /// parameter configured through Dns.Configure() interface. /// - UINT32 RetryCount; + UINT32 RetryCount; /// /// Minimum interval of retry is 2 second. If the retry interval is less than 2 /// seconds, then use the 2 seconds. If zero, use the parameter configured through /// Dns.Configure() interface. - UINT32 RetryInterval; + UINT32 RetryInterval; /// /// DNSv4 completion token data /// @@ -258,17 +257,17 @@ typedef struct { /// When the Token is used for host name to address translation, H2AData is a pointer /// to the DNS_HOST_TO_ADDR_DATA. /// - DNS_HOST_TO_ADDR_DATA *H2AData; + DNS_HOST_TO_ADDR_DATA *H2AData; /// /// When the Token is used for host address to host name translation, A2HData is a /// pointer to the DNS_ADDR_TO_HOST_DATA. /// - DNS_ADDR_TO_HOST_DATA *A2HData; + DNS_ADDR_TO_HOST_DATA *A2HData; /// /// When the Token is used for a general lookup function, GLookupDATA is a pointer to /// the DNS_GENERAL_LOOKUP_DATA. /// - DNS_GENERAL_LOOKUP_DATA *GLookupData; + DNS_GENERAL_LOOKUP_DATA *GLookupData; } RspData; } EFI_DNS4_COMPLETION_TOKEN; @@ -289,7 +288,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS4_GET_MODE_DATA) ( +(EFIAPI *EFI_DNS4_GET_MODE_DATA)( IN EFI_DNS4_PROTOCOL *This, OUT EFI_DNS4_MODE_DATA *DnsModeData ); @@ -321,7 +320,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS4_CONFIGURE) ( +(EFIAPI *EFI_DNS4_CONFIGURE)( IN EFI_DNS4_PROTOCOL *This, IN EFI_DNS4_CONFIG_DATA *DnsConfigData ); @@ -348,10 +347,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS4_HOST_NAME_TO_IP) ( - IN EFI_DNS4_PROTOCOL *This, - IN CHAR16 *HostName, - IN EFI_DNS4_COMPLETION_TOKEN *Token +(EFIAPI *EFI_DNS4_HOST_NAME_TO_IP)( + IN EFI_DNS4_PROTOCOL *This, + IN CHAR16 *HostName, + IN EFI_DNS4_COMPLETION_TOKEN *Token ); /** @@ -378,10 +377,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS4_IP_TO_HOST_NAME) ( - IN EFI_DNS4_PROTOCOL *This, - IN EFI_IPv4_ADDRESS IpAddress, - IN EFI_DNS4_COMPLETION_TOKEN *Token +(EFIAPI *EFI_DNS4_IP_TO_HOST_NAME)( + IN EFI_DNS4_PROTOCOL *This, + IN EFI_IPv4_ADDRESS IpAddress, + IN EFI_DNS4_COMPLETION_TOKEN *Token ); /** @@ -413,7 +412,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS4_GENERAL_LOOKUP) ( +(EFIAPI *EFI_DNS4_GENERAL_LOOKUP)( IN EFI_DNS4_PROTOCOL *This, IN CHAR8 *QName, IN UINT16 QType, @@ -449,7 +448,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS4_UPDATE_DNS_CACHE) ( +(EFIAPI *EFI_DNS4_UPDATE_DNS_CACHE)( IN EFI_DNS4_PROTOCOL *This, IN BOOLEAN DeleteFlag, IN BOOLEAN Override, @@ -479,7 +478,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS4_POLL) ( +(EFIAPI *EFI_DNS4_POLL)( IN EFI_DNS4_PROTOCOL *This ); @@ -510,7 +509,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS4_CANCEL) ( +(EFIAPI *EFI_DNS4_CANCEL)( IN EFI_DNS4_PROTOCOL *This, IN EFI_DNS4_COMPLETION_TOKEN *Token ); @@ -521,17 +520,17 @@ EFI_STATUS /// from DNS. /// struct _EFI_DNS4_PROTOCOL { - EFI_DNS4_GET_MODE_DATA GetModeData; - EFI_DNS4_CONFIGURE Configure; - EFI_DNS4_HOST_NAME_TO_IP HostNameToIp; - EFI_DNS4_IP_TO_HOST_NAME IpToHostName; - EFI_DNS4_GENERAL_LOOKUP GeneralLookUp; - EFI_DNS4_UPDATE_DNS_CACHE UpdateDnsCache; - EFI_DNS4_POLL Poll; - EFI_DNS4_CANCEL Cancel; + EFI_DNS4_GET_MODE_DATA GetModeData; + EFI_DNS4_CONFIGURE Configure; + EFI_DNS4_HOST_NAME_TO_IP HostNameToIp; + EFI_DNS4_IP_TO_HOST_NAME IpToHostName; + EFI_DNS4_GENERAL_LOOKUP GeneralLookUp; + EFI_DNS4_UPDATE_DNS_CACHE UpdateDnsCache; + EFI_DNS4_POLL Poll; + EFI_DNS4_CANCEL Cancel; }; -extern EFI_GUID gEfiDns4ServiceBindingProtocolGuid; -extern EFI_GUID gEfiDns4ProtocolGuid; +extern EFI_GUID gEfiDns4ServiceBindingProtocolGuid; +extern EFI_GUID gEfiDns4ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Dns6.h b/MdePkg/Include/Protocol/Dns6.h index ebf368f36f..3b6697ab2f 100644 --- a/MdePkg/Include/Protocol/Dns6.h +++ b/MdePkg/Include/Protocol/Dns6.h @@ -35,23 +35,23 @@ typedef struct { /// If TRUE, enable DNS cache function for this DNS instance. If FALSE, all DNS query /// will not lookup local DNS cache. /// - BOOLEAN EnableDnsCache; + BOOLEAN EnableDnsCache; /// /// Use the protocol number defined in /// http://www.iana.org/assignments/protocol-numbers. Beside TCP/UDP, Other protocol /// is invalid value. An implementation can choose to support UDP, or both TCP and UDP. /// - UINT8 Protocol; + UINT8 Protocol; /// /// The local IP address to use. Set to zero to let the underlying IPv6 /// driver choose a source address. If not zero it must be one of the /// configured IP addresses in the underlying IPv6 driver. /// - EFI_IPv6_ADDRESS StationIp; + EFI_IPv6_ADDRESS StationIp; /// /// Local port number. Set to zero to use the automatically assigned port number. /// - UINT16 LocalPort; + UINT16 LocalPort; /// /// Count of the DNS servers. When used with GetModeData(), /// this field is the count of originally configured servers when @@ -60,7 +60,7 @@ typedef struct { /// DnsServerListCount is zero, the DNS server configuration /// will be retrieved from DHCP server automatically. /// - UINT32 DnsServerCount; + UINT32 DnsServerCount; /// /// Pointer to DNS server list containing DnsServerListCount /// entries or NULL if DnsServerListCount is 0. For Configure(), @@ -72,15 +72,15 @@ typedef struct { /// freed by the caller. When used with Configure(), the buffer /// containing the list will be allocated and released by the caller. /// - EFI_IPv6_ADDRESS *DnsServerList; + EFI_IPv6_ADDRESS *DnsServerList; /// /// Retry number if no response received after RetryInterval. /// - UINT32 RetryCount; + UINT32 RetryCount; /// /// Minimum interval of retry is 2 second. If the retry interval is less than 2 /// seconds, then use the 2 seconds. - UINT32 RetryInterval; + UINT32 RetryInterval; } EFI_DNS6_CONFIG_DATA; /// @@ -90,18 +90,18 @@ typedef struct { /// /// Host name. This should be interpreted as Unicode characters. /// - CHAR16 *HostName; + CHAR16 *HostName; /// /// IP address of this host. /// - EFI_IPv6_ADDRESS *IpAddress; + EFI_IPv6_ADDRESS *IpAddress; /// /// Time in second unit that this entry will remain in DNS cache. A value of zero means /// that this entry is permanent. A nonzero value will override the existing one if /// this entry to be added is dynamic entry. Implementations may set its default /// timeout value for the dynamically created DNS cache entry after one DNS resolve /// succeeds. - UINT32 Timeout; + UINT32 Timeout; } EFI_DNS6_CACHE_ENTRY; /// @@ -111,28 +111,28 @@ typedef struct { /// /// The configuration data of this instance. /// - EFI_DNS6_CONFIG_DATA DnsConfigData; + EFI_DNS6_CONFIG_DATA DnsConfigData; /// /// Number of configured DNS6 servers. /// - UINT32 DnsServerCount; + UINT32 DnsServerCount; /// /// Pointer to common list of addresses of all configured DNS server used by EFI_DNS6_PROTOCOL /// instances. List will include DNS servers configured by this or any other EFI_DNS6_PROTOCOL /// instance. The storage for this list is allocated by the driver publishing this protocol, /// and must be freed by the caller. /// - EFI_IPv6_ADDRESS *DnsServerList; + EFI_IPv6_ADDRESS *DnsServerList; /// /// Number of DNS Cache entries. The DNS Cache is shared among all DNS instances. /// - UINT32 DnsCacheCount; + UINT32 DnsCacheCount; /// /// Pointer to a buffer containing DnsCacheCount DNS Cache /// entry structures. The storage for thislist is allocated by the driver /// publishing this protocol and must be freed by caller. /// - EFI_DNS6_CACHE_ENTRY *DnsCacheList; + EFI_DNS6_CACHE_ENTRY *DnsCacheList; } EFI_DNS6_MODE_DATA; /// @@ -142,11 +142,11 @@ typedef struct { /// /// Number of the returned IP address. /// - UINT32 IpCount; + UINT32 IpCount; /// /// Pointer to the all the returned IP address. /// - EFI_IPv6_ADDRESS *IpList; + EFI_IPv6_ADDRESS *IpList; } DNS6_HOST_TO_ADDR_DATA; /// @@ -157,7 +157,7 @@ typedef struct { /// Pointer to the primary name for this host address. It's the caller's /// responsibility to free the response memory. /// - CHAR16 *HostName; + CHAR16 *HostName; } DNS6_ADDR_TO_HOST_DATA; /// @@ -167,30 +167,30 @@ typedef struct { /// /// The Owner name. /// - CHAR8 *QName; + CHAR8 *QName; /// /// The Type Code of this RR. /// - UINT16 QType; + UINT16 QType; /// /// The CLASS code of this RR. /// - UINT16 QClass; + UINT16 QClass; /// /// 32 bit integer which specify the time interval that the resource record may be /// cached before the source of the information should again be consulted. Zero means /// this RR cannot be cached. /// - UINT32 TTL; + UINT32 TTL; /// /// 16 big integer which specify the length of RData. /// - UINT16 DataLength; + UINT16 DataLength; /// /// A string of octets that describe the resource, the format of this information /// varies according to QType and QClass difference. /// - CHAR8 *RData; + CHAR8 *RData; } DNS6_RESOURCE_RECORD; /// @@ -200,12 +200,12 @@ typedef struct { /// /// Number of returned matching RRs. /// - UINTN RRCount; + UINTN RRCount; /// /// Pointer to the all the returned matching RRs. It's caller responsibility to free /// the allocated memory to hold the returned RRs. /// - DNS6_RESOURCE_RECORD *RRList; + DNS6_RESOURCE_RECORD *RRList; } DNS6_GENERAL_LOOKUP_DATA; /// @@ -216,7 +216,7 @@ typedef struct { /// This Event will be signaled after the Status field is updated by the EFI DNSv6 /// protocol driver. The type of Event must be EFI_NOTIFY_SIGNAL. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Will be set to one of the following values: /// EFI_SUCCESS: The host name to address translation completed successfully. @@ -226,18 +226,18 @@ typedef struct { /// EFI_DEVICE_ERROR: An unexpected system or network error occurred. /// EFI_NO_MEDIA: There was a media error. /// - EFI_STATUS Status; + EFI_STATUS Status; /// /// The parameter configured through DNSv6.Configure() interface. Retry number if no /// response received after RetryInterval. /// - UINT32 RetryCount; + UINT32 RetryCount; /// /// The parameter configured through DNSv6.Configure() interface. Minimum interval of /// retry is 2 seconds. If the retry interval is less than 2 seconds, then use the 2 /// seconds. /// - UINT32 RetryInterval; + UINT32 RetryInterval; /// /// DNSv6 completion token data /// @@ -278,7 +278,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI * EFI_DNS6_GET_MODE_DATA)( +(EFIAPI *EFI_DNS6_GET_MODE_DATA)( IN EFI_DNS6_PROTOCOL *This, OUT EFI_DNS6_MODE_DATA *DnsModeData ); @@ -308,7 +308,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_DNS6_CONFIGURE)( +(EFIAPI *EFI_DNS6_CONFIGURE)( IN EFI_DNS6_PROTOCOL *This, IN EFI_DNS6_CONFIG_DATA *DnsConfigData ); @@ -337,7 +337,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS6_HOST_NAME_TO_IP) ( +(EFIAPI *EFI_DNS6_HOST_NAME_TO_IP)( IN EFI_DNS6_PROTOCOL *This, IN CHAR16 *HostName, IN EFI_DNS6_COMPLETION_TOKEN *Token @@ -368,7 +368,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS6_IP_TO_HOST_NAME) ( +(EFIAPI *EFI_DNS6_IP_TO_HOST_NAME)( IN EFI_DNS6_PROTOCOL *This, IN EFI_IPv6_ADDRESS IpAddress, IN EFI_DNS6_COMPLETION_TOKEN *Token @@ -405,7 +405,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS6_GENERAL_LOOKUP) ( +(EFIAPI *EFI_DNS6_GENERAL_LOOKUP)( IN EFI_DNS6_PROTOCOL *This, IN CHAR8 *QName, IN UINT16 QType, @@ -442,7 +442,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS6_UPDATE_DNS_CACHE) ( +(EFIAPI *EFI_DNS6_UPDATE_DNS_CACHE)( IN EFI_DNS6_PROTOCOL *This, IN BOOLEAN DeleteFlag, IN BOOLEAN Override, @@ -474,7 +474,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS6_POLL) ( +(EFIAPI *EFI_DNS6_POLL)( IN EFI_DNS6_PROTOCOL *This ); @@ -506,7 +506,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_DNS6_CANCEL) ( +(EFIAPI *EFI_DNS6_CANCEL)( IN EFI_DNS6_PROTOCOL *This, IN EFI_DNS6_COMPLETION_TOKEN *Token ); @@ -517,17 +517,17 @@ EFI_STATUS /// DNSv6. /// struct _EFI_DNS6_PROTOCOL { - EFI_DNS6_GET_MODE_DATA GetModeData; - EFI_DNS6_CONFIGURE Configure; - EFI_DNS6_HOST_NAME_TO_IP HostNameToIp; - EFI_DNS6_IP_TO_HOST_NAME IpToHostName; - EFI_DNS6_GENERAL_LOOKUP GeneralLookUp; - EFI_DNS6_UPDATE_DNS_CACHE UpdateDnsCache; - EFI_DNS6_POLL Poll; - EFI_DNS6_CANCEL Cancel; + EFI_DNS6_GET_MODE_DATA GetModeData; + EFI_DNS6_CONFIGURE Configure; + EFI_DNS6_HOST_NAME_TO_IP HostNameToIp; + EFI_DNS6_IP_TO_HOST_NAME IpToHostName; + EFI_DNS6_GENERAL_LOOKUP GeneralLookUp; + EFI_DNS6_UPDATE_DNS_CACHE UpdateDnsCache; + EFI_DNS6_POLL Poll; + EFI_DNS6_CANCEL Cancel; }; -extern EFI_GUID gEfiDns6ServiceBindingProtocolGuid; -extern EFI_GUID gEfiDns6ProtocolGuid; +extern EFI_GUID gEfiDns6ServiceBindingProtocolGuid; +extern EFI_GUID gEfiDns6ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DriverBinding.h b/MdePkg/Include/Protocol/DriverBinding.h index a58e812e48..078b014685 100644 --- a/MdePkg/Include/Protocol/DriverBinding.h +++ b/MdePkg/Include/Protocol/DriverBinding.h @@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0x18a031ab, 0xb443, 0x4d1a, {0xa5, 0xc0, 0xc, 0x9, 0x26, 0x1e, 0x9f, 0x71 } \ } -typedef struct _EFI_DRIVER_BINDING_PROTOCOL EFI_DRIVER_BINDING_PROTOCOL; +typedef struct _EFI_DRIVER_BINDING_PROTOCOL EFI_DRIVER_BINDING_PROTOCOL; /** Tests to see if this driver supports a given controller. If a child device is provided, @@ -155,9 +155,9 @@ EFI_STATUS /// If a controller is supported, then it also provides routines to start and stop the controller. /// struct _EFI_DRIVER_BINDING_PROTOCOL { - EFI_DRIVER_BINDING_SUPPORTED Supported; - EFI_DRIVER_BINDING_START Start; - EFI_DRIVER_BINDING_STOP Stop; + EFI_DRIVER_BINDING_SUPPORTED Supported; + EFI_DRIVER_BINDING_START Start; + EFI_DRIVER_BINDING_STOP Stop; /// /// The version number of the UEFI driver that produced the @@ -171,13 +171,13 @@ struct _EFI_DRIVER_BINDING_PROTOCOL { /// platform/OEM specific drivers. The Version values of 0x10- /// 0xffffffef are reserved for IHV-developed drivers. /// - UINT32 Version; + UINT32 Version; /// /// The image handle of the UEFI driver that produced this instance /// of the EFI_DRIVER_BINDING_PROTOCOL. /// - EFI_HANDLE ImageHandle; + EFI_HANDLE ImageHandle; /// /// The handle on which this instance of the @@ -187,9 +187,9 @@ struct _EFI_DRIVER_BINDING_PROTOCOL { /// EFI_DRIVER_BINDING_PROTOCOL, this value may not be /// the same as ImageHandle. /// - EFI_HANDLE DriverBindingHandle; + EFI_HANDLE DriverBindingHandle; }; -extern EFI_GUID gEfiDriverBindingProtocolGuid; +extern EFI_GUID gEfiDriverBindingProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DriverConfiguration.h b/MdePkg/Include/Protocol/DriverConfiguration.h index 4b0076d49a..7d7e9870f0 100644 --- a/MdePkg/Include/Protocol/DriverConfiguration.h +++ b/MdePkg/Include/Protocol/DriverConfiguration.h @@ -19,7 +19,7 @@ 0x107a772b, 0xd5e1, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ } -typedef struct _EFI_DRIVER_CONFIGURATION_PROTOCOL EFI_DRIVER_CONFIGURATION_PROTOCOL; +typedef struct _EFI_DRIVER_CONFIGURATION_PROTOCOL EFI_DRIVER_CONFIGURATION_PROTOCOL; /** Allows the user to set controller specific options for a controller that a @@ -139,23 +139,21 @@ EFI_STATUS OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED *ActionRequired ); - /// /// Used to set configuration options for a controller that an EFI Driver is managing. /// struct _EFI_DRIVER_CONFIGURATION_PROTOCOL { - EFI_DRIVER_CONFIGURATION_SET_OPTIONS SetOptions; - EFI_DRIVER_CONFIGURATION_OPTIONS_VALID OptionsValid; - EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults; + EFI_DRIVER_CONFIGURATION_SET_OPTIONS SetOptions; + EFI_DRIVER_CONFIGURATION_OPTIONS_VALID OptionsValid; + EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults; /// /// A Null-terminated ASCII string that contains one or more /// ISO 639-2 language codes. This is the list of language /// codes that this protocol supports. /// - CHAR8 *SupportedLanguages; + CHAR8 *SupportedLanguages; }; - -extern EFI_GUID gEfiDriverConfigurationProtocolGuid; +extern EFI_GUID gEfiDriverConfigurationProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DriverConfiguration2.h b/MdePkg/Include/Protocol/DriverConfiguration2.h index ed4a65d1a1..2847c1a95c 100644 --- a/MdePkg/Include/Protocol/DriverConfiguration2.h +++ b/MdePkg/Include/Protocol/DriverConfiguration2.h @@ -17,19 +17,19 @@ 0xbfd7dc1d, 0x24f1, 0x40d9, {0x82, 0xe7, 0x2e, 0x09, 0xbb, 0x6b, 0x4e, 0xbe } \ } -typedef struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL EFI_DRIVER_CONFIGURATION2_PROTOCOL; +typedef struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL EFI_DRIVER_CONFIGURATION2_PROTOCOL; typedef enum { /// /// The controller is still in a usable state. No actions /// are required before this controller can be used again. /// - EfiDriverConfigurationActionNone = 0, + EfiDriverConfigurationActionNone = 0, /// /// The driver has detected that the controller is not in a /// usable state, and it needs to be stopped. /// - EfiDriverConfigurationActionStopController = 1, + EfiDriverConfigurationActionStopController = 1, /// /// This controller needs to be stopped and restarted /// before it can be used again. @@ -39,14 +39,14 @@ typedef enum { /// A configuration change has been made that requires the platform to be restarted before /// the controller can be used again. /// - EfiDriverConfigurationActionRestartPlatform = 3, + EfiDriverConfigurationActionRestartPlatform = 3, EfiDriverConfigurationActionMaximum } EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED; -#define EFI_DRIVER_CONFIGURATION_SAFE_DEFAULTS 0x00000000 -#define EFI_DRIVER_CONFIGURATION_MANUFACTURING_DEFAULTS 0x00000001 -#define EFI_DRIVER_CONFIGURATION_CUSTOM_DEFAULTS 0x00000002 -#define EFI_DRIVER_CONFIGURATION_PERORMANCE_DEFAULTS 0x00000003 +#define EFI_DRIVER_CONFIGURATION_SAFE_DEFAULTS 0x00000000 +#define EFI_DRIVER_CONFIGURATION_MANUFACTURING_DEFAULTS 0x00000001 +#define EFI_DRIVER_CONFIGURATION_CUSTOM_DEFAULTS 0x00000002 +#define EFI_DRIVER_CONFIGURATION_PERORMANCE_DEFAULTS 0x00000003 /** Allows the user to set controller specific options for a controller that a @@ -169,16 +169,16 @@ EFI_STATUS /// Used to set configuration options for a controller that an EFI Driver is managing. /// struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL { - EFI_DRIVER_CONFIGURATION2_SET_OPTIONS SetOptions; - EFI_DRIVER_CONFIGURATION2_OPTIONS_VALID OptionsValid; - EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS ForceDefaults; + EFI_DRIVER_CONFIGURATION2_SET_OPTIONS SetOptions; + EFI_DRIVER_CONFIGURATION2_OPTIONS_VALID OptionsValid; + EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS ForceDefaults; /// /// A Null-terminated ASCII string that contains one or more RFC 4646 /// language codes. This is the list of language codes that this protocol supports. /// - CHAR8 *SupportedLanguages; + CHAR8 *SupportedLanguages; }; -extern EFI_GUID gEfiDriverConfiguration2ProtocolGuid; +extern EFI_GUID gEfiDriverConfiguration2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DriverDiagnostics.h b/MdePkg/Include/Protocol/DriverDiagnostics.h index 8139c9954e..aadcdb45c2 100644 --- a/MdePkg/Include/Protocol/DriverDiagnostics.h +++ b/MdePkg/Include/Protocol/DriverDiagnostics.h @@ -17,29 +17,29 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0x0784924f, 0xe296, 0x11d4, {0x9a, 0x49, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ } -typedef struct _EFI_DRIVER_DIAGNOSTICS_PROTOCOL EFI_DRIVER_DIAGNOSTICS_PROTOCOL; +typedef struct _EFI_DRIVER_DIAGNOSTICS_PROTOCOL EFI_DRIVER_DIAGNOSTICS_PROTOCOL; typedef enum { /// /// Performs standard diagnostics on the controller. /// - EfiDriverDiagnosticTypeStandard = 0, + EfiDriverDiagnosticTypeStandard = 0, /// /// This is an optional diagnostic type that performs diagnostics on the controller that may /// take an extended amount of time to execute. /// - EfiDriverDiagnosticTypeExtended = 1, + EfiDriverDiagnosticTypeExtended = 1, /// /// This is an optional diagnostic type that performs diagnostics on the controller that are /// suitable for a manufacturing and test environment. /// - EfiDriverDiagnosticTypeManufacturing= 2, + EfiDriverDiagnosticTypeManufacturing = 2, /// /// This is an optional diagnostic type that would only be used in the situation where an /// EFI_NOT_READY had been returned by a previous call to RunDiagnostics() /// and there is a desire to cancel the current running diagnostics operation. /// - EfiDriverDiagnosticTypeCancel = 3, + EfiDriverDiagnosticTypeCancel = 3, EfiDriverDiagnosticTypeMaximum } EFI_DRIVER_DIAGNOSTIC_TYPE; @@ -112,14 +112,14 @@ EFI_STATUS /// Used to perform diagnostics on a controller that an EFI Driver is managing. /// struct _EFI_DRIVER_DIAGNOSTICS_PROTOCOL { - EFI_DRIVER_DIAGNOSTICS_RUN_DIAGNOSTICS RunDiagnostics; + EFI_DRIVER_DIAGNOSTICS_RUN_DIAGNOSTICS RunDiagnostics; /// /// A Null-terminated ASCII string that contains one or more ISO 639-2 /// language codes. This is the list of language codes that this protocol supports. /// - CHAR8 *SupportedLanguages; + CHAR8 *SupportedLanguages; }; -extern EFI_GUID gEfiDriverDiagnosticsProtocolGuid; +extern EFI_GUID gEfiDriverDiagnosticsProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DriverDiagnostics2.h b/MdePkg/Include/Protocol/DriverDiagnostics2.h index 9babeb1535..54fb9f6b95 100644 --- a/MdePkg/Include/Protocol/DriverDiagnostics2.h +++ b/MdePkg/Include/Protocol/DriverDiagnostics2.h @@ -16,7 +16,7 @@ 0x4d330321, 0x025f, 0x4aac, {0x90, 0xd8, 0x5e, 0xd9, 0x00, 0x17, 0x3b, 0x63 } \ } -typedef struct _EFI_DRIVER_DIAGNOSTICS2_PROTOCOL EFI_DRIVER_DIAGNOSTICS2_PROTOCOL; +typedef struct _EFI_DRIVER_DIAGNOSTICS2_PROTOCOL EFI_DRIVER_DIAGNOSTICS2_PROTOCOL; /** Runs diagnostics on a controller. @@ -92,14 +92,14 @@ EFI_STATUS /// Used to perform diagnostics on a controller that an EFI Driver is managing. /// struct _EFI_DRIVER_DIAGNOSTICS2_PROTOCOL { - EFI_DRIVER_DIAGNOSTICS2_RUN_DIAGNOSTICS RunDiagnostics; + EFI_DRIVER_DIAGNOSTICS2_RUN_DIAGNOSTICS RunDiagnostics; /// /// A Null-terminated ASCII string that contains one or more RFC 4646 /// language codes. This is the list of language codes that this protocol supports. /// - CHAR8 *SupportedLanguages; + CHAR8 *SupportedLanguages; }; -extern EFI_GUID gEfiDriverDiagnostics2ProtocolGuid; +extern EFI_GUID gEfiDriverDiagnostics2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DriverFamilyOverride.h b/MdePkg/Include/Protocol/DriverFamilyOverride.h index 8ea730e9ca..767c543968 100644 --- a/MdePkg/Include/Protocol/DriverFamilyOverride.h +++ b/MdePkg/Include/Protocol/DriverFamilyOverride.h @@ -14,12 +14,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0xb1ee129e, 0xda36, 0x4181, { 0x91, 0xf8, 0x4, 0xa4, 0x92, 0x37, 0x66, 0xa7 } \ } -typedef struct _EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL; +typedef struct _EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL; // // Prototypes for the Driver Family Override Protocol // // + /** This function returns the version value associated with the driver specified by This. @@ -52,9 +53,9 @@ UINT32 /// Bus Specific Driver Override Protocol. /// struct _EFI_DRIVER_FAMILY_OVERRIDE_PROTOCOL { - EFI_DRIVER_FAMILY_OVERRIDE_GET_VERSION GetVersion; + EFI_DRIVER_FAMILY_OVERRIDE_GET_VERSION GetVersion; }; -extern EFI_GUID gEfiDriverFamilyOverrideProtocolGuid; +extern EFI_GUID gEfiDriverFamilyOverrideProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DriverHealth.h b/MdePkg/Include/Protocol/DriverHealth.h index fa2aa78124..9de025434e 100644 --- a/MdePkg/Include/Protocol/DriverHealth.h +++ b/MdePkg/Include/Protocol/DriverHealth.h @@ -37,7 +37,7 @@ 0x2a534210, 0x9280, 0x41d8, { 0xae, 0x79, 0xca, 0xda, 0x1, 0xa2, 0xb1, 0x27 } \ } -typedef struct _EFI_DRIVER_HEALTH_PROTOCOL EFI_DRIVER_HEALTH_PROTOCOL; +typedef struct _EFI_DRIVER_HEALTH_PROTOCOL EFI_DRIVER_HEALTH_PROTOCOL; /// /// EFI_DRIVER_HEALTH_HEALTH_STATUS @@ -55,8 +55,8 @@ typedef enum { /// EFI_DRIVER_HEALTH_HII_MESSAGE /// typedef struct { - EFI_HII_HANDLE HiiHandle; - EFI_STRING_ID StringId; + EFI_HII_HANDLE HiiHandle; + EFI_STRING_ID StringId; /// /// 64-bit numeric value of the warning/error specified by this message. @@ -66,7 +66,7 @@ typedef struct { /// The values 0x8000000000000000 to 0x8fffffffffffffff is reserved for platform/OEM drivers. /// All other values are reserved and should not be used. /// - UINT64 MessageCode; + UINT64 MessageCode; } EFI_DRIVER_HEALTH_HII_MESSAGE; /** @@ -228,14 +228,10 @@ EFI_STATUS /// hardware configuration changes. /// struct _EFI_DRIVER_HEALTH_PROTOCOL { - EFI_DRIVER_HEALTH_GET_HEALTH_STATUS GetHealthStatus; - EFI_DRIVER_HEALTH_REPAIR Repair; + EFI_DRIVER_HEALTH_GET_HEALTH_STATUS GetHealthStatus; + EFI_DRIVER_HEALTH_REPAIR Repair; }; -extern EFI_GUID gEfiDriverHealthProtocolGuid; +extern EFI_GUID gEfiDriverHealthProtocolGuid; #endif - - - - diff --git a/MdePkg/Include/Protocol/DriverSupportedEfiVersion.h b/MdePkg/Include/Protocol/DriverSupportedEfiVersion.h index 9514bd62ef..4de1264816 100644 --- a/MdePkg/Include/Protocol/DriverSupportedEfiVersion.h +++ b/MdePkg/Include/Protocol/DriverSupportedEfiVersion.h @@ -15,7 +15,6 @@ #define EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL_GUID \ { 0x5c198761, 0x16a8, 0x4e69, { 0x97, 0x2c, 0x89, 0xd6, 0x79, 0x54, 0xf8, 0x1d } } - /// /// The EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL provides a /// mechanism for an EFI driver to publish the version of the EFI @@ -28,13 +27,13 @@ typedef struct _EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL { /// The size, in bytes, of the entire structure. Future versions of this /// specification may grow the size of the structure. /// - UINT32 Length; + UINT32 Length; /// /// The latest version of the UEFI specification that this driver conforms to. /// - UINT32 FirmwareVersion; + UINT32 FirmwareVersion; } EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL; -extern EFI_GUID gEfiDriverSupportedEfiVersionProtocolGuid; +extern EFI_GUID gEfiDriverSupportedEfiVersionProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DxeMmReadyToLock.h b/MdePkg/Include/Protocol/DxeMmReadyToLock.h index ecf444561b..a90e8c71c5 100644 --- a/MdePkg/Include/Protocol/DxeMmReadyToLock.h +++ b/MdePkg/Include/Protocol/DxeMmReadyToLock.h @@ -14,6 +14,6 @@ 0x60ff8964, 0xe906, 0x41d0, { 0xaf, 0xed, 0xf2, 0x41, 0xe9, 0x74, 0xe0, 0x8e } \ } -extern EFI_GUID gEfiDxeMmReadyToLockProtocolGuid; +extern EFI_GUID gEfiDxeMmReadyToLockProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/DxeSmmReadyToLock.h b/MdePkg/Include/Protocol/DxeSmmReadyToLock.h index c7926c8597..c82e0fda87 100644 --- a/MdePkg/Include/Protocol/DxeSmmReadyToLock.h +++ b/MdePkg/Include/Protocol/DxeSmmReadyToLock.h @@ -27,8 +27,8 @@ #include -#define EFI_DXE_SMM_READY_TO_LOCK_PROTOCOL_GUID EFI_DXE_MM_READY_TO_LOCK_PROTOCOL_GUID +#define EFI_DXE_SMM_READY_TO_LOCK_PROTOCOL_GUID EFI_DXE_MM_READY_TO_LOCK_PROTOCOL_GUID -extern EFI_GUID gEfiDxeSmmReadyToLockProtocolGuid; +extern EFI_GUID gEfiDxeSmmReadyToLockProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Eap.h b/MdePkg/Include/Protocol/Eap.h index 203d0f40b0..37b94b55c9 100644 --- a/MdePkg/Include/Protocol/Eap.h +++ b/MdePkg/Include/Protocol/Eap.h @@ -16,7 +16,6 @@ #ifndef __EFI_EAP_PROTOCOL_H__ #define __EFI_EAP_PROTOCOL_H__ - #define EFI_EAP_PROTOCOL_GUID \ { \ 0x5d9f96db, 0xe731, 0x4caa, {0xa0, 0xd, 0x72, 0xe1, 0x87, 0xcd, 0x77, 0x62 } \ @@ -28,21 +27,21 @@ typedef struct _EFI_EAP_PROTOCOL EFI_EAP_PROTOCOL; /// Type for the identification number assigned to the Port by the /// System in which the Port resides. /// -typedef VOID * EFI_PORT_HANDLE; +typedef VOID *EFI_PORT_HANDLE; /// /// EAP Authentication Method Type (RFC 3748) ///@{ -#define EFI_EAP_TYPE_TLS 13 ///< REQUIRED - RFC 5216 +#define EFI_EAP_TYPE_TLS 13///< REQUIRED - RFC 5216 ///@} // // EAP_TYPE MD5, OTP and TOEKN_CARD has been removed from UEFI2.3.1B. // Definitions are kept for backward compatibility. // -#define EFI_EAP_TYPE_MD5 4 -#define EFI_EAP_TYPE_OTP 5 -#define EFI_EAP_TYPE_TOKEN_CARD 6 +#define EFI_EAP_TYPE_MD5 4 +#define EFI_EAP_TYPE_OTP 5 +#define EFI_EAP_TYPE_TOKEN_CARD 6 /** One user provided EAP authentication method. @@ -146,11 +145,10 @@ EFI_STATUS /// Port means a NIC. For the details of EAP protocol, please refer to RFC 2284. /// struct _EFI_EAP_PROTOCOL { - EFI_EAP_SET_DESIRED_AUTHENTICATION_METHOD SetDesiredAuthMethod; - EFI_EAP_REGISTER_AUTHENTICATION_METHOD RegisterAuthMethod; + EFI_EAP_SET_DESIRED_AUTHENTICATION_METHOD SetDesiredAuthMethod; + EFI_EAP_REGISTER_AUTHENTICATION_METHOD RegisterAuthMethod; }; -extern EFI_GUID gEfiEapProtocolGuid; +extern EFI_GUID gEfiEapProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/EapConfiguration.h b/MdePkg/Include/Protocol/EapConfiguration.h index 3ca02c3876..6fcddabcb7 100644 --- a/MdePkg/Include/Protocol/EapConfiguration.h +++ b/MdePkg/Include/Protocol/EapConfiguration.h @@ -25,7 +25,7 @@ typedef struct _EFI_EAP_CONFIGURATION_PROTOCOL EFI_EAP_CONFIGURATION_PROTOCOL; /// /// Make sure it not conflict with any real EapTypeXXX /// -#define EFI_EAP_TYPE_ATTRIBUTE 0 +#define EFI_EAP_TYPE_ATTRIBUTE 0 typedef enum { /// @@ -98,7 +98,7 @@ typedef UINT8 EFI_EAP_TYPE; **/ typedef EFI_STATUS -(EFIAPI *EFI_EAP_CONFIGURATION_SET_DATA) ( +(EFIAPI *EFI_EAP_CONFIGURATION_SET_DATA)( IN EFI_EAP_CONFIGURATION_PROTOCOL *This, IN EFI_EAP_TYPE EapType, IN EFI_EAP_CONFIG_DATA_TYPE DataType, @@ -130,7 +130,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_EAP_CONFIGURATION_GET_DATA) ( +(EFIAPI *EFI_EAP_CONFIGURATION_GET_DATA)( IN EFI_EAP_CONFIGURATION_PROTOCOL *This, IN EFI_EAP_TYPE EapType, IN EFI_EAP_CONFIG_DATA_TYPE DataType, @@ -144,10 +144,10 @@ EFI_STATUS /// private key file. /// struct _EFI_EAP_CONFIGURATION_PROTOCOL { - EFI_EAP_CONFIGURATION_SET_DATA SetData; - EFI_EAP_CONFIGURATION_GET_DATA GetData; + EFI_EAP_CONFIGURATION_SET_DATA SetData; + EFI_EAP_CONFIGURATION_GET_DATA GetData; }; -extern EFI_GUID gEfiEapConfigurationProtocolGuid; +extern EFI_GUID gEfiEapConfigurationProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/EapManagement.h b/MdePkg/Include/Protocol/EapManagement.h index 8e6addbff2..ea1b0d71e3 100644 --- a/MdePkg/Include/Protocol/EapManagement.h +++ b/MdePkg/Include/Protocol/EapManagement.h @@ -30,8 +30,8 @@ typedef struct _EFI_EAP_MANAGEMENT_PROTOCOL EFI_EAP_MANAGEMENT_PROTOCOL; /// PAE Capabilities /// ///@{ -#define PAE_SUPPORT_AUTHENTICATOR 0x01 -#define PAE_SUPPORT_SUPPLICANT 0x02 +#define PAE_SUPPORT_AUTHENTICATOR 0x01 +#define PAE_SUPPORT_SUPPLICANT 0x02 ///@} /// @@ -42,18 +42,18 @@ typedef struct _EFI_EAPOL_PORT_INFO { /// The identification number assigned to the Port by the System in /// which the Port resides. /// - EFI_PORT_HANDLE PortNumber; + EFI_PORT_HANDLE PortNumber; /// /// The protocol version number of the EAPOL implementation /// supported by the Port. /// - UINT8 ProtocolVersion; + UINT8 ProtocolVersion; /// /// The capabilities of the PAE associated with the Port. This field /// indicates whether Authenticator functionality, Supplicant /// functionality, both, or neither, is supported by the Port's PAE. /// - UINT8 PaeCapabilities; + UINT8 PaeCapabilities; } EFI_EAPOL_PORT_INFO; /// @@ -74,10 +74,10 @@ typedef enum _EFI_EAPOL_SUPPLICANT_PAE_STATE { /// Definitions for ValidFieldMask /// ///@{ -#define AUTH_PERIOD_FIELD_VALID 0x01 -#define HELD_PERIOD_FIELD_VALID 0x02 -#define START_PERIOD_FIELD_VALID 0x04 -#define MAX_START_FIELD_VALID 0x08 +#define AUTH_PERIOD_FIELD_VALID 0x01 +#define HELD_PERIOD_FIELD_VALID 0x02 +#define START_PERIOD_FIELD_VALID 0x04 +#define MAX_START_FIELD_VALID 0x08 ///@} /// @@ -87,25 +87,25 @@ typedef struct _EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION { /// /// Indicates which of the following fields are valid. /// - UINT8 ValidFieldMask; + UINT8 ValidFieldMask; /// /// The initial value for the authWhile timer. Its default value is 30s. /// - UINTN AuthPeriod; + UINTN AuthPeriod; /// /// The initial value for the heldWhile timer. Its default value is 60s. /// - UINTN HeldPeriod; + UINTN HeldPeriod; /// /// The initial value for the startWhen timer. Its default value is 30s. /// - UINTN StartPeriod; + UINTN StartPeriod; /// /// The maximum number of successive EAPOL-Start messages will /// be sent before the Supplicant assumes that there is no /// Authenticator present. Its default value is 3. /// - UINTN MaxStart; + UINTN MaxStart; } EFI_EAPOL_SUPPLICANT_PAE_CONFIGURATION; /// @@ -115,55 +115,55 @@ typedef struct _EFI_EAPOL_SUPPLICANT_PAE_STATISTICS { /// /// The number of EAPOL frames of any type that have been received by this Supplican. /// - UINTN EapolFramesReceived; + UINTN EapolFramesReceived; /// /// The number of EAPOL frames of any type that have been transmitted by this Supplicant. /// - UINTN EapolFramesTransmitted; + UINTN EapolFramesTransmitted; /// /// The number of EAPOL Start frames that have been transmitted by this Supplicant. /// - UINTN EapolStartFramesTransmitted; + UINTN EapolStartFramesTransmitted; /// /// The number of EAPOL Logoff frames that have been transmitted by this Supplicant. /// - UINTN EapolLogoffFramesTransmitted; + UINTN EapolLogoffFramesTransmitted; /// /// The number of EAP Resp/Id frames that have been transmitted by this Supplicant. /// - UINTN EapRespIdFramesTransmitted; + UINTN EapRespIdFramesTransmitted; /// /// The number of valid EAP Response frames (other than Resp/Id frames) that have been /// transmitted by this Supplicant. /// - UINTN EapResponseFramesTransmitted; + UINTN EapResponseFramesTransmitted; /// /// The number of EAP Req/Id frames that have been received by this Supplicant. /// - UINTN EapReqIdFramesReceived; + UINTN EapReqIdFramesReceived; /// /// The number of EAP Request frames (other than Rq/Id frames) that have been received /// by this Supplicant. /// - UINTN EapRequestFramesReceived; + UINTN EapRequestFramesReceived; /// /// The number of EAPOL frames that have been received by this Supplicant in which the /// frame type is not recognized. /// - UINTN InvalidEapolFramesReceived; + UINTN InvalidEapolFramesReceived; /// /// The number of EAPOL frames that have been received by this Supplicant in which the /// Packet Body Length field (7.5.5) is invalid. /// - UINTN EapLengthErrorFramesReceived; + UINTN EapLengthErrorFramesReceived; /// /// The protocol version number carried in the most recently received EAPOL frame. /// - UINTN LastEapolFrameVersion; + UINTN LastEapolFrameVersion; /// /// The source MAC address carried in the most recently received EAPOL frame. /// - UINTN LastEapolFrameSource; + UINTN LastEapolFrameSource; } EFI_EAPOL_SUPPLICANT_PAE_STATISTICS; /** @@ -391,7 +391,6 @@ struct _EFI_EAP_MANAGEMENT_PROTOCOL { EFI_EAP_GET_SUPPLICANT_STATISTICS GetSupplicantStatistics; }; -extern EFI_GUID gEfiEapManagementProtocolGuid; +extern EFI_GUID gEfiEapManagementProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/EapManagement2.h b/MdePkg/Include/Protocol/EapManagement2.h index f8a89b0cce..ab42b04e1a 100644 --- a/MdePkg/Include/Protocol/EapManagement2.h +++ b/MdePkg/Include/Protocol/EapManagement2.h @@ -49,7 +49,7 @@ typedef struct _EFI_EAP_MANAGEMENT2_PROTOCOL EFI_EAP_MANAGEMENT2_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_EAP_GET_KEY) ( +(EFIAPI *EFI_EAP_GET_KEY)( IN EFI_EAP_MANAGEMENT2_PROTOCOL *This, IN OUT UINT8 *Msk, IN OUT UINTN *MskSize, @@ -76,6 +76,6 @@ struct _EFI_EAP_MANAGEMENT2_PROTOCOL { EFI_EAP_GET_KEY GetKey; }; -extern EFI_GUID gEfiEapManagement2ProtocolGuid; +extern EFI_GUID gEfiEapManagement2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Ebc.h b/MdePkg/Include/Protocol/Ebc.h index 2b7191aca5..993ec0c425 100644 --- a/MdePkg/Include/Protocol/Ebc.h +++ b/MdePkg/Include/Protocol/Ebc.h @@ -59,26 +59,26 @@ // // #define OPCODE_27 0x27 // -#define OPCODE_MOVQQ 0x28 // Does this go away? -#define OPCODE_LOADSP 0x29 -#define OPCODE_STORESP 0x2A -#define OPCODE_PUSH 0x2B -#define OPCODE_POP 0x2C -#define OPCODE_CMPIEQ 0x2D -#define OPCODE_CMPILTE 0x2E -#define OPCODE_CMPIGTE 0x2F -#define OPCODE_CMPIULTE 0x30 -#define OPCODE_CMPIUGTE 0x31 -#define OPCODE_MOVNW 0x32 -#define OPCODE_MOVND 0x33 +#define OPCODE_MOVQQ 0x28 // Does this go away? +#define OPCODE_LOADSP 0x29 +#define OPCODE_STORESP 0x2A +#define OPCODE_PUSH 0x2B +#define OPCODE_POP 0x2C +#define OPCODE_CMPIEQ 0x2D +#define OPCODE_CMPILTE 0x2E +#define OPCODE_CMPIGTE 0x2F +#define OPCODE_CMPIULTE 0x30 +#define OPCODE_CMPIUGTE 0x31 +#define OPCODE_MOVNW 0x32 +#define OPCODE_MOVND 0x33 // // #define OPCODE_34 0x34 // -#define OPCODE_PUSHN 0x35 -#define OPCODE_POPN 0x36 -#define OPCODE_MOVI 0x37 -#define OPCODE_MOVIN 0x38 -#define OPCODE_MOVREL 0x39 +#define OPCODE_PUSHN 0x35 +#define OPCODE_POPN 0x36 +#define OPCODE_MOVI 0x37 +#define OPCODE_MOVIN 0x38 +#define OPCODE_MOVREL 0x39 // // Bit masks for opcode encodings @@ -103,16 +103,16 @@ // // Bit masks for operand encodings // -#define OPERAND_M_INDIRECT1 0x08 -#define OPERAND_M_INDIRECT2 0x80 -#define OPERAND_M_OP1 0x07 -#define OPERAND_M_OP2 0x70 +#define OPERAND_M_INDIRECT1 0x08 +#define OPERAND_M_INDIRECT2 0x80 +#define OPERAND_M_OP1 0x07 +#define OPERAND_M_OP2 0x70 // // Masks for data manipulation instructions // -#define DATAMANIP_M_64 0x40 // 64-bit width operation -#define DATAMANIP_M_IMMDATA 0x80 +#define DATAMANIP_M_64 0x40 // 64-bit width operation +#define DATAMANIP_M_IMMDATA 0x80 // // For MOV instructions, need a mask for the opcode when immediate @@ -139,46 +139,46 @@ // // Masks for CALL instruction encodings // -#define OPERAND_M_RELATIVE_ADDR 0x10 -#define OPERAND_M_NATIVE_CALL 0x20 +#define OPERAND_M_RELATIVE_ADDR 0x10 +#define OPERAND_M_NATIVE_CALL 0x20 // // Masks for decoding push/pop instructions // -#define PUSHPOP_M_IMMDATA 0x80 // opcode bit indicating immediate data -#define PUSHPOP_M_64 0x40 // opcode bit indicating 64-bit operation +#define PUSHPOP_M_IMMDATA 0x80 // opcode bit indicating immediate data +#define PUSHPOP_M_64 0x40 // opcode bit indicating 64-bit operation // // Mask for operand of JMP instruction // -#define JMP_M_RELATIVE 0x10 -#define JMP_M_CONDITIONAL 0x80 -#define JMP_M_CS 0x40 +#define JMP_M_RELATIVE 0x10 +#define JMP_M_CONDITIONAL 0x80 +#define JMP_M_CS 0x40 // // Macros to determine if a given operand is indirect // -#define OPERAND1_INDIRECT(op) ((op) & OPERAND_M_INDIRECT1) -#define OPERAND2_INDIRECT(op) ((op) & OPERAND_M_INDIRECT2) +#define OPERAND1_INDIRECT(op) ((op) & OPERAND_M_INDIRECT1) +#define OPERAND2_INDIRECT(op) ((op) & OPERAND_M_INDIRECT2) // // Macros to extract the operands from second byte of instructions // -#define OPERAND1_REGNUM(op) ((op) & OPERAND_M_OP1) -#define OPERAND2_REGNUM(op) (((op) & OPERAND_M_OP2) >> 4) +#define OPERAND1_REGNUM(op) ((op) & OPERAND_M_OP1) +#define OPERAND2_REGNUM(op) (((op) & OPERAND_M_OP2) >> 4) -#define OPERAND1_CHAR(op) ('0' + OPERAND1_REGNUM (op)) -#define OPERAND2_CHAR(op) ('0' + OPERAND2_REGNUM (op)) +#define OPERAND1_CHAR(op) ('0' + OPERAND1_REGNUM (op)) +#define OPERAND2_CHAR(op) ('0' + OPERAND2_REGNUM (op)) // // Condition masks usually for byte 1 encodings of code // -#define CONDITION_M_CONDITIONAL 0x80 -#define CONDITION_M_CS 0x40 +#define CONDITION_M_CONDITIONAL 0x80 +#define CONDITION_M_CS 0x40 /// /// Protocol Guid Name defined in spec. /// -#define EFI_EBC_PROTOCOL_GUID EFI_EBC_INTERPRETER_PROTOCOL_GUID +#define EFI_EBC_PROTOCOL_GUID EFI_EBC_INTERPRETER_PROTOCOL_GUID /// /// Define for forward reference. @@ -294,15 +294,15 @@ EFI_STATUS /// image can then be run using the standard EFI start image services. /// struct _EFI_EBC_PROTOCOL { - EFI_EBC_CREATE_THUNK CreateThunk; - EFI_EBC_UNLOAD_IMAGE UnloadImage; - EFI_EBC_REGISTER_ICACHE_FLUSH RegisterICacheFlush; - EFI_EBC_GET_VERSION GetVersion; + EFI_EBC_CREATE_THUNK CreateThunk; + EFI_EBC_UNLOAD_IMAGE UnloadImage; + EFI_EBC_REGISTER_ICACHE_FLUSH RegisterICacheFlush; + EFI_EBC_GET_VERSION GetVersion; }; // // Extern the global EBC protocol GUID // -extern EFI_GUID gEfiEbcProtocolGuid; +extern EFI_GUID gEfiEbcProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/EdidActive.h b/MdePkg/Include/Protocol/EdidActive.h index bfc21516f8..5bdb22b7ac 100644 --- a/MdePkg/Include/Protocol/EdidActive.h +++ b/MdePkg/Include/Protocol/EdidActive.h @@ -28,7 +28,7 @@ typedef struct { /// is available from the video output device. Otherwise, it must be a /// minimum of 128 bytes. /// - UINT32 SizeOfEdid; + UINT32 SizeOfEdid; /// /// A pointer to a read-only array of bytes that contains the EDID @@ -41,6 +41,6 @@ typedef struct { UINT8 *Edid; } EFI_EDID_ACTIVE_PROTOCOL; -extern EFI_GUID gEfiEdidActiveProtocolGuid; +extern EFI_GUID gEfiEdidActiveProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/EdidDiscovered.h b/MdePkg/Include/Protocol/EdidDiscovered.h index 7ddfe2b351..6be92857d5 100644 --- a/MdePkg/Include/Protocol/EdidDiscovered.h +++ b/MdePkg/Include/Protocol/EdidDiscovered.h @@ -26,7 +26,7 @@ typedef struct { /// is available from the video output device. Otherwise, it must be a /// minimum of 128 bytes. /// - UINT32 SizeOfEdid; + UINT32 SizeOfEdid; /// /// A pointer to a read-only array of bytes that contains the EDID @@ -39,6 +39,6 @@ typedef struct { UINT8 *Edid; } EFI_EDID_DISCOVERED_PROTOCOL; -extern EFI_GUID gEfiEdidDiscoveredProtocolGuid; +extern EFI_GUID gEfiEdidDiscoveredProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/EdidOverride.h b/MdePkg/Include/Protocol/EdidOverride.h index 709ee48c84..065a0ccd8a 100644 --- a/MdePkg/Include/Protocol/EdidOverride.h +++ b/MdePkg/Include/Protocol/EdidOverride.h @@ -19,8 +19,8 @@ typedef struct _EFI_EDID_OVERRIDE_PROTOCOL EFI_EDID_OVERRIDE_PROTOCOL; -#define EFI_EDID_OVERRIDE_DONT_OVERRIDE 0x01 -#define EFI_EDID_OVERRIDE_ENABLE_HOT_PLUG 0x02 +#define EFI_EDID_OVERRIDE_DONT_OVERRIDE 0x01 +#define EFI_EDID_OVERRIDE_ENABLE_HOT_PLUG 0x02 /** Returns policy information and potentially a replacement EDID for the specified video output device. @@ -53,9 +53,9 @@ EFI_STATUS /// EDID information to the producer of the Graphics Output protocol. /// struct _EFI_EDID_OVERRIDE_PROTOCOL { - EFI_EDID_OVERRIDE_PROTOCOL_GET_EDID GetEdid; + EFI_EDID_OVERRIDE_PROTOCOL_GET_EDID GetEdid; }; -extern EFI_GUID gEfiEdidOverrideProtocolGuid; +extern EFI_GUID gEfiEdidOverrideProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/EraseBlock.h b/MdePkg/Include/Protocol/EraseBlock.h index cb809c1736..bfa5921400 100644 --- a/MdePkg/Include/Protocol/EraseBlock.h +++ b/MdePkg/Include/Protocol/EraseBlock.h @@ -19,7 +19,7 @@ typedef struct _EFI_ERASE_BLOCK_PROTOCOL EFI_ERASE_BLOCK_PROTOCOL; -#define EFI_ERASE_BLOCK_PROTOCOL_REVISION ((2<<16) | (60)) +#define EFI_ERASE_BLOCK_PROTOCOL_REVISION ((2<<16) | (60)) /// /// EFI_ERASE_BLOCK_TOKEN @@ -30,11 +30,11 @@ typedef struct { // non-blocking I/O is supported, then non-blocking I/O is performed, and // Event will be signaled when the erase request is completed. // - EFI_EVENT Event; + EFI_EVENT Event; // // Defines whether the signaled event encountered an error. // - EFI_STATUS TransactionStatus; + EFI_STATUS TransactionStatus; } EFI_ERASE_BLOCK_TOKEN; /** @@ -66,7 +66,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_BLOCK_ERASE) ( +(EFIAPI *EFI_BLOCK_ERASE)( IN EFI_ERASE_BLOCK_PROTOCOL *This, IN UINT32 MediaId, IN EFI_LBA LBA, @@ -85,15 +85,15 @@ struct _EFI_ERASE_BLOCK_PROTOCOL { // revisions must be backwards compatible. If a future version is not // backwards compatible, it is not the same GUID. // - UINT64 Revision; + UINT64 Revision; // // Returns the erase length granularity as a number of logical blocks. A // value of 1 means the erase granularity is one logical block. // - UINT32 EraseLengthGranularity; - EFI_BLOCK_ERASE EraseBlocks; + UINT32 EraseLengthGranularity; + EFI_BLOCK_ERASE EraseBlocks; }; -extern EFI_GUID gEfiEraseBlockProtocolGuid; +extern EFI_GUID gEfiEraseBlockProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/FirmwareManagement.h b/MdePkg/Include/Protocol/FirmwareManagement.h index b50126164d..f37067df34 100644 --- a/MdePkg/Include/Protocol/FirmwareManagement.h +++ b/MdePkg/Include/Protocol/FirmwareManagement.h @@ -20,7 +20,6 @@ #ifndef __EFI_FIRMWARE_MANAGEMENT_PROTOCOL_H__ #define __EFI_FIRMWARE_MANAGEMENT_PROTOCOL_H__ - #define EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GUID \ { \ 0x86c77a67, 0xb97, 0x4633, {0xa1, 0x87, 0x49, 0x10, 0x4d, 0x6, 0x85, 0xc7 } \ @@ -31,26 +30,26 @@ typedef struct _EFI_FIRMWARE_MANAGEMENT_PROTOCOL EFI_FIRMWARE_MANAGEMENT_PROTOCO /// /// Dependency Expression Opcode /// -#define EFI_FMP_DEP_PUSH_GUID 0x00 -#define EFI_FMP_DEP_PUSH_VERSION 0x01 -#define EFI_FMP_DEP_VERSION_STR 0x02 -#define EFI_FMP_DEP_AND 0x03 -#define EFI_FMP_DEP_OR 0x04 -#define EFI_FMP_DEP_NOT 0x05 -#define EFI_FMP_DEP_TRUE 0x06 -#define EFI_FMP_DEP_FALSE 0x07 -#define EFI_FMP_DEP_EQ 0x08 -#define EFI_FMP_DEP_GT 0x09 -#define EFI_FMP_DEP_GTE 0x0A -#define EFI_FMP_DEP_LT 0x0B -#define EFI_FMP_DEP_LTE 0x0C -#define EFI_FMP_DEP_END 0x0D +#define EFI_FMP_DEP_PUSH_GUID 0x00 +#define EFI_FMP_DEP_PUSH_VERSION 0x01 +#define EFI_FMP_DEP_VERSION_STR 0x02 +#define EFI_FMP_DEP_AND 0x03 +#define EFI_FMP_DEP_OR 0x04 +#define EFI_FMP_DEP_NOT 0x05 +#define EFI_FMP_DEP_TRUE 0x06 +#define EFI_FMP_DEP_FALSE 0x07 +#define EFI_FMP_DEP_EQ 0x08 +#define EFI_FMP_DEP_GT 0x09 +#define EFI_FMP_DEP_GTE 0x0A +#define EFI_FMP_DEP_LT 0x0B +#define EFI_FMP_DEP_LTE 0x0C +#define EFI_FMP_DEP_END 0x0D /// /// Image Attribute - Dependency /// typedef struct { - UINT8 Dependencies[1]; + UINT8 Dependencies[1]; } EFI_FIRMWARE_IMAGE_DEP; /// @@ -61,32 +60,32 @@ typedef struct { /// A unique number identifying the firmware image within the device. The number is /// between 1 and DescriptorCount. /// - UINT8 ImageIndex; + UINT8 ImageIndex; /// /// A unique GUID identifying the firmware image type. /// - EFI_GUID ImageTypeId; + EFI_GUID ImageTypeId; /// /// A unique number identifying the firmware image. /// - UINT64 ImageId; + UINT64 ImageId; /// /// A pointer to a null-terminated string representing the firmware image name. /// - CHAR16 *ImageIdName; + CHAR16 *ImageIdName; /// /// Identifies the version of the device firmware. The format is vendor specific and new /// version must have a greater value than an old version. /// - UINT32 Version; + UINT32 Version; /// /// A pointer to a null-terminated string representing the firmware image version name. /// - CHAR16 *VersionName; + CHAR16 *VersionName; /// /// Size of the image in bytes. If size=0, then only ImageIndex and ImageTypeId are valid. /// - UINTN Size; + UINTN Size; /// /// Image attributes that are supported by this device. See 'Image Attribute Definitions' /// for possible returned values of this parameter. A value of 1 indicates the attribute is @@ -94,32 +93,32 @@ typedef struct { /// value of 0 indicates the attribute is not supported and the current setting value in /// AttributesSetting is meaningless. /// - UINT64 AttributesSupported; + UINT64 AttributesSupported; /// /// Image attributes. See 'Image Attribute Definitions' for possible returned values of /// this parameter. /// - UINT64 AttributesSetting; + UINT64 AttributesSetting; /// /// Image compatibilities. See 'Image Compatibility Definitions' for possible returned /// values of this parameter. /// - UINT64 Compatibilities; + UINT64 Compatibilities; /// /// Describes the lowest ImageDescriptor version that the device will accept. Only /// present in version 2 or higher. /// - UINT32 LowestSupportedImageVersion; + UINT32 LowestSupportedImageVersion; /// /// Describes the version that was last attempted to update. If no update attempted the /// value will be 0. If the update attempted was improperly formatted and no version /// number was available then the value will be zero. Only present in version 3 or higher. - UINT32 LastAttemptVersion; + UINT32 LastAttemptVersion; /// /// Describes the status that was last attempted to update. If no update has been attempted /// the value will be LAST_ATTEMPT_STATUS_SUCCESS. Only present in version 3 or higher. /// - UINT32 LastAttemptStatus; + UINT32 LastAttemptStatus; /// /// An optional number to identify the unique hardware instance within the system for /// devices that may have multiple instances (Example: a plug in pci network card). This @@ -135,11 +134,10 @@ typedef struct { /// unique hardware instance number or a hardware instance number is not needed. Only /// present in version 3 or higher. /// - UINT64 HardwareInstance; - EFI_FIRMWARE_IMAGE_DEP *Dependencies; + UINT64 HardwareInstance; + EFI_FIRMWARE_IMAGE_DEP *Dependencies; } EFI_FIRMWARE_IMAGE_DESCRIPTOR; - // // Image Attribute Definitions // @@ -147,34 +145,33 @@ typedef struct { /// The attribute IMAGE_ATTRIBUTE_IMAGE_UPDATABLE indicates this device supports firmware /// image update. /// -#define IMAGE_ATTRIBUTE_IMAGE_UPDATABLE 0x0000000000000001 +#define IMAGE_ATTRIBUTE_IMAGE_UPDATABLE 0x0000000000000001 /// /// The attribute IMAGE_ATTRIBUTE_RESET_REQUIRED indicates a reset of the device is required /// for the new firmware image to take effect after a firmware update. The device is the device hosting /// the firmware image. /// -#define IMAGE_ATTRIBUTE_RESET_REQUIRED 0x0000000000000002 +#define IMAGE_ATTRIBUTE_RESET_REQUIRED 0x0000000000000002 /// /// The attribute IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED indicates authentication is /// required to perform the following image operations: GetImage(), SetImage(), and /// CheckImage(). See 'Image Attribute - Authentication'. /// -#define IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED 0x0000000000000004 +#define IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED 0x0000000000000004 /// /// The attribute IMAGE_ATTRIBUTE_IN_USE indicates the current state of the firmware image. /// This distinguishes firmware images in a device that supports redundant images. /// -#define IMAGE_ATTRIBUTE_IN_USE 0x0000000000000008 +#define IMAGE_ATTRIBUTE_IN_USE 0x0000000000000008 /// /// The attribute IMAGE_ATTRIBUTE_UEFI_IMAGE indicates that this image is an EFI compatible image. /// -#define IMAGE_ATTRIBUTE_UEFI_IMAGE 0x0000000000000010 +#define IMAGE_ATTRIBUTE_UEFI_IMAGE 0x0000000000000010 /// /// The attribute IMAGE_ATTRIBUTE_DEPENDENCY indicates that there is an EFI_FIRMWARE_IMAGE_DEP /// section associated with the image. /// -#define IMAGE_ATTRIBUTE_DEPENDENCY 0x0000000000000020 - +#define IMAGE_ATTRIBUTE_DEPENDENCY 0x0000000000000020 // // Image Compatibility Definitions @@ -184,13 +181,12 @@ typedef struct { /// Values from 0x0000000000010000 thru 0xFFFFFFFFFFFFFFFF are used by firmware vendor for /// compatibility check. /// -#define IMAGE_COMPATIBILITY_CHECK_SUPPORTED 0x0000000000000001 +#define IMAGE_COMPATIBILITY_CHECK_SUPPORTED 0x0000000000000001 /// /// Descriptor Version exposed by GetImageInfo() function /// -#define EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION 4 - +#define EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION 4 /// /// Image Attribute - Authentication Required @@ -200,7 +196,7 @@ typedef struct { /// It is included in the signature of AuthInfo. It is used to ensure freshness/no replay. /// It is incremented during each firmware image operation. /// - UINT64 MonotonicCount; + UINT64 MonotonicCount; /// /// Provides the authorization for the firmware image operations. It is a signature across /// the image data and the Monotonic Count value. Caller uses the private key that is @@ -208,10 +204,9 @@ typedef struct { /// Because this is defined as a signature, WIN_CERTIFICATE_UEFI_GUID.CertType must /// be EFI_CERT_TYPE_PKCS7_GUID. /// - WIN_CERTIFICATE_UEFI_GUID AuthInfo; + WIN_CERTIFICATE_UEFI_GUID AuthInfo; } EFI_FIRMWARE_IMAGE_AUTHENTICATION; - // // ImageUpdatable Definitions // @@ -221,31 +216,30 @@ typedef struct { /// the current image. SetImage VendorCode is optional but can be used for vendor /// specific action. /// -#define IMAGE_UPDATABLE_VALID 0x0000000000000001 +#define IMAGE_UPDATABLE_VALID 0x0000000000000001 /// /// IMAGE_UPDATABLE_INVALID indicates SetImage() will reject the new image. No additional /// information is provided for the rejection. /// -#define IMAGE_UPDATABLE_INVALID 0x0000000000000002 +#define IMAGE_UPDATABLE_INVALID 0x0000000000000002 /// /// IMAGE_UPDATABLE_INVALID_TYPE indicates SetImage() will reject the new image. The /// rejection is due to the new image is not a firmware image recognized for this device. /// -#define IMAGE_UPDATABLE_INVALID_TYPE 0x0000000000000004 +#define IMAGE_UPDATABLE_INVALID_TYPE 0x0000000000000004 /// /// IMAGE_UPDATABLE_INVALID_OLD indicates SetImage() will reject the new image. The /// rejection is due to the new image version is older than the current firmware image /// version in the device. The device firmware update policy does not support firmware /// version downgrade. /// -#define IMAGE_UPDATABLE_INVALID_OLD 0x0000000000000008 +#define IMAGE_UPDATABLE_INVALID_OLD 0x0000000000000008 /// /// IMAGE_UPDATABLE_VALID_WITH_VENDOR_CODE indicates SetImage() will accept and update /// the new image only if a correct VendorCode is provided or else image would be /// rejected and SetImage will return appropriate error. /// -#define IMAGE_UPDATABLE_VALID_WITH_VENDOR_CODE 0x0000000000000010 - +#define IMAGE_UPDATABLE_VALID_WITH_VENDOR_CODE 0x0000000000000010 // // Package Attribute Definitions @@ -254,17 +248,17 @@ typedef struct { /// The attribute PACKAGE_ATTRIBUTE_VERSION_UPDATABLE indicates this device supports the /// update of the firmware package version. /// -#define PACKAGE_ATTRIBUTE_VERSION_UPDATABLE 0x0000000000000001 +#define PACKAGE_ATTRIBUTE_VERSION_UPDATABLE 0x0000000000000001 /// /// The attribute PACKAGE_ATTRIBUTE_RESET_REQUIRED indicates a reset of the device is /// required for the new package info to take effect after an update. /// -#define PACKAGE_ATTRIBUTE_RESET_REQUIRED 0x0000000000000002 +#define PACKAGE_ATTRIBUTE_RESET_REQUIRED 0x0000000000000002 /// /// The attribute PACKAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED indicates authentication /// is required to update the package info. /// -#define PACKAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED 0x0000000000000004 +#define PACKAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED 0x0000000000000004 /** Callback function to report the process of the firmware updating. @@ -551,14 +545,14 @@ EFI_STATUS /// - Label all the firmware images within a device with a single version. /// struct _EFI_FIRMWARE_MANAGEMENT_PROTOCOL { - EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GET_IMAGE_INFO GetImageInfo; - EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GET_IMAGE GetImage; - EFI_FIRMWARE_MANAGEMENT_PROTOCOL_SET_IMAGE SetImage; - EFI_FIRMWARE_MANAGEMENT_PROTOCOL_CHECK_IMAGE CheckImage; - EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GET_PACKAGE_INFO GetPackageInfo; - EFI_FIRMWARE_MANAGEMENT_PROTOCOL_SET_PACKAGE_INFO SetPackageInfo; + EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GET_IMAGE_INFO GetImageInfo; + EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GET_IMAGE GetImage; + EFI_FIRMWARE_MANAGEMENT_PROTOCOL_SET_IMAGE SetImage; + EFI_FIRMWARE_MANAGEMENT_PROTOCOL_CHECK_IMAGE CheckImage; + EFI_FIRMWARE_MANAGEMENT_PROTOCOL_GET_PACKAGE_INFO GetPackageInfo; + EFI_FIRMWARE_MANAGEMENT_PROTOCOL_SET_PACKAGE_INFO SetPackageInfo; }; -extern EFI_GUID gEfiFirmwareManagementProtocolGuid; +extern EFI_GUID gEfiFirmwareManagementProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/FirmwareVolume2.h b/MdePkg/Include/Protocol/FirmwareVolume2.h index 0792324609..93749c82fd 100644 --- a/MdePkg/Include/Protocol/FirmwareVolume2.h +++ b/MdePkg/Include/Protocol/FirmwareVolume2.h @@ -21,62 +21,61 @@ typedef struct _EFI_FIRMWARE_VOLUME2_PROTOCOL EFI_FIRMWARE_VOLUME2_PROTOCOL; - /// /// EFI_FV_ATTRIBUTES /// -typedef UINT64 EFI_FV_ATTRIBUTES; +typedef UINT64 EFI_FV_ATTRIBUTES; // // EFI_FV_ATTRIBUTES bit definitions // // EFI_FV_ATTRIBUTES bit semantics -#define EFI_FV2_READ_DISABLE_CAP 0x0000000000000001ULL -#define EFI_FV2_READ_ENABLE_CAP 0x0000000000000002ULL -#define EFI_FV2_READ_STATUS 0x0000000000000004ULL -#define EFI_FV2_WRITE_DISABLE_CAP 0x0000000000000008ULL -#define EFI_FV2_WRITE_ENABLE_CAP 0x0000000000000010ULL -#define EFI_FV2_WRITE_STATUS 0x0000000000000020ULL -#define EFI_FV2_LOCK_CAP 0x0000000000000040ULL -#define EFI_FV2_LOCK_STATUS 0x0000000000000080ULL -#define EFI_FV2_WRITE_POLICY_RELIABLE 0x0000000000000100ULL -#define EFI_FV2_READ_LOCK_CAP 0x0000000000001000ULL -#define EFI_FV2_READ_LOCK_STATUS 0x0000000000002000ULL -#define EFI_FV2_WRITE_LOCK_CAP 0x0000000000004000ULL -#define EFI_FV2_WRITE_LOCK_STATUS 0x0000000000008000ULL -#define EFI_FV2_ALIGNMENT 0x00000000001F0000ULL -#define EFI_FV2_ALIGNMENT_1 0x0000000000000000ULL -#define EFI_FV2_ALIGNMENT_2 0x0000000000010000ULL -#define EFI_FV2_ALIGNMENT_4 0x0000000000020000ULL -#define EFI_FV2_ALIGNMENT_8 0x0000000000030000ULL -#define EFI_FV2_ALIGNMENT_16 0x0000000000040000ULL -#define EFI_FV2_ALIGNMENT_32 0x0000000000050000ULL -#define EFI_FV2_ALIGNMENT_64 0x0000000000060000ULL -#define EFI_FV2_ALIGNMENT_128 0x0000000000070000ULL -#define EFI_FV2_ALIGNMENT_256 0x0000000000080000ULL -#define EFI_FV2_ALIGNMENT_512 0x0000000000090000ULL -#define EFI_FV2_ALIGNMENT_1K 0x00000000000A0000ULL -#define EFI_FV2_ALIGNMENT_2K 0x00000000000B0000ULL -#define EFI_FV2_ALIGNMENT_4K 0x00000000000C0000ULL -#define EFI_FV2_ALIGNMENT_8K 0x00000000000D0000ULL -#define EFI_FV2_ALIGNMENT_16K 0x00000000000E0000ULL -#define EFI_FV2_ALIGNMENT_32K 0x00000000000F0000ULL -#define EFI_FV2_ALIGNMENT_64K 0x0000000000100000ULL -#define EFI_FV2_ALIGNMENT_128K 0x0000000000110000ULL -#define EFI_FV2_ALIGNMENT_256K 0x0000000000120000ULL -#define EFI_FV2_ALIGNMENT_512K 0x0000000000130000ULL -#define EFI_FV2_ALIGNMENT_1M 0x0000000000140000ULL -#define EFI_FV2_ALIGNMENT_2M 0x0000000000150000ULL -#define EFI_FV2_ALIGNMENT_4M 0x0000000000160000ULL -#define EFI_FV2_ALIGNMENT_8M 0x0000000000170000ULL -#define EFI_FV2_ALIGNMENT_16M 0x0000000000180000ULL -#define EFI_FV2_ALIGNMENT_32M 0x0000000000190000ULL -#define EFI_FV2_ALIGNMENT_64M 0x00000000001A0000ULL -#define EFI_FV2_ALIGNMENT_128M 0x00000000001B0000ULL -#define EFI_FV2_ALIGNMENT_256M 0x00000000001C0000ULL -#define EFI_FV2_ALIGNMENT_512M 0x00000000001D0000ULL -#define EFI_FV2_ALIGNMENT_1G 0x00000000001E0000ULL -#define EFI_FV2_ALIGNMENT_2G 0x00000000001F0000ULL +#define EFI_FV2_READ_DISABLE_CAP 0x0000000000000001ULL +#define EFI_FV2_READ_ENABLE_CAP 0x0000000000000002ULL +#define EFI_FV2_READ_STATUS 0x0000000000000004ULL +#define EFI_FV2_WRITE_DISABLE_CAP 0x0000000000000008ULL +#define EFI_FV2_WRITE_ENABLE_CAP 0x0000000000000010ULL +#define EFI_FV2_WRITE_STATUS 0x0000000000000020ULL +#define EFI_FV2_LOCK_CAP 0x0000000000000040ULL +#define EFI_FV2_LOCK_STATUS 0x0000000000000080ULL +#define EFI_FV2_WRITE_POLICY_RELIABLE 0x0000000000000100ULL +#define EFI_FV2_READ_LOCK_CAP 0x0000000000001000ULL +#define EFI_FV2_READ_LOCK_STATUS 0x0000000000002000ULL +#define EFI_FV2_WRITE_LOCK_CAP 0x0000000000004000ULL +#define EFI_FV2_WRITE_LOCK_STATUS 0x0000000000008000ULL +#define EFI_FV2_ALIGNMENT 0x00000000001F0000ULL +#define EFI_FV2_ALIGNMENT_1 0x0000000000000000ULL +#define EFI_FV2_ALIGNMENT_2 0x0000000000010000ULL +#define EFI_FV2_ALIGNMENT_4 0x0000000000020000ULL +#define EFI_FV2_ALIGNMENT_8 0x0000000000030000ULL +#define EFI_FV2_ALIGNMENT_16 0x0000000000040000ULL +#define EFI_FV2_ALIGNMENT_32 0x0000000000050000ULL +#define EFI_FV2_ALIGNMENT_64 0x0000000000060000ULL +#define EFI_FV2_ALIGNMENT_128 0x0000000000070000ULL +#define EFI_FV2_ALIGNMENT_256 0x0000000000080000ULL +#define EFI_FV2_ALIGNMENT_512 0x0000000000090000ULL +#define EFI_FV2_ALIGNMENT_1K 0x00000000000A0000ULL +#define EFI_FV2_ALIGNMENT_2K 0x00000000000B0000ULL +#define EFI_FV2_ALIGNMENT_4K 0x00000000000C0000ULL +#define EFI_FV2_ALIGNMENT_8K 0x00000000000D0000ULL +#define EFI_FV2_ALIGNMENT_16K 0x00000000000E0000ULL +#define EFI_FV2_ALIGNMENT_32K 0x00000000000F0000ULL +#define EFI_FV2_ALIGNMENT_64K 0x0000000000100000ULL +#define EFI_FV2_ALIGNMENT_128K 0x0000000000110000ULL +#define EFI_FV2_ALIGNMENT_256K 0x0000000000120000ULL +#define EFI_FV2_ALIGNMENT_512K 0x0000000000130000ULL +#define EFI_FV2_ALIGNMENT_1M 0x0000000000140000ULL +#define EFI_FV2_ALIGNMENT_2M 0x0000000000150000ULL +#define EFI_FV2_ALIGNMENT_4M 0x0000000000160000ULL +#define EFI_FV2_ALIGNMENT_8M 0x0000000000170000ULL +#define EFI_FV2_ALIGNMENT_16M 0x0000000000180000ULL +#define EFI_FV2_ALIGNMENT_32M 0x0000000000190000ULL +#define EFI_FV2_ALIGNMENT_64M 0x00000000001A0000ULL +#define EFI_FV2_ALIGNMENT_128M 0x00000000001B0000ULL +#define EFI_FV2_ALIGNMENT_256M 0x00000000001C0000ULL +#define EFI_FV2_ALIGNMENT_512M 0x00000000001D0000ULL +#define EFI_FV2_ALIGNMENT_1G 0x00000000001E0000ULL +#define EFI_FV2_ALIGNMENT_2G 0x00000000001F0000ULL /** Returns the attributes and current settings of the firmware volume. @@ -104,11 +103,10 @@ typedef UINT64 EFI_FV_ATTRIBUTES; **/ typedef EFI_STATUS -(EFIAPI * EFI_FV_GET_ATTRIBUTES)( +(EFIAPI *EFI_FV_GET_ATTRIBUTES)( IN CONST EFI_FIRMWARE_VOLUME2_PROTOCOL *This, OUT EFI_FV_ATTRIBUTES *FvAttributes -); - + ); /** Modifies the current settings of the firmware volume according to the input parameter. @@ -199,11 +197,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_FV_SET_ATTRIBUTES)( +(EFIAPI *EFI_FV_SET_ATTRIBUTES)( IN CONST EFI_FIRMWARE_VOLUME2_PROTOCOL *This, IN OUT EFI_FV_ATTRIBUTES *FvAttributes -); - + ); /** Retrieves a file and/or file information from the firmware volume. @@ -294,7 +291,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_FV_READ_FILE)( +(EFIAPI *EFI_FV_READ_FILE)( IN CONST EFI_FIRMWARE_VOLUME2_PROTOCOL *This, IN CONST EFI_GUID *NameGuid, IN OUT VOID **Buffer, @@ -302,9 +299,7 @@ EFI_STATUS OUT EFI_FV_FILETYPE *FoundType, OUT EFI_FV_FILE_ATTRIBUTES *FileAttributes, OUT UINT32 *AuthenticationStatus -); - - + ); /** Locates the requested section within a file and returns it in a buffer. @@ -402,7 +397,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_FV_READ_SECTION)( +(EFIAPI *EFI_FV_READ_SECTION)( IN CONST EFI_FIRMWARE_VOLUME2_PROTOCOL *This, IN CONST EFI_GUID *NameGuid, IN EFI_SECTION_TYPE SectionType, @@ -410,14 +405,14 @@ EFI_STATUS IN OUT VOID **Buffer, IN OUT UINTN *BufferSize, OUT UINT32 *AuthenticationStatus -); + ); /// /// EFI_FV_WRITE_POLICY, two policies (unreliable write and reliable write) are defined. /// typedef UINT32 EFI_FV_WRITE_POLICY; -#define EFI_FV_UNRELIABLE_WRITE 0x00000000 -#define EFI_FV_RELIABLE_WRITE 0x00000001 +#define EFI_FV_UNRELIABLE_WRITE 0x00000000 +#define EFI_FV_RELIABLE_WRITE 0x00000001 // // EFI_FV_WRITE_FILE_DATA @@ -426,23 +421,23 @@ typedef struct { /// /// Pointer to a GUID, which is the file name to be written. /// - EFI_GUID *NameGuid; + EFI_GUID *NameGuid; /// /// Indicates the type of file to be written. /// - EFI_FV_FILETYPE Type; + EFI_FV_FILETYPE Type; /// /// Indicates the attributes for the file to be written. /// - EFI_FV_FILE_ATTRIBUTES FileAttributes; + EFI_FV_FILE_ATTRIBUTES FileAttributes; /// /// Pointer to a buffer containing the file to be written. /// - VOID *Buffer; + VOID *Buffer; /// /// Indicates the size of the file image contained in Buffer. /// - UINT32 BufferSize; + UINT32 BufferSize; } EFI_FV_WRITE_FILE_DATA; /** @@ -513,13 +508,12 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI * EFI_FV_WRITE_FILE)( +(EFIAPI *EFI_FV_WRITE_FILE)( IN CONST EFI_FIRMWARE_VOLUME2_PROTOCOL *This, IN UINT32 NumberOfFiles, IN EFI_FV_WRITE_POLICY WritePolicy, IN EFI_FV_WRITE_FILE_DATA *FileData -); - + ); /** Retrieves information about the next file in the firmware volume store @@ -598,14 +592,14 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_FV_GET_NEXT_FILE)( +(EFIAPI *EFI_FV_GET_NEXT_FILE)( IN CONST EFI_FIRMWARE_VOLUME2_PROTOCOL *This, IN OUT VOID *Key, IN OUT EFI_FV_FILETYPE *FileType, OUT EFI_GUID *NameGuid, OUT EFI_FV_FILE_ATTRIBUTES *Attributes, OUT UINTN *Size -); + ); /** Return information about a firmware volume. @@ -661,8 +655,7 @@ EFI_STATUS IN CONST EFI_GUID *InformationType, IN OUT UINTN *BufferSize, OUT VOID *Buffer -); - + ); /** Sets information about a firmware volume. @@ -711,8 +704,7 @@ EFI_STATUS IN CONST EFI_GUID *InformationType, IN UINTN BufferSize, IN CONST VOID *Buffer -); - + ); /// /// The Firmware Volume Protocol contains the file-level @@ -728,29 +720,28 @@ EFI_STATUS /// Protocol. /// struct _EFI_FIRMWARE_VOLUME2_PROTOCOL { - EFI_FV_GET_ATTRIBUTES GetVolumeAttributes; - EFI_FV_SET_ATTRIBUTES SetVolumeAttributes; - EFI_FV_READ_FILE ReadFile; - EFI_FV_READ_SECTION ReadSection; - EFI_FV_WRITE_FILE WriteFile; - EFI_FV_GET_NEXT_FILE GetNextFile; + EFI_FV_GET_ATTRIBUTES GetVolumeAttributes; + EFI_FV_SET_ATTRIBUTES SetVolumeAttributes; + EFI_FV_READ_FILE ReadFile; + EFI_FV_READ_SECTION ReadSection; + EFI_FV_WRITE_FILE WriteFile; + EFI_FV_GET_NEXT_FILE GetNextFile; /// /// Data field that indicates the size in bytes /// of the Key input buffer for the /// GetNextFile() API. /// - UINT32 KeySize; + UINT32 KeySize; /// /// Handle of the parent firmware volume. /// - EFI_HANDLE ParentHandle; - EFI_FV_GET_INFO GetInfo; - EFI_FV_SET_INFO SetInfo; + EFI_HANDLE ParentHandle; + EFI_FV_GET_INFO GetInfo; + EFI_FV_SET_INFO SetInfo; }; - -extern EFI_GUID gEfiFirmwareVolume2ProtocolGuid; +extern EFI_GUID gEfiFirmwareVolume2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/FirmwareVolumeBlock.h b/MdePkg/Include/Protocol/FirmwareVolumeBlock.h index 9d4f6ebac0..3fcc0826d0 100644 --- a/MdePkg/Include/Protocol/FirmwareVolumeBlock.h +++ b/MdePkg/Include/Protocol/FirmwareVolumeBlock.h @@ -44,11 +44,10 @@ typedef EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI * EFI_FVB_GET_ATTRIBUTES)( +(EFIAPI *EFI_FVB_GET_ATTRIBUTES)( IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This, OUT EFI_FVB_ATTRIBUTES_2 *Attributes -); - + ); /** The SetAttributes() function sets configurable firmware volume @@ -74,11 +73,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_FVB_SET_ATTRIBUTES)( +(EFIAPI *EFI_FVB_SET_ATTRIBUTES)( IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This, IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes -); - + ); /** The GetPhysicalAddress() function retrieves the base address of @@ -99,10 +97,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_FVB_GET_PHYSICAL_ADDRESS)( +(EFIAPI *EFI_FVB_GET_PHYSICAL_ADDRESS)( IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This, OUT EFI_PHYSICAL_ADDRESS *Address -); + ); /** The GetBlockSize() function retrieves the size of the requested @@ -132,13 +130,12 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_FVB_GET_BLOCK_SIZE)( +(EFIAPI *EFI_FVB_GET_BLOCK_SIZE)( IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This, IN EFI_LBA Lba, OUT UINTN *BlockSize, OUT UINTN *NumberOfBlocks -); - + ); /** Reads the specified number of bytes into a buffer from the specified block. @@ -195,7 +192,7 @@ EFI_STATUS IN UINTN Offset, IN OUT UINTN *NumBytes, IN OUT UINT8 *Buffer -); + ); /** Writes the specified number of bytes from the input buffer to the block. @@ -258,22 +255,18 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_FVB_WRITE)( +(EFIAPI *EFI_FVB_WRITE)( IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This, IN EFI_LBA Lba, IN UINTN Offset, IN OUT UINTN *NumBytes, IN UINT8 *Buffer -); - - - + ); /// /// EFI_LBA_LIST_TERMINATOR /// -#define EFI_LBA_LIST_TERMINATOR 0xFFFFFFFFFFFFFFFFULL - +#define EFI_LBA_LIST_TERMINATOR 0xFFFFFFFFFFFFFFFFULL /** Erases and initializes a firmware volume block. @@ -325,10 +318,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_FVB_ERASE_BLOCKS)( +(EFIAPI *EFI_FVB_ERASE_BLOCKS)( IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This, ... -); + ); /// /// The Firmware Volume Block Protocol is the low-level interface @@ -339,22 +332,21 @@ EFI_STATUS /// produces the Firmware Volume Protocol will bind to the /// Firmware Volume Block Protocol. /// -struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL{ - EFI_FVB_GET_ATTRIBUTES GetAttributes; - EFI_FVB_SET_ATTRIBUTES SetAttributes; - EFI_FVB_GET_PHYSICAL_ADDRESS GetPhysicalAddress; - EFI_FVB_GET_BLOCK_SIZE GetBlockSize; - EFI_FVB_READ Read; - EFI_FVB_WRITE Write; - EFI_FVB_ERASE_BLOCKS EraseBlocks; +struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL { + EFI_FVB_GET_ATTRIBUTES GetAttributes; + EFI_FVB_SET_ATTRIBUTES SetAttributes; + EFI_FVB_GET_PHYSICAL_ADDRESS GetPhysicalAddress; + EFI_FVB_GET_BLOCK_SIZE GetBlockSize; + EFI_FVB_READ Read; + EFI_FVB_WRITE Write; + EFI_FVB_ERASE_BLOCKS EraseBlocks; /// /// The handle of the parent firmware volume. /// - EFI_HANDLE ParentHandle; + EFI_HANDLE ParentHandle; }; - -extern EFI_GUID gEfiFirmwareVolumeBlockProtocolGuid; -extern EFI_GUID gEfiFirmwareVolumeBlock2ProtocolGuid; +extern EFI_GUID gEfiFirmwareVolumeBlockProtocolGuid; +extern EFI_GUID gEfiFirmwareVolumeBlock2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/FormBrowser2.h b/MdePkg/Include/Protocol/FormBrowser2.h index 0220ae26bb..436a7723c1 100644 --- a/MdePkg/Include/Protocol/FormBrowser2.h +++ b/MdePkg/Include/Protocol/FormBrowser2.h @@ -17,10 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define EFI_FORM_BROWSER2_PROTOCOL_GUID \ {0xb9d4c360, 0xbcfb, 0x4f9b, {0x92, 0x98, 0x53, 0xc1, 0x36, 0x98, 0x22, 0x58 }} - -typedef struct _EFI_FORM_BROWSER2_PROTOCOL EFI_FORM_BROWSER2_PROTOCOL; - - +typedef struct _EFI_FORM_BROWSER2_PROTOCOL EFI_FORM_BROWSER2_PROTOCOL; /** @@ -41,24 +38,23 @@ typedef struct _EFI_FORM_BROWSER2_PROTOCOL EFI_FORM_BROWSER2_PROTOCOL; window will end. **/ typedef struct { - UINTN LeftColumn; - UINTN RightColumn; - UINTN TopRow; - UINTN BottomRow; + UINTN LeftColumn; + UINTN RightColumn; + UINTN TopRow; + UINTN BottomRow; } EFI_SCREEN_DESCRIPTOR; typedef UINTN EFI_BROWSER_ACTION_REQUEST; -#define EFI_BROWSER_ACTION_REQUEST_NONE 0 -#define EFI_BROWSER_ACTION_REQUEST_RESET 1 -#define EFI_BROWSER_ACTION_REQUEST_SUBMIT 2 -#define EFI_BROWSER_ACTION_REQUEST_EXIT 3 -#define EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT 4 -#define EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT 5 -#define EFI_BROWSER_ACTION_REQUEST_FORM_APPLY 6 -#define EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD 7 -#define EFI_BROWSER_ACTION_REQUEST_RECONNECT 8 - +#define EFI_BROWSER_ACTION_REQUEST_NONE 0 +#define EFI_BROWSER_ACTION_REQUEST_RESET 1 +#define EFI_BROWSER_ACTION_REQUEST_SUBMIT 2 +#define EFI_BROWSER_ACTION_REQUEST_EXIT 3 +#define EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT 4 +#define EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT 5 +#define EFI_BROWSER_ACTION_REQUEST_FORM_APPLY 6 +#define EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD 7 +#define EFI_BROWSER_ACTION_REQUEST_RECONNECT 8 /** Initialize the browser to display the specified configuration forms. @@ -106,8 +102,7 @@ EFI_STATUS IN EFI_FORM_ID FormId OPTIONAL, IN CONST EFI_SCREEN_DESCRIPTOR *ScreenDimensions OPTIONAL, OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest OPTIONAL -); - + ); /** This function is called by a callback handler to retrieve uncommitted state data from the browser. @@ -157,17 +152,17 @@ EFI_STATUS IN CONST BOOLEAN RetrieveData, IN CONST EFI_GUID *VariableGuid OPTIONAL, IN CONST CHAR16 *VariableName OPTIONAL -); + ); /// /// This interface will allow the caller to direct the configuration /// driver to use either the HII database or use the passed-in packet of data. /// struct _EFI_FORM_BROWSER2_PROTOCOL { - EFI_SEND_FORM2 SendForm; - EFI_BROWSER_CALLBACK2 BrowserCallback; -} ; + EFI_SEND_FORM2 SendForm; + EFI_BROWSER_CALLBACK2 BrowserCallback; +}; -extern EFI_GUID gEfiFormBrowser2ProtocolGuid; +extern EFI_GUID gEfiFormBrowser2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Ftp4.h b/MdePkg/Include/Protocol/Ftp4.h index 3b05de8a11..f2dd8b8c15 100644 --- a/MdePkg/Include/Protocol/Ftp4.h +++ b/MdePkg/Include/Protocol/Ftp4.h @@ -18,7 +18,6 @@ #ifndef __EFI_FTP4_PROTOCOL_H__ #define __EFI_FTP4_PROTOCOL_H__ - #define EFI_FTP4_SERVICE_BINDING_PROTOCOL_GUID \ { \ 0xfaaecb1, 0x226e, 0x4782, {0xaa, 0xce, 0x7d, 0xb9, 0xbc, 0xbf, 0x4d, 0xaf } \ @@ -42,7 +41,7 @@ typedef struct { /// equal to TPL_CALLBACK. If it is set to NULL, this function will not return until the /// function completes. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// The variable to receive the result of the completed operation. /// EFI_SUCCESS: The FTP connection is established successfully @@ -63,7 +62,7 @@ typedef struct { /// error is received. /// EFI_DEVICE_ERROR: An unexpected system or network error occurred. /// - EFI_STATUS Status; + EFI_STATUS Status; } EFI_FTP4_CONNECTION_TOKEN; /// @@ -74,47 +73,47 @@ typedef struct { /// Pointer to a ASCII string that contains user name. The caller is /// responsible for freeing Username after GetModeData() is called. /// - UINT8 *Username; + UINT8 *Username; /// /// Pointer to a ASCII string that contains password. The caller is /// responsible for freeing Password after GetModeData() is called. /// - UINT8 *Password; + UINT8 *Password; /// /// Set it to TRUE to initiate an active data connection. Set it to /// FALSE to initiate a passive data connection. /// - BOOLEAN Active; + BOOLEAN Active; /// /// Boolean value indicating if default network settting used. /// - BOOLEAN UseDefaultSetting; + BOOLEAN UseDefaultSetting; /// /// IP address of station if UseDefaultSetting is FALSE. /// - EFI_IPv4_ADDRESS StationIp; + EFI_IPv4_ADDRESS StationIp; /// /// Subnet mask of station if UseDefaultSetting is FALSE. /// - EFI_IPv4_ADDRESS SubnetMask; + EFI_IPv4_ADDRESS SubnetMask; /// /// IP address of gateway if UseDefaultSetting is FALSE. /// - EFI_IPv4_ADDRESS GatewayIp; + EFI_IPv4_ADDRESS GatewayIp; /// /// IP address of FTPv4 server. /// - EFI_IPv4_ADDRESS ServerIp; + EFI_IPv4_ADDRESS ServerIp; /// /// FTPv4 server port number of control connection, and the default /// value is 21 as convention. /// - UINT16 ServerPort; + UINT16 ServerPort; /// /// FTPv4 server port number of data connection. If it is zero, use /// (ServerPort - 1) by convention. /// - UINT16 AltDataPort; + UINT16 AltDataPort; /// /// A byte indicate the representation type. The right 4 bit is used for /// first parameter, the left 4 bit is use for second parameter @@ -124,15 +123,15 @@ typedef struct { /// - If it is a local type, the second parameter is the local byte byte size. /// - If it is a image type, the second parameter is undefined. /// - UINT8 RepType; + UINT8 RepType; /// /// Defines the file structure in FTP used. 0x00 = file, 0x01 = record, 0x02 = page. /// - UINT8 FileStruct; + UINT8 FileStruct; /// /// Defines the transifer mode used in FTP. 0x00 = stream, 0x01 = Block, 0x02 = Compressed. /// - UINT8 TransMode; + UINT8 TransMode; } EFI_FTP4_CONFIG_DATA; typedef struct _EFI_FTP4_COMMAND_TOKEN EFI_FTP4_COMMAND_TOKEN; @@ -172,20 +171,20 @@ struct _EFI_FTP4_COMMAND_TOKEN { /// set to NULL, related function must wait until the function /// completes. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Pointer to a null-terminated ASCII name string. /// - UINT8 *Pathname; + UINT8 *Pathname; /// /// The size of data buffer in bytes. /// - UINT64 DataBufferSize; + UINT64 DataBufferSize; /// /// Pointer to the data buffer. Data downloaded from FTP server /// through connection is downloaded here. /// - VOID *DataBuffer; + VOID *DataBuffer; /// /// Pointer to a callback function. If it is receiving function that leads /// to inbound data, the callback function is called when databuffer is @@ -198,11 +197,11 @@ struct _EFI_FTP4_COMMAND_TOKEN { /// DataBufferSize, again. If there is no data remained, /// DataBufferSize should be set to 0. /// - EFI_FTP4_DATA_CALLBACK DataCallback; + EFI_FTP4_DATA_CALLBACK DataCallback; /// /// Pointer to the parameter for DataCallback. /// - VOID *Context; + VOID *Context; /// /// The variable to receive the result of the completed operation. /// EFI_SUCCESS: The FTP command is completed successfully. @@ -223,7 +222,7 @@ struct _EFI_FTP4_COMMAND_TOKEN { /// error is received. /// EFI_DEVICE_ERROR: An unexpected system or network error occurred. /// - EFI_STATUS Status; + EFI_STATUS Status; }; /** @@ -353,7 +352,6 @@ EFI_STATUS IN EFI_FTP4_CONFIG_DATA *FtpConfigData OPTIONAL ); - /** Downloads a file from an FTPv4 server. @@ -511,8 +509,7 @@ struct _EFI_FTP4_PROTOCOL { EFI_FTP4_POLL Poll; }; -extern EFI_GUID gEfiFtp4ServiceBindingProtocolGuid; -extern EFI_GUID gEfiFtp4ProtocolGuid; +extern EFI_GUID gEfiFtp4ServiceBindingProtocolGuid; +extern EFI_GUID gEfiFtp4ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/GraphicsOutput.h b/MdePkg/Include/Protocol/GraphicsOutput.h index b80ac44466..fa00fa3d54 100644 --- a/MdePkg/Include/Protocol/GraphicsOutput.h +++ b/MdePkg/Include/Protocol/GraphicsOutput.h @@ -19,10 +19,10 @@ typedef struct _EFI_GRAPHICS_OUTPUT_PROTOCOL EFI_GRAPHICS_OUTPUT_PROTOCOL; typedef struct { - UINT32 RedMask; - UINT32 GreenMask; - UINT32 BlueMask; - UINT32 ReservedMask; + UINT32 RedMask; + UINT32 GreenMask; + UINT32 BlueMask; + UINT32 ReservedMask; } EFI_PIXEL_BITMASK; typedef enum { @@ -61,29 +61,29 @@ typedef struct { /// The version of this data structure. A value of zero represents the /// EFI_GRAPHICS_OUTPUT_MODE_INFORMATION structure as defined in this specification. /// - UINT32 Version; + UINT32 Version; /// /// The size of video screen in pixels in the X dimension. /// - UINT32 HorizontalResolution; + UINT32 HorizontalResolution; /// /// The size of video screen in pixels in the Y dimension. /// - UINT32 VerticalResolution; + UINT32 VerticalResolution; /// /// Enumeration that defines the physical format of the pixel. A value of PixelBltOnly /// implies that a linear frame buffer is not available for this mode. /// - EFI_GRAPHICS_PIXEL_FORMAT PixelFormat; + EFI_GRAPHICS_PIXEL_FORMAT PixelFormat; /// /// This bit-mask is only valid if PixelFormat is set to PixelPixelBitMask. /// A bit being set defines what bits are used for what purpose such as Red, Green, Blue, or Reserved. /// - EFI_PIXEL_BITMASK PixelInformation; + EFI_PIXEL_BITMASK PixelInformation; /// /// Defines the number of pixel elements per video memory line. /// - UINT32 PixelsPerScanLine; + UINT32 PixelsPerScanLine; } EFI_GRAPHICS_OUTPUT_MODE_INFORMATION; /** @@ -129,15 +129,15 @@ EFI_STATUS ); typedef struct { - UINT8 Blue; - UINT8 Green; - UINT8 Red; - UINT8 Reserved; + UINT8 Blue; + UINT8 Green; + UINT8 Red; + UINT8 Reserved; } EFI_GRAPHICS_OUTPUT_BLT_PIXEL; typedef union { - EFI_GRAPHICS_OUTPUT_BLT_PIXEL Pixel; - UINT32 Raw; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL Pixel; + UINT32 Raw; } EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION; /// @@ -225,29 +225,29 @@ typedef struct { /// /// The number of modes supported by QueryMode() and SetMode(). /// - UINT32 MaxMode; + UINT32 MaxMode; /// /// Current Mode of the graphics device. Valid mode numbers are 0 to MaxMode -1. /// - UINT32 Mode; + UINT32 Mode; /// /// Pointer to read-only EFI_GRAPHICS_OUTPUT_MODE_INFORMATION data. /// - EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; /// /// Size of Info structure in bytes. /// - UINTN SizeOfInfo; + UINTN SizeOfInfo; /// /// Base address of graphics linear frame buffer. /// Offset zero in FrameBufferBase represents the upper left pixel of the display. /// - EFI_PHYSICAL_ADDRESS FrameBufferBase; + EFI_PHYSICAL_ADDRESS FrameBufferBase; /// /// Amount of frame buffer needed to support the active mode as defined by /// PixelsPerScanLine xVerticalResolution x PixelElementSize. /// - UINTN FrameBufferSize; + UINTN FrameBufferSize; } EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE; /// @@ -256,15 +256,15 @@ typedef struct { /// frame buffer is also exposed so software can write directly to the video hardware. /// struct _EFI_GRAPHICS_OUTPUT_PROTOCOL { - EFI_GRAPHICS_OUTPUT_PROTOCOL_QUERY_MODE QueryMode; - EFI_GRAPHICS_OUTPUT_PROTOCOL_SET_MODE SetMode; - EFI_GRAPHICS_OUTPUT_PROTOCOL_BLT Blt; + EFI_GRAPHICS_OUTPUT_PROTOCOL_QUERY_MODE QueryMode; + EFI_GRAPHICS_OUTPUT_PROTOCOL_SET_MODE SetMode; + EFI_GRAPHICS_OUTPUT_PROTOCOL_BLT Blt; /// /// Pointer to EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE data. /// - EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode; + EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode; }; -extern EFI_GUID gEfiGraphicsOutputProtocolGuid; +extern EFI_GUID gEfiGraphicsOutputProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/GuidedSectionExtraction.h b/MdePkg/Include/Protocol/GuidedSectionExtraction.h index 5f55b0bccb..d20fed3cf4 100644 --- a/MdePkg/Include/Protocol/GuidedSectionExtraction.h +++ b/MdePkg/Include/Protocol/GuidedSectionExtraction.h @@ -28,7 +28,6 @@ typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL; - /** The ExtractSection() function processes the input section and allocates a buffer from the pool in which it returns the section @@ -117,8 +116,7 @@ EFI_STATUS OUT VOID **OutputBuffer, OUT UINTN *OutputSize, OUT UINT32 *AuthenticationStatus -); - + ); /// /// Typically, protocol interface structures are identified by associating them with a GUID. Each @@ -128,8 +126,7 @@ EFI_STATUS /// Extraction Protocol is used to correlate it with the GUIDed section type that it is intended to process. /// struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL { - EFI_EXTRACT_GUIDED_SECTION ExtractSection; + EFI_EXTRACT_GUIDED_SECTION ExtractSection; }; - #endif diff --git a/MdePkg/Include/Protocol/Hash.h b/MdePkg/Include/Protocol/Hash.h index 931d7916ef..b76821fb4f 100644 --- a/MdePkg/Include/Protocol/Hash.h +++ b/MdePkg/Include/Protocol/Hash.h @@ -75,20 +75,20 @@ SPDX-License-Identifier: BSD-2-Clause-Patent typedef struct _EFI_HASH_PROTOCOL EFI_HASH_PROTOCOL; -typedef UINT8 EFI_MD5_HASH[16]; -typedef UINT8 EFI_SHA1_HASH[20]; -typedef UINT8 EFI_SHA224_HASH[28]; -typedef UINT8 EFI_SHA256_HASH[32]; -typedef UINT8 EFI_SHA384_HASH[48]; -typedef UINT8 EFI_SHA512_HASH[64]; +typedef UINT8 EFI_MD5_HASH[16]; +typedef UINT8 EFI_SHA1_HASH[20]; +typedef UINT8 EFI_SHA224_HASH[28]; +typedef UINT8 EFI_SHA256_HASH[32]; +typedef UINT8 EFI_SHA384_HASH[48]; +typedef UINT8 EFI_SHA512_HASH[64]; typedef union { - EFI_MD5_HASH *Md5Hash; - EFI_SHA1_HASH *Sha1Hash; - EFI_SHA224_HASH *Sha224Hash; - EFI_SHA256_HASH *Sha256Hash; - EFI_SHA384_HASH *Sha384Hash; - EFI_SHA512_HASH *Sha512Hash; + EFI_MD5_HASH *Md5Hash; + EFI_SHA1_HASH *Sha1Hash; + EFI_SHA224_HASH *Sha224Hash; + EFI_SHA256_HASH *Sha256Hash; + EFI_SHA384_HASH *Sha384Hash; + EFI_SHA512_HASH *Sha512Hash; } EFI_HASH_OUTPUT; /** @@ -151,19 +151,19 @@ EFI_STATUS /// using one or more hash algorithms. /// struct _EFI_HASH_PROTOCOL { - EFI_HASH_GET_HASH_SIZE GetHashSize; - EFI_HASH_HASH Hash; + EFI_HASH_GET_HASH_SIZE GetHashSize; + EFI_HASH_HASH Hash; }; -extern EFI_GUID gEfiHashServiceBindingProtocolGuid; -extern EFI_GUID gEfiHashProtocolGuid; -extern EFI_GUID gEfiHashAlgorithmSha1Guid; -extern EFI_GUID gEfiHashAlgorithmSha224Guid; -extern EFI_GUID gEfiHashAlgorithmSha256Guid; -extern EFI_GUID gEfiHashAlgorithmSha384Guid; -extern EFI_GUID gEfiHashAlgorithmSha512Guid; -extern EFI_GUID gEfiHashAlgorithmMD5Guid; -extern EFI_GUID gEfiHashAlgorithmSha1NoPadGuid; -extern EFI_GUID gEfiHashAlgorithmSha256NoPadGuid; +extern EFI_GUID gEfiHashServiceBindingProtocolGuid; +extern EFI_GUID gEfiHashProtocolGuid; +extern EFI_GUID gEfiHashAlgorithmSha1Guid; +extern EFI_GUID gEfiHashAlgorithmSha224Guid; +extern EFI_GUID gEfiHashAlgorithmSha256Guid; +extern EFI_GUID gEfiHashAlgorithmSha384Guid; +extern EFI_GUID gEfiHashAlgorithmSha512Guid; +extern EFI_GUID gEfiHashAlgorithmMD5Guid; +extern EFI_GUID gEfiHashAlgorithmSha1NoPadGuid; +extern EFI_GUID gEfiHashAlgorithmSha256NoPadGuid; #endif diff --git a/MdePkg/Include/Protocol/Hash2.h b/MdePkg/Include/Protocol/Hash2.h index 55ce4cfe33..59a41b45b5 100644 --- a/MdePkg/Include/Protocol/Hash2.h +++ b/MdePkg/Include/Protocol/Hash2.h @@ -42,20 +42,20 @@ SPDX-License-Identifier: BSD-2-Clause-Patent typedef struct _EFI_HASH2_PROTOCOL EFI_HASH2_PROTOCOL; -typedef UINT8 EFI_MD5_HASH2[16]; -typedef UINT8 EFI_SHA1_HASH2[20]; -typedef UINT8 EFI_SHA224_HASH2[28]; -typedef UINT8 EFI_SHA256_HASH2[32]; -typedef UINT8 EFI_SHA384_HASH2[48]; -typedef UINT8 EFI_SHA512_HASH2[64]; +typedef UINT8 EFI_MD5_HASH2[16]; +typedef UINT8 EFI_SHA1_HASH2[20]; +typedef UINT8 EFI_SHA224_HASH2[28]; +typedef UINT8 EFI_SHA256_HASH2[32]; +typedef UINT8 EFI_SHA384_HASH2[48]; +typedef UINT8 EFI_SHA512_HASH2[64]; typedef union { - EFI_MD5_HASH2 Md5Hash; - EFI_SHA1_HASH2 Sha1Hash; - EFI_SHA224_HASH2 Sha224Hash; - EFI_SHA256_HASH2 Sha256Hash; - EFI_SHA384_HASH2 Sha384Hash; - EFI_SHA512_HASH2 Sha512Hash; + EFI_MD5_HASH2 Md5Hash; + EFI_SHA1_HASH2 Sha1Hash; + EFI_SHA224_HASH2 Sha224Hash; + EFI_SHA256_HASH2 Sha256Hash; + EFI_SHA384_HASH2 Sha384Hash; + EFI_SHA512_HASH2 Sha512Hash; } EFI_HASH2_OUTPUT; /** @@ -183,14 +183,14 @@ EFI_STATUS /// finalization are performed by the supporting driver. /// struct _EFI_HASH2_PROTOCOL { - EFI_HASH2_GET_HASH_SIZE GetHashSize; - EFI_HASH2_HASH Hash; - EFI_HASH2_HASH_INIT HashInit; - EFI_HASH2_HASH_UPDATE HashUpdate; - EFI_HASH2_HASH_FINAL HashFinal; + EFI_HASH2_GET_HASH_SIZE GetHashSize; + EFI_HASH2_HASH Hash; + EFI_HASH2_HASH_INIT HashInit; + EFI_HASH2_HASH_UPDATE HashUpdate; + EFI_HASH2_HASH_FINAL HashFinal; }; -extern EFI_GUID gEfiHash2ServiceBindingProtocolGuid; -extern EFI_GUID gEfiHash2ProtocolGuid; +extern EFI_GUID gEfiHash2ServiceBindingProtocolGuid; +extern EFI_GUID gEfiHash2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/HiiConfigAccess.h b/MdePkg/Include/Protocol/HiiConfigAccess.h index 53aefd3778..3baf91e07b 100644 --- a/MdePkg/Include/Protocol/HiiConfigAccess.h +++ b/MdePkg/Include/Protocol/HiiConfigAccess.h @@ -13,7 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ - #ifndef __EFI_HII_CONFIG_ACCESS_H__ #define __EFI_HII_CONFIG_ACCESS_H__ @@ -22,22 +21,22 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define EFI_HII_CONFIG_ACCESS_PROTOCOL_GUID \ { 0x330d4706, 0xf2a0, 0x4e4f, { 0xa3, 0x69, 0xb6, 0x6f, 0xa8, 0xd5, 0x43, 0x85 } } -typedef struct _EFI_HII_CONFIG_ACCESS_PROTOCOL EFI_HII_CONFIG_ACCESS_PROTOCOL; +typedef struct _EFI_HII_CONFIG_ACCESS_PROTOCOL EFI_HII_CONFIG_ACCESS_PROTOCOL; typedef UINTN EFI_BROWSER_ACTION; -#define EFI_BROWSER_ACTION_CHANGING 0 -#define EFI_BROWSER_ACTION_CHANGED 1 -#define EFI_BROWSER_ACTION_RETRIEVE 2 -#define EFI_BROWSER_ACTION_FORM_OPEN 3 -#define EFI_BROWSER_ACTION_FORM_CLOSE 4 -#define EFI_BROWSER_ACTION_SUBMITTED 5 -#define EFI_BROWSER_ACTION_DEFAULT_STANDARD 0x1000 -#define EFI_BROWSER_ACTION_DEFAULT_MANUFACTURING 0x1001 -#define EFI_BROWSER_ACTION_DEFAULT_SAFE 0x1002 -#define EFI_BROWSER_ACTION_DEFAULT_PLATFORM 0x2000 -#define EFI_BROWSER_ACTION_DEFAULT_HARDWARE 0x3000 -#define EFI_BROWSER_ACTION_DEFAULT_FIRMWARE 0x4000 +#define EFI_BROWSER_ACTION_CHANGING 0 +#define EFI_BROWSER_ACTION_CHANGED 1 +#define EFI_BROWSER_ACTION_RETRIEVE 2 +#define EFI_BROWSER_ACTION_FORM_OPEN 3 +#define EFI_BROWSER_ACTION_FORM_CLOSE 4 +#define EFI_BROWSER_ACTION_SUBMITTED 5 +#define EFI_BROWSER_ACTION_DEFAULT_STANDARD 0x1000 +#define EFI_BROWSER_ACTION_DEFAULT_MANUFACTURING 0x1001 +#define EFI_BROWSER_ACTION_DEFAULT_SAFE 0x1002 +#define EFI_BROWSER_ACTION_DEFAULT_PLATFORM 0x2000 +#define EFI_BROWSER_ACTION_DEFAULT_HARDWARE 0x3000 +#define EFI_BROWSER_ACTION_DEFAULT_FIRMWARE 0x4000 /** @@ -109,13 +108,12 @@ typedef UINTN EFI_BROWSER_ACTION; **/ typedef EFI_STATUS -(EFIAPI * EFI_HII_ACCESS_EXTRACT_CONFIG)( +(EFIAPI *EFI_HII_ACCESS_EXTRACT_CONFIG)( IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This, IN CONST EFI_STRING Request, OUT EFI_STRING *Progress, OUT EFI_STRING *Results -); - + ); /** @@ -159,11 +157,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_HII_ACCESS_ROUTE_CONFIG)( +(EFIAPI *EFI_HII_ACCESS_ROUTE_CONFIG)( IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This, IN CONST EFI_STRING Configuration, OUT EFI_STRING *Progress -); + ); /** @@ -200,7 +198,7 @@ EFI_STATUS IN OUT EFI_IFR_TYPE_VALUE *Value, OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest ) - ; +; /// /// This protocol provides a callable interface between the HII and @@ -208,13 +206,11 @@ EFI_STATUS /// to publish this protocol. /// struct _EFI_HII_CONFIG_ACCESS_PROTOCOL { - EFI_HII_ACCESS_EXTRACT_CONFIG ExtractConfig; - EFI_HII_ACCESS_ROUTE_CONFIG RouteConfig; - EFI_HII_ACCESS_FORM_CALLBACK Callback; -} ; + EFI_HII_ACCESS_EXTRACT_CONFIG ExtractConfig; + EFI_HII_ACCESS_ROUTE_CONFIG RouteConfig; + EFI_HII_ACCESS_FORM_CALLBACK Callback; +}; -extern EFI_GUID gEfiHiiConfigAccessProtocolGuid; +extern EFI_GUID gEfiHiiConfigAccessProtocolGuid; #endif - - diff --git a/MdePkg/Include/Protocol/HiiConfigKeyword.h b/MdePkg/Include/Protocol/HiiConfigKeyword.h index c650d0de39..0792681b79 100644 --- a/MdePkg/Include/Protocol/HiiConfigKeyword.h +++ b/MdePkg/Include/Protocol/HiiConfigKeyword.h @@ -20,16 +20,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0x0a8badd5, 0x03b8, 0x4d19, {0xb1, 0x28, 0x7b, 0x8f, 0x0e, 0xda, 0xa5, 0x96 } \ } -//*********************************************************** +// *********************************************************** // Progress Errors -//*********************************************************** -#define KEYWORD_HANDLER_NO_ERROR 0x00000000 -#define KEYWORD_HANDLER_NAMESPACE_ID_NOT_FOUND 0x00000001 -#define KEYWORD_HANDLER_MALFORMED_STRING 0x00000002 -#define KEYWORD_HANDLER_KEYWORD_NOT_FOUND 0x00000004 -#define KEYWORD_HANDLER_INCOMPATIBLE_VALUE_DETECTED 0x00000008 -#define KEYWORD_HANDLER_ACCESS_NOT_PERMITTED 0x00000010 -#define KEYWORD_HANDLER_UNDEFINED_PROCESSING_ERROR 0x80000000 +// *********************************************************** +#define KEYWORD_HANDLER_NO_ERROR 0x00000000 +#define KEYWORD_HANDLER_NAMESPACE_ID_NOT_FOUND 0x00000001 +#define KEYWORD_HANDLER_MALFORMED_STRING 0x00000002 +#define KEYWORD_HANDLER_KEYWORD_NOT_FOUND 0x00000004 +#define KEYWORD_HANDLER_INCOMPATIBLE_VALUE_DETECTED 0x00000008 +#define KEYWORD_HANDLER_ACCESS_NOT_PERMITTED 0x00000010 +#define KEYWORD_HANDLER_UNDEFINED_PROCESSING_ERROR 0x80000000 typedef struct _EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL; @@ -94,14 +94,13 @@ typedef struct _EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL EFI_CONFIG_KEYWORD_HANDLER_P **/ typedef EFI_STATUS -(EFIAPI *EFI_CONFIG_KEYWORD_HANDLER_SET_DATA) ( +(EFIAPI *EFI_CONFIG_KEYWORD_HANDLER_SET_DATA)( IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This, IN CONST EFI_STRING KeywordString, OUT EFI_STRING *Progress, OUT UINT32 *ProgressErr ); - /** This function accepts a formatted string, finds the underlying @@ -173,7 +172,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_CONFIG_KEYWORD_HANDLER_GET_DATA) ( +(EFIAPI *EFI_CONFIG_KEYWORD_HANDLER_GET_DATA)( IN EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL *This, IN CONST EFI_STRING NameSpaceId OPTIONAL, IN CONST EFI_STRING KeywordString OPTIONAL, @@ -189,10 +188,10 @@ EFI_STATUS /// struct _EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL { - EFI_CONFIG_KEYWORD_HANDLER_SET_DATA SetData; - EFI_CONFIG_KEYWORD_HANDLER_GET_DATA GetData; + EFI_CONFIG_KEYWORD_HANDLER_SET_DATA SetData; + EFI_CONFIG_KEYWORD_HANDLER_GET_DATA GetData; }; -extern EFI_GUID gEfiConfigKeywordHandlerProtocolGuid; +extern EFI_GUID gEfiConfigKeywordHandlerProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/HiiConfigRouting.h b/MdePkg/Include/Protocol/HiiConfigRouting.h index 7a11c2b759..23e054790f 100644 --- a/MdePkg/Include/Protocol/HiiConfigRouting.h +++ b/MdePkg/Include/Protocol/HiiConfigRouting.h @@ -20,7 +20,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define EFI_HII_CONFIG_ROUTING_PROTOCOL_GUID \ { 0x587e72d7, 0xcc50, 0x4f79, { 0x82, 0x09, 0xca, 0x29, 0x1f, 0xc1, 0xa1, 0x0f } } - typedef struct _EFI_HII_CONFIG_ROUTING_PROTOCOL EFI_HII_CONFIG_ROUTING_PROTOCOL; /** @@ -108,12 +107,12 @@ typedef struct _EFI_HII_CONFIG_ROUTING_PROTOCOL EFI_HII_CONFIG_ROUTING_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI * EFI_HII_EXTRACT_CONFIG)( +(EFIAPI *EFI_HII_EXTRACT_CONFIG)( IN CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *This, IN CONST EFI_STRING Request, OUT EFI_STRING *Progress, OUT EFI_STRING *Results -); + ); /** This function allows the caller to request the current configuration @@ -150,10 +149,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_HII_EXPORT_CONFIG)( +(EFIAPI *EFI_HII_EXPORT_CONFIG)( IN CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *This, OUT EFI_STRING *Results -); + ); /** @@ -196,12 +195,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_HII_ROUTE_CONFIG)( +(EFIAPI *EFI_HII_ROUTE_CONFIG)( IN CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *This, IN CONST EFI_STRING Configuration, OUT EFI_STRING *Progress -); - + ); /** @@ -266,16 +264,14 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_HII_BLOCK_TO_CONFIG)( +(EFIAPI *EFI_HII_BLOCK_TO_CONFIG)( IN CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *This, IN CONST EFI_STRING ConfigRequest, IN CONST UINT8 *Block, IN CONST UINTN BlockSize, OUT EFI_STRING *Config, OUT EFI_STRING *Progress -); - - + ); /** This function maps a configuration containing a series of @@ -343,13 +339,13 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_HII_CONFIG_TO_BLOCK)( +(EFIAPI *EFI_HII_CONFIG_TO_BLOCK)( IN CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *This, IN CONST EFI_STRING ConfigResp, IN OUT UINT8 *Block, IN OUT UINTN *BlockSize, OUT EFI_STRING *Progress -); + ); /** This helper function is to be called by drivers to extract portions of @@ -386,7 +382,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_HII_GET_ALT_CFG)( +(EFIAPI *EFI_HII_GET_ALT_CFG)( IN CONST EFI_HII_CONFIG_ROUTING_PROTOCOL *This, IN CONST EFI_STRING ConfigResp, IN CONST EFI_GUID *Guid, @@ -402,16 +398,14 @@ EFI_STATUS /// instance of this protocol in the system. /// struct _EFI_HII_CONFIG_ROUTING_PROTOCOL { - EFI_HII_EXTRACT_CONFIG ExtractConfig; - EFI_HII_EXPORT_CONFIG ExportConfig; - EFI_HII_ROUTE_CONFIG RouteConfig; - EFI_HII_BLOCK_TO_CONFIG BlockToConfig; - EFI_HII_CONFIG_TO_BLOCK ConfigToBlock; - EFI_HII_GET_ALT_CFG GetAltConfig; + EFI_HII_EXTRACT_CONFIG ExtractConfig; + EFI_HII_EXPORT_CONFIG ExportConfig; + EFI_HII_ROUTE_CONFIG RouteConfig; + EFI_HII_BLOCK_TO_CONFIG BlockToConfig; + EFI_HII_CONFIG_TO_BLOCK ConfigToBlock; + EFI_HII_GET_ALT_CFG GetAltConfig; }; -extern EFI_GUID gEfiHiiConfigRoutingProtocolGuid; - +extern EFI_GUID gEfiHiiConfigRoutingProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/HiiDatabase.h b/MdePkg/Include/Protocol/HiiDatabase.h index cc69e1a4dc..1084c5376e 100644 --- a/MdePkg/Include/Protocol/HiiDatabase.h +++ b/MdePkg/Include/Protocol/HiiDatabase.h @@ -16,19 +16,18 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define EFI_HII_DATABASE_PROTOCOL_GUID \ { 0xef9fc172, 0xa1b2, 0x4693, { 0xb3, 0x27, 0x6d, 0x32, 0xfc, 0x41, 0x60, 0x42 } } - typedef struct _EFI_HII_DATABASE_PROTOCOL EFI_HII_DATABASE_PROTOCOL; - /// /// EFI_HII_DATABASE_NOTIFY_TYPE. /// -typedef UINTN EFI_HII_DATABASE_NOTIFY_TYPE; +typedef UINTN EFI_HII_DATABASE_NOTIFY_TYPE; + +#define EFI_HII_DATABASE_NOTIFY_NEW_PACK 0x00000001 +#define EFI_HII_DATABASE_NOTIFY_REMOVE_PACK 0x00000002 +#define EFI_HII_DATABASE_NOTIFY_EXPORT_PACK 0x00000004 +#define EFI_HII_DATABASE_NOTIFY_ADD_PACK 0x00000008 -#define EFI_HII_DATABASE_NOTIFY_NEW_PACK 0x00000001 -#define EFI_HII_DATABASE_NOTIFY_REMOVE_PACK 0x00000002 -#define EFI_HII_DATABASE_NOTIFY_EXPORT_PACK 0x00000004 -#define EFI_HII_DATABASE_NOTIFY_ADD_PACK 0x00000008 /** Functions which are registered to receive notification of @@ -63,7 +62,7 @@ EFI_STATUS IN CONST EFI_HII_PACKAGE_HEADER *Package, IN EFI_HII_HANDLE Handle, IN EFI_HII_DATABASE_NOTIFY_TYPE NotifyType -); + ); /** @@ -105,8 +104,7 @@ EFI_STATUS IN CONST EFI_HII_PACKAGE_LIST_HEADER *PackageList, IN EFI_HANDLE DriverHandle OPTIONAL, OUT EFI_HII_HANDLE *Handle -); - + ); /** @@ -132,8 +130,7 @@ EFI_STATUS (EFIAPI *EFI_HII_DATABASE_REMOVE_PACK)( IN CONST EFI_HII_DATABASE_PROTOCOL *This, IN EFI_HII_HANDLE Handle -); - + ); /** @@ -181,8 +178,7 @@ EFI_STATUS IN CONST EFI_HII_DATABASE_PROTOCOL *This, IN EFI_HII_HANDLE Handle, IN CONST EFI_HII_PACKAGE_LIST_HEADER *PackageList -); - + ); /** @@ -235,7 +231,7 @@ EFI_STATUS IN CONST EFI_GUID *PackageGuid, IN OUT UINTN *HandleBufferLength, OUT EFI_HII_HANDLE *Handle -); + ); /** @@ -285,8 +281,7 @@ EFI_STATUS IN EFI_HII_HANDLE Handle, IN OUT UINTN *BufferSize, OUT EFI_HII_PACKAGE_LIST_HEADER *Buffer -); - + ); /** @@ -348,8 +343,7 @@ EFI_STATUS IN EFI_HII_DATABASE_NOTIFY PackageNotifyFn, IN EFI_HII_DATABASE_NOTIFY_TYPE NotifyType, OUT EFI_HANDLE *NotifyHandle -); - + ); /** @@ -371,8 +365,7 @@ EFI_STATUS (EFIAPI *EFI_HII_DATABASE_UNREGISTER_NOTIFY)( IN CONST EFI_HII_DATABASE_PROTOCOL *This, IN EFI_HANDLE NotificationHandle -); - + ); /** @@ -412,8 +405,7 @@ EFI_STATUS IN CONST EFI_HII_DATABASE_PROTOCOL *This, IN OUT UINT16 *KeyGuidBufferLength, OUT EFI_GUID *KeyGuidBuffer -); - + ); /** @@ -448,7 +440,7 @@ EFI_STATUS IN CONST EFI_GUID *KeyGuid, IN OUT UINT16 *KeyboardLayoutLength, OUT EFI_HII_KEYBOARD_LAYOUT *KeyboardLayout -); + ); /** @@ -475,7 +467,7 @@ EFI_STATUS (EFIAPI *EFI_HII_SET_KEYBOARD_LAYOUT)( IN CONST EFI_HII_DATABASE_PROTOCOL *This, IN CONST EFI_GUID *KeyGuid -); + ); /** @@ -502,25 +494,25 @@ EFI_STATUS IN CONST EFI_HII_DATABASE_PROTOCOL *This, IN EFI_HII_HANDLE PackageListHandle, OUT EFI_HANDLE *DriverHandle -); + ); /// /// Database manager for HII-related data structures. /// struct _EFI_HII_DATABASE_PROTOCOL { - EFI_HII_DATABASE_NEW_PACK NewPackageList; - EFI_HII_DATABASE_REMOVE_PACK RemovePackageList; - EFI_HII_DATABASE_UPDATE_PACK UpdatePackageList; - EFI_HII_DATABASE_LIST_PACKS ListPackageLists; - EFI_HII_DATABASE_EXPORT_PACKS ExportPackageLists; - EFI_HII_DATABASE_REGISTER_NOTIFY RegisterPackageNotify; - EFI_HII_DATABASE_UNREGISTER_NOTIFY UnregisterPackageNotify; - EFI_HII_FIND_KEYBOARD_LAYOUTS FindKeyboardLayouts; - EFI_HII_GET_KEYBOARD_LAYOUT GetKeyboardLayout; - EFI_HII_SET_KEYBOARD_LAYOUT SetKeyboardLayout; - EFI_HII_DATABASE_GET_PACK_HANDLE GetPackageListHandle; + EFI_HII_DATABASE_NEW_PACK NewPackageList; + EFI_HII_DATABASE_REMOVE_PACK RemovePackageList; + EFI_HII_DATABASE_UPDATE_PACK UpdatePackageList; + EFI_HII_DATABASE_LIST_PACKS ListPackageLists; + EFI_HII_DATABASE_EXPORT_PACKS ExportPackageLists; + EFI_HII_DATABASE_REGISTER_NOTIFY RegisterPackageNotify; + EFI_HII_DATABASE_UNREGISTER_NOTIFY UnregisterPackageNotify; + EFI_HII_FIND_KEYBOARD_LAYOUTS FindKeyboardLayouts; + EFI_HII_GET_KEYBOARD_LAYOUT GetKeyboardLayout; + EFI_HII_SET_KEYBOARD_LAYOUT SetKeyboardLayout; + EFI_HII_DATABASE_GET_PACK_HANDLE GetPackageListHandle; }; -extern EFI_GUID gEfiHiiDatabaseProtocolGuid; +extern EFI_GUID gEfiHiiDatabaseProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/HiiFont.h b/MdePkg/Include/Protocol/HiiFont.h index 539d45ff8f..596e1011b3 100644 --- a/MdePkg/Include/Protocol/HiiFont.h +++ b/MdePkg/Include/Protocol/HiiFont.h @@ -20,21 +20,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent typedef struct _EFI_HII_FONT_PROTOCOL EFI_HII_FONT_PROTOCOL; -typedef VOID *EFI_FONT_HANDLE; +typedef VOID *EFI_FONT_HANDLE; /// /// EFI_HII_OUT_FLAGS. /// -typedef UINT32 EFI_HII_OUT_FLAGS; +typedef UINT32 EFI_HII_OUT_FLAGS; -#define EFI_HII_OUT_FLAG_CLIP 0x00000001 -#define EFI_HII_OUT_FLAG_WRAP 0x00000002 -#define EFI_HII_OUT_FLAG_CLIP_CLEAN_Y 0x00000004 -#define EFI_HII_OUT_FLAG_CLIP_CLEAN_X 0x00000008 -#define EFI_HII_OUT_FLAG_TRANSPARENT 0x00000010 -#define EFI_HII_IGNORE_IF_NO_GLYPH 0x00000020 -#define EFI_HII_IGNORE_LINE_BREAK 0x00000040 -#define EFI_HII_DIRECT_TO_SCREEN 0x00000080 +#define EFI_HII_OUT_FLAG_CLIP 0x00000001 +#define EFI_HII_OUT_FLAG_WRAP 0x00000002 +#define EFI_HII_OUT_FLAG_CLIP_CLEAN_Y 0x00000004 +#define EFI_HII_OUT_FLAG_CLIP_CLEAN_X 0x00000008 +#define EFI_HII_OUT_FLAG_TRANSPARENT 0x00000010 +#define EFI_HII_IGNORE_IF_NO_GLYPH 0x00000020 +#define EFI_HII_IGNORE_LINE_BREAK 0x00000040 +#define EFI_HII_DIRECT_TO_SCREEN 0x00000080 /** Definition of EFI_HII_ROW_INFO. @@ -43,26 +43,26 @@ typedef struct _EFI_HII_ROW_INFO { /// /// The index of the first character in the string which is displayed on the line. /// - UINTN StartIndex; + UINTN StartIndex; /// /// The index of the last character in the string which is displayed on the line. /// If this is the same as StartIndex, then no characters are displayed. /// - UINTN EndIndex; - UINTN LineHeight; ///< The height of the line, in pixels. - UINTN LineWidth; ///< The width of the text on the line, in pixels. + UINTN EndIndex; + UINTN LineHeight; ///< The height of the line, in pixels. + UINTN LineWidth; ///< The width of the text on the line, in pixels. /// /// The font baseline offset in pixels from the bottom of the row, or 0 if none. /// - UINTN BaselineOffset; + UINTN BaselineOffset; } EFI_HII_ROW_INFO; /// /// Font info flag. All flags (FONT, SIZE, STYLE, and COLOR) are defined. /// They are defined as EFI_FONT_INFO_*** /// -typedef UINT32 EFI_FONT_INFO_MASK; +typedef UINT32 EFI_FONT_INFO_MASK; #define EFI_FONT_INFO_SYS_FONT 0x00000001 #define EFI_FONT_INFO_SYS_SIZE 0x00000002 @@ -79,9 +79,9 @@ typedef UINT32 EFI_FONT_INFO_MASK; // EFI_FONT_INFO // typedef struct { - EFI_HII_FONT_STYLE FontStyle; - UINT16 FontSize; ///< character cell height in pixels - CHAR16 FontName[1]; + EFI_HII_FONT_STYLE FontStyle; + UINT16 FontSize; ///< character cell height in pixels + CHAR16 FontName[1]; } EFI_FONT_INFO; /** @@ -97,10 +97,10 @@ typedef struct { font requested and the font available. **/ typedef struct _EFI_FONT_DISPLAY_INFO { - EFI_GRAPHICS_OUTPUT_BLT_PIXEL ForegroundColor; - EFI_GRAPHICS_OUTPUT_BLT_PIXEL BackgroundColor; - EFI_FONT_INFO_MASK FontInfoMask; - EFI_FONT_INFO FontInfo; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL ForegroundColor; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL BackgroundColor; + EFI_FONT_INFO_MASK FontInfoMask; + EFI_FONT_INFO FontInfo; } EFI_FONT_DISPLAY_INFO; /** @@ -220,9 +220,7 @@ EFI_STATUS OUT EFI_HII_ROW_INFO **RowInfoArray OPTIONAL, OUT UINTN *RowInfoArraySize OPTIONAL, OUT UINTN *ColumnInfoArray OPTIONAL -); - - + ); /** @@ -358,8 +356,7 @@ EFI_STATUS OUT EFI_HII_ROW_INFO **RowInfoArray OPTIONAL, OUT UINTN *RowInfoArraySize OPTIONAL, OUT UINTN *ColumnInfoArray OPTIONAL -); - + ); /** @@ -403,7 +400,7 @@ EFI_STATUS IN CONST EFI_FONT_DISPLAY_INFO *StringInfo, OUT EFI_IMAGE_OUTPUT **Blt, OUT UINTN *Baseline OPTIONAL -); + ); /** @@ -450,19 +447,18 @@ EFI_STATUS IN CONST EFI_FONT_DISPLAY_INFO *StringInfoIn OPTIONAL, OUT EFI_FONT_DISPLAY_INFO **StringInfoOut, IN CONST EFI_STRING String OPTIONAL -); + ); /// /// The protocol provides the service to retrieve the font informations. /// struct _EFI_HII_FONT_PROTOCOL { - EFI_HII_STRING_TO_IMAGE StringToImage; - EFI_HII_STRING_ID_TO_IMAGE StringIdToImage; - EFI_HII_GET_GLYPH GetGlyph; - EFI_HII_GET_FONT_INFO GetFontInfo; + EFI_HII_STRING_TO_IMAGE StringToImage; + EFI_HII_STRING_ID_TO_IMAGE StringIdToImage; + EFI_HII_GET_GLYPH GetGlyph; + EFI_HII_GET_FONT_INFO GetFontInfo; }; -extern EFI_GUID gEfiHiiFontProtocolGuid; - +extern EFI_GUID gEfiHiiFontProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/HiiImage.h b/MdePkg/Include/Protocol/HiiImage.h index d72ac76bbc..14cf28f873 100644 --- a/MdePkg/Include/Protocol/HiiImage.h +++ b/MdePkg/Include/Protocol/HiiImage.h @@ -19,11 +19,10 @@ typedef struct _EFI_HII_IMAGE_PROTOCOL EFI_HII_IMAGE_PROTOCOL; - /// /// Flags in EFI_IMAGE_INPUT /// -#define EFI_IMAGE_TRANSPARENT 0x00000001 +#define EFI_IMAGE_TRANSPARENT 0x00000001 /** @@ -44,13 +43,12 @@ typedef struct _EFI_HII_IMAGE_PROTOCOL EFI_HII_IMAGE_PROTOCOL; **/ typedef struct _EFI_IMAGE_INPUT { - UINT32 Flags; - UINT16 Width; - UINT16 Height; - EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Bitmap; + UINT32 Flags; + UINT16 Width; + UINT16 Height; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Bitmap; } EFI_IMAGE_INPUT; - /** This function adds the image Image to the group of images @@ -83,7 +81,7 @@ EFI_STATUS IN EFI_HII_HANDLE PackageList, OUT EFI_IMAGE_ID *ImageId, IN CONST EFI_IMAGE_INPUT *Image -); + ); /** @@ -125,7 +123,7 @@ EFI_STATUS IN EFI_HII_HANDLE PackageList, IN EFI_IMAGE_ID ImageId, OUT EFI_IMAGE_INPUT *Image -); + ); /** @@ -156,14 +154,13 @@ EFI_STATUS IN EFI_HII_HANDLE PackageList, IN EFI_IMAGE_ID ImageId, IN CONST EFI_IMAGE_INPUT *Image -); - + ); /// /// EFI_HII_DRAW_FLAGS describes how the image is to be drawn. /// These flags are defined as EFI_HII_DRAW_FLAG_*** /// -typedef UINT32 EFI_HII_DRAW_FLAGS; +typedef UINT32 EFI_HII_DRAW_FLAGS; #define EFI_HII_DRAW_FLAG_CLIP 0x00000001 #define EFI_HII_DRAW_FLAG_TRANSPARENT 0x00000030 @@ -188,15 +185,14 @@ typedef UINT32 EFI_HII_DRAW_FLAGS; **/ typedef struct _EFI_IMAGE_OUTPUT { - UINT16 Width; - UINT16 Height; + UINT16 Width; + UINT16 Height; union { - EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Bitmap; - EFI_GRAPHICS_OUTPUT_PROTOCOL *Screen; + EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Bitmap; + EFI_GRAPHICS_OUTPUT_PROTOCOL *Screen; } Image; } EFI_IMAGE_OUTPUT; - /** This function renders an image to a bitmap or the screen using @@ -253,7 +249,7 @@ EFI_STATUS IN OUT EFI_IMAGE_OUTPUT **Blt, IN UINTN BltX, IN UINTN BltY -); + ); /** @@ -325,29 +321,26 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_HII_DRAW_IMAGE_ID)( -IN CONST EFI_HII_IMAGE_PROTOCOL *This, -IN EFI_HII_DRAW_FLAGS Flags, -IN EFI_HII_HANDLE PackageList, -IN EFI_IMAGE_ID ImageId, -IN OUT EFI_IMAGE_OUTPUT **Blt, -IN UINTN BltX, -IN UINTN BltY -); - + IN CONST EFI_HII_IMAGE_PROTOCOL *This, + IN EFI_HII_DRAW_FLAGS Flags, + IN EFI_HII_HANDLE PackageList, + IN EFI_IMAGE_ID ImageId, + IN OUT EFI_IMAGE_OUTPUT **Blt, + IN UINTN BltX, + IN UINTN BltY + ); /// /// Services to access to images in the images database. /// struct _EFI_HII_IMAGE_PROTOCOL { - EFI_HII_NEW_IMAGE NewImage; - EFI_HII_GET_IMAGE GetImage; - EFI_HII_SET_IMAGE SetImage; - EFI_HII_DRAW_IMAGE DrawImage; - EFI_HII_DRAW_IMAGE_ID DrawImageId; + EFI_HII_NEW_IMAGE NewImage; + EFI_HII_GET_IMAGE GetImage; + EFI_HII_SET_IMAGE SetImage; + EFI_HII_DRAW_IMAGE DrawImage; + EFI_HII_DRAW_IMAGE_ID DrawImageId; }; -extern EFI_GUID gEfiHiiImageProtocolGuid; +extern EFI_GUID gEfiHiiImageProtocolGuid; #endif - - diff --git a/MdePkg/Include/Protocol/HiiImageDecoder.h b/MdePkg/Include/Protocol/HiiImageDecoder.h index 3e035a0682..bb1dce92e6 100644 --- a/MdePkg/Include/Protocol/HiiImageDecoder.h +++ b/MdePkg/Include/Protocol/HiiImageDecoder.h @@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent This Protocol was introduced in UEFI Specification 2.6. **/ + #ifndef __HII_IMAGE_DECODER_H__ #define __HII_IMAGE_DECODER_H__ @@ -18,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define EFI_HII_IMAGE_DECODER_PROTOCOL_GUID \ {0x9e66f251, 0x727c, 0x418c, { 0xbf, 0xd6, 0xc2, 0xb4, 0x25, 0x28, 0x18, 0xea }} - #define EFI_HII_IMAGE_DECODER_NAME_JPEG_GUID \ {0xefefd093, 0xd9b, 0x46eb, { 0xa8, 0x56, 0x48, 0x35, 0x7, 0x0, 0xc9, 0x8 }} @@ -53,8 +53,8 @@ typedef struct _EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER { UINT8 ColorDepthInBits; } EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER; -#define EFI_IMAGE_JPEG_SCANTYPE_PROGREESSIVE 0x01 -#define EFI_IMAGE_JPEG_SCANTYPE_INTERLACED 0x02 +#define EFI_IMAGE_JPEG_SCANTYPE_PROGREESSIVE 0x01 +#define EFI_IMAGE_JPEG_SCANTYPE_INTERLACED 0x02 // // EFI_HII_IMAGE_DECODER_JPEG_INFO @@ -63,9 +63,9 @@ typedef struct _EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER { // Reserved Reserved // typedef struct _EFI_HII_IMAGE_DECODER_JPEG_INFO { - EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER Header; - UINT16 ScanType; - UINT64 Reserved; + EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER Header; + UINT16 ScanType; + UINT64 Reserved; } EFI_HII_IMAGE_DECODER_JPEG_INFO; // @@ -75,17 +75,17 @@ typedef struct _EFI_HII_IMAGE_DECODER_JPEG_INFO { // Reserved Reserved // typedef struct _EFI_HII_IMAGE_DECODER_PNG_INFO { - EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER Header; - UINT16 Channels; - UINT64 Reserved; + EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER Header; + UINT16 Channels; + UINT64 Reserved; } EFI_HII_IMAGE_DECODER_PNG_INFO; // // EFI_HII_IMAGE_DECODER_OTHER_INFO // typedef struct _EFI_HII_IMAGE_DECODER_OTHER_INFO { - EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER Header; - CHAR16 ImageExtenion[1]; + EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER Header; + CHAR16 ImageExtenion[1]; // // Variable length of image file extension name. // @@ -193,8 +193,8 @@ struct _EFI_HII_IMAGE_DECODER_PROTOCOL { EFI_HII_IMAGE_DECODER_DECODE DecodeImage; }; -extern EFI_GUID gEfiHiiImageDecoderProtocolGuid; -extern EFI_GUID gEfiHiiImageDecoderNameJpegGuid; -extern EFI_GUID gEfiHiiImageDecoderNamePngGuid; +extern EFI_GUID gEfiHiiImageDecoderProtocolGuid; +extern EFI_GUID gEfiHiiImageDecoderNameJpegGuid; +extern EFI_GUID gEfiHiiImageDecoderNamePngGuid; #endif diff --git a/MdePkg/Include/Protocol/HiiImageEx.h b/MdePkg/Include/Protocol/HiiImageEx.h index ffdd9bf654..1e5a565da4 100644 --- a/MdePkg/Include/Protocol/HiiImageEx.h +++ b/MdePkg/Include/Protocol/HiiImageEx.h @@ -235,14 +235,14 @@ EFI_STATUS /// Protocol which allows access to the images in the images database. /// struct _EFI_HII_IMAGE_EX_PROTOCOL { - EFI_HII_NEW_IMAGE_EX NewImageEx; - EFI_HII_GET_IMAGE_EX GetImageEx; - EFI_HII_SET_IMAGE_EX SetImageEx; - EFI_HII_DRAW_IMAGE_EX DrawImageEx; - EFI_HII_DRAW_IMAGE_ID_EX DrawImageIdEx; - EFI_HII_GET_IMAGE_INFO GetImageInfo; + EFI_HII_NEW_IMAGE_EX NewImageEx; + EFI_HII_GET_IMAGE_EX GetImageEx; + EFI_HII_SET_IMAGE_EX SetImageEx; + EFI_HII_DRAW_IMAGE_EX DrawImageEx; + EFI_HII_DRAW_IMAGE_ID_EX DrawImageIdEx; + EFI_HII_GET_IMAGE_INFO GetImageInfo; }; -extern EFI_GUID gEfiHiiImageExProtocolGuid; +extern EFI_GUID gEfiHiiImageExProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/HiiPackageList.h b/MdePkg/Include/Protocol/HiiPackageList.h index 865d8d873c..5267e45872 100644 --- a/MdePkg/Include/Protocol/HiiPackageList.h +++ b/MdePkg/Include/Protocol/HiiPackageList.h @@ -16,12 +16,8 @@ #define EFI_HII_PACKAGE_LIST_PROTOCOL_GUID \ { 0x6a1ee763, 0xd47a, 0x43b4, {0xaa, 0xbe, 0xef, 0x1d, 0xe2, 0xab, 0x56, 0xfc}} -typedef EFI_HII_PACKAGE_LIST_HEADER * EFI_HII_PACKAGE_LIST_PROTOCOL; - -extern EFI_GUID gEfiHiiPackageListProtocolGuid; - +typedef EFI_HII_PACKAGE_LIST_HEADER *EFI_HII_PACKAGE_LIST_PROTOCOL; +extern EFI_GUID gEfiHiiPackageListProtocolGuid; #endif - - diff --git a/MdePkg/Include/Protocol/HiiPopup.h b/MdePkg/Include/Protocol/HiiPopup.h index 8e217071d7..c3d47b00b2 100644 --- a/MdePkg/Include/Protocol/HiiPopup.h +++ b/MdePkg/Include/Protocol/HiiPopup.h @@ -16,7 +16,7 @@ #define EFI_HII_POPUP_PROTOCOL_GUID \ {0x4311edc0, 0x6054, 0x46d4, {0x9e, 0x40, 0x89, 0x3e, 0xa9, 0x52, 0xfc, 0xcc}} -#define EFI_HII_POPUP_PROTOCOL_REVISION 1 +#define EFI_HII_POPUP_PROTOCOL_REVISION 1 typedef struct _EFI_HII_POPUP_PROTOCOL EFI_HII_POPUP_PROTOCOL; @@ -58,21 +58,20 @@ typedef enum { **/ typedef EFI_STATUS -(EFIAPI * EFI_HII_CREATE_POPUP) ( +(EFIAPI *EFI_HII_CREATE_POPUP)( IN EFI_HII_POPUP_PROTOCOL *This, IN EFI_HII_POPUP_STYLE PopupStyle, IN EFI_HII_POPUP_TYPE PopupType, IN EFI_HII_HANDLE HiiHandle, IN EFI_STRING_ID Message, OUT EFI_HII_POPUP_SELECTION *UserSelection OPTIONAL -); + ); struct _EFI_HII_POPUP_PROTOCOL { - UINT64 Revision; - EFI_HII_CREATE_POPUP CreatePopup; + UINT64 Revision; + EFI_HII_CREATE_POPUP CreatePopup; }; -extern EFI_GUID gEfiHiiPopupProtocolGuid; +extern EFI_GUID gEfiHiiPopupProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/HiiString.h b/MdePkg/Include/Protocol/HiiString.h index ade4121358..914934132d 100644 --- a/MdePkg/Include/Protocol/HiiString.h +++ b/MdePkg/Include/Protocol/HiiString.h @@ -61,8 +61,7 @@ EFI_STATUS IN CONST CHAR16 *LanguageName OPTIONAL, IN CONST EFI_STRING String, IN CONST EFI_FONT_INFO *StringFontInfo OPTIONAL -); - + ); /** This function retrieves the string specified by StringId which is associated @@ -107,7 +106,7 @@ EFI_STATUS OUT EFI_STRING String, IN OUT UINTN *StringSize, OUT EFI_FONT_INFO **StringFontInfo OPTIONAL -); + ); /** This function updates the string specified by StringId in the specified PackageList to the text @@ -141,8 +140,7 @@ EFI_STATUS IN CONST CHAR8 *Language, IN EFI_STRING String, IN CONST EFI_FONT_INFO *StringFontInfo OPTIONAL -); - + ); /** This function returns the list of supported languages. @@ -173,8 +171,7 @@ EFI_STATUS IN EFI_HII_HANDLE PackageList, IN OUT CHAR8 *Languages, IN OUT UINTN *LanguagesSize -); - + ); /** Each string package has associated with it a single primary language and zero @@ -217,21 +214,19 @@ EFI_STATUS IN CONST CHAR8 *PrimaryLanguage, IN OUT CHAR8 *SecondaryLanguages, IN OUT UINTN *SecondaryLanguagesSize -); - + ); /// /// Services to manipulate the string. /// struct _EFI_HII_STRING_PROTOCOL { - EFI_HII_NEW_STRING NewString; - EFI_HII_GET_STRING GetString; - EFI_HII_SET_STRING SetString; - EFI_HII_GET_LANGUAGES GetLanguages; - EFI_HII_GET_2ND_LANGUAGES GetSecondaryLanguages; + EFI_HII_NEW_STRING NewString; + EFI_HII_GET_STRING GetString; + EFI_HII_SET_STRING SetString; + EFI_HII_GET_LANGUAGES GetLanguages; + EFI_HII_GET_2ND_LANGUAGES GetSecondaryLanguages; }; - -extern EFI_GUID gEfiHiiStringProtocolGuid; +extern EFI_GUID gEfiHiiStringProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Http.h b/MdePkg/Include/Protocol/Http.h index 8347363e4e..28e6221593 100644 --- a/MdePkg/Include/Protocol/Http.h +++ b/MdePkg/Include/Protocol/Http.h @@ -110,22 +110,22 @@ typedef struct { /// information in every TCP connection made by this instance. In addition, when set /// to TRUE, LocalAddress and LocalSubnet are ignored. /// - BOOLEAN UseDefaultAddress; + BOOLEAN UseDefaultAddress; /// /// If UseDefaultAddress is set to FALSE, this defines the local IP address to be /// used in every TCP connection opened by this instance. /// - EFI_IPv4_ADDRESS LocalAddress; + EFI_IPv4_ADDRESS LocalAddress; /// /// If UseDefaultAddress is set to FALSE, this defines the local subnet to be used /// in every TCP connection opened by this instance. /// - EFI_IPv4_ADDRESS LocalSubnet; + EFI_IPv4_ADDRESS LocalSubnet; /// /// This defines the local port to be used in /// every TCP connection opened by this instance. /// - UINT16 LocalPort; + UINT16 LocalPort; } EFI_HTTPv4_ACCESS_POINT; /// @@ -135,45 +135,44 @@ typedef struct { /// /// Local IP address to be used in every TCP connection opened by this instance. /// - EFI_IPv6_ADDRESS LocalAddress; + EFI_IPv6_ADDRESS LocalAddress; /// /// Local port to be used in every TCP connection opened by this instance. /// - UINT16 LocalPort; + UINT16 LocalPort; } EFI_HTTPv6_ACCESS_POINT; /// /// EFI_HTTP_CONFIG_DATA_ACCESS_POINT /// - typedef struct { /// /// HTTP version that this instance will support. /// - EFI_HTTP_VERSION HttpVersion; + EFI_HTTP_VERSION HttpVersion; /// /// Time out (in milliseconds) when blocking for requests. /// - UINT32 TimeOutMillisec; + UINT32 TimeOutMillisec; /// /// Defines behavior of EFI DNS and TCP protocols consumed by this instance. If /// FALSE, this instance will use EFI_DNS4_PROTOCOL and EFI_TCP4_PROTOCOL. If TRUE, /// this instance will use EFI_DNS6_PROTOCOL and EFI_TCP6_PROTOCOL. /// - BOOLEAN LocalAddressIsIPv6; + BOOLEAN LocalAddressIsIPv6; union { /// /// When LocalAddressIsIPv6 is FALSE, this points to the local address, subnet, and /// port used by the underlying TCP protocol. /// - EFI_HTTPv4_ACCESS_POINT *IPv4Node; + EFI_HTTPv4_ACCESS_POINT *IPv4Node; /// /// When LocalAddressIsIPv6 is TRUE, this points to the local IPv6 address and port /// used by the underlying TCP protocol. /// - EFI_HTTPv6_ACCESS_POINT *IPv6Node; + EFI_HTTPv6_ACCESS_POINT *IPv6Node; } AccessPoint; } EFI_HTTP_CONFIG_DATA; @@ -184,14 +183,14 @@ typedef struct { /// /// The HTTP method (e.g. GET, POST) for this HTTP Request. /// - EFI_HTTP_METHOD Method; + EFI_HTTP_METHOD Method; /// /// The URI of a remote host. From the information in this field, the HTTP instance /// will be able to determine whether to use HTTP or HTTPS and will also be able to /// determine the port number to use. If no port number is specified, port 80 (HTTP) /// is assumed. See RFC 3986 for more details on URI syntax. /// - CHAR16 *Url; + CHAR16 *Url; } EFI_HTTP_REQUEST_DATA; /// @@ -201,7 +200,7 @@ typedef struct { /// /// Response status code returned by the remote host. /// - EFI_HTTP_STATUS_CODE StatusCode; + EFI_HTTP_STATUS_CODE StatusCode; } EFI_HTTP_RESPONSE_DATA; /// @@ -212,12 +211,12 @@ typedef struct { /// Null terminated string which describes a field name. See RFC 2616 Section 14 for /// detailed information about field names. /// - CHAR8 *FieldName; + CHAR8 *FieldName; /// /// Null terminated string which describes the corresponding field value. See RFC 2616 /// Section 14 for detailed information about field values. /// - CHAR8 *FieldValue; + CHAR8 *FieldValue; } EFI_HTTP_HEADER; /// @@ -232,37 +231,36 @@ typedef struct { /// When the token is used to send a HTTP request, Request is a pointer to storage that /// contains such data as URL and HTTP method. /// - EFI_HTTP_REQUEST_DATA *Request; + EFI_HTTP_REQUEST_DATA *Request; /// /// When used to await a response, Response points to storage containing HTTP response /// status code. /// - EFI_HTTP_RESPONSE_DATA *Response; + EFI_HTTP_RESPONSE_DATA *Response; } Data; /// /// Number of HTTP header structures in Headers list. On request, this count is /// provided by the caller. On response, this count is provided by the HTTP driver. /// - UINTN HeaderCount; + UINTN HeaderCount; /// /// Array containing list of HTTP headers. On request, this array is populated by the /// caller. On response, this array is allocated and populated by the HTTP driver. It /// is the responsibility of the caller to free this memory on both request and /// response. /// - EFI_HTTP_HEADER *Headers; + EFI_HTTP_HEADER *Headers; /// /// Length in bytes of the HTTP body. This can be zero depending on the HttpMethod type. /// - UINTN BodyLength; + UINTN BodyLength; /// /// Body associated with the HTTP request or response. This can be NULL depending on /// the HttpMethod type. /// - VOID *Body; + VOID *Body; } EFI_HTTP_MESSAGE; - /// /// EFI_HTTP_TOKEN /// @@ -272,7 +270,7 @@ typedef struct { /// Protocol driver. The type of Event must be EFI_NOTIFY_SIGNAL. The Task Priority /// Level (TPL) of Event must be lower than or equal to TPL_CALLBACK. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Status will be set to one of the following value if the HTTP request is /// successfully sent or if an unexpected error occurs: @@ -284,11 +282,11 @@ typedef struct { /// EFI_TIMEOUT: The HTTP request timed out before reaching the remote host. /// EFI_DEVICE_ERROR: An unexpected system or network error occurred. /// - EFI_STATUS Status; + EFI_STATUS Status; /// /// Pointer to storage containing HTTP message data. /// - EFI_HTTP_MESSAGE *Message; + EFI_HTTP_MESSAGE *Message; } EFI_HTTP_TOKEN; /** @@ -383,7 +381,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_HTTP_REQUEST) ( +(EFIAPI *EFI_HTTP_REQUEST)( IN EFI_HTTP_PROTOCOL *This, IN EFI_HTTP_TOKEN *Token ); @@ -465,7 +463,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_HTTP_RESPONSE) ( +(EFIAPI *EFI_HTTP_RESPONSE)( IN EFI_HTTP_PROTOCOL *This, IN EFI_HTTP_TOKEN *Token ); @@ -491,7 +489,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_HTTP_POLL) ( +(EFIAPI *EFI_HTTP_POLL)( IN EFI_HTTP_PROTOCOL *This ); @@ -502,15 +500,15 @@ EFI_STATUS /// TCP protocol. /// struct _EFI_HTTP_PROTOCOL { - EFI_HTTP_GET_MODE_DATA GetModeData; - EFI_HTTP_CONFIGURE Configure; - EFI_HTTP_REQUEST Request; - EFI_HTTP_CANCEL Cancel; - EFI_HTTP_RESPONSE Response; - EFI_HTTP_POLL Poll; + EFI_HTTP_GET_MODE_DATA GetModeData; + EFI_HTTP_CONFIGURE Configure; + EFI_HTTP_REQUEST Request; + EFI_HTTP_CANCEL Cancel; + EFI_HTTP_RESPONSE Response; + EFI_HTTP_POLL Poll; }; -extern EFI_GUID gEfiHttpServiceBindingProtocolGuid; -extern EFI_GUID gEfiHttpProtocolGuid; +extern EFI_GUID gEfiHttpServiceBindingProtocolGuid; +extern EFI_GUID gEfiHttpProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/HttpBootCallback.h b/MdePkg/Include/Protocol/HttpBootCallback.h index 2e3518bd00..926f6c1b30 100644 --- a/MdePkg/Include/Protocol/HttpBootCallback.h +++ b/MdePkg/Include/Protocol/HttpBootCallback.h @@ -17,7 +17,7 @@ 0xba23b311, 0x343d, 0x11e6, {0x91, 0x85, 0x58, 0x20, 0xb1, 0xd6, 0x52, 0x99} \ } -typedef struct _EFI_HTTP_BOOT_CALLBACK_PROTOCOL EFI_HTTP_BOOT_CALLBACK_PROTOCOL; +typedef struct _EFI_HTTP_BOOT_CALLBACK_PROTOCOL EFI_HTTP_BOOT_CALLBACK_PROTOCOL; /// /// EFI_HTTP_BOOT_CALLBACK_DATA_TYPE @@ -72,13 +72,13 @@ typedef enum { **/ typedef EFI_STATUS -(EFIAPI * EFI_HTTP_BOOT_CALLBACK) ( +(EFIAPI *EFI_HTTP_BOOT_CALLBACK)( IN EFI_HTTP_BOOT_CALLBACK_PROTOCOL *This, IN EFI_HTTP_BOOT_CALLBACK_DATA_TYPE DataType, IN BOOLEAN Received, IN UINT32 DataLength, IN VOID *Data OPTIONAL - ); + ); /// /// EFI HTTP Boot Callback Protocol is invoked when the HTTP Boot driver is about to transmit or @@ -86,9 +86,9 @@ EFI_STATUS /// as the Load File Protocol for the HTTP Boot. /// struct _EFI_HTTP_BOOT_CALLBACK_PROTOCOL { - EFI_HTTP_BOOT_CALLBACK Callback; + EFI_HTTP_BOOT_CALLBACK Callback; }; -extern EFI_GUID gEfiHttpBootCallbackProtocolGuid; +extern EFI_GUID gEfiHttpBootCallbackProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/HttpUtilities.h b/MdePkg/Include/Protocol/HttpUtilities.h index 6fd45e2194..05ed4d7b65 100644 --- a/MdePkg/Include/Protocol/HttpUtilities.h +++ b/MdePkg/Include/Protocol/HttpUtilities.h @@ -22,7 +22,6 @@ typedef struct _EFI_HTTP_UTILITIES_PROTOCOL EFI_HTTP_UTILITIES_PROTOCOL; - /** Create HTTP header based on a combination of seed header, fields to delete, and fields to append. @@ -57,7 +56,7 @@ typedef struct _EFI_HTTP_UTILITIES_PROTOCOL EFI_HTTP_UTILITIES_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_HTTP_UTILS_BUILD) ( +(EFIAPI *EFI_HTTP_UTILS_BUILD)( IN EFI_HTTP_UTILITIES_PROTOCOL *This, IN UINTN SeedMessageSize, IN VOID *SeedMessage OPTIONAL, @@ -92,7 +91,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_HTTP_UTILS_PARSE) ( +(EFIAPI *EFI_HTTP_UTILS_PARSE)( IN EFI_HTTP_UTILITIES_PROTOCOL *This, IN CHAR8 *HttpMessage, IN UINTN HttpMessageSize, @@ -100,7 +99,6 @@ EFI_STATUS OUT UINTN *FieldCount ); - /// /// EFI_HTTP_UTILITIES_PROTOCOL /// designed to be used by EFI drivers and applications to parse HTTP @@ -109,10 +107,10 @@ EFI_STATUS /// infrastructure. /// struct _EFI_HTTP_UTILITIES_PROTOCOL { - EFI_HTTP_UTILS_BUILD Build; - EFI_HTTP_UTILS_PARSE Parse; + EFI_HTTP_UTILS_BUILD Build; + EFI_HTTP_UTILS_PARSE Parse; }; -extern EFI_GUID gEfiHttpUtilitiesProtocolGuid; +extern EFI_GUID gEfiHttpUtilitiesProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/I2cBusConfigurationManagement.h b/MdePkg/Include/Protocol/I2cBusConfigurationManagement.h index ca784a7ed9..fb139de8ed 100644 --- a/MdePkg/Include/Protocol/I2cBusConfigurationManagement.h +++ b/MdePkg/Include/Protocol/I2cBusConfigurationManagement.h @@ -86,7 +86,6 @@ /// typedef struct _EFI_I2C_BUS_CONFIGURATION_MANAGEMENT_PROTOCOL EFI_I2C_BUS_CONFIGURATION_MANAGEMENT_PROTOCOL; - /** Enable access to an I2C bus configuration. @@ -140,7 +139,7 @@ typedef struct _EFI_I2C_BUS_CONFIGURATION_MANAGEMENT_PROTOCOL EFI_I2C_BUS_CONFIG **/ typedef EFI_STATUS -(EFIAPI *EFI_I2C_BUS_CONFIGURATION_MANAGEMENT_PROTOCOL_ENABLE_I2C_BUS_CONFIGURATION) ( +(EFIAPI *EFI_I2C_BUS_CONFIGURATION_MANAGEMENT_PROTOCOL_ENABLE_I2C_BUS_CONFIGURATION)( IN CONST EFI_I2C_BUS_CONFIGURATION_MANAGEMENT_PROTOCOL *This, IN UINTN I2cBusConfiguration, IN EFI_EVENT Event OPTIONAL, @@ -154,12 +153,12 @@ struct _EFI_I2C_BUS_CONFIGURATION_MANAGEMENT_PROTOCOL { /// /// Enable an I2C bus configuration for use. /// - EFI_I2C_BUS_CONFIGURATION_MANAGEMENT_PROTOCOL_ENABLE_I2C_BUS_CONFIGURATION EnableI2cBusConfiguration; + EFI_I2C_BUS_CONFIGURATION_MANAGEMENT_PROTOCOL_ENABLE_I2C_BUS_CONFIGURATION EnableI2cBusConfiguration; }; /// /// Reference to variable defined in the .DEC file /// -extern EFI_GUID gEfiI2cBusConfigurationManagementProtocolGuid; +extern EFI_GUID gEfiI2cBusConfigurationManagementProtocolGuid; -#endif // __I2C_BUS_CONFIGURATION_MANAGEMENT_H__ +#endif // __I2C_BUS_CONFIGURATION_MANAGEMENT_H__ diff --git a/MdePkg/Include/Protocol/I2cEnumerate.h b/MdePkg/Include/Protocol/I2cEnumerate.h index d7d0253a7d..e1890e470c 100644 --- a/MdePkg/Include/Protocol/I2cEnumerate.h +++ b/MdePkg/Include/Protocol/I2cEnumerate.h @@ -16,9 +16,9 @@ #include -#define EFI_I2C_ENUMERATE_PROTOCOL_GUID { 0xda8cd7c4, 0x1c00, 0x49e2, { 0x80, 0x3e, 0x52, 0x14, 0xe7, 0x01, 0x89, 0x4c }} +#define EFI_I2C_ENUMERATE_PROTOCOL_GUID { 0xda8cd7c4, 0x1c00, 0x49e2, { 0x80, 0x3e, 0x52, 0x14, 0xe7, 0x01, 0x89, 0x4c }} -typedef struct _EFI_I2C_ENUMERATE_PROTOCOL EFI_I2C_ENUMERATE_PROTOCOL; +typedef struct _EFI_I2C_ENUMERATE_PROTOCOL EFI_I2C_ENUMERATE_PROTOCOL; /** Enumerate the I2C devices @@ -45,7 +45,7 @@ typedef struct _EFI_I2C_ENUMERATE_PROTOCOL EFI_I2C_ENUMERATE_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_I2C_ENUMERATE_PROTOCOL_ENUMERATE) ( +(EFIAPI *EFI_I2C_ENUMERATE_PROTOCOL_ENUMERATE)( IN CONST EFI_I2C_ENUMERATE_PROTOCOL *This, IN OUT CONST EFI_I2C_DEVICE **Device ); @@ -73,7 +73,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_I2C_ENUMERATE_PROTOCOL_GET_BUS_FREQUENCY) ( +(EFIAPI *EFI_I2C_ENUMERATE_PROTOCOL_GET_BUS_FREQUENCY)( IN CONST EFI_I2C_ENUMERATE_PROTOCOL *This, IN UINTN I2cBusConfiguration, OUT UINTN *BusClockHertz @@ -87,18 +87,18 @@ struct _EFI_I2C_ENUMERATE_PROTOCOL { /// Traverse the set of I2C devices on an I2C bus. This routine /// returns the next I2C device on an I2C bus. /// - EFI_I2C_ENUMERATE_PROTOCOL_ENUMERATE Enumerate; + EFI_I2C_ENUMERATE_PROTOCOL_ENUMERATE Enumerate; /// /// Get the requested I2C bus frequency for a specified bus /// configuration. /// - EFI_I2C_ENUMERATE_PROTOCOL_GET_BUS_FREQUENCY GetBusFrequency; + EFI_I2C_ENUMERATE_PROTOCOL_GET_BUS_FREQUENCY GetBusFrequency; }; /// /// Reference to variable defined in the .DEC file /// -extern EFI_GUID gEfiI2cEnumerateProtocolGuid; +extern EFI_GUID gEfiI2cEnumerateProtocolGuid; -#endif // __I2C_ENUMERATE_H__ +#endif // __I2C_ENUMERATE_H__ diff --git a/MdePkg/Include/Protocol/I2cHost.h b/MdePkg/Include/Protocol/I2cHost.h index 4657c64718..d820734465 100644 --- a/MdePkg/Include/Protocol/I2cHost.h +++ b/MdePkg/Include/Protocol/I2cHost.h @@ -37,7 +37,6 @@ /// typedef struct _EFI_I2C_HOST_PROTOCOL EFI_I2C_HOST_PROTOCOL; - /** Queue an I2C transaction for execution on the I2C controller. @@ -113,7 +112,7 @@ typedef struct _EFI_I2C_HOST_PROTOCOL EFI_I2C_HOST_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_I2C_HOST_PROTOCOL_QUEUE_REQUEST) ( +(EFIAPI *EFI_I2C_HOST_PROTOCOL_QUEUE_REQUEST)( IN CONST EFI_I2C_HOST_PROTOCOL *This, IN UINTN I2cBusConfiguration, IN UINTN SlaveAddress, @@ -129,18 +128,18 @@ struct _EFI_I2C_HOST_PROTOCOL { /// /// Queue an I2C transaction for execution on the I2C bus /// - EFI_I2C_HOST_PROTOCOL_QUEUE_REQUEST QueueRequest; + EFI_I2C_HOST_PROTOCOL_QUEUE_REQUEST QueueRequest; /// /// Pointer to an EFI_I2C_CONTROLLER_CAPABILITIES data structure /// containing the capabilities of the I2C host controller. /// - CONST EFI_I2C_CONTROLLER_CAPABILITIES *I2cControllerCapabilities; + CONST EFI_I2C_CONTROLLER_CAPABILITIES *I2cControllerCapabilities; }; /// /// Reference to variable defined in the .DEC file /// -extern EFI_GUID gEfiI2cHostProtocolGuid; +extern EFI_GUID gEfiI2cHostProtocolGuid; -#endif // __I2C_HOST_H__ +#endif // __I2C_HOST_H__ diff --git a/MdePkg/Include/Protocol/I2cIo.h b/MdePkg/Include/Protocol/I2cIo.h index 09076df7d0..e38fd9450e 100644 --- a/MdePkg/Include/Protocol/I2cIo.h +++ b/MdePkg/Include/Protocol/I2cIo.h @@ -17,7 +17,7 @@ #include -#define EFI_I2C_IO_PROTOCOL_GUID { 0xb60a3e6b, 0x18c4, 0x46e5, { 0xa2, 0x9a, 0xc9, 0xa1, 0x06, 0x65, 0xa2, 0x8e }} +#define EFI_I2C_IO_PROTOCOL_GUID { 0xb60a3e6b, 0x18c4, 0x46e5, { 0xa2, 0x9a, 0xc9, 0xa1, 0x06, 0x65, 0xa2, 0x8e }} /// /// I2C I/O protocol @@ -38,8 +38,7 @@ /// for the I2C device required to implement the EFI_I2C_ENUMERATE_PROTOCOL. /// The order of the list must be preserved. /// -typedef struct _EFI_I2C_IO_PROTOCOL EFI_I2C_IO_PROTOCOL; - +typedef struct _EFI_I2C_IO_PROTOCOL EFI_I2C_IO_PROTOCOL; /** Queue an I2C transaction for execution on the I2C device. @@ -114,7 +113,7 @@ typedef struct _EFI_I2C_IO_PROTOCOL EFI_I2C_IO_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_I2C_IO_PROTOCOL_QUEUE_REQUEST) ( +(EFIAPI *EFI_I2C_IO_PROTOCOL_QUEUE_REQUEST)( IN CONST EFI_I2C_IO_PROTOCOL *This, IN UINTN SlaveAddressIndex, IN EFI_EVENT Event OPTIONAL, @@ -129,7 +128,7 @@ struct _EFI_I2C_IO_PROTOCOL { /// /// Queue an I2C transaction for execution on the I2C device. /// - EFI_I2C_IO_PROTOCOL_QUEUE_REQUEST QueueRequest; + EFI_I2C_IO_PROTOCOL_QUEUE_REQUEST QueueRequest; /// /// Unique value assigned by the silicon manufacture or the third @@ -137,30 +136,30 @@ struct _EFI_I2C_IO_PROTOCOL { /// combines both the manufacture name and the I2C part number into /// a single value specified as a GUID. /// - CONST EFI_GUID *DeviceGuid; + CONST EFI_GUID *DeviceGuid; /// /// Unique ID of the I2C part within the system /// - UINT32 DeviceIndex; + UINT32 DeviceIndex; /// /// Hardware revision - ACPI _HRV value. See the Advanced Configuration /// and Power Interface Specification, Revision 5.0 for the field format /// and the Plug and play support for I2C web-page for restriction on values. /// - UINT32 HardwareRevision; + UINT32 HardwareRevision; /// /// Pointer to an EFI_I2C_CONTROLLER_CAPABILITIES data structure containing /// the capabilities of the I2C host controller. /// - CONST EFI_I2C_CONTROLLER_CAPABILITIES *I2cControllerCapabilities; + CONST EFI_I2C_CONTROLLER_CAPABILITIES *I2cControllerCapabilities; }; /// /// Reference to variable defined in the .DEC file /// -extern EFI_GUID gEfiI2cIoProtocolGuid; +extern EFI_GUID gEfiI2cIoProtocolGuid; -#endif // __I2C_IO_H__ +#endif // __I2C_IO_H__ diff --git a/MdePkg/Include/Protocol/I2cMaster.h b/MdePkg/Include/Protocol/I2cMaster.h index 58244c2d07..6ba70e21e3 100644 --- a/MdePkg/Include/Protocol/I2cMaster.h +++ b/MdePkg/Include/Protocol/I2cMaster.h @@ -17,7 +17,7 @@ #include -#define EFI_I2C_MASTER_PROTOCOL_GUID { 0xcd72881f, 0x45b5, 0x4feb, { 0x98, 0xc8, 0x31, 0x3d, 0xa8, 0x11, 0x74, 0x62 }} +#define EFI_I2C_MASTER_PROTOCOL_GUID { 0xcd72881f, 0x45b5, 0x4feb, { 0x98, 0xc8, 0x31, 0x3d, 0xa8, 0x11, 0x74, 0x62 }} typedef struct _EFI_I2C_MASTER_PROTOCOL EFI_I2C_MASTER_PROTOCOL; @@ -48,7 +48,7 @@ typedef struct _EFI_I2C_MASTER_PROTOCOL EFI_I2C_MASTER_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_I2C_MASTER_PROTOCOL_SET_BUS_FREQUENCY) ( +(EFIAPI *EFI_I2C_MASTER_PROTOCOL_SET_BUS_FREQUENCY)( IN CONST EFI_I2C_MASTER_PROTOCOL *This, IN OUT UINTN *BusClockHertz ); @@ -70,7 +70,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_I2C_MASTER_PROTOCOL_RESET) ( +(EFIAPI *EFI_I2C_MASTER_PROTOCOL_RESET)( IN CONST EFI_I2C_MASTER_PROTOCOL *This ); @@ -143,7 +143,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_I2C_MASTER_PROTOCOL_START_REQUEST) ( +(EFIAPI *EFI_I2C_MASTER_PROTOCOL_START_REQUEST)( IN CONST EFI_I2C_MASTER_PROTOCOL *This, IN UINTN SlaveAddress, IN EFI_I2C_REQUEST_PACKET *RequestPacket, @@ -162,25 +162,25 @@ struct _EFI_I2C_MASTER_PROTOCOL { /// /// Set the clock frequency for the I2C bus. /// - EFI_I2C_MASTER_PROTOCOL_SET_BUS_FREQUENCY SetBusFrequency; + EFI_I2C_MASTER_PROTOCOL_SET_BUS_FREQUENCY SetBusFrequency; /// /// Reset the I2C host controller. /// - EFI_I2C_MASTER_PROTOCOL_RESET Reset; + EFI_I2C_MASTER_PROTOCOL_RESET Reset; /// /// Start an I2C transaction in master mode on the host controller. /// - EFI_I2C_MASTER_PROTOCOL_START_REQUEST StartRequest; + EFI_I2C_MASTER_PROTOCOL_START_REQUEST StartRequest; /// /// Pointer to an EFI_I2C_CONTROLLER_CAPABILITIES data structure containing /// the capabilities of the I2C host controller. /// - CONST EFI_I2C_CONTROLLER_CAPABILITIES *I2cControllerCapabilities; + CONST EFI_I2C_CONTROLLER_CAPABILITIES *I2cControllerCapabilities; }; -extern EFI_GUID gEfiI2cMasterProtocolGuid; +extern EFI_GUID gEfiI2cMasterProtocolGuid; -#endif // __I2C_MASTER_H__ +#endif // __I2C_MASTER_H__ diff --git a/MdePkg/Include/Protocol/IScsiInitiatorName.h b/MdePkg/Include/Protocol/IScsiInitiatorName.h index 3f0bb0a535..f7a0bb4368 100644 --- a/MdePkg/Include/Protocol/IScsiInitiatorName.h +++ b/MdePkg/Include/Protocol/IScsiInitiatorName.h @@ -41,8 +41,6 @@ EFI_STATUS OUT VOID *Buffer ); - - /** Sets the iSCSI Initiator Name. @@ -71,11 +69,10 @@ typedef EFI_STATUS /// iSCSI Initiator Name Protocol for setting and obtaining the iSCSI Initiator Name. /// struct _EFI_ISCSI_INITIATOR_NAME_PROTOCOL { - EFI_ISCSI_INITIATOR_NAME_GET Get; - EFI_ISCSI_INITIATOR_NAME_SET Set; + EFI_ISCSI_INITIATOR_NAME_GET Get; + EFI_ISCSI_INITIATOR_NAME_SET Set; }; -extern EFI_GUID gEfiIScsiInitiatorNameProtocolGuid; +extern EFI_GUID gEfiIScsiInitiatorNameProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/IdeControllerInit.h b/MdePkg/Include/Protocol/IdeControllerInit.h index 021a989fe2..46c43bdf94 100644 --- a/MdePkg/Include/Protocol/IdeControllerInit.h +++ b/MdePkg/Include/Protocol/IdeControllerInit.h @@ -38,7 +38,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// Forward declaration for EFI_IDE_CONTROLLER_INIT_PROTOCOL. /// -typedef struct _EFI_IDE_CONTROLLER_INIT_PROTOCOL EFI_IDE_CONTROLLER_INIT_PROTOCOL; +typedef struct _EFI_IDE_CONTROLLER_INIT_PROTOCOL EFI_IDE_CONTROLLER_INIT_PROTOCOL; /// /// The phase of the IDE Controller enumeration. @@ -119,8 +119,8 @@ typedef enum { /// EFI_ATA_MODE structure. /// typedef struct { - BOOLEAN Valid; ///< TRUE if Mode is valid. - UINT32 Mode; ///< The actual ATA mode. This field is not a bit map. + BOOLEAN Valid; ///< TRUE if Mode is valid. + UINT32 Mode; ///< The actual ATA mode. This field is not a bit map. } EFI_ATA_MODE; /// @@ -136,11 +136,11 @@ typedef struct { /// can support new transport protocols beyond UDMA. Type EFI_ATA_EXT_TRANSFER_PROTOCOL /// is defined below. /// - EFI_ATA_EXT_TRANSFER_PROTOCOL TransferProtocol; + EFI_ATA_EXT_TRANSFER_PROTOCOL TransferProtocol; /// /// The mode for operating the transfer protocol that is identified by TransferProtocol. /// - UINT32 Mode; + UINT32 Mode; } EFI_ATA_EXTENDED_MODE; /// @@ -154,7 +154,7 @@ typedef struct { /// of PIO mode 1 is governed by the ATA/ATAPI specification. Type EFI_ATA_MODE /// is defined below. /// - EFI_ATA_MODE PioMode; + EFI_ATA_MODE PioMode; /// /// This field specifies the single word DMA mode. Single word DMA modes are defined /// in the ATA/ATAPI specification, versions 1 and 2. Single word DMA support was @@ -164,26 +164,26 @@ typedef struct { /// mode 1. The actual meaning of single word DMA mode 1 is governed by the ATA/ /// ATAPI specification. /// - EFI_ATA_MODE SingleWordDmaMode; + EFI_ATA_MODE SingleWordDmaMode; /// /// This field specifies the multiword DMA mode. Various multiword DMA modes are /// defined in the ATA/ATAPI specification. A value of 1 in this field means multiword /// DMA mode 1. The actual meaning of multiword DMA mode 1 is governed by the /// ATA/ATAPI specification. /// - EFI_ATA_MODE MultiWordDmaMode; + EFI_ATA_MODE MultiWordDmaMode; /// /// This field specifies the ultra DMA (UDMA) mode. UDMA modes are defined in the /// ATA/ATAPI specification. A value of 1 in this field means UDMA mode 1. The /// actual meaning of UDMA mode 1 is governed by the ATA/ATAPI specification. /// - EFI_ATA_MODE UdmaMode; + EFI_ATA_MODE UdmaMode; /// /// The number of extended-mode bitmap entries. Extended modes describe transfer /// protocols beyond PIO, single word DMA, multiword DMA, and UDMA. This field /// can be zero and provides extensibility. /// - UINT32 ExtModeCount; + UINT32 ExtModeCount; /// /// ExtModeCount number of entries. Each entry represents a transfer protocol other /// than the ones defined above (i.e., PIO, single word DMA, multiword DMA, and @@ -191,7 +191,7 @@ typedef struct { /// transfer protocol is defined to cover SATA transfers. Type /// EFI_ATA_EXTENDED_MODE is defined below. /// - EFI_ATA_EXTENDED_MODE ExtMode[1]; + EFI_ATA_EXTENDED_MODE ExtMode[1]; } EFI_ATA_COLLECTIVE_MODE; /// @@ -222,12 +222,12 @@ typedef union { /// The data that is returned by an ATA device upon successful completion /// of the ATA IDENTIFY_DEVICE command. /// - EFI_ATA_IDENTIFY_DATA AtaData; + EFI_ATA_IDENTIFY_DATA AtaData; /// /// The data that is returned by an ATAPI device upon successful completion /// of the ATA IDENTIFY_PACKET_DEVICE command. /// - EFI_ATAPI_IDENTIFY_DATA AtapiData; + EFI_ATAPI_IDENTIFY_DATA AtapiData; } EFI_IDENTIFY_DATA; /** @@ -551,9 +551,9 @@ struct _EFI_IDE_CONTROLLER_INIT_PROTOCOL { /// each of which can have up to one device. In the presence of a multiplier, /// each channel can have fifteen devices. /// - UINT8 ChannelCount; + UINT8 ChannelCount; }; -extern EFI_GUID gEfiIdeControllerInitProtocolGuid; +extern EFI_GUID gEfiIdeControllerInitProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h b/MdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h index 8bb4c3e27a..b56d3eb475 100644 --- a/MdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h +++ b/MdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h @@ -159,9 +159,9 @@ struct _EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL { /// resource configuration requirements if the specified device is a recognized /// incompatible PCI device. /// - EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_CHECK_DEVICE CheckDevice; + EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_CHECK_DEVICE CheckDevice; }; -extern EFI_GUID gEfiIncompatiblePciDeviceSupportProtocolGuid; +extern EFI_GUID gEfiIncompatiblePciDeviceSupportProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Ip4.h b/MdePkg/Include/Protocol/Ip4.h index b1c5cb0814..4c0ed6fd3c 100644 --- a/MdePkg/Include/Protocol/Ip4.h +++ b/MdePkg/Include/Protocol/Ip4.h @@ -40,9 +40,9 @@ typedef struct _EFI_IP4_PROTOCOL EFI_IP4_PROTOCOL; /// The definition in here is only present to provide backwards compatability. /// typedef struct { - EFI_HANDLE InstanceHandle; - EFI_IPv4_ADDRESS Ip4Address; - EFI_IPv4_ADDRESS SubnetMask; + EFI_HANDLE InstanceHandle; + EFI_IPv4_ADDRESS Ip4Address; + EFI_IPv4_ADDRESS SubnetMask; } EFI_IP4_ADDRESS_PAIR; /// @@ -60,182 +60,178 @@ typedef struct { /// The default IPv4 protocol packets to send and receive. Ignored /// when AcceptPromiscuous is TRUE. /// - UINT8 DefaultProtocol; + UINT8 DefaultProtocol; /// /// Set to TRUE to receive all IPv4 packets that get through the receive filters. /// Set to FALSE to receive only the DefaultProtocol IPv4 /// packets that get through the receive filters. /// - BOOLEAN AcceptAnyProtocol; + BOOLEAN AcceptAnyProtocol; /// /// Set to TRUE to receive ICMP error report packets. Ignored when /// AcceptPromiscuous or AcceptAnyProtocol is TRUE. /// - BOOLEAN AcceptIcmpErrors; + BOOLEAN AcceptIcmpErrors; /// /// Set to TRUE to receive broadcast IPv4 packets. Ignored when /// AcceptPromiscuous is TRUE. /// Set to FALSE to stop receiving broadcast IPv4 packets. /// - BOOLEAN AcceptBroadcast; + BOOLEAN AcceptBroadcast; /// /// Set to TRUE to receive all IPv4 packets that are sent to any /// hardware address or any protocol address. /// Set to FALSE to stop receiving all promiscuous IPv4 packets /// - BOOLEAN AcceptPromiscuous; + BOOLEAN AcceptPromiscuous; /// /// Set to TRUE to use the default IPv4 address and default routing table. /// - BOOLEAN UseDefaultAddress; + BOOLEAN UseDefaultAddress; /// /// The station IPv4 address that will be assigned to this EFI IPv4Protocol instance. /// - EFI_IPv4_ADDRESS StationAddress; + EFI_IPv4_ADDRESS StationAddress; /// /// The subnet address mask that is associated with the station address. /// - EFI_IPv4_ADDRESS SubnetMask; + EFI_IPv4_ADDRESS SubnetMask; /// /// TypeOfService field in transmitted IPv4 packets. /// - UINT8 TypeOfService; + UINT8 TypeOfService; /// /// TimeToLive field in transmitted IPv4 packets. /// - UINT8 TimeToLive; + UINT8 TimeToLive; /// /// State of the DoNotFragment bit in transmitted IPv4 packets. /// - BOOLEAN DoNotFragment; + BOOLEAN DoNotFragment; /// /// Set to TRUE to send and receive unformatted packets. The other /// IPv4 receive filters are still applied. Fragmentation is disabled for RawData mode. /// - BOOLEAN RawData; + BOOLEAN RawData; /// /// The timer timeout value (number of microseconds) for the /// receive timeout event to be associated with each assembled /// packet. Zero means do not drop assembled packets. /// - UINT32 ReceiveTimeout; + UINT32 ReceiveTimeout; /// /// The timer timeout value (number of microseconds) for the /// transmit timeout event to be associated with each outgoing /// packet. Zero means do not drop outgoing packets. /// - UINT32 TransmitTimeout; + UINT32 TransmitTimeout; } EFI_IP4_CONFIG_DATA; - typedef struct { - EFI_IPv4_ADDRESS SubnetAddress; - EFI_IPv4_ADDRESS SubnetMask; - EFI_IPv4_ADDRESS GatewayAddress; + EFI_IPv4_ADDRESS SubnetAddress; + EFI_IPv4_ADDRESS SubnetMask; + EFI_IPv4_ADDRESS GatewayAddress; } EFI_IP4_ROUTE_TABLE; typedef struct { - UINT8 Type; - UINT8 Code; + UINT8 Type; + UINT8 Code; } EFI_IP4_ICMP_TYPE; typedef struct { /// /// Set to TRUE after this EFI IPv4 Protocol instance has been successfully configured. /// - BOOLEAN IsStarted; + BOOLEAN IsStarted; /// /// The maximum packet size, in bytes, of the packet which the upper layer driver could feed. /// - UINT32 MaxPacketSize; + UINT32 MaxPacketSize; /// /// Current configuration settings. /// - EFI_IP4_CONFIG_DATA ConfigData; + EFI_IP4_CONFIG_DATA ConfigData; /// /// Set to TRUE when the EFI IPv4 Protocol instance has a station address and subnet mask. /// - BOOLEAN IsConfigured; + BOOLEAN IsConfigured; /// /// Number of joined multicast groups. /// - UINT32 GroupCount; + UINT32 GroupCount; /// /// List of joined multicast group addresses. /// - EFI_IPv4_ADDRESS *GroupTable; + EFI_IPv4_ADDRESS *GroupTable; /// /// Number of entries in the routing table. /// - UINT32 RouteCount; + UINT32 RouteCount; /// /// Routing table entries. /// - EFI_IP4_ROUTE_TABLE *RouteTable; + EFI_IP4_ROUTE_TABLE *RouteTable; /// /// Number of entries in the supported ICMP types list. /// - UINT32 IcmpTypeCount; + UINT32 IcmpTypeCount; /// /// Array of ICMP types and codes that are supported by this EFI IPv4 Protocol driver /// - EFI_IP4_ICMP_TYPE *IcmpTypeList; + EFI_IP4_ICMP_TYPE *IcmpTypeList; } EFI_IP4_MODE_DATA; #pragma pack(1) typedef struct { - UINT8 HeaderLength:4; - UINT8 Version:4; - UINT8 TypeOfService; - UINT16 TotalLength; - UINT16 Identification; - UINT16 Fragmentation; - UINT8 TimeToLive; - UINT8 Protocol; - UINT16 Checksum; - EFI_IPv4_ADDRESS SourceAddress; - EFI_IPv4_ADDRESS DestinationAddress; + UINT8 HeaderLength : 4; + UINT8 Version : 4; + UINT8 TypeOfService; + UINT16 TotalLength; + UINT16 Identification; + UINT16 Fragmentation; + UINT8 TimeToLive; + UINT8 Protocol; + UINT16 Checksum; + EFI_IPv4_ADDRESS SourceAddress; + EFI_IPv4_ADDRESS DestinationAddress; } EFI_IP4_HEADER; #pragma pack() - typedef struct { - UINT32 FragmentLength; - VOID *FragmentBuffer; + UINT32 FragmentLength; + VOID *FragmentBuffer; } EFI_IP4_FRAGMENT_DATA; - typedef struct { - EFI_TIME TimeStamp; - EFI_EVENT RecycleSignal; - UINT32 HeaderLength; - EFI_IP4_HEADER *Header; - UINT32 OptionsLength; - VOID *Options; - UINT32 DataLength; - UINT32 FragmentCount; - EFI_IP4_FRAGMENT_DATA FragmentTable[1]; + EFI_TIME TimeStamp; + EFI_EVENT RecycleSignal; + UINT32 HeaderLength; + EFI_IP4_HEADER *Header; + UINT32 OptionsLength; + VOID *Options; + UINT32 DataLength; + UINT32 FragmentCount; + EFI_IP4_FRAGMENT_DATA FragmentTable[1]; } EFI_IP4_RECEIVE_DATA; - typedef struct { - EFI_IPv4_ADDRESS SourceAddress; - EFI_IPv4_ADDRESS GatewayAddress; - UINT8 Protocol; - UINT8 TypeOfService; - UINT8 TimeToLive; - BOOLEAN DoNotFragment; + EFI_IPv4_ADDRESS SourceAddress; + EFI_IPv4_ADDRESS GatewayAddress; + UINT8 Protocol; + UINT8 TypeOfService; + UINT8 TimeToLive; + BOOLEAN DoNotFragment; } EFI_IP4_OVERRIDE_DATA; typedef struct { - EFI_IPv4_ADDRESS DestinationAddress; - EFI_IP4_OVERRIDE_DATA *OverrideData; //OPTIONAL - UINT32 OptionsLength; //OPTIONAL - VOID *OptionsBuffer; //OPTIONAL - UINT32 TotalDataLength; - UINT32 FragmentCount; - EFI_IP4_FRAGMENT_DATA FragmentTable[1]; + EFI_IPv4_ADDRESS DestinationAddress; + EFI_IP4_OVERRIDE_DATA *OverrideData; // OPTIONAL + UINT32 OptionsLength; // OPTIONAL + VOID *OptionsBuffer; // OPTIONAL + UINT32 TotalDataLength; + UINT32 FragmentCount; + EFI_IP4_FRAGMENT_DATA FragmentTable[1]; } EFI_IP4_TRANSMIT_DATA; typedef struct { @@ -245,21 +241,21 @@ typedef struct { /// EFI_NOTIFY_SIGNAL. The Task Priority Level (TPL) of /// Event must be lower than or equal to TPL_CALLBACK. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// The status that is returned to the caller at the end of the operation /// to indicate whether this operation completed successfully. /// - EFI_STATUS Status; + EFI_STATUS Status; union { /// /// When this token is used for receiving, RxData is a pointer to the EFI_IP4_RECEIVE_DATA. /// - EFI_IP4_RECEIVE_DATA *RxData; + EFI_IP4_RECEIVE_DATA *RxData; /// /// When this token is used for transmitting, TxData is a pointer to the EFI_IP4_TRANSMIT_DATA. /// - EFI_IP4_TRANSMIT_DATA *TxData; + EFI_IP4_TRANSMIT_DATA *TxData; } Packet; } EFI_IP4_COMPLETION_TOKEN; @@ -590,17 +586,17 @@ EFI_STATUS /// used by drivers, daemons, and applications to transmit and receive network packets. /// struct _EFI_IP4_PROTOCOL { - EFI_IP4_GET_MODE_DATA GetModeData; - EFI_IP4_CONFIGURE Configure; - EFI_IP4_GROUPS Groups; - EFI_IP4_ROUTES Routes; - EFI_IP4_TRANSMIT Transmit; - EFI_IP4_RECEIVE Receive; - EFI_IP4_CANCEL Cancel; - EFI_IP4_POLL Poll; + EFI_IP4_GET_MODE_DATA GetModeData; + EFI_IP4_CONFIGURE Configure; + EFI_IP4_GROUPS Groups; + EFI_IP4_ROUTES Routes; + EFI_IP4_TRANSMIT Transmit; + EFI_IP4_RECEIVE Receive; + EFI_IP4_CANCEL Cancel; + EFI_IP4_POLL Poll; }; -extern EFI_GUID gEfiIp4ServiceBindingProtocolGuid; -extern EFI_GUID gEfiIp4ProtocolGuid; +extern EFI_GUID gEfiIp4ServiceBindingProtocolGuid; +extern EFI_GUID gEfiIp4ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Ip4Config.h b/MdePkg/Include/Protocol/Ip4Config.h index 08e716c9fb..89b07e4554 100644 --- a/MdePkg/Include/Protocol/Ip4Config.h +++ b/MdePkg/Include/Protocol/Ip4Config.h @@ -9,6 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent This Protocol is introduced in UEFI Specification 2.0. **/ + #ifndef __EFI_IP4CONFIG_PROTOCOL_H__ #define __EFI_IP4CONFIG_PROTOCOL_H__ @@ -36,23 +37,22 @@ typedef struct { /// /// Default station IP address, stored in network byte order. /// - EFI_IPv4_ADDRESS StationAddress; + EFI_IPv4_ADDRESS StationAddress; /// /// Default subnet mask, stored in network byte order. /// - EFI_IPv4_ADDRESS SubnetMask; + EFI_IPv4_ADDRESS SubnetMask; /// /// Number of entries in the following RouteTable. May be zero. /// - UINT32 RouteTableSize; + UINT32 RouteTableSize; /// /// Default routing table data (stored in network byte order). /// Ignored if RouteTableSize is zero. /// - EFI_IP4_ROUTE_TABLE *RouteTable; + EFI_IP4_ROUTE_TABLE *RouteTable; } EFI_IP4_IPCONFIG_DATA; - /** Starts running the configuration policy for the EFI IPv4 Protocol driver. @@ -166,11 +166,11 @@ EFI_STATUS /// configurations for the EFI IPv4 Protocol driver. /// struct _EFI_IP4_CONFIG_PROTOCOL { - EFI_IP4_CONFIG_START Start; - EFI_IP4_CONFIG_STOP Stop; - EFI_IP4_CONFIG_GET_DATA GetData; + EFI_IP4_CONFIG_START Start; + EFI_IP4_CONFIG_STOP Stop; + EFI_IP4_CONFIG_GET_DATA GetData; }; -extern EFI_GUID gEfiIp4ConfigProtocolGuid; +extern EFI_GUID gEfiIp4ConfigProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Ip4Config2.h b/MdePkg/Include/Protocol/Ip4Config2.h index 7ba2d6c1ab..b824567927 100644 --- a/MdePkg/Include/Protocol/Ip4Config2.h +++ b/MdePkg/Include/Protocol/Ip4Config2.h @@ -9,6 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent This Protocol is introduced in UEFI Specification 2.5 **/ + #ifndef __EFI_IP4CONFIG2_PROTOCOL_H__ #define __EFI_IP4CONFIG2_PROTOCOL_H__ @@ -21,7 +22,6 @@ This Protocol is introduced in UEFI Specification 2.5 typedef struct _EFI_IP4_CONFIG2_PROTOCOL EFI_IP4_CONFIG2_PROTOCOL; - /// /// EFI_IP4_CONFIG2_DATA_TYPE /// @@ -78,7 +78,7 @@ typedef enum { /// /// EFI_IP4_CONFIG2_INTERFACE_INFO related definitions /// -#define EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_SIZE 32 +#define EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_SIZE 32 /// /// EFI_IP4_CONFIG2_INTERFACE_INFO @@ -87,32 +87,32 @@ typedef struct { /// /// The name of the interface. It is a NULL-terminated Unicode string. /// - CHAR16 Name[EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_SIZE]; + CHAR16 Name[EFI_IP4_CONFIG2_INTERFACE_INFO_NAME_SIZE]; /// /// The interface type of the network interface. See RFC 1700, /// section "Number Hardware Type". /// - UINT8 IfType; + UINT8 IfType; /// /// The size, in bytes, of the network interface's hardware address. /// - UINT32 HwAddressSize; + UINT32 HwAddressSize; /// /// The hardware address for the network interface. /// - EFI_MAC_ADDRESS HwAddress; + EFI_MAC_ADDRESS HwAddress; /// /// The station IPv4 address of this EFI IPv4 network stack. /// - EFI_IPv4_ADDRESS StationAddress; + EFI_IPv4_ADDRESS StationAddress; /// /// The subnet address mask that is associated with the station address. /// - EFI_IPv4_ADDRESS SubnetMask; + EFI_IPv4_ADDRESS SubnetMask; /// /// Size of the following RouteTable, in bytes. May be zero. /// - UINT32 RouteTableSize; + UINT32 RouteTableSize; /// /// The route table of the IPv4 network stack runs on this interface. /// Set to NULL if RouteTableSize is zero. Type EFI_IP4_ROUTE_TABLE is defined in @@ -150,11 +150,11 @@ typedef struct { /// /// The IPv4 unicast address. /// - EFI_IPv4_ADDRESS Address; + EFI_IPv4_ADDRESS Address; /// /// The subnet mask. /// - EFI_IPv4_ADDRESS SubnetMask; + EFI_IPv4_ADDRESS SubnetMask; } EFI_IP4_CONFIG2_MANUAL_ADDRESS; /** @@ -200,7 +200,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_IP4_CONFIG2_SET_DATA) ( +(EFIAPI *EFI_IP4_CONFIG2_SET_DATA)( IN EFI_IP4_CONFIG2_PROTOCOL *This, IN EFI_IP4_CONFIG2_DATA_TYPE DataType, IN UINTN DataSize, @@ -242,7 +242,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_IP4_CONFIG2_GET_DATA) ( +(EFIAPI *EFI_IP4_CONFIG2_GET_DATA)( IN EFI_IP4_CONFIG2_PROTOCOL *This, IN EFI_IP4_CONFIG2_DATA_TYPE DataType, IN OUT UINTN *DataSize, @@ -271,7 +271,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_IP4_CONFIG2_REGISTER_NOTIFY) ( +(EFIAPI *EFI_IP4_CONFIG2_REGISTER_NOTIFY)( IN EFI_IP4_CONFIG2_PROTOCOL *This, IN EFI_IP4_CONFIG2_DATA_TYPE DataType, IN EFI_EVENT Event @@ -292,7 +292,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_IP4_CONFIG2_UNREGISTER_NOTIFY) ( +(EFIAPI *EFI_IP4_CONFIG2_UNREGISTER_NOTIFY)( IN EFI_IP4_CONFIG2_PROTOCOL *This, IN EFI_IP4_CONFIG2_DATA_TYPE DataType, IN EFI_EVENT Event @@ -305,13 +305,12 @@ EFI_STATUS /// the EFI IPv4 network stack runs on. /// struct _EFI_IP4_CONFIG2_PROTOCOL { - EFI_IP4_CONFIG2_SET_DATA SetData; - EFI_IP4_CONFIG2_GET_DATA GetData; - EFI_IP4_CONFIG2_REGISTER_NOTIFY RegisterDataNotify; - EFI_IP4_CONFIG2_UNREGISTER_NOTIFY UnregisterDataNotify; + EFI_IP4_CONFIG2_SET_DATA SetData; + EFI_IP4_CONFIG2_GET_DATA GetData; + EFI_IP4_CONFIG2_REGISTER_NOTIFY RegisterDataNotify; + EFI_IP4_CONFIG2_UNREGISTER_NOTIFY UnregisterDataNotify; }; -extern EFI_GUID gEfiIp4Config2ProtocolGuid; +extern EFI_GUID gEfiIp4Config2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/Ip6.h b/MdePkg/Include/Protocol/Ip6.h index f432372de4..4aff36f0a1 100644 --- a/MdePkg/Include/Protocol/Ip6.h +++ b/MdePkg/Include/Protocol/Ip6.h @@ -23,7 +23,6 @@ #include - #define EFI_IP6_SERVICE_BINDING_PROTOCOL_GUID \ { \ 0xec835dd3, 0xfe0f, 0x617b, {0xa6, 0x21, 0xb3, 0x50, 0xc3, 0xe1, 0x33, 0x88 } \ @@ -40,7 +39,7 @@ typedef struct _EFI_IP6_PROTOCOL EFI_IP6_PROTOCOL; /// EFI_IP6_ADDRESS_PAIR is deprecated in the UEFI 2.4B and should not be used any more. /// The definition in here is only present to provide backwards compatability. /// -typedef struct{ +typedef struct { /// /// The EFI IPv6 Protocol instance handle that is using this address/prefix pair. /// @@ -78,57 +77,57 @@ typedef struct { /// ICMPv6 type definitions for error messages /// ///@{ -#define ICMP_V6_DEST_UNREACHABLE 0x1 -#define ICMP_V6_PACKET_TOO_BIG 0x2 -#define ICMP_V6_TIME_EXCEEDED 0x3 -#define ICMP_V6_PARAMETER_PROBLEM 0x4 +#define ICMP_V6_DEST_UNREACHABLE 0x1 +#define ICMP_V6_PACKET_TOO_BIG 0x2 +#define ICMP_V6_TIME_EXCEEDED 0x3 +#define ICMP_V6_PARAMETER_PROBLEM 0x4 ///@} /// /// ICMPv6 type definition for informational messages /// ///@{ -#define ICMP_V6_ECHO_REQUEST 0x80 -#define ICMP_V6_ECHO_REPLY 0x81 -#define ICMP_V6_LISTENER_QUERY 0x82 -#define ICMP_V6_LISTENER_REPORT 0x83 -#define ICMP_V6_LISTENER_DONE 0x84 -#define ICMP_V6_ROUTER_SOLICIT 0x85 -#define ICMP_V6_ROUTER_ADVERTISE 0x86 -#define ICMP_V6_NEIGHBOR_SOLICIT 0x87 -#define ICMP_V6_NEIGHBOR_ADVERTISE 0x88 -#define ICMP_V6_REDIRECT 0x89 -#define ICMP_V6_LISTENER_REPORT_2 0x8F +#define ICMP_V6_ECHO_REQUEST 0x80 +#define ICMP_V6_ECHO_REPLY 0x81 +#define ICMP_V6_LISTENER_QUERY 0x82 +#define ICMP_V6_LISTENER_REPORT 0x83 +#define ICMP_V6_LISTENER_DONE 0x84 +#define ICMP_V6_ROUTER_SOLICIT 0x85 +#define ICMP_V6_ROUTER_ADVERTISE 0x86 +#define ICMP_V6_NEIGHBOR_SOLICIT 0x87 +#define ICMP_V6_NEIGHBOR_ADVERTISE 0x88 +#define ICMP_V6_REDIRECT 0x89 +#define ICMP_V6_LISTENER_REPORT_2 0x8F ///@} /// /// ICMPv6 code definitions for ICMP_V6_DEST_UNREACHABLE /// ///@{ -#define ICMP_V6_NO_ROUTE_TO_DEST 0x0 -#define ICMP_V6_COMM_PROHIBITED 0x1 -#define ICMP_V6_BEYOND_SCOPE 0x2 -#define ICMP_V6_ADDR_UNREACHABLE 0x3 -#define ICMP_V6_PORT_UNREACHABLE 0x4 -#define ICMP_V6_SOURCE_ADDR_FAILED 0x5 -#define ICMP_V6_ROUTE_REJECTED 0x6 +#define ICMP_V6_NO_ROUTE_TO_DEST 0x0 +#define ICMP_V6_COMM_PROHIBITED 0x1 +#define ICMP_V6_BEYOND_SCOPE 0x2 +#define ICMP_V6_ADDR_UNREACHABLE 0x3 +#define ICMP_V6_PORT_UNREACHABLE 0x4 +#define ICMP_V6_SOURCE_ADDR_FAILED 0x5 +#define ICMP_V6_ROUTE_REJECTED 0x6 ///@} /// /// ICMPv6 code definitions for ICMP_V6_TIME_EXCEEDED /// ///@{ -#define ICMP_V6_TIMEOUT_HOP_LIMIT 0x0 -#define ICMP_V6_TIMEOUT_REASSEMBLE 0x1 +#define ICMP_V6_TIMEOUT_HOP_LIMIT 0x0 +#define ICMP_V6_TIMEOUT_REASSEMBLE 0x1 ///@} /// /// ICMPv6 code definitions for ICMP_V6_PARAMETER_PROBLEM /// ///@{ -#define ICMP_V6_ERRONEOUS_HEADER 0x0 -#define ICMP_V6_UNRECOGNIZE_NEXT_HDR 0x1 -#define ICMP_V6_UNRECOGNIZE_OPTION 0x2 +#define ICMP_V6_ERRONEOUS_HEADER 0x0 +#define ICMP_V6_UNRECOGNIZE_NEXT_HDR 0x1 +#define ICMP_V6_UNRECOGNIZE_OPTION 0x2 ///@} /// @@ -142,7 +141,7 @@ typedef struct { /// the IPv6 header if there are no extension headers. Ignored when /// AcceptPromiscuous is TRUE. /// - UINT8 DefaultProtocol; + UINT8 DefaultProtocol; /// /// Set to TRUE to receive all IPv6 packets that get through the /// receive filters. @@ -150,23 +149,23 @@ typedef struct { /// packets that get through the receive filters. Ignored when /// AcceptPromiscuous is TRUE. /// - BOOLEAN AcceptAnyProtocol; + BOOLEAN AcceptAnyProtocol; /// /// Set to TRUE to receive ICMP error report packets. Ignored when /// AcceptPromiscuous or AcceptAnyProtocol is TRUE. /// - BOOLEAN AcceptIcmpErrors; + BOOLEAN AcceptIcmpErrors; /// /// Set to TRUE to receive all IPv6 packets that are sent to any /// hardware address or any protocol address. Set to FALSE to stop /// receiving all promiscuous IPv6 packets. /// - BOOLEAN AcceptPromiscuous; + BOOLEAN AcceptPromiscuous; /// /// The destination address of the packets that will be transmitted. /// Ignored if it is unspecified. /// - EFI_IPv6_ADDRESS DestinationAddress; + EFI_IPv6_ADDRESS DestinationAddress; /// /// The station IPv6 address that will be assigned to this EFI IPv6 /// Protocol instance. This field can be set and changed only when @@ -186,41 +185,41 @@ typedef struct { /// only be successfully bound to this EFI IPv6 protocol instance /// after IP6ModeData.IsConfigured changed to TRUE. /// - EFI_IPv6_ADDRESS StationAddress; + EFI_IPv6_ADDRESS StationAddress; /// /// TrafficClass field in transmitted IPv6 packets. Default value /// is zero. /// - UINT8 TrafficClass; + UINT8 TrafficClass; /// /// HopLimit field in transmitted IPv6 packets. /// - UINT8 HopLimit; + UINT8 HopLimit; /// /// FlowLabel field in transmitted IPv6 packets. Default value is /// zero. /// - UINT32 FlowLabel; + UINT32 FlowLabel; /// /// The timer timeout value (number of microseconds) for the /// receive timeout event to be associated with each assembled /// packet. Zero means do not drop assembled packets. /// - UINT32 ReceiveTimeout; + UINT32 ReceiveTimeout; /// /// The timer timeout value (number of microseconds) for the /// transmit timeout event to be associated with each outgoing /// packet. Zero means do not drop outgoing packets. /// - UINT32 TransmitTimeout; + UINT32 TransmitTimeout; } EFI_IP6_CONFIG_DATA; /// /// EFI_IP6_ADDRESS_INFO /// typedef struct { - EFI_IPv6_ADDRESS Address; ///< The IPv6 address. - UINT8 PrefixLength; ///< The length of the prefix associated with the Address. + EFI_IPv6_ADDRESS Address; ///< The IPv6 address. + UINT8 PrefixLength; ///< The length of the prefix associated with the Address. } EFI_IP6_ADDRESS_INFO; /// @@ -233,15 +232,15 @@ typedef struct { /// packets to this prefix. If the IPv6 address is all zeros, then the /// prefix is on-link. /// - EFI_IPv6_ADDRESS Gateway; + EFI_IPv6_ADDRESS Gateway; /// /// The destination prefix to be routed. /// - EFI_IPv6_ADDRESS Destination; + EFI_IPv6_ADDRESS Destination; /// /// The length of the prefix associated with the Destination. /// - UINT8 PrefixLength; + UINT8 PrefixLength; } EFI_IP6_ROUTE_TABLE; /// @@ -261,9 +260,9 @@ typedef enum { /// EfiNeighborReachable, /// - ///Reachable Time has elapsed since the last positive confirmation - ///was received. In this state, the forward path to the neighbor was - ///functioning properly. + /// Reachable Time has elapsed since the last positive confirmation + /// was received. In this state, the forward path to the neighbor was + /// functioning properly. /// EfiNeighborStale, /// @@ -285,9 +284,9 @@ typedef enum { /// of entries about individual neighbors to which traffic has been sent recently. /// typedef struct { - EFI_IPv6_ADDRESS Neighbor; ///< The on-link unicast/anycast IP address of the neighbor. - EFI_MAC_ADDRESS LinkAddress; ///< Link-layer address of the neighbor. - EFI_IP6_NEIGHBOR_STATE State; ///< State of this neighbor cache entry. + EFI_IPv6_ADDRESS Neighbor; ///< The on-link unicast/anycast IP address of the neighbor. + EFI_MAC_ADDRESS LinkAddress; ///< Link-layer address of the neighbor. + EFI_IP6_NEIGHBOR_STATE State; ///< State of this neighbor cache entry. } EFI_IP6_NEIGHBOR_CACHE; /// @@ -296,8 +295,8 @@ typedef struct { /// IPv6 Protocol driver. /// typedef struct { - UINT8 Type; ///< The type of ICMP message. - UINT8 Code; ///< The code of the ICMP message. + UINT8 Type; ///< The type of ICMP message. + UINT8 Code; ///< The code of the ICMP message. } EFI_IP6_ICMP_TYPE; /// @@ -309,82 +308,82 @@ typedef struct { /// All other fields in this structure are undefined until this field is TRUE. /// Set to FALSE when the EFI IPv6 Protocol instance is stopped. /// - BOOLEAN IsStarted; + BOOLEAN IsStarted; /// /// The maximum packet size, in bytes, of the packet which the upper layer driver could feed. /// - UINT32 MaxPacketSize; + UINT32 MaxPacketSize; /// /// Current configuration settings. Undefined until IsStarted is TRUE. /// - EFI_IP6_CONFIG_DATA ConfigData; + EFI_IP6_CONFIG_DATA ConfigData; /// /// Set to TRUE when the EFI IPv6 Protocol instance is configured. /// The instance is configured when it has a station address and /// corresponding prefix length. /// Set to FALSE when the EFI IPv6 Protocol instance is not configured. /// - BOOLEAN IsConfigured; + BOOLEAN IsConfigured; /// /// Number of configured IPv6 addresses on this interface. /// - UINT32 AddressCount; + UINT32 AddressCount; /// /// List of currently configured IPv6 addresses and corresponding /// prefix lengths assigned to this interface. It is caller's /// responsibility to free this buffer. /// - EFI_IP6_ADDRESS_INFO *AddressList; + EFI_IP6_ADDRESS_INFO *AddressList; /// /// Number of joined multicast groups. Undefined until /// IsConfigured is TRUE. /// - UINT32 GroupCount; + UINT32 GroupCount; /// /// List of joined multicast group addresses. It is caller's /// responsibility to free this buffer. Undefined until /// IsConfigured is TRUE. /// - EFI_IPv6_ADDRESS *GroupTable; + EFI_IPv6_ADDRESS *GroupTable; /// /// Number of entries in the routing table. Undefined until /// IsConfigured is TRUE. /// - UINT32 RouteCount; + UINT32 RouteCount; /// /// Routing table entries. It is caller's responsibility to free this buffer. /// - EFI_IP6_ROUTE_TABLE *RouteTable; + EFI_IP6_ROUTE_TABLE *RouteTable; /// /// Number of entries in the neighbor cache. Undefined until /// IsConfigured is TRUE. /// - UINT32 NeighborCount; + UINT32 NeighborCount; /// /// Neighbor cache entries. It is caller's responsibility to free this /// buffer. Undefined until IsConfigured is TRUE. /// - EFI_IP6_NEIGHBOR_CACHE *NeighborCache; + EFI_IP6_NEIGHBOR_CACHE *NeighborCache; /// /// Number of entries in the prefix table. Undefined until /// IsConfigured is TRUE. /// - UINT32 PrefixCount; + UINT32 PrefixCount; /// /// On-link Prefix table entries. It is caller's responsibility to free this /// buffer. Undefined until IsConfigured is TRUE. /// - EFI_IP6_ADDRESS_INFO *PrefixTable; + EFI_IP6_ADDRESS_INFO *PrefixTable; /// /// Number of entries in the supported ICMP types list. /// - UINT32 IcmpTypeCount; + UINT32 IcmpTypeCount; /// /// Array of ICMP types and codes that are supported by this EFI /// IPv6 Protocol driver. It is caller's responsibility to free this /// buffer. /// - EFI_IP6_ICMP_TYPE *IcmpTypeList; + EFI_IP6_ICMP_TYPE *IcmpTypeList; } EFI_IP6_MODE_DATA; /// @@ -394,16 +393,16 @@ typedef struct { /// #pragma pack(1) typedef struct _EFI_IP6_HEADER { - UINT8 TrafficClassH:4; - UINT8 Version:4; - UINT8 FlowLabelH:4; - UINT8 TrafficClassL:4; - UINT16 FlowLabelL; - UINT16 PayloadLength; - UINT8 NextHeader; - UINT8 HopLimit; - EFI_IPv6_ADDRESS SourceAddress; - EFI_IPv6_ADDRESS DestinationAddress; + UINT8 TrafficClassH : 4; + UINT8 Version : 4; + UINT8 FlowLabelH : 4; + UINT8 TrafficClassL : 4; + UINT16 FlowLabelL; + UINT16 PayloadLength; + UINT8 NextHeader; + UINT8 HopLimit; + EFI_IPv6_ADDRESS SourceAddress; + EFI_IPv6_ADDRESS DestinationAddress; } EFI_IP6_HEADER; #pragma pack() @@ -413,8 +412,8 @@ typedef struct _EFI_IP6_HEADER { /// fragment to transmit or that has been received. /// typedef struct _EFI_IP6_FRAGMENT_DATA { - UINT32 FragmentLength; ///< Length of fragment data. This field may not be set to zero. - VOID *FragmentBuffer; ///< Pointer to fragment data. This field may not be set to NULL. + UINT32 FragmentLength; ///< Length of fragment data. This field may not be set to zero. + VOID *FragmentBuffer; ///< Pointer to fragment data. This field may not be set to NULL. } EFI_IP6_FRAGMENT_DATA; /// @@ -425,36 +424,36 @@ typedef struct _EFI_IP6_RECEIVE_DATA { /// Time when the EFI IPv6 Protocol driver accepted the packet. /// Ignored if it is zero. /// - EFI_TIME TimeStamp; + EFI_TIME TimeStamp; /// /// After this event is signaled, the receive data structure is released /// and must not be referenced. /// - EFI_EVENT RecycleSignal; + EFI_EVENT RecycleSignal; /// - ///Length of the IPv6 packet headers, including both the IPv6 - ///header and any extension headers. + /// Length of the IPv6 packet headers, including both the IPv6 + /// header and any extension headers. /// - UINT32 HeaderLength; + UINT32 HeaderLength; /// /// Pointer to the IPv6 packet header. If the IPv6 packet was /// fragmented, this argument is a pointer to the header in the first /// fragment. /// - EFI_IP6_HEADER *Header; + EFI_IP6_HEADER *Header; /// /// Sum of the lengths of IPv6 packet buffers in FragmentTable. May /// be zero. /// - UINT32 DataLength; + UINT32 DataLength; /// /// Number of IPv6 payload fragments. May be zero. /// - UINT32 FragmentCount; + UINT32 FragmentCount; /// /// Array of payload fragment lengths and buffer pointers. /// - EFI_IP6_FRAGMENT_DATA FragmentTable[1]; + EFI_IP6_FRAGMENT_DATA FragmentTable[1]; } EFI_IP6_RECEIVE_DATA; /// @@ -463,9 +462,9 @@ typedef struct _EFI_IP6_RECEIVE_DATA { /// default parameters or settings for one Transmit() function call. /// typedef struct _EFI_IP6_OVERRIDE_DATA { - UINT8 Protocol; ///< Protocol type override. - UINT8 HopLimit; ///< Hop-Limit override. - UINT32 FlowLabel; ///< Flow-Label override. + UINT8 Protocol; ///< Protocol type override. + UINT8 HopLimit; ///< Hop-Limit override. + UINT32 FlowLabel; ///< Flow-Label override. } EFI_IP6_OVERRIDE_DATA; /// @@ -476,39 +475,39 @@ typedef struct _EFI_IP6_TRANSMIT_DATA { /// The destination IPv6 address. If it is unspecified, /// ConfigData.DestinationAddress will be used instead. /// - EFI_IPv6_ADDRESS DestinationAddress; + EFI_IPv6_ADDRESS DestinationAddress; /// /// If not NULL, the IPv6 transmission control override data. /// - EFI_IP6_OVERRIDE_DATA *OverrideData; + EFI_IP6_OVERRIDE_DATA *OverrideData; /// /// Total length in byte of the IPv6 extension headers specified in /// ExtHdrs. /// - UINT32 ExtHdrsLength; + UINT32 ExtHdrsLength; /// /// Pointer to the IPv6 extension headers. The IP layer will append /// the required extension headers if they are not specified by /// ExtHdrs. Ignored if ExtHdrsLength is zero. /// - VOID *ExtHdrs; + VOID *ExtHdrs; /// /// The protocol of first extension header in ExtHdrs. Ignored if /// ExtHdrsLength is zero. /// - UINT8 NextHeader; + UINT8 NextHeader; /// /// Total length in bytes of the FragmentTable data to transmit. /// - UINT32 DataLength; + UINT32 DataLength; /// /// Number of entries in the fragment data table. /// - UINT32 FragmentCount; + UINT32 FragmentCount; /// /// Start of the fragment data table. /// - EFI_IP6_FRAGMENT_DATA FragmentTable[1]; + EFI_IP6_FRAGMENT_DATA FragmentTable[1]; } EFI_IP6_TRANSMIT_DATA; /// @@ -520,7 +519,7 @@ typedef struct { /// This Event will be signaled after the Status field is updated by /// the EFI IPv6 Protocol driver. The type of Event must be EFI_NOTIFY_SIGNAL. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Will be set to one of the following values: /// - EFI_SUCCESS: The receive or transmit completed @@ -534,16 +533,16 @@ typedef struct { /// failed because of an IPsec policy check. /// - EFI_NO_MEDIA: There was a media error. /// - EFI_STATUS Status; + EFI_STATUS Status; union { /// /// When the Token is used for receiving, RxData is a pointer to the EFI_IP6_RECEIVE_DATA. /// - EFI_IP6_RECEIVE_DATA *RxData; + EFI_IP6_RECEIVE_DATA *RxData; /// /// When the Token is used for transmitting, TxData is a pointer to the EFI_IP6_TRANSMIT_DATA. /// - EFI_IP6_TRANSMIT_DATA *TxData; + EFI_IP6_TRANSMIT_DATA *TxData; } Packet; } EFI_IP6_COMPLETION_TOKEN; @@ -930,18 +929,18 @@ EFI_STATUS /// used by drivers, daemons, and applications to transmit and receive network packets. /// struct _EFI_IP6_PROTOCOL { - EFI_IP6_GET_MODE_DATA GetModeData; - EFI_IP6_CONFIGURE Configure; - EFI_IP6_GROUPS Groups; - EFI_IP6_ROUTES Routes; - EFI_IP6_NEIGHBORS Neighbors; - EFI_IP6_TRANSMIT Transmit; - EFI_IP6_RECEIVE Receive; - EFI_IP6_CANCEL Cancel; - EFI_IP6_POLL Poll; + EFI_IP6_GET_MODE_DATA GetModeData; + EFI_IP6_CONFIGURE Configure; + EFI_IP6_GROUPS Groups; + EFI_IP6_ROUTES Routes; + EFI_IP6_NEIGHBORS Neighbors; + EFI_IP6_TRANSMIT Transmit; + EFI_IP6_RECEIVE Receive; + EFI_IP6_CANCEL Cancel; + EFI_IP6_POLL Poll; }; -extern EFI_GUID gEfiIp6ServiceBindingProtocolGuid; -extern EFI_GUID gEfiIp6ProtocolGuid; +extern EFI_GUID gEfiIp6ServiceBindingProtocolGuid; +extern EFI_GUID gEfiIp6ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Ip6Config.h b/MdePkg/Include/Protocol/Ip6Config.h index 7fcfa27257..b755b9300d 100644 --- a/MdePkg/Include/Protocol/Ip6Config.h +++ b/MdePkg/Include/Protocol/Ip6Config.h @@ -6,6 +6,7 @@ Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ + #ifndef __EFI_IP6CONFIG_PROTOCOL_H__ #define __EFI_IP6CONFIG_PROTOCOL_H__ @@ -102,39 +103,39 @@ typedef struct { /// /// The name of the interface. It is a NULL-terminated string. /// - CHAR16 Name[32]; + CHAR16 Name[32]; /// /// The interface type of the network interface. /// - UINT8 IfType; + UINT8 IfType; /// /// The size, in bytes, of the network interface's hardware address. /// - UINT32 HwAddressSize; + UINT32 HwAddressSize; /// /// The hardware address for the network interface. /// - EFI_MAC_ADDRESS HwAddress; + EFI_MAC_ADDRESS HwAddress; /// /// Number of EFI_IP6_ADDRESS_INFO structures pointed to by AddressInfo. /// - UINT32 AddressInfoCount; + UINT32 AddressInfoCount; /// /// Pointer to an array of EFI_IP6_ADDRESS_INFO instances /// which contain the local IPv6 addresses and the corresponding /// prefix length information. Set to NULL if AddressInfoCount /// is zero. /// - EFI_IP6_ADDRESS_INFO *AddressInfo; + EFI_IP6_ADDRESS_INFO *AddressInfo; /// /// Number of route table entries in the following RouteTable. /// - UINT32 RouteCount; + UINT32 RouteCount; /// /// The route table of the IPv6 network stack runs on this interface. /// Set to NULL if RouteCount is zero. /// - EFI_IP6_ROUTE_TABLE *RouteTable; + EFI_IP6_ROUTE_TABLE *RouteTable; } EFI_IP6_CONFIG_INTERFACE_INFO; /// @@ -142,7 +143,7 @@ typedef struct { /// describes the 64-bit interface ID. /// typedef struct { - UINT8 Id[8]; + UINT8 Id[8]; } EFI_IP6_CONFIG_INTERFACE_ID; /// @@ -190,12 +191,11 @@ typedef struct { /// stack manually when the policy is Ip6ConfigPolicyManual. /// typedef struct { - EFI_IPv6_ADDRESS Address; ///< The IPv6 unicast address. - BOOLEAN IsAnycast; ///< Set to TRUE if Address is anycast. - UINT8 PrefixLength; ///< The length, in bits, of the prefix associated with this Address. + EFI_IPv6_ADDRESS Address; ///< The IPv6 unicast address. + BOOLEAN IsAnycast; ///< Set to TRUE if Address is anycast. + UINT8 PrefixLength; ///< The length, in bits, of the prefix associated with this Address. } EFI_IP6_CONFIG_MANUAL_ADDRESS; - /** Set the configuration for the EFI IPv6 network stack running on the communication device this EFI IPv6 Configuration Protocol instance manages. @@ -356,13 +356,12 @@ EFI_STATUS /// types of configurations for the EFI IPv6 network stack. /// struct _EFI_IP6_CONFIG_PROTOCOL { - EFI_IP6_CONFIG_SET_DATA SetData; - EFI_IP6_CONFIG_GET_DATA GetData; - EFI_IP6_CONFIG_REGISTER_NOTIFY RegisterDataNotify; - EFI_IP6_CONFIG_UNREGISTER_NOTIFY UnregisterDataNotify; + EFI_IP6_CONFIG_SET_DATA SetData; + EFI_IP6_CONFIG_GET_DATA GetData; + EFI_IP6_CONFIG_REGISTER_NOTIFY RegisterDataNotify; + EFI_IP6_CONFIG_UNREGISTER_NOTIFY UnregisterDataNotify; }; -extern EFI_GUID gEfiIp6ConfigProtocolGuid; +extern EFI_GUID gEfiIp6ConfigProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/IpSec.h b/MdePkg/Include/Protocol/IpSec.h index a78010bc09..0b5d55a852 100644 --- a/MdePkg/Include/Protocol/IpSec.h +++ b/MdePkg/Include/Protocol/IpSec.h @@ -33,19 +33,18 @@ 0xa3979e64, 0xace8, 0x4ddc, {0xbc, 0x7, 0x4d, 0x66, 0xb8, 0xfd, 0x9, 0x77 } \ } -typedef struct _EFI_IPSEC_PROTOCOL EFI_IPSEC_PROTOCOL; -typedef struct _EFI_IPSEC2_PROTOCOL EFI_IPSEC2_PROTOCOL; +typedef struct _EFI_IPSEC_PROTOCOL EFI_IPSEC_PROTOCOL; +typedef struct _EFI_IPSEC2_PROTOCOL EFI_IPSEC2_PROTOCOL; /// /// EFI_IPSEC_FRAGMENT_DATA /// defines the instances of packet fragments. /// typedef struct _EFI_IPSEC_FRAGMENT_DATA { - UINT32 FragmentLength; - VOID *FragmentBuffer; + UINT32 FragmentLength; + VOID *FragmentBuffer; } EFI_IPSEC_FRAGMENT_DATA; - /** Handles IPsec packet processing for inbound and outbound IP packets. @@ -83,7 +82,7 @@ EFI_STATUS IN OUT EFI_IPSEC_FRAGMENT_DATA **FragmentTable, IN UINT32 *FragmentCount, IN EFI_IPSEC_TRAFFIC_DIR TrafficDirection, - OUT EFI_EVENT *RecycleSignal + OUT EFI_EVENT *RecycleSignal ); /// @@ -95,9 +94,9 @@ EFI_STATUS // and IPv6 environment. /// struct _EFI_IPSEC_PROTOCOL { - EFI_IPSEC_PROCESS Process; ///< Handle the IPsec message. - EFI_EVENT DisabledEvent; ///< Event signaled when the interface is disabled. - BOOLEAN DisabledFlag; ///< State of the interface. + EFI_IPSEC_PROCESS Process; ///< Handle the IPsec message. + EFI_EVENT DisabledEvent; ///< Event signaled when the interface is disabled. + BOOLEAN DisabledFlag; ///< State of the interface. }; /** @@ -185,7 +184,7 @@ struct _EFI_IPSEC_PROTOCOL { **/ typedef EFI_STATUS -(EFIAPI *EFI_IPSEC_PROCESSEXT) ( +(EFIAPI *EFI_IPSEC_PROCESSEXT)( IN EFI_IPSEC2_PROTOCOL *This, IN EFI_HANDLE NicHandle, IN UINT8 IpVer, @@ -196,7 +195,7 @@ EFI_STATUS IN OUT EFI_IPSEC_FRAGMENT_DATA **FragmentTable, IN OUT UINT32 *FragmentCount, IN EFI_IPSEC_TRAFFIC_DIR TrafficDirection, - OUT EFI_EVENT *RecycleSignal + OUT EFI_EVENT *RecycleSignal ); /// @@ -208,11 +207,11 @@ EFI_STATUS /// encrypting each IP packet in a data stream. /// struct _EFI_IPSEC2_PROTOCOL { -EFI_IPSEC_PROCESSEXT ProcessExt; -EFI_EVENT DisabledEvent; -BOOLEAN DisabledFlag; + EFI_IPSEC_PROCESSEXT ProcessExt; + EFI_EVENT DisabledEvent; + BOOLEAN DisabledFlag; }; -extern EFI_GUID gEfiIpSecProtocolGuid; -extern EFI_GUID gEfiIpSec2ProtocolGuid; +extern EFI_GUID gEfiIpSecProtocolGuid; +extern EFI_GUID gEfiIpSec2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/IpSecConfig.h b/MdePkg/Include/Protocol/IpSecConfig.h index 24d1b4d65c..7136060691 100644 --- a/MdePkg/Include/Protocol/IpSecConfig.h +++ b/MdePkg/Include/Protocol/IpSecConfig.h @@ -14,7 +14,6 @@ #ifndef __EFI_IPSE_CCONFIG_PROTOCOL_H__ #define __EFI_IPSE_CCONFIG_PROTOCOL_H__ - #define EFI_IPSEC_CONFIG_PROTOCOL_GUID \ { \ 0xce5e5929, 0xc7a3, 0x4602, {0xad, 0x9e, 0xc9, 0xda, 0xf9, 0x4e, 0xbf, 0xcf } \ @@ -64,11 +63,10 @@ typedef enum { /// EFI_IP_ADDRESS_INFO /// typedef struct _EFI_IP_ADDRESS_INFO { - EFI_IP_ADDRESS Address; ///< The IPv4 or IPv6 address - UINT8 PrefixLength; ///< The length of the prefix associated with the Address. + EFI_IP_ADDRESS Address; ///< The IPv4 or IPv6 address + UINT8 PrefixLength; ///< The length of the prefix associated with the Address. } EFI_IP_ADDRESS_INFO; - /// /// EFI_IPSEC_SPD_SELECTOR /// @@ -76,52 +74,52 @@ typedef struct _EFI_IPSEC_SPD_SELECTOR { /// /// Specifies the actual number of entries in LocalAddress. /// - UINT32 LocalAddressCount; + UINT32 LocalAddressCount; /// /// A list of ranges of IPv4 or IPv6 addresses, which refers to the /// addresses being protected by IPsec policy. /// - EFI_IP_ADDRESS_INFO *LocalAddress; + EFI_IP_ADDRESS_INFO *LocalAddress; /// /// Specifies the actual number of entries in RemoteAddress. /// - UINT32 RemoteAddressCount; + UINT32 RemoteAddressCount; /// /// A list of ranges of IPv4 or IPv6 addresses, which are peer entities /// to LocalAddress. /// - EFI_IP_ADDRESS_INFO *RemoteAddress; + EFI_IP_ADDRESS_INFO *RemoteAddress; /// /// Next layer protocol. Obtained from the IPv4 Protocol or the IPv6 /// Next Header fields. The next layer protocol is whatever comes /// after any IP extension headers that are present. A zero value is a /// wildcard that matches any value in NextLayerProtocol field. /// - UINT16 NextLayerProtocol; + UINT16 NextLayerProtocol; /// /// Local Port if the Next Layer Protocol uses two ports (as do TCP, /// UDP, and others). A zero value is a wildcard that matches any /// value in LocalPort field. /// - UINT16 LocalPort; + UINT16 LocalPort; /// /// A designed port range size. The start port is LocalPort, and /// the total number of ports is described by LocalPortRange. /// This field is ignored if NextLayerProtocol does not use /// ports. /// - UINT16 LocalPortRange; + UINT16 LocalPortRange; /// /// Remote Port if the Next Layer Protocol uses two ports. A zero /// value is a wildcard that matches any value in RemotePort field. /// - UINT16 RemotePort; + UINT16 RemotePort; /// /// A designed port range size. The start port is RemotePort, and /// the total number of ports is described by RemotePortRange. /// This field is ignored if NextLayerProtocol does not use ports. /// - UINT16 RemotePortRange; + UINT16 RemotePortRange; } EFI_IPSEC_SPD_SELECTOR; /// @@ -179,17 +177,17 @@ typedef struct _EFI_IPSEC_SA_LIFETIME { /// AH, this is the authentication algorithm. The ByteCount /// includes pad bytes for cryptographic operations. /// - UINT64 ByteCount; + UINT64 ByteCount; /// /// A time interval in second that warns the implementation to /// initiate action such as setting up a replacement SA. /// - UINT64 SoftLifetime; + UINT64 SoftLifetime; /// /// A time interval in second when the current SA ends and is /// destroyed. /// - UINT64 HardLifetime; + UINT64 HardLifetime; } EFI_IPSEC_SA_LIFETIME; /// @@ -223,17 +221,17 @@ typedef struct _EFI_IPSEC_TUNNEL_OPTION { /// /// Local tunnel address when IPsec mode is EfiIPsecTunnel. /// - EFI_IP_ADDRESS LocalTunnelAddress; + EFI_IP_ADDRESS LocalTunnelAddress; /// /// Remote tunnel address when IPsec mode is EfiIPsecTunnel. /// - EFI_IP_ADDRESS RemoteTunnelAddress; + EFI_IP_ADDRESS RemoteTunnelAddress; /// /// The option of copying the DF bit from an outbound package /// to the tunnel mode header that it emits, when traffic is /// carried via a tunnel mode SA. /// - EFI_IPSEC_TUNNEL_DF_OPTION DF; + EFI_IPSEC_TUNNEL_DF_OPTION DF; } EFI_IPSEC_TUNNEL_OPTION; /// @@ -253,47 +251,47 @@ typedef struct _EFI_IPSEC_PROCESS_POLICY { /// Extended Sequence Number. Is this SA using extended sequence /// numbers. 64 bit counter is used if TRUE. /// - BOOLEAN ExtSeqNum; + BOOLEAN ExtSeqNum; /// /// A flag indicating whether overflow of the sequence number /// counter should generate an auditable event and prevent /// transmission of additional packets on the SA, or whether rollover /// is permitted. /// - BOOLEAN SeqOverflow; + BOOLEAN SeqOverflow; /// /// Is this SA using stateful fragment checking. TRUE represents /// stateful fragment checking. /// - BOOLEAN FragCheck; + BOOLEAN FragCheck; /// /// A time interval after which a SA must be replaced with a new SA /// (and new SPI) or terminated. /// - EFI_IPSEC_SA_LIFETIME SaLifetime; + EFI_IPSEC_SA_LIFETIME SaLifetime; /// /// IPsec mode: tunnel or transport. /// - EFI_IPSEC_MODE Mode; + EFI_IPSEC_MODE Mode; /// /// Tunnel Option. TunnelOption is ignored if Mode is EfiIPsecTransport. /// - EFI_IPSEC_TUNNEL_OPTION *TunnelOption; + EFI_IPSEC_TUNNEL_OPTION *TunnelOption; /// /// IPsec protocol: AH or ESP /// - EFI_IPSEC_PROTOCOL_TYPE Proto; + EFI_IPSEC_PROTOCOL_TYPE Proto; /// /// Cryptographic algorithm type used for authentication. /// - UINT8 AuthAlgoId; + UINT8 AuthAlgoId; /// /// Cryptographic algorithm type used for encryption. EncAlgo is /// NULL when IPsec protocol is AH. For ESP protocol, EncAlgo /// can also be used to describe the algorithm if a combined mode /// algorithm is used. /// - UINT8 EncAlgoId; + UINT8 EncAlgoId; } EFI_IPSEC_PROCESS_POLICY; /// @@ -306,19 +304,18 @@ typedef struct _EFI_IPSEC_SA_ID { /// that is used by a receiver to identity the SA to which an incoming /// package should be bound. /// - UINT32 Spi; + UINT32 Spi; /// /// IPsec protocol: AH or ESP /// - EFI_IPSEC_PROTOCOL_TYPE Proto; + EFI_IPSEC_PROTOCOL_TYPE Proto; /// /// Destination IP address. /// - EFI_IP_ADDRESS DestAddress; + EFI_IP_ADDRESS DestAddress; } EFI_IPSEC_SA_ID; - -#define MAX_PEERID_LEN 128 +#define MAX_PEERID_LEN 128 /// /// EFI_IPSEC_SPD_DATA @@ -328,7 +325,7 @@ typedef struct _EFI_IPSEC_SPD_DATA { /// A null-terminated ASCII name string which is used as a symbolic /// identifier for an IPsec Local or Remote address. /// - UINT8 Name[MAX_PEERID_LEN]; + UINT8 Name[MAX_PEERID_LEN]; /// /// Bit-mapped list describing Populate from Packet flags. When /// creating a SA, if PackageFlag bit is set to TRUE, instantiate @@ -344,29 +341,29 @@ typedef struct _EFI_IPSEC_SPD_DATA { /// Bit 4: EFI_IPSEC_SPD_SELECTOR.RemotePort /// Others: Reserved. /// - UINT32 PackageFlag; + UINT32 PackageFlag; /// /// The traffic direction of data gram. /// - EFI_IPSEC_TRAFFIC_DIR TrafficDirection; + EFI_IPSEC_TRAFFIC_DIR TrafficDirection; /// /// Processing choices to indicate which action is required by this /// policy. /// - EFI_IPSEC_ACTION Action; + EFI_IPSEC_ACTION Action; /// /// The policy and rule information for a SPD entry. /// - EFI_IPSEC_PROCESS_POLICY *ProcessingPolicy; + EFI_IPSEC_PROCESS_POLICY *ProcessingPolicy; /// /// Specifies the actual number of entries in SaId list. /// - UINTN SaIdCount; + UINTN SaIdCount; /// /// The SAD entry used for the traffic processing. The /// existed SAD entry links indicate this is the manual key case. /// - EFI_IPSEC_SA_ID SaId[1]; + EFI_IPSEC_SA_ID SaId[1]; } EFI_IPSEC_SPD_DATA; /// @@ -375,9 +372,9 @@ typedef struct _EFI_IPSEC_SPD_DATA { /// The required authentication algorithm is specified in RFC 4305. /// typedef struct _EFI_IPSEC_AH_ALGO_INFO { - UINT8 AuthAlgoId; - UINTN AuthKeyLength; - VOID *AuthKey; + UINT8 AuthAlgoId; + UINTN AuthKeyLength; + VOID *AuthKey; } EFI_IPSEC_AH_ALGO_INFO; /// @@ -389,20 +386,20 @@ typedef struct _EFI_IPSEC_AH_ALGO_INFO { /// confidentiality and authentication services. /// typedef struct _EFI_IPSEC_ESP_ALGO_INFO { - UINT8 EncAlgoId; - UINTN EncKeyLength; - VOID *EncKey; - UINT8 AuthAlgoId; - UINTN AuthKeyLength; - VOID *AuthKey; + UINT8 EncAlgoId; + UINTN EncKeyLength; + VOID *EncKey; + UINT8 AuthAlgoId; + UINTN AuthKeyLength; + VOID *AuthKey; } EFI_IPSEC_ESP_ALGO_INFO; /// /// EFI_IPSEC_ALGO_INFO /// typedef union { - EFI_IPSEC_AH_ALGO_INFO AhAlgoInfo; - EFI_IPSEC_ESP_ALGO_INFO EspAlgoInfo; + EFI_IPSEC_AH_ALGO_INFO AhAlgoInfo; + EFI_IPSEC_ESP_ALGO_INFO EspAlgoInfo; } EFI_IPSEC_ALGO_INFO; /// @@ -412,40 +409,40 @@ typedef struct _EFI_IPSEC_SA_DATA { /// /// IPsec mode: tunnel or transport. /// - EFI_IPSEC_MODE Mode; + EFI_IPSEC_MODE Mode; /// /// Sequence Number Counter. A 64-bit counter used to generate the /// sequence number field in AH or ESP headers. /// - UINT64 SNCount; + UINT64 SNCount; /// /// Anti-Replay Window. A 64-bit counter and a bit-map used to /// determine whether an inbound AH or ESP packet is a replay. /// - UINT8 AntiReplayWindows; + UINT8 AntiReplayWindows; /// /// AH/ESP cryptographic algorithm, key and parameters. /// - EFI_IPSEC_ALGO_INFO AlgoInfo; + EFI_IPSEC_ALGO_INFO AlgoInfo; /// /// Lifetime of this SA. /// - EFI_IPSEC_SA_LIFETIME SaLifetime; + EFI_IPSEC_SA_LIFETIME SaLifetime; /// /// Any observed path MTU and aging variables. The Path MTU /// processing is defined in section 8 of RFC 4301. /// - UINT32 PathMTU; + UINT32 PathMTU; /// /// Link to one SPD entry. /// - EFI_IPSEC_SPD_SELECTOR *SpdSelector; + EFI_IPSEC_SPD_SELECTOR *SpdSelector; /// /// Indication of whether it's manually set or negotiated automatically. /// If ManualSet is FALSE, the corresponding SA entry is inserted through /// IKE protocol negotiation. /// - BOOLEAN ManualSet; + BOOLEAN ManualSet; } EFI_IPSEC_SA_DATA; /// @@ -455,51 +452,50 @@ typedef struct _EFI_IPSEC_SA_DATA2 { /// /// IPsec mode: tunnel or transport /// - EFI_IPSEC_MODE Mode; + EFI_IPSEC_MODE Mode; /// /// Sequence Number Counter. A 64-bit counter used to generate the sequence /// number field in AH or ESP headers. /// - UINT64 SNCount; + UINT64 SNCount; /// /// Anti-Replay Window. A 64-bit counter and a bit-map used to determine /// whether an inbound AH or ESP packet is a replay. /// - UINT8 AntiReplayWindows; + UINT8 AntiReplayWindows; /// /// AH/ESP cryptographic algorithm, key and parameters. /// - EFI_IPSEC_ALGO_INFO AlgoInfo; + EFI_IPSEC_ALGO_INFO AlgoInfo; /// /// Lifetime of this SA. /// - EFI_IPSEC_SA_LIFETIME SaLifetime; + EFI_IPSEC_SA_LIFETIME SaLifetime; /// /// Any observed path MTU and aging variables. The Path MTU processing is /// defined in section 8 of RFC 4301. /// - UINT32 PathMTU; + UINT32 PathMTU; /// /// Link to one SPD entry /// - EFI_IPSEC_SPD_SELECTOR *SpdSelector; + EFI_IPSEC_SPD_SELECTOR *SpdSelector; /// /// Indication of whether it's manually set or negotiated automatically. /// If ManualSet is FALSE, the corresponding SA entry is inserted through IKE /// protocol negotiation /// - BOOLEAN ManualSet; + BOOLEAN ManualSet; /// /// The tunnel header IP source address. /// - EFI_IP_ADDRESS TunnelSourceAddress; + EFI_IP_ADDRESS TunnelSourceAddress; /// /// The tunnel header IP destination address. /// - EFI_IP_ADDRESS TunnelDestinationAddress; + EFI_IP_ADDRESS TunnelDestinationAddress; } EFI_IPSEC_SA_DATA2; - /// /// EFI_IPSEC_PAD_ID /// specifies the identifier for PAD entry, which is also used for SPD lookup. @@ -509,19 +505,19 @@ typedef struct _EFI_IPSEC_PAD_ID { /// /// Flag to identify which type of PAD Id is used. /// - BOOLEAN PeerIdValid; + BOOLEAN PeerIdValid; union { /// /// Pointer to the IPv4 or IPv6 address range. /// - EFI_IP_ADDRESS_INFO IpAddress; + EFI_IP_ADDRESS_INFO IpAddress; /// /// Pointer to a null terminated ASCII string /// representing the symbolic names. A PeerId can be a DNS /// name, Distinguished Name, RFC 822 email address or Key ID /// (specified in section 4.4.3.1 of RFC 4301) /// - UINT8 PeerId[MAX_PEERID_LEN]; + UINT8 PeerId[MAX_PEERID_LEN]; } Id; } EFI_IPSEC_PAD_ID; @@ -531,9 +527,9 @@ typedef struct _EFI_IPSEC_PAD_ID { /// of type EFI_IPSEC_CONFIG_DATA_TYPE. /// typedef union { - EFI_IPSEC_SPD_SELECTOR SpdSelector; - EFI_IPSEC_SA_ID SaId; - EFI_IPSEC_PAD_ID PadId; + EFI_IPSEC_SPD_SELECTOR SpdSelector; + EFI_IPSEC_SA_ID SaId; + EFI_IPSEC_PAD_ID PadId; } EFI_IPSEC_CONFIG_SELECTOR; /// @@ -569,39 +565,38 @@ typedef struct _EFI_IPSEC_PAD_DATA { /// /// Authentication Protocol for IPsec security association management. /// - EFI_IPSEC_AUTH_PROTOCOL_TYPE AuthProtocol; + EFI_IPSEC_AUTH_PROTOCOL_TYPE AuthProtocol; /// /// Authentication method used. /// - EFI_IPSEC_AUTH_METHOD AuthMethod; + EFI_IPSEC_AUTH_METHOD AuthMethod; /// /// The IKE ID payload will be used as a symbolic name for SPD /// lookup if IkeIdFlag is TRUE. Otherwise, the remote IP /// address provided in traffic selector playloads will be used. /// - BOOLEAN IkeIdFlag; + BOOLEAN IkeIdFlag; /// /// The size of Authentication data buffer, in bytes. /// - UINTN AuthDataSize; + UINTN AuthDataSize; /// /// Buffer for Authentication data, (e.g., the pre-shared secret or the /// trust anchor relative to which the peer's certificate will be /// validated). /// - VOID *AuthData; + VOID *AuthData; /// /// The size of RevocationData, in bytes /// - UINTN RevocationDataSize; + UINTN RevocationDataSize; /// /// Pointer to CRL or OCSP data, if certificates are used for /// authentication method. /// - VOID *RevocationData; + VOID *RevocationData; } EFI_IPSEC_PAD_DATA; - /** Set the security association, security policy and peer authorization configuration information for the EFI IPsec driver. @@ -789,13 +784,13 @@ EFI_STATUS /// protocol for IPsec configuration in both IPv4 and IPv6 environment. /// struct _EFI_IPSEC_CONFIG_PROTOCOL { - EFI_IPSEC_CONFIG_SET_DATA SetData; - EFI_IPSEC_CONFIG_GET_DATA GetData; - EFI_IPSEC_CONFIG_GET_NEXT_SELECTOR GetNextSelector; - EFI_IPSEC_CONFIG_REGISTER_NOTIFY RegisterDataNotify; - EFI_IPSEC_CONFIG_UNREGISTER_NOTIFY UnregisterDataNotify; + EFI_IPSEC_CONFIG_SET_DATA SetData; + EFI_IPSEC_CONFIG_GET_DATA GetData; + EFI_IPSEC_CONFIG_GET_NEXT_SELECTOR GetNextSelector; + EFI_IPSEC_CONFIG_REGISTER_NOTIFY RegisterDataNotify; + EFI_IPSEC_CONFIG_UNREGISTER_NOTIFY UnregisterDataNotify; }; -extern EFI_GUID gEfiIpSecConfigProtocolGuid; +extern EFI_GUID gEfiIpSecConfigProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/IsaHc.h b/MdePkg/Include/Protocol/IsaHc.h index 6628996a5c..221c86b24e 100644 --- a/MdePkg/Include/Protocol/IsaHc.h +++ b/MdePkg/Include/Protocol/IsaHc.h @@ -26,8 +26,8 @@ 0xfad7933a, 0x6c21, 0x4234, {0xa4, 0x34, 0x0a, 0x8a, 0x0d, 0x2b, 0x07, 0x81} \ } -typedef struct _EFI_ISA_HC_PROTOCOL EFI_ISA_HC_PROTOCOL; -typedef struct _EFI_ISA_HC_PROTOCOL *PEFI_ISA_HC_PROTOCOL; +typedef struct _EFI_ISA_HC_PROTOCOL EFI_ISA_HC_PROTOCOL; +typedef struct _EFI_ISA_HC_PROTOCOL *PEFI_ISA_HC_PROTOCOL; /** Open I/O aperture. @@ -52,7 +52,7 @@ typedef struct _EFI_ISA_HC_PROTOCOL *PEFI_ISA_HC_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_ISA_HC_OPEN_IO) ( +(EFIAPI *EFI_ISA_HC_OPEN_IO)( IN CONST EFI_ISA_HC_PROTOCOL *This, IN UINT16 IoAddress, IN UINT16 IoLength, @@ -77,7 +77,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_ISA_HC_CLOSE_IO) ( +(EFIAPI *EFI_ISA_HC_CLOSE_IO)( IN CONST EFI_ISA_HC_PROTOCOL *This, IN UINT64 IoApertureHandle ); @@ -90,21 +90,21 @@ struct _EFI_ISA_HC_PROTOCOL { /// The version of this protocol. Higher version numbers are backward /// compatible with lower version numbers. /// - UINT32 Version; + UINT32 Version; /// /// Open an I/O aperture. /// - EFI_ISA_HC_OPEN_IO OpenIoAperture; + EFI_ISA_HC_OPEN_IO OpenIoAperture; /// /// Close an I/O aperture. /// - EFI_ISA_HC_CLOSE_IO CloseIoAperture; + EFI_ISA_HC_CLOSE_IO CloseIoAperture; }; /// /// Reference to variable defined in the .DEC file /// -extern EFI_GUID gEfiIsaHcProtocolGuid; -extern EFI_GUID gEfiIsaHcServiceBindingProtocolGuid; +extern EFI_GUID gEfiIsaHcProtocolGuid; +extern EFI_GUID gEfiIsaHcServiceBindingProtocolGuid; -#endif // __ISA_HC_H__ +#endif // __ISA_HC_H__ diff --git a/MdePkg/Include/Protocol/Kms.h b/MdePkg/Include/Protocol/Kms.h index 7dac7efcdc..c37fcbb65c 100644 --- a/MdePkg/Include/Protocol/Kms.h +++ b/MdePkg/Include/Protocol/Kms.h @@ -27,12 +27,11 @@ typedef struct _EFI_KMS_PROTOCOL EFI_KMS_PROTOCOL; // Where appropriate, EFI_KMS_DATA_TYPE values may be combined using a bitwise 'OR' // operation to indicate support for multiple data types. // -#define EFI_KMS_DATA_TYPE_NONE 0 -#define EFI_KMS_DATA_TYPE_BINARY 1 -#define EFI_KMS_DATA_TYPE_ASCII 2 -#define EFI_KMS_DATA_TYPE_UNICODE 4 -#define EFI_KMS_DATA_TYPE_UTF8 8 - +#define EFI_KMS_DATA_TYPE_NONE 0 +#define EFI_KMS_DATA_TYPE_BINARY 1 +#define EFI_KMS_DATA_TYPE_ASCII 2 +#define EFI_KMS_DATA_TYPE_UNICODE 4 +#define EFI_KMS_DATA_TYPE_UTF8 8 // // The key formats recognized by the KMS protocol are defined by an EFI_GUID which specifies @@ -160,76 +159,76 @@ typedef struct _EFI_KMS_PROTOCOL EFI_KMS_PROTOCOL; } ///@} -#define EFI_KMS_ATTRIBUTE_TYPE_NONE 0x00 -#define EFI_KMS_ATTRIBUTE_TYPE_INTEGER 0x01 -#define EFI_KMS_ATTRIBUTE_TYPE_LONG_INTEGER 0x02 -#define EFI_KMS_ATTRIBUTE_TYPE_BIG_INTEGER 0x03 -#define EFI_KMS_ATTRIBUTE_TYPE_ENUMERATION 0x04 -#define EFI_KMS_ATTRIBUTE_TYPE_BOOLEAN 0x05 -#define EFI_KMS_ATTRIBUTE_TYPE_BYTE_STRING 0x06 -#define EFI_KMS_ATTRIBUTE_TYPE_TEXT_STRING 0x07 -#define EFI_KMS_ATTRIBUTE_TYPE_DATE_TIME 0x08 -#define EFI_KMS_ATTRIBUTE_TYPE_INTERVAL 0x09 -#define EFI_KMS_ATTRIBUTE_TYPE_STRUCTURE 0x0A -#define EFI_KMS_ATTRIBUTE_TYPE_DYNAMIC 0x0B +#define EFI_KMS_ATTRIBUTE_TYPE_NONE 0x00 +#define EFI_KMS_ATTRIBUTE_TYPE_INTEGER 0x01 +#define EFI_KMS_ATTRIBUTE_TYPE_LONG_INTEGER 0x02 +#define EFI_KMS_ATTRIBUTE_TYPE_BIG_INTEGER 0x03 +#define EFI_KMS_ATTRIBUTE_TYPE_ENUMERATION 0x04 +#define EFI_KMS_ATTRIBUTE_TYPE_BOOLEAN 0x05 +#define EFI_KMS_ATTRIBUTE_TYPE_BYTE_STRING 0x06 +#define EFI_KMS_ATTRIBUTE_TYPE_TEXT_STRING 0x07 +#define EFI_KMS_ATTRIBUTE_TYPE_DATE_TIME 0x08 +#define EFI_KMS_ATTRIBUTE_TYPE_INTERVAL 0x09 +#define EFI_KMS_ATTRIBUTE_TYPE_STRUCTURE 0x0A +#define EFI_KMS_ATTRIBUTE_TYPE_DYNAMIC 0x0B typedef struct { /// /// Length in bytes of the KeyData. /// - UINT32 KeySize; + UINT32 KeySize; /// /// The data of the key. /// - UINT8 KeyData[1]; + UINT8 KeyData[1]; } EFI_KMS_FORMAT_GENERIC_DYNAMIC; typedef struct { /// /// The size in bytes for the client identifier. /// - UINT16 ClientIdSize; + UINT16 ClientIdSize; /// /// Pointer to a valid client identifier. /// - VOID *ClientId; + VOID *ClientId; /// /// The client name string type used by this client. The string type set here must be one of /// the string types reported in the ClientNameStringTypes field of the KMS protocol. If the /// KMS does not support client names, this field should be set to EFI_KMS_DATA_TYPE_NONE. /// - UINT8 ClientNameType; + UINT8 ClientNameType; /// /// The size in characters for the client name. This field will be ignored if /// ClientNameStringType is set to EFI_KMS_DATA_TYPE_NONE. Otherwise, it must contain /// number of characters contained in the ClientName field. /// - UINT8 ClientNameCount; + UINT8 ClientNameCount; /// /// Pointer to a client name. This field will be ignored if ClientNameStringType is set to /// EFI_KMS_DATA_TYPE_NONE. Otherwise, it must point to a valid string of the specified type. /// - VOID *ClientName; + VOID *ClientName; } EFI_KMS_CLIENT_INFO; typedef struct { /// /// The size of the KeyIdentifier field in bytes. This field is limited to the range 0 to 255. /// - UINT8 KeyIdentifierSize; + UINT8 KeyIdentifierSize; /// /// Pointer to an array of KeyIdentifierType elements. /// - VOID *KeyIdentifier; + VOID *KeyIdentifier; /// /// An EFI_GUID which specifies the algorithm and key value size for this key. /// - EFI_GUID KeyFormat; + EFI_GUID KeyFormat; /// /// Pointer to a key value for a key specified by the KeyFormat field. A NULL value for this /// field indicates that no key is available. /// - VOID *KeyValue; + VOID *KeyValue; /// /// Specifies the results of KMS operations performed with this descriptor. This field is used /// to indicate the status of individual operations when a KMS function is called with multiple @@ -255,31 +254,31 @@ typedef struct { /// Part of a tag-type-length triplet that identifies the KeyAttributeData formatting. The /// definition of the value is outside the scope of this standard and may be defined by the KMS. /// - UINT16 Tag; + UINT16 Tag; /// /// Part of a tag-type-length triplet that identifies the KeyAttributeData formatting. The /// definition of the value is outside the scope of this standard and may be defined by the KMS. /// - UINT16 Type; + UINT16 Type; /// /// Length in bytes of the KeyAttributeData. /// - UINT32 Length; + UINT32 Length; /// /// An array of bytes to hold the attribute data associated with the KeyAttributeIdentifier. /// - UINT8 KeyAttributeData[1]; + UINT8 KeyAttributeData[1]; } EFI_KMS_DYNAMIC_FIELD; typedef struct { /// /// The number of members in the EFI_KMS_DYNAMIC_ATTRIBUTE structure. /// - UINT32 FieldCount; + UINT32 FieldCount; /// /// An array of EFI_KMS_DYNAMIC_FIELD structures. /// - EFI_KMS_DYNAMIC_FIELD Field[1]; + EFI_KMS_DYNAMIC_FIELD Field[1]; } EFI_KMS_DYNAMIC_ATTRIBUTE; typedef struct { @@ -288,17 +287,17 @@ typedef struct { /// by the EFI_KMS_DATA_TYPE constants, except that EFI_KMS_DATA_TYPE_BINARY is not /// valid for this field. /// - UINT8 KeyAttributeIdentifierType; + UINT8 KeyAttributeIdentifierType; /// /// The length of the KeyAttributeIdentifier field in units defined by KeyAttributeIdentifierType /// field. This field is limited to the range 0 to 255. /// - UINT8 KeyAttributeIdentifierCount; + UINT8 KeyAttributeIdentifierCount; /// /// Pointer to an array of KeyAttributeIdentifierType elements. For string types, there must /// not be a null-termination element at the end of the array. /// - VOID *KeyAttributeIdentifier; + VOID *KeyAttributeIdentifier; /// /// The instance number of this attribute. If there is only one instance, the value is set to /// one. If this value is set to 0xFFFF (all binary 1's) then this field should be ignored if an @@ -307,22 +306,22 @@ typedef struct { /// field in the request. If set to 0xFFFF in the request, it will match any attribute with the /// same KeyAttributeIdentifier. /// - UINT16 KeyAttributeInstance; + UINT16 KeyAttributeInstance; /// /// The data type of the KeyAttributeValue (e.g. struct, bool, etc.). See the list of /// KeyAttributeType definitions. /// - UINT16 KeyAttributeType; + UINT16 KeyAttributeType; /// /// The size in bytes of the KeyAttribute field. A value of zero for this field indicates that no /// key attribute value is available. /// - UINT16 KeyAttributeValueSize; + UINT16 KeyAttributeValueSize; /// /// Pointer to a key attribute value for the attribute specified by the KeyAttributeIdentifier /// field. If the KeyAttributeValueSize field is zero, then this field must be NULL. /// - VOID *KeyAttributeValue; + VOID *KeyAttributeValue; /// /// KeyAttributeStatusSpecifies the results of KMS operations performed with this attribute. /// This field is used to indicate the status of individual operations when a KMS function is @@ -358,7 +357,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_KMS_GET_SERVICE_STATUS) ( +(EFIAPI *EFI_KMS_GET_SERVICE_STATUS)( IN EFI_KMS_PROTOCOL *This ); @@ -407,7 +406,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_KMS_REGISTER_CLIENT) ( +(EFIAPI *EFI_KMS_REGISTER_CLIENT)( IN EFI_KMS_PROTOCOL *This, IN EFI_KMS_CLIENT_INFO *Client, IN OUT UINTN *ClientDataSize OPTIONAL, @@ -501,7 +500,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_KMS_CREATE_KEY) ( +(EFIAPI *EFI_KMS_CREATE_KEY)( IN EFI_KMS_PROTOCOL *This, IN EFI_KMS_CLIENT_INFO *Client, IN OUT UINT16 *KeyDescriptorCount, @@ -589,7 +588,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_KMS_GET_KEY) ( +(EFIAPI *EFI_KMS_GET_KEY)( IN EFI_KMS_PROTOCOL *This, IN EFI_KMS_CLIENT_INFO *Client, IN OUT UINT16 *KeyDescriptorCount, @@ -675,7 +674,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_KMS_ADD_KEY) ( +(EFIAPI *EFI_KMS_ADD_KEY)( IN EFI_KMS_PROTOCOL *This, IN EFI_KMS_CLIENT_INFO *Client, IN OUT UINT16 *KeyDescriptorCount, @@ -754,7 +753,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_KMS_DELETE_KEY) ( +(EFIAPI *EFI_KMS_DELETE_KEY)( IN EFI_KMS_PROTOCOL *This, IN EFI_KMS_CLIENT_INFO *Client, IN OUT UINT16 *KeyDescriptorCount, @@ -841,7 +840,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_KMS_GET_KEY_ATTRIBUTES) ( +(EFIAPI *EFI_KMS_GET_KEY_ATTRIBUTES)( IN EFI_KMS_PROTOCOL *This, IN EFI_KMS_CLIENT_INFO *Client, IN UINT8 *KeyIdentifierSize, @@ -931,7 +930,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_KMS_ADD_KEY_ATTRIBUTES) ( +(EFIAPI *EFI_KMS_ADD_KEY_ATTRIBUTES)( IN EFI_KMS_PROTOCOL *This, IN EFI_KMS_CLIENT_INFO *Client, IN UINT8 *KeyIdentifierSize, @@ -1014,7 +1013,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_KMS_DELETE_KEY_ATTRIBUTES) ( +(EFIAPI *EFI_KMS_DELETE_KEY_ATTRIBUTES)( IN EFI_KMS_PROTOCOL *This, IN EFI_KMS_CLIENT_INFO *Client, IN UINT8 *KeyIdentifierSize, @@ -1117,7 +1116,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_KMS_GET_KEY_BY_ATTRIBUTES) ( +(EFIAPI *EFI_KMS_GET_KEY_BY_ATTRIBUTES)( IN EFI_KMS_PROTOCOL *This, IN EFI_KMS_CLIENT_INFO *Client, IN OUT UINTN *KeyAttributeCount, @@ -1138,64 +1137,64 @@ struct _EFI_KMS_PROTOCOL { /// connected to the KMS, then a call to this function will initiate a connection. This is the /// only function that is valid for use prior to the service being marked available. /// - EFI_KMS_GET_SERVICE_STATUS GetServiceStatus; + EFI_KMS_GET_SERVICE_STATUS GetServiceStatus; /// /// Register a specific client with the KMS. /// - EFI_KMS_REGISTER_CLIENT RegisterClient; + EFI_KMS_REGISTER_CLIENT RegisterClient; /// /// Request the generation of a new key and retrieve it. /// - EFI_KMS_CREATE_KEY CreateKey; + EFI_KMS_CREATE_KEY CreateKey; /// /// Retrieve an existing key. /// - EFI_KMS_GET_KEY GetKey; + EFI_KMS_GET_KEY GetKey; /// /// Add a local key to KMS database. If there is an existing key with this key identifier in the /// KMS database, it will be replaced with the new key. /// - EFI_KMS_ADD_KEY AddKey; + EFI_KMS_ADD_KEY AddKey; /// /// Delete an existing key from the KMS database. /// - EFI_KMS_DELETE_KEY DeleteKey; + EFI_KMS_DELETE_KEY DeleteKey; /// /// Get attributes for an existing key in the KMS database. /// - EFI_KMS_GET_KEY_ATTRIBUTES GetKeyAttributes; + EFI_KMS_GET_KEY_ATTRIBUTES GetKeyAttributes; /// /// Add attributes to an existing key in the KMS database. /// - EFI_KMS_ADD_KEY_ATTRIBUTES AddKeyAttributes; + EFI_KMS_ADD_KEY_ATTRIBUTES AddKeyAttributes; /// /// Delete attributes for an existing key in the KMS database. /// - EFI_KMS_DELETE_KEY_ATTRIBUTES DeleteKeyAttributes; + EFI_KMS_DELETE_KEY_ATTRIBUTES DeleteKeyAttributes; /// /// Get existing key(s) with the specified attributes. /// - EFI_KMS_GET_KEY_BY_ATTRIBUTES GetKeyByAttributes; + EFI_KMS_GET_KEY_BY_ATTRIBUTES GetKeyByAttributes; /// /// The version of this EFI_KMS_PROTOCOL structure. This must be set to 0x00020040 for /// the initial version of this protocol. /// - UINT32 ProtocolVersion; + UINT32 ProtocolVersion; /// /// Optional GUID used to identify a specific KMS. This GUID may be supplied by the provider, /// by the implementation, or may be null. If is null, then the ServiceName must not be null. /// - EFI_GUID ServiceId; + EFI_GUID ServiceId; /// /// Optional pointer to a unicode string which may be used to identify the KMS or provide /// other information about the supplier. /// - CHAR16 *ServiceName; + CHAR16 *ServiceName; /// /// Optional 32-bit value which may be used to indicate the version of the KMS provided by /// the supplier. /// - UINT32 ServiceVersion; + UINT32 ServiceVersion; /// /// TRUE if and only if the service is active and available for use. To avoid unnecessary /// delays in POST, this protocol may be installed without connecting to the service. In this @@ -1204,64 +1203,64 @@ struct _EFI_KMS_PROTOCOL { /// as defined in the reminder of this protocol are not guaranteed to be valid until the service /// has been marked available. /// - BOOLEAN ServiceAvailable; + BOOLEAN ServiceAvailable; /// /// TRUE if and only if the service supports client identifiers. Client identifiers may be used /// for auditing, access control or any other purpose specific to the implementation. /// - BOOLEAN ClientIdSupported; + BOOLEAN ClientIdSupported; /// /// TRUE if and only if the service requires a client identifier in order to process key requests. /// FALSE otherwise. /// - BOOLEAN ClientIdRequired; + BOOLEAN ClientIdRequired; /// /// The maximum size in bytes for the client identifier. /// - UINT16 ClientIdMaxSize; + UINT16 ClientIdMaxSize; /// /// The client name string type(s) supported by the KMS service. If client names are not /// supported, this field will be set the EFI_KMS_DATA_TYPE_NONE. Otherwise, it will be set /// to the inclusive 'OR' of all client name formats supported. Client names may be used for /// auditing, access control or any other purpose specific to the implementation. /// - UINT8 ClientNameStringTypes; + UINT8 ClientNameStringTypes; /// /// TRUE if only if the KMS requires a client name to be supplied to the service. /// FALSE otherwise. /// - BOOLEAN ClientNameRequired; + BOOLEAN ClientNameRequired; /// /// The maximum number of characters allowed for the client name. /// - UINT16 ClientNameMaxCount; + UINT16 ClientNameMaxCount; /// /// TRUE if and only if the service supports arbitrary client data requests. The use of client /// data requires the caller to have specific knowledge of the individual KMS service and /// should be used only if absolutely necessary. /// FALSE otherwise. /// - BOOLEAN ClientDataSupported; + BOOLEAN ClientDataSupported; /// /// The maximum size in bytes for the client data. If the maximum data size is not specified /// by the KMS or it is not known, then this field must be filled with all ones. /// - UINTN ClientDataMaxSize; + UINTN ClientDataMaxSize; /// /// TRUE if variable length key identifiers are supported. /// FALSE if a fixed length key identifier is supported. /// - BOOLEAN KeyIdVariableLenSupported; + BOOLEAN KeyIdVariableLenSupported; /// /// If KeyIdVariableLenSupported is TRUE, this is the maximum supported key identifier length /// in bytes. Otherwise this is the fixed length of key identifier supported. Key ids shorter /// than the fixed length will be padded on the right with blanks. /// - UINTN KeyIdMaxSize; + UINTN KeyIdMaxSize; /// /// The number of key format/size GUIDs returned in the KeyFormats field. /// - UINTN KeyFormatsCount; + UINTN KeyFormatsCount; /// /// A pointer to an array of EFI_GUID values which specify key formats/sizes supported by /// this KMS. Each format/size pair will be specified by a separate EFI_GUID. At least one @@ -1273,26 +1272,26 @@ struct _EFI_KMS_PROTOCOL { /// using an arbitrary GUID, but any GUID not recognized by the implementation or not /// supported by the KMS will return an error code of EFI_UNSUPPORTED /// - EFI_GUID *KeyFormats; + EFI_GUID *KeyFormats; /// /// TRUE if key attributes are supported. /// FALSE if key attributes are not supported. /// - BOOLEAN KeyAttributesSupported; + BOOLEAN KeyAttributesSupported; /// /// The key attribute identifier string type(s) supported by the KMS service. If key attributes /// are not supported, this field will be set to EFI_KMS_DATA_TYPE_NONE. Otherwise, it will /// be set to the inclusive 'OR' of all key attribute identifier string types supported. /// EFI_KMS_DATA_TYPE_BINARY is not valid for this field. /// - UINT8 KeyAttributeIdStringTypes; - UINT16 KeyAttributeIdMaxCount; + UINT8 KeyAttributeIdStringTypes; + UINT16 KeyAttributeIdMaxCount; /// /// The number of predefined KeyAttributes structures returned in the KeyAttributes /// parameter. If the KMS does not support predefined key attributes, or if it does not /// provide a method to obtain predefined key attributes data, then this field must be zero. /// - UINTN KeyAttributesCount; + UINTN KeyAttributesCount; /// /// A pointer to an array of KeyAttributes structures which contains the predefined /// attributes supported by this KMS. Each structure must contain a valid key attribute @@ -1305,33 +1304,33 @@ struct _EFI_KMS_PROTOCOL { /// does not distinguish between predefined and used defined attributes, and therefore, /// predefined attributes not enumerated will still be processed to the KMS. /// - EFI_KMS_KEY_ATTRIBUTE *KeyAttributes; + EFI_KMS_KEY_ATTRIBUTE *KeyAttributes; }; -extern EFI_GUID gEfiKmsFormatGeneric128Guid; -extern EFI_GUID gEfiKmsFormatGeneric160Guid; -extern EFI_GUID gEfiKmsFormatGeneric256Guid; -extern EFI_GUID gEfiKmsFormatGeneric512Guid; -extern EFI_GUID gEfiKmsFormatGeneric1024Guid; -extern EFI_GUID gEfiKmsFormatGeneric2048Guid; -extern EFI_GUID gEfiKmsFormatGeneric3072Guid; -extern EFI_GUID gEfiKmsFormatMd2128Guid; -extern EFI_GUID gEfiKmsFormatMdc2128Guid; -extern EFI_GUID gEfiKmsFormatMd4128Guid; -extern EFI_GUID gEfiKmsFormatMdc4128Guid; -extern EFI_GUID gEfiKmsFormatMd5128Guid; -extern EFI_GUID gEfiKmsFormatMd5sha128Guid; -extern EFI_GUID gEfiKmsFormatSha1160Guid; -extern EFI_GUID gEfiKmsFormatSha256256Guid; -extern EFI_GUID gEfiKmsFormatSha512512Guid; -extern EFI_GUID gEfiKmsFormatAesxts128Guid; -extern EFI_GUID gEfiKmsFormatAesxts256Guid; -extern EFI_GUID gEfiKmsFormatAescbc128Guid; -extern EFI_GUID gEfiKmsFormatAescbc256Guid; -extern EFI_GUID gEfiKmsFormatRsasha11024Guid; -extern EFI_GUID gEfiKmsFormatRsasha12048Guid; -extern EFI_GUID gEfiKmsFormatRsasha2562048Guid; -extern EFI_GUID gEfiKmsFormatRsasha2563072Guid; -extern EFI_GUID gEfiKmsProtocolGuid; +extern EFI_GUID gEfiKmsFormatGeneric128Guid; +extern EFI_GUID gEfiKmsFormatGeneric160Guid; +extern EFI_GUID gEfiKmsFormatGeneric256Guid; +extern EFI_GUID gEfiKmsFormatGeneric512Guid; +extern EFI_GUID gEfiKmsFormatGeneric1024Guid; +extern EFI_GUID gEfiKmsFormatGeneric2048Guid; +extern EFI_GUID gEfiKmsFormatGeneric3072Guid; +extern EFI_GUID gEfiKmsFormatMd2128Guid; +extern EFI_GUID gEfiKmsFormatMdc2128Guid; +extern EFI_GUID gEfiKmsFormatMd4128Guid; +extern EFI_GUID gEfiKmsFormatMdc4128Guid; +extern EFI_GUID gEfiKmsFormatMd5128Guid; +extern EFI_GUID gEfiKmsFormatMd5sha128Guid; +extern EFI_GUID gEfiKmsFormatSha1160Guid; +extern EFI_GUID gEfiKmsFormatSha256256Guid; +extern EFI_GUID gEfiKmsFormatSha512512Guid; +extern EFI_GUID gEfiKmsFormatAesxts128Guid; +extern EFI_GUID gEfiKmsFormatAesxts256Guid; +extern EFI_GUID gEfiKmsFormatAescbc128Guid; +extern EFI_GUID gEfiKmsFormatAescbc256Guid; +extern EFI_GUID gEfiKmsFormatRsasha11024Guid; +extern EFI_GUID gEfiKmsFormatRsasha12048Guid; +extern EFI_GUID gEfiKmsFormatRsasha2562048Guid; +extern EFI_GUID gEfiKmsFormatRsasha2563072Guid; +extern EFI_GUID gEfiKmsProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/LegacyRegion2.h b/MdePkg/Include/Protocol/LegacyRegion2.h index eca5917537..764998d7e8 100644 --- a/MdePkg/Include/Protocol/LegacyRegion2.h +++ b/MdePkg/Include/Protocol/LegacyRegion2.h @@ -14,7 +14,6 @@ #ifndef __LEGACY_REGION2_H__ #define __LEGACY_REGION2_H__ - #define EFI_LEGACY_REGION2_PROTOCOL_GUID \ { \ 0x70101eaf, 0x85, 0x440c, {0xb3, 0x56, 0x8e, 0xe3, 0x6f, 0xef, 0x24, 0xf0 } \ @@ -49,13 +48,12 @@ typedef struct _EFI_LEGACY_REGION2_PROTOCOL EFI_LEGACY_REGION2_PROTOCOL; typedef EFI_STATUS (EFIAPI *EFI_LEGACY_REGION2_DECODE)( - IN EFI_LEGACY_REGION2_PROTOCOL *This, - IN UINT32 Start, - IN UINT32 Length, - OUT UINT32 *Granularity, - IN BOOLEAN *On - ); - + IN EFI_LEGACY_REGION2_PROTOCOL *This, + IN UINT32 Start, + IN UINT32 Length, + OUT UINT32 *Granularity, + IN BOOLEAN *On + ); /** Modify the hardware to disallow memory writes in a region. @@ -80,12 +78,11 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_LEGACY_REGION2_LOCK)( - IN EFI_LEGACY_REGION2_PROTOCOL *This, - IN UINT32 Start, - IN UINT32 Length, - OUT UINT32 *Granularity - ); - + IN EFI_LEGACY_REGION2_PROTOCOL *This, + IN UINT32 Start, + IN UINT32 Length, + OUT UINT32 *Granularity + ); /** Modify the hardware to disallow memory attribute changes in a region. @@ -121,7 +118,6 @@ EFI_STATUS OUT UINT32 *Granularity OPTIONAL ); - /** Modify the hardware to allow memory writes in a region. @@ -145,12 +141,11 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_LEGACY_REGION2_UNLOCK)( - IN EFI_LEGACY_REGION2_PROTOCOL *This, - IN UINT32 Start, - IN UINT32 Length, - OUT UINT32 *Granularity - ); - + IN EFI_LEGACY_REGION2_PROTOCOL *This, + IN UINT32 Start, + IN UINT32 Length, + OUT UINT32 *Granularity + ); typedef enum { LegacyRegionDecoded, ///< This region is currently set to allow reads. @@ -162,30 +157,28 @@ typedef enum { LegacyRegionNotLocked ///< This region's attributes are not locked. } EFI_LEGACY_REGION_ATTRIBUTE; - typedef struct { /// /// The beginning of the physical address of this /// region. /// - UINT32 Start; + UINT32 Start; /// /// The number of bytes in this region. /// - UINT32 Length; + UINT32 Length; /// /// Attribute of the Legacy Region Descriptor that /// describes the capabilities for that memory region. /// - EFI_LEGACY_REGION_ATTRIBUTE Attribute; + EFI_LEGACY_REGION_ATTRIBUTE Attribute; /// /// Describes the byte length programmability /// associated with the Start address and the specified /// Attribute setting. - UINT32 Granularity; + UINT32 Granularity; } EFI_LEGACY_REGION_DESCRIPTOR; - /** Get region information for the attributes of the Legacy Region. @@ -213,7 +206,6 @@ EFI_STATUS OUT EFI_LEGACY_REGION_DESCRIPTOR **Descriptor ); - /// /// The EFI_LEGACY_REGION2_PROTOCOL is used to abstract the hardware control of the memory /// attributes of the Option ROM shadowing region, 0xC0000 to 0xFFFFF. @@ -221,13 +213,13 @@ EFI_STATUS /// boot-lock. These protocols may be set in any combination. /// struct _EFI_LEGACY_REGION2_PROTOCOL { - EFI_LEGACY_REGION2_DECODE Decode; - EFI_LEGACY_REGION2_LOCK Lock; - EFI_LEGACY_REGION2_BOOT_LOCK BootLock; - EFI_LEGACY_REGION2_UNLOCK UnLock; - EFI_LEGACY_REGION_GET_INFO GetInfo; + EFI_LEGACY_REGION2_DECODE Decode; + EFI_LEGACY_REGION2_LOCK Lock; + EFI_LEGACY_REGION2_BOOT_LOCK BootLock; + EFI_LEGACY_REGION2_UNLOCK UnLock; + EFI_LEGACY_REGION_GET_INFO GetInfo; }; -extern EFI_GUID gEfiLegacyRegion2ProtocolGuid; +extern EFI_GUID gEfiLegacyRegion2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/LegacySpiController.h b/MdePkg/Include/Protocol/LegacySpiController.h index 31f14b10fd..71844b2189 100644 --- a/MdePkg/Include/Protocol/LegacySpiController.h +++ b/MdePkg/Include/Protocol/LegacySpiController.h @@ -23,7 +23,7 @@ { 0xbf, 0x35, 0x0e, 0x78, 0xdd, 0xb5, 0x24, 0xfc }} typedef -struct _EFI_LEGACY_SPI_CONTROLLER_PROTOCOL + struct _EFI_LEGACY_SPI_CONTROLLER_PROTOCOL EFI_LEGACY_SPI_CONTROLLER_PROTOCOL; /** @@ -46,7 +46,7 @@ EFI_LEGACY_SPI_CONTROLLER_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_ERASE_BLOCK_OPCODE) ( +(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_ERASE_BLOCK_OPCODE)( IN CONST EFI_LEGACY_SPI_CONTROLLER_PROTOCOL *This, IN UINT8 EraseBlockOpcode ); @@ -71,7 +71,7 @@ typedef EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_WRITE_STATUS_PREFIX) ( +(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_WRITE_STATUS_PREFIX)( IN CONST EFI_LEGACY_SPI_CONTROLLER_PROTOCOL *This, IN UINT8 WriteStatusPrefix ); @@ -96,7 +96,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_BIOS_BASE_ADDRESS) ( +(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_BIOS_BASE_ADDRESS)( IN CONST EFI_LEGACY_SPI_CONTROLLER_PROTOCOL *This, IN UINT32 BiosBaseAddress ); @@ -116,7 +116,7 @@ typedef EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_CLEAR_SPI_PROTECT) ( +(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_CLEAR_SPI_PROTECT)( IN CONST EFI_LEGACY_SPI_CONTROLLER_PROTOCOL *This ); @@ -137,7 +137,7 @@ EFI_STATUS **/ typedef BOOLEAN -(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_IS_RANGE_PROTECTED) ( +(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_IS_RANGE_PROTECTED)( IN CONST EFI_LEGACY_SPI_CONTROLLER_PROTOCOL *This, IN UINT32 BiosAddress, IN UINT32 BlocksToProtect @@ -170,7 +170,7 @@ BOOLEAN **/ typedef EFI_STATUS -(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_PROTECT_NEXT_RANGE) ( +(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_PROTECT_NEXT_RANGE)( IN CONST EFI_LEGACY_SPI_CONTROLLER_PROTOCOL *This, IN UINT32 BiosAddress, IN UINT32 BlocksToProtect @@ -195,7 +195,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_LOCK_CONTROLLER) ( +(EFIAPI *EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_LOCK_CONTROLLER)( IN CONST EFI_LEGACY_SPI_CONTROLLER_PROTOCOL *This ); @@ -206,54 +206,54 @@ struct _EFI_LEGACY_SPI_CONTROLLER_PROTOCOL { /// /// Maximum offset from the BIOS base address that is able to be protected. /// - UINT32 MaximumOffset; + UINT32 MaximumOffset; /// /// Maximum number of bytes that can be protected by one range register. /// - UINT32 MaximumRangeBytes; + UINT32 MaximumRangeBytes; /// /// The number of registers available for protecting the BIOS. /// - UINT32 RangeRegisterCount; + UINT32 RangeRegisterCount; /// /// Set the erase block opcode. /// - EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_ERASE_BLOCK_OPCODE EraseBlockOpcode; + EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_ERASE_BLOCK_OPCODE EraseBlockOpcode; /// /// Set the write status prefix opcode. /// - EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_WRITE_STATUS_PREFIX WriteStatusPrefix; + EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_WRITE_STATUS_PREFIX WriteStatusPrefix; /// /// Set the BIOS base address. /// - EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_BIOS_BASE_ADDRESS BiosBaseAddress; + EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_BIOS_BASE_ADDRESS BiosBaseAddress; /// /// Clear the SPI protect range registers. /// - EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_CLEAR_SPI_PROTECT ClearSpiProtect; + EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_CLEAR_SPI_PROTECT ClearSpiProtect; /// /// Determine if the SPI range is protected. /// - EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_IS_RANGE_PROTECTED IsRangeProtected; + EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_IS_RANGE_PROTECTED IsRangeProtected; /// /// Set the next protect range register. /// - EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_PROTECT_NEXT_RANGE ProtectNextRange; + EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_PROTECT_NEXT_RANGE ProtectNextRange; /// /// Lock the SPI controller configuration. /// - EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_LOCK_CONTROLLER LockController; + EFI_LEGACY_SPI_CONTROLLER_PROTOCOL_LOCK_CONTROLLER LockController; }; -extern EFI_GUID gEfiLegacySpiControllerProtocolGuid; +extern EFI_GUID gEfiLegacySpiControllerProtocolGuid; #endif // __LEGACY_SPI_CONTROLLER_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/LegacySpiFlash.h b/MdePkg/Include/Protocol/LegacySpiFlash.h index 3089a80e37..5b9651561e 100644 --- a/MdePkg/Include/Protocol/LegacySpiFlash.h +++ b/MdePkg/Include/Protocol/LegacySpiFlash.h @@ -44,7 +44,7 @@ typedef struct _EFI_LEGACY_SPI_FLASH_PROTOCOL EFI_LEGACY_SPI_FLASH_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_LEGACY_SPI_FLASH_PROTOCOL_BIOS_BASE_ADDRESS) ( +(EFIAPI *EFI_LEGACY_SPI_FLASH_PROTOCOL_BIOS_BASE_ADDRESS)( IN CONST EFI_LEGACY_SPI_FLASH_PROTOCOL *This, IN UINT32 BiosBaseAddress ); @@ -64,7 +64,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_LEGACY_SPI_FLASH_PROTOCOL_CLEAR_SPI_PROTECT) ( +(EFIAPI *EFI_LEGACY_SPI_FLASH_PROTOCOL_CLEAR_SPI_PROTECT)( IN CONST EFI_LEGACY_SPI_FLASH_PROTOCOL *This ); @@ -85,7 +85,7 @@ typedef EFI_STATUS **/ typedef BOOLEAN -(EFIAPI *EFI_LEGACY_SPI_FLASH_PROTOCOL_IS_RANGE_PROTECTED) ( +(EFIAPI *EFI_LEGACY_SPI_FLASH_PROTOCOL_IS_RANGE_PROTECTED)( IN CONST EFI_LEGACY_SPI_FLASH_PROTOCOL *This, IN UINT32 BiosAddress, IN UINT32 BlocksToProtect @@ -119,7 +119,7 @@ BOOLEAN **/ typedef EFI_STATUS -(EFIAPI *EFI_LEGACY_SPI_FLASH_PROTOCOL_PROTECT_NEXT_RANGE) ( +(EFIAPI *EFI_LEGACY_SPI_FLASH_PROTOCOL_PROTECT_NEXT_RANGE)( IN CONST EFI_LEGACY_SPI_FLASH_PROTOCOL *This, IN UINT32 BiosAddress, IN UINT32 BlocksToProtect @@ -145,7 +145,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_LEGACY_SPI_FLASH_PROTOCOL_LOCK_CONTROLLER) ( +(EFIAPI *EFI_LEGACY_SPI_FLASH_PROTOCOL_LOCK_CONTROLLER)( IN CONST EFI_LEGACY_SPI_FLASH_PROTOCOL *This ); @@ -158,7 +158,7 @@ struct _EFI_LEGACY_SPI_FLASH_PROTOCOL { /// This protocol manipulates the SPI NOR flash parts using a common set of /// commands. /// - EFI_SPI_NOR_FLASH_PROTOCOL FlashProtocol; + EFI_SPI_NOR_FLASH_PROTOCOL FlashProtocol; // // Legacy flash (SPI host) controller support @@ -167,29 +167,29 @@ struct _EFI_LEGACY_SPI_FLASH_PROTOCOL { /// /// Set the BIOS base address. /// - EFI_LEGACY_SPI_FLASH_PROTOCOL_BIOS_BASE_ADDRESS BiosBaseAddress; + EFI_LEGACY_SPI_FLASH_PROTOCOL_BIOS_BASE_ADDRESS BiosBaseAddress; /// /// Clear the SPI protect range registers. /// - EFI_LEGACY_SPI_FLASH_PROTOCOL_CLEAR_SPI_PROTECT ClearSpiProtect; + EFI_LEGACY_SPI_FLASH_PROTOCOL_CLEAR_SPI_PROTECT ClearSpiProtect; /// /// Determine if the SPI range is protected. /// - EFI_LEGACY_SPI_FLASH_PROTOCOL_IS_RANGE_PROTECTED IsRangeProtected; + EFI_LEGACY_SPI_FLASH_PROTOCOL_IS_RANGE_PROTECTED IsRangeProtected; /// /// Set the next protect range register. /// - EFI_LEGACY_SPI_FLASH_PROTOCOL_PROTECT_NEXT_RANGE ProtectNextRange; + EFI_LEGACY_SPI_FLASH_PROTOCOL_PROTECT_NEXT_RANGE ProtectNextRange; /// /// Lock the SPI controller configuration. /// - EFI_LEGACY_SPI_FLASH_PROTOCOL_LOCK_CONTROLLER LockController; + EFI_LEGACY_SPI_FLASH_PROTOCOL_LOCK_CONTROLLER LockController; }; -extern EFI_GUID gEfiLegacySpiFlashProtocolGuid; +extern EFI_GUID gEfiLegacySpiFlashProtocolGuid; #endif // __LEGACY_SPI_FLASH_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/LegacySpiSmmController.h b/MdePkg/Include/Protocol/LegacySpiSmmController.h index 008a3432f3..7b238dc1f2 100644 --- a/MdePkg/Include/Protocol/LegacySpiSmmController.h +++ b/MdePkg/Include/Protocol/LegacySpiSmmController.h @@ -22,9 +22,9 @@ { 0x8c, 0xcb, 0xd2, 0x7d, 0xfe, 0x32, 0xdb, 0x9b }} typedef -struct _EFI_LEGACY_SPI_CONTROLLER_PROTOCOL + struct _EFI_LEGACY_SPI_CONTROLLER_PROTOCOL EFI_LEGACY_SPI_SMM_CONTROLLER_PROTOCOL; -extern EFI_GUID gEfiLegacySpiSmmControllerProtocolGuid; +extern EFI_GUID gEfiLegacySpiSmmControllerProtocolGuid; #endif // __LEGACY_SPI_SMM_CONTROLLER_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/LegacySpiSmmFlash.h b/MdePkg/Include/Protocol/LegacySpiSmmFlash.h index 1babbc09ca..a4b25fbd89 100644 --- a/MdePkg/Include/Protocol/LegacySpiSmmFlash.h +++ b/MdePkg/Include/Protocol/LegacySpiSmmFlash.h @@ -22,9 +22,9 @@ { 0x97, 0x29, 0x3f, 0x35, 0x3d, 0x4f, 0x87, 0x9f }} typedef -struct _EFI_LEGACY_SPI_FLASH_PROTOCOL + struct _EFI_LEGACY_SPI_FLASH_PROTOCOL EFI_LEGACY_SPI_SMM_FLASH_PROTOCOL; -extern EFI_GUID gEfiLegacySpiSmmFlashProtocolGuid; +extern EFI_GUID gEfiLegacySpiSmmFlashProtocolGuid; #endif // __SPI_SMM_FLASH_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/LoadFile.h b/MdePkg/Include/Protocol/LoadFile.h index 929cc8ed1a..10221d62c4 100644 --- a/MdePkg/Include/Protocol/LoadFile.h +++ b/MdePkg/Include/Protocol/LoadFile.h @@ -23,14 +23,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// Protocol Guid defined by EFI1.1. /// -#define LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL_GUID +#define LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL_GUID typedef struct _EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL; /// /// Backward-compatible with EFI1.1 /// -typedef EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_INTERFACE; +typedef EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_INTERFACE; /** Causes the driver to load a specified file. @@ -74,9 +74,9 @@ EFI_STATUS /// The EFI_LOAD_FILE_PROTOCOL is a simple protocol used to obtain files from arbitrary devices. /// struct _EFI_LOAD_FILE_PROTOCOL { - EFI_LOAD_FILE LoadFile; + EFI_LOAD_FILE LoadFile; }; -extern EFI_GUID gEfiLoadFileProtocolGuid; +extern EFI_GUID gEfiLoadFileProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/LoadFile2.h b/MdePkg/Include/Protocol/LoadFile2.h index 1f4dc8ee02..21bb37b4a1 100644 --- a/MdePkg/Include/Protocol/LoadFile2.h +++ b/MdePkg/Include/Protocol/LoadFile2.h @@ -23,11 +23,10 @@ /// /// Protocol Guid defined by UEFI2.1. /// -#define LOAD_FILE2_PROTOCOL EFI_LOAD_FILE2_PROTOCOL_GUID +#define LOAD_FILE2_PROTOCOL EFI_LOAD_FILE2_PROTOCOL_GUID typedef struct _EFI_LOAD_FILE2_PROTOCOL EFI_LOAD_FILE2_PROTOCOL; - /** Causes the driver to load a specified file. @@ -71,9 +70,9 @@ EFI_STATUS /// The EFI_LOAD_FILE_PROTOCOL is a simple protocol used to obtain files from arbitrary devices. /// struct _EFI_LOAD_FILE2_PROTOCOL { - EFI_LOAD_FILE2 LoadFile; + EFI_LOAD_FILE2 LoadFile; }; -extern EFI_GUID gEfiLoadFile2ProtocolGuid; +extern EFI_GUID gEfiLoadFile2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/LoadedImage.h b/MdePkg/Include/Protocol/LoadedImage.h index d6e05a90a5..c1e65a718e 100644 --- a/MdePkg/Include/Protocol/LoadedImage.h +++ b/MdePkg/Include/Protocol/LoadedImage.h @@ -25,7 +25,7 @@ /// /// Protocol GUID defined in EFI1.1. /// -#define LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE_PROTOCOL_GUID +#define LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE_PROTOCOL_GUID /// /// EFI_SYSTEM_TABLE & EFI_IMAGE_UNLOAD are defined in EfiApi.h @@ -35,40 +35,40 @@ /// /// Revision defined in EFI1.1. /// -#define EFI_LOADED_IMAGE_INFORMATION_REVISION EFI_LOADED_IMAGE_PROTOCOL_REVISION +#define EFI_LOADED_IMAGE_INFORMATION_REVISION EFI_LOADED_IMAGE_PROTOCOL_REVISION /// /// Can be used on any image handle to obtain information about the loaded image. /// typedef struct { - UINT32 Revision; ///< Defines the revision of the EFI_LOADED_IMAGE_PROTOCOL structure. - ///< All future revisions will be backward compatible to the current revision. - EFI_HANDLE ParentHandle; ///< Parent image's image handle. NULL if the image is loaded directly from - ///< the firmware's boot manager. - EFI_SYSTEM_TABLE *SystemTable; ///< the image's EFI system table pointer. + UINT32 Revision; ///< Defines the revision of the EFI_LOADED_IMAGE_PROTOCOL structure. + ///< All future revisions will be backward compatible to the current revision. + EFI_HANDLE ParentHandle; ///< Parent image's image handle. NULL if the image is loaded directly from + ///< the firmware's boot manager. + EFI_SYSTEM_TABLE *SystemTable; ///< the image's EFI system table pointer. // // Source location of image // - EFI_HANDLE DeviceHandle; ///< The device handle that the EFI Image was loaded from. - EFI_DEVICE_PATH_PROTOCOL *FilePath; ///< A pointer to the file path portion specific to DeviceHandle - ///< that the EFI Image was loaded from. - VOID *Reserved; ///< Reserved. DO NOT USE. + EFI_HANDLE DeviceHandle; ///< The device handle that the EFI Image was loaded from. + EFI_DEVICE_PATH_PROTOCOL *FilePath; ///< A pointer to the file path portion specific to DeviceHandle + ///< that the EFI Image was loaded from. + VOID *Reserved; ///< Reserved. DO NOT USE. // // Images load options // - UINT32 LoadOptionsSize;///< The size in bytes of LoadOptions. - VOID *LoadOptions; ///< A pointer to the image's binary load options. + UINT32 LoadOptionsSize; ///< The size in bytes of LoadOptions. + VOID *LoadOptions; ///< A pointer to the image's binary load options. // // Location of where image was loaded // - VOID *ImageBase; ///< The base address at which the image was loaded. - UINT64 ImageSize; ///< The size in bytes of the loaded image. - EFI_MEMORY_TYPE ImageCodeType; ///< The memory type that the code sections were loaded as. - EFI_MEMORY_TYPE ImageDataType; ///< The memory type that the data sections were loaded as. - EFI_IMAGE_UNLOAD Unload; + VOID *ImageBase; ///< The base address at which the image was loaded. + UINT64 ImageSize; ///< The size in bytes of the loaded image. + EFI_MEMORY_TYPE ImageCodeType; ///< The memory type that the code sections were loaded as. + EFI_MEMORY_TYPE ImageDataType; ///< The memory type that the data sections were loaded as. + EFI_IMAGE_UNLOAD Unload; } EFI_LOADED_IMAGE_PROTOCOL; // @@ -76,7 +76,7 @@ typedef struct { // typedef EFI_LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE; -extern EFI_GUID gEfiLoadedImageProtocolGuid; -extern EFI_GUID gEfiLoadedImageDevicePathProtocolGuid; +extern EFI_GUID gEfiLoadedImageProtocolGuid; +extern EFI_GUID gEfiLoadedImageDevicePathProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/ManagedNetwork.h b/MdePkg/Include/Protocol/ManagedNetwork.h index 28f35a6898..9ec9a68ff2 100644 --- a/MdePkg/Include/Protocol/ManagedNetwork.h +++ b/MdePkg/Include/Protocol/ManagedNetwork.h @@ -84,38 +84,37 @@ typedef struct { } EFI_MANAGED_NETWORK_CONFIG_DATA; typedef struct { - EFI_TIME Timestamp; - EFI_EVENT RecycleEvent; - UINT32 PacketLength; - UINT32 HeaderLength; - UINT32 AddressLength; - UINT32 DataLength; - BOOLEAN BroadcastFlag; - BOOLEAN MulticastFlag; - BOOLEAN PromiscuousFlag; - UINT16 ProtocolType; - VOID *DestinationAddress; - VOID *SourceAddress; - VOID *MediaHeader; - VOID *PacketData; + EFI_TIME Timestamp; + EFI_EVENT RecycleEvent; + UINT32 PacketLength; + UINT32 HeaderLength; + UINT32 AddressLength; + UINT32 DataLength; + BOOLEAN BroadcastFlag; + BOOLEAN MulticastFlag; + BOOLEAN PromiscuousFlag; + UINT16 ProtocolType; + VOID *DestinationAddress; + VOID *SourceAddress; + VOID *MediaHeader; + VOID *PacketData; } EFI_MANAGED_NETWORK_RECEIVE_DATA; typedef struct { - UINT32 FragmentLength; - VOID *FragmentBuffer; + UINT32 FragmentLength; + VOID *FragmentBuffer; } EFI_MANAGED_NETWORK_FRAGMENT_DATA; typedef struct { - EFI_MAC_ADDRESS *DestinationAddress; //OPTIONAL - EFI_MAC_ADDRESS *SourceAddress; //OPTIONAL - UINT16 ProtocolType; //OPTIONAL - UINT32 DataLength; - UINT16 HeaderLength; //OPTIONAL - UINT16 FragmentCount; - EFI_MANAGED_NETWORK_FRAGMENT_DATA FragmentTable[1]; + EFI_MAC_ADDRESS *DestinationAddress; // OPTIONAL + EFI_MAC_ADDRESS *SourceAddress; // OPTIONAL + UINT16 ProtocolType; // OPTIONAL + UINT32 DataLength; + UINT16 HeaderLength; // OPTIONAL + UINT16 FragmentCount; + EFI_MANAGED_NETWORK_FRAGMENT_DATA FragmentTable[1]; } EFI_MANAGED_NETWORK_TRANSMIT_DATA; - typedef struct { /// /// This Event will be signaled after the Status field is updated @@ -123,21 +122,21 @@ typedef struct { /// EFI_NOTIFY_SIGNAL. The Task Priority Level (TPL) of /// Event must be lower than or equal to TPL_CALLBACK. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// The status that is returned to the caller at the end of the operation /// to indicate whether this operation completed successfully. /// - EFI_STATUS Status; + EFI_STATUS Status; union { /// /// When this token is used for receiving, RxData is a pointer to the EFI_MANAGED_NETWORK_RECEIVE_DATA. /// - EFI_MANAGED_NETWORK_RECEIVE_DATA *RxData; + EFI_MANAGED_NETWORK_RECEIVE_DATA *RxData; /// /// When this token is used for transmitting, TxData is a pointer to the EFI_MANAGED_NETWORK_TRANSMIT_DATA. /// - EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData; + EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData; } Packet; } EFI_MANAGED_NETWORK_COMPLETION_TOKEN; @@ -298,7 +297,6 @@ EFI_STATUS IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token ); - /** Aborts an asynchronous transmit or receive request. @@ -350,17 +348,17 @@ EFI_STATUS /// perform raw (unformatted) asynchronous network packet I/O. /// struct _EFI_MANAGED_NETWORK_PROTOCOL { - EFI_MANAGED_NETWORK_GET_MODE_DATA GetModeData; - EFI_MANAGED_NETWORK_CONFIGURE Configure; - EFI_MANAGED_NETWORK_MCAST_IP_TO_MAC McastIpToMac; - EFI_MANAGED_NETWORK_GROUPS Groups; - EFI_MANAGED_NETWORK_TRANSMIT Transmit; - EFI_MANAGED_NETWORK_RECEIVE Receive; - EFI_MANAGED_NETWORK_CANCEL Cancel; - EFI_MANAGED_NETWORK_POLL Poll; + EFI_MANAGED_NETWORK_GET_MODE_DATA GetModeData; + EFI_MANAGED_NETWORK_CONFIGURE Configure; + EFI_MANAGED_NETWORK_MCAST_IP_TO_MAC McastIpToMac; + EFI_MANAGED_NETWORK_GROUPS Groups; + EFI_MANAGED_NETWORK_TRANSMIT Transmit; + EFI_MANAGED_NETWORK_RECEIVE Receive; + EFI_MANAGED_NETWORK_CANCEL Cancel; + EFI_MANAGED_NETWORK_POLL Poll; }; -extern EFI_GUID gEfiManagedNetworkServiceBindingProtocolGuid; -extern EFI_GUID gEfiManagedNetworkProtocolGuid; +extern EFI_GUID gEfiManagedNetworkServiceBindingProtocolGuid; +extern EFI_GUID gEfiManagedNetworkProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Metronome.h b/MdePkg/Include/Protocol/Metronome.h index 4f9c083170..d0e1d3d534 100644 --- a/MdePkg/Include/Protocol/Metronome.h +++ b/MdePkg/Include/Protocol/Metronome.h @@ -20,7 +20,7 @@ /// /// Declare forward reference for the Metronome Architectural Protocol /// -typedef struct _EFI_METRONOME_ARCH_PROTOCOL EFI_METRONOME_ARCH_PROTOCOL; +typedef struct _EFI_METRONOME_ARCH_PROTOCOL EFI_METRONOME_ARCH_PROTOCOL; /** The WaitForTick() function waits for the number of ticks specified by @@ -47,8 +47,8 @@ typedef struct _EFI_METRONOME_ARCH_PROTOCOL EFI_METRONOME_ARCH_PROTOCOL; typedef EFI_STATUS (EFIAPI *EFI_METRONOME_WAIT_FOR_TICK)( - IN EFI_METRONOME_ARCH_PROTOCOL *This, - IN UINT32 TickNumber + IN EFI_METRONOME_ARCH_PROTOCOL *This, + IN UINT32 TickNumber ); /// @@ -57,7 +57,7 @@ EFI_STATUS /// require calibrated delays. /// struct _EFI_METRONOME_ARCH_PROTOCOL { - EFI_METRONOME_WAIT_FOR_TICK WaitForTick; + EFI_METRONOME_WAIT_FOR_TICK WaitForTick; /// /// The period of platform's known time source in 100 nS units. @@ -66,9 +66,9 @@ struct _EFI_METRONOME_ARCH_PROTOCOL { /// not be modified after the Metronome architectural protocol is /// installed. All consumers must treat this as a read-only field. /// - UINT32 TickPeriod; + UINT32 TickPeriod; }; -extern EFI_GUID gEfiMetronomeArchProtocolGuid; +extern EFI_GUID gEfiMetronomeArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/MmAccess.h b/MdePkg/Include/Protocol/MmAccess.h index 6b5eccb524..8d10861212 100644 --- a/MdePkg/Include/Protocol/MmAccess.h +++ b/MdePkg/Include/Protocol/MmAccess.h @@ -24,8 +24,7 @@ 0xc2702b74, 0x800c, 0x4131, {0x87, 0x46, 0x8f, 0xb5, 0xb8, 0x9c, 0xe4, 0xac } \ } - -typedef struct _EFI_MM_ACCESS_PROTOCOL EFI_MM_ACCESS_PROTOCOL; +typedef struct _EFI_MM_ACCESS_PROTOCOL EFI_MM_ACCESS_PROTOCOL; /** Opens the MMRAM area to be accessible by a boot-service driver. @@ -107,21 +106,20 @@ EFI_STATUS /// controller would publish this protocol. /// struct _EFI_MM_ACCESS_PROTOCOL { - EFI_MM_OPEN Open; - EFI_MM_CLOSE Close; - EFI_MM_LOCK Lock; - EFI_MM_CAPABILITIES GetCapabilities; + EFI_MM_OPEN Open; + EFI_MM_CLOSE Close; + EFI_MM_LOCK Lock; + EFI_MM_CAPABILITIES GetCapabilities; /// /// Indicates the current state of the MMRAM. Set to TRUE if MMRAM is locked. /// - BOOLEAN LockState; + BOOLEAN LockState; /// /// Indicates the current state of the MMRAM. Set to TRUE if MMRAM is open. /// - BOOLEAN OpenState; + BOOLEAN OpenState; }; -extern EFI_GUID gEfiMmAccessProtocolGuid; +extern EFI_GUID gEfiMmAccessProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmBase.h b/MdePkg/Include/Protocol/MmBase.h index 1e1d7b7eaa..fa0310fce6 100644 --- a/MdePkg/Include/Protocol/MmBase.h +++ b/MdePkg/Include/Protocol/MmBase.h @@ -19,7 +19,7 @@ 0xf4ccbfb7, 0xf6e0, 0x47fd, {0x9d, 0xd4, 0x10, 0xa8, 0xf1, 0x50, 0xc1, 0x91 } \ } -typedef struct _EFI_MM_BASE_PROTOCOL EFI_MM_BASE_PROTOCOL; +typedef struct _EFI_MM_BASE_PROTOCOL EFI_MM_BASE_PROTOCOL; /** Service to indicate whether the driver is currently executing in the MM Initialization phase. @@ -71,11 +71,10 @@ EFI_STATUS /// services and determine whether the driver is being invoked inside MMRAM or outside of MMRAM. /// struct _EFI_MM_BASE_PROTOCOL { - EFI_MM_INSIDE_OUT InMm; - EFI_MM_GET_MMST_LOCATION GetMmstLocation; + EFI_MM_INSIDE_OUT InMm; + EFI_MM_GET_MMST_LOCATION GetMmstLocation; }; -extern EFI_GUID gEfiMmBaseProtocolGuid; +extern EFI_GUID gEfiMmBaseProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmCommunication.h b/MdePkg/Include/Protocol/MmCommunication.h index 34c3e2b5a9..0ccb989020 100644 --- a/MdePkg/Include/Protocol/MmCommunication.h +++ b/MdePkg/Include/Protocol/MmCommunication.h @@ -22,15 +22,15 @@ typedef struct { /// /// Allows for disambiguation of the message format. /// - EFI_GUID HeaderGuid; + EFI_GUID HeaderGuid; /// /// Describes the size of Data (in bytes) and does not include the size of the header. /// - UINTN MessageLength; + UINTN MessageLength; /// /// Designates an array of bytes that is MessageLength in size. /// - UINT8 Data[1]; + UINT8 Data[1]; } EFI_MM_COMMUNICATE_HEADER; #pragma pack() @@ -40,7 +40,7 @@ typedef struct { 0xc68ed8e2, 0x9dc6, 0x4cbd, { 0x9d, 0x94, 0xdb, 0x65, 0xac, 0xc5, 0xc3, 0x32 } \ } -typedef struct _EFI_MM_COMMUNICATION_PROTOCOL EFI_MM_COMMUNICATION_PROTOCOL; +typedef struct _EFI_MM_COMMUNICATION_PROTOCOL EFI_MM_COMMUNICATION_PROTOCOL; /** Communicates with a registered handler. @@ -78,10 +78,9 @@ EFI_STATUS /// between DXE drivers and a registered MMI handler. /// struct _EFI_MM_COMMUNICATION_PROTOCOL { - EFI_MM_COMMUNICATE Communicate; + EFI_MM_COMMUNICATE Communicate; }; -extern EFI_GUID gEfiMmCommunicationProtocolGuid; +extern EFI_GUID gEfiMmCommunicationProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmCommunication2.h b/MdePkg/Include/Protocol/MmCommunication2.h index 05f56dcae5..3495a7327f 100644 --- a/MdePkg/Include/Protocol/MmCommunication2.h +++ b/MdePkg/Include/Protocol/MmCommunication2.h @@ -20,7 +20,7 @@ 0x378daedc, 0xf06b, 0x4446, { 0x83, 0x14, 0x40, 0xab, 0x93, 0x3c, 0x87, 0xa3 } \ } -typedef struct _EFI_MM_COMMUNICATION2_PROTOCOL EFI_MM_COMMUNICATION2_PROTOCOL; +typedef struct _EFI_MM_COMMUNICATION2_PROTOCOL EFI_MM_COMMUNICATION2_PROTOCOL; /** Communicates with a registered handler. @@ -60,10 +60,9 @@ EFI_STATUS /// between DXE drivers and a registered MMI handler. /// struct _EFI_MM_COMMUNICATION2_PROTOCOL { - EFI_MM_COMMUNICATE2 Communicate; + EFI_MM_COMMUNICATE2 Communicate; }; -extern EFI_GUID gEfiMmCommunication2ProtocolGuid; +extern EFI_GUID gEfiMmCommunication2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmConfiguration.h b/MdePkg/Include/Protocol/MmConfiguration.h index d2fb6a13d4..e9d41082a7 100644 --- a/MdePkg/Include/Protocol/MmConfiguration.h +++ b/MdePkg/Include/Protocol/MmConfiguration.h @@ -21,7 +21,7 @@ 0x26eeb3de, 0xb689, 0x492e, {0x80, 0xf0, 0xbe, 0x8b, 0xd7, 0xda, 0x4b, 0xa7 } \ } -typedef struct _EFI_MM_CONFIGURATION_PROTOCOL EFI_MM_CONFIGURATION_PROTOCOL; +typedef struct _EFI_MM_CONFIGURATION_PROTOCOL EFI_MM_CONFIGURATION_PROTOCOL; /** Register the MM Foundation entry point. @@ -54,11 +54,10 @@ struct _EFI_MM_CONFIGURATION_PROTOCOL { /// /// A pointer to an array MMRAM ranges used by the initial MM entry code. /// - EFI_MM_RESERVED_MMRAM_REGION *MmramReservedRegions; - EFI_MM_REGISTER_MM_ENTRY RegisterMmEntry; + EFI_MM_RESERVED_MMRAM_REGION *MmramReservedRegions; + EFI_MM_REGISTER_MM_ENTRY RegisterMmEntry; }; -extern EFI_GUID gEfiMmConfigurationProtocolGuid; +extern EFI_GUID gEfiMmConfigurationProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmControl.h b/MdePkg/Include/Protocol/MmControl.h index c89ffea960..2cb5b9b52c 100644 --- a/MdePkg/Include/Protocol/MmControl.h +++ b/MdePkg/Include/Protocol/MmControl.h @@ -27,7 +27,7 @@ } typedef struct _EFI_MM_CONTROL_PROTOCOL EFI_MM_CONTROL_PROTOCOL; -typedef UINTN EFI_MM_PERIOD; +typedef UINTN EFI_MM_PERIOD; /** Invokes MMI activation from either the preboot or runtime environment. @@ -83,18 +83,17 @@ EFI_STATUS /// these signals. /// struct _EFI_MM_CONTROL_PROTOCOL { - EFI_MM_ACTIVATE Trigger; - EFI_MM_DEACTIVATE Clear; + EFI_MM_ACTIVATE Trigger; + EFI_MM_DEACTIVATE Clear; /// /// Minimum interval at which the platform can set the period. A maximum is not /// specified in that the MM infrastructure code can emulate a maximum interval that is /// greater than the hardware capabilities by using software emulation in the MM /// infrastructure code. /// - EFI_MM_PERIOD MinimumTriggerPeriod; + EFI_MM_PERIOD MinimumTriggerPeriod; }; -extern EFI_GUID gEfiMmControlProtocolGuid; +extern EFI_GUID gEfiMmControlProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmCpu.h b/MdePkg/Include/Protocol/MmCpu.h index 4df527ed63..ee1b6aaa38 100644 --- a/MdePkg/Include/Protocol/MmCpu.h +++ b/MdePkg/Include/Protocol/MmCpu.h @@ -26,82 +26,82 @@ typedef enum { /// /// x86/X64 standard registers /// - EFI_MM_SAVE_STATE_REGISTER_GDTBASE = 4, - EFI_MM_SAVE_STATE_REGISTER_IDTBASE = 5, - EFI_MM_SAVE_STATE_REGISTER_LDTBASE = 6, - EFI_MM_SAVE_STATE_REGISTER_GDTLIMIT = 7, - EFI_MM_SAVE_STATE_REGISTER_IDTLIMIT = 8, - EFI_MM_SAVE_STATE_REGISTER_LDTLIMIT = 9, - EFI_MM_SAVE_STATE_REGISTER_LDTINFO = 10, - EFI_MM_SAVE_STATE_REGISTER_ES = 20, - EFI_MM_SAVE_STATE_REGISTER_CS = 21, - EFI_MM_SAVE_STATE_REGISTER_SS = 22, - EFI_MM_SAVE_STATE_REGISTER_DS = 23, - EFI_MM_SAVE_STATE_REGISTER_FS = 24, - EFI_MM_SAVE_STATE_REGISTER_GS = 25, - EFI_MM_SAVE_STATE_REGISTER_LDTR_SEL = 26, - EFI_MM_SAVE_STATE_REGISTER_TR_SEL = 27, - EFI_MM_SAVE_STATE_REGISTER_DR7 = 28, - EFI_MM_SAVE_STATE_REGISTER_DR6 = 29, - EFI_MM_SAVE_STATE_REGISTER_R8 = 30, - EFI_MM_SAVE_STATE_REGISTER_R9 = 31, - EFI_MM_SAVE_STATE_REGISTER_R10 = 32, - EFI_MM_SAVE_STATE_REGISTER_R11 = 33, - EFI_MM_SAVE_STATE_REGISTER_R12 = 34, - EFI_MM_SAVE_STATE_REGISTER_R13 = 35, - EFI_MM_SAVE_STATE_REGISTER_R14 = 36, - EFI_MM_SAVE_STATE_REGISTER_R15 = 37, - EFI_MM_SAVE_STATE_REGISTER_RAX = 38, - EFI_MM_SAVE_STATE_REGISTER_RBX = 39, - EFI_MM_SAVE_STATE_REGISTER_RCX = 40, - EFI_MM_SAVE_STATE_REGISTER_RDX = 41, - EFI_MM_SAVE_STATE_REGISTER_RSP = 42, - EFI_MM_SAVE_STATE_REGISTER_RBP = 43, - EFI_MM_SAVE_STATE_REGISTER_RSI = 44, - EFI_MM_SAVE_STATE_REGISTER_RDI = 45, - EFI_MM_SAVE_STATE_REGISTER_RIP = 46, - EFI_MM_SAVE_STATE_REGISTER_RFLAGS = 51, - EFI_MM_SAVE_STATE_REGISTER_CR0 = 52, - EFI_MM_SAVE_STATE_REGISTER_CR3 = 53, - EFI_MM_SAVE_STATE_REGISTER_CR4 = 54, - EFI_MM_SAVE_STATE_REGISTER_FCW = 256, - EFI_MM_SAVE_STATE_REGISTER_FSW = 257, - EFI_MM_SAVE_STATE_REGISTER_FTW = 258, - EFI_MM_SAVE_STATE_REGISTER_OPCODE = 259, - EFI_MM_SAVE_STATE_REGISTER_FP_EIP = 260, - EFI_MM_SAVE_STATE_REGISTER_FP_CS = 261, - EFI_MM_SAVE_STATE_REGISTER_DATAOFFSET = 262, - EFI_MM_SAVE_STATE_REGISTER_FP_DS = 263, - EFI_MM_SAVE_STATE_REGISTER_MM0 = 264, - EFI_MM_SAVE_STATE_REGISTER_MM1 = 265, - EFI_MM_SAVE_STATE_REGISTER_MM2 = 266, - EFI_MM_SAVE_STATE_REGISTER_MM3 = 267, - EFI_MM_SAVE_STATE_REGISTER_MM4 = 268, - EFI_MM_SAVE_STATE_REGISTER_MM5 = 269, - EFI_MM_SAVE_STATE_REGISTER_MM6 = 270, - EFI_MM_SAVE_STATE_REGISTER_MM7 = 271, - EFI_MM_SAVE_STATE_REGISTER_XMM0 = 272, - EFI_MM_SAVE_STATE_REGISTER_XMM1 = 273, - EFI_MM_SAVE_STATE_REGISTER_XMM2 = 274, - EFI_MM_SAVE_STATE_REGISTER_XMM3 = 275, - EFI_MM_SAVE_STATE_REGISTER_XMM4 = 276, - EFI_MM_SAVE_STATE_REGISTER_XMM5 = 277, - EFI_MM_SAVE_STATE_REGISTER_XMM6 = 278, - EFI_MM_SAVE_STATE_REGISTER_XMM7 = 279, - EFI_MM_SAVE_STATE_REGISTER_XMM8 = 280, - EFI_MM_SAVE_STATE_REGISTER_XMM9 = 281, - EFI_MM_SAVE_STATE_REGISTER_XMM10 = 282, - EFI_MM_SAVE_STATE_REGISTER_XMM11 = 283, - EFI_MM_SAVE_STATE_REGISTER_XMM12 = 284, - EFI_MM_SAVE_STATE_REGISTER_XMM13 = 285, - EFI_MM_SAVE_STATE_REGISTER_XMM14 = 286, - EFI_MM_SAVE_STATE_REGISTER_XMM15 = 287, + EFI_MM_SAVE_STATE_REGISTER_GDTBASE = 4, + EFI_MM_SAVE_STATE_REGISTER_IDTBASE = 5, + EFI_MM_SAVE_STATE_REGISTER_LDTBASE = 6, + EFI_MM_SAVE_STATE_REGISTER_GDTLIMIT = 7, + EFI_MM_SAVE_STATE_REGISTER_IDTLIMIT = 8, + EFI_MM_SAVE_STATE_REGISTER_LDTLIMIT = 9, + EFI_MM_SAVE_STATE_REGISTER_LDTINFO = 10, + EFI_MM_SAVE_STATE_REGISTER_ES = 20, + EFI_MM_SAVE_STATE_REGISTER_CS = 21, + EFI_MM_SAVE_STATE_REGISTER_SS = 22, + EFI_MM_SAVE_STATE_REGISTER_DS = 23, + EFI_MM_SAVE_STATE_REGISTER_FS = 24, + EFI_MM_SAVE_STATE_REGISTER_GS = 25, + EFI_MM_SAVE_STATE_REGISTER_LDTR_SEL = 26, + EFI_MM_SAVE_STATE_REGISTER_TR_SEL = 27, + EFI_MM_SAVE_STATE_REGISTER_DR7 = 28, + EFI_MM_SAVE_STATE_REGISTER_DR6 = 29, + EFI_MM_SAVE_STATE_REGISTER_R8 = 30, + EFI_MM_SAVE_STATE_REGISTER_R9 = 31, + EFI_MM_SAVE_STATE_REGISTER_R10 = 32, + EFI_MM_SAVE_STATE_REGISTER_R11 = 33, + EFI_MM_SAVE_STATE_REGISTER_R12 = 34, + EFI_MM_SAVE_STATE_REGISTER_R13 = 35, + EFI_MM_SAVE_STATE_REGISTER_R14 = 36, + EFI_MM_SAVE_STATE_REGISTER_R15 = 37, + EFI_MM_SAVE_STATE_REGISTER_RAX = 38, + EFI_MM_SAVE_STATE_REGISTER_RBX = 39, + EFI_MM_SAVE_STATE_REGISTER_RCX = 40, + EFI_MM_SAVE_STATE_REGISTER_RDX = 41, + EFI_MM_SAVE_STATE_REGISTER_RSP = 42, + EFI_MM_SAVE_STATE_REGISTER_RBP = 43, + EFI_MM_SAVE_STATE_REGISTER_RSI = 44, + EFI_MM_SAVE_STATE_REGISTER_RDI = 45, + EFI_MM_SAVE_STATE_REGISTER_RIP = 46, + EFI_MM_SAVE_STATE_REGISTER_RFLAGS = 51, + EFI_MM_SAVE_STATE_REGISTER_CR0 = 52, + EFI_MM_SAVE_STATE_REGISTER_CR3 = 53, + EFI_MM_SAVE_STATE_REGISTER_CR4 = 54, + EFI_MM_SAVE_STATE_REGISTER_FCW = 256, + EFI_MM_SAVE_STATE_REGISTER_FSW = 257, + EFI_MM_SAVE_STATE_REGISTER_FTW = 258, + EFI_MM_SAVE_STATE_REGISTER_OPCODE = 259, + EFI_MM_SAVE_STATE_REGISTER_FP_EIP = 260, + EFI_MM_SAVE_STATE_REGISTER_FP_CS = 261, + EFI_MM_SAVE_STATE_REGISTER_DATAOFFSET = 262, + EFI_MM_SAVE_STATE_REGISTER_FP_DS = 263, + EFI_MM_SAVE_STATE_REGISTER_MM0 = 264, + EFI_MM_SAVE_STATE_REGISTER_MM1 = 265, + EFI_MM_SAVE_STATE_REGISTER_MM2 = 266, + EFI_MM_SAVE_STATE_REGISTER_MM3 = 267, + EFI_MM_SAVE_STATE_REGISTER_MM4 = 268, + EFI_MM_SAVE_STATE_REGISTER_MM5 = 269, + EFI_MM_SAVE_STATE_REGISTER_MM6 = 270, + EFI_MM_SAVE_STATE_REGISTER_MM7 = 271, + EFI_MM_SAVE_STATE_REGISTER_XMM0 = 272, + EFI_MM_SAVE_STATE_REGISTER_XMM1 = 273, + EFI_MM_SAVE_STATE_REGISTER_XMM2 = 274, + EFI_MM_SAVE_STATE_REGISTER_XMM3 = 275, + EFI_MM_SAVE_STATE_REGISTER_XMM4 = 276, + EFI_MM_SAVE_STATE_REGISTER_XMM5 = 277, + EFI_MM_SAVE_STATE_REGISTER_XMM6 = 278, + EFI_MM_SAVE_STATE_REGISTER_XMM7 = 279, + EFI_MM_SAVE_STATE_REGISTER_XMM8 = 280, + EFI_MM_SAVE_STATE_REGISTER_XMM9 = 281, + EFI_MM_SAVE_STATE_REGISTER_XMM10 = 282, + EFI_MM_SAVE_STATE_REGISTER_XMM11 = 283, + EFI_MM_SAVE_STATE_REGISTER_XMM12 = 284, + EFI_MM_SAVE_STATE_REGISTER_XMM13 = 285, + EFI_MM_SAVE_STATE_REGISTER_XMM14 = 286, + EFI_MM_SAVE_STATE_REGISTER_XMM15 = 287, /// /// Pseudo-Registers /// - EFI_MM_SAVE_STATE_REGISTER_IO = 512, - EFI_MM_SAVE_STATE_REGISTER_LMA = 513, - EFI_MM_SAVE_STATE_REGISTER_PROCESSOR_ID = 514 + EFI_MM_SAVE_STATE_REGISTER_IO = 512, + EFI_MM_SAVE_STATE_REGISTER_LMA = 513, + EFI_MM_SAVE_STATE_REGISTER_PROCESSOR_ID = 514 } EFI_MM_SAVE_STATE_REGISTER; /// @@ -117,20 +117,20 @@ typedef enum { /// Size width of I/O instruction /// typedef enum { - EFI_MM_SAVE_STATE_IO_WIDTH_UINT8 = 0, - EFI_MM_SAVE_STATE_IO_WIDTH_UINT16 = 1, - EFI_MM_SAVE_STATE_IO_WIDTH_UINT32 = 2, - EFI_MM_SAVE_STATE_IO_WIDTH_UINT64 = 3 + EFI_MM_SAVE_STATE_IO_WIDTH_UINT8 = 0, + EFI_MM_SAVE_STATE_IO_WIDTH_UINT16 = 1, + EFI_MM_SAVE_STATE_IO_WIDTH_UINT32 = 2, + EFI_MM_SAVE_STATE_IO_WIDTH_UINT64 = 3 } EFI_MM_SAVE_STATE_IO_WIDTH; /// /// Types of I/O instruction /// typedef enum { - EFI_MM_SAVE_STATE_IO_TYPE_INPUT = 1, - EFI_MM_SAVE_STATE_IO_TYPE_OUTPUT = 2, - EFI_MM_SAVE_STATE_IO_TYPE_STRING = 4, - EFI_MM_SAVE_STATE_IO_TYPE_REP_PREFIX = 8 + EFI_MM_SAVE_STATE_IO_TYPE_INPUT = 1, + EFI_MM_SAVE_STATE_IO_TYPE_OUTPUT = 2, + EFI_MM_SAVE_STATE_IO_TYPE_STRING = 4, + EFI_MM_SAVE_STATE_IO_TYPE_REP_PREFIX = 8 } EFI_MM_SAVE_STATE_IO_TYPE; /// @@ -161,7 +161,7 @@ typedef struct _EFI_MM_SAVE_STATE_IO_INFO { EFI_MM_SAVE_STATE_IO_TYPE IoType; } EFI_MM_SAVE_STATE_IO_INFO; -typedef struct _EFI_MM_CPU_PROTOCOL EFI_MM_CPU_PROTOCOL; +typedef struct _EFI_MM_CPU_PROTOCOL EFI_MM_CPU_PROTOCOL; /** Read data from the CPU save state. @@ -192,7 +192,6 @@ EFI_STATUS OUT VOID *Buffer ); - /** Write data to the CPU save state. @@ -231,11 +230,10 @@ EFI_STATUS /// format. /// struct _EFI_MM_CPU_PROTOCOL { - EFI_MM_READ_SAVE_STATE ReadSaveState; - EFI_MM_WRITE_SAVE_STATE WriteSaveState; + EFI_MM_READ_SAVE_STATE ReadSaveState; + EFI_MM_WRITE_SAVE_STATE WriteSaveState; }; -extern EFI_GUID gEfiMmCpuProtocolGuid; +extern EFI_GUID gEfiMmCpuProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmCpuIo.h b/MdePkg/Include/Protocol/MmCpuIo.h index 2e7c829282..a723f8764c 100644 --- a/MdePkg/Include/Protocol/MmCpuIo.h +++ b/MdePkg/Include/Protocol/MmCpuIo.h @@ -16,7 +16,7 @@ 0x3242A9D8, 0xCE70, 0x4AA0, { 0x95, 0x5D, 0x5E, 0x7B, 0x14, 0x0D, 0xE4, 0xD2 } \ } -typedef struct _EFI_MM_CPU_IO_PROTOCOL EFI_MM_CPU_IO_PROTOCOL; +typedef struct _EFI_MM_CPU_IO_PROTOCOL EFI_MM_CPU_IO_PROTOCOL; /// /// Width of the MM CPU I/O operations @@ -64,11 +64,11 @@ typedef struct { /// /// This service provides the various modalities of memory and I/O read. /// - EFI_MM_CPU_IO Read; + EFI_MM_CPU_IO Read; /// /// This service provides the various modalities of memory and I/O write. /// - EFI_MM_CPU_IO Write; + EFI_MM_CPU_IO Write; } EFI_MM_IO_ACCESS; /// @@ -78,13 +78,13 @@ struct _EFI_MM_CPU_IO_PROTOCOL { /// /// Allows reads and writes to memory-mapped I/O space. /// - EFI_MM_IO_ACCESS Mem; + EFI_MM_IO_ACCESS Mem; /// /// Allows reads and writes to I/O space. /// - EFI_MM_IO_ACCESS Io; + EFI_MM_IO_ACCESS Io; }; -extern EFI_GUID gEfiMmCpuIoProtocolGuid; +extern EFI_GUID gEfiMmCpuIoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/MmEndOfDxe.h b/MdePkg/Include/Protocol/MmEndOfDxe.h index cecee97dfd..8b86555119 100644 --- a/MdePkg/Include/Protocol/MmEndOfDxe.h +++ b/MdePkg/Include/Protocol/MmEndOfDxe.h @@ -19,6 +19,6 @@ 0x24e70042, 0xd5c5, 0x4260, { 0x8c, 0x39, 0xa, 0xd3, 0xaa, 0x32, 0xe9, 0x3d } \ } -extern EFI_GUID gEfiMmEndOfDxeProtocolGuid; +extern EFI_GUID gEfiMmEndOfDxeProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/MmGpiDispatch.h b/MdePkg/Include/Protocol/MmGpiDispatch.h index ed20e97125..0ce11bbf3b 100644 --- a/MdePkg/Include/Protocol/MmGpiDispatch.h +++ b/MdePkg/Include/Protocol/MmGpiDispatch.h @@ -36,7 +36,7 @@ typedef struct { /// 0 corresponds to logical GPI[0]; 1 corresponds to logical GPI[1]; and /// GpiNum of N corresponds to GPI[N], where N can span from 0 to 2^64-1. /// - UINT64 GpiNum; + UINT64 GpiNum; } EFI_MM_GPI_REGISTER_CONTEXT; typedef struct _EFI_MM_GPI_DISPATCH_PROTOCOL EFI_MM_GPI_DISPATCH_PROTOCOL; @@ -105,15 +105,14 @@ EFI_STATUS /// for the General Purpose Input (GPI) MMI source generator. /// struct _EFI_MM_GPI_DISPATCH_PROTOCOL { - EFI_MM_GPI_REGISTER Register; - EFI_MM_GPI_UNREGISTER UnRegister; + EFI_MM_GPI_REGISTER Register; + EFI_MM_GPI_UNREGISTER UnRegister; /// /// Denotes the maximum value of inputs that can have handlers attached. /// - UINTN NumSupportedGpis; + UINTN NumSupportedGpis; }; -extern EFI_GUID gEfiMmGpiDispatchProtocolGuid; +extern EFI_GUID gEfiMmGpiDispatchProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmIoTrapDispatch.h b/MdePkg/Include/Protocol/MmIoTrapDispatch.h index 3c9905fbb5..e18d88d9cd 100644 --- a/MdePkg/Include/Protocol/MmIoTrapDispatch.h +++ b/MdePkg/Include/Protocol/MmIoTrapDispatch.h @@ -37,16 +37,16 @@ typedef enum { /// IO trap event that should invoke the handler /// typedef struct { - UINT16 Address; - UINT16 Length; - EFI_MM_IO_TRAP_DISPATCH_TYPE Type; + UINT16 Address; + UINT16 Length; + EFI_MM_IO_TRAP_DISPATCH_TYPE Type; } EFI_MM_IO_TRAP_REGISTER_CONTEXT; /// /// IO Trap context structure containing information about the IO trap that occurred /// typedef struct { - UINT32 WriteData; + UINT32 WriteData; } EFI_MM_IO_TRAP_CONTEXT; typedef struct _EFI_MM_IO_TRAP_DISPATCH_PROTOCOL EFI_MM_IO_TRAP_DISPATCH_PROTOCOL; @@ -92,7 +92,7 @@ EFI_STATUS IN CONST EFI_MM_IO_TRAP_DISPATCH_PROTOCOL *This, IN EFI_MM_HANDLER_ENTRY_POINT DispatchFunction, IN OUT EFI_MM_IO_TRAP_REGISTER_CONTEXT *RegisterContext, - OUT EFI_HANDLE *DispatchHandle + OUT EFI_HANDLE *DispatchHandle ); /** @@ -120,11 +120,10 @@ EFI_STATUS /// This protocol provides a parent dispatch service for IO trap MMI sources. /// struct _EFI_MM_IO_TRAP_DISPATCH_PROTOCOL { - EFI_MM_IO_TRAP_DISPATCH_REGISTER Register; - EFI_MM_IO_TRAP_DISPATCH_UNREGISTER UnRegister; + EFI_MM_IO_TRAP_DISPATCH_REGISTER Register; + EFI_MM_IO_TRAP_DISPATCH_UNREGISTER UnRegister; }; -extern EFI_GUID gEfiMmIoTrapDispatchProtocolGuid; +extern EFI_GUID gEfiMmIoTrapDispatchProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmMp.h b/MdePkg/Include/Protocol/MmMp.h index beace1386c..ad958c84b5 100644 --- a/MdePkg/Include/Protocol/MmMp.h +++ b/MdePkg/Include/Protocol/MmMp.h @@ -26,24 +26,24 @@ // // Revision definition. // -#define EFI_MM_MP_PROTOCOL_REVISION 0x00 +#define EFI_MM_MP_PROTOCOL_REVISION 0x00 // // Attribute flags // -#define EFI_MM_MP_TIMEOUT_SUPPORTED 0x01 +#define EFI_MM_MP_TIMEOUT_SUPPORTED 0x01 // // Completion token // -typedef VOID* MM_COMPLETION; +typedef VOID *MM_COMPLETION; typedef struct { - MM_COMPLETION Completion; - EFI_STATUS Status; + MM_COMPLETION Completion; + EFI_STATUS Status; } MM_DISPATCH_COMPLETION_TOKEN; -typedef struct _EFI_MM_MP_PROTOCOL EFI_MM_MP_PROTOCOL; +typedef struct _EFI_MM_MP_PROTOCOL EFI_MM_MP_PROTOCOL; /** Service to retrieves the number of logical processor in the platform. @@ -57,11 +57,10 @@ typedef struct _EFI_MM_MP_PROTOCOL EFI_MM_MP_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_MM_GET_NUMBER_OF_PROCESSORS) ( +(EFIAPI *EFI_MM_GET_NUMBER_OF_PROCESSORS)( IN CONST EFI_MM_MP_PROTOCOL *This, OUT UINTN *NumberOfProcessors -); - + ); /** This service allows the caller to invoke a procedure one of the application processors (AP). This @@ -124,7 +123,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_MM_DISPATCH_PROCEDURE) ( +(EFIAPI *EFI_MM_DISPATCH_PROCEDURE)( IN CONST EFI_MM_MP_PROTOCOL *This, IN EFI_AP_PROCEDURE2 Procedure, IN UINTN CpuNumber, @@ -132,7 +131,7 @@ EFI_STATUS IN OUT VOID *ProcedureArguments OPTIONAL, IN OUT MM_COMPLETION *Token, IN OUT EFI_STATUS *CPUStatus -); + ); /** This service allows the caller to invoke a procedure on all running application processors (AP) @@ -202,15 +201,14 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_MM_BROADCAST_PROCEDURE) ( +(EFIAPI *EFI_MM_BROADCAST_PROCEDURE)( IN CONST EFI_MM_MP_PROTOCOL *This, IN EFI_AP_PROCEDURE2 Procedure, IN UINTN TimeoutInMicroseconds, IN OUT VOID *ProcedureArguments OPTIONAL, IN OUT MM_COMPLETION *Token, IN OUT EFI_STATUS *CPUStatus -); - + ); /** This service allows the caller to set a startup procedure that will be executed when an AP powers @@ -238,11 +236,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_MM_SET_STARTUP_PROCEDURE) ( +(EFIAPI *EFI_MM_SET_STARTUP_PROCEDURE)( IN CONST EFI_MM_MP_PROTOCOL *This, IN EFI_AP_PROCEDURE Procedure, IN OUT VOID *ProcedureArguments OPTIONAL -); + ); /** When non-blocking execution of a procedure on an AP is invoked with DispatchProcedure, @@ -274,10 +272,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_CHECK_FOR_PROCEDURE) ( +(EFIAPI *EFI_CHECK_FOR_PROCEDURE)( IN CONST EFI_MM_MP_PROTOCOL *This, IN MM_COMPLETION Token -); + ); /** When a non-blocking execution of a procedure on an AP is invoked via DispatchProcedure, @@ -306,28 +304,26 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_WAIT_FOR_PROCEDURE) ( +(EFIAPI *EFI_WAIT_FOR_PROCEDURE)( IN CONST EFI_MM_MP_PROTOCOL *This, IN MM_COMPLETION Token -); - - + ); /// /// The MM MP protocol provides a set of functions to allow execution of procedures on processors that /// have entered MM. /// struct _EFI_MM_MP_PROTOCOL { - UINT32 Revision; - UINT32 Attributes; - EFI_MM_GET_NUMBER_OF_PROCESSORS GetNumberOfProcessors; - EFI_MM_DISPATCH_PROCEDURE DispatchProcedure; - EFI_MM_BROADCAST_PROCEDURE BroadcastProcedure; - EFI_MM_SET_STARTUP_PROCEDURE SetStartupProcedure; - EFI_CHECK_FOR_PROCEDURE CheckForProcedure; - EFI_WAIT_FOR_PROCEDURE WaitForProcedure; + UINT32 Revision; + UINT32 Attributes; + EFI_MM_GET_NUMBER_OF_PROCESSORS GetNumberOfProcessors; + EFI_MM_DISPATCH_PROCEDURE DispatchProcedure; + EFI_MM_BROADCAST_PROCEDURE BroadcastProcedure; + EFI_MM_SET_STARTUP_PROCEDURE SetStartupProcedure; + EFI_CHECK_FOR_PROCEDURE CheckForProcedure; + EFI_WAIT_FOR_PROCEDURE WaitForProcedure; }; -extern EFI_GUID gEfiMmMpProtocolGuid; +extern EFI_GUID gEfiMmMpProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/MmPciRootBridgeIo.h b/MdePkg/Include/Protocol/MmPciRootBridgeIo.h index faf6e27d22..7535a39992 100644 --- a/MdePkg/Include/Protocol/MmPciRootBridgeIo.h +++ b/MdePkg/Include/Protocol/MmPciRootBridgeIo.h @@ -23,9 +23,8 @@ /// UEFI 2.1 Specifcation, section 13.2, except that the functions for Map() and Unmap() may return /// EFI_UNSUPPORTED. /// -typedef EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL EFI_MM_PCI_ROOT_BRIDGE_IO_PROTOCOL; +typedef EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL EFI_MM_PCI_ROOT_BRIDGE_IO_PROTOCOL; -extern EFI_GUID gEfiMmPciRootBridgeIoProtocolGuid; +extern EFI_GUID gEfiMmPciRootBridgeIoProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmPeriodicTimerDispatch.h b/MdePkg/Include/Protocol/MmPeriodicTimerDispatch.h index 8733de7567..01b4e6b161 100644 --- a/MdePkg/Include/Protocol/MmPeriodicTimerDispatch.h +++ b/MdePkg/Include/Protocol/MmPeriodicTimerDispatch.h @@ -46,13 +46,13 @@ typedef struct { /// The minimum period of time in 100 nanosecond units that the child gets called. The /// child will be called back after a time greater than the time Period. /// - UINT64 Period; + UINT64 Period; /// /// The period of time interval between MMIs. Children of this interface should use this /// field when registering for periodic timer intervals when a finer granularity periodic /// MMI is desired. /// - UINT64 MmiTickInterval; + UINT64 MmiTickInterval; } EFI_MM_PERIODIC_TIMER_REGISTER_CONTEXT; /// @@ -65,10 +65,10 @@ typedef struct { /// ElapsedTime is the actual time in 100 nanosecond units elapsed since last called, a /// value of 0 indicates an unknown amount of time. /// - UINT64 ElapsedTime; + UINT64 ElapsedTime; } EFI_MM_PERIODIC_TIMER_CONTEXT; -typedef struct _EFI_MM_PERIODIC_TIMER_DISPATCH_PROTOCOL EFI_MM_PERIODIC_TIMER_DISPATCH_PROTOCOL; +typedef struct _EFI_MM_PERIODIC_TIMER_DISPATCH_PROTOCOL EFI_MM_PERIODIC_TIMER_DISPATCH_PROTOCOL; /** Register a child MMI source dispatch function for MM periodic timer. @@ -153,12 +153,11 @@ EFI_STATUS /// This protocol provides the parent dispatch service for the periodical timer MMI source generator. /// struct _EFI_MM_PERIODIC_TIMER_DISPATCH_PROTOCOL { - EFI_MM_PERIODIC_TIMER_REGISTER Register; - EFI_MM_PERIODIC_TIMER_UNREGISTER UnRegister; - EFI_MM_PERIODIC_TIMER_INTERVAL GetNextShorterInterval; + EFI_MM_PERIODIC_TIMER_REGISTER Register; + EFI_MM_PERIODIC_TIMER_UNREGISTER UnRegister; + EFI_MM_PERIODIC_TIMER_INTERVAL GetNextShorterInterval; }; -extern EFI_GUID gEfiMmPeriodicTimerDispatchProtocolGuid; +extern EFI_GUID gEfiMmPeriodicTimerDispatchProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmPowerButtonDispatch.h b/MdePkg/Include/Protocol/MmPowerButtonDispatch.h index a7697a84f5..0a61b3fd9e 100644 --- a/MdePkg/Include/Protocol/MmPowerButtonDispatch.h +++ b/MdePkg/Include/Protocol/MmPowerButtonDispatch.h @@ -38,7 +38,7 @@ typedef struct { /// /// Designates whether this handler should be invoked upon entry or exit. /// - EFI_POWER_BUTTON_PHASE Phase; + EFI_POWER_BUTTON_PHASE Phase; } EFI_MM_POWER_BUTTON_REGISTER_CONTEXT; typedef struct _EFI_MM_POWER_BUTTON_DISPATCH_PROTOCOL EFI_MM_POWER_BUTTON_DISPATCH_PROTOCOL; @@ -101,11 +101,10 @@ EFI_STATUS /// This protocol provides the parent dispatch service for the power button MMI source generator. /// struct _EFI_MM_POWER_BUTTON_DISPATCH_PROTOCOL { - EFI_MM_POWER_BUTTON_REGISTER Register; - EFI_MM_POWER_BUTTON_UNREGISTER UnRegister; + EFI_MM_POWER_BUTTON_REGISTER Register; + EFI_MM_POWER_BUTTON_UNREGISTER UnRegister; }; -extern EFI_GUID gEfiMmPowerButtonDispatchProtocolGuid; +extern EFI_GUID gEfiMmPowerButtonDispatchProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmReadyToLock.h b/MdePkg/Include/Protocol/MmReadyToLock.h index 17088cd9d2..b8fa3b55f3 100644 --- a/MdePkg/Include/Protocol/MmReadyToLock.h +++ b/MdePkg/Include/Protocol/MmReadyToLock.h @@ -21,6 +21,6 @@ 0x47b7fa8c, 0xf4bd, 0x4af6, { 0x82, 0x00, 0x33, 0x30, 0x86, 0xf0, 0xd2, 0xc8 } \ } -extern EFI_GUID gEfiMmReadyToLockProtocolGuid; +extern EFI_GUID gEfiMmReadyToLockProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/MmReportStatusCodeHandler.h b/MdePkg/Include/Protocol/MmReportStatusCodeHandler.h index f97509e1e4..64c865fda6 100644 --- a/MdePkg/Include/Protocol/MmReportStatusCodeHandler.h +++ b/MdePkg/Include/Protocol/MmReportStatusCodeHandler.h @@ -25,7 +25,7 @@ EFI_STATUS IN UINT32 Instance, IN EFI_GUID *CallerId, IN EFI_STATUS_CODE_DATA *Data -); + ); /** Register the callback function for ReportStatusCode() notification. @@ -46,7 +46,7 @@ typedef EFI_STATUS (EFIAPI *EFI_MM_RSC_HANDLER_REGISTER)( IN EFI_MM_RSC_HANDLER_CALLBACK Callback -); + ); /** Remove a previously registered callback function from the notification list. @@ -66,13 +66,13 @@ typedef EFI_STATUS (EFIAPI *EFI_MM_RSC_HANDLER_UNREGISTER)( IN EFI_MM_RSC_HANDLER_CALLBACK Callback -); + ); typedef struct _EFI_MM_RSC_HANDLER_PROTOCOL { EFI_MM_RSC_HANDLER_REGISTER Register; EFI_MM_RSC_HANDLER_UNREGISTER Unregister; } EFI_MM_RSC_HANDLER_PROTOCOL; -extern EFI_GUID gEfiMmRscHandlerProtocolGuid; +extern EFI_GUID gEfiMmRscHandlerProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/MmStandbyButtonDispatch.h b/MdePkg/Include/Protocol/MmStandbyButtonDispatch.h index 49d105be7a..1a76f8552d 100644 --- a/MdePkg/Include/Protocol/MmStandbyButtonDispatch.h +++ b/MdePkg/Include/Protocol/MmStandbyButtonDispatch.h @@ -39,7 +39,7 @@ typedef struct { /// Describes whether the child handler should be invoked upon the entry to the button /// activation or upon exit. /// - EFI_STANDBY_BUTTON_PHASE Phase; + EFI_STANDBY_BUTTON_PHASE Phase; } EFI_MM_STANDBY_BUTTON_REGISTER_CONTEXT; typedef struct _EFI_MM_STANDBY_BUTTON_DISPATCH_PROTOCOL EFI_MM_STANDBY_BUTTON_DISPATCH_PROTOCOL; @@ -103,11 +103,10 @@ EFI_STATUS /// button MMI source generator. /// struct _EFI_MM_STANDBY_BUTTON_DISPATCH_PROTOCOL { - EFI_MM_STANDBY_BUTTON_REGISTER Register; - EFI_MM_STANDBY_BUTTON_UNREGISTER UnRegister; + EFI_MM_STANDBY_BUTTON_REGISTER Register; + EFI_MM_STANDBY_BUTTON_UNREGISTER UnRegister; }; -extern EFI_GUID gEfiMmStandbyButtonDispatchProtocolGuid; +extern EFI_GUID gEfiMmStandbyButtonDispatchProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmStatusCode.h b/MdePkg/Include/Protocol/MmStatusCode.h index ce9c51e549..771cbee2d6 100644 --- a/MdePkg/Include/Protocol/MmStatusCode.h +++ b/MdePkg/Include/Protocol/MmStatusCode.h @@ -11,13 +11,12 @@ #ifndef _MM_STATUS_CODE_H__ #define _MM_STATUS_CODE_H__ - #define EFI_MM_STATUS_CODE_PROTOCOL_GUID \ { \ 0x6afd2b77, 0x98c1, 0x4acd, {0xa6, 0xf9, 0x8a, 0x94, 0x39, 0xde, 0xf, 0xb1} \ } -typedef struct _EFI_MM_STATUS_CODE_PROTOCOL EFI_MM_STATUS_CODE_PROTOCOL; +typedef struct _EFI_MM_STATUS_CODE_PROTOCOL EFI_MM_STATUS_CODE_PROTOCOL; /** Service to emit the status code in MM. @@ -50,10 +49,9 @@ EFI_STATUS ); struct _EFI_MM_STATUS_CODE_PROTOCOL { - EFI_MM_REPORT_STATUS_CODE ReportStatusCode; + EFI_MM_REPORT_STATUS_CODE ReportStatusCode; }; -extern EFI_GUID gEfiMmStatusCodeProtocolGuid; +extern EFI_GUID gEfiMmStatusCodeProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MmSwDispatch.h b/MdePkg/Include/Protocol/MmSwDispatch.h index a3f4b41db2..e7810662ec 100644 --- a/MdePkg/Include/Protocol/MmSwDispatch.h +++ b/MdePkg/Include/Protocol/MmSwDispatch.h @@ -25,7 +25,7 @@ /// child registration for each SwMmiInputValue. /// typedef struct { - UINTN SwMmiInputValue; + UINTN SwMmiInputValue; } EFI_MM_SW_REGISTER_CONTEXT; /// @@ -38,18 +38,18 @@ typedef struct { /// /// The 0-based index of the CPU which generated the software MMI. /// - UINTN SwMmiCpuIndex; + UINTN SwMmiCpuIndex; /// /// This value corresponds directly to the CommandPort parameter used in the call to Trigger(). /// - UINT8 CommandPort; + UINT8 CommandPort; /// /// This value corresponds directly to the DataPort parameter used in the call to Trigger(). /// - UINT8 DataPort; + UINT8 DataPort; } EFI_MM_SW_CONTEXT; -typedef struct _EFI_MM_SW_DISPATCH_PROTOCOL EFI_MM_SW_DISPATCH_PROTOCOL; +typedef struct _EFI_MM_SW_DISPATCH_PROTOCOL EFI_MM_SW_DISPATCH_PROTOCOL; /** Register a child MMI source dispatch function for the specified software MMI. @@ -106,7 +106,7 @@ EFI_STATUS (EFIAPI *EFI_MM_SW_UNREGISTER)( IN CONST EFI_MM_SW_DISPATCH_PROTOCOL *This, IN EFI_HANDLE DispatchHandle -); + ); /// /// Interface structure for the MM Software MMI Dispatch Protocol. @@ -116,15 +116,15 @@ EFI_STATUS /// interrupt in the EFI_MM_SW_REGISTER_CONTEXT is denoted by MaximumSwiValue. /// struct _EFI_MM_SW_DISPATCH_PROTOCOL { - EFI_MM_SW_REGISTER Register; - EFI_MM_SW_UNREGISTER UnRegister; + EFI_MM_SW_REGISTER Register; + EFI_MM_SW_UNREGISTER UnRegister; /// /// A read-only field that describes the maximum value that can be used in the /// EFI_MM_SW_DISPATCH_PROTOCOL.Register() service. /// - UINTN MaximumSwiValue; + UINTN MaximumSwiValue; }; -extern EFI_GUID gEfiMmSwDispatchProtocolGuid; +extern EFI_GUID gEfiMmSwDispatchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/MmSxDispatch.h b/MdePkg/Include/Protocol/MmSxDispatch.h index 8a53be69c5..f9f74a2885 100644 --- a/MdePkg/Include/Protocol/MmSxDispatch.h +++ b/MdePkg/Include/Protocol/MmSxDispatch.h @@ -45,11 +45,11 @@ typedef enum { /// The dispatch function's context /// typedef struct { - EFI_SLEEP_TYPE Type; - EFI_SLEEP_PHASE Phase; + EFI_SLEEP_TYPE Type; + EFI_SLEEP_PHASE Phase; } EFI_MM_SX_REGISTER_CONTEXT; -typedef struct _EFI_MM_SX_DISPATCH_PROTOCOL EFI_MM_SX_DISPATCH_PROTOCOL; +typedef struct _EFI_MM_SX_DISPATCH_PROTOCOL EFI_MM_SX_DISPATCH_PROTOCOL; /** Provides the parent dispatch service for a given Sx source generator. @@ -120,10 +120,10 @@ EFI_STATUS /// respond to sleep state related events. /// struct _EFI_MM_SX_DISPATCH_PROTOCOL { - EFI_MM_SX_REGISTER Register; - EFI_MM_SX_UNREGISTER UnRegister; + EFI_MM_SX_REGISTER Register; + EFI_MM_SX_UNREGISTER UnRegister; }; -extern EFI_GUID gEfiMmSxDispatchProtocolGuid; +extern EFI_GUID gEfiMmSxDispatchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/MmUsbDispatch.h b/MdePkg/Include/Protocol/MmUsbDispatch.h index c5d5bc56ec..b250adda5b 100644 --- a/MdePkg/Include/Protocol/MmUsbDispatch.h +++ b/MdePkg/Include/Protocol/MmUsbDispatch.h @@ -39,14 +39,14 @@ typedef struct { /// emulation event, such as port-trap on the PS/2* keyboard control registers, or to a /// USB wake event, such as resumption from a sleep state. /// - EFI_USB_MMI_TYPE Type; + EFI_USB_MMI_TYPE Type; /// /// The device path is part of the context structure and describes the location of the /// particular USB host controller in the system for which this register event will occur. /// This location is important because of the possible integration of several USB host /// controllers in a system. /// - EFI_DEVICE_PATH_PROTOCOL *Device; + EFI_DEVICE_PATH_PROTOCOL *Device; } EFI_MM_USB_REGISTER_CONTEXT; typedef struct _EFI_MM_USB_DISPATCH_PROTOCOL EFI_MM_USB_DISPATCH_PROTOCOL; @@ -114,11 +114,10 @@ EFI_STATUS /// This protocol provides the parent dispatch service for the USB MMI source generator. /// struct _EFI_MM_USB_DISPATCH_PROTOCOL { - EFI_MM_USB_REGISTER Register; - EFI_MM_USB_UNREGISTER UnRegister; + EFI_MM_USB_REGISTER Register; + EFI_MM_USB_UNREGISTER UnRegister; }; -extern EFI_GUID gEfiMmUsbDispatchProtocolGuid; +extern EFI_GUID gEfiMmUsbDispatchProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/MonotonicCounter.h b/MdePkg/Include/Protocol/MonotonicCounter.h index 467bd07e09..ad90247368 100644 --- a/MdePkg/Include/Protocol/MonotonicCounter.h +++ b/MdePkg/Include/Protocol/MonotonicCounter.h @@ -17,6 +17,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define EFI_MONOTONIC_COUNTER_ARCH_PROTOCOL_GUID \ {0x1da97072, 0xbddc, 0x4b30, {0x99, 0xf1, 0x72, 0xa0, 0xb5, 0x6f, 0xff, 0x2a} } -extern EFI_GUID gEfiMonotonicCounterArchProtocolGuid; +extern EFI_GUID gEfiMonotonicCounterArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/MpService.h b/MdePkg/Include/Protocol/MpService.h index 9445c5567f..433a6e9259 100644 --- a/MdePkg/Include/Protocol/MpService.h +++ b/MdePkg/Include/Protocol/MpService.h @@ -50,7 +50,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// Value used in the NumberProcessors parameter of the GetProcessorInfo function /// -#define CPU_V2_EXTENDED_TOPOLOGY BIT24 +#define CPU_V2_EXTENDED_TOPOLOGY BIT24 /// /// Forward declaration for the EFI_MP_SERVICES_PROTOCOL. @@ -60,21 +60,21 @@ typedef struct _EFI_MP_SERVICES_PROTOCOL EFI_MP_SERVICES_PROTOCOL; /// /// Terminator for a list of failed CPUs returned by StartAllAPs(). /// -#define END_OF_CPU_LIST 0xffffffff +#define END_OF_CPU_LIST 0xffffffff /// /// This bit is used in the StatusFlag field of EFI_PROCESSOR_INFORMATION and /// indicates whether the processor is playing the role of BSP. If the bit is 1, /// then the processor is BSP. Otherwise, it is AP. /// -#define PROCESSOR_AS_BSP_BIT 0x00000001 +#define PROCESSOR_AS_BSP_BIT 0x00000001 /// /// This bit is used in the StatusFlag field of EFI_PROCESSOR_INFORMATION and /// indicates whether the processor is enabled. If the bit is 1, then the /// processor is enabled. Otherwise, it is disabled. /// -#define PROCESSOR_ENABLED_BIT 0x00000002 +#define PROCESSOR_ENABLED_BIT 0x00000002 /// /// This bit is used in the StatusFlag field of EFI_PROCESSOR_INFORMATION and @@ -90,58 +90,56 @@ typedef struct { /// /// Zero-based physical package number that identifies the cartridge of the processor. /// - UINT32 Package; + UINT32 Package; /// /// Zero-based physical core number within package of the processor. /// - UINT32 Core; + UINT32 Core; /// /// Zero-based logical thread number within core of the processor. /// - UINT32 Thread; + UINT32 Thread; } EFI_CPU_PHYSICAL_LOCATION; /// /// Structure that defines the 6-level physical location of the processor /// typedef struct { -/// -/// Package Zero-based physical package number that identifies the cartridge of the processor. -/// -UINT32 Package; -/// -/// Module Zero-based physical module number within package of the processor. -/// -UINT32 Module; -/// -/// Tile Zero-based physical tile number within module of the processor. -/// -UINT32 Tile; -/// -/// Die Zero-based physical die number within tile of the processor. -/// -UINT32 Die; -/// -/// Core Zero-based physical core number within die of the processor. -/// -UINT32 Core; -/// -/// Thread Zero-based logical thread number within core of the processor. -/// -UINT32 Thread; + /// + /// Package Zero-based physical package number that identifies the cartridge of the processor. + /// + UINT32 Package; + /// + /// Module Zero-based physical module number within package of the processor. + /// + UINT32 Module; + /// + /// Tile Zero-based physical tile number within module of the processor. + /// + UINT32 Tile; + /// + /// Die Zero-based physical die number within tile of the processor. + /// + UINT32 Die; + /// + /// Core Zero-based physical core number within die of the processor. + /// + UINT32 Core; + /// + /// Thread Zero-based logical thread number within core of the processor. + /// + UINT32 Thread; } EFI_CPU_PHYSICAL_LOCATION2; - typedef union { /// The 6-level physical location of the processor, including the /// physical package number that identifies the cartridge, the physical /// module number within package, the physical tile number within the module, /// the physical die number within the tile, the physical core number within /// package, and logical thread number within core. - EFI_CPU_PHYSICAL_LOCATION2 Location2; + EFI_CPU_PHYSICAL_LOCATION2 Location2; } EXTENDED_PROCESSOR_INFORMATION; - /// /// Structure that describes information about a logical CPU. /// @@ -152,7 +150,7 @@ typedef struct { /// are used, and higher bits are reserved. For IPF, the lower 16 bits contains /// id/eid, and higher bits are reserved. /// - UINT64 ProcessorId; + UINT64 ProcessorId; /// /// Flags indicating if the processor is BSP or AP, if the processor is enabled /// or disabled, and if the processor is healthy. Bits 3..31 are reserved and @@ -171,17 +169,17 @@ typedef struct { /// 1 1 1 Healthy Enabled BSP. /// /// - UINT32 StatusFlag; + UINT32 StatusFlag; /// /// The physical location of the processor, including the physical package number /// that identifies the cartridge, the physical core number within package, and /// logical thread number within core. /// - EFI_CPU_PHYSICAL_LOCATION Location; + EFI_CPU_PHYSICAL_LOCATION Location; /// /// The extended information of the processor. This field is filled only when /// CPU_V2_EXTENDED_TOPOLOGY is set in parameter ProcessorNumber. - EXTENDED_PROCESSOR_INFORMATION ExtendedInformation; + EXTENDED_PROCESSOR_INFORMATION ExtendedInformation; } EFI_PROCESSOR_INFORMATION; /** @@ -662,15 +660,15 @@ EFI_STATUS /// UEFI images must be aware that the functionality of this protocol may be reduced. /// struct _EFI_MP_SERVICES_PROTOCOL { - EFI_MP_SERVICES_GET_NUMBER_OF_PROCESSORS GetNumberOfProcessors; - EFI_MP_SERVICES_GET_PROCESSOR_INFO GetProcessorInfo; - EFI_MP_SERVICES_STARTUP_ALL_APS StartupAllAPs; - EFI_MP_SERVICES_STARTUP_THIS_AP StartupThisAP; - EFI_MP_SERVICES_SWITCH_BSP SwitchBSP; - EFI_MP_SERVICES_ENABLEDISABLEAP EnableDisableAP; - EFI_MP_SERVICES_WHOAMI WhoAmI; + EFI_MP_SERVICES_GET_NUMBER_OF_PROCESSORS GetNumberOfProcessors; + EFI_MP_SERVICES_GET_PROCESSOR_INFO GetProcessorInfo; + EFI_MP_SERVICES_STARTUP_ALL_APS StartupAllAPs; + EFI_MP_SERVICES_STARTUP_THIS_AP StartupThisAP; + EFI_MP_SERVICES_SWITCH_BSP SwitchBSP; + EFI_MP_SERVICES_ENABLEDISABLEAP EnableDisableAP; + EFI_MP_SERVICES_WHOAMI WhoAmI; }; -extern EFI_GUID gEfiMpServiceProtocolGuid; +extern EFI_GUID gEfiMpServiceProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Mtftp4.h b/MdePkg/Include/Protocol/Mtftp4.h index e5d418f873..8fbb8d4e99 100644 --- a/MdePkg/Include/Protocol/Mtftp4.h +++ b/MdePkg/Include/Protocol/Mtftp4.h @@ -22,21 +22,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0x78247c57, 0x63db, 0x4708, {0x99, 0xc2, 0xa8, 0xb4, 0xa9, 0xa6, 0x1f, 0x6b } \ } -typedef struct _EFI_MTFTP4_PROTOCOL EFI_MTFTP4_PROTOCOL; -typedef struct _EFI_MTFTP4_TOKEN EFI_MTFTP4_TOKEN; +typedef struct _EFI_MTFTP4_PROTOCOL EFI_MTFTP4_PROTOCOL; +typedef struct _EFI_MTFTP4_TOKEN EFI_MTFTP4_TOKEN; // -//MTFTP4 packet opcode definition +// MTFTP4 packet opcode definition // -#define EFI_MTFTP4_OPCODE_RRQ 1 -#define EFI_MTFTP4_OPCODE_WRQ 2 -#define EFI_MTFTP4_OPCODE_DATA 3 -#define EFI_MTFTP4_OPCODE_ACK 4 -#define EFI_MTFTP4_OPCODE_ERROR 5 -#define EFI_MTFTP4_OPCODE_OACK 6 -#define EFI_MTFTP4_OPCODE_DIR 7 -#define EFI_MTFTP4_OPCODE_DATA8 8 -#define EFI_MTFTP4_OPCODE_ACK8 9 +#define EFI_MTFTP4_OPCODE_RRQ 1 +#define EFI_MTFTP4_OPCODE_WRQ 2 +#define EFI_MTFTP4_OPCODE_DATA 3 +#define EFI_MTFTP4_OPCODE_ACK 4 +#define EFI_MTFTP4_OPCODE_ERROR 5 +#define EFI_MTFTP4_OPCODE_OACK 6 +#define EFI_MTFTP4_OPCODE_DIR 7 +#define EFI_MTFTP4_OPCODE_DATA8 8 +#define EFI_MTFTP4_OPCODE_ACK8 9 // // MTFTP4 error code definition @@ -57,80 +57,80 @@ typedef struct _EFI_MTFTP4_TOKEN EFI_MTFTP4_TOKEN; #pragma pack(1) typedef struct { - UINT16 OpCode; - UINT8 Filename[1]; + UINT16 OpCode; + UINT8 Filename[1]; } EFI_MTFTP4_REQ_HEADER; typedef struct { - UINT16 OpCode; - UINT8 Data[1]; + UINT16 OpCode; + UINT8 Data[1]; } EFI_MTFTP4_OACK_HEADER; typedef struct { - UINT16 OpCode; - UINT16 Block; - UINT8 Data[1]; + UINT16 OpCode; + UINT16 Block; + UINT8 Data[1]; } EFI_MTFTP4_DATA_HEADER; typedef struct { - UINT16 OpCode; - UINT16 Block[1]; + UINT16 OpCode; + UINT16 Block[1]; } EFI_MTFTP4_ACK_HEADER; typedef struct { - UINT16 OpCode; - UINT64 Block; - UINT8 Data[1]; + UINT16 OpCode; + UINT64 Block; + UINT8 Data[1]; } EFI_MTFTP4_DATA8_HEADER; typedef struct { - UINT16 OpCode; - UINT64 Block[1]; + UINT16 OpCode; + UINT64 Block[1]; } EFI_MTFTP4_ACK8_HEADER; typedef struct { - UINT16 OpCode; - UINT16 ErrorCode; - UINT8 ErrorMessage[1]; + UINT16 OpCode; + UINT16 ErrorCode; + UINT8 ErrorMessage[1]; } EFI_MTFTP4_ERROR_HEADER; typedef union { /// /// Type of packets as defined by the MTFTPv4 packet opcodes. /// - UINT16 OpCode; + UINT16 OpCode; /// /// Read request packet header. /// - EFI_MTFTP4_REQ_HEADER Rrq; + EFI_MTFTP4_REQ_HEADER Rrq; /// /// Write request packet header. /// - EFI_MTFTP4_REQ_HEADER Wrq; + EFI_MTFTP4_REQ_HEADER Wrq; /// /// Option acknowledge packet header. /// - EFI_MTFTP4_OACK_HEADER Oack; + EFI_MTFTP4_OACK_HEADER Oack; /// /// Data packet header. /// - EFI_MTFTP4_DATA_HEADER Data; + EFI_MTFTP4_DATA_HEADER Data; /// /// Acknowledgement packet header. /// - EFI_MTFTP4_ACK_HEADER Ack; + EFI_MTFTP4_ACK_HEADER Ack; /// /// Data packet header with big block number. /// - EFI_MTFTP4_DATA8_HEADER Data8; + EFI_MTFTP4_DATA8_HEADER Data8; /// /// Acknowledgement header with big block num. /// - EFI_MTFTP4_ACK8_HEADER Ack8; + EFI_MTFTP4_ACK8_HEADER Ack8; /// /// Error packet header. /// - EFI_MTFTP4_ERROR_HEADER Error; + EFI_MTFTP4_ERROR_HEADER Error; } EFI_MTFTP4_PACKET; #pragma pack() @@ -139,39 +139,36 @@ typedef union { /// MTFTP4 option definition. /// typedef struct { - UINT8 *OptionStr; - UINT8 *ValueStr; + UINT8 *OptionStr; + UINT8 *ValueStr; } EFI_MTFTP4_OPTION; - typedef struct { - BOOLEAN UseDefaultSetting; - EFI_IPv4_ADDRESS StationIp; - EFI_IPv4_ADDRESS SubnetMask; - UINT16 LocalPort; - EFI_IPv4_ADDRESS GatewayIp; - EFI_IPv4_ADDRESS ServerIp; - UINT16 InitialServerPort; - UINT16 TryCount; - UINT16 TimeoutValue; + BOOLEAN UseDefaultSetting; + EFI_IPv4_ADDRESS StationIp; + EFI_IPv4_ADDRESS SubnetMask; + UINT16 LocalPort; + EFI_IPv4_ADDRESS GatewayIp; + EFI_IPv4_ADDRESS ServerIp; + UINT16 InitialServerPort; + UINT16 TryCount; + UINT16 TimeoutValue; } EFI_MTFTP4_CONFIG_DATA; - typedef struct { - EFI_MTFTP4_CONFIG_DATA ConfigData; - UINT8 SupportedOptionCount; - UINT8 **SupportedOptoins; - UINT8 UnsupportedOptionCount; - UINT8 **UnsupportedOptoins; + EFI_MTFTP4_CONFIG_DATA ConfigData; + UINT8 SupportedOptionCount; + UINT8 **SupportedOptoins; + UINT8 UnsupportedOptionCount; + UINT8 **UnsupportedOptoins; } EFI_MTFTP4_MODE_DATA; - typedef struct { - EFI_IPv4_ADDRESS GatewayIp; - EFI_IPv4_ADDRESS ServerIp; - UINT16 ServerPort; - UINT16 TryCount; - UINT16 TimeoutValue; + EFI_IPv4_ADDRESS GatewayIp; + EFI_IPv4_ADDRESS ServerIp; + UINT16 ServerPort; + UINT16 TryCount; + UINT16 TimeoutValue; } EFI_MTFTP4_OVERRIDE_DATA; // @@ -250,7 +247,6 @@ EFI_STATUS OUT VOID **Buffer ); - /** Submits an asynchronous interrupt transfer to an interrupt endpoint of a USB device. @@ -269,7 +265,6 @@ EFI_STATUS OUT EFI_MTFTP4_MODE_DATA *ModeData ); - /** Initializes, changes, or resets the default operational setting for this EFI MTFTPv4 Protocol driver instance. @@ -299,7 +294,6 @@ EFI_STATUS IN EFI_MTFTP4_CONFIG_DATA *MtftpConfigData OPTIONAL ); - /** Gets information about a file from an MTFTPv4 server. @@ -389,7 +383,6 @@ EFI_STATUS OUT EFI_MTFTP4_OPTION **OptionList OPTIONAL ); - /** Downloads a file from an MTFTPv4 server. @@ -420,8 +413,6 @@ EFI_STATUS IN EFI_MTFTP4_TOKEN *Token ); - - /** Sends a file to an MTFTPv4 server. @@ -450,7 +441,6 @@ EFI_STATUS IN EFI_MTFTP4_TOKEN *Token ); - /** Downloads a data file "directory" from an MTFTPv4 server. May be unsupported in some EFI implementations. @@ -522,7 +512,7 @@ struct _EFI_MTFTP4_TOKEN { /// The status that is returned to the caller at the end of the operation /// to indicate whether this operation completed successfully. /// - EFI_STATUS Status; + EFI_STATUS Status; /// /// The event that will be signaled when the operation completes. If /// set to NULL, the corresponding function will wait until the read or @@ -530,58 +520,57 @@ struct _EFI_MTFTP4_TOKEN { /// EVT_NOTIFY_SIGNAL. The Task Priority Level (TPL) of /// Event must be lower than or equal to TPL_CALLBACK. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// If not NULL, the data that will be used to override the existing configure data. /// - EFI_MTFTP4_OVERRIDE_DATA *OverrideData; + EFI_MTFTP4_OVERRIDE_DATA *OverrideData; /// /// The pointer to the null-terminated ASCII file name string. /// - UINT8 *Filename; + UINT8 *Filename; /// /// The pointer to the null-terminated ASCII mode string. If NULL, "octet" is used. /// - UINT8 *ModeStr; + UINT8 *ModeStr; /// /// Number of option/value string pairs. /// - UINT32 OptionCount; + UINT32 OptionCount; /// /// The pointer to an array of option/value string pairs. Ignored if OptionCount is zero. /// - EFI_MTFTP4_OPTION *OptionList; + EFI_MTFTP4_OPTION *OptionList; /// /// The size of the data buffer. /// - UINT64 BufferSize; + UINT64 BufferSize; /// /// The pointer to the data buffer. Data that is downloaded from the /// MTFTPv4 server is stored here. Data that is uploaded to the /// MTFTPv4 server is read from here. Ignored if BufferSize is zero. /// - VOID *Buffer; + VOID *Buffer; /// /// The pointer to the context that will be used by CheckPacket, /// TimeoutCallback and PacketNeeded. /// - VOID *Context; + VOID *Context; /// /// The pointer to the callback function to check the contents of the received packet. /// - EFI_MTFTP4_CHECK_PACKET CheckPacket; + EFI_MTFTP4_CHECK_PACKET CheckPacket; /// /// The pointer to the function to be called when a timeout occurs. /// - EFI_MTFTP4_TIMEOUT_CALLBACK TimeoutCallback; + EFI_MTFTP4_TIMEOUT_CALLBACK TimeoutCallback; /// /// The pointer to the function to provide the needed packet contents. /// - EFI_MTFTP4_PACKET_NEEDED PacketNeeded; + EFI_MTFTP4_PACKET_NEEDED PacketNeeded; }; -extern EFI_GUID gEfiMtftp4ServiceBindingProtocolGuid; -extern EFI_GUID gEfiMtftp4ProtocolGuid; +extern EFI_GUID gEfiMtftp4ServiceBindingProtocolGuid; +extern EFI_GUID gEfiMtftp4ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/Mtftp6.h b/MdePkg/Include/Protocol/Mtftp6.h index bb9f2d2f21..4abf296c1c 100644 --- a/MdePkg/Include/Protocol/Mtftp6.h +++ b/MdePkg/Include/Protocol/Mtftp6.h @@ -16,7 +16,6 @@ #ifndef __EFI_MTFTP6_PROTOCOL_H__ #define __EFI_MTFTP6_PROTOCOL_H__ - #define EFI_MTFTP6_SERVICE_BINDING_PROTOCOL_GUID \ { \ 0xd9760ff3, 0x3cca, 0x4267, {0x80, 0xf9, 0x75, 0x27, 0xfa, 0xfa, 0x42, 0x23 } \ @@ -27,21 +26,21 @@ 0xbf0a78ba, 0xec29, 0x49cf, {0xa1, 0xc9, 0x7a, 0xe5, 0x4e, 0xab, 0x6a, 0x51 } \ } -typedef struct _EFI_MTFTP6_PROTOCOL EFI_MTFTP6_PROTOCOL; -typedef struct _EFI_MTFTP6_TOKEN EFI_MTFTP6_TOKEN; +typedef struct _EFI_MTFTP6_PROTOCOL EFI_MTFTP6_PROTOCOL; +typedef struct _EFI_MTFTP6_TOKEN EFI_MTFTP6_TOKEN; /// /// MTFTP Packet OpCodes ///@{ -#define EFI_MTFTP6_OPCODE_RRQ 1 ///< The MTFTPv6 packet is a read request. -#define EFI_MTFTP6_OPCODE_WRQ 2 ///< The MTFTPv6 packet is a write request. -#define EFI_MTFTP6_OPCODE_DATA 3 ///< The MTFTPv6 packet is a data packet. -#define EFI_MTFTP6_OPCODE_ACK 4 ///< The MTFTPv6 packet is an acknowledgement packet. -#define EFI_MTFTP6_OPCODE_ERROR 5 ///< The MTFTPv6 packet is an error packet. -#define EFI_MTFTP6_OPCODE_OACK 6 ///< The MTFTPv6 packet is an option acknowledgement packet. -#define EFI_MTFTP6_OPCODE_DIR 7 ///< The MTFTPv6 packet is a directory query packet. -#define EFI_MTFTP6_OPCODE_DATA8 8 ///< The MTFTPv6 packet is a data packet with a big block number. -#define EFI_MTFTP6_OPCODE_ACK8 9 ///< The MTFTPv6 packet is an acknowledgement packet with a big block number. +#define EFI_MTFTP6_OPCODE_RRQ 1 ///< The MTFTPv6 packet is a read request. +#define EFI_MTFTP6_OPCODE_WRQ 2 ///< The MTFTPv6 packet is a write request. +#define EFI_MTFTP6_OPCODE_DATA 3 ///< The MTFTPv6 packet is a data packet. +#define EFI_MTFTP6_OPCODE_ACK 4 ///< The MTFTPv6 packet is an acknowledgement packet. +#define EFI_MTFTP6_OPCODE_ERROR 5 ///< The MTFTPv6 packet is an error packet. +#define EFI_MTFTP6_OPCODE_OACK 6 ///< The MTFTPv6 packet is an option acknowledgement packet. +#define EFI_MTFTP6_OPCODE_DIR 7 ///< The MTFTPv6 packet is a directory query packet. +#define EFI_MTFTP6_OPCODE_DATA8 8 ///< The MTFTPv6 packet is a data packet with a big block number. +#define EFI_MTFTP6_OPCODE_ACK8 9 ///< The MTFTPv6 packet is an acknowledgement packet with a big block number. ///@} /// @@ -50,39 +49,39 @@ typedef struct _EFI_MTFTP6_TOKEN EFI_MTFTP6_TOKEN; /// /// The error code is not defined. See the error message in the packet (if any) for details. /// -#define EFI_MTFTP6_ERRORCODE_NOT_DEFINED 0 +#define EFI_MTFTP6_ERRORCODE_NOT_DEFINED 0 /// /// The file was not found. /// -#define EFI_MTFTP6_ERRORCODE_FILE_NOT_FOUND 1 +#define EFI_MTFTP6_ERRORCODE_FILE_NOT_FOUND 1 /// /// There was an access violation. /// -#define EFI_MTFTP6_ERRORCODE_ACCESS_VIOLATION 2 +#define EFI_MTFTP6_ERRORCODE_ACCESS_VIOLATION 2 /// /// The disk was full or its allocation was exceeded. /// -#define EFI_MTFTP6_ERRORCODE_DISK_FULL 3 +#define EFI_MTFTP6_ERRORCODE_DISK_FULL 3 /// /// The MTFTPv6 operation was illegal. /// -#define EFI_MTFTP6_ERRORCODE_ILLEGAL_OPERATION 4 +#define EFI_MTFTP6_ERRORCODE_ILLEGAL_OPERATION 4 /// /// The transfer ID is unknown. /// -#define EFI_MTFTP6_ERRORCODE_UNKNOWN_TRANSFER_ID 5 +#define EFI_MTFTP6_ERRORCODE_UNKNOWN_TRANSFER_ID 5 /// /// The file already exists. /// -#define EFI_MTFTP6_ERRORCODE_FILE_ALREADY_EXISTS 6 +#define EFI_MTFTP6_ERRORCODE_FILE_ALREADY_EXISTS 6 /// /// There is no such user. /// -#define EFI_MTFTP6_ERRORCODE_NO_SUCH_USER 7 +#define EFI_MTFTP6_ERRORCODE_NO_SUCH_USER 7 /// /// The request has been denied due to option negotiation. /// -#define EFI_MTFTP6_ERRORCODE_REQUEST_DENIED 8 +#define EFI_MTFTP6_ERRORCODE_REQUEST_DENIED 8 ///@} #pragma pack(1) @@ -202,15 +201,15 @@ typedef struct { /// EFI_MTFTP6_PACKET /// typedef union { - UINT16 OpCode; ///< Type of packets as defined by the MTFTPv6 packet opcodes. - EFI_MTFTP6_REQ_HEADER Rrq; ///< Read request packet header. - EFI_MTFTP6_REQ_HEADER Wrq; ///< write request packet header. - EFI_MTFTP6_OACK_HEADER Oack; ///< Option acknowledge packet header. - EFI_MTFTP6_DATA_HEADER Data; ///< Data packet header. - EFI_MTFTP6_ACK_HEADER Ack; ///< Acknowledgement packet header. - EFI_MTFTP6_DATA8_HEADER Data8; ///< Data packet header with big block number. - EFI_MTFTP6_ACK8_HEADER Ack8; ///< Acknowledgement header with big block number. - EFI_MTFTP6_ERROR_HEADER Error; ///< Error packet header. + UINT16 OpCode; ///< Type of packets as defined by the MTFTPv6 packet opcodes. + EFI_MTFTP6_REQ_HEADER Rrq; ///< Read request packet header. + EFI_MTFTP6_REQ_HEADER Wrq; ///< write request packet header. + EFI_MTFTP6_OACK_HEADER Oack; ///< Option acknowledge packet header. + EFI_MTFTP6_DATA_HEADER Data; ///< Data packet header. + EFI_MTFTP6_ACK_HEADER Ack; ///< Acknowledgement packet header. + EFI_MTFTP6_DATA8_HEADER Data8; ///< Data packet header with big block number. + EFI_MTFTP6_ACK8_HEADER Ack8; ///< Acknowledgement header with big block number. + EFI_MTFTP6_ERROR_HEADER Error; ///< Error packet header. } EFI_MTFTP6_PACKET; #pragma pack() @@ -224,28 +223,28 @@ typedef struct { /// driver choose a source address. If not zero it must be one of the /// configured IP addresses in the underlying IPv6 driver. /// - EFI_IPv6_ADDRESS StationIp; + EFI_IPv6_ADDRESS StationIp; /// /// Local port number. Set to zero to use the automatically assigned port number. /// - UINT16 LocalPort; + UINT16 LocalPort; /// /// The IP address of the MTFTPv6 server. /// - EFI_IPv6_ADDRESS ServerIp; + EFI_IPv6_ADDRESS ServerIp; /// /// The initial MTFTPv6 server port number. Request packets are /// sent to this port. This number is almost always 69 and using zero /// defaults to 69. - UINT16 InitialServerPort; + UINT16 InitialServerPort; /// /// The number of times to transmit MTFTPv6 request packets and wait for a response. /// - UINT16 TryCount; + UINT16 TryCount; /// /// The number of seconds to wait for a response after sending the MTFTPv6 request packet. /// - UINT16 TimeoutValue; + UINT16 TimeoutValue; } EFI_MTFTP6_CONFIG_DATA; /// @@ -255,17 +254,17 @@ typedef struct { /// /// The configuration data of this instance. /// - EFI_MTFTP6_CONFIG_DATA ConfigData; + EFI_MTFTP6_CONFIG_DATA ConfigData; /// /// The number of option strings in the following SupportedOptions array. /// - UINT8 SupportedOptionCount; + UINT8 SupportedOptionCount; /// /// An array of null-terminated ASCII option strings that are recognized and supported by /// this EFI MTFTPv6 Protocol driver implementation. The buffer is /// read only to the caller and the caller should NOT free the buffer. /// - UINT8 **SupportedOptions; + UINT8 **SupportedOptions; } EFI_MTFTP6_MODE_DATA; /// @@ -276,32 +275,32 @@ typedef struct { /// IP address of the MTFTPv6 server. If set to all zero, the value that /// was set by the EFI_MTFTP6_PROTOCOL.Configure() function will be used. /// - EFI_IPv6_ADDRESS ServerIp; + EFI_IPv6_ADDRESS ServerIp; /// /// MTFTPv6 server port number. If set to zero, it will use the value /// that was set by the EFI_MTFTP6_PROTOCOL.Configure() function. /// - UINT16 ServerPort; + UINT16 ServerPort; /// /// Number of times to transmit MTFTPv6 request packets and wait /// for a response. If set to zero, the value that was set by /// theEFI_MTFTP6_PROTOCOL.Configure() function will be used. /// - UINT16 TryCount; + UINT16 TryCount; /// /// Number of seconds to wait for a response after sending the /// MTFTPv6 request packet. If set to zero, the value that was set by /// the EFI_MTFTP6_PROTOCOL.Configure() function will be used. /// - UINT16 TimeoutValue; + UINT16 TimeoutValue; } EFI_MTFTP6_OVERRIDE_DATA; /// /// EFI_MTFTP6_OPTION /// typedef struct { - UINT8 *OptionStr; ///< Pointer to the null-terminated ASCII MTFTPv6 option string. - UINT8 *ValueStr; ///< Pointer to the null-terminated ASCII MTFTPv6 value string. + UINT8 *OptionStr; ///< Pointer to the null-terminated ASCII MTFTPv6 option string. + UINT8 *ValueStr; ///< Pointer to the null-terminated ASCII MTFTPv6 value string. } EFI_MTFTP6_OPTION; /** @@ -392,30 +391,30 @@ struct _EFI_MTFTP6_TOKEN { /// to indicate whether this operation completed successfully. /// Defined Status values are listed below. /// - EFI_STATUS Status; + EFI_STATUS Status; /// /// The event that will be signaled when the operation completes. If /// set to NULL, the corresponding function will wait until the read or /// write operation finishes. The type of Event must be EVT_NOTIFY_SIGNAL. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// If not NULL, the data that will be used to override the existing /// configure data. /// - EFI_MTFTP6_OVERRIDE_DATA *OverrideData; + EFI_MTFTP6_OVERRIDE_DATA *OverrideData; /// /// Pointer to the null-terminated ASCII file name string. /// - UINT8 *Filename; + UINT8 *Filename; /// /// Pointer to the null-terminated ASCII mode string. If NULL, octet is used. /// - UINT8 *ModeStr; + UINT8 *ModeStr; /// /// Number of option/value string pairs. /// - UINT32 OptionCount; + UINT32 OptionCount; /// /// Pointer to an array of option/value string pairs. Ignored if /// OptionCount is zero. Both a remote server and this driver @@ -423,37 +422,37 @@ struct _EFI_MTFTP6_TOKEN { /// options are unrecognized by this implementation, it is sent to the /// remote server without being changed. /// - EFI_MTFTP6_OPTION *OptionList; + EFI_MTFTP6_OPTION *OptionList; /// /// On input, the size, in bytes, of Buffer. On output, the number /// of bytes transferred. /// - UINT64 BufferSize; + UINT64 BufferSize; /// /// Pointer to the data buffer. Data that is downloaded from the /// MTFTPv6 server is stored here. Data that is uploaded to the /// MTFTPv6 server is read from here. Ignored if BufferSize is zero. /// - VOID *Buffer; + VOID *Buffer; /// /// Pointer to the context that will be used by CheckPacket, /// TimeoutCallback and PacketNeeded. /// - VOID *Context; + VOID *Context; /// /// Pointer to the callback function to check the contents of the /// received packet. /// - EFI_MTFTP6_CHECK_PACKET CheckPacket; + EFI_MTFTP6_CHECK_PACKET CheckPacket; /// /// Pointer to the function to be called when a timeout occurs. /// - EFI_MTFTP6_TIMEOUT_CALLBACK TimeoutCallback; + EFI_MTFTP6_TIMEOUT_CALLBACK TimeoutCallback; /// /// Pointer to the function to provide the needed packet contents. /// Only used in WriteFile() operation. /// - EFI_MTFTP6_PACKET_NEEDED PacketNeeded; + EFI_MTFTP6_PACKET_NEEDED PacketNeeded; }; /** @@ -516,7 +515,7 @@ EFI_STATUS (EFIAPI *EFI_MTFTP6_CONFIGURE)( IN EFI_MTFTP6_PROTOCOL *This, IN EFI_MTFTP6_CONFIG_DATA *MtftpConfigData OPTIONAL -); + ); /** Get information about a file from an MTFTPv6 server. @@ -577,7 +576,7 @@ EFI_STATUS IN EFI_MTFTP6_OPTION *OptionList OPTIONAL, OUT UINT32 *PacketLength, OUT EFI_MTFTP6_PACKET **Packet OPTIONAL -); + ); /** Parse the options in an MTFTPv6 OACK packet. @@ -769,7 +768,7 @@ EFI_STATUS (EFIAPI *EFI_MTFTP6_READ_DIRECTORY)( IN EFI_MTFTP6_PROTOCOL *This, IN EFI_MTFTP6_TOKEN *Token -); + ); /** Polls for incoming data packets and processes outgoing data packets. @@ -803,18 +802,17 @@ EFI_STATUS /// driver and EFI IPv6 Protocol driver. /// struct _EFI_MTFTP6_PROTOCOL { - EFI_MTFTP6_GET_MODE_DATA GetModeData; - EFI_MTFTP6_CONFIGURE Configure; - EFI_MTFTP6_GET_INFO GetInfo; - EFI_MTFTP6_PARSE_OPTIONS ParseOptions; - EFI_MTFTP6_READ_FILE ReadFile; - EFI_MTFTP6_WRITE_FILE WriteFile; - EFI_MTFTP6_READ_DIRECTORY ReadDirectory; - EFI_MTFTP6_POLL Poll; + EFI_MTFTP6_GET_MODE_DATA GetModeData; + EFI_MTFTP6_CONFIGURE Configure; + EFI_MTFTP6_GET_INFO GetInfo; + EFI_MTFTP6_PARSE_OPTIONS ParseOptions; + EFI_MTFTP6_READ_FILE ReadFile; + EFI_MTFTP6_WRITE_FILE WriteFile; + EFI_MTFTP6_READ_DIRECTORY ReadDirectory; + EFI_MTFTP6_POLL Poll; }; -extern EFI_GUID gEfiMtftp6ServiceBindingProtocolGuid; -extern EFI_GUID gEfiMtftp6ProtocolGuid; +extern EFI_GUID gEfiMtftp6ServiceBindingProtocolGuid; +extern EFI_GUID gEfiMtftp6ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h b/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h index 2242a37ede..78acb4ddae 100644 --- a/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h +++ b/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h @@ -31,53 +31,51 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // Revision defined in UEFI Specification 2.4 // -#define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION 0x00020000 - +#define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION 0x00020000 /// /// Revision defined in EFI1.1. /// -#define EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE_REVISION EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION +#define EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE_REVISION EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION /// /// Forward reference for pure ANSI compatability. /// -typedef struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL; +typedef struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL; /// /// Protocol defined in EFI1.1. /// -typedef EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE; +typedef EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE; /// /// An optional protocol that is used to describe details about the software /// layer that is used to produce the Simple Network Protocol. /// struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL { - UINT64 Revision; ///< The revision of the EFI_NETWORK_INTERFACE_IDENTIFIER protocol. - UINT64 Id; ///< The address of the first byte of the identifying structure for this network - ///< interface. This is only valid when the network interface is started - ///< (see Start()). When the network interface is not started, this field is set to zero. - UINT64 ImageAddr; ///< The address of the first byte of the identifying structure for this - ///< network interface. This is set to zero if there is no structure. - UINT32 ImageSize; ///< The size of unrelocated network interface image. - CHAR8 StringId[4];///< A four-character ASCII string that is sent in the class identifier field of - ///< option 60 in DHCP. For a Type of EfiNetworkInterfaceUndi, this field is UNDI. - UINT8 Type; ///< Network interface type. This will be set to one of the values - ///< in EFI_NETWORK_INTERFACE_TYPE. - UINT8 MajorVer; ///< Major version number. - UINT8 MinorVer; ///< Minor version number. - BOOLEAN Ipv6Supported; ///< TRUE if the network interface supports IPv6; otherwise FALSE. - UINT16 IfNum; ///< The network interface number that is being identified by this Network - ///< Interface Identifier Protocol. This field must be less than or - ///< equal to the (IFcnt | IFcntExt <<8 ) fields in the !PXE structure. - + UINT64 Revision; ///< The revision of the EFI_NETWORK_INTERFACE_IDENTIFIER protocol. + UINT64 Id; ///< The address of the first byte of the identifying structure for this network + ///< interface. This is only valid when the network interface is started + ///< (see Start()). When the network interface is not started, this field is set to zero. + UINT64 ImageAddr; ///< The address of the first byte of the identifying structure for this + ///< network interface. This is set to zero if there is no structure. + UINT32 ImageSize; ///< The size of unrelocated network interface image. + CHAR8 StringId[4]; ///< A four-character ASCII string that is sent in the class identifier field of + ///< option 60 in DHCP. For a Type of EfiNetworkInterfaceUndi, this field is UNDI. + UINT8 Type; ///< Network interface type. This will be set to one of the values + ///< in EFI_NETWORK_INTERFACE_TYPE. + UINT8 MajorVer; ///< Major version number. + UINT8 MinorVer; ///< Minor version number. + BOOLEAN Ipv6Supported; ///< TRUE if the network interface supports IPv6; otherwise FALSE. + UINT16 IfNum; ///< The network interface number that is being identified by this Network + ///< Interface Identifier Protocol. This field must be less than or + ///< equal to the (IFcnt | IFcntExt <<8 ) fields in the !PXE structure. }; /// -///******************************************************* +/// ******************************************************* /// EFI_NETWORK_INTERFACE_TYPE -///******************************************************* +/// ******************************************************* /// typedef enum { EfiNetworkInterfaceUndi = 1 @@ -86,27 +84,27 @@ typedef enum { /// /// Forward reference for pure ANSI compatability. /// -typedef struct undiconfig_table UNDI_CONFIG_TABLE; +typedef struct undiconfig_table UNDI_CONFIG_TABLE; /// /// The format of the configuration table for UNDI /// struct undiconfig_table { - UINT32 NumberOfInterfaces; ///< The number of NIC devices + UINT32 NumberOfInterfaces; ///< The number of NIC devices ///< that this UNDI controls. - UINT32 reserved; - UNDI_CONFIG_TABLE *nextlink; ///< A pointer to the next UNDI + UINT32 reserved; + UNDI_CONFIG_TABLE *nextlink; ///< A pointer to the next UNDI ///< configuration table. /// /// The length of this array is given in the NumberOfInterfaces field. /// struct { - VOID *NII_InterfacePointer; ///< Pointer to the NII interface structure. - VOID *DevicePathPointer; ///< Pointer to the device path for this NIC. + VOID *NII_InterfacePointer; ///< Pointer to the NII interface structure. + VOID *DevicePathPointer; ///< Pointer to the device path for this NIC. } NII_entry[1]; }; -extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid; -extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid_31; +extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid; +extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid_31; #endif diff --git a/MdePkg/Include/Protocol/NvdimmLabel.h b/MdePkg/Include/Protocol/NvdimmLabel.h index 1f289ec32e..e46999a3ab 100644 --- a/MdePkg/Include/Protocol/NvdimmLabel.h +++ b/MdePkg/Include/Protocol/NvdimmLabel.h @@ -23,70 +23,70 @@ SPDX-License-Identifier: BSD-2-Clause-Patent typedef struct _EFI_NVDIMM_LABEL_PROTOCOL EFI_NVDIMM_LABEL_PROTOCOL; -#define EFI_NVDIMM_LABEL_INDEX_SIG_LEN 16 -#define EFI_NVDIMM_LABEL_INDEX_ALIGN 256 +#define EFI_NVDIMM_LABEL_INDEX_SIG_LEN 16 +#define EFI_NVDIMM_LABEL_INDEX_ALIGN 256 typedef struct { /// /// Signature of the Index Block data structure. Must be "NAMESPACE_INDEX\0". /// - CHAR8 Sig[EFI_NVDIMM_LABEL_INDEX_SIG_LEN]; + CHAR8 Sig[EFI_NVDIMM_LABEL_INDEX_SIG_LEN]; /// /// Attributes of this Label Storage Area. /// - UINT8 Flags[3]; + UINT8 Flags[3]; /// /// Size of each label in bytes, 128 bytes << LabelSize. /// 1 means 256 bytes, 2 means 512 bytes, etc. Shall be 1 or greater. /// - UINT8 LabelSize; + UINT8 LabelSize; /// /// Sequence number used to identify which of the two Index Blocks is current. /// - UINT32 Seq; + UINT32 Seq; /// /// The offset of this Index Block in the Label Storage Area. /// - UINT64 MyOff; + UINT64 MyOff; /// /// The size of this Index Block in bytes. /// This field must be a multiple of the EFI_NVDIMM_LABEL_INDEX_ALIGN. /// - UINT64 MySize; + UINT64 MySize; /// /// The offset of the other Index Block paired with this one. /// - UINT64 OtherOff; + UINT64 OtherOff; /// /// The offset of the first slot where labels are stored in this Label Storage Area. /// - UINT64 LabelOff; + UINT64 LabelOff; /// /// The total number of slots for storing labels in this Label Storage Area. /// - UINT32 NSlot; + UINT32 NSlot; /// /// Major version number. Value shall be 1. /// - UINT16 Major; + UINT16 Major; /// /// Minor version number. Value shall be 2. /// - UINT16 Minor; + UINT16 Minor; /// /// 64-bit Fletcher64 checksum of all fields in this Index Block. /// - UINT64 Checksum; + UINT64 Checksum; /// /// Array of unsigned bytes implementing a bitmask that tracks which label slots are free. @@ -95,156 +95,156 @@ typedef struct { /// padded with additional zero bytes to make the Index Block size a multiple of EFI_NVDIMM_LABEL_INDEX_ALIGN. /// Any bits allocated beyond NSlot bits must be zero. /// - UINT8 Free[]; + UINT8 Free[]; } EFI_NVDIMM_LABEL_INDEX_BLOCK; -#define EFI_NVDIMM_LABEL_NAME_LEN 64 +#define EFI_NVDIMM_LABEL_NAME_LEN 64 /// /// The label is read-only. /// -#define EFI_NVDIMM_LABEL_FLAGS_ROLABEL 0x00000001 +#define EFI_NVDIMM_LABEL_FLAGS_ROLABEL 0x00000001 /// /// When set, the complete label set is local to a single NVDIMM Label Storage Area. /// When clear, the complete label set is contained on multiple NVDIMM Label Storage Areas. /// -#define EFI_NVDIMM_LABEL_FLAGS_LOCAL 0x00000002 +#define EFI_NVDIMM_LABEL_FLAGS_LOCAL 0x00000002 /// /// This reserved flag is utilized on older implementations and has been deprecated. /// Do not use. // -#define EFI_NVDIMM_LABEL_FLAGS_RESERVED 0x00000004 +#define EFI_NVDIMM_LABEL_FLAGS_RESERVED 0x00000004 /// /// When set, the label set is being updated. /// -#define EFI_NVDIMM_LABEL_FLAGS_UPDATING 0x00000008 +#define EFI_NVDIMM_LABEL_FLAGS_UPDATING 0x00000008 typedef struct { /// /// Unique Label Identifier UUID per RFC 4122. /// - EFI_GUID Uuid; + EFI_GUID Uuid; /// /// NULL-terminated string using UTF-8 character formatting. /// - CHAR8 Name[EFI_NVDIMM_LABEL_NAME_LEN]; + CHAR8 Name[EFI_NVDIMM_LABEL_NAME_LEN]; /// /// Attributes of this namespace. /// - UINT32 Flags; + UINT32 Flags; /// /// Total number of labels describing this namespace. /// - UINT16 NLabel; + UINT16 NLabel; /// /// Position of this label in list of labels for this namespace. /// - UINT16 Position; + UINT16 Position; /// /// The SetCookie is utilized by SW to perform consistency checks on the Interleave Set to verify the current /// physical device configuration matches the original physical configuration when the labels were created /// for the set.The label is considered invalid if the actual label set cookie doesn't match the cookie stored here. /// - UINT64 SetCookie; + UINT64 SetCookie; /// /// This is the default logical block size in bytes and may be superseded by a block size that is specified /// in the AbstractionGuid. /// - UINT64 LbaSize; + UINT64 LbaSize; /// /// The DPA is the DIMM Physical address where the NVM contributing to this namespace begins on this NVDIMM. /// - UINT64 Dpa; + UINT64 Dpa; /// /// The extent of the DPA contributed by this label. /// - UINT64 RawSize; + UINT64 RawSize; /// /// Current slot in the Label Storage Area where this label is stored. /// - UINT32 Slot; + UINT32 Slot; /// /// Alignment hint used to advertise the preferred alignment of the data from within the namespace defined by this label. /// - UINT8 Alignment; + UINT8 Alignment; /// /// Shall be 0. /// - UINT8 Reserved[3]; + UINT8 Reserved[3]; /// /// Range Type GUID that describes the access mechanism for the specified DPA range. /// - EFI_GUID TypeGuid; + EFI_GUID TypeGuid; /// /// Identifies the address abstraction mechanism for this namespace. A value of 0 indicates no mechanism used. /// - EFI_GUID AddressAbstractionGuid; + EFI_GUID AddressAbstractionGuid; /// /// Shall be 0. /// - UINT8 Reserved1[88]; + UINT8 Reserved1[88]; /// /// 64-bit Fletcher64 checksum of all fields in this Label. /// This field is considered zero when the checksum is computed. /// - UINT64 Checksum; + UINT64 Checksum; } EFI_NVDIMM_LABEL; typedef struct { /// /// The Region Offset field from the ACPI NFIT NVDIMM Region Mapping Structure for a given entry. /// - UINT64 RegionOffset; + UINT64 RegionOffset; /// /// The serial number of the NVDIMM, assigned by the module vendor. /// - UINT32 SerialNumber; + UINT32 SerialNumber; /// /// The identifier indicating the vendor of the NVDIMM. /// - UINT16 VendorId; + UINT16 VendorId; /// /// The manufacturing date of the NVDIMM, assigned by the module vendor. /// - UINT16 ManufacturingDate; + UINT16 ManufacturingDate; /// /// The manufacturing location from for the NVDIMM, assigned by the module vendor. /// - UINT8 ManufacturingLocation; + UINT8 ManufacturingLocation; /// /// Shall be 0. /// - UINT8 Reserved[31]; + UINT8 Reserved[31]; } EFI_NVDIMM_LABEL_SET_COOKIE_MAP; typedef struct { /// /// Array size is 1 if EFI_NVDIMM_LABEL_FLAGS_LOCAL is set indicating a Local Namespaces. /// - EFI_NVDIMM_LABEL_SET_COOKIE_MAP Mapping[0]; + EFI_NVDIMM_LABEL_SET_COOKIE_MAP Mapping[0]; } EFI_NVDIMM_LABEL_SET_COOKIE_INFO; /** @@ -262,7 +262,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_NVDIMM_LABEL_STORAGE_INFORMATION) ( +(EFIAPI *EFI_NVDIMM_LABEL_STORAGE_INFORMATION)( IN EFI_NVDIMM_LABEL_PROTOCOL *This, OUT UINT32 *SizeOfLabelStorageArea, OUT UINT32 *MaxTransferLength @@ -293,7 +293,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_NVDIMM_LABEL_STORAGE_READ) ( +(EFIAPI *EFI_NVDIMM_LABEL_STORAGE_READ)( IN CONST EFI_NVDIMM_LABEL_PROTOCOL *This, IN UINT32 Offset, IN UINT32 TransferLength, @@ -324,7 +324,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_NVDIMM_LABEL_STORAGE_WRITE) ( +(EFIAPI *EFI_NVDIMM_LABEL_STORAGE_WRITE)( IN CONST EFI_NVDIMM_LABEL_PROTOCOL *This, IN UINT32 Offset, IN UINT32 TransferLength, @@ -335,11 +335,11 @@ EFI_STATUS /// Provides services that allow management of labels contained in a Label Storage Area. /// struct _EFI_NVDIMM_LABEL_PROTOCOL { - EFI_NVDIMM_LABEL_STORAGE_INFORMATION LabelStorageInformation; - EFI_NVDIMM_LABEL_STORAGE_READ LabelStorageRead; - EFI_NVDIMM_LABEL_STORAGE_WRITE LabelStorageWrite; + EFI_NVDIMM_LABEL_STORAGE_INFORMATION LabelStorageInformation; + EFI_NVDIMM_LABEL_STORAGE_READ LabelStorageRead; + EFI_NVDIMM_LABEL_STORAGE_WRITE LabelStorageWrite; }; -extern EFI_GUID gEfiNvdimmLabelProtocolGuid; +extern EFI_GUID gEfiNvdimmLabelProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/NvmExpressPassthru.h b/MdePkg/Include/Protocol/NvmExpressPassthru.h index 870b9b5d37..a6cba98e71 100644 --- a/MdePkg/Include/Protocol/NvmExpressPassthru.h +++ b/MdePkg/Include/Protocol/NvmExpressPassthru.h @@ -22,98 +22,99 @@ typedef struct _EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL; typedef struct { - UINT32 Attributes; - UINT32 IoAlign; - UINT32 NvmeVersion; + UINT32 Attributes; + UINT32 IoAlign; + UINT32 NvmeVersion; } EFI_NVM_EXPRESS_PASS_THRU_MODE; // // If this bit is set, then the EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL interface is // for directly addressable namespaces. // -#define EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_PHYSICAL 0x0001 +#define EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_PHYSICAL 0x0001 // // If this bit is set, then the EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL interface is // for a single volume logical namespace comprised of multiple namespaces. // -#define EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_LOGICAL 0x0002 +#define EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_LOGICAL 0x0002 // // If this bit is set, then the EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL interface // supports non-blocking I/O. // -#define EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_NONBLOCKIO 0x0004 +#define EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_NONBLOCKIO 0x0004 // // If this bit is set, then the EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL interface // supports NVM command set. // -#define EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_CMD_SET_NVM 0x0008 +#define EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_CMD_SET_NVM 0x0008 // // FusedOperation // -#define NORMAL_CMD 0x00 -#define FUSED_FIRST_CMD 0x01 -#define FUSED_SECOND_CMD 0x02 +#define NORMAL_CMD 0x00 +#define FUSED_FIRST_CMD 0x01 +#define FUSED_SECOND_CMD 0x02 typedef struct { - UINT32 Opcode:8; - UINT32 FusedOperation:2; - UINT32 Reserved:22; + UINT32 Opcode : 8; + UINT32 FusedOperation : 2; + UINT32 Reserved : 22; } NVME_CDW0; // // Flags // -#define CDW2_VALID 0x01 -#define CDW3_VALID 0x02 -#define CDW10_VALID 0x04 -#define CDW11_VALID 0x08 -#define CDW12_VALID 0x10 -#define CDW13_VALID 0x20 -#define CDW14_VALID 0x40 -#define CDW15_VALID 0x80 +#define CDW2_VALID 0x01 +#define CDW3_VALID 0x02 +#define CDW10_VALID 0x04 +#define CDW11_VALID 0x08 +#define CDW12_VALID 0x10 +#define CDW13_VALID 0x20 +#define CDW14_VALID 0x40 +#define CDW15_VALID 0x80 // // Queue Type // -#define NVME_ADMIN_QUEUE 0x00 -#define NVME_IO_QUEUE 0x01 +#define NVME_ADMIN_QUEUE 0x00 +#define NVME_IO_QUEUE 0x01 typedef struct { - NVME_CDW0 Cdw0; - UINT8 Flags; - UINT32 Nsid; - UINT32 Cdw2; - UINT32 Cdw3; - UINT32 Cdw10; - UINT32 Cdw11; - UINT32 Cdw12; - UINT32 Cdw13; - UINT32 Cdw14; - UINT32 Cdw15; + NVME_CDW0 Cdw0; + UINT8 Flags; + UINT32 Nsid; + UINT32 Cdw2; + UINT32 Cdw3; + UINT32 Cdw10; + UINT32 Cdw11; + UINT32 Cdw12; + UINT32 Cdw13; + UINT32 Cdw14; + UINT32 Cdw15; } EFI_NVM_EXPRESS_COMMAND; typedef struct { - UINT32 DW0; - UINT32 DW1; - UINT32 DW2; - UINT32 DW3; + UINT32 DW0; + UINT32 DW1; + UINT32 DW2; + UINT32 DW3; } EFI_NVM_EXPRESS_COMPLETION; typedef struct { - UINT64 CommandTimeout; - VOID *TransferBuffer; - UINT32 TransferLength; - VOID *MetadataBuffer; - UINT32 MetadataLength; - UINT8 QueueType; - EFI_NVM_EXPRESS_COMMAND *NvmeCmd; - EFI_NVM_EXPRESS_COMPLETION *NvmeCompletion; + UINT64 CommandTimeout; + VOID *TransferBuffer; + UINT32 TransferLength; + VOID *MetadataBuffer; + UINT32 MetadataLength; + UINT8 QueueType; + EFI_NVM_EXPRESS_COMMAND *NvmeCmd; + EFI_NVM_EXPRESS_COMPLETION *NvmeCompletion; } EFI_NVM_EXPRESS_PASS_THRU_COMMAND_PACKET; // // Protocol function prototypes // + /** Sends an NVM Express Command Packet to an NVM Express controller or namespace. This function supports both blocking I/O and non-blocking I/O. The blocking I/O functionality is required, and the non-blocking @@ -263,21 +264,20 @@ EFI_STATUS (EFIAPI *EFI_NVM_EXPRESS_PASS_THRU_GET_NAMESPACE)( IN EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL *This, IN EFI_DEVICE_PATH_PROTOCOL *DevicePath, - OUT UINT32 *NamespaceId + OUT UINT32 *NamespaceId ); // // Protocol Interface Structure // struct _EFI_NVM_EXPRESS_PASS_THRU_PROTOCOL { - EFI_NVM_EXPRESS_PASS_THRU_MODE *Mode; - EFI_NVM_EXPRESS_PASS_THRU_PASSTHRU PassThru; - EFI_NVM_EXPRESS_PASS_THRU_GET_NEXT_NAMESPACE GetNextNamespace; - EFI_NVM_EXPRESS_PASS_THRU_BUILD_DEVICE_PATH BuildDevicePath; - EFI_NVM_EXPRESS_PASS_THRU_GET_NAMESPACE GetNamespace; + EFI_NVM_EXPRESS_PASS_THRU_MODE *Mode; + EFI_NVM_EXPRESS_PASS_THRU_PASSTHRU PassThru; + EFI_NVM_EXPRESS_PASS_THRU_GET_NEXT_NAMESPACE GetNextNamespace; + EFI_NVM_EXPRESS_PASS_THRU_BUILD_DEVICE_PATH BuildDevicePath; + EFI_NVM_EXPRESS_PASS_THRU_GET_NAMESPACE GetNamespace; }; -extern EFI_GUID gEfiNvmExpressPassThruProtocolGuid; +extern EFI_GUID gEfiNvmExpressPassThruProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/PartitionInfo.h b/MdePkg/Include/Protocol/PartitionInfo.h index f57f4c68b7..ad5cf1c08f 100644 --- a/MdePkg/Include/Protocol/PartitionInfo.h +++ b/MdePkg/Include/Protocol/PartitionInfo.h @@ -21,11 +21,10 @@ #define EFI_PARTITION_INFO_PROTOCOL_GUID \ { 0x8cf2f62c, 0xbc9b, 0x4821, { 0x80, 0x8d, 0xec, 0x9e, 0xc4, 0x21, 0xa1, 0xa0 }}; - -#define EFI_PARTITION_INFO_PROTOCOL_REVISION 0x0001000 -#define PARTITION_TYPE_OTHER 0x00 -#define PARTITION_TYPE_MBR 0x01 -#define PARTITION_TYPE_GPT 0x02 +#define EFI_PARTITION_INFO_PROTOCOL_REVISION 0x0001000 +#define PARTITION_TYPE_OTHER 0x00 +#define PARTITION_TYPE_MBR 0x01 +#define PARTITION_TYPE_GPT 0x02 #pragma pack(1) @@ -36,25 +35,25 @@ typedef struct { // // Set to EFI_PARTITION_INFO_PROTOCOL_REVISION. // - UINT32 Revision; + UINT32 Revision; // // Partition info type (PARTITION_TYPE_MBR, PARTITION_TYPE_GPT, or PARTITION_TYPE_OTHER). // - UINT32 Type; + UINT32 Type; // // If 1, partition describes an EFI System Partition. // - UINT8 System; - UINT8 Reserved[7]; + UINT8 System; + UINT8 Reserved[7]; union { /// /// MBR data /// - MBR_PARTITION_RECORD Mbr; + MBR_PARTITION_RECORD Mbr; /// /// GPT data /// - EFI_PARTITION_ENTRY Gpt; + EFI_PARTITION_ENTRY Gpt; } Info; } EFI_PARTITION_INFO_PROTOCOL; @@ -63,6 +62,6 @@ typedef struct { /// /// Partition Information Protocol GUID variable. /// -extern EFI_GUID gEfiPartitionInfoProtocolGuid; +extern EFI_GUID gEfiPartitionInfoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Pcd.h b/MdePkg/Include/Protocol/Pcd.h index 6dc5388b39..25f73cda14 100644 --- a/MdePkg/Include/Protocol/Pcd.h +++ b/MdePkg/Include/Protocol/Pcd.h @@ -17,13 +17,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #ifndef __PCD_H__ #define __PCD_H__ -extern EFI_GUID gPcdProtocolGuid; +extern EFI_GUID gPcdProtocolGuid; #define PCD_PROTOCOL_GUID \ { 0x11b34006, 0xd85b, 0x4d0a, { 0xa2, 0x90, 0xd5, 0xa5, 0x71, 0x31, 0xe, 0xf7 } } -#define PCD_INVALID_TOKEN_NUMBER ((UINTN) 0) - +#define PCD_INVALID_TOKEN_NUMBER ((UINTN) 0) /** Sets the SKU value for subsequent calls to set or get PCD token values. @@ -53,8 +52,6 @@ VOID IN UINTN SkuId ); - - /** Retrieves an 8-bit value for a given PCD token. @@ -72,8 +69,6 @@ UINT8 IN UINTN TokenNumber ); - - /** Retrieves a 16-bit value for a given PCD token. @@ -91,8 +86,6 @@ UINT16 IN UINTN TokenNumber ); - - /** Retrieves a 32-bit value for a given PCD token. @@ -110,8 +103,6 @@ UINT32 IN UINTN TokenNumber ); - - /** Retrieves a 64-bit value for a given PCD token. @@ -129,8 +120,6 @@ UINT64 IN UINTN TokenNumber ); - - /** Retrieves a pointer to a value for a given PCD token. @@ -150,8 +139,6 @@ VOID * IN UINTN TokenNumber ); - - /** Retrieves a Boolean value for a given PCD token. @@ -171,8 +158,6 @@ BOOLEAN IN UINTN TokenNumber ); - - /** Retrieves the size of the value for a given PCD token. @@ -190,8 +175,6 @@ UINTN IN UINTN TokenNumber ); - - /** Retrieves an 8-bit value for a given PCD token. @@ -213,8 +196,6 @@ UINT8 IN UINTN TokenNumber ); - - /** Retrieves a 16-bit value for a given PCD token. @@ -236,8 +217,6 @@ UINT16 IN UINTN TokenNumber ); - - /** Retrieves a 32-bit value for a given PCD token. @@ -259,8 +238,6 @@ UINT32 IN UINTN TokenNumber ); - - /** Retrieves an 64-bit value for a given PCD token. @@ -282,8 +259,6 @@ UINT64 IN UINTN TokenNumber ); - - /** Retrieves a pointer to a value for a given PCD token. @@ -305,8 +280,6 @@ VOID * IN UINTN TokenNumber ); - - /** Retrieves a Boolean value for a given PCD token. @@ -328,8 +301,6 @@ BOOLEAN IN UINTN TokenNumber ); - - /** Retrieves the size of the value for a given PCD token. @@ -349,8 +320,6 @@ UINTN IN UINTN TokenNumber ); - - /** Sets an 8-bit value for a given PCD token. @@ -375,8 +344,6 @@ EFI_STATUS IN UINT8 Value ); - - /** Sets a 16-bit value for a given PCD token. @@ -401,8 +368,6 @@ EFI_STATUS IN UINT16 Value ); - - /** Sets a 32-bit value for a given PCD token. @@ -427,8 +392,6 @@ EFI_STATUS IN UINT32 Value ); - - /** Sets a 64-bit value for a given PCD token. @@ -453,8 +416,6 @@ EFI_STATUS IN UINT64 Value ); - - /** Sets a value of a specified size for a given PCD token. @@ -484,8 +445,6 @@ EFI_STATUS IN VOID *Buffer ); - - /** Sets a Boolean value for a given PCD token. @@ -510,8 +469,6 @@ EFI_STATUS IN BOOLEAN Value ); - - /** Sets an 8-bit value for a given PCD token. @@ -538,8 +495,6 @@ EFI_STATUS IN UINT8 Value ); - - /** Sets an 16-bit value for a given PCD token. @@ -566,8 +521,6 @@ EFI_STATUS IN UINT16 Value ); - - /** Sets a 32-bit value for a given PCD token. @@ -594,8 +547,6 @@ EFI_STATUS IN UINT32 Value ); - - /** Sets a 64-bit value for a given PCD token. @@ -622,8 +573,6 @@ EFI_STATUS IN UINT64 Value ); - - /** Sets a value of a specified size for a given PCD token. @@ -655,8 +604,6 @@ EFI_STATUS IN VOID *Buffer ); - - /** Sets a Boolean value for a given PCD token. @@ -683,8 +630,6 @@ EFI_STATUS IN BOOLEAN Value ); - - /** Callback on SET function prototype definition. @@ -713,8 +658,6 @@ VOID IN UINTN TokenDataSize ); - - /** Specifies a function to be called anytime the value of a designated token is changed. @@ -735,8 +678,6 @@ EFI_STATUS IN PCD_PROTOCOL_CALLBACK CallBackFunction ); - - /** Cancels a previously set callback function for a particular PCD token number. @@ -757,8 +698,6 @@ EFI_STATUS IN PCD_PROTOCOL_CALLBACK CallBackFunction ); - - /** Retrieves the next valid token number in a given namespace. @@ -792,8 +731,6 @@ EFI_STATUS IN OUT UINTN *TokenNumber ); - - /** Retrieves the next valid PCD token namespace for a given namespace. @@ -820,42 +757,42 @@ EFI_STATUS /// This service abstracts the ability to set/get Platform Configuration Database (PCD). /// typedef struct { - PCD_PROTOCOL_SET_SKU SetSku; - - PCD_PROTOCOL_GET8 Get8; - PCD_PROTOCOL_GET16 Get16; - PCD_PROTOCOL_GET32 Get32; - PCD_PROTOCOL_GET64 Get64; - PCD_PROTOCOL_GET_POINTER GetPtr; - PCD_PROTOCOL_GET_BOOLEAN GetBool; - PCD_PROTOCOL_GET_SIZE GetSize; - - PCD_PROTOCOL_GET_EX_8 Get8Ex; - PCD_PROTOCOL_GET_EX_16 Get16Ex; - PCD_PROTOCOL_GET_EX_32 Get32Ex; - PCD_PROTOCOL_GET_EX_64 Get64Ex; - PCD_PROTOCOL_GET_EX_POINTER GetPtrEx; - PCD_PROTOCOL_GET_EX_BOOLEAN GetBoolEx; - PCD_PROTOCOL_GET_EX_SIZE GetSizeEx; - - PCD_PROTOCOL_SET8 Set8; - PCD_PROTOCOL_SET16 Set16; - PCD_PROTOCOL_SET32 Set32; - PCD_PROTOCOL_SET64 Set64; - PCD_PROTOCOL_SET_POINTER SetPtr; - PCD_PROTOCOL_SET_BOOLEAN SetBool; - - PCD_PROTOCOL_SET_EX_8 Set8Ex; - PCD_PROTOCOL_SET_EX_16 Set16Ex; - PCD_PROTOCOL_SET_EX_32 Set32Ex; - PCD_PROTOCOL_SET_EX_64 Set64Ex; - PCD_PROTOCOL_SET_EX_POINTER SetPtrEx; - PCD_PROTOCOL_SET_EX_BOOLEAN SetBoolEx; - - PCD_PROTOCOL_CALLBACK_ONSET CallbackOnSet; - PCD_PROTOCOL_CANCEL_CALLBACK CancelCallback; - PCD_PROTOCOL_GET_NEXT_TOKEN GetNextToken; - PCD_PROTOCOL_GET_NEXT_TOKENSPACE GetNextTokenSpace; + PCD_PROTOCOL_SET_SKU SetSku; + + PCD_PROTOCOL_GET8 Get8; + PCD_PROTOCOL_GET16 Get16; + PCD_PROTOCOL_GET32 Get32; + PCD_PROTOCOL_GET64 Get64; + PCD_PROTOCOL_GET_POINTER GetPtr; + PCD_PROTOCOL_GET_BOOLEAN GetBool; + PCD_PROTOCOL_GET_SIZE GetSize; + + PCD_PROTOCOL_GET_EX_8 Get8Ex; + PCD_PROTOCOL_GET_EX_16 Get16Ex; + PCD_PROTOCOL_GET_EX_32 Get32Ex; + PCD_PROTOCOL_GET_EX_64 Get64Ex; + PCD_PROTOCOL_GET_EX_POINTER GetPtrEx; + PCD_PROTOCOL_GET_EX_BOOLEAN GetBoolEx; + PCD_PROTOCOL_GET_EX_SIZE GetSizeEx; + + PCD_PROTOCOL_SET8 Set8; + PCD_PROTOCOL_SET16 Set16; + PCD_PROTOCOL_SET32 Set32; + PCD_PROTOCOL_SET64 Set64; + PCD_PROTOCOL_SET_POINTER SetPtr; + PCD_PROTOCOL_SET_BOOLEAN SetBool; + + PCD_PROTOCOL_SET_EX_8 Set8Ex; + PCD_PROTOCOL_SET_EX_16 Set16Ex; + PCD_PROTOCOL_SET_EX_32 Set32Ex; + PCD_PROTOCOL_SET_EX_64 Set64Ex; + PCD_PROTOCOL_SET_EX_POINTER SetPtrEx; + PCD_PROTOCOL_SET_EX_BOOLEAN SetBoolEx; + + PCD_PROTOCOL_CALLBACK_ONSET CallbackOnSet; + PCD_PROTOCOL_CANCEL_CALLBACK CancelCallback; + PCD_PROTOCOL_GET_NEXT_TOKEN GetNextToken; + PCD_PROTOCOL_GET_NEXT_TOKENSPACE GetNextTokenSpace; } PCD_PROTOCOL; #endif diff --git a/MdePkg/Include/Protocol/PcdInfo.h b/MdePkg/Include/Protocol/PcdInfo.h index b0ec7f6770..ea4fe1aef2 100644 --- a/MdePkg/Include/Protocol/PcdInfo.h +++ b/MdePkg/Include/Protocol/PcdInfo.h @@ -19,7 +19,7 @@ #ifndef __PCD_INFO_H__ #define __PCD_INFO_H__ -extern EFI_GUID gGetPcdInfoProtocolGuid; +extern EFI_GUID gGetPcdInfoProtocolGuid; #define GET_PCD_INFO_PROTOCOL_GUID \ { 0x5be40f57, 0xfa68, 0x4610, { 0xbb, 0xbf, 0xe9, 0xc5, 0xfc, 0xda, 0xd3, 0x65 } } @@ -27,7 +27,7 @@ extern EFI_GUID gGetPcdInfoProtocolGuid; /// /// The forward declaration for GET_PCD_INFO_PROTOCOL. /// -typedef struct _GET_PCD_INFO_PROTOCOL GET_PCD_INFO_PROTOCOL; +typedef struct _GET_PCD_INFO_PROTOCOL GET_PCD_INFO_PROTOCOL; /** Retrieve additional information associated with a PCD token. @@ -43,10 +43,10 @@ typedef struct _GET_PCD_INFO_PROTOCOL GET_PCD_INFO_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *GET_PCD_INFO_PROTOCOL_GET_INFO) ( +(EFIAPI *GET_PCD_INFO_PROTOCOL_GET_INFO)( IN UINTN TokenNumber, OUT EFI_PCD_INFO *PcdInfo -); + ); /** Retrieve additional information associated with a PCD token. @@ -63,11 +63,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *GET_PCD_INFO_PROTOCOL_GET_INFO_EX) ( +(EFIAPI *GET_PCD_INFO_PROTOCOL_GET_INFO_EX)( IN CONST EFI_GUID *Guid, IN UINTN TokenNumber, OUT EFI_PCD_INFO *PcdInfo -); + ); /** Retrieve the currently set SKU Id. @@ -78,9 +78,9 @@ EFI_STATUS **/ typedef UINTN -(EFIAPI *GET_PCD_INFO_PROTOCOL_GET_SKU) ( +(EFIAPI *GET_PCD_INFO_PROTOCOL_GET_SKU)( VOID -); + ); /// /// This is the PCD service to use when querying for some additional data that can be contained in the @@ -90,13 +90,12 @@ struct _GET_PCD_INFO_PROTOCOL { /// /// Retrieve additional information associated with a PCD. /// - GET_PCD_INFO_PROTOCOL_GET_INFO GetInfo; - GET_PCD_INFO_PROTOCOL_GET_INFO_EX GetInfoEx; + GET_PCD_INFO_PROTOCOL_GET_INFO GetInfo; + GET_PCD_INFO_PROTOCOL_GET_INFO_EX GetInfoEx; /// /// Retrieve the currently set SKU Id. /// - GET_PCD_INFO_PROTOCOL_GET_SKU GetSku; + GET_PCD_INFO_PROTOCOL_GET_SKU GetSku; }; #endif - diff --git a/MdePkg/Include/Protocol/PciEnumerationComplete.h b/MdePkg/Include/Protocol/PciEnumerationComplete.h index 13bd3e17b8..2d63ef25d4 100644 --- a/MdePkg/Include/Protocol/PciEnumerationComplete.h +++ b/MdePkg/Include/Protocol/PciEnumerationComplete.h @@ -19,6 +19,6 @@ 0x30cfe3e7, 0x3de1, 0x4586, { 0xbe, 0x20, 0xde, 0xab, 0xa1, 0xb3, 0xb7, 0x93 } \ } -extern EFI_GUID gEfiPciEnumerationCompleteProtocolGuid; +extern EFI_GUID gEfiPciEnumerationCompleteProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h b/MdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h index 17b1b5a8d8..5ef7c000d6 100644 --- a/MdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h +++ b/MdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h @@ -47,7 +47,7 @@ typedef struct _EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL EFI_PCI_HOST_BR /// the PCI bus driver needs to include requests for 64 bit /// memory address in the corresponding 32 bit memory pool. /// -#define EFI_PCI_HOST_BRIDGE_MEM64_DECODE 2 +#define EFI_PCI_HOST_BRIDGE_MEM64_DECODE 2 /// /// A UINT64 value that contains the status of a PCI resource requested @@ -61,7 +61,7 @@ typedef UINT64 EFI_RESOURCE_ALLOCATION_STATUS; /// Configuration parameter returned by GetProposedResources() to identify /// a PCI resources request that can be satisfied. /// -#define EFI_RESOURCE_SATISFIED 0x0000000000000000ULL +#define EFI_RESOURCE_SATISFIED 0x0000000000000000ULL /// /// The request of this resource type could not be fulfilled for its @@ -375,38 +375,38 @@ struct _EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL { /// The notification from the PCI bus enumerator that it is about to enter /// a certain phase during the enumeration process. /// - EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_NOTIFY_PHASE NotifyPhase; + EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_NOTIFY_PHASE NotifyPhase; /// /// Retrieves the device handle for the next PCI root bridge that is produced by the /// host bridge to which this instance of the EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL is attached. /// - EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_NEXT_ROOT_BRIDGE GetNextRootBridge; + EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_NEXT_ROOT_BRIDGE GetNextRootBridge; /// /// Retrieves the allocation-related attributes of a PCI root bridge. /// - EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_ATTRIBUTES GetAllocAttributes; + EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_ATTRIBUTES GetAllocAttributes; /// /// Sets up a PCI root bridge for bus enumeration. /// - EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_START_BUS_ENUMERATION StartBusEnumeration; + EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_START_BUS_ENUMERATION StartBusEnumeration; /// /// Sets up the PCI root bridge so that it decodes a specific range of bus numbers. /// - EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_SET_BUS_NUMBERS SetBusNumbers; + EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_SET_BUS_NUMBERS SetBusNumbers; /// /// Submits the resource requirements for the specified PCI root bridge. /// - EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_SUBMIT_RESOURCES SubmitResources; + EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_SUBMIT_RESOURCES SubmitResources; /// /// Returns the proposed resource assignment for the specified PCI root bridges. /// - EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_PROPOSED_RESOURCES GetProposedResources; + EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_PROPOSED_RESOURCES GetProposedResources; /// /// Provides hooks from the PCI bus driver to every PCI controller @@ -414,9 +414,9 @@ struct _EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL { /// allow the host bridge driver to preinitialize individual PCI controllers /// before enumeration. /// - EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_PREPROCESS_CONTROLLER PreprocessController; + EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_PREPROCESS_CONTROLLER PreprocessController; }; -extern EFI_GUID gEfiPciHostBridgeResourceAllocationProtocolGuid; +extern EFI_GUID gEfiPciHostBridgeResourceAllocationProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PciHotPlugInit.h b/MdePkg/Include/Protocol/PciHotPlugInit.h index 72dd248e43..cd9097782a 100644 --- a/MdePkg/Include/Protocol/PciHotPlugInit.h +++ b/MdePkg/Include/Protocol/PciHotPlugInit.h @@ -76,18 +76,18 @@ typedef UINT16 EFI_HPC_STATE; /// disabled in hardware, or it may be disabled due to user preferences, /// hardware failure, or other reasons. No resource padding is required. /// -#define EFI_HPC_STATE_INITIALIZED 0x01 +#define EFI_HPC_STATE_INITIALIZED 0x01 /// /// The HPC initialization function was called, the HPC completed /// initialization, and it was enabled. Resource padding is required. /// -#define EFI_HPC_STATE_ENABLED 0x02 +#define EFI_HPC_STATE_ENABLED 0x02 /// /// Location definition for PCI Hot Plug Controller /// -typedef struct{ +typedef struct { /// /// /// The device path to the root HPC. An HPC cannot control its parent buses. @@ -95,7 +95,7 @@ typedef struct{ /// correct HpcPciAddress to the InitializeRootHpc() and GetResourcePadding() /// functions. /// - EFI_DEVICE_PATH_PROTOCOL *HpcDevicePath; + EFI_DEVICE_PATH_PROTOCOL *HpcDevicePath; /// /// The device path to the Hot Plug Bus (HPB) that is controlled by the root /// HPC. The PCI bus driver uses this information to check if a particular PCI @@ -103,7 +103,7 @@ typedef struct{ /// device path of its parent. For Standard(PCI) Hot Plug Controllers (SHPCs) /// and PCI Express*, HpbDevicePath is the same as HpcDevicePath. /// - EFI_DEVICE_PATH_PROTOCOL *HpbDevicePath; + EFI_DEVICE_PATH_PROTOCOL *HpbDevicePath; } EFI_HPC_LOCATION; /// @@ -254,19 +254,19 @@ struct _EFI_PCI_HOT_PLUG_INIT_PROTOCOL { /// /// Returns a list of root HPCs and the buses that they control. /// - EFI_GET_ROOT_HPC_LIST GetRootHpcList; + EFI_GET_ROOT_HPC_LIST GetRootHpcList; /// /// Initializes the specified root HPC. /// - EFI_INITIALIZE_ROOT_HPC InitializeRootHpc; + EFI_INITIALIZE_ROOT_HPC InitializeRootHpc; /// /// Returns the resource padding that is required by the HPC. /// - EFI_GET_HOT_PLUG_PADDING GetResourcePadding; + EFI_GET_HOT_PLUG_PADDING GetResourcePadding; }; -extern EFI_GUID gEfiPciHotPlugInitProtocolGuid; +extern EFI_GUID gEfiPciHotPlugInitProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PciHotPlugRequest.h b/MdePkg/Include/Protocol/PciHotPlugRequest.h index 780bbe1274..78b4fcb234 100644 --- a/MdePkg/Include/Protocol/PciHotPlugRequest.h +++ b/MdePkg/Include/Protocol/PciHotPlugRequest.h @@ -51,7 +51,7 @@ /// /// Forward declaration for EFI_PCI_HOTPLUG_REQUEST_PROTOCOL /// -typedef struct _EFI_PCI_HOTPLUG_REQUEST_PROTOCOL EFI_PCI_HOTPLUG_REQUEST_PROTOCOL; +typedef struct _EFI_PCI_HOTPLUG_REQUEST_PROTOCOL EFI_PCI_HOTPLUG_REQUEST_PROTOCOL; /// /// Enumeration of PCI hot plug operations @@ -156,9 +156,9 @@ struct _EFI_PCI_HOTPLUG_REQUEST_PROTOCOL { /// to create or destroy handles for the PCI-like devices. See Section 0 for /// a detailed description. /// - EFI_PCI_HOTPLUG_REQUEST_NOTIFY Notify; + EFI_PCI_HOTPLUG_REQUEST_NOTIFY Notify; }; -extern EFI_GUID gEfiPciHotPlugRequestProtocolGuid; +extern EFI_GUID gEfiPciHotPlugRequestProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PciIo.h b/MdePkg/Include/Protocol/PciIo.h index d77ceec37a..55c5de365b 100644 --- a/MdePkg/Include/Protocol/PciIo.h +++ b/MdePkg/Include/Protocol/PciIo.h @@ -18,7 +18,7 @@ 0x4cf5b200, 0x68b8, 0x4ca5, {0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a } \ } -typedef struct _EFI_PCI_IO_PROTOCOL EFI_PCI_IO_PROTOCOL; +typedef struct _EFI_PCI_IO_PROTOCOL EFI_PCI_IO_PROTOCOL; /// /// ******************************************************* @@ -26,7 +26,7 @@ typedef struct _EFI_PCI_IO_PROTOCOL EFI_PCI_IO_PROTOCOL; /// ******************************************************* /// typedef enum { - EfiPciIoWidthUint8 = 0, + EfiPciIoWidthUint8 = 0, EfiPciIoWidthUint16, EfiPciIoWidthUint32, EfiPciIoWidthUint64, @@ -44,30 +44,30 @@ typedef enum { // // Complete PCI address generater // -#define EFI_PCI_IO_PASS_THROUGH_BAR 0xff ///< Special BAR that passes a memory or I/O cycle through unchanged -#define EFI_PCI_IO_ATTRIBUTE_MASK 0x077f ///< All the following I/O and Memory cycles -#define EFI_PCI_IO_ATTRIBUTE_ISA_MOTHERBOARD_IO 0x0001 ///< I/O cycles 0x0000-0x00FF (10 bit decode) -#define EFI_PCI_IO_ATTRIBUTE_ISA_IO 0x0002 ///< I/O cycles 0x0100-0x03FF or greater (10 bit decode) -#define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO 0x0004 ///< I/O cycles 0x3C6, 0x3C8, 0x3C9 (10 bit decode) -#define EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY 0x0008 ///< MEM cycles 0xA0000-0xBFFFF (24 bit decode) -#define EFI_PCI_IO_ATTRIBUTE_VGA_IO 0x0010 ///< I/O cycles 0x3B0-0x3BB and 0x3C0-0x3DF (10 bit decode) -#define EFI_PCI_IO_ATTRIBUTE_IDE_PRIMARY_IO 0x0020 ///< I/O cycles 0x1F0-0x1F7, 0x3F6, 0x3F7 (10 bit decode) -#define EFI_PCI_IO_ATTRIBUTE_IDE_SECONDARY_IO 0x0040 ///< I/O cycles 0x170-0x177, 0x376, 0x377 (10 bit decode) -#define EFI_PCI_IO_ATTRIBUTE_MEMORY_WRITE_COMBINE 0x0080 ///< Map a memory range so writes are combined -#define EFI_PCI_IO_ATTRIBUTE_IO 0x0100 ///< Enable the I/O decode bit in the PCI Config Header -#define EFI_PCI_IO_ATTRIBUTE_MEMORY 0x0200 ///< Enable the Memory decode bit in the PCI Config Header -#define EFI_PCI_IO_ATTRIBUTE_BUS_MASTER 0x0400 ///< Enable the DMA bit in the PCI Config Header -#define EFI_PCI_IO_ATTRIBUTE_MEMORY_CACHED 0x0800 ///< Map a memory range so all r/w accesses are cached -#define EFI_PCI_IO_ATTRIBUTE_MEMORY_DISABLE 0x1000 ///< Disable a memory range -#define EFI_PCI_IO_ATTRIBUTE_EMBEDDED_DEVICE 0x2000 ///< Clear for an add-in PCI Device -#define EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM 0x4000 ///< Clear for a physical PCI Option ROM accessed through ROM BAR -#define EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE 0x8000 ///< Clear for PCI controllers that can not genrate a DAC -#define EFI_PCI_IO_ATTRIBUTE_ISA_IO_16 0x10000 ///< I/O cycles 0x0100-0x03FF or greater (16 bit decode) -#define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO_16 0x20000 ///< I/O cycles 0x3C6, 0x3C8, 0x3C9 (16 bit decode) -#define EFI_PCI_IO_ATTRIBUTE_VGA_IO_16 0x40000 ///< I/O cycles 0x3B0-0x3BB and 0x3C0-0x3DF (16 bit decode) - -#define EFI_PCI_DEVICE_ENABLE (EFI_PCI_IO_ATTRIBUTE_IO | EFI_PCI_IO_ATTRIBUTE_MEMORY | EFI_PCI_IO_ATTRIBUTE_BUS_MASTER) -#define EFI_VGA_DEVICE_ENABLE (EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_IO) +#define EFI_PCI_IO_PASS_THROUGH_BAR 0xff ///< Special BAR that passes a memory or I/O cycle through unchanged +#define EFI_PCI_IO_ATTRIBUTE_MASK 0x077f ///< All the following I/O and Memory cycles +#define EFI_PCI_IO_ATTRIBUTE_ISA_MOTHERBOARD_IO 0x0001 ///< I/O cycles 0x0000-0x00FF (10 bit decode) +#define EFI_PCI_IO_ATTRIBUTE_ISA_IO 0x0002 ///< I/O cycles 0x0100-0x03FF or greater (10 bit decode) +#define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO 0x0004 ///< I/O cycles 0x3C6, 0x3C8, 0x3C9 (10 bit decode) +#define EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY 0x0008 ///< MEM cycles 0xA0000-0xBFFFF (24 bit decode) +#define EFI_PCI_IO_ATTRIBUTE_VGA_IO 0x0010 ///< I/O cycles 0x3B0-0x3BB and 0x3C0-0x3DF (10 bit decode) +#define EFI_PCI_IO_ATTRIBUTE_IDE_PRIMARY_IO 0x0020 ///< I/O cycles 0x1F0-0x1F7, 0x3F6, 0x3F7 (10 bit decode) +#define EFI_PCI_IO_ATTRIBUTE_IDE_SECONDARY_IO 0x0040 ///< I/O cycles 0x170-0x177, 0x376, 0x377 (10 bit decode) +#define EFI_PCI_IO_ATTRIBUTE_MEMORY_WRITE_COMBINE 0x0080 ///< Map a memory range so writes are combined +#define EFI_PCI_IO_ATTRIBUTE_IO 0x0100 ///< Enable the I/O decode bit in the PCI Config Header +#define EFI_PCI_IO_ATTRIBUTE_MEMORY 0x0200 ///< Enable the Memory decode bit in the PCI Config Header +#define EFI_PCI_IO_ATTRIBUTE_BUS_MASTER 0x0400 ///< Enable the DMA bit in the PCI Config Header +#define EFI_PCI_IO_ATTRIBUTE_MEMORY_CACHED 0x0800 ///< Map a memory range so all r/w accesses are cached +#define EFI_PCI_IO_ATTRIBUTE_MEMORY_DISABLE 0x1000 ///< Disable a memory range +#define EFI_PCI_IO_ATTRIBUTE_EMBEDDED_DEVICE 0x2000 ///< Clear for an add-in PCI Device +#define EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM 0x4000 ///< Clear for a physical PCI Option ROM accessed through ROM BAR +#define EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE 0x8000 ///< Clear for PCI controllers that can not genrate a DAC +#define EFI_PCI_IO_ATTRIBUTE_ISA_IO_16 0x10000 ///< I/O cycles 0x0100-0x03FF or greater (16 bit decode) +#define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO_16 0x20000 ///< I/O cycles 0x3C6, 0x3C8, 0x3C9 (16 bit decode) +#define EFI_PCI_IO_ATTRIBUTE_VGA_IO_16 0x40000 ///< I/O cycles 0x3B0-0x3BB and 0x3C0-0x3DF (16 bit decode) + +#define EFI_PCI_DEVICE_ENABLE (EFI_PCI_IO_ATTRIBUTE_IO | EFI_PCI_IO_ATTRIBUTE_MEMORY | EFI_PCI_IO_ATTRIBUTE_BUS_MASTER) +#define EFI_VGA_DEVICE_ENABLE (EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_IO) /// /// ******************************************************* @@ -190,11 +190,11 @@ typedef struct { /// /// Read PCI controller registers in the PCI memory or I/O space. /// - EFI_PCI_IO_PROTOCOL_IO_MEM Read; + EFI_PCI_IO_PROTOCOL_IO_MEM Read; /// /// Write PCI controller registers in the PCI memory or I/O space. /// - EFI_PCI_IO_PROTOCOL_IO_MEM Write; + EFI_PCI_IO_PROTOCOL_IO_MEM Write; } EFI_PCI_IO_PROTOCOL_ACCESS; /** @@ -229,11 +229,11 @@ typedef struct { /// /// Read PCI controller registers in PCI configuration space. /// - EFI_PCI_IO_PROTOCOL_CONFIG Read; + EFI_PCI_IO_PROTOCOL_CONFIG Read; /// /// Write PCI controller registers in PCI configuration space. /// - EFI_PCI_IO_PROTOCOL_CONFIG Write; + EFI_PCI_IO_PROTOCOL_CONFIG Write; } EFI_PCI_IO_PROTOCOL_CONFIG_ACCESS; /** @@ -514,26 +514,26 @@ EFI_STATUS /// retrieve the EFI_PCI_IO_PROTOCOL instance that is associated with the PCI controller. /// struct _EFI_PCI_IO_PROTOCOL { - EFI_PCI_IO_PROTOCOL_POLL_IO_MEM PollMem; - EFI_PCI_IO_PROTOCOL_POLL_IO_MEM PollIo; - EFI_PCI_IO_PROTOCOL_ACCESS Mem; - EFI_PCI_IO_PROTOCOL_ACCESS Io; - EFI_PCI_IO_PROTOCOL_CONFIG_ACCESS Pci; - EFI_PCI_IO_PROTOCOL_COPY_MEM CopyMem; - EFI_PCI_IO_PROTOCOL_MAP Map; - EFI_PCI_IO_PROTOCOL_UNMAP Unmap; - EFI_PCI_IO_PROTOCOL_ALLOCATE_BUFFER AllocateBuffer; - EFI_PCI_IO_PROTOCOL_FREE_BUFFER FreeBuffer; - EFI_PCI_IO_PROTOCOL_FLUSH Flush; - EFI_PCI_IO_PROTOCOL_GET_LOCATION GetLocation; - EFI_PCI_IO_PROTOCOL_ATTRIBUTES Attributes; - EFI_PCI_IO_PROTOCOL_GET_BAR_ATTRIBUTES GetBarAttributes; - EFI_PCI_IO_PROTOCOL_SET_BAR_ATTRIBUTES SetBarAttributes; + EFI_PCI_IO_PROTOCOL_POLL_IO_MEM PollMem; + EFI_PCI_IO_PROTOCOL_POLL_IO_MEM PollIo; + EFI_PCI_IO_PROTOCOL_ACCESS Mem; + EFI_PCI_IO_PROTOCOL_ACCESS Io; + EFI_PCI_IO_PROTOCOL_CONFIG_ACCESS Pci; + EFI_PCI_IO_PROTOCOL_COPY_MEM CopyMem; + EFI_PCI_IO_PROTOCOL_MAP Map; + EFI_PCI_IO_PROTOCOL_UNMAP Unmap; + EFI_PCI_IO_PROTOCOL_ALLOCATE_BUFFER AllocateBuffer; + EFI_PCI_IO_PROTOCOL_FREE_BUFFER FreeBuffer; + EFI_PCI_IO_PROTOCOL_FLUSH Flush; + EFI_PCI_IO_PROTOCOL_GET_LOCATION GetLocation; + EFI_PCI_IO_PROTOCOL_ATTRIBUTES Attributes; + EFI_PCI_IO_PROTOCOL_GET_BAR_ATTRIBUTES GetBarAttributes; + EFI_PCI_IO_PROTOCOL_SET_BAR_ATTRIBUTES SetBarAttributes; /// /// The size, in bytes, of the ROM image. /// - UINT64 RomSize; + UINT64 RomSize; /// /// A pointer to the in memory copy of the ROM image. The PCI Bus Driver is responsible @@ -543,9 +543,9 @@ struct _EFI_PCI_IO_PROTOCOL { /// The Attributes() function can be used to determine from which of these two sources /// the RomImage buffer was initialized. /// - VOID *RomImage; + VOID *RomImage; }; -extern EFI_GUID gEfiPciIoProtocolGuid; +extern EFI_GUID gEfiPciIoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PciOverride.h b/MdePkg/Include/Protocol/PciOverride.h index 0a7635d207..91f20a10ec 100644 --- a/MdePkg/Include/Protocol/PciOverride.h +++ b/MdePkg/Include/Protocol/PciOverride.h @@ -34,7 +34,6 @@ /// typedef EFI_PCI_PLATFORM_PROTOCOL EFI_PCI_OVERRIDE_PROTOCOL; - -extern EFI_GUID gEfiPciOverrideProtocolGuid; +extern EFI_GUID gEfiPciOverrideProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PciPlatform.h b/MdePkg/Include/Protocol/PciPlatform.h index 4b0cf07391..355f4ba83d 100644 --- a/MdePkg/Include/Protocol/PciPlatform.h +++ b/MdePkg/Include/Protocol/PciPlatform.h @@ -110,13 +110,13 @@ typedef struct _EFI_PCI_PLATFORM_PROTOCOL EFI_PCI_PLATFORM_PROTOCOL; /// be treated like EFI_RESERVE_ISA_IO_NO_ALIAS | /// EFI_RESERVE_VGA_IO_ALIAS. /// -typedef UINT32 EFI_PCI_PLATFORM_POLICY; +typedef UINT32 EFI_PCI_PLATFORM_POLICY; /// /// Does not set aside either ISA or VGA I/O resources during PCI /// enumeration. /// -#define EFI_RESERVE_NONE_IO_ALIAS 0x0000 +#define EFI_RESERVE_NONE_IO_ALIAS 0x0000 /// /// Sets aside ISA I/O range and all aliases: @@ -125,22 +125,22 @@ typedef UINT32 EFI_PCI_PLATFORM_POLICY; /// - n900..nBFF /// - nD00..nFFF. /// -#define EFI_RESERVE_ISA_IO_ALIAS 0x0001 +#define EFI_RESERVE_ISA_IO_ALIAS 0x0001 /// /// Sets aside ISA I/O range 0x100-0x3FF. /// -#define EFI_RESERVE_ISA_IO_NO_ALIAS 0x0002 +#define EFI_RESERVE_ISA_IO_NO_ALIAS 0x0002 /// /// Sets aside VGA I/O ranges and all aliases. /// -#define EFI_RESERVE_VGA_IO_ALIAS 0x0004 +#define EFI_RESERVE_VGA_IO_ALIAS 0x0004 /// /// Sets aside VGA I/O ranges /// -#define EFI_RESERVE_VGA_IO_NO_ALIAS 0x0008 +#define EFI_RESERVE_VGA_IO_NO_ALIAS 0x0008 /// /// EFI_PCI_EXECUTION_PHASE is used to call a platform protocol and execute @@ -317,22 +317,22 @@ struct _EFI_PCI_PLATFORM_PROTOCOL { /// The notification from the PCI bus enumerator to the platform that it is about to /// enter a certain phase during the enumeration process. /// - EFI_PCI_PLATFORM_PHASE_NOTIFY PlatformNotify; + EFI_PCI_PLATFORM_PHASE_NOTIFY PlatformNotify; /// /// The notification from the PCI bus enumerator to the platform for each PCI /// controller at several predefined points during PCI controller initialization. /// - EFI_PCI_PLATFORM_PREPROCESS_CONTROLLER PlatformPrepController; + EFI_PCI_PLATFORM_PREPROCESS_CONTROLLER PlatformPrepController; /// /// Retrieves the platform policy regarding enumeration. /// - EFI_PCI_PLATFORM_GET_PLATFORM_POLICY GetPlatformPolicy; + EFI_PCI_PLATFORM_GET_PLATFORM_POLICY GetPlatformPolicy; /// /// Gets the PCI device's option ROM from a platform-specific location. /// - EFI_PCI_PLATFORM_GET_PCI_ROM GetPciRom; + EFI_PCI_PLATFORM_GET_PCI_ROM GetPciRom; }; -extern EFI_GUID gEfiPciPlatformProtocolGuid; +extern EFI_GUID gEfiPciPlatformProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PciRootBridgeIo.h b/MdePkg/Include/Protocol/PciRootBridgeIo.h index 068bcd82dd..b2927b04d5 100644 --- a/MdePkg/Include/Protocol/PciRootBridgeIo.h +++ b/MdePkg/Include/Protocol/PciRootBridgeIo.h @@ -20,7 +20,7 @@ 0x2f707ebb, 0x4a1a, 0x11d4, {0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ } -typedef struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL; +typedef struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL; /// /// ******************************************************* @@ -82,24 +82,24 @@ typedef enum { EfiPciOperationMaximum } EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_OPERATION; -#define EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO 0x0001 -#define EFI_PCI_ATTRIBUTE_ISA_IO 0x0002 -#define EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO 0x0004 -#define EFI_PCI_ATTRIBUTE_VGA_MEMORY 0x0008 -#define EFI_PCI_ATTRIBUTE_VGA_IO 0x0010 -#define EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO 0x0020 -#define EFI_PCI_ATTRIBUTE_IDE_SECONDARY_IO 0x0040 -#define EFI_PCI_ATTRIBUTE_MEMORY_WRITE_COMBINE 0x0080 -#define EFI_PCI_ATTRIBUTE_MEMORY_CACHED 0x0800 -#define EFI_PCI_ATTRIBUTE_MEMORY_DISABLE 0x1000 -#define EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE 0x8000 -#define EFI_PCI_ATTRIBUTE_ISA_IO_16 0x10000 -#define EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16 0x20000 -#define EFI_PCI_ATTRIBUTE_VGA_IO_16 0x40000 - -#define EFI_PCI_ATTRIBUTE_VALID_FOR_ALLOCATE_BUFFER (EFI_PCI_ATTRIBUTE_MEMORY_WRITE_COMBINE | EFI_PCI_ATTRIBUTE_MEMORY_CACHED | EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE) - -#define EFI_PCI_ATTRIBUTE_INVALID_FOR_ALLOCATE_BUFFER (~EFI_PCI_ATTRIBUTE_VALID_FOR_ALLOCATE_BUFFER) +#define EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO 0x0001 +#define EFI_PCI_ATTRIBUTE_ISA_IO 0x0002 +#define EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO 0x0004 +#define EFI_PCI_ATTRIBUTE_VGA_MEMORY 0x0008 +#define EFI_PCI_ATTRIBUTE_VGA_IO 0x0010 +#define EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO 0x0020 +#define EFI_PCI_ATTRIBUTE_IDE_SECONDARY_IO 0x0040 +#define EFI_PCI_ATTRIBUTE_MEMORY_WRITE_COMBINE 0x0080 +#define EFI_PCI_ATTRIBUTE_MEMORY_CACHED 0x0800 +#define EFI_PCI_ATTRIBUTE_MEMORY_DISABLE 0x1000 +#define EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE 0x8000 +#define EFI_PCI_ATTRIBUTE_ISA_IO_16 0x10000 +#define EFI_PCI_ATTRIBUTE_VGA_PALETTE_IO_16 0x20000 +#define EFI_PCI_ATTRIBUTE_VGA_IO_16 0x40000 + +#define EFI_PCI_ATTRIBUTE_VALID_FOR_ALLOCATE_BUFFER (EFI_PCI_ATTRIBUTE_MEMORY_WRITE_COMBINE | EFI_PCI_ATTRIBUTE_MEMORY_CACHED | EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE) + +#define EFI_PCI_ATTRIBUTE_INVALID_FOR_ALLOCATE_BUFFER (~EFI_PCI_ATTRIBUTE_VALID_FOR_ALLOCATE_BUFFER) #define EFI_PCI_ADDRESS(bus, dev, func, reg) \ (UINT64) ( \ @@ -109,11 +109,11 @@ typedef enum { (((UINTN) (reg)) < 256 ? ((UINTN) (reg)) : (UINT64) (LShiftU64 ((UINT64) (reg), 32)))) typedef struct { - UINT8 Register; - UINT8 Function; - UINT8 Device; - UINT8 Bus; - UINT32 ExtendedRegister; + UINT8 Register; + UINT8 Function; + UINT8 Device; + UINT8 Bus; + UINT32 ExtendedRegister; } EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS; /** @@ -175,11 +175,11 @@ typedef struct { /// /// Read PCI controller registers in the PCI root bridge memory space. /// - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_IO_MEM Read; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_IO_MEM Read; /// /// Write PCI controller registers in the PCI root bridge memory space. /// - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_IO_MEM Write; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_IO_MEM Write; } EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ACCESS; /** @@ -409,28 +409,28 @@ struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL { /// /// The EFI_HANDLE of the PCI Host Bridge of which this PCI Root Bridge is a member. /// - EFI_HANDLE ParentHandle; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_POLL_IO_MEM PollMem; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_POLL_IO_MEM PollIo; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ACCESS Mem; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ACCESS Io; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ACCESS Pci; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_COPY_MEM CopyMem; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_MAP Map; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_UNMAP Unmap; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ALLOCATE_BUFFER AllocateBuffer; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_FREE_BUFFER FreeBuffer; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_FLUSH Flush; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GET_ATTRIBUTES GetAttributes; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_SET_ATTRIBUTES SetAttributes; - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_CONFIGURATION Configuration; + EFI_HANDLE ParentHandle; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_POLL_IO_MEM PollMem; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_POLL_IO_MEM PollIo; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ACCESS Mem; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ACCESS Io; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ACCESS Pci; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_COPY_MEM CopyMem; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_MAP Map; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_UNMAP Unmap; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_ALLOCATE_BUFFER AllocateBuffer; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_FREE_BUFFER FreeBuffer; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_FLUSH Flush; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GET_ATTRIBUTES GetAttributes; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_SET_ATTRIBUTES SetAttributes; + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_CONFIGURATION Configuration; /// /// The segment number that this PCI root bridge resides. /// - UINT32 SegmentNumber; + UINT32 SegmentNumber; }; -extern EFI_GUID gEfiPciRootBridgeIoProtocolGuid; +extern EFI_GUID gEfiPciRootBridgeIoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PiPcd.h b/MdePkg/Include/Protocol/PiPcd.h index 67d48d546e..e26733b5d9 100644 --- a/MdePkg/Include/Protocol/PiPcd.h +++ b/MdePkg/Include/Protocol/PiPcd.h @@ -22,12 +22,12 @@ #ifndef __PI_PCD_H__ #define __PI_PCD_H__ -extern EFI_GUID gEfiPcdProtocolGuid; +extern EFI_GUID gEfiPcdProtocolGuid; #define EFI_PCD_PROTOCOL_GUID \ { 0x13a3f0f6, 0x264a, 0x3ef0, { 0xf2, 0xe0, 0xde, 0xc5, 0x12, 0x34, 0x2f, 0x34 } } -#define EFI_PCD_INVALID_TOKEN_NUMBER ((UINTN) 0) +#define EFI_PCD_INVALID_TOKEN_NUMBER ((UINTN) 0) /** SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values. SetSku() is @@ -48,7 +48,7 @@ typedef VOID (EFIAPI *EFI_PCD_PROTOCOL_SET_SKU)( IN UINTN SkuId -); + ); /** Retrieves an 8-bit value for a given PCD token. @@ -64,7 +64,7 @@ UINT8 (EFIAPI *EFI_PCD_PROTOCOL_GET_8)( IN CONST EFI_GUID *Guid, IN UINTN TokenNumber -); + ); /** Retrieves the current word-sized value for a PCD token number. @@ -80,7 +80,7 @@ UINT16 (EFIAPI *EFI_PCD_PROTOCOL_GET_16)( IN CONST EFI_GUID *Guid, IN UINTN TokenNumber -); + ); /** Retrieves the current 32-bit sized value for a PCD token number. @@ -96,7 +96,7 @@ UINT32 (EFIAPI *EFI_PCD_PROTOCOL_GET_32)( IN CONST EFI_GUID *Guid, IN UINTN TokenNumber -); + ); /** Retrieves the 64-bit sized value for a PCD token number. @@ -113,7 +113,7 @@ UINT64 (EFIAPI *EFI_PCD_PROTOCOL_GET_64)( IN CONST EFI_GUID *Guid, IN UINTN TokenNumber -); + ); /** Retrieves the current pointer to the value for a PCD token number. Do not make any assumptions @@ -130,7 +130,7 @@ VOID * (EFIAPI *EFI_PCD_PROTOCOL_GET_POINTER)( IN CONST EFI_GUID *Guid, IN UINTN TokenNumber -); + ); /** Retrieves the current BOOLEAN-sized value for a PCD token number. If the TokenNumber is @@ -146,7 +146,7 @@ BOOLEAN (EFIAPI *EFI_PCD_PROTOCOL_GET_BOOLEAN)( IN CONST EFI_GUID *Guid, IN UINTN TokenNumber -); + ); /** Retrieves the current size of a particular PCD token. If the TokenNumber is invalid, the results are @@ -162,7 +162,7 @@ UINTN (EFIAPI *EFI_PCD_PROTOCOL_GET_SIZE)( IN CONST EFI_GUID *Guid, IN UINTN TokenNumber -); + ); /** Sets an 8-bit value for a given PCD token. @@ -186,7 +186,7 @@ EFI_STATUS IN CONST EFI_GUID *Guid, IN UINTN TokenNumber, IN UINT8 Value -); + ); /** Sets an 16-bit value for a given PCD token. @@ -210,7 +210,7 @@ EFI_STATUS IN CONST EFI_GUID *Guid, IN UINTN TokenNumber, IN UINT16 Value -); + ); /** Sets an 32-bit value for a given PCD token. @@ -234,7 +234,7 @@ EFI_STATUS IN CONST EFI_GUID *Guid, IN UINTN TokenNumber, IN UINT32 Value -); + ); /** Sets an 64-bit value for a given PCD token. @@ -258,7 +258,7 @@ EFI_STATUS IN CONST EFI_GUID *Guid, IN UINTN TokenNumber, IN UINT64 Value -); + ); /** Sets a value of a specified size for a given PCD token. @@ -286,7 +286,7 @@ EFI_STATUS IN UINTN TokenNumber, IN OUT UINTN *SizeOfValue, IN VOID *Buffer -); + ); /** Sets a Boolean value for a given PCD token. @@ -310,7 +310,7 @@ EFI_STATUS IN CONST EFI_GUID *Guid, IN UINTN TokenNumber, IN BOOLEAN Value -); + ); typedef VOID @@ -319,7 +319,7 @@ VOID IN UINTN CallBackToken, IN OUT VOID *TokenData, IN UINTN TokenDataSize -); + ); /** Specifies a function to be called anytime the value of a designated token is changed. @@ -337,7 +337,7 @@ EFI_STATUS IN CONST EFI_GUID *Guid OPTIONAL, IN UINTN CallBackToken, IN EFI_PCD_PROTOCOL_CALLBACK CallBackFunction -); + ); /** Cancels a callback function that was set through a previous call to the CallBackOnSet function. @@ -355,7 +355,7 @@ EFI_STATUS IN CONST EFI_GUID *Guid OPTIONAL, IN UINTN CallBackToken, IN EFI_PCD_PROTOCOL_CALLBACK CallBackFunction -); + ); /** Gets the next valid token number in a given namespace. This is useful since the PCD infrastructure @@ -373,7 +373,7 @@ EFI_STATUS (EFIAPI *EFI_PCD_PROTOCOL_GET_NEXT_TOKEN)( IN CONST EFI_GUID *Guid OPTIONAL, IN UINTN *TokenNumber -); + ); /** Gets the next valid token namespace for a given namespace. This is useful to traverse the valid @@ -392,27 +392,27 @@ typedef EFI_STATUS (EFIAPI *EFI_PCD_PROTOCOL_GET_NEXT_TOKEN_SPACE)( IN OUT CONST EFI_GUID **Guid -); + ); typedef struct _EFI_PCD_PROTOCOL { - EFI_PCD_PROTOCOL_SET_SKU SetSku; - EFI_PCD_PROTOCOL_GET_8 Get8; - EFI_PCD_PROTOCOL_GET_16 Get16; - EFI_PCD_PROTOCOL_GET_32 Get32; - EFI_PCD_PROTOCOL_GET_64 Get64; - EFI_PCD_PROTOCOL_GET_POINTER GetPtr; - EFI_PCD_PROTOCOL_GET_BOOLEAN GetBool; - EFI_PCD_PROTOCOL_GET_SIZE GetSize; - EFI_PCD_PROTOCOL_SET_8 Set8; - EFI_PCD_PROTOCOL_SET_16 Set16; - EFI_PCD_PROTOCOL_SET_32 Set32; - EFI_PCD_PROTOCOL_SET_64 Set64; - EFI_PCD_PROTOCOL_SET_POINTER SetPtr; - EFI_PCD_PROTOCOL_SET_BOOLEAN SetBool; - EFI_PCD_PROTOCOL_CALLBACK_ON_SET CallbackOnSet; - EFI_PCD_PROTOCOL_CANCEL_CALLBACK CancelCallback; - EFI_PCD_PROTOCOL_GET_NEXT_TOKEN GetNextToken; - EFI_PCD_PROTOCOL_GET_NEXT_TOKEN_SPACE GetNextTokenSpace; + EFI_PCD_PROTOCOL_SET_SKU SetSku; + EFI_PCD_PROTOCOL_GET_8 Get8; + EFI_PCD_PROTOCOL_GET_16 Get16; + EFI_PCD_PROTOCOL_GET_32 Get32; + EFI_PCD_PROTOCOL_GET_64 Get64; + EFI_PCD_PROTOCOL_GET_POINTER GetPtr; + EFI_PCD_PROTOCOL_GET_BOOLEAN GetBool; + EFI_PCD_PROTOCOL_GET_SIZE GetSize; + EFI_PCD_PROTOCOL_SET_8 Set8; + EFI_PCD_PROTOCOL_SET_16 Set16; + EFI_PCD_PROTOCOL_SET_32 Set32; + EFI_PCD_PROTOCOL_SET_64 Set64; + EFI_PCD_PROTOCOL_SET_POINTER SetPtr; + EFI_PCD_PROTOCOL_SET_BOOLEAN SetBool; + EFI_PCD_PROTOCOL_CALLBACK_ON_SET CallbackOnSet; + EFI_PCD_PROTOCOL_CANCEL_CALLBACK CancelCallback; + EFI_PCD_PROTOCOL_GET_NEXT_TOKEN GetNextToken; + EFI_PCD_PROTOCOL_GET_NEXT_TOKEN_SPACE GetNextTokenSpace; } EFI_PCD_PROTOCOL; #endif diff --git a/MdePkg/Include/Protocol/PiPcdInfo.h b/MdePkg/Include/Protocol/PiPcdInfo.h index eb90f6b7a6..0402feeb66 100644 --- a/MdePkg/Include/Protocol/PiPcdInfo.h +++ b/MdePkg/Include/Protocol/PiPcdInfo.h @@ -13,7 +13,7 @@ #ifndef __PI_PCD_INFO_H__ #define __PI_PCD_INFO_H__ -extern EFI_GUID gEfiGetPcdInfoProtocolGuid; +extern EFI_GUID gEfiGetPcdInfoProtocolGuid; #define EFI_GET_PCD_INFO_PROTOCOL_GUID \ { 0xfd0f4478, 0xefd, 0x461d, { 0xba, 0x2d, 0xe5, 0x8c, 0x45, 0xfd, 0x5f, 0x5e } } @@ -21,7 +21,7 @@ extern EFI_GUID gEfiGetPcdInfoProtocolGuid; /// /// The forward declaration for EFI_GET_PCD_INFO_PROTOCOL. /// -typedef struct _EFI_GET_PCD_INFO_PROTOCOL EFI_GET_PCD_INFO_PROTOCOL; +typedef struct _EFI_GET_PCD_INFO_PROTOCOL EFI_GET_PCD_INFO_PROTOCOL; /** Retrieve additional information associated with a PCD token. @@ -38,11 +38,11 @@ typedef struct _EFI_GET_PCD_INFO_PROTOCOL EFI_GET_PCD_INFO_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_GET_PCD_INFO_PROTOCOL_GET_INFO) ( +(EFIAPI *EFI_GET_PCD_INFO_PROTOCOL_GET_INFO)( IN CONST EFI_GUID *Guid, IN UINTN TokenNumber, OUT EFI_PCD_INFO *PcdInfo -); + ); /** Retrieve the currently set SKU Id. @@ -53,9 +53,9 @@ EFI_STATUS **/ typedef UINTN -(EFIAPI *EFI_GET_PCD_INFO_PROTOCOL_GET_SKU) ( +(EFIAPI *EFI_GET_PCD_INFO_PROTOCOL_GET_SKU)( VOID -); + ); /// /// Callers to this protocol must be at a TPL_APPLICATION task priority level. @@ -74,4 +74,3 @@ struct _EFI_GET_PCD_INFO_PROTOCOL { }; #endif - diff --git a/MdePkg/Include/Protocol/Pkcs7Verify.h b/MdePkg/Include/Protocol/Pkcs7Verify.h index 7b3454ec3a..068eda8b45 100644 --- a/MdePkg/Include/Protocol/Pkcs7Verify.h +++ b/MdePkg/Include/Protocol/Pkcs7Verify.h @@ -26,7 +26,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent typedef struct _EFI_PKCS7_VERIFY_PROTOCOL EFI_PKCS7_VERIFY_PROTOCOL; - /** Processes a buffer containing binary DER-encoded PKCS7 signature. The signed data content may be embedded within the buffer or separated. Funtion @@ -115,7 +114,7 @@ typedef struct _EFI_PKCS7_VERIFY_PROTOCOL EFI_PKCS7_VERIFY_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_PKCS7_VERIFY_BUFFER) ( +(EFIAPI *EFI_PKCS7_VERIFY_BUFFER)( IN EFI_PKCS7_VERIFY_PROTOCOL *This, IN VOID *SignedData, IN UINTN SignedDataSize, @@ -196,7 +195,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_PKCS7_VERIFY_SIGNATURE) ( +(EFIAPI *EFI_PKCS7_VERIFY_SIGNATURE)( IN EFI_PKCS7_VERIFY_PROTOCOL *This, IN VOID *Signature, IN UINTN SignatureSize, @@ -214,10 +213,10 @@ EFI_STATUS /// Support of other hash algorithms is optional. /// struct _EFI_PKCS7_VERIFY_PROTOCOL { - EFI_PKCS7_VERIFY_BUFFER VerifyBuffer; - EFI_PKCS7_VERIFY_SIGNATURE VerifySignature; + EFI_PKCS7_VERIFY_BUFFER VerifyBuffer; + EFI_PKCS7_VERIFY_SIGNATURE VerifySignature; }; -extern EFI_GUID gEfiPkcs7VerifyProtocolGuid; +extern EFI_GUID gEfiPkcs7VerifyProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PlatformDriverOverride.h b/MdePkg/Include/Protocol/PlatformDriverOverride.h index 1d260344d1..69798278b0 100644 --- a/MdePkg/Include/Protocol/PlatformDriverOverride.h +++ b/MdePkg/Include/Protocol/PlatformDriverOverride.h @@ -17,7 +17,7 @@ 0x6b30c738, 0xa391, 0x11d4, {0x9a, 0x3b, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ } -typedef struct _EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL; +typedef struct _EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL; // // Prototypes for the Platform Driver Override Protocol @@ -124,11 +124,11 @@ EFI_STATUS /// order from highest precedence to lowest precedence. /// struct _EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL { - EFI_PLATFORM_DRIVER_OVERRIDE_GET_DRIVER GetDriver; - EFI_PLATFORM_DRIVER_OVERRIDE_GET_DRIVER_PATH GetDriverPath; - EFI_PLATFORM_DRIVER_OVERRIDE_DRIVER_LOADED DriverLoaded; + EFI_PLATFORM_DRIVER_OVERRIDE_GET_DRIVER GetDriver; + EFI_PLATFORM_DRIVER_OVERRIDE_GET_DRIVER_PATH GetDriverPath; + EFI_PLATFORM_DRIVER_OVERRIDE_DRIVER_LOADED DriverLoaded; }; -extern EFI_GUID gEfiPlatformDriverOverrideProtocolGuid; +extern EFI_GUID gEfiPlatformDriverOverrideProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PlatformToDriverConfiguration.h b/MdePkg/Include/Protocol/PlatformToDriverConfiguration.h index fdb80f044d..48b83893fe 100644 --- a/MdePkg/Include/Protocol/PlatformToDriverConfiguration.h +++ b/MdePkg/Include/Protocol/PlatformToDriverConfiguration.h @@ -16,10 +16,8 @@ #define EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL_GUID \ { 0x642cd590, 0x8059, 0x4c0a, { 0xa9, 0x58, 0xc5, 0xec, 0x7, 0xd2, 0x3c, 0x4b } } - typedef struct _EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL; - /** The UEFI driver must call Query early in the Start() function before any time consuming operations are performed. If @@ -128,7 +126,7 @@ EFI_STATUS OUT EFI_GUID **ParameterTypeGuid, OUT VOID **ParameterBlock, OUT UINTN *ParameterBlockSize -); + ); typedef enum { /// @@ -141,7 +139,7 @@ typedef enum { /// this controller can be used again with the updated /// configuration settings. /// - EfiPlatformConfigurationActionNone = 0, + EfiPlatformConfigurationActionNone = 0, /// /// The driver has detected that the controller specified @@ -150,7 +148,7 @@ typedef enum { /// DisconnectControservice to perform this operation, and /// it should be performed as soon as possible. /// - EfiPlatformConfigurationActionStopController = 1, + EfiPlatformConfigurationActionStopController = 1, /// /// This controller specified by ControllerHandle needs to @@ -171,7 +169,7 @@ typedef enum { /// delayed until all of the configuration options have /// been set. /// - EfiPlatformConfigurationActionRestartPlatform = 3, + EfiPlatformConfigurationActionRestartPlatform = 3, /// /// The controller specified by ControllerHandle is still @@ -184,7 +182,7 @@ typedef enum { /// configuration settings are not guaranteed to persist /// after ControllerHandle is stopped. /// - EfiPlatformConfigurationActionNvramFailed = 4, + EfiPlatformConfigurationActionNvramFailed = 4, /// /// The controller specified by ControllerHandle is still @@ -198,11 +196,10 @@ typedef enum { /// ParameterTypeGuid is supported by the platform, Query /// should return EFI_NOT_FOUND. /// - EfiPlatformConfigurationActionUnsupportedGuid = 5, + EfiPlatformConfigurationActionUnsupportedGuid = 5, EfiPlatformConfigurationActionMaximum } EFI_PLATFORM_CONFIGURATION_ACTION; - /** The UEFI driver repeatedly calls Query, processes the information returned by the platform, and calls Response passing @@ -264,10 +261,9 @@ EFI_STATUS IN CONST UINTN *Instance, IN CONST EFI_GUID *ParameterTypeGuid, IN CONST VOID *ParameterBlock, - IN CONST UINTN ParameterBlockSize , + IN CONST UINTN ParameterBlockSize, IN CONST EFI_PLATFORM_CONFIGURATION_ACTION ConfigurationAction -); - + ); /// /// The EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL is used by the @@ -282,12 +278,10 @@ EFI_STATUS /// taken. /// struct _EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL { - EFI_PLATFORM_TO_DRIVER_CONFIGURATION_QUERY Query; - EFI_PLATFORM_TO_DRIVER_CONFIGURATION_RESPONSE Response; + EFI_PLATFORM_TO_DRIVER_CONFIGURATION_QUERY Query; + EFI_PLATFORM_TO_DRIVER_CONFIGURATION_RESPONSE Response; }; - - #define EFI_PLATFORM_TO_DRIVER_CONFIGURATION_CLP_GUID \ {0x345ecc0e, 0xcb6, 0x4b75, { 0xbb, 0x57, 0x1b, 0x12, 0x9c, 0x47, 0x33,0x3e } } @@ -304,46 +298,43 @@ struct _EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL { used. **/ typedef struct { - CHAR8 *CLPCommand; ///< A pointer to the null-terminated UTF-8 string that specifies the DMTF SM CLP command - ///< line that the driver is required to parse and process when this function is called. - ///< See the DMTF SM CLP Specification 1.0 Final Standard for details on the - ///< format and syntax of the CLP command line string. CLPCommand buffer - ///< is allocated by the producer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOOL. - UINT32 CLPCommandLength; ///< The length of the CLP Command in bytes. - CHAR8 *CLPReturnString; ///< A pointer to the null-terminated UTF-8 string that indicates the CLP return status - ///< that the driver is required to provide to the calling agent. - ///< The calling agent may parse and/ or pass - ///< this for processing and user feedback. The SM CLP Command Response string - ///< buffer is filled in by the UEFI driver in the "keyword=value" format - ///< described in the SM CLP Specification, unless otherwise requested via the SM - ///< CLP Coutput option in the Command Line string buffer. UEFI driver's support - ///< for this default "keyword=value" output format is required if the UEFI - ///< driver supports this protocol, while support for other SM CLP output - ///< formats is optional (the UEFI Driver should return an EFI_UNSUPPORTED if - ///< the SM CLP Coutput option requested by the caller is not supported by the - ///< UEFI Driver). CLPReturnString buffer is allocated by the consumer of the - ///< EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC OL and undefined prior to the call to - ///< Response(). - UINT32 CLPReturnStringLength; ///< The length of the CLP return status string in bytes. - UINT8 CLPCmdStatus; ///< SM CLP Command Status (see DMTF SM CLP Specification 1.0 Final Standard - - ///< Table 4) CLPErrorValue SM CLP Processing Error Value (see DMTF SM - ///< CLP Specification 1.0 Final Standard - Table 6). This field is filled in by - ///< the consumer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC - ///< OL and undefined prior to the call to Response(). - UINT8 CLPErrorValue; ///< SM CLP Processing Error Value (see DMTF SM CLP Specification 1.0 Final Standard - Table 6). - ///< This field is filled in by the consumer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL and undefined prior to the call to Response(). - UINT16 CLPMsgCode; ///< Bit 15: OEM Message Code Flag 0 = Message Code is an SM CLP Probable - ///< Cause Value. (see SM CLP Specification Table 11) 1 = Message Code is OEM - ///< Specific Bits 14-0: Message Code This field is filled in by the consumer of - ///< the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC OL and undefined prior to the call to - ///< Response(). - + CHAR8 *CLPCommand; ///< A pointer to the null-terminated UTF-8 string that specifies the DMTF SM CLP command + ///< line that the driver is required to parse and process when this function is called. + ///< See the DMTF SM CLP Specification 1.0 Final Standard for details on the + ///< format and syntax of the CLP command line string. CLPCommand buffer + ///< is allocated by the producer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOOL. + UINT32 CLPCommandLength; ///< The length of the CLP Command in bytes. + CHAR8 *CLPReturnString; ///< A pointer to the null-terminated UTF-8 string that indicates the CLP return status + ///< that the driver is required to provide to the calling agent. + ///< The calling agent may parse and/ or pass + ///< this for processing and user feedback. The SM CLP Command Response string + ///< buffer is filled in by the UEFI driver in the "keyword=value" format + ///< described in the SM CLP Specification, unless otherwise requested via the SM + ///< CLP Coutput option in the Command Line string buffer. UEFI driver's support + ///< for this default "keyword=value" output format is required if the UEFI + ///< driver supports this protocol, while support for other SM CLP output + ///< formats is optional (the UEFI Driver should return an EFI_UNSUPPORTED if + ///< the SM CLP Coutput option requested by the caller is not supported by the + ///< UEFI Driver). CLPReturnString buffer is allocated by the consumer of the + ///< EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC OL and undefined prior to the call to + ///< Response(). + UINT32 CLPReturnStringLength; ///< The length of the CLP return status string in bytes. + UINT8 CLPCmdStatus; ///< SM CLP Command Status (see DMTF SM CLP Specification 1.0 Final Standard - + ///< Table 4) CLPErrorValue SM CLP Processing Error Value (see DMTF SM + ///< CLP Specification 1.0 Final Standard - Table 6). This field is filled in by + ///< the consumer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC + ///< OL and undefined prior to the call to Response(). + UINT8 CLPErrorValue; ///< SM CLP Processing Error Value (see DMTF SM CLP Specification 1.0 Final Standard - Table 6). + ///< This field is filled in by the consumer of the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOCOL and undefined prior to the call to Response(). + UINT16 CLPMsgCode; ///< Bit 15: OEM Message Code Flag 0 = Message Code is an SM CLP Probable + ///< Cause Value. (see SM CLP Specification Table 11) 1 = Message Code is OEM + ///< Specific Bits 14-0: Message Code This field is filled in by the consumer of + ///< the EFI_PLATFORM_TO_DRIVER_CONFIGURATION_PROTOC OL and undefined prior to the call to + ///< Response(). } EFI_CONFIGURE_CLP_PARAMETER_BLK; +extern EFI_GUID gEfiPlatformToDriverConfigurationClpGuid; - -extern EFI_GUID gEfiPlatformToDriverConfigurationClpGuid; - -extern EFI_GUID gEfiPlatformToDriverConfigurationProtocolGuid; +extern EFI_GUID gEfiPlatformToDriverConfigurationProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PxeBaseCode.h b/MdePkg/Include/Protocol/PxeBaseCode.h index bf60dd0b1c..11872d602d 100644 --- a/MdePkg/Include/Protocol/PxeBaseCode.h +++ b/MdePkg/Include/Protocol/PxeBaseCode.h @@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent This Protocol is introduced in EFI Specification 1.10. **/ + #ifndef __PXE_BASE_CODE_PROTOCOL_H__ #define __PXE_BASE_CODE_PROTOCOL_H__ @@ -22,94 +23,94 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0x03c4e603, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ } -typedef struct _EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE_PROTOCOL; +typedef struct _EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE_PROTOCOL; /// /// Protocol defined in EFI1.1. /// -typedef EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE; +typedef EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE; /// /// Default IP TTL and ToS. /// -#define DEFAULT_TTL 16 -#define DEFAULT_ToS 0 +#define DEFAULT_TTL 16 +#define DEFAULT_ToS 0 /// /// ICMP error format. /// typedef struct { - UINT8 Type; - UINT8 Code; - UINT16 Checksum; + UINT8 Type; + UINT8 Code; + UINT16 Checksum; union { - UINT32 reserved; - UINT32 Mtu; - UINT32 Pointer; + UINT32 reserved; + UINT32 Mtu; + UINT32 Pointer; struct { - UINT16 Identifier; - UINT16 Sequence; + UINT16 Identifier; + UINT16 Sequence; } Echo; } u; - UINT8 Data[494]; + UINT8 Data[494]; } EFI_PXE_BASE_CODE_ICMP_ERROR; /// /// TFTP error format. /// typedef struct { - UINT8 ErrorCode; - CHAR8 ErrorString[127]; + UINT8 ErrorCode; + CHAR8 ErrorString[127]; } EFI_PXE_BASE_CODE_TFTP_ERROR; /// /// IP Receive Filter definitions. /// -#define EFI_PXE_BASE_CODE_MAX_IPCNT 8 +#define EFI_PXE_BASE_CODE_MAX_IPCNT 8 /// /// IP Receive Filter structure. /// typedef struct { - UINT8 Filters; - UINT8 IpCnt; - UINT16 reserved; - EFI_IP_ADDRESS IpList[EFI_PXE_BASE_CODE_MAX_IPCNT]; + UINT8 Filters; + UINT8 IpCnt; + UINT16 reserved; + EFI_IP_ADDRESS IpList[EFI_PXE_BASE_CODE_MAX_IPCNT]; } EFI_PXE_BASE_CODE_IP_FILTER; -#define EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP 0x0001 -#define EFI_PXE_BASE_CODE_IP_FILTER_BROADCAST 0x0002 -#define EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS 0x0004 -#define EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST 0x0008 +#define EFI_PXE_BASE_CODE_IP_FILTER_STATION_IP 0x0001 +#define EFI_PXE_BASE_CODE_IP_FILTER_BROADCAST 0x0002 +#define EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS 0x0004 +#define EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST 0x0008 /// /// ARP cache entries. /// typedef struct { - EFI_IP_ADDRESS IpAddr; - EFI_MAC_ADDRESS MacAddr; + EFI_IP_ADDRESS IpAddr; + EFI_MAC_ADDRESS MacAddr; } EFI_PXE_BASE_CODE_ARP_ENTRY; /// /// ARP route table entries. /// typedef struct { - EFI_IP_ADDRESS IpAddr; - EFI_IP_ADDRESS SubnetMask; - EFI_IP_ADDRESS GwAddr; + EFI_IP_ADDRESS IpAddr; + EFI_IP_ADDRESS SubnetMask; + EFI_IP_ADDRESS GwAddr; } EFI_PXE_BASE_CODE_ROUTE_ENTRY; // // UDP definitions // -typedef UINT16 EFI_PXE_BASE_CODE_UDP_PORT; +typedef UINT16 EFI_PXE_BASE_CODE_UDP_PORT; -#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP 0x0001 -#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT 0x0002 -#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_IP 0x0004 -#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT 0x0008 -#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_USE_FILTER 0x0010 -#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_MAY_FRAGMENT 0x0020 +#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP 0x0001 +#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT 0x0002 +#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_IP 0x0004 +#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_DEST_PORT 0x0008 +#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_USE_FILTER 0x0010 +#define EFI_PXE_BASE_CODE_UDP_OPFLAGS_MAY_FRAGMENT 0x0020 // // Discover() definitions @@ -136,7 +137,7 @@ typedef UINT16 EFI_PXE_BASE_CODE_UDP_PORT; // 32768 through 65279 are for vendor use // 65280 through 65534 are reserved // -#define EFI_PXE_BASE_CODE_BOOT_TYPE_PXETEST 65535 +#define EFI_PXE_BASE_CODE_BOOT_TYPE_PXETEST 65535 #define EFI_PXE_BASE_CODE_BOOT_LAYER_MASK 0x7FFF #define EFI_PXE_BASE_CODE_BOOT_LAYER_INITIAL 0x0000 @@ -148,39 +149,38 @@ typedef UINT16 EFI_PXE_BASE_CODE_UDP_PORT; // http://www.ietf.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml // #if defined (MDE_CPU_IA32) -#define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE 0x0006 +#define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE 0x0006 #elif defined (MDE_CPU_X64) -#define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE 0x0007 +#define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE 0x0007 #elif defined (MDE_CPU_ARM) -#define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE 0x000A +#define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE 0x000A #elif defined (MDE_CPU_AARCH64) -#define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE 0x000B +#define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE 0x000B #elif defined (MDE_CPU_RISCV64) -#define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE 0x001B +#define EFI_PXE_CLIENT_SYSTEM_ARCHITECTURE 0x001B #endif - /// /// Discover() server list structure. /// typedef struct { - UINT16 Type; - BOOLEAN AcceptAnyResponse; - UINT8 Reserved; - EFI_IP_ADDRESS IpAddr; + UINT16 Type; + BOOLEAN AcceptAnyResponse; + UINT8 Reserved; + EFI_IP_ADDRESS IpAddr; } EFI_PXE_BASE_CODE_SRVLIST; /// /// Discover() information override structure. /// typedef struct { - BOOLEAN UseMCast; - BOOLEAN UseBCast; - BOOLEAN UseUCast; - BOOLEAN MustUseList; - EFI_IP_ADDRESS ServerMCastIp; - UINT16 IpCnt; - EFI_PXE_BASE_CODE_SRVLIST SrvList[1]; + BOOLEAN UseMCast; + BOOLEAN UseBCast; + BOOLEAN UseUCast; + BOOLEAN MustUseList; + EFI_IP_ADDRESS ServerMCastIp; + UINT16 IpCnt; + EFI_PXE_BASE_CODE_SRVLIST SrvList[1]; } EFI_PXE_BASE_CODE_DISCOVER_INFO; /// @@ -204,58 +204,58 @@ typedef enum { /// perform the "get file size" and "read directory" operations of MTFTP. /// typedef struct { - EFI_IP_ADDRESS MCastIp; - EFI_PXE_BASE_CODE_UDP_PORT CPort; - EFI_PXE_BASE_CODE_UDP_PORT SPort; - UINT16 ListenTimeout; - UINT16 TransmitTimeout; + EFI_IP_ADDRESS MCastIp; + EFI_PXE_BASE_CODE_UDP_PORT CPort; + EFI_PXE_BASE_CODE_UDP_PORT SPort; + UINT16 ListenTimeout; + UINT16 TransmitTimeout; } EFI_PXE_BASE_CODE_MTFTP_INFO; /// /// DHCPV4 Packet structure. /// typedef struct { - UINT8 BootpOpcode; - UINT8 BootpHwType; - UINT8 BootpHwAddrLen; - UINT8 BootpGateHops; - UINT32 BootpIdent; - UINT16 BootpSeconds; - UINT16 BootpFlags; - UINT8 BootpCiAddr[4]; - UINT8 BootpYiAddr[4]; - UINT8 BootpSiAddr[4]; - UINT8 BootpGiAddr[4]; - UINT8 BootpHwAddr[16]; - UINT8 BootpSrvName[64]; - UINT8 BootpBootFile[128]; - UINT32 DhcpMagik; - UINT8 DhcpOptions[56]; + UINT8 BootpOpcode; + UINT8 BootpHwType; + UINT8 BootpHwAddrLen; + UINT8 BootpGateHops; + UINT32 BootpIdent; + UINT16 BootpSeconds; + UINT16 BootpFlags; + UINT8 BootpCiAddr[4]; + UINT8 BootpYiAddr[4]; + UINT8 BootpSiAddr[4]; + UINT8 BootpGiAddr[4]; + UINT8 BootpHwAddr[16]; + UINT8 BootpSrvName[64]; + UINT8 BootpBootFile[128]; + UINT32 DhcpMagik; + UINT8 DhcpOptions[56]; } EFI_PXE_BASE_CODE_DHCPV4_PACKET; /// /// DHCPV6 Packet structure. /// typedef struct { - UINT32 MessageType:8; - UINT32 TransactionId:24; - UINT8 DhcpOptions[1024]; + UINT32 MessageType : 8; + UINT32 TransactionId : 24; + UINT8 DhcpOptions[1024]; } EFI_PXE_BASE_CODE_DHCPV6_PACKET; /// /// Packet structure. /// typedef union { - UINT8 Raw[1472]; - EFI_PXE_BASE_CODE_DHCPV4_PACKET Dhcpv4; - EFI_PXE_BASE_CODE_DHCPV6_PACKET Dhcpv6; + UINT8 Raw[1472]; + EFI_PXE_BASE_CODE_DHCPV4_PACKET Dhcpv4; + EFI_PXE_BASE_CODE_DHCPV6_PACKET Dhcpv6; } EFI_PXE_BASE_CODE_PACKET; // // PXE Base Code Mode structure // -#define EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES 8 -#define EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES 8 +#define EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES 8 +#define EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES 8 /// /// EFI_PXE_BASE_CODE_MODE. @@ -264,40 +264,40 @@ typedef union { /// EFI_PXE_BASE_CODE_PROTOCOL functions. /// typedef struct { - BOOLEAN Started; - BOOLEAN Ipv6Available; - BOOLEAN Ipv6Supported; - BOOLEAN UsingIpv6; - BOOLEAN BisSupported; - BOOLEAN BisDetected; - BOOLEAN AutoArp; - BOOLEAN SendGUID; - BOOLEAN DhcpDiscoverValid; - BOOLEAN DhcpAckReceived; - BOOLEAN ProxyOfferReceived; - BOOLEAN PxeDiscoverValid; - BOOLEAN PxeReplyReceived; - BOOLEAN PxeBisReplyReceived; - BOOLEAN IcmpErrorReceived; - BOOLEAN TftpErrorReceived; - BOOLEAN MakeCallbacks; - UINT8 TTL; - UINT8 ToS; - EFI_IP_ADDRESS StationIp; - EFI_IP_ADDRESS SubnetMask; - EFI_PXE_BASE_CODE_PACKET DhcpDiscover; - EFI_PXE_BASE_CODE_PACKET DhcpAck; - EFI_PXE_BASE_CODE_PACKET ProxyOffer; - EFI_PXE_BASE_CODE_PACKET PxeDiscover; - EFI_PXE_BASE_CODE_PACKET PxeReply; - EFI_PXE_BASE_CODE_PACKET PxeBisReply; - EFI_PXE_BASE_CODE_IP_FILTER IpFilter; - UINT32 ArpCacheEntries; - EFI_PXE_BASE_CODE_ARP_ENTRY ArpCache[EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES]; - UINT32 RouteTableEntries; - EFI_PXE_BASE_CODE_ROUTE_ENTRY RouteTable[EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES]; - EFI_PXE_BASE_CODE_ICMP_ERROR IcmpError; - EFI_PXE_BASE_CODE_TFTP_ERROR TftpError; + BOOLEAN Started; + BOOLEAN Ipv6Available; + BOOLEAN Ipv6Supported; + BOOLEAN UsingIpv6; + BOOLEAN BisSupported; + BOOLEAN BisDetected; + BOOLEAN AutoArp; + BOOLEAN SendGUID; + BOOLEAN DhcpDiscoverValid; + BOOLEAN DhcpAckReceived; + BOOLEAN ProxyOfferReceived; + BOOLEAN PxeDiscoverValid; + BOOLEAN PxeReplyReceived; + BOOLEAN PxeBisReplyReceived; + BOOLEAN IcmpErrorReceived; + BOOLEAN TftpErrorReceived; + BOOLEAN MakeCallbacks; + UINT8 TTL; + UINT8 ToS; + EFI_IP_ADDRESS StationIp; + EFI_IP_ADDRESS SubnetMask; + EFI_PXE_BASE_CODE_PACKET DhcpDiscover; + EFI_PXE_BASE_CODE_PACKET DhcpAck; + EFI_PXE_BASE_CODE_PACKET ProxyOffer; + EFI_PXE_BASE_CODE_PACKET PxeDiscover; + EFI_PXE_BASE_CODE_PACKET PxeReply; + EFI_PXE_BASE_CODE_PACKET PxeBisReply; + EFI_PXE_BASE_CODE_IP_FILTER IpFilter; + UINT32 ArpCacheEntries; + EFI_PXE_BASE_CODE_ARP_ENTRY ArpCache[EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES]; + UINT32 RouteTableEntries; + EFI_PXE_BASE_CODE_ROUTE_ENTRY RouteTable[EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES]; + EFI_PXE_BASE_CODE_ICMP_ERROR IcmpError; + EFI_PXE_BASE_CODE_TFTP_ERROR TftpError; } EFI_PXE_BASE_CODE_MODE; // @@ -885,7 +885,7 @@ EFI_STATUS // // PXE Base Code Protocol structure // -#define EFI_PXE_BASE_CODE_PROTOCOL_REVISION 0x00010000 +#define EFI_PXE_BASE_CODE_PROTOCOL_REVISION 0x00010000 // // Revision defined in EFI1.1 @@ -906,25 +906,25 @@ struct _EFI_PXE_BASE_CODE_PROTOCOL { /// be backwards compatible. If a future version is not backwards compatible /// it is not the same GUID. /// - UINT64 Revision; - EFI_PXE_BASE_CODE_START Start; - EFI_PXE_BASE_CODE_STOP Stop; - EFI_PXE_BASE_CODE_DHCP Dhcp; - EFI_PXE_BASE_CODE_DISCOVER Discover; - EFI_PXE_BASE_CODE_MTFTP Mtftp; - EFI_PXE_BASE_CODE_UDP_WRITE UdpWrite; - EFI_PXE_BASE_CODE_UDP_READ UdpRead; - EFI_PXE_BASE_CODE_SET_IP_FILTER SetIpFilter; - EFI_PXE_BASE_CODE_ARP Arp; - EFI_PXE_BASE_CODE_SET_PARAMETERS SetParameters; - EFI_PXE_BASE_CODE_SET_STATION_IP SetStationIp; - EFI_PXE_BASE_CODE_SET_PACKETS SetPackets; + UINT64 Revision; + EFI_PXE_BASE_CODE_START Start; + EFI_PXE_BASE_CODE_STOP Stop; + EFI_PXE_BASE_CODE_DHCP Dhcp; + EFI_PXE_BASE_CODE_DISCOVER Discover; + EFI_PXE_BASE_CODE_MTFTP Mtftp; + EFI_PXE_BASE_CODE_UDP_WRITE UdpWrite; + EFI_PXE_BASE_CODE_UDP_READ UdpRead; + EFI_PXE_BASE_CODE_SET_IP_FILTER SetIpFilter; + EFI_PXE_BASE_CODE_ARP Arp; + EFI_PXE_BASE_CODE_SET_PARAMETERS SetParameters; + EFI_PXE_BASE_CODE_SET_STATION_IP SetStationIp; + EFI_PXE_BASE_CODE_SET_PACKETS SetPackets; /// /// The pointer to the EFI_PXE_BASE_CODE_MODE data for this device. /// - EFI_PXE_BASE_CODE_MODE *Mode; + EFI_PXE_BASE_CODE_MODE *Mode; }; -extern EFI_GUID gEfiPxeBaseCodeProtocolGuid; +extern EFI_GUID gEfiPxeBaseCodeProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h b/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h index 505515d617..65b3220698 100644 --- a/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h +++ b/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h @@ -24,7 +24,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// UEFI Revision Number Definition. /// -#define EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION 0x00010000 +#define EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION 0x00010000 /// /// EFI 1.1 Revision Number defintion. @@ -35,12 +35,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// UEFI Protocol name. /// -typedef struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL; +typedef struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL; /// /// EFI1.1 Protocol name. /// -typedef EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK; +typedef EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK; /// /// Event type list for PXE Base Code Protocol function. @@ -114,11 +114,10 @@ struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL { /// be backwards compatible. If a future version is not backwards compatible /// it is not the same GUID. /// - UINT64 Revision; - EFI_PXE_CALLBACK Callback; + UINT64 Revision; + EFI_PXE_CALLBACK Callback; }; -extern EFI_GUID gEfiPxeBaseCodeCallbackProtocolGuid; +extern EFI_GUID gEfiPxeBaseCodeCallbackProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/RamDisk.h b/MdePkg/Include/Protocol/RamDisk.h index a0512af0c0..2ab5a5e5e1 100644 --- a/MdePkg/Include/Protocol/RamDisk.h +++ b/MdePkg/Include/Protocol/RamDisk.h @@ -21,7 +21,7 @@ // // Forward reference for pure ANSI compatability // -typedef struct _EFI_RAM_DISK_PROTOCOL EFI_RAM_DISK_PROTOCOL; +typedef struct _EFI_RAM_DISK_PROTOCOL EFI_RAM_DISK_PROTOCOL; /** Register a RAM disk with specified address, size and type. @@ -55,7 +55,7 @@ typedef struct _EFI_RAM_DISK_PROTOCOL EFI_RAM_DISK_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_RAM_DISK_REGISTER_RAMDISK) ( +(EFIAPI *EFI_RAM_DISK_REGISTER_RAMDISK)( IN UINT64 RamDiskBase, IN UINT64 RamDiskSize, IN EFI_GUID *RamDiskType, @@ -80,7 +80,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_RAM_DISK_UNREGISTER_RAMDISK) ( +(EFIAPI *EFI_RAM_DISK_UNREGISTER_RAMDISK)( IN EFI_DEVICE_PATH_PROTOCOL *DevicePath ); @@ -88,13 +88,13 @@ EFI_STATUS /// RAM Disk Protocol structure. /// struct _EFI_RAM_DISK_PROTOCOL { - EFI_RAM_DISK_REGISTER_RAMDISK Register; - EFI_RAM_DISK_UNREGISTER_RAMDISK Unregister; + EFI_RAM_DISK_REGISTER_RAMDISK Register; + EFI_RAM_DISK_UNREGISTER_RAMDISK Unregister; }; /// /// RAM Disk Protocol GUID variable. /// -extern EFI_GUID gEfiRamDiskProtocolGuid; +extern EFI_GUID gEfiRamDiskProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/RealTimeClock.h b/MdePkg/Include/Protocol/RealTimeClock.h index cf1a9a7338..f300f5eefa 100644 --- a/MdePkg/Include/Protocol/RealTimeClock.h +++ b/MdePkg/Include/Protocol/RealTimeClock.h @@ -25,6 +25,6 @@ #define EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL_GUID \ { 0x27CFAC87, 0x46CC, 0x11d4, {0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D } } -extern EFI_GUID gEfiRealTimeClockArchProtocolGuid; +extern EFI_GUID gEfiRealTimeClockArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/RedfishDiscover.h b/MdePkg/Include/Protocol/RedfishDiscover.h index 8dbb70b082..70b83eb4b4 100644 --- a/MdePkg/Include/Protocol/RedfishDiscover.h +++ b/MdePkg/Include/Protocol/RedfishDiscover.h @@ -22,15 +22,15 @@ 0x5db12509, 0x4550, 0x4347, { 0x96, 0xb3, 0x73, 0xc0, 0xff, 0x6e, 0x86, 0x9f } \ } -#define REDFISH_DISCOVER_TOKEN_SIGNATURE SIGNATURE_32 ('R', 'F', 'T', 'S') +#define REDFISH_DISCOVER_TOKEN_SIGNATURE SIGNATURE_32 ('R', 'F', 'T', 'S') typedef UINT32 EFI_REDFISH_DISCOVER_FLAG; -#define EFI_REDFISH_DISCOVER_HOST_INTERFACE 0x00000001 ///< Discover Redfish server reported in SMBIOS 42h. -#define EFI_REDFISH_DISCOVER_SSDP 0x00000002 ///< Discover Redfish server using UPnP Http search method. -#define EFI_REDFISH_DISCOVER_SSDP_UDP6 0x00000004 ///< Use UDP version 6. -#define EFI_REDFISH_DISCOVER_KEEP_ALIVE 0x00000008 ///< Keep to send UPnP Search in the duration indicated in - ///< EFI_REDFISH_DISCOVER_DURATION_MASK. -#define EFI_REDFISH_DISCOVER_RENEW 0x00000010 ///< Set this bit to indicate this function to notify the caller +#define EFI_REDFISH_DISCOVER_HOST_INTERFACE 0x00000001 ///< Discover Redfish server reported in SMBIOS 42h. +#define EFI_REDFISH_DISCOVER_SSDP 0x00000002 ///< Discover Redfish server using UPnP Http search method. +#define EFI_REDFISH_DISCOVER_SSDP_UDP6 0x00000004 ///< Use UDP version 6. +#define EFI_REDFISH_DISCOVER_KEEP_ALIVE 0x00000008 ///< Keep to send UPnP Search in the duration indicated in + ///< EFI_REDFISH_DISCOVER_DURATION_MASK. +#define EFI_REDFISH_DISCOVER_RENEW 0x00000010 ///< Set this bit to indicate this function to notify the caller ///< a list of all Redfish servers it found. Otherwise, this fucntion ///< just notify the caller new found Redfish servers. ///< @@ -56,37 +56,37 @@ typedef struct { } EFI_REDFISH_DISCOVERED_INFORMATION; typedef struct { - EFI_STATUS Status; ///< Status of Redfish service discovery. - EFI_REDFISH_DISCOVERED_INFORMATION Information; ///< Redfish service discovered. + EFI_STATUS Status; ///< Status of Redfish service discovery. + EFI_REDFISH_DISCOVERED_INFORMATION Information; ///< Redfish service discovered. } EFI_REDFISH_DISCOVERED_INSTANCE; typedef struct { - UINTN NumberOfServiceFound; ///< Must be 0 when pass to Acquire (). - EFI_REDFISH_DISCOVERED_INSTANCE *RedfishInstances; ///< Must be NULL when pass to Acquire (). + UINTN NumberOfServiceFound; ///< Must be 0 when pass to Acquire (). + EFI_REDFISH_DISCOVERED_INSTANCE *RedfishInstances; ///< Must be NULL when pass to Acquire (). } EFI_REDFISH_DISCOVERED_LIST; typedef struct { - EFI_MAC_ADDRESS MacAddress; ///< MAC address of network interfase to discover Redfish service. - BOOLEAN IsIpv6; ///< Indicates it's IP versino 6. - EFI_IP_ADDRESS SubnetId; ///< Subnet ID. - UINT8 SubnetPrefixLength; ///< Subnet prefix-length for IPv4 and IPv6. - UINT16 VlanId; ///< VLAN ID. + EFI_MAC_ADDRESS MacAddress; ///< MAC address of network interfase to discover Redfish service. + BOOLEAN IsIpv6; ///< Indicates it's IP versino 6. + EFI_IP_ADDRESS SubnetId; ///< Subnet ID. + UINT8 SubnetPrefixLength; ///< Subnet prefix-length for IPv4 and IPv6. + UINT16 VlanId; ///< VLAN ID. } EFI_REDFISH_DISCOVER_NETWORK_INTERFACE; typedef struct { - UINT32 Signature; ///< Token signature. - EFI_REDFISH_DISCOVERED_LIST DiscoverList; ///< The memory of EFI_REDFISH_DISCOVERED_LIST is - ///< allocated by Acquire() and freed when caller invoke Release(). - EFI_EVENT Event; ///< The TPL_CALLBACK event to be notified when Redfish services - ///< are discovered or any errors occurred during discovery. - UINTN Timeout; ///< The timeout value declared in EFI_REDFISH_DISCOVERED_TOKEN - ///< determines the seconds to drop discover process. - ///< Basically, the nearby Redfish services must response in >=1 - ///< and <= 5 seconds. The valid timeout value used to have - ///< asynchronous discovery is >= 1 and <= 5 seconds. Set the - ///< timeout to zero means to discover Redfish service synchronously. - ///< Event in token is created by caller to listen the Reefish services - ///< found by Acquire(). + UINT32 Signature; ///< Token signature. + EFI_REDFISH_DISCOVERED_LIST DiscoverList; ///< The memory of EFI_REDFISH_DISCOVERED_LIST is + ///< allocated by Acquire() and freed when caller invoke Release(). + EFI_EVENT Event; ///< The TPL_CALLBACK event to be notified when Redfish services + ///< are discovered or any errors occurred during discovery. + UINTN Timeout; ///< The timeout value declared in EFI_REDFISH_DISCOVERED_TOKEN + ///< determines the seconds to drop discover process. + ///< Basically, the nearby Redfish services must response in >=1 + ///< and <= 5 seconds. The valid timeout value used to have + ///< asynchronous discovery is >= 1 and <= 5 seconds. Set the + ///< timeout to zero means to discover Redfish service synchronously. + ///< Event in token is created by caller to listen the Reefish services + ///< found by Acquire(). } EFI_REDFISH_DISCOVERED_TOKEN; /** @@ -112,7 +112,7 @@ EFI_STATUS IN EFI_HANDLE ImageHandle, OUT UINTN *NumberOfNetworkInterfaces, OUT EFI_REDFISH_DISCOVER_NETWORK_INTERFACE **NetworkInterfaces -); + ); /** This function acquires Redfish services by discovering static Redfish setting @@ -146,7 +146,7 @@ EFI_STATUS IN EFI_REDFISH_DISCOVER_NETWORK_INTERFACE *TargetNetworkInterface OPTIONAL, IN EFI_REDFISH_DISCOVER_FLAG Flags, IN EFI_REDFISH_DISCOVERED_TOKEN *Token -); + ); /** This function aborts Redfish service discovery on the given network interface. @@ -163,7 +163,7 @@ EFI_STATUS (EFIAPI *EFI_REDFISH_DISCOVER_ABORT_ACQUIRE)( IN EFI_REDFISH_DISCOVER_PROTOCOL *This, IN EFI_REDFISH_DISCOVER_NETWORK_INTERFACE *TargetNetworkInterface OPTIONAL -); + ); /** This function releases Redfish services found by RedfishServiceAcquire(). @@ -180,14 +180,14 @@ EFI_STATUS (EFIAPI *EFI_REDFISH_DISCOVER_RELEASE_SERVICE)( IN EFI_REDFISH_DISCOVER_PROTOCOL *This, IN EFI_REDFISH_DISCOVERED_LIST *List -); + ); struct _EFI_REDFISH_DISCOVER_PROTOCOL { - EFI_REDFISH_DISCOVER_NETWORK_LIST GetNetworkInterfaceList; - EFI_REDFISH_DISCOVER_ACQUIRE_SERVICE AcquireRedfishService; - EFI_REDFISH_DISCOVER_ABORT_ACQUIRE AbortAcquireRedfishService; - EFI_REDFISH_DISCOVER_RELEASE_SERVICE ReleaseRedfishService; + EFI_REDFISH_DISCOVER_NETWORK_LIST GetNetworkInterfaceList; + EFI_REDFISH_DISCOVER_ACQUIRE_SERVICE AcquireRedfishService; + EFI_REDFISH_DISCOVER_ABORT_ACQUIRE AbortAcquireRedfishService; + EFI_REDFISH_DISCOVER_RELEASE_SERVICE ReleaseRedfishService; }; -extern EFI_GUID gEfiRedfishDiscoverProtocolGuid; +extern EFI_GUID gEfiRedfishDiscoverProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/RegularExpressionProtocol.h b/MdePkg/Include/Protocol/RegularExpressionProtocol.h index ac4f98270a..ca05be8ef1 100644 --- a/MdePkg/Include/Protocol/RegularExpressionProtocol.h +++ b/MdePkg/Include/Protocol/RegularExpressionProtocol.h @@ -33,14 +33,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0x9A473A4A, 0x4CEB, 0xB95A, {0x41, 0x5E, 0x5B, 0xA0, 0xBC, 0x63, 0x9B, 0x2E } \ } -typedef struct _EFI_REGULAR_EXPRESSION_PROTOCOL EFI_REGULAR_EXPRESSION_PROTOCOL; - +typedef struct _EFI_REGULAR_EXPRESSION_PROTOCOL EFI_REGULAR_EXPRESSION_PROTOCOL; typedef struct { - CONST CHAR16 *CapturePtr; // Pointer to the start of the captured sub-expression - // within matched String. + CONST CHAR16 *CapturePtr; // Pointer to the start of the captured sub-expression + // within matched String. - UINTN Length; // Length of captured sub-expression. + UINTN Length; // Length of captured sub-expression. } EFI_REGEX_CAPTURE; typedef EFI_GUID EFI_REGEX_SYNTAX_TYPE; @@ -48,6 +47,7 @@ typedef EFI_GUID EFI_REGEX_SYNTAX_TYPE; // // Protocol member functions // + /** Returns information about the regular expression syntax types supported by the implementation. @@ -82,7 +82,7 @@ typedef EFI_GUID EFI_REGEX_SYNTAX_TYPE; **/ typedef EFI_STATUS -(EFIAPI *EFI_REGULAR_EXPRESSION_GET_INFO) ( +(EFIAPI *EFI_REGULAR_EXPRESSION_GET_INFO)( IN EFI_REGULAR_EXPRESSION_PROTOCOL *This, IN OUT UINTN *RegExSyntaxTypeListSize, OUT EFI_REGEX_SYNTAX_TYPE *RegExSyntaxTypeList @@ -139,7 +139,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_REGULAR_EXPRESSION_MATCH) ( +(EFIAPI *EFI_REGULAR_EXPRESSION_MATCH)( IN EFI_REGULAR_EXPRESSION_PROTOCOL *This, IN CHAR16 *String, IN CHAR16 *Pattern, @@ -150,26 +150,26 @@ EFI_STATUS ); struct _EFI_REGULAR_EXPRESSION_PROTOCOL { - EFI_REGULAR_EXPRESSION_MATCH MatchString; - EFI_REGULAR_EXPRESSION_GET_INFO GetInfo; -} ; + EFI_REGULAR_EXPRESSION_MATCH MatchString; + EFI_REGULAR_EXPRESSION_GET_INFO GetInfo; +}; -extern EFI_GUID gEfiRegularExpressionProtocolGuid; +extern EFI_GUID gEfiRegularExpressionProtocolGuid; // // For regular expression rules specified in the POSIX Extended Regular // Expression (ERE) Syntax: // -extern EFI_GUID gEfiRegexSyntaxTypePosixExtendedGuid; +extern EFI_GUID gEfiRegexSyntaxTypePosixExtendedGuid; // // For regular expression rules specifiedin the ECMA 262 Specification // -extern EFI_GUID gEfiRegexSyntaxTypeEcma262Guid; +extern EFI_GUID gEfiRegexSyntaxTypeEcma262Guid; // // For regular expression rules specified in the Perl standard: // -extern EFI_GUID gEfiRegexSyntaxTypePerlGuid; +extern EFI_GUID gEfiRegexSyntaxTypePerlGuid; #endif diff --git a/MdePkg/Include/Protocol/ReportStatusCodeHandler.h b/MdePkg/Include/Protocol/ReportStatusCodeHandler.h index 1b21d2d223..e77274cbd2 100644 --- a/MdePkg/Include/Protocol/ReportStatusCodeHandler.h +++ b/MdePkg/Include/Protocol/ReportStatusCodeHandler.h @@ -26,7 +26,7 @@ EFI_STATUS IN UINT32 Instance, IN EFI_GUID *CallerId, IN EFI_STATUS_CODE_DATA *Data -); + ); /** Register the callback function for ReportStatusCode() notification. @@ -60,7 +60,7 @@ EFI_STATUS (EFIAPI *EFI_RSC_HANDLER_REGISTER)( IN EFI_RSC_HANDLER_CALLBACK Callback, IN EFI_TPL Tpl -); + ); /** Remove a previously registered callback function from the notification list. @@ -79,13 +79,13 @@ typedef EFI_STATUS (EFIAPI *EFI_RSC_HANDLER_UNREGISTER)( IN EFI_RSC_HANDLER_CALLBACK Callback -); + ); typedef struct { - EFI_RSC_HANDLER_REGISTER Register; - EFI_RSC_HANDLER_UNREGISTER Unregister; + EFI_RSC_HANDLER_REGISTER Register; + EFI_RSC_HANDLER_UNREGISTER Unregister; } EFI_RSC_HANDLER_PROTOCOL; -extern EFI_GUID gEfiRscHandlerProtocolGuid; +extern EFI_GUID gEfiRscHandlerProtocolGuid; #endif // __REPORT_STATUS_CODE_HANDLER_H__ diff --git a/MdePkg/Include/Protocol/Reset.h b/MdePkg/Include/Protocol/Reset.h index 78ae63aa11..adf9bdd573 100644 --- a/MdePkg/Include/Protocol/Reset.h +++ b/MdePkg/Include/Protocol/Reset.h @@ -20,6 +20,6 @@ #define EFI_RESET_ARCH_PROTOCOL_GUID \ { 0x27CFAC88, 0x46CC, 0x11d4, {0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D } } -extern EFI_GUID gEfiResetArchProtocolGuid; +extern EFI_GUID gEfiResetArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/ResetNotification.h b/MdePkg/Include/Protocol/ResetNotification.h index 26f8a33858..f72a8269b0 100644 --- a/MdePkg/Include/Protocol/ResetNotification.h +++ b/MdePkg/Include/Protocol/ResetNotification.h @@ -41,10 +41,10 @@ typedef struct _EFI_RESET_NOTIFICATION_PROTOCOL EFI_RESET_NOTIFICATION_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_REGISTER_RESET_NOTIFY) ( +(EFIAPI *EFI_REGISTER_RESET_NOTIFY)( IN EFI_RESET_NOTIFICATION_PROTOCOL *This, IN EFI_RESET_SYSTEM ResetFunction -); + ); /** Unregister a notification function. @@ -63,18 +63,16 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_UNREGISTER_RESET_NOTIFY) ( +(EFIAPI *EFI_UNREGISTER_RESET_NOTIFY)( IN EFI_RESET_NOTIFICATION_PROTOCOL *This, IN EFI_RESET_SYSTEM ResetFunction -); + ); struct _EFI_RESET_NOTIFICATION_PROTOCOL { - EFI_REGISTER_RESET_NOTIFY RegisterResetNotify; - EFI_UNREGISTER_RESET_NOTIFY UnregisterResetNotify; + EFI_REGISTER_RESET_NOTIFY RegisterResetNotify; + EFI_UNREGISTER_RESET_NOTIFY UnregisterResetNotify; }; - -extern EFI_GUID gEfiResetNotificationProtocolGuid; +extern EFI_GUID gEfiResetNotificationProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/Rest.h b/MdePkg/Include/Protocol/Rest.h index e54710ccc7..8da6ed73be 100644 --- a/MdePkg/Include/Protocol/Rest.h +++ b/MdePkg/Include/Protocol/Rest.h @@ -43,7 +43,7 @@ typedef struct _EFI_REST_PROTOCOL EFI_REST_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_REST_SEND_RECEIVE) ( +(EFIAPI *EFI_REST_SEND_RECEIVE)( IN EFI_REST_PROTOCOL *This, IN EFI_HTTP_MESSAGE *RequestMessage, OUT EFI_HTTP_MESSAGE *ResponseMessage @@ -66,7 +66,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_REST_GET_TIME) ( +(EFIAPI *EFI_REST_GET_TIME)( IN EFI_REST_PROTOCOL *This, OUT EFI_TIME *Time ); @@ -79,10 +79,10 @@ EFI_STATUS /// interfaces that abstract HTTP access to the resources. /// struct _EFI_REST_PROTOCOL { - EFI_REST_SEND_RECEIVE SendReceive; - EFI_REST_GET_TIME GetServiceTime; + EFI_REST_SEND_RECEIVE SendReceive; + EFI_REST_GET_TIME GetServiceTime; }; -extern EFI_GUID gEfiRestProtocolGuid; +extern EFI_GUID gEfiRestProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/RestEx.h b/MdePkg/Include/Protocol/RestEx.h index dc1b4381b9..e9bc7be94f 100644 --- a/MdePkg/Include/Protocol/RestEx.h +++ b/MdePkg/Include/Protocol/RestEx.h @@ -21,7 +21,7 @@ #include // -//GUID definitions +// GUID definitions // #define EFI_REST_EX_SERVICE_BINDING_PROTOCOL_GUID \ { \ @@ -35,25 +35,25 @@ typedef struct _EFI_REST_EX_PROTOCOL EFI_REST_EX_PROTOCOL; -//******************************************************* -//EFI_REST_EX_SERVICE_INFO_VER -//******************************************************* +// ******************************************************* +// EFI_REST_EX_SERVICE_INFO_VER +// ******************************************************* typedef struct { - UINT8 Major; - UINT8 Minor; + UINT8 Major; + UINT8 Minor; } EFI_REST_EX_SERVICE_INFO_VER; -//******************************************************* -//EFI_REST_EX_SERVICE_INFO_HEADER -//******************************************************* +// ******************************************************* +// EFI_REST_EX_SERVICE_INFO_HEADER +// ******************************************************* typedef struct { - UINT32 Length; - EFI_REST_EX_SERVICE_INFO_VER RestServiceInfoVer; + UINT32 Length; + EFI_REST_EX_SERVICE_INFO_VER RestServiceInfoVer; } EFI_REST_EX_SERVICE_INFO_HEADER; -//******************************************************* +// ******************************************************* // EFI_REST_EX_SERVICE_TYPE -//******************************************************* +// ******************************************************* typedef enum { EfiRestExServiceUnspecific = 1, EfiRestExServiceRedfish, @@ -62,66 +62,66 @@ typedef enum { EfiRestExServiceTypeMax } EFI_REST_EX_SERVICE_TYPE; -//******************************************************* +// ******************************************************* // EFI_REST_EX_SERVICE_ACCESS_MODE -//******************************************************* +// ******************************************************* typedef enum { - EfiRestExServiceInBandAccess = 1, + EfiRestExServiceInBandAccess = 1, EfiRestExServiceOutOfBandAccess = 2, EfiRestExServiceModeMax } EFI_REST_EX_SERVICE_ACCESS_MODE; -//******************************************************* +// ******************************************************* // EFI_REST_EX_CONFIG_TYPE -//******************************************************* +// ******************************************************* typedef enum { EfiRestExConfigHttp, EfiRestExConfigUnspecific, EfiRestExConfigTypeMax } EFI_REST_EX_CONFIG_TYPE; -//******************************************************* -//EFI_REST_EX_SERVICE_INFO v1.0 -//******************************************************* +// ******************************************************* +// EFI_REST_EX_SERVICE_INFO v1.0 +// ******************************************************* typedef struct { - EFI_REST_EX_SERVICE_INFO_HEADER EfiRestExServiceInfoHeader; - EFI_REST_EX_SERVICE_TYPE RestServiceType; - EFI_REST_EX_SERVICE_ACCESS_MODE RestServiceAccessMode; - EFI_GUID VendorRestServiceName; - UINT32 VendorSpecificDataLength; - UINT8 *VendorSpecifcData; - EFI_REST_EX_CONFIG_TYPE RestExConfigType; - UINT8 RestExConfigDataLength; + EFI_REST_EX_SERVICE_INFO_HEADER EfiRestExServiceInfoHeader; + EFI_REST_EX_SERVICE_TYPE RestServiceType; + EFI_REST_EX_SERVICE_ACCESS_MODE RestServiceAccessMode; + EFI_GUID VendorRestServiceName; + UINT32 VendorSpecificDataLength; + UINT8 *VendorSpecifcData; + EFI_REST_EX_CONFIG_TYPE RestExConfigType; + UINT8 RestExConfigDataLength; } EFI_REST_EX_SERVICE_INFO_V_1_0; -//******************************************************* -//EFI_REST_EX_SERVICE_INFO -//******************************************************* +// ******************************************************* +// EFI_REST_EX_SERVICE_INFO +// ******************************************************* typedef union { - EFI_REST_EX_SERVICE_INFO_HEADER EfiRestExServiceInfoHeader; - EFI_REST_EX_SERVICE_INFO_V_1_0 EfiRestExServiceInfoV10; + EFI_REST_EX_SERVICE_INFO_HEADER EfiRestExServiceInfoHeader; + EFI_REST_EX_SERVICE_INFO_V_1_0 EfiRestExServiceInfoV10; } EFI_REST_EX_SERVICE_INFO; -//******************************************************* +// ******************************************************* // EFI_REST_EX_HTTP_CONFIG_DATA -//******************************************************* +// ******************************************************* typedef struct { EFI_HTTP_CONFIG_DATA HttpConfigData; UINT32 SendReceiveTimeout; } EFI_REST_EX_HTTP_CONFIG_DATA; -//******************************************************* -//EFI_REST_EX_CONFIG_DATA -//******************************************************* +// ******************************************************* +// EFI_REST_EX_CONFIG_DATA +// ******************************************************* typedef UINT8 *EFI_REST_EX_CONFIG_DATA; -//******************************************************* -//EFI_REST_EX_TOKEN -//******************************************************* +// ******************************************************* +// EFI_REST_EX_TOKEN +// ******************************************************* typedef struct { - EFI_EVENT Event; - EFI_STATUS Status; - EFI_HTTP_MESSAGE *ResponseMessage; + EFI_EVENT Event; + EFI_STATUS Status; + EFI_HTTP_MESSAGE *ResponseMessage; } EFI_REST_EX_TOKEN; /** @@ -361,7 +361,7 @@ EFI_STATUS IN EFI_REST_EX_PROTOCOL *This, IN EFI_HTTP_MESSAGE *RequestMessage OPTIONAL, IN EFI_REST_EX_TOKEN *RestExToken -); + ); /// /// EFI REST(EX) protocols are designed to support REST communication between EFI REST client @@ -375,16 +375,16 @@ EFI_STATUS /// interface after the corresponding configuration is initialized. /// struct _EFI_REST_EX_PROTOCOL { - EFI_REST_SEND_RECEIVE SendReceive; - EFI_REST_GET_TIME GetServiceTime; - EFI_REST_EX_GET_SERVICE GetService; - EFI_REST_EX_GET_MODE_DATA GetModeData; - EFI_REST_EX_CONFIGURE Configure; - EFI_REST_EX_ASYNC_SEND_RECEIVE AyncSendReceive; - EFI_REST_EX_EVENT_SERVICE EventService; + EFI_REST_SEND_RECEIVE SendReceive; + EFI_REST_GET_TIME GetServiceTime; + EFI_REST_EX_GET_SERVICE GetService; + EFI_REST_EX_GET_MODE_DATA GetModeData; + EFI_REST_EX_CONFIGURE Configure; + EFI_REST_EX_ASYNC_SEND_RECEIVE AyncSendReceive; + EFI_REST_EX_EVENT_SERVICE EventService; }; -extern EFI_GUID gEfiRestExServiceBindingProtocolGuid; -extern EFI_GUID gEfiRestExProtocolGuid; +extern EFI_GUID gEfiRestExServiceBindingProtocolGuid; +extern EFI_GUID gEfiRestExProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/RestJsonStructure.h b/MdePkg/Include/Protocol/RestJsonStructure.h index ea3c4a62a9..29d69d6252 100644 --- a/MdePkg/Include/Protocol/RestJsonStructure.h +++ b/MdePkg/Include/Protocol/RestJsonStructure.h @@ -21,8 +21,8 @@ 0xa9a048f6, 0x48a0, 0x4714, {0xb7, 0xda, 0xa9, 0xad,0x87, 0xd4, 0xda, 0xc9 } \ } -typedef struct _EFI_REST_JSON_STRUCTURE_PROTOCOL EFI_REST_JSON_STRUCTURE_PROTOCOL; -typedef CHAR8 * EFI_REST_JSON_RESOURCE_TYPE_DATATYPE; +typedef struct _EFI_REST_JSON_STRUCTURE_PROTOCOL EFI_REST_JSON_STRUCTURE_PROTOCOL; +typedef CHAR8 *EFI_REST_JSON_RESOURCE_TYPE_DATATYPE; /// /// Structure defintions of resource name space. @@ -32,10 +32,10 @@ typedef CHAR8 * EFI_REST_JSON_RESOURCE_TYPE_DATATYPE; /// REST API. /// typedef struct _EFI_REST_JSON_RESOURCE_TYPE_NAMESPACE { - CHAR8 *ResourceTypeName; ///< Resource type name - CHAR8 *MajorVersion; ///< Resource major version - CHAR8 *MinorVersion; ///< Resource minor version - CHAR8 *ErrataVersion; ///< Resource errata version + CHAR8 *ResourceTypeName; ///< Resource type name + CHAR8 *MajorVersion; ///< Resource major version + CHAR8 *MinorVersion; ///< Resource minor version + CHAR8 *ErrataVersion; ///< Resource errata version } EFI_REST_JSON_RESOURCE_TYPE_NAMESPACE; /// @@ -44,17 +44,17 @@ typedef struct _EFI_REST_JSON_RESOURCE_TYPE_NAMESPACE { /// REST resource type consists of name space and data type. /// typedef struct _EFI_REST_JSON_RESOURCE_TYPE_IDENTIFIER { - EFI_REST_JSON_RESOURCE_TYPE_NAMESPACE NameSpace; ///< Namespace of this resource type. - EFI_REST_JSON_RESOURCE_TYPE_DATATYPE DataType; ///< Name of data type declared in this - ///< resource type. + EFI_REST_JSON_RESOURCE_TYPE_NAMESPACE NameSpace; ///< Namespace of this resource type. + EFI_REST_JSON_RESOURCE_TYPE_DATATYPE DataType; ///< Name of data type declared in this + ///< resource type. } EFI_REST_JSON_RESOURCE_TYPE_IDENTIFIER; /// /// List of JSON to C structure conversions which this convertor supports. /// typedef struct _EFI_REST_JSON_STRUCTURE_SUPPORTED { - LIST_ENTRY NextSupportedRsrcInterp; ///< Linklist to next supported conversion. - EFI_REST_JSON_RESOURCE_TYPE_IDENTIFIER RestResourceInterp; ///< JSON resource type this convertor supports. + LIST_ENTRY NextSupportedRsrcInterp; ///< Linklist to next supported conversion. + EFI_REST_JSON_RESOURCE_TYPE_IDENTIFIER RestResourceInterp; ///< JSON resource type this convertor supports. } EFI_REST_JSON_STRUCTURE_SUPPORTED; /// @@ -65,7 +65,7 @@ typedef struct _EFI_REST_JSON_STRUCTURE_HEADER { ///< choice the proper interpreter. ///< Follow by a pointer points to JSON structure, the content in the ///< JSON structure is implementation-specific according to converter producer. - VOID *JsonStructurePointer; + VOID *JsonStructurePointer; } EFI_REST_JSON_STRUCTURE_HEADER; /** @@ -87,7 +87,7 @@ EFI_STATUS IN EFI_REST_JSON_RESOURCE_TYPE_IDENTIFIER *JsonRsrcIdentifier OPTIONAL, IN CHAR8 *ResourceJsonText, OUT EFI_REST_JSON_STRUCTURE_HEADER **JsonStructure -); + ); /** Convert the given REST JSON structure into JSON text. @@ -106,7 +106,7 @@ EFI_STATUS IN EFI_REST_JSON_STRUCTURE_PROTOCOL *This, IN EFI_REST_JSON_STRUCTURE_HEADER *JsonStructureHeader, OUT CHAR8 **ResourceJsonText -); + ); /** This function destroys the REST JSON structure. @@ -123,7 +123,8 @@ EFI_STATUS (EFIAPI *EFI_REST_JSON_STRUCTURE_DESTORY_STRUCTURE)( IN EFI_REST_JSON_STRUCTURE_PROTOCOL *This, IN EFI_REST_JSON_STRUCTURE_HEADER *JsonStructureHeader -); + ); + /** This function provides REST JSON resource to structure converter registration. @@ -146,16 +147,16 @@ EFI_STATUS IN EFI_REST_JSON_STRUCTURE_TO_STRUCTURE ToStructure, IN EFI_REST_JSON_STRUCTURE_TO_JSON ToJson, IN EFI_REST_JSON_STRUCTURE_DESTORY_STRUCTURE DestroyStructure -); + ); /// /// EFI REST JSON to C structure protocol definition. /// struct _EFI_REST_JSON_STRUCTURE_PROTOCOL { - EFI_REST_JSON_STRUCTURE_REGISTER Register; ///< Register JSON to C structure convertor - EFI_REST_JSON_STRUCTURE_TO_STRUCTURE ToStructure; ///< The function to convert JSON to C structure - EFI_REST_JSON_STRUCTURE_TO_JSON ToJson; ///< The function to convert C structure to JSON - EFI_REST_JSON_STRUCTURE_DESTORY_STRUCTURE DestoryStructure; ///< Destory C structure. + EFI_REST_JSON_STRUCTURE_REGISTER Register; ///< Register JSON to C structure convertor + EFI_REST_JSON_STRUCTURE_TO_STRUCTURE ToStructure; ///< The function to convert JSON to C structure + EFI_REST_JSON_STRUCTURE_TO_JSON ToJson; ///< The function to convert C structure to JSON + EFI_REST_JSON_STRUCTURE_DESTORY_STRUCTURE DestoryStructure; ///< Destory C structure. }; #endif diff --git a/MdePkg/Include/Protocol/Rng.h b/MdePkg/Include/Protocol/Rng.h index 2d892759cd..baf425587b 100644 --- a/MdePkg/Include/Protocol/Rng.h +++ b/MdePkg/Include/Protocol/Rng.h @@ -93,7 +93,7 @@ typedef EFI_GUID EFI_RNG_ALGORITHM; **/ typedef EFI_STATUS -(EFIAPI *EFI_RNG_GET_INFO) ( +(EFIAPI *EFI_RNG_GET_INFO)( IN EFI_RNG_PROTOCOL *This, IN OUT UINTN *RNGAlgorithmListSize, OUT EFI_RNG_ALGORITHM *RNGAlgorithmList @@ -123,7 +123,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_RNG_GET_RNG) ( +(EFIAPI *EFI_RNG_GET_RNG)( IN EFI_RNG_PROTOCOL *This, IN EFI_RNG_ALGORITHM *RNGAlgorithm OPTIONAL, IN UINTN RNGValueLength, @@ -135,16 +135,16 @@ EFI_STATUS /// applications, or entropy for seeding other random number generators. /// struct _EFI_RNG_PROTOCOL { - EFI_RNG_GET_INFO GetInfo; - EFI_RNG_GET_RNG GetRNG; + EFI_RNG_GET_INFO GetInfo; + EFI_RNG_GET_RNG GetRNG; }; -extern EFI_GUID gEfiRngProtocolGuid; -extern EFI_GUID gEfiRngAlgorithmSp80090Hash256Guid; -extern EFI_GUID gEfiRngAlgorithmSp80090Hmac256Guid; -extern EFI_GUID gEfiRngAlgorithmSp80090Ctr256Guid; -extern EFI_GUID gEfiRngAlgorithmX9313DesGuid; -extern EFI_GUID gEfiRngAlgorithmX931AesGuid; -extern EFI_GUID gEfiRngAlgorithmRaw; +extern EFI_GUID gEfiRngProtocolGuid; +extern EFI_GUID gEfiRngAlgorithmSp80090Hash256Guid; +extern EFI_GUID gEfiRngAlgorithmSp80090Hmac256Guid; +extern EFI_GUID gEfiRngAlgorithmSp80090Ctr256Guid; +extern EFI_GUID gEfiRngAlgorithmX9313DesGuid; +extern EFI_GUID gEfiRngAlgorithmX931AesGuid; +extern EFI_GUID gEfiRngAlgorithmRaw; #endif diff --git a/MdePkg/Include/Protocol/Runtime.h b/MdePkg/Include/Protocol/Runtime.h index b7d9ea9573..c535559179 100644 --- a/MdePkg/Include/Protocol/Runtime.h +++ b/MdePkg/Include/Protocol/Runtime.h @@ -24,14 +24,14 @@ #define EFI_RUNTIME_ARCH_PROTOCOL_GUID \ { 0xb7dfb4e1, 0x52f, 0x449f, {0x87, 0xbe, 0x98, 0x18, 0xfc, 0x91, 0xb7, 0x33 } } -typedef struct _EFI_RUNTIME_ARCH_PROTOCOL EFI_RUNTIME_ARCH_PROTOCOL; +typedef struct _EFI_RUNTIME_ARCH_PROTOCOL EFI_RUNTIME_ARCH_PROTOCOL; /// /// LIST_ENTRY from BaseType /// typedef LIST_ENTRY EFI_LIST_ENTRY; -typedef struct _EFI_RUNTIME_IMAGE_ENTRY EFI_RUNTIME_IMAGE_ENTRY; +typedef struct _EFI_RUNTIME_IMAGE_ENTRY EFI_RUNTIME_IMAGE_ENTRY; /// /// EFI_RUNTIME_IMAGE_ENTRY @@ -41,27 +41,27 @@ struct _EFI_RUNTIME_IMAGE_ENTRY { /// Start of image that has been loaded in memory. It is a pointer /// to either the DOS header or PE header of the image. /// - VOID *ImageBase; + VOID *ImageBase; /// /// Size in bytes of the image represented by ImageBase. /// - UINT64 ImageSize; + UINT64 ImageSize; /// /// Information about the fix-ups that were performed on ImageBase when it was /// loaded into memory. /// - VOID *RelocationData; + VOID *RelocationData; /// /// The ImageHandle passed into ImageBase when it was loaded. /// - EFI_HANDLE Handle; + EFI_HANDLE Handle; /// /// Entry for this node in the EFI_RUNTIME_ARCHITECTURE_PROTOCOL.ImageHead list. /// - EFI_LIST_ENTRY Link; + EFI_LIST_ENTRY Link; }; -typedef struct _EFI_RUNTIME_EVENT_ENTRY EFI_RUNTIME_EVENT_ENTRY; +typedef struct _EFI_RUNTIME_EVENT_ENTRY EFI_RUNTIME_EVENT_ENTRY; /// /// EFI_RUNTIME_EVENT_ENTRY @@ -70,28 +70,28 @@ struct _EFI_RUNTIME_EVENT_ENTRY { /// /// The same as Type passed into CreateEvent(). /// - UINT32 Type; + UINT32 Type; /// /// The same as NotifyTpl passed into CreateEvent(). /// - EFI_TPL NotifyTpl; + EFI_TPL NotifyTpl; /// /// The same as NotifyFunction passed into CreateEvent(). /// - EFI_EVENT_NOTIFY NotifyFunction; + EFI_EVENT_NOTIFY NotifyFunction; /// /// The same as NotifyContext passed into CreateEvent(). /// - VOID *NotifyContext; + VOID *NotifyContext; /// /// The EFI_EVENT returned by CreateEvent(). Event must be in runtime memory. /// - EFI_EVENT *Event; + EFI_EVENT *Event; /// /// Entry for this node in the /// EFI_RUNTIME_ARCHITECTURE_PROTOCOL.EventHead list. /// - EFI_LIST_ENTRY Link; + EFI_LIST_ENTRY Link; }; /// @@ -105,18 +105,18 @@ struct _EFI_RUNTIME_EVENT_ENTRY { /// by a runtime DXE driver and may only be consumed by the DXE Foundation. /// struct _EFI_RUNTIME_ARCH_PROTOCOL { - EFI_LIST_ENTRY ImageHead; ///< A list of type EFI_RUNTIME_IMAGE_ENTRY. - EFI_LIST_ENTRY EventHead; ///< A list of type EFI_RUNTIME_EVENT_ENTRY. - UINTN MemoryDescriptorSize; ///< Size of a memory descriptor that is returned by GetMemoryMap(). - UINT32 MemoryDesciptorVersion; ///< Version of a memory descriptor that is returned by GetMemoryMap(). - UINTN MemoryMapSize;///< Size of the memory map in bytes contained in MemoryMapPhysical and MemoryMapVirtual. - EFI_MEMORY_DESCRIPTOR *MemoryMapPhysical; ///< Pointer to a runtime buffer that contains a copy of - ///< the memory map returned via GetMemoryMap(). - EFI_MEMORY_DESCRIPTOR *MemoryMapVirtual; ///< Pointer to MemoryMapPhysical that is updated to virtual mode after SetVirtualAddressMap(). - BOOLEAN VirtualMode; ///< Boolean that is TRUE if SetVirtualAddressMap() has been called. - BOOLEAN AtRuntime; ///< Boolean that is TRUE if ExitBootServices () has been called. + EFI_LIST_ENTRY ImageHead; ///< A list of type EFI_RUNTIME_IMAGE_ENTRY. + EFI_LIST_ENTRY EventHead; ///< A list of type EFI_RUNTIME_EVENT_ENTRY. + UINTN MemoryDescriptorSize; ///< Size of a memory descriptor that is returned by GetMemoryMap(). + UINT32 MemoryDesciptorVersion; ///< Version of a memory descriptor that is returned by GetMemoryMap(). + UINTN MemoryMapSize; ///< Size of the memory map in bytes contained in MemoryMapPhysical and MemoryMapVirtual. + EFI_MEMORY_DESCRIPTOR *MemoryMapPhysical; ///< Pointer to a runtime buffer that contains a copy of + ///< the memory map returned via GetMemoryMap(). + EFI_MEMORY_DESCRIPTOR *MemoryMapVirtual; ///< Pointer to MemoryMapPhysical that is updated to virtual mode after SetVirtualAddressMap(). + BOOLEAN VirtualMode; ///< Boolean that is TRUE if SetVirtualAddressMap() has been called. + BOOLEAN AtRuntime; ///< Boolean that is TRUE if ExitBootServices () has been called. }; -extern EFI_GUID gEfiRuntimeArchProtocolGuid; +extern EFI_GUID gEfiRuntimeArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/S3SaveState.h b/MdePkg/Include/Protocol/S3SaveState.h index c1b8f8b9e0..c2b26944fb 100644 --- a/MdePkg/Include/Protocol/S3SaveState.h +++ b/MdePkg/Include/Protocol/S3SaveState.h @@ -20,10 +20,9 @@ #define EFI_S3_SAVE_STATE_PROTOCOL_GUID \ { 0xe857caf6, 0xc046, 0x45dc, { 0xbe, 0x3f, 0xee, 0x7, 0x65, 0xfb, 0xa8, 0x87 }} - typedef VOID *EFI_S3_BOOT_SCRIPT_POSITION; -typedef struct _EFI_S3_SAVE_STATE_PROTOCOL EFI_S3_SAVE_STATE_PROTOCOL; +typedef struct _EFI_S3_SAVE_STATE_PROTOCOL EFI_S3_SAVE_STATE_PROTOCOL; /** Record operations that need to be replayed during an S3 resume. @@ -45,10 +44,10 @@ typedef struct _EFI_S3_SAVE_STATE_PROTOCOL EFI_S3_SAVE_STATE_PROTOCOL; typedef EFI_STATUS (EFIAPI *EFI_S3_SAVE_STATE_WRITE)( - IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This, - IN UINTN OpCode, - ... -); + IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This, + IN UINTN OpCode, + ... + ); /** Record operations that need to be replayed during an S3 resume. @@ -89,12 +88,12 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_S3_SAVE_STATE_INSERT)( - IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This, - IN BOOLEAN BeforeOrAfter, - IN OUT EFI_S3_BOOT_SCRIPT_POSITION *Position OPTIONAL, - IN UINTN OpCode, - ... -); + IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This, + IN BOOLEAN BeforeOrAfter, + IN OUT EFI_S3_BOOT_SCRIPT_POSITION *Position OPTIONAL, + IN UINTN OpCode, + ... + ); /** Find a label within the boot script table and, if not present, optionally create it. @@ -126,12 +125,12 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_S3_SAVE_STATE_LABEL)( - IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This, - IN BOOLEAN BeforeOrAfter, - IN BOOLEAN CreateIfNotFound, - IN OUT EFI_S3_BOOT_SCRIPT_POSITION *Position OPTIONAL, - IN CONST CHAR8 *Label -); + IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This, + IN BOOLEAN BeforeOrAfter, + IN BOOLEAN CreateIfNotFound, + IN OUT EFI_S3_BOOT_SCRIPT_POSITION *Position OPTIONAL, + IN CONST CHAR8 *Label + ); /** Compare two positions in the boot script table and return their relative position. @@ -152,19 +151,19 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_S3_SAVE_STATE_COMPARE)( - IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This, - IN EFI_S3_BOOT_SCRIPT_POSITION Position1, - IN EFI_S3_BOOT_SCRIPT_POSITION Position2, - OUT UINTN *RelativePosition -); + IN CONST EFI_S3_SAVE_STATE_PROTOCOL *This, + IN EFI_S3_BOOT_SCRIPT_POSITION Position1, + IN EFI_S3_BOOT_SCRIPT_POSITION Position2, + OUT UINTN *RelativePosition + ); struct _EFI_S3_SAVE_STATE_PROTOCOL { - EFI_S3_SAVE_STATE_WRITE Write; - EFI_S3_SAVE_STATE_INSERT Insert; - EFI_S3_SAVE_STATE_LABEL Label; - EFI_S3_SAVE_STATE_COMPARE Compare; + EFI_S3_SAVE_STATE_WRITE Write; + EFI_S3_SAVE_STATE_INSERT Insert; + EFI_S3_SAVE_STATE_LABEL Label; + EFI_S3_SAVE_STATE_COMPARE Compare; }; -extern EFI_GUID gEfiS3SaveStateProtocolGuid; +extern EFI_GUID gEfiS3SaveStateProtocolGuid; #endif // __S3_SAVE_STATE_H__ diff --git a/MdePkg/Include/Protocol/S3SmmSaveState.h b/MdePkg/Include/Protocol/S3SmmSaveState.h index bbc01accf5..cabcc24647 100644 --- a/MdePkg/Include/Protocol/S3SmmSaveState.h +++ b/MdePkg/Include/Protocol/S3SmmSaveState.h @@ -31,10 +31,8 @@ #define EFI_S3_SMM_SAVE_STATE_PROTOCOL_GUID \ {0x320afe62, 0xe593, 0x49cb, { 0xa9, 0xf1, 0xd4, 0xc2, 0xf4, 0xaf, 0x1, 0x4c }} - typedef EFI_S3_SAVE_STATE_PROTOCOL EFI_S3_SMM_SAVE_STATE_PROTOCOL; -extern EFI_GUID gEfiS3SmmSaveStateProtocolGuid; +extern EFI_GUID gEfiS3SmmSaveStateProtocolGuid; #endif // __S3_SMM_SAVE_STATE_H__ - diff --git a/MdePkg/Include/Protocol/ScsiIo.h b/MdePkg/Include/Protocol/ScsiIo.h index 05e46bda9c..7ebfd9a652 100644 --- a/MdePkg/Include/Protocol/ScsiIo.h +++ b/MdePkg/Include/Protocol/ScsiIo.h @@ -25,34 +25,34 @@ typedef struct _EFI_SCSI_IO_PROTOCOL EFI_SCSI_IO_PROTOCOL; // // SCSI Device type information, defined in the SCSI Primary Commands standard (e.g., SPC-4) // -#define EFI_SCSI_IO_TYPE_DISK 0x00 ///< Disk device -#define EFI_SCSI_IO_TYPE_TAPE 0x01 ///< Tape device -#define EFI_SCSI_IO_TYPE_PRINTER 0x02 ///< Printer -#define EFI_SCSI_IO_TYPE_PROCESSOR 0x03 ///< Processor -#define EFI_SCSI_IO_TYPE_WORM 0x04 ///< Write-once read-multiple -#define EFI_SCSI_IO_TYPE_CDROM 0x05 ///< CD or DVD device -#define EFI_SCSI_IO_TYPE_SCANNER 0x06 ///< Scanner device -#define EFI_SCSI_IO_TYPE_OPTICAL 0x07 ///< Optical memory device -#define EFI_SCSI_IO_TYPE_MEDIUMCHANGER 0x08 ///< Medium Changer device -#define EFI_SCSI_IO_TYPE_COMMUNICATION 0x09 ///< Communications device -#define MFI_SCSI_IO_TYPE_A 0x0A ///< Obsolete -#define MFI_SCSI_IO_TYPE_B 0x0B ///< Obsolete -#define MFI_SCSI_IO_TYPE_RAID 0x0C ///< Storage array controller device (e.g., RAID) -#define MFI_SCSI_IO_TYPE_SES 0x0D ///< Enclosure services device -#define MFI_SCSI_IO_TYPE_RBC 0x0E ///< Simplified direct-access device (e.g., magnetic disk) -#define MFI_SCSI_IO_TYPE_OCRW 0x0F ///< Optical card reader/writer device -#define MFI_SCSI_IO_TYPE_BRIDGE 0x10 ///< Bridge Controller Commands -#define MFI_SCSI_IO_TYPE_OSD 0x11 ///< Object-based Storage Device -#define EFI_SCSI_IO_TYPE_RESERVED_LOW 0x12 ///< Reserved (low) -#define EFI_SCSI_IO_TYPE_RESERVED_HIGH 0x1E ///< Reserved (high) -#define EFI_SCSI_IO_TYPE_UNKNOWN 0x1F ///< Unknown no device type +#define EFI_SCSI_IO_TYPE_DISK 0x00 ///< Disk device +#define EFI_SCSI_IO_TYPE_TAPE 0x01 ///< Tape device +#define EFI_SCSI_IO_TYPE_PRINTER 0x02 ///< Printer +#define EFI_SCSI_IO_TYPE_PROCESSOR 0x03 ///< Processor +#define EFI_SCSI_IO_TYPE_WORM 0x04 ///< Write-once read-multiple +#define EFI_SCSI_IO_TYPE_CDROM 0x05 ///< CD or DVD device +#define EFI_SCSI_IO_TYPE_SCANNER 0x06 ///< Scanner device +#define EFI_SCSI_IO_TYPE_OPTICAL 0x07 ///< Optical memory device +#define EFI_SCSI_IO_TYPE_MEDIUMCHANGER 0x08 ///< Medium Changer device +#define EFI_SCSI_IO_TYPE_COMMUNICATION 0x09 ///< Communications device +#define MFI_SCSI_IO_TYPE_A 0x0A ///< Obsolete +#define MFI_SCSI_IO_TYPE_B 0x0B ///< Obsolete +#define MFI_SCSI_IO_TYPE_RAID 0x0C ///< Storage array controller device (e.g., RAID) +#define MFI_SCSI_IO_TYPE_SES 0x0D ///< Enclosure services device +#define MFI_SCSI_IO_TYPE_RBC 0x0E ///< Simplified direct-access device (e.g., magnetic disk) +#define MFI_SCSI_IO_TYPE_OCRW 0x0F ///< Optical card reader/writer device +#define MFI_SCSI_IO_TYPE_BRIDGE 0x10 ///< Bridge Controller Commands +#define MFI_SCSI_IO_TYPE_OSD 0x11 ///< Object-based Storage Device +#define EFI_SCSI_IO_TYPE_RESERVED_LOW 0x12 ///< Reserved (low) +#define EFI_SCSI_IO_TYPE_RESERVED_HIGH 0x1E ///< Reserved (high) +#define EFI_SCSI_IO_TYPE_UNKNOWN 0x1F ///< Unknown no device type // // SCSI Data Direction definition // -#define EFI_SCSI_IO_DATA_DIRECTION_READ 0 -#define EFI_SCSI_IO_DATA_DIRECTION_WRITE 1 -#define EFI_SCSI_IO_DATA_DIRECTION_BIDIRECTIONAL 2 +#define EFI_SCSI_IO_DATA_DIRECTION_READ 0 +#define EFI_SCSI_IO_DATA_DIRECTION_WRITE 1 +#define EFI_SCSI_IO_DATA_DIRECTION_BIDIRECTIONAL 2 // // SCSI Host Adapter Status definition @@ -70,19 +70,18 @@ typedef struct _EFI_SCSI_IO_PROTOCOL EFI_SCSI_IO_PROTOCOL; #define EFI_SCSI_IO_STATUS_HOST_ADAPTER_PHASE_ERROR 0x14 ///< Target bus phase sequence failure #define EFI_SCSI_IO_STATUS_HOST_ADAPTER_OTHER 0x7f - // // SCSI Target Status definition // -#define EFI_SCSI_IO_STATUS_TARGET_GOOD 0x00 -#define EFI_SCSI_IO_STATUS_TARGET_CHECK_CONDITION 0x02 ///< check condition -#define EFI_SCSI_IO_STATUS_TARGET_CONDITION_MET 0x04 ///< condition met -#define EFI_SCSI_IO_STATUS_TARGET_BUSY 0x08 ///< busy -#define EFI_SCSI_IO_STATUS_TARGET_INTERMEDIATE 0x10 ///< intermediate -#define EFI_SCSI_IO_STATUS_TARGET_INTERMEDIATE_CONDITION_MET 0x14 ///< intermediate-condition met -#define EFI_SCSI_IO_STATUS_TARGET_RESERVATION_CONFLICT 0x18 ///< reservation conflict -#define EFI_SCSI_IO_STATUS_TARGET_COMMOND_TERMINATED 0x22 ///< command terminated -#define EFI_SCSI_IO_STATUS_TARGET_QUEUE_FULL 0x28 ///< queue full +#define EFI_SCSI_IO_STATUS_TARGET_GOOD 0x00 +#define EFI_SCSI_IO_STATUS_TARGET_CHECK_CONDITION 0x02 ///< check condition +#define EFI_SCSI_IO_STATUS_TARGET_CONDITION_MET 0x04 ///< condition met +#define EFI_SCSI_IO_STATUS_TARGET_BUSY 0x08 ///< busy +#define EFI_SCSI_IO_STATUS_TARGET_INTERMEDIATE 0x10 ///< intermediate +#define EFI_SCSI_IO_STATUS_TARGET_INTERMEDIATE_CONDITION_MET 0x14 ///< intermediate-condition met +#define EFI_SCSI_IO_STATUS_TARGET_RESERVATION_CONFLICT 0x18 ///< reservation conflict +#define EFI_SCSI_IO_STATUS_TARGET_COMMOND_TERMINATED 0x22 ///< command terminated +#define EFI_SCSI_IO_STATUS_TARGET_QUEUE_FULL 0x28 ///< queue full typedef struct { /// @@ -93,63 +92,63 @@ typedef struct { /// EFI_TIMEOUT if the time required to execute the SCSI Request /// Packet is greater than Timeout. /// - UINT64 Timeout; + UINT64 Timeout; /// /// A pointer to the data buffer to transfer between the SCSI /// controller and the SCSI device for SCSI READ command /// - VOID *InDataBuffer; + VOID *InDataBuffer; /// /// A pointer to the data buffer to transfer between the SCSI /// controller and the SCSI device for SCSI WRITE command. /// - VOID *OutDataBuffer; + VOID *OutDataBuffer; /// /// A pointer to the sense data that was generated by the execution of /// the SCSI Request Packet. /// - VOID *SenseData; + VOID *SenseData; /// /// A pointer to buffer that contains the Command Data Block to /// send to the SCSI device. /// - VOID *Cdb; + VOID *Cdb; /// /// On Input, the size, in bytes, of InDataBuffer. On output, the /// number of bytes transferred between the SCSI controller and the SCSI device. /// - UINT32 InTransferLength; + UINT32 InTransferLength; /// /// On Input, the size, in bytes of OutDataBuffer. On Output, the /// Number of bytes transferred between SCSI Controller and the SCSI device. /// - UINT32 OutTransferLength; + UINT32 OutTransferLength; /// /// The length, in bytes, of the buffer Cdb. The standard values are /// 6, 10, 12, and 16, but other values are possible if a variable length CDB is used. /// - UINT8 CdbLength; + UINT8 CdbLength; /// /// The direction of the data transfer. 0 for reads, 1 for writes. A /// value of 2 is Reserved for Bi-Directional SCSI commands. /// - UINT8 DataDirection; + UINT8 DataDirection; /// /// The status of the SCSI Host Controller that produces the SCSI /// bus where the SCSI device attached when the SCSI Request /// Packet was executed on the SCSI Controller. /// - UINT8 HostAdapterStatus; + UINT8 HostAdapterStatus; /// /// The status returned by the SCSI device when the SCSI Request /// Packet was executed. /// - UINT8 TargetStatus; + UINT8 TargetStatus; /// /// On input, the length in bytes of the SenseData buffer. On /// output, the number of bytes written to the SenseData buffer. /// - UINT8 SenseDataLength; + UINT8 SenseDataLength; } EFI_SCSI_IO_SCSI_REQUEST_PACKET; /** @@ -230,7 +229,6 @@ EFI_STATUS IN EFI_SCSI_IO_PROTOCOL *This ); - /** Sends a SCSI Request Packet to the SCSI Controller for execution. @@ -291,11 +289,11 @@ EFI_STATUS /// Provides services to manage and communicate with SCSI devices. /// struct _EFI_SCSI_IO_PROTOCOL { - EFI_SCSI_IO_PROTOCOL_GET_DEVICE_TYPE GetDeviceType; - EFI_SCSI_IO_PROTOCOL_GET_DEVICE_LOCATION GetDeviceLocation; - EFI_SCSI_IO_PROTOCOL_RESET_BUS ResetBus; - EFI_SCSI_IO_PROTOCOL_RESET_DEVICE ResetDevice; - EFI_SCSI_IO_PROTOCOL_EXEC_SCSI_COMMAND ExecuteScsiCommand; + EFI_SCSI_IO_PROTOCOL_GET_DEVICE_TYPE GetDeviceType; + EFI_SCSI_IO_PROTOCOL_GET_DEVICE_LOCATION GetDeviceLocation; + EFI_SCSI_IO_PROTOCOL_RESET_BUS ResetBus; + EFI_SCSI_IO_PROTOCOL_RESET_DEVICE ResetDevice; + EFI_SCSI_IO_PROTOCOL_EXEC_SCSI_COMMAND ExecuteScsiCommand; /// /// Supplies the alignment requirement for any buffer used in a data transfer. @@ -303,9 +301,9 @@ struct _EFI_SCSI_IO_PROTOCOL { /// Otherwise, IoAlign must be a power of 2, and the requirement is that the /// start address of a buffer must be evenly divisible by IoAlign with no remainder. /// - UINT32 IoAlign; + UINT32 IoAlign; }; -extern EFI_GUID gEfiScsiIoProtocolGuid; +extern EFI_GUID gEfiScsiIoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/ScsiPassThru.h b/MdePkg/Include/Protocol/ScsiPassThru.h index b0acf09d8f..c87fb97aee 100644 --- a/MdePkg/Include/Protocol/ScsiPassThru.h +++ b/MdePkg/Include/Protocol/ScsiPassThru.h @@ -24,7 +24,7 @@ /// /// Forward reference for pure ANSI compatability /// -typedef struct _EFI_SCSI_PASS_THRU_PROTOCOL EFI_SCSI_PASS_THRU_PROTOCOL; +typedef struct _EFI_SCSI_PASS_THRU_PROTOCOL EFI_SCSI_PASS_THRU_PROTOCOL; #define EFI_SCSI_PASS_THRU_ATTRIBUTES_PHYSICAL 0x0001 #define EFI_SCSI_PASS_THRU_ATTRIBUTES_LOGICAL 0x0002 @@ -49,15 +49,15 @@ typedef struct _EFI_SCSI_PASS_THRU_PROTOCOL EFI_SCSI_PASS_THRU_PROTOCOL; // // SCSI Target Status definition // -#define EFI_SCSI_STATUS_TARGET_GOOD 0x00 -#define EFI_SCSI_STATUS_TARGET_CHECK_CONDITION 0x02 // check condition -#define EFI_SCSI_STATUS_TARGET_CONDITION_MET 0x04 // condition met -#define EFI_SCSI_STATUS_TARGET_BUSY 0x08 // busy -#define EFI_SCSI_STATUS_TARGET_INTERMEDIATE 0x10 // intermediate -#define EFI_SCSI_STATUS_TARGET_INTERMEDIATE_CONDITION_MET 0x14 // intermediate-condition met -#define EFI_SCSI_STATUS_TARGET_RESERVATION_CONFLICT 0x18 // reservation conflict -#define EFI_SCSI_STATUS_TARGET_COMMOND_TERMINATED 0x22 // command terminated -#define EFI_SCSI_STATUS_TARGET_QUEUE_FULL 0x28 // queue full +#define EFI_SCSI_STATUS_TARGET_GOOD 0x00 +#define EFI_SCSI_STATUS_TARGET_CHECK_CONDITION 0x02 // check condition +#define EFI_SCSI_STATUS_TARGET_CONDITION_MET 0x04 // condition met +#define EFI_SCSI_STATUS_TARGET_BUSY 0x08 // busy +#define EFI_SCSI_STATUS_TARGET_INTERMEDIATE 0x10 // intermediate +#define EFI_SCSI_STATUS_TARGET_INTERMEDIATE_CONDITION_MET 0x14 // intermediate-condition met +#define EFI_SCSI_STATUS_TARGET_RESERVATION_CONFLICT 0x18 // reservation conflict +#define EFI_SCSI_STATUS_TARGET_COMMOND_TERMINATED 0x22 // command terminated +#define EFI_SCSI_STATUS_TARGET_QUEUE_FULL 0x28 // queue full typedef struct { /// @@ -68,78 +68,78 @@ typedef struct { /// EFI_TIMEOUT if the time required to execute the SCSI Request /// Packet is greater than Timeout. /// - UINT64 Timeout; + UINT64 Timeout; /// /// A pointer to the data buffer to transfer between the SCSI /// controller and the SCSI device. Must be aligned to the boundary /// specified in the IoAlign field of the /// EFI_SCSI_PASS_THRU_MODE structure. /// - VOID *DataBuffer; + VOID *DataBuffer; /// /// A pointer to the sense data that was generated by the execution of /// the SCSI Request Packet. /// - VOID *SenseData; + VOID *SenseData; /// /// A pointer to buffer that contains the Command Data Block to /// send to the SCSI device. /// - VOID *Cdb; + VOID *Cdb; /// /// On Input, the size, in bytes, of InDataBuffer. On output, the /// number of bytes transferred between the SCSI controller and the SCSI device. /// - UINT32 TransferLength; + UINT32 TransferLength; /// /// The length, in bytes, of the buffer Cdb. The standard values are /// 6, 10, 12, and 16, but other values are possible if a variable length CDB is used. /// - UINT8 CdbLength; + UINT8 CdbLength; /// /// The direction of the data transfer. 0 for reads, 1 for writes. A /// value of 2 is Reserved for Bi-Directional SCSI commands. /// - UINT8 DataDirection; + UINT8 DataDirection; /// /// The status of the SCSI Host Controller that produces the SCSI /// bus where the SCSI device attached when the SCSI Request /// Packet was executed on the SCSI Controller. /// - UINT8 HostAdapterStatus; + UINT8 HostAdapterStatus; /// /// The status returned by the SCSI device when the SCSI Request /// Packet was executed. /// - UINT8 TargetStatus; + UINT8 TargetStatus; /// /// On input, the length in bytes of the SenseData buffer. On /// output, the number of bytes written to the SenseData buffer. /// - UINT8 SenseDataLength; + UINT8 SenseDataLength; } EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET; typedef struct { /// /// A Null-terminated Unicode string that represents the printable name of the SCSI controller. /// - CHAR16 *ControllerName; + CHAR16 *ControllerName; /// /// A Null-terminated Unicode string that represents the printable name of the SCSI channel. /// - CHAR16 *ChannelName; + CHAR16 *ChannelName; /// /// The Target ID of the host adapter on the SCSI channel. /// - UINT32 AdapterId; + UINT32 AdapterId; /// /// Additional information on the attributes of the SCSI channel. /// - UINT32 Attributes; + UINT32 Attributes; /// /// Supplies the alignment requirement for any buffer used in a data transfer. /// - UINT32 IoAlign; + UINT32 IoAlign; } EFI_SCSI_PASS_THRU_MODE; /** @@ -363,15 +363,15 @@ struct _EFI_SCSI_PASS_THRU_PROTOCOL { /// /// A pointer to the EFI_SCSI_PASS_THRU_MODE data for this SCSI channel. /// - EFI_SCSI_PASS_THRU_MODE *Mode; - EFI_SCSI_PASS_THRU_PASSTHRU PassThru; - EFI_SCSI_PASS_THRU_GET_NEXT_DEVICE GetNextDevice; - EFI_SCSI_PASS_THRU_BUILD_DEVICE_PATH BuildDevicePath; - EFI_SCSI_PASS_THRU_GET_TARGET_LUN GetTargetLun; - EFI_SCSI_PASS_THRU_RESET_CHANNEL ResetChannel; - EFI_SCSI_PASS_THRU_RESET_TARGET ResetTarget; + EFI_SCSI_PASS_THRU_MODE *Mode; + EFI_SCSI_PASS_THRU_PASSTHRU PassThru; + EFI_SCSI_PASS_THRU_GET_NEXT_DEVICE GetNextDevice; + EFI_SCSI_PASS_THRU_BUILD_DEVICE_PATH BuildDevicePath; + EFI_SCSI_PASS_THRU_GET_TARGET_LUN GetTargetLun; + EFI_SCSI_PASS_THRU_RESET_CHANNEL ResetChannel; + EFI_SCSI_PASS_THRU_RESET_TARGET ResetTarget; }; -extern EFI_GUID gEfiScsiPassThruProtocolGuid; +extern EFI_GUID gEfiScsiPassThruProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/ScsiPassThruExt.h b/MdePkg/Include/Protocol/ScsiPassThruExt.h index 994fbba93d..84a31d913b 100644 --- a/MdePkg/Include/Protocol/ScsiPassThruExt.h +++ b/MdePkg/Include/Protocol/ScsiPassThruExt.h @@ -18,33 +18,33 @@ typedef struct _EFI_EXT_SCSI_PASS_THRU_PROTOCOL EFI_EXT_SCSI_PASS_THRU_PROTOCOL; -#define TARGET_MAX_BYTES 0x10 +#define TARGET_MAX_BYTES 0x10 -#define EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_PHYSICAL 0x0001 -#define EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_LOGICAL 0x0002 -#define EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_NONBLOCKIO 0x0004 +#define EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_PHYSICAL 0x0001 +#define EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_LOGICAL 0x0002 +#define EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_NONBLOCKIO 0x0004 // // DataDirection // -#define EFI_EXT_SCSI_DATA_DIRECTION_READ 0 -#define EFI_EXT_SCSI_DATA_DIRECTION_WRITE 1 -#define EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL 2 +#define EFI_EXT_SCSI_DATA_DIRECTION_READ 0 +#define EFI_EXT_SCSI_DATA_DIRECTION_WRITE 1 +#define EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL 2 // // HostAdapterStatus // -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK 0x00 -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_TIMEOUT_COMMAND 0x09 -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_TIMEOUT 0x0b -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_MESSAGE_REJECT 0x0d -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_BUS_RESET 0x0e -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_PARITY_ERROR 0x0f -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_REQUEST_SENSE_FAILED 0x10 -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_SELECTION_TIMEOUT 0x11 -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN 0x12 -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_BUS_FREE 0x13 -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_PHASE_ERROR 0x14 -#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OTHER 0x7f +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OK 0x00 +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_TIMEOUT_COMMAND 0x09 +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_TIMEOUT 0x0b +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_MESSAGE_REJECT 0x0d +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_BUS_RESET 0x0e +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_PARITY_ERROR 0x0f +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_REQUEST_SENSE_FAILED 0x10 +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_SELECTION_TIMEOUT 0x11 +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN 0x12 +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_BUS_FREE 0x13 +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_PHASE_ERROR 0x14 +#define EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OTHER 0x7f // // TargetStatus // @@ -63,15 +63,15 @@ typedef struct { /// /// The Target ID of the host adapter on the SCSI channel. /// - UINT32 AdapterId; + UINT32 AdapterId; /// /// Additional information on the attributes of the SCSI channel. /// - UINT32 Attributes; + UINT32 Attributes; /// /// Supplies the alignment requirement for any buffer used in a data transfer. /// - UINT32 IoAlign; + UINT32 IoAlign; } EFI_EXT_SCSI_PASS_THRU_MODE; typedef struct { @@ -83,62 +83,62 @@ typedef struct { /// EFI_TIMEOUT if the time required to execute the SCSI /// Request Packet is greater than Timeout. /// - UINT64 Timeout; + UINT64 Timeout; /// /// A pointer to the data buffer to transfer between the SCSI /// controller and the SCSI device for read and bidirectional commands. /// - VOID *InDataBuffer; + VOID *InDataBuffer; /// /// A pointer to the data buffer to transfer between the SCSI /// controller and the SCSI device for write or bidirectional commands. /// - VOID *OutDataBuffer; + VOID *OutDataBuffer; /// /// A pointer to the sense data that was generated by the execution of /// the SCSI Request Packet. /// - VOID *SenseData; + VOID *SenseData; /// /// A pointer to buffer that contains the Command Data Block to /// send to the SCSI device specified by Target and Lun. /// - VOID *Cdb; + VOID *Cdb; /// /// On Input, the size, in bytes, of InDataBuffer. On output, the /// number of bytes transferred between the SCSI controller and the SCSI device. /// - UINT32 InTransferLength; + UINT32 InTransferLength; /// /// On Input, the size, in bytes of OutDataBuffer. On Output, the /// Number of bytes transferred between SCSI Controller and the SCSI device. /// - UINT32 OutTransferLength; + UINT32 OutTransferLength; /// /// The length, in bytes, of the buffer Cdb. The standard values are 6, /// 10, 12, and 16, but other values are possible if a variable length CDB is used. /// - UINT8 CdbLength; + UINT8 CdbLength; /// /// The direction of the data transfer. 0 for reads, 1 for writes. A /// value of 2 is Reserved for Bi-Directional SCSI commands. /// - UINT8 DataDirection; + UINT8 DataDirection; /// /// The status of the host adapter specified by This when the SCSI /// Request Packet was executed on the target device. /// - UINT8 HostAdapterStatus; + UINT8 HostAdapterStatus; /// /// The status returned by the device specified by Target and Lun /// when the SCSI Request Packet was executed. /// - UINT8 TargetStatus; + UINT8 TargetStatus; /// /// On input, the length in bytes of the SenseData buffer. On /// output, the number of bytes written to the SenseData buffer. /// - UINT8 SenseDataLength; + UINT8 SenseDataLength; } EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET; /** @@ -373,16 +373,16 @@ struct _EFI_EXT_SCSI_PASS_THRU_PROTOCOL { /// /// A pointer to the EFI_EXT_SCSI_PASS_THRU_MODE data for this SCSI channel. /// - EFI_EXT_SCSI_PASS_THRU_MODE *Mode; - EFI_EXT_SCSI_PASS_THRU_PASSTHRU PassThru; - EFI_EXT_SCSI_PASS_THRU_GET_NEXT_TARGET_LUN GetNextTargetLun; - EFI_EXT_SCSI_PASS_THRU_BUILD_DEVICE_PATH BuildDevicePath; - EFI_EXT_SCSI_PASS_THRU_GET_TARGET_LUN GetTargetLun; - EFI_EXT_SCSI_PASS_THRU_RESET_CHANNEL ResetChannel; - EFI_EXT_SCSI_PASS_THRU_RESET_TARGET_LUN ResetTargetLun; - EFI_EXT_SCSI_PASS_THRU_GET_NEXT_TARGET GetNextTarget; + EFI_EXT_SCSI_PASS_THRU_MODE *Mode; + EFI_EXT_SCSI_PASS_THRU_PASSTHRU PassThru; + EFI_EXT_SCSI_PASS_THRU_GET_NEXT_TARGET_LUN GetNextTargetLun; + EFI_EXT_SCSI_PASS_THRU_BUILD_DEVICE_PATH BuildDevicePath; + EFI_EXT_SCSI_PASS_THRU_GET_TARGET_LUN GetTargetLun; + EFI_EXT_SCSI_PASS_THRU_RESET_CHANNEL ResetChannel; + EFI_EXT_SCSI_PASS_THRU_RESET_TARGET_LUN ResetTargetLun; + EFI_EXT_SCSI_PASS_THRU_GET_NEXT_TARGET GetNextTarget; }; -extern EFI_GUID gEfiExtScsiPassThruProtocolGuid; +extern EFI_GUID gEfiExtScsiPassThruProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SdMmcPassThru.h b/MdePkg/Include/Protocol/SdMmcPassThru.h index ac5470b1ac..1db145e8b6 100644 --- a/MdePkg/Include/Protocol/SdMmcPassThru.h +++ b/MdePkg/Include/Protocol/SdMmcPassThru.h @@ -37,28 +37,28 @@ typedef enum { } EFI_SD_MMC_RESPONSE_TYPE; typedef struct _EFI_SD_MMC_COMMAND_BLOCK { - UINT16 CommandIndex; - UINT32 CommandArgument; - UINT32 CommandType; // One of the EFI_SD_MMC_COMMAND_TYPE values - UINT32 ResponseType; // One of the EFI_SD_MMC_RESPONSE_TYPE values + UINT16 CommandIndex; + UINT32 CommandArgument; + UINT32 CommandType; // One of the EFI_SD_MMC_COMMAND_TYPE values + UINT32 ResponseType; // One of the EFI_SD_MMC_RESPONSE_TYPE values } EFI_SD_MMC_COMMAND_BLOCK; typedef struct _EFI_SD_MMC_STATUS_BLOCK { - UINT32 Resp0; - UINT32 Resp1; - UINT32 Resp2; - UINT32 Resp3; + UINT32 Resp0; + UINT32 Resp1; + UINT32 Resp2; + UINT32 Resp3; } EFI_SD_MMC_STATUS_BLOCK; typedef struct _EFI_SD_MMC_PASS_THRU_COMMAND_PACKET { - UINT64 Timeout; - EFI_SD_MMC_COMMAND_BLOCK *SdMmcCmdBlk; - EFI_SD_MMC_STATUS_BLOCK *SdMmcStatusBlk; - VOID *InDataBuffer; - VOID *OutDataBuffer; - UINT32 InTransferLength; - UINT32 OutTransferLength; - EFI_STATUS TransactionStatus; + UINT64 Timeout; + EFI_SD_MMC_COMMAND_BLOCK *SdMmcCmdBlk; + EFI_SD_MMC_STATUS_BLOCK *SdMmcStatusBlk; + VOID *InDataBuffer; + VOID *OutDataBuffer; + UINT32 InTransferLength; + UINT32 OutTransferLength; + EFI_STATUS TransactionStatus; } EFI_SD_MMC_PASS_THRU_COMMAND_PACKET; /** @@ -100,12 +100,12 @@ typedef struct _EFI_SD_MMC_PASS_THRU_COMMAND_PACKET { **/ typedef EFI_STATUS -(EFIAPI *EFI_SD_MMC_PASS_THRU_PASSTHRU) ( +(EFIAPI *EFI_SD_MMC_PASS_THRU_PASSTHRU)( IN EFI_SD_MMC_PASS_THRU_PROTOCOL *This, IN UINT8 Slot, IN OUT EFI_SD_MMC_PASS_THRU_COMMAND_PACKET *Packet, IN EFI_EVENT Event OPTIONAL -); + ); /** Used to retrieve next slot numbers supported by the SD controller. The function @@ -138,10 +138,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SD_MMC_PASS_THRU_GET_NEXT_SLOT) ( +(EFIAPI *EFI_SD_MMC_PASS_THRU_GET_NEXT_SLOT)( IN EFI_SD_MMC_PASS_THRU_PROTOCOL *This, IN OUT UINT8 *Slot -); + ); /** Used to allocate and build a device path node for an SD card on the SD controller. @@ -179,11 +179,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SD_MMC_PASS_THRU_BUILD_DEVICE_PATH) ( +(EFIAPI *EFI_SD_MMC_PASS_THRU_BUILD_DEVICE_PATH)( IN EFI_SD_MMC_PASS_THRU_PROTOCOL *This, IN UINT8 Slot, OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath -); + ); /** This function retrieves an SD card slot number based on the input device path. @@ -208,11 +208,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SD_MMC_PASS_THRU_GET_SLOT_NUMBER) ( +(EFIAPI *EFI_SD_MMC_PASS_THRU_GET_SLOT_NUMBER)( IN EFI_SD_MMC_PASS_THRU_PROTOCOL *This, IN EFI_DEVICE_PATH_PROTOCOL *DevicePath, OUT UINT8 *Slot -); + ); /** Resets an SD card that is connected to the SD controller. @@ -239,20 +239,20 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SD_MMC_PASS_THRU_RESET_DEVICE) ( +(EFIAPI *EFI_SD_MMC_PASS_THRU_RESET_DEVICE)( IN EFI_SD_MMC_PASS_THRU_PROTOCOL *This, IN UINT8 Slot -); + ); struct _EFI_SD_MMC_PASS_THRU_PROTOCOL { - UINT32 IoAlign; - EFI_SD_MMC_PASS_THRU_PASSTHRU PassThru; - EFI_SD_MMC_PASS_THRU_GET_NEXT_SLOT GetNextSlot; - EFI_SD_MMC_PASS_THRU_BUILD_DEVICE_PATH BuildDevicePath; - EFI_SD_MMC_PASS_THRU_GET_SLOT_NUMBER GetSlotNumber; - EFI_SD_MMC_PASS_THRU_RESET_DEVICE ResetDevice; + UINT32 IoAlign; + EFI_SD_MMC_PASS_THRU_PASSTHRU PassThru; + EFI_SD_MMC_PASS_THRU_GET_NEXT_SLOT GetNextSlot; + EFI_SD_MMC_PASS_THRU_BUILD_DEVICE_PATH BuildDevicePath; + EFI_SD_MMC_PASS_THRU_GET_SLOT_NUMBER GetSlotNumber; + EFI_SD_MMC_PASS_THRU_RESET_DEVICE ResetDevice; }; -extern EFI_GUID gEfiSdMmcPassThruProtocolGuid; +extern EFI_GUID gEfiSdMmcPassThruProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Security.h b/MdePkg/Include/Protocol/Security.h index 0df2a22f28..d0c1c4df06 100644 --- a/MdePkg/Include/Protocol/Security.h +++ b/MdePkg/Include/Protocol/Security.h @@ -28,7 +28,7 @@ #define EFI_SECURITY_ARCH_PROTOCOL_GUID \ { 0xA46423E3, 0x4617, 0x49f1, {0xB9, 0xFF, 0xD1, 0xBF, 0xA9, 0x11, 0x58, 0x39 } } -typedef struct _EFI_SECURITY_ARCH_PROTOCOL EFI_SECURITY_ARCH_PROTOCOL; +typedef struct _EFI_SECURITY_ARCH_PROTOCOL EFI_SECURITY_ARCH_PROTOCOL; /** The EFI_SECURITY_ARCH_PROTOCOL (SAP) is used to abstract platform-specific @@ -89,9 +89,9 @@ EFI_STATUS /// attestation logging, and other exception operations. /// struct _EFI_SECURITY_ARCH_PROTOCOL { - EFI_SECURITY_FILE_AUTHENTICATION_STATE FileAuthenticationState; + EFI_SECURITY_FILE_AUTHENTICATION_STATE FileAuthenticationState; }; -extern EFI_GUID gEfiSecurityArchProtocolGuid; +extern EFI_GUID gEfiSecurityArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Security2.h b/MdePkg/Include/Protocol/Security2.h index 1fdc1d9c77..fd38f2cbed 100644 --- a/MdePkg/Include/Protocol/Security2.h +++ b/MdePkg/Include/Protocol/Security2.h @@ -31,7 +31,7 @@ #define EFI_SECURITY2_ARCH_PROTOCOL_GUID \ { 0x94ab2f58, 0x1438, 0x4ef1, {0x91, 0x52, 0x18, 0x94, 0x1a, 0x3a, 0x0e, 0x68 } } -typedef struct _EFI_SECURITY2_ARCH_PROTOCOL EFI_SECURITY2_ARCH_PROTOCOL; +typedef struct _EFI_SECURITY2_ARCH_PROTOCOL EFI_SECURITY2_ARCH_PROTOCOL; /** The DXE Foundation uses this service to measure and/or verify a UEFI image. @@ -78,13 +78,13 @@ typedef struct _EFI_SECURITY2_ARCH_PROTOCOL EFI_SECURITY2_ARCH_PROTOCOL; drivers from the device path specified by DevicePath. The image has been added into the list of the deferred images. **/ -typedef EFI_STATUS (EFIAPI *EFI_SECURITY2_FILE_AUTHENTICATION) ( +typedef EFI_STATUS (EFIAPI *EFI_SECURITY2_FILE_AUTHENTICATION)( IN CONST EFI_SECURITY2_ARCH_PROTOCOL *This, IN CONST EFI_DEVICE_PATH_PROTOCOL *File OPTIONAL, IN VOID *FileBuffer, IN UINTN FileSize, IN BOOLEAN BootPolicy -); + ); /// /// The EFI_SECURITY2_ARCH_PROTOCOL is used to abstract platform-specific policy from the @@ -93,9 +93,9 @@ typedef EFI_STATUS (EFIAPI *EFI_SECURITY2_FILE_AUTHENTICATION) ( /// or registered hashes). /// struct _EFI_SECURITY2_ARCH_PROTOCOL { - EFI_SECURITY2_FILE_AUTHENTICATION FileAuthentication; + EFI_SECURITY2_FILE_AUTHENTICATION FileAuthentication; }; -extern EFI_GUID gEfiSecurity2ArchProtocolGuid; +extern EFI_GUID gEfiSecurity2ArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SecurityPolicy.h b/MdePkg/Include/Protocol/SecurityPolicy.h index 9f6b525472..99a49bf81f 100644 --- a/MdePkg/Include/Protocol/SecurityPolicy.h +++ b/MdePkg/Include/Protocol/SecurityPolicy.h @@ -15,6 +15,6 @@ #define EFI_SECURITY_POLICY_PROTOCOL_GUID \ {0x78E4D245, 0xCD4D, 0x4a05, {0xA2, 0xBA, 0x47, 0x43, 0xE8, 0x6C, 0xFC, 0xAB} } -extern EFI_GUID gEfiSecurityPolicyProtocolGuid; +extern EFI_GUID gEfiSecurityPolicyProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SerialIo.h b/MdePkg/Include/Protocol/SerialIo.h index 16a865bfdc..30a2260fd7 100644 --- a/MdePkg/Include/Protocol/SerialIo.h +++ b/MdePkg/Include/Protocol/SerialIo.h @@ -29,11 +29,10 @@ typedef struct _EFI_SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL; - /// /// Backward-compatible with EFI1.1. /// -typedef EFI_SERIAL_IO_PROTOCOL SERIAL_IO_INTERFACE; +typedef EFI_SERIAL_IO_PROTOCOL SERIAL_IO_INTERFACE; /// /// Parity type that is computed or checked as each character is transmitted or received. If the @@ -80,13 +79,14 @@ typedef enum { // // Read Write // -#define EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE 0x00001000 -#define EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE 0x00002000 -#define EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE 0x00004000 +#define EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE 0x00001000 +#define EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE 0x00002000 +#define EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE 0x00004000 // // Serial IO Member Functions // + /** Reset the serial device. @@ -254,22 +254,22 @@ EFI_STATUS **/ typedef struct { - UINT32 ControlMask; + UINT32 ControlMask; // // current Attributes // - UINT32 Timeout; - UINT64 BaudRate; - UINT32 ReceiveFifoDepth; - UINT32 DataBits; - UINT32 Parity; - UINT32 StopBits; + UINT32 Timeout; + UINT64 BaudRate; + UINT32 ReceiveFifoDepth; + UINT32 DataBits; + UINT32 Parity; + UINT32 StopBits; } EFI_SERIAL_IO_MODE; -#define EFI_SERIAL_IO_PROTOCOL_REVISION 0x00010000 -#define EFI_SERIAL_IO_PROTOCOL_REVISION1p1 0x00010001 -#define SERIAL_IO_INTERFACE_REVISION EFI_SERIAL_IO_PROTOCOL_REVISION +#define EFI_SERIAL_IO_PROTOCOL_REVISION 0x00010000 +#define EFI_SERIAL_IO_PROTOCOL_REVISION1p1 0x00010001 +#define SERIAL_IO_INTERFACE_REVISION EFI_SERIAL_IO_PROTOCOL_REVISION /// /// The Serial I/O protocol is used to communicate with UART-style serial devices. @@ -282,17 +282,17 @@ struct _EFI_SERIAL_IO_PROTOCOL { /// must be backwards compatible. If a future version is not backwards compatible, /// it is not the same GUID. /// - UINT32 Revision; - EFI_SERIAL_RESET Reset; - EFI_SERIAL_SET_ATTRIBUTES SetAttributes; - EFI_SERIAL_SET_CONTROL_BITS SetControl; - EFI_SERIAL_GET_CONTROL_BITS GetControl; - EFI_SERIAL_WRITE Write; - EFI_SERIAL_READ Read; + UINT32 Revision; + EFI_SERIAL_RESET Reset; + EFI_SERIAL_SET_ATTRIBUTES SetAttributes; + EFI_SERIAL_SET_CONTROL_BITS SetControl; + EFI_SERIAL_GET_CONTROL_BITS GetControl; + EFI_SERIAL_WRITE Write; + EFI_SERIAL_READ Read; /// /// Pointer to SERIAL_IO_MODE data. /// - EFI_SERIAL_IO_MODE *Mode; + EFI_SERIAL_IO_MODE *Mode; /// /// Pointer to a GUID identifying the device connected to the serial port. /// This field is NULL when the protocol is installed by the serial port @@ -300,10 +300,10 @@ struct _EFI_SERIAL_IO_PROTOCOL { /// with a known device attached. The field will remain NULL if there is /// no platform serial device identification information available. /// - CONST EFI_GUID *DeviceTypeGuid; // Revision 1.1 + CONST EFI_GUID *DeviceTypeGuid; // Revision 1.1 }; -extern EFI_GUID gEfiSerialIoProtocolGuid; -extern EFI_GUID gEfiSerialTerminalDeviceTypeGuid; +extern EFI_GUID gEfiSerialIoProtocolGuid; +extern EFI_GUID gEfiSerialTerminalDeviceTypeGuid; #endif diff --git a/MdePkg/Include/Protocol/ServiceBinding.h b/MdePkg/Include/Protocol/ServiceBinding.h index 92047f7268..b39af73a95 100644 --- a/MdePkg/Include/Protocol/ServiceBinding.h +++ b/MdePkg/Include/Protocol/ServiceBinding.h @@ -81,8 +81,8 @@ EFI_STATUS /// protocol and calling DestroyChild() when it is finished with that protocol. /// struct _EFI_SERVICE_BINDING_PROTOCOL { - EFI_SERVICE_BINDING_CREATE_CHILD CreateChild; - EFI_SERVICE_BINDING_DESTROY_CHILD DestroyChild; + EFI_SERVICE_BINDING_CREATE_CHILD CreateChild; + EFI_SERVICE_BINDING_DESTROY_CHILD DestroyChild; }; #endif diff --git a/MdePkg/Include/Protocol/Shell.h b/MdePkg/Include/Protocol/Shell.h index cfb7878228..5efee49e19 100644 --- a/MdePkg/Include/Protocol/Shell.h +++ b/MdePkg/Include/Protocol/Shell.h @@ -22,110 +22,110 @@ typedef enum { /// /// The operation completed successfully. /// - SHELL_SUCCESS = 0, + SHELL_SUCCESS = 0, /// /// The image failed to load. /// - SHELL_LOAD_ERROR = 1, + SHELL_LOAD_ERROR = 1, /// /// The parameter was incorrect. /// - SHELL_INVALID_PARAMETER = 2, + SHELL_INVALID_PARAMETER = 2, /// /// The operation is not supported. /// - SHELL_UNSUPPORTED = 3, + SHELL_UNSUPPORTED = 3, /// /// The buffer was not the proper size for the request. /// - SHELL_BAD_BUFFER_SIZE = 4, + SHELL_BAD_BUFFER_SIZE = 4, /// /// The buffer was not large enough to hold the requested data. /// The required buffer size is returned in the appropriate /// parameter when this error occurs. /// - SHELL_BUFFER_TOO_SMALL = 5, + SHELL_BUFFER_TOO_SMALL = 5, /// /// There is no data pending upon return. /// - SHELL_NOT_READY = 6, + SHELL_NOT_READY = 6, /// /// The physical device reported an error while attempting the /// operation. /// - SHELL_DEVICE_ERROR = 7, + SHELL_DEVICE_ERROR = 7, /// /// The device cannot be written to. /// - SHELL_WRITE_PROTECTED = 8, + SHELL_WRITE_PROTECTED = 8, /// /// The resource has run out. /// - SHELL_OUT_OF_RESOURCES = 9, + SHELL_OUT_OF_RESOURCES = 9, /// /// An inconsistency was detected on the file system causing the /// operation to fail. /// - SHELL_VOLUME_CORRUPTED = 10, + SHELL_VOLUME_CORRUPTED = 10, /// /// There is no more space on the file system. /// - SHELL_VOLUME_FULL = 11, + SHELL_VOLUME_FULL = 11, /// /// The device does not contain any medium to perform the /// operation. /// - SHELL_NO_MEDIA = 12, + SHELL_NO_MEDIA = 12, /// /// The medium in the device has changed since the last /// access. /// - SHELL_MEDIA_CHANGED = 13, + SHELL_MEDIA_CHANGED = 13, /// /// The item was not found. /// - SHELL_NOT_FOUND = 14, + SHELL_NOT_FOUND = 14, /// /// Access was denied. /// - SHELL_ACCESS_DENIED = 15, + SHELL_ACCESS_DENIED = 15, // note the skipping of 16 and 17 /// /// A timeout time expired. /// - SHELL_TIMEOUT = 18, + SHELL_TIMEOUT = 18, /// /// The protocol has not been started. /// - SHELL_NOT_STARTED = 19, + SHELL_NOT_STARTED = 19, /// /// The protocol has already been started. /// - SHELL_ALREADY_STARTED = 20, + SHELL_ALREADY_STARTED = 20, /// /// The operation was aborted. /// - SHELL_ABORTED = 21, + SHELL_ABORTED = 21, // note the skipping of 22, 23, and 24 @@ -133,30 +133,29 @@ typedef enum { /// A function encountered an internal version that was /// incompatible with a version requested by the caller. /// - SHELL_INCOMPATIBLE_VERSION = 25, + SHELL_INCOMPATIBLE_VERSION = 25, /// /// The function was not performed due to a security violation. /// - SHELL_SECURITY_VIOLATION = 26, + SHELL_SECURITY_VIOLATION = 26, /// /// The function was performed and resulted in an unequal /// comparison.. /// - SHELL_NOT_EQUAL = 27 + SHELL_NOT_EQUAL = 27 } SHELL_STATUS; - // replaced EFI_LIST_ENTRY with LIST_ENTRY for simplicity. // they are identical outside of the name. typedef struct { - LIST_ENTRY Link; ///< Linked list members. - EFI_STATUS Status; ///< Status of opening the file. Valid only if Handle != NULL. - CONST CHAR16 *FullName; ///< Fully qualified filename. - CONST CHAR16 *FileName; ///< name of this file. - SHELL_FILE_HANDLE Handle; ///< Handle for interacting with the opened file or NULL if closed. - EFI_FILE_INFO *Info; ///< Pointer to the FileInfo struct for this file or NULL. + LIST_ENTRY Link; ///< Linked list members. + EFI_STATUS Status; ///< Status of opening the file. Valid only if Handle != NULL. + CONST CHAR16 *FullName; ///< Fully qualified filename. + CONST CHAR16 *FileName; ///< name of this file. + SHELL_FILE_HANDLE Handle; ///< Handle for interacting with the opened file or NULL if closed. + EFI_FILE_INFO *Info; ///< Pointer to the FileInfo struct for this file or NULL. } EFI_SHELL_FILE_INFO; /** @@ -168,7 +167,7 @@ typedef struct { **/ typedef BOOLEAN -(EFIAPI *EFI_SHELL_BATCH_IS_ACTIVE) ( +(EFIAPI *EFI_SHELL_BATCH_IS_ACTIVE)( VOID ); @@ -272,7 +271,7 @@ EFI_STATUS **/ typedef VOID -(EFIAPI *EFI_SHELL_DISABLE_PAGE_BREAK) ( +(EFIAPI *EFI_SHELL_DISABLE_PAGE_BREAK)( VOID ); @@ -281,7 +280,7 @@ VOID **/ typedef VOID -(EFIAPI *EFI_SHELL_ENABLE_PAGE_BREAK) ( +(EFIAPI *EFI_SHELL_ENABLE_PAGE_BREAK)( VOID ); @@ -318,7 +317,7 @@ VOID **/ typedef EFI_STATUS -(EFIAPI *EFI_SHELL_EXECUTE) ( +(EFIAPI *EFI_SHELL_EXECUTE)( IN EFI_HANDLE *ParentImageHandle, IN CHAR16 *CommandLine OPTIONAL, IN CHAR16 **Environment OPTIONAL, @@ -368,9 +367,9 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_SHELL_FIND_FILES_IN_DIR)( -IN SHELL_FILE_HANDLE FileDirHandle, -OUT EFI_SHELL_FILE_INFO **FileList -); + IN SHELL_FILE_HANDLE FileDirHandle, + OUT EFI_SHELL_FILE_INFO **FileList + ); /** Flushes data back to a device. @@ -406,7 +405,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SHELL_FREE_FILE_LIST) ( +(EFIAPI *EFI_SHELL_FREE_FILE_LIST)( IN EFI_SHELL_FILE_INFO **FileList ); @@ -428,7 +427,7 @@ EFI_STATUS **/ typedef CONST CHAR16 * -(EFIAPI *EFI_SHELL_GET_CUR_DIR) ( +(EFIAPI *EFI_SHELL_GET_CUR_DIR)( IN CONST CHAR16 *FileSystemMapping OPTIONAL ); @@ -468,7 +467,7 @@ typedef UINT32 EFI_SHELL_DEVICE_NAME_FLAGS; **/ typedef EFI_STATUS -(EFIAPI *EFI_SHELL_GET_DEVICE_NAME) ( +(EFIAPI *EFI_SHELL_GET_DEVICE_NAME)( IN EFI_HANDLE DeviceHandle, IN EFI_SHELL_DEVICE_NAME_FLAGS Flags, IN CHAR8 *Language, @@ -490,7 +489,7 @@ EFI_STATUS **/ typedef CONST EFI_DEVICE_PATH_PROTOCOL * -(EFIAPI *EFI_SHELL_GET_DEVICE_PATH_FROM_MAP) ( +(EFIAPI *EFI_SHELL_GET_DEVICE_PATH_FROM_MAP)( IN CONST CHAR16 *Mapping ); @@ -507,7 +506,7 @@ CONST EFI_DEVICE_PATH_PROTOCOL * **/ typedef EFI_DEVICE_PATH_PROTOCOL * -(EFIAPI *EFI_SHELL_GET_DEVICE_PATH_FROM_FILE_PATH) ( +(EFIAPI *EFI_SHELL_GET_DEVICE_PATH_FROM_FILE_PATH)( IN CONST CHAR16 *Path ); @@ -536,7 +535,7 @@ EFI_DEVICE_PATH_PROTOCOL * **/ typedef CONST CHAR16 * -(EFIAPI *EFI_SHELL_GET_ENV) ( +(EFIAPI *EFI_SHELL_GET_ENV)( IN CONST CHAR16 *Name OPTIONAL ); @@ -564,7 +563,7 @@ CONST CHAR16 * **/ typedef CONST CHAR16 * -(EFIAPI *EFI_SHELL_GET_ENV_EX) ( +(EFIAPI *EFI_SHELL_GET_ENV_EX)( IN CONST CHAR16 *Name, OUT UINT32 *Attributes OPTIONAL ); @@ -600,7 +599,7 @@ EFI_FILE_INFO * **/ typedef CHAR16 * -(EFIAPI *EFI_SHELL_GET_FILE_PATH_FROM_DEVICE_PATH) ( +(EFIAPI *EFI_SHELL_GET_FILE_PATH_FROM_DEVICE_PATH)( IN CONST EFI_DEVICE_PATH_PROTOCOL *Path ); @@ -717,7 +716,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SHELL_GET_HELP_TEXT) ( +(EFIAPI *EFI_SHELL_GET_HELP_TEXT)( IN CONST CHAR16 *Command, IN CONST CHAR16 *Sections OPTIONAL, OUT CHAR16 **HelpText @@ -745,7 +744,7 @@ EFI_STATUS **/ typedef CONST CHAR16 * -(EFIAPI *EFI_SHELL_GET_MAP_FROM_DEVICE_PATH) ( +(EFIAPI *EFI_SHELL_GET_MAP_FROM_DEVICE_PATH)( IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath ); @@ -759,7 +758,7 @@ CONST CHAR16 * **/ typedef BOOLEAN -(EFIAPI *EFI_SHELL_GET_PAGE_BREAK) ( +(EFIAPI *EFI_SHELL_GET_PAGE_BREAK)( VOID ); @@ -773,9 +772,9 @@ BOOLEAN **/ typedef BOOLEAN -(EFIAPI *EFI_SHELL_IS_ROOT_SHELL) ( -VOID -); +(EFIAPI *EFI_SHELL_IS_ROOT_SHELL)( + VOID + ); /** Opens a file or a directory by file name. @@ -831,7 +830,7 @@ VOID **/ typedef EFI_STATUS -(EFIAPI *EFI_SHELL_OPEN_FILE_BY_NAME) ( +(EFIAPI *EFI_SHELL_OPEN_FILE_BY_NAME)( IN CONST CHAR16 *FileName, OUT SHELL_FILE_HANDLE *FileHandle, IN UINT64 OpenMode @@ -854,7 +853,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SHELL_OPEN_FILE_LIST) ( +(EFIAPI *EFI_SHELL_OPEN_FILE_LIST)( IN CHAR16 *Path, IN UINT64 OpenMode, IN OUT EFI_SHELL_FILE_INFO **FileList @@ -926,7 +925,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SHELL_READ_FILE) ( +(EFIAPI *EFI_SHELL_READ_FILE)( IN SHELL_FILE_HANDLE FileHandle, IN OUT UINTN *ReadSize, IN OUT VOID *Buffer @@ -965,7 +964,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SHELL_REMOVE_DUP_IN_FILE_LIST) ( +(EFIAPI *EFI_SHELL_REMOVE_DUP_IN_FILE_LIST)( IN EFI_SHELL_FILE_INFO **FileList ); @@ -1046,7 +1045,7 @@ CONST CHAR16 * **/ typedef EFI_STATUS -(EFIAPI *EFI_SHELL_SET_CUR_DIR) ( +(EFIAPI *EFI_SHELL_SET_CUR_DIR)( IN CONST CHAR16 *FileSystem OPTIONAL, IN CONST CHAR16 *Dir ); @@ -1074,7 +1073,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SHELL_SET_ENV) ( +(EFIAPI *EFI_SHELL_SET_ENV)( IN CONST CHAR16 *Name, IN CONST CHAR16 *Value, IN BOOLEAN Volatile @@ -1203,56 +1202,56 @@ EFI_STATUS // } // typedef struct _EFI_SHELL_PROTOCOL { - EFI_SHELL_EXECUTE Execute; - EFI_SHELL_GET_ENV GetEnv; - EFI_SHELL_SET_ENV SetEnv; - EFI_SHELL_GET_ALIAS GetAlias; - EFI_SHELL_SET_ALIAS SetAlias; - EFI_SHELL_GET_HELP_TEXT GetHelpText; - EFI_SHELL_GET_DEVICE_PATH_FROM_MAP GetDevicePathFromMap; - EFI_SHELL_GET_MAP_FROM_DEVICE_PATH GetMapFromDevicePath; - EFI_SHELL_GET_DEVICE_PATH_FROM_FILE_PATH GetDevicePathFromFilePath; - EFI_SHELL_GET_FILE_PATH_FROM_DEVICE_PATH GetFilePathFromDevicePath; - EFI_SHELL_SET_MAP SetMap; - EFI_SHELL_GET_CUR_DIR GetCurDir; - EFI_SHELL_SET_CUR_DIR SetCurDir; - EFI_SHELL_OPEN_FILE_LIST OpenFileList; - EFI_SHELL_FREE_FILE_LIST FreeFileList; - EFI_SHELL_REMOVE_DUP_IN_FILE_LIST RemoveDupInFileList; - EFI_SHELL_BATCH_IS_ACTIVE BatchIsActive; - EFI_SHELL_IS_ROOT_SHELL IsRootShell; - EFI_SHELL_ENABLE_PAGE_BREAK EnablePageBreak; - EFI_SHELL_DISABLE_PAGE_BREAK DisablePageBreak; - EFI_SHELL_GET_PAGE_BREAK GetPageBreak; - EFI_SHELL_GET_DEVICE_NAME GetDeviceName; - EFI_SHELL_GET_FILE_INFO GetFileInfo; - EFI_SHELL_SET_FILE_INFO SetFileInfo; - EFI_SHELL_OPEN_FILE_BY_NAME OpenFileByName; - EFI_SHELL_CLOSE_FILE CloseFile; - EFI_SHELL_CREATE_FILE CreateFile; - EFI_SHELL_READ_FILE ReadFile; - EFI_SHELL_WRITE_FILE WriteFile; - EFI_SHELL_DELETE_FILE DeleteFile; - EFI_SHELL_DELETE_FILE_BY_NAME DeleteFileByName; - EFI_SHELL_GET_FILE_POSITION GetFilePosition; - EFI_SHELL_SET_FILE_POSITION SetFilePosition; - EFI_SHELL_FLUSH_FILE FlushFile; - EFI_SHELL_FIND_FILES FindFiles; - EFI_SHELL_FIND_FILES_IN_DIR FindFilesInDir; - EFI_SHELL_GET_FILE_SIZE GetFileSize; - EFI_SHELL_OPEN_ROOT OpenRoot; - EFI_SHELL_OPEN_ROOT_BY_HANDLE OpenRootByHandle; - EFI_EVENT ExecutionBreak; - UINT32 MajorVersion; - UINT32 MinorVersion; + EFI_SHELL_EXECUTE Execute; + EFI_SHELL_GET_ENV GetEnv; + EFI_SHELL_SET_ENV SetEnv; + EFI_SHELL_GET_ALIAS GetAlias; + EFI_SHELL_SET_ALIAS SetAlias; + EFI_SHELL_GET_HELP_TEXT GetHelpText; + EFI_SHELL_GET_DEVICE_PATH_FROM_MAP GetDevicePathFromMap; + EFI_SHELL_GET_MAP_FROM_DEVICE_PATH GetMapFromDevicePath; + EFI_SHELL_GET_DEVICE_PATH_FROM_FILE_PATH GetDevicePathFromFilePath; + EFI_SHELL_GET_FILE_PATH_FROM_DEVICE_PATH GetFilePathFromDevicePath; + EFI_SHELL_SET_MAP SetMap; + EFI_SHELL_GET_CUR_DIR GetCurDir; + EFI_SHELL_SET_CUR_DIR SetCurDir; + EFI_SHELL_OPEN_FILE_LIST OpenFileList; + EFI_SHELL_FREE_FILE_LIST FreeFileList; + EFI_SHELL_REMOVE_DUP_IN_FILE_LIST RemoveDupInFileList; + EFI_SHELL_BATCH_IS_ACTIVE BatchIsActive; + EFI_SHELL_IS_ROOT_SHELL IsRootShell; + EFI_SHELL_ENABLE_PAGE_BREAK EnablePageBreak; + EFI_SHELL_DISABLE_PAGE_BREAK DisablePageBreak; + EFI_SHELL_GET_PAGE_BREAK GetPageBreak; + EFI_SHELL_GET_DEVICE_NAME GetDeviceName; + EFI_SHELL_GET_FILE_INFO GetFileInfo; + EFI_SHELL_SET_FILE_INFO SetFileInfo; + EFI_SHELL_OPEN_FILE_BY_NAME OpenFileByName; + EFI_SHELL_CLOSE_FILE CloseFile; + EFI_SHELL_CREATE_FILE CreateFile; + EFI_SHELL_READ_FILE ReadFile; + EFI_SHELL_WRITE_FILE WriteFile; + EFI_SHELL_DELETE_FILE DeleteFile; + EFI_SHELL_DELETE_FILE_BY_NAME DeleteFileByName; + EFI_SHELL_GET_FILE_POSITION GetFilePosition; + EFI_SHELL_SET_FILE_POSITION SetFilePosition; + EFI_SHELL_FLUSH_FILE FlushFile; + EFI_SHELL_FIND_FILES FindFiles; + EFI_SHELL_FIND_FILES_IN_DIR FindFilesInDir; + EFI_SHELL_GET_FILE_SIZE GetFileSize; + EFI_SHELL_OPEN_ROOT OpenRoot; + EFI_SHELL_OPEN_ROOT_BY_HANDLE OpenRootByHandle; + EFI_EVENT ExecutionBreak; + UINT32 MajorVersion; + UINT32 MinorVersion; // Added for Shell 2.1 - EFI_SHELL_REGISTER_GUID_NAME RegisterGuidName; - EFI_SHELL_GET_GUID_NAME GetGuidName; - EFI_SHELL_GET_GUID_FROM_NAME GetGuidFromName; - EFI_SHELL_GET_ENV_EX GetEnvEx; + EFI_SHELL_REGISTER_GUID_NAME RegisterGuidName; + EFI_SHELL_GET_GUID_NAME GetGuidName; + EFI_SHELL_GET_GUID_FROM_NAME GetGuidFromName; + EFI_SHELL_GET_ENV_EX GetEnvEx; } EFI_SHELL_PROTOCOL; -extern EFI_GUID gEfiShellProtocolGuid; +extern EFI_GUID gEfiShellProtocolGuid; enum ShellVersion { SHELL_MAJOR_VERSION = 2, diff --git a/MdePkg/Include/Protocol/ShellDynamicCommand.h b/MdePkg/Include/Protocol/ShellDynamicCommand.h index 7ab3104357..f1bb59d700 100644 --- a/MdePkg/Include/Protocol/ShellDynamicCommand.h +++ b/MdePkg/Include/Protocol/ShellDynamicCommand.h @@ -19,13 +19,11 @@ 0x3c7200e9, 0x005f, 0x4ea4, { 0x87, 0xde, 0xa3, 0xdf, 0xac, 0x8a, 0x27, 0xc3 } \ } - // // Define for forward reference. // typedef struct _EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL; - /** This is the shell command handler function pointer callback type. This function handles the command when it is invoked in the shell. @@ -41,7 +39,7 @@ typedef struct _EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL EFI_SHELL_DYNAMIC_COMMAND_PRO **/ typedef SHELL_STATUS -(EFIAPI * SHELL_COMMAND_HANDLER)( +(EFIAPI *SHELL_COMMAND_HANDLER)( IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL *This, IN EFI_SYSTEM_TABLE *SystemTable, IN EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters, @@ -59,21 +57,19 @@ SHELL_STATUS @return string Pool allocated help string, must be freed by caller **/ typedef -CHAR16* -(EFIAPI * SHELL_COMMAND_GETHELP)( +CHAR16 * +(EFIAPI *SHELL_COMMAND_GETHELP)( IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL *This, IN CONST CHAR8 *Language ); /// EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL protocol structure. struct _EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL { - - CONST CHAR16 *CommandName; - SHELL_COMMAND_HANDLER Handler; - SHELL_COMMAND_GETHELP GetHelp; - + CONST CHAR16 *CommandName; + SHELL_COMMAND_HANDLER Handler; + SHELL_COMMAND_GETHELP GetHelp; }; -extern EFI_GUID gEfiShellDynamicCommandProtocolGuid; +extern EFI_GUID gEfiShellDynamicCommandProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/ShellParameters.h b/MdePkg/Include/Protocol/ShellParameters.h index 1f939bd6dd..847e1a1d85 100644 --- a/MdePkg/Include/Protocol/ShellParameters.h +++ b/MdePkg/Include/Protocol/ShellParameters.h @@ -23,32 +23,32 @@ typedef struct _EFI_SHELL_PARAMETERS_PROTOCOL { /// path of the executable. Any quotation marks that were used to preserve /// whitespace have been removed. /// - CHAR16 **Argv; + CHAR16 **Argv; /// /// The number of elements in the Argv array. /// - UINTN Argc; + UINTN Argc; /// /// The file handle for the standard input for this executable. This may be different /// from the ConInHandle in EFI_SYSTEM_TABLE. /// - SHELL_FILE_HANDLE StdIn; + SHELL_FILE_HANDLE StdIn; /// /// The file handle for the standard output for this executable. This may be different /// from the ConOutHandle in EFI_SYSTEM_TABLE. /// - SHELL_FILE_HANDLE StdOut; + SHELL_FILE_HANDLE StdOut; /// /// The file handle for the standard error output for this executable. This may be /// different from the StdErrHandle in EFI_SYSTEM_TABLE. /// - SHELL_FILE_HANDLE StdErr; + SHELL_FILE_HANDLE StdErr; } EFI_SHELL_PARAMETERS_PROTOCOL; -extern EFI_GUID gEfiShellParametersProtocolGuid; +extern EFI_GUID gEfiShellParametersProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SimpleFileSystem.h b/MdePkg/Include/Protocol/SimpleFileSystem.h index 38d54db807..5c28ae7737 100644 --- a/MdePkg/Include/Protocol/SimpleFileSystem.h +++ b/MdePkg/Include/Protocol/SimpleFileSystem.h @@ -20,21 +20,21 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0x964e5b22, 0x6459, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \ } -typedef struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL; +typedef struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL; -typedef struct _EFI_FILE_PROTOCOL EFI_FILE_PROTOCOL; -typedef struct _EFI_FILE_PROTOCOL *EFI_FILE_HANDLE; +typedef struct _EFI_FILE_PROTOCOL EFI_FILE_PROTOCOL; +typedef struct _EFI_FILE_PROTOCOL *EFI_FILE_HANDLE; /// /// Protocol GUID name defined in EFI1.1. /// -#define SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID +#define SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID /// /// Protocol name defined in EFI1.1. /// -typedef EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_FILE_IO_INTERFACE; -typedef EFI_FILE_PROTOCOL EFI_FILE; +typedef EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_FILE_IO_INTERFACE; +typedef EFI_FILE_PROTOCOL EFI_FILE; /** Open the root directory on a volume. @@ -76,8 +76,8 @@ struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL { /// specified by this specification is 0x00010000. All future revisions /// must be backwards compatible. /// - UINT64 Revision; - EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME OpenVolume; + UINT64 Revision; + EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME OpenVolume; }; /** @@ -130,13 +130,13 @@ EFI_STATUS // // File attributes // -#define EFI_FILE_READ_ONLY 0x0000000000000001ULL -#define EFI_FILE_HIDDEN 0x0000000000000002ULL -#define EFI_FILE_SYSTEM 0x0000000000000004ULL -#define EFI_FILE_RESERVED 0x0000000000000008ULL -#define EFI_FILE_DIRECTORY 0x0000000000000010ULL -#define EFI_FILE_ARCHIVE 0x0000000000000020ULL -#define EFI_FILE_VALID_ATTR 0x0000000000000037ULL +#define EFI_FILE_READ_ONLY 0x0000000000000001ULL +#define EFI_FILE_HIDDEN 0x0000000000000002ULL +#define EFI_FILE_SYSTEM 0x0000000000000004ULL +#define EFI_FILE_RESERVED 0x0000000000000008ULL +#define EFI_FILE_DIRECTORY 0x0000000000000010ULL +#define EFI_FILE_ARCHIVE 0x0000000000000020ULL +#define EFI_FILE_VALID_ATTR 0x0000000000000037ULL /** Closes a specified file handle. @@ -365,12 +365,12 @@ typedef struct { // The caller must be prepared to handle the case where the callback associated with Event // occurs before the original asynchronous I/O request call returns. // - EFI_EVENT Event; + EFI_EVENT Event; // // Defines whether or not the signaled event encountered an error. // - EFI_STATUS Status; + EFI_STATUS Status; // // For OpenEx(): Not Used, ignored. @@ -380,7 +380,7 @@ typedef struct { // In both cases, the size is measured in bytes. // For FlushEx(): Not used, ignored. // - UINTN BufferSize; + UINTN BufferSize; // // For OpenEx(): Not Used, ignored. @@ -388,7 +388,7 @@ typedef struct { // For WriteEx(): The buffer of data to write. // For FlushEx(): Not Used, ignored. // - VOID *Buffer; + VOID *Buffer; } EFI_FILE_IO_TOKEN; /** @@ -434,7 +434,6 @@ EFI_STATUS IN OUT EFI_FILE_IO_TOKEN *Token ); - /** Reads data from a file. @@ -453,11 +452,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_FILE_READ_EX) ( +(EFIAPI *EFI_FILE_READ_EX)( IN EFI_FILE_PROTOCOL *This, IN OUT EFI_FILE_IO_TOKEN *Token -); - + ); /** Writes data to a file. @@ -480,10 +478,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_FILE_WRITE_EX) ( +(EFIAPI *EFI_FILE_WRITE_EX)( IN EFI_FILE_PROTOCOL *This, IN OUT EFI_FILE_IO_TOKEN *Token -); + ); /** Flushes all modified data associated with a file to a device. @@ -506,19 +504,19 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_FILE_FLUSH_EX) ( +(EFIAPI *EFI_FILE_FLUSH_EX)( IN EFI_FILE_PROTOCOL *This, IN OUT EFI_FILE_IO_TOKEN *Token ); -#define EFI_FILE_PROTOCOL_REVISION 0x00010000 -#define EFI_FILE_PROTOCOL_REVISION2 0x00020000 -#define EFI_FILE_PROTOCOL_LATEST_REVISION EFI_FILE_PROTOCOL_REVISION2 +#define EFI_FILE_PROTOCOL_REVISION 0x00010000 +#define EFI_FILE_PROTOCOL_REVISION2 0x00020000 +#define EFI_FILE_PROTOCOL_LATEST_REVISION EFI_FILE_PROTOCOL_REVISION2 // // Revision defined in EFI1.1. // -#define EFI_FILE_REVISION EFI_FILE_PROTOCOL_REVISION +#define EFI_FILE_REVISION EFI_FILE_PROTOCOL_REVISION /// /// The EFI_FILE_PROTOCOL provides file IO access to supported file systems. @@ -533,24 +531,23 @@ struct _EFI_FILE_PROTOCOL { /// by this specification is EFI_FILE_PROTOCOL_LATEST_REVISION. /// Future versions are required to be backward compatible to version 1.0. /// - UINT64 Revision; - EFI_FILE_OPEN Open; - EFI_FILE_CLOSE Close; - EFI_FILE_DELETE Delete; - EFI_FILE_READ Read; - EFI_FILE_WRITE Write; - EFI_FILE_GET_POSITION GetPosition; - EFI_FILE_SET_POSITION SetPosition; - EFI_FILE_GET_INFO GetInfo; - EFI_FILE_SET_INFO SetInfo; - EFI_FILE_FLUSH Flush; - EFI_FILE_OPEN_EX OpenEx; - EFI_FILE_READ_EX ReadEx; - EFI_FILE_WRITE_EX WriteEx; - EFI_FILE_FLUSH_EX FlushEx; + UINT64 Revision; + EFI_FILE_OPEN Open; + EFI_FILE_CLOSE Close; + EFI_FILE_DELETE Delete; + EFI_FILE_READ Read; + EFI_FILE_WRITE Write; + EFI_FILE_GET_POSITION GetPosition; + EFI_FILE_SET_POSITION SetPosition; + EFI_FILE_GET_INFO GetInfo; + EFI_FILE_SET_INFO SetInfo; + EFI_FILE_FLUSH Flush; + EFI_FILE_OPEN_EX OpenEx; + EFI_FILE_READ_EX ReadEx; + EFI_FILE_WRITE_EX WriteEx; + EFI_FILE_FLUSH_EX FlushEx; }; - -extern EFI_GUID gEfiSimpleFileSystemProtocolGuid; +extern EFI_GUID gEfiSimpleFileSystemProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SimpleNetwork.h b/MdePkg/Include/Protocol/SimpleNetwork.h index 2f4ae0dd97..29ede243df 100644 --- a/MdePkg/Include/Protocol/SimpleNetwork.h +++ b/MdePkg/Include/Protocol/SimpleNetwork.h @@ -25,13 +25,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0xA19832B9, 0xAC25, 0x11D3, {0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D } \ } -typedef struct _EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK_PROTOCOL; - +typedef struct _EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK_PROTOCOL; /// /// Protocol defined in EFI1.1. /// -typedef EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK; +typedef EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK; /// /// Simple Network Protocol data structures. @@ -41,99 +40,99 @@ typedef struct { /// Total number of frames received. Includes frames with errors and /// dropped frames. /// - UINT64 RxTotalFrames; + UINT64 RxTotalFrames; /// /// Number of valid frames received and copied into receive buffers. /// - UINT64 RxGoodFrames; + UINT64 RxGoodFrames; /// /// Number of frames below the minimum length for the media. /// This would be <64 for ethernet. /// - UINT64 RxUndersizeFrames; + UINT64 RxUndersizeFrames; /// /// Number of frames longer than the maxminum length for the /// media. This would be >1500 for ethernet. /// - UINT64 RxOversizeFrames; + UINT64 RxOversizeFrames; /// /// Valid frames that were dropped because receive buffers were full. /// - UINT64 RxDroppedFrames; + UINT64 RxDroppedFrames; /// /// Number of valid unicast frames received and not dropped. /// - UINT64 RxUnicastFrames; + UINT64 RxUnicastFrames; /// /// Number of valid broadcast frames received and not dropped. /// - UINT64 RxBroadcastFrames; + UINT64 RxBroadcastFrames; /// /// Number of valid mutlicast frames received and not dropped. /// - UINT64 RxMulticastFrames; + UINT64 RxMulticastFrames; /// /// Number of frames w/ CRC or alignment errors. /// - UINT64 RxCrcErrorFrames; + UINT64 RxCrcErrorFrames; /// /// Total number of bytes received. Includes frames with errors /// and dropped frames. // - UINT64 RxTotalBytes; + UINT64 RxTotalBytes; /// /// Transmit statistics. /// - UINT64 TxTotalFrames; - UINT64 TxGoodFrames; - UINT64 TxUndersizeFrames; - UINT64 TxOversizeFrames; - UINT64 TxDroppedFrames; - UINT64 TxUnicastFrames; - UINT64 TxBroadcastFrames; - UINT64 TxMulticastFrames; - UINT64 TxCrcErrorFrames; - UINT64 TxTotalBytes; + UINT64 TxTotalFrames; + UINT64 TxGoodFrames; + UINT64 TxUndersizeFrames; + UINT64 TxOversizeFrames; + UINT64 TxDroppedFrames; + UINT64 TxUnicastFrames; + UINT64 TxBroadcastFrames; + UINT64 TxMulticastFrames; + UINT64 TxCrcErrorFrames; + UINT64 TxTotalBytes; /// /// Number of collisions detection on this subnet. /// - UINT64 Collisions; + UINT64 Collisions; /// /// Number of frames destined for unsupported protocol. /// - UINT64 UnsupportedProtocol; + UINT64 UnsupportedProtocol; /// /// Number of valid frames received that were duplicated. /// - UINT64 RxDuplicatedFrames; + UINT64 RxDuplicatedFrames; /// /// Number of encrypted frames received that failed to decrypt. /// - UINT64 RxDecryptErrorFrames; + UINT64 RxDecryptErrorFrames; /// /// Number of frames that failed to transmit after exceeding the retry limit. /// - UINT64 TxErrorFrames; + UINT64 TxErrorFrames; /// /// Number of frames transmitted successfully after more than one attempt. /// - UINT64 TxRetryFrames; + UINT64 TxRetryFrames; } EFI_NETWORK_STATISTICS; /// @@ -154,97 +153,98 @@ typedef enum { #define EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS 0x08 #define EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST 0x10 -#define EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT 0x01 -#define EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT 0x02 -#define EFI_SIMPLE_NETWORK_COMMAND_INTERRUPT 0x04 -#define EFI_SIMPLE_NETWORK_SOFTWARE_INTERRUPT 0x08 +#define EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT 0x01 +#define EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT 0x02 +#define EFI_SIMPLE_NETWORK_COMMAND_INTERRUPT 0x04 +#define EFI_SIMPLE_NETWORK_SOFTWARE_INTERRUPT 0x08 -#define MAX_MCAST_FILTER_CNT 16 +#define MAX_MCAST_FILTER_CNT 16 typedef struct { /// /// Reports the current state of the network interface. /// - UINT32 State; + UINT32 State; /// /// The size, in bytes, of the network interface's HW address. /// - UINT32 HwAddressSize; + UINT32 HwAddressSize; /// /// The size, in bytes, of the network interface's media header. /// - UINT32 MediaHeaderSize; + UINT32 MediaHeaderSize; /// /// The maximum size, in bytes, of the packets supported by the network interface. /// - UINT32 MaxPacketSize; + UINT32 MaxPacketSize; /// /// The size, in bytes, of the NVRAM device attached to the network interface. /// - UINT32 NvRamSize; + UINT32 NvRamSize; /// /// The size that must be used for all NVRAM reads and writes. The /// start address for NVRAM read and write operations and the total /// length of those operations, must be a multiple of this value. The /// legal values for this field are 0, 1, 2, 4, and 8. /// - UINT32 NvRamAccessSize; + UINT32 NvRamAccessSize; /// /// The multicast receive filter settings supported by the network interface. /// - UINT32 ReceiveFilterMask; + UINT32 ReceiveFilterMask; /// /// The current multicast receive filter settings. /// - UINT32 ReceiveFilterSetting; + UINT32 ReceiveFilterSetting; /// /// The maximum number of multicast address receive filters supported by the driver. /// - UINT32 MaxMCastFilterCount; + UINT32 MaxMCastFilterCount; /// /// The current number of multicast address receive filters. /// - UINT32 MCastFilterCount; + UINT32 MCastFilterCount; /// /// Array containing the addresses of the current multicast address receive filters. /// - EFI_MAC_ADDRESS MCastFilter[MAX_MCAST_FILTER_CNT]; + EFI_MAC_ADDRESS MCastFilter[MAX_MCAST_FILTER_CNT]; /// /// The current HW MAC address for the network interface. /// - EFI_MAC_ADDRESS CurrentAddress; + EFI_MAC_ADDRESS CurrentAddress; /// /// The current HW MAC address for broadcast packets. /// - EFI_MAC_ADDRESS BroadcastAddress; + EFI_MAC_ADDRESS BroadcastAddress; /// /// The permanent HW MAC address for the network interface. /// - EFI_MAC_ADDRESS PermanentAddress; + EFI_MAC_ADDRESS PermanentAddress; /// /// The interface type of the network interface. /// - UINT8 IfType; + UINT8 IfType; /// /// TRUE if the HW MAC address can be changed. /// - BOOLEAN MacAddressChangeable; + BOOLEAN MacAddressChangeable; /// /// TRUE if the network interface can transmit more than one packet at a time. /// - BOOLEAN MultipleTxSupported; + BOOLEAN MultipleTxSupported; /// /// TRUE if the presence of media can be determined; otherwise FALSE. /// - BOOLEAN MediaPresentSupported; + BOOLEAN MediaPresentSupported; /// /// TRUE if media are connected to the network interface; otherwise FALSE. /// - BOOLEAN MediaPresent; + BOOLEAN MediaPresent; } EFI_SIMPLE_NETWORK_MODE; // // Protocol Member Functions // + /** Changes the state of a network interface from "stopped" to "started". @@ -632,7 +632,7 @@ EFI_STATUS // // Revision defined in EFI1.1 // -#define EFI_SIMPLE_NETWORK_INTERFACE_REVISION EFI_SIMPLE_NETWORK_PROTOCOL_REVISION +#define EFI_SIMPLE_NETWORK_INTERFACE_REVISION EFI_SIMPLE_NETWORK_PROTOCOL_REVISION /// /// The EFI_SIMPLE_NETWORK_PROTOCOL protocol is used to initialize access @@ -646,30 +646,30 @@ struct _EFI_SIMPLE_NETWORK_PROTOCOL { /// be backwards compatible. If a future version is not backwards compatible /// it is not the same GUID. /// - UINT64 Revision; - EFI_SIMPLE_NETWORK_START Start; - EFI_SIMPLE_NETWORK_STOP Stop; - EFI_SIMPLE_NETWORK_INITIALIZE Initialize; - EFI_SIMPLE_NETWORK_RESET Reset; - EFI_SIMPLE_NETWORK_SHUTDOWN Shutdown; - EFI_SIMPLE_NETWORK_RECEIVE_FILTERS ReceiveFilters; - EFI_SIMPLE_NETWORK_STATION_ADDRESS StationAddress; - EFI_SIMPLE_NETWORK_STATISTICS Statistics; - EFI_SIMPLE_NETWORK_MCAST_IP_TO_MAC MCastIpToMac; - EFI_SIMPLE_NETWORK_NVDATA NvData; - EFI_SIMPLE_NETWORK_GET_STATUS GetStatus; - EFI_SIMPLE_NETWORK_TRANSMIT Transmit; - EFI_SIMPLE_NETWORK_RECEIVE Receive; + UINT64 Revision; + EFI_SIMPLE_NETWORK_START Start; + EFI_SIMPLE_NETWORK_STOP Stop; + EFI_SIMPLE_NETWORK_INITIALIZE Initialize; + EFI_SIMPLE_NETWORK_RESET Reset; + EFI_SIMPLE_NETWORK_SHUTDOWN Shutdown; + EFI_SIMPLE_NETWORK_RECEIVE_FILTERS ReceiveFilters; + EFI_SIMPLE_NETWORK_STATION_ADDRESS StationAddress; + EFI_SIMPLE_NETWORK_STATISTICS Statistics; + EFI_SIMPLE_NETWORK_MCAST_IP_TO_MAC MCastIpToMac; + EFI_SIMPLE_NETWORK_NVDATA NvData; + EFI_SIMPLE_NETWORK_GET_STATUS GetStatus; + EFI_SIMPLE_NETWORK_TRANSMIT Transmit; + EFI_SIMPLE_NETWORK_RECEIVE Receive; /// /// Event used with WaitForEvent() to wait for a packet to be received. /// - EFI_EVENT WaitForPacket; + EFI_EVENT WaitForPacket; /// /// Pointer to the EFI_SIMPLE_NETWORK_MODE data for the device. /// - EFI_SIMPLE_NETWORK_MODE *Mode; + EFI_SIMPLE_NETWORK_MODE *Mode; }; -extern EFI_GUID gEfiSimpleNetworkProtocolGuid; +extern EFI_GUID gEfiSimpleNetworkProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SimplePointer.h b/MdePkg/Include/Protocol/SimplePointer.h index c6314145fb..f8d45a6bc2 100644 --- a/MdePkg/Include/Protocol/SimplePointer.h +++ b/MdePkg/Include/Protocol/SimplePointer.h @@ -16,7 +16,7 @@ 0x31878c87, 0xb75, 0x11d5, {0x9a, 0x4f, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ } -typedef struct _EFI_SIMPLE_POINTER_PROTOCOL EFI_SIMPLE_POINTER_PROTOCOL; +typedef struct _EFI_SIMPLE_POINTER_PROTOCOL EFI_SIMPLE_POINTER_PROTOCOL; // // Data structures @@ -25,25 +25,25 @@ typedef struct { /// /// The signed distance in counts that the pointer device has been moved along the x-axis. /// - INT32 RelativeMovementX; + INT32 RelativeMovementX; /// /// The signed distance in counts that the pointer device has been moved along the y-axis. /// - INT32 RelativeMovementY; + INT32 RelativeMovementY; /// /// The signed distance in counts that the pointer device has been moved along the z-axis. /// - INT32 RelativeMovementZ; + INT32 RelativeMovementZ; /// /// If TRUE, then the left button of the pointer device is being /// pressed. If FALSE, then the left button of the pointer device is not being pressed. /// - BOOLEAN LeftButton; + BOOLEAN LeftButton; /// /// If TRUE, then the right button of the pointer device is being /// pressed. If FALSE, then the right button of the pointer device is not being pressed. /// - BOOLEAN RightButton; + BOOLEAN RightButton; } EFI_SIMPLE_POINTER_STATE; typedef struct { @@ -51,25 +51,25 @@ typedef struct { /// The resolution of the pointer device on the x-axis in counts/mm. /// If 0, then the pointer device does not support an x-axis. /// - UINT64 ResolutionX; + UINT64 ResolutionX; /// /// The resolution of the pointer device on the y-axis in counts/mm. /// If 0, then the pointer device does not support an x-axis. /// - UINT64 ResolutionY; + UINT64 ResolutionY; /// /// The resolution of the pointer device on the z-axis in counts/mm. /// If 0, then the pointer device does not support an x-axis. /// - UINT64 ResolutionZ; + UINT64 ResolutionZ; /// /// TRUE if a left button is present on the pointer device. Otherwise FALSE. /// - BOOLEAN LeftButton; + BOOLEAN LeftButton; /// /// TRUE if a right button is present on the pointer device. Otherwise FALSE. /// - BOOLEAN RightButton; + BOOLEAN RightButton; } EFI_SIMPLE_POINTER_MODE; /** @@ -120,18 +120,18 @@ EFI_STATUS /// retrieve the capabilities of the pointer device. /// struct _EFI_SIMPLE_POINTER_PROTOCOL { - EFI_SIMPLE_POINTER_RESET Reset; - EFI_SIMPLE_POINTER_GET_STATE GetState; + EFI_SIMPLE_POINTER_RESET Reset; + EFI_SIMPLE_POINTER_GET_STATE GetState; /// /// Event to use with WaitForEvent() to wait for input from the pointer device. /// - EFI_EVENT WaitForInput; + EFI_EVENT WaitForInput; /// /// Pointer to EFI_SIMPLE_POINTER_MODE data. /// - EFI_SIMPLE_POINTER_MODE *Mode; + EFI_SIMPLE_POINTER_MODE *Mode; }; -extern EFI_GUID gEfiSimplePointerProtocolGuid; +extern EFI_GUID gEfiSimplePointerProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h index e22e05ee4a..838fae279e 100644 --- a/MdePkg/Include/Protocol/SimpleTextIn.h +++ b/MdePkg/Include/Protocol/SimpleTextIn.h @@ -17,24 +17,24 @@ 0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \ } -typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL; +typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL; /// /// Protocol GUID name defined in EFI1.1. /// -#define SIMPLE_INPUT_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID +#define SIMPLE_INPUT_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID /// /// Protocol name in EFI1.1 for backward-compatible. /// -typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL SIMPLE_INPUT_INTERFACE; +typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL SIMPLE_INPUT_INTERFACE; /// /// The keystroke information for the key that was pressed. /// typedef struct { - UINT16 ScanCode; - CHAR16 UnicodeChar; + UINT16 ScanCode; + CHAR16 UnicodeChar; } EFI_INPUT_KEY; // @@ -114,14 +114,14 @@ EFI_STATUS /// It is the minimum required protocol for ConsoleIn. /// struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL { - EFI_INPUT_RESET Reset; - EFI_INPUT_READ_KEY ReadKeyStroke; + EFI_INPUT_RESET Reset; + EFI_INPUT_READ_KEY ReadKeyStroke; /// /// Event to use with WaitForEvent() to wait for a key to be available /// - EFI_EVENT WaitForKey; + EFI_EVENT WaitForKey; }; -extern EFI_GUID gEfiSimpleTextInProtocolGuid; +extern EFI_GUID gEfiSimpleTextInProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SimpleTextInEx.h b/MdePkg/Include/Protocol/SimpleTextInEx.h index 2df583e90e..8317325d9b 100644 --- a/MdePkg/Include/Protocol/SimpleTextInEx.h +++ b/MdePkg/Include/Protocol/SimpleTextInEx.h @@ -18,7 +18,6 @@ #define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \ {0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } } - typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; /** @@ -51,8 +50,7 @@ EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)( IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, IN BOOLEAN ExtendedVerification -); - + ); /// /// EFI_KEY_TOGGLE_STATE. The toggle states are defined. @@ -68,25 +66,25 @@ typedef struct _EFI_KEY_STATE { /// returned value is valid only if the high /// order bit has been set. /// - UINT32 KeyShiftState; + UINT32 KeyShiftState; /// /// Reflects the current internal state of /// various toggled attributes. The returned /// value is valid only if the high order /// bit has been set. /// - EFI_KEY_TOGGLE_STATE KeyToggleState; + EFI_KEY_TOGGLE_STATE KeyToggleState; } EFI_KEY_STATE; typedef struct { /// /// The EFI scan code and Unicode value returned from the input device. /// - EFI_INPUT_KEY Key; + EFI_INPUT_KEY Key; /// /// The current state of various toggled attributes as well as input modifier values. /// - EFI_KEY_STATE KeyState; + EFI_KEY_STATE KeyState; } EFI_KEY_DATA; // @@ -95,55 +93,55 @@ typedef struct { // // Shift state // -#define EFI_SHIFT_STATE_VALID 0x80000000 -#define EFI_RIGHT_SHIFT_PRESSED 0x00000001 -#define EFI_LEFT_SHIFT_PRESSED 0x00000002 -#define EFI_RIGHT_CONTROL_PRESSED 0x00000004 -#define EFI_LEFT_CONTROL_PRESSED 0x00000008 -#define EFI_RIGHT_ALT_PRESSED 0x00000010 -#define EFI_LEFT_ALT_PRESSED 0x00000020 -#define EFI_RIGHT_LOGO_PRESSED 0x00000040 -#define EFI_LEFT_LOGO_PRESSED 0x00000080 -#define EFI_MENU_KEY_PRESSED 0x00000100 -#define EFI_SYS_REQ_PRESSED 0x00000200 +#define EFI_SHIFT_STATE_VALID 0x80000000 +#define EFI_RIGHT_SHIFT_PRESSED 0x00000001 +#define EFI_LEFT_SHIFT_PRESSED 0x00000002 +#define EFI_RIGHT_CONTROL_PRESSED 0x00000004 +#define EFI_LEFT_CONTROL_PRESSED 0x00000008 +#define EFI_RIGHT_ALT_PRESSED 0x00000010 +#define EFI_LEFT_ALT_PRESSED 0x00000020 +#define EFI_RIGHT_LOGO_PRESSED 0x00000040 +#define EFI_LEFT_LOGO_PRESSED 0x00000080 +#define EFI_MENU_KEY_PRESSED 0x00000100 +#define EFI_SYS_REQ_PRESSED 0x00000200 // // Toggle state // -#define EFI_TOGGLE_STATE_VALID 0x80 -#define EFI_KEY_STATE_EXPOSED 0x40 -#define EFI_SCROLL_LOCK_ACTIVE 0x01 -#define EFI_NUM_LOCK_ACTIVE 0x02 -#define EFI_CAPS_LOCK_ACTIVE 0x04 +#define EFI_TOGGLE_STATE_VALID 0x80 +#define EFI_KEY_STATE_EXPOSED 0x40 +#define EFI_SCROLL_LOCK_ACTIVE 0x01 +#define EFI_NUM_LOCK_ACTIVE 0x02 +#define EFI_CAPS_LOCK_ACTIVE 0x04 // // EFI Scan codes // -#define SCAN_F11 0x0015 -#define SCAN_F12 0x0016 -#define SCAN_PAUSE 0x0048 -#define SCAN_F13 0x0068 -#define SCAN_F14 0x0069 -#define SCAN_F15 0x006A -#define SCAN_F16 0x006B -#define SCAN_F17 0x006C -#define SCAN_F18 0x006D -#define SCAN_F19 0x006E -#define SCAN_F20 0x006F -#define SCAN_F21 0x0070 -#define SCAN_F22 0x0071 -#define SCAN_F23 0x0072 -#define SCAN_F24 0x0073 -#define SCAN_MUTE 0x007F -#define SCAN_VOLUME_UP 0x0080 -#define SCAN_VOLUME_DOWN 0x0081 -#define SCAN_BRIGHTNESS_UP 0x0100 -#define SCAN_BRIGHTNESS_DOWN 0x0101 -#define SCAN_SUSPEND 0x0102 -#define SCAN_HIBERNATE 0x0103 -#define SCAN_TOGGLE_DISPLAY 0x0104 -#define SCAN_RECOVERY 0x0105 -#define SCAN_EJECT 0x0106 +#define SCAN_F11 0x0015 +#define SCAN_F12 0x0016 +#define SCAN_PAUSE 0x0048 +#define SCAN_F13 0x0068 +#define SCAN_F14 0x0069 +#define SCAN_F15 0x006A +#define SCAN_F16 0x006B +#define SCAN_F17 0x006C +#define SCAN_F18 0x006D +#define SCAN_F19 0x006E +#define SCAN_F20 0x006F +#define SCAN_F21 0x0070 +#define SCAN_F22 0x0071 +#define SCAN_F23 0x0072 +#define SCAN_F24 0x0073 +#define SCAN_MUTE 0x007F +#define SCAN_VOLUME_UP 0x0080 +#define SCAN_VOLUME_DOWN 0x0081 +#define SCAN_BRIGHTNESS_UP 0x0100 +#define SCAN_BRIGHTNESS_DOWN 0x0101 +#define SCAN_SUSPEND 0x0102 +#define SCAN_HIBERNATE 0x0103 +#define SCAN_TOGGLE_DISPLAY 0x0104 +#define SCAN_RECOVERY 0x0105 +#define SCAN_EJECT 0x0106 /** The function reads the next keystroke from the input device. If @@ -196,7 +194,7 @@ EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)( IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, OUT EFI_KEY_DATA *KeyData -); + ); /** The SetState() function allows the input device hardware to @@ -223,7 +221,7 @@ EFI_STATUS (EFIAPI *EFI_SET_STATE)( IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, IN EFI_KEY_TOGGLE_STATE *KeyToggleState -); + ); /// /// The function will be called when the key sequence is typed specified by KeyData. @@ -232,7 +230,7 @@ typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)( IN EFI_KEY_DATA *KeyData -); + ); /** The RegisterKeystrokeNotify() function registers a function @@ -267,7 +265,7 @@ EFI_STATUS IN EFI_KEY_DATA *KeyData, IN EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction, OUT VOID **NotifyHandle -); + ); /** The UnregisterKeystrokeNotify() function removes the @@ -289,8 +287,7 @@ EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)( IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This, IN VOID *NotificationHandle -); - + ); /// /// The EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL is used on the ConsoleIn @@ -298,20 +295,18 @@ EFI_STATUS /// which allows a variety of extended shift state information to be /// returned. /// -struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL{ - EFI_INPUT_RESET_EX Reset; - EFI_INPUT_READ_KEY_EX ReadKeyStrokeEx; +struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL { + EFI_INPUT_RESET_EX Reset; + EFI_INPUT_READ_KEY_EX ReadKeyStrokeEx; /// /// Event to use with WaitForEvent() to wait for a key to be available. /// - EFI_EVENT WaitForKeyEx; - EFI_SET_STATE SetState; - EFI_REGISTER_KEYSTROKE_NOTIFY RegisterKeyNotify; - EFI_UNREGISTER_KEYSTROKE_NOTIFY UnregisterKeyNotify; + EFI_EVENT WaitForKeyEx; + EFI_SET_STATE SetState; + EFI_REGISTER_KEYSTROKE_NOTIFY RegisterKeyNotify; + EFI_UNREGISTER_KEYSTROKE_NOTIFY UnregisterKeyNotify; }; - -extern EFI_GUID gEfiSimpleTextInputExProtocolGuid; +extern EFI_GUID gEfiSimpleTextInputExProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SimpleTextOut.h b/MdePkg/Include/Protocol/SimpleTextOut.h index 100d69a23a..12dbbc16aa 100644 --- a/MdePkg/Include/Protocol/SimpleTextOut.h +++ b/MdePkg/Include/Protocol/SimpleTextOut.h @@ -22,14 +22,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// Protocol GUID defined in EFI1.1. /// -#define SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID +#define SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID typedef struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL; /// /// Backward-compatible with EFI1.1. /// -typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SIMPLE_TEXT_OUTPUT_INTERFACE; +typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SIMPLE_TEXT_OUTPUT_INTERFACE; // // Defines for required EFI Unicode Box Draw characters @@ -84,39 +84,39 @@ typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SIMPLE_TEXT_OUTPUT_INTERFACE; // // EFI Required Geometric Shapes Code Chart // -#define GEOMETRICSHAPE_UP_TRIANGLE 0x25b2 -#define GEOMETRICSHAPE_RIGHT_TRIANGLE 0x25ba -#define GEOMETRICSHAPE_DOWN_TRIANGLE 0x25bc -#define GEOMETRICSHAPE_LEFT_TRIANGLE 0x25c4 +#define GEOMETRICSHAPE_UP_TRIANGLE 0x25b2 +#define GEOMETRICSHAPE_RIGHT_TRIANGLE 0x25ba +#define GEOMETRICSHAPE_DOWN_TRIANGLE 0x25bc +#define GEOMETRICSHAPE_LEFT_TRIANGLE 0x25c4 // // EFI Required Arrow shapes // -#define ARROW_LEFT 0x2190 -#define ARROW_UP 0x2191 -#define ARROW_RIGHT 0x2192 -#define ARROW_DOWN 0x2193 +#define ARROW_LEFT 0x2190 +#define ARROW_UP 0x2191 +#define ARROW_RIGHT 0x2192 +#define ARROW_DOWN 0x2193 // // EFI Console Colours // -#define EFI_BLACK 0x00 -#define EFI_BLUE 0x01 -#define EFI_GREEN 0x02 -#define EFI_CYAN (EFI_BLUE | EFI_GREEN) -#define EFI_RED 0x04 -#define EFI_MAGENTA (EFI_BLUE | EFI_RED) -#define EFI_BROWN (EFI_GREEN | EFI_RED) -#define EFI_LIGHTGRAY (EFI_BLUE | EFI_GREEN | EFI_RED) -#define EFI_BRIGHT 0x08 -#define EFI_DARKGRAY (EFI_BLACK | EFI_BRIGHT) -#define EFI_LIGHTBLUE (EFI_BLUE | EFI_BRIGHT) -#define EFI_LIGHTGREEN (EFI_GREEN | EFI_BRIGHT) -#define EFI_LIGHTCYAN (EFI_CYAN | EFI_BRIGHT) -#define EFI_LIGHTRED (EFI_RED | EFI_BRIGHT) -#define EFI_LIGHTMAGENTA (EFI_MAGENTA | EFI_BRIGHT) -#define EFI_YELLOW (EFI_BROWN | EFI_BRIGHT) -#define EFI_WHITE (EFI_BLUE | EFI_GREEN | EFI_RED | EFI_BRIGHT) +#define EFI_BLACK 0x00 +#define EFI_BLUE 0x01 +#define EFI_GREEN 0x02 +#define EFI_CYAN (EFI_BLUE | EFI_GREEN) +#define EFI_RED 0x04 +#define EFI_MAGENTA (EFI_BLUE | EFI_RED) +#define EFI_BROWN (EFI_GREEN | EFI_RED) +#define EFI_LIGHTGRAY (EFI_BLUE | EFI_GREEN | EFI_RED) +#define EFI_BRIGHT 0x08 +#define EFI_DARKGRAY (EFI_BLACK | EFI_BRIGHT) +#define EFI_LIGHTBLUE (EFI_BLUE | EFI_BRIGHT) +#define EFI_LIGHTGREEN (EFI_GREEN | EFI_BRIGHT) +#define EFI_LIGHTCYAN (EFI_CYAN | EFI_BRIGHT) +#define EFI_LIGHTRED (EFI_RED | EFI_BRIGHT) +#define EFI_LIGHTMAGENTA (EFI_MAGENTA | EFI_BRIGHT) +#define EFI_YELLOW (EFI_BROWN | EFI_BRIGHT) +#define EFI_WHITE (EFI_BLUE | EFI_GREEN | EFI_RED | EFI_BRIGHT) // // Macro to accept color values in their raw form to create @@ -129,7 +129,7 @@ typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SIMPLE_TEXT_OUTPUT_INTERFACE; // // Do not use EFI_BACKGROUND_xxx values with this macro. // -#define EFI_TEXT_ATTR(Foreground,Background) ((Foreground) | ((Background) << 4)) +#define EFI_TEXT_ATTR(Foreground, Background) ((Foreground) | ((Background) << 4)) #define EFI_BACKGROUND_BLACK 0x00 #define EFI_BACKGROUND_BLUE 0x10 @@ -350,7 +350,7 @@ typedef struct { /// /// The number of modes supported by QueryMode () and SetMode (). /// - INT32 MaxMode; + INT32 MaxMode; // // current settings @@ -359,23 +359,23 @@ typedef struct { /// /// The text mode of the output device(s). /// - INT32 Mode; + INT32 Mode; /// /// The current character output attribute. /// - INT32 Attribute; + INT32 Attribute; /// /// The cursor's column. /// - INT32 CursorColumn; + INT32 CursorColumn; /// /// The cursor's row. /// - INT32 CursorRow; + INT32 CursorRow; /// /// The cursor is currently visible or not. /// - BOOLEAN CursorVisible; + BOOLEAN CursorVisible; } EFI_SIMPLE_TEXT_OUTPUT_MODE; /// @@ -385,25 +385,25 @@ typedef struct { /// devices is at least 80 x 25 characters. /// struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL { - EFI_TEXT_RESET Reset; + EFI_TEXT_RESET Reset; - EFI_TEXT_STRING OutputString; - EFI_TEXT_TEST_STRING TestString; + EFI_TEXT_STRING OutputString; + EFI_TEXT_TEST_STRING TestString; - EFI_TEXT_QUERY_MODE QueryMode; - EFI_TEXT_SET_MODE SetMode; - EFI_TEXT_SET_ATTRIBUTE SetAttribute; + EFI_TEXT_QUERY_MODE QueryMode; + EFI_TEXT_SET_MODE SetMode; + EFI_TEXT_SET_ATTRIBUTE SetAttribute; - EFI_TEXT_CLEAR_SCREEN ClearScreen; - EFI_TEXT_SET_CURSOR_POSITION SetCursorPosition; - EFI_TEXT_ENABLE_CURSOR EnableCursor; + EFI_TEXT_CLEAR_SCREEN ClearScreen; + EFI_TEXT_SET_CURSOR_POSITION SetCursorPosition; + EFI_TEXT_ENABLE_CURSOR EnableCursor; /// /// Pointer to SIMPLE_TEXT_OUTPUT_MODE data. /// - EFI_SIMPLE_TEXT_OUTPUT_MODE *Mode; + EFI_SIMPLE_TEXT_OUTPUT_MODE *Mode; }; -extern EFI_GUID gEfiSimpleTextOutProtocolGuid; +extern EFI_GUID gEfiSimpleTextOutProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SmartCardEdge.h b/MdePkg/Include/Protocol/SmartCardEdge.h index ebece5aa70..1251680ec0 100644 --- a/MdePkg/Include/Protocol/SmartCardEdge.h +++ b/MdePkg/Include/Protocol/SmartCardEdge.h @@ -22,20 +22,20 @@ 0xd317f29b, 0xa325, 0x4712, {0x9b, 0xf1, 0xc6, 0x19, 0x54, 0xdc, 0x19, 0x8c} \ } -typedef struct _EFI_SMART_CARD_EDGE_PROTOCOL EFI_SMART_CARD_EDGE_PROTOCOL; +typedef struct _EFI_SMART_CARD_EDGE_PROTOCOL EFI_SMART_CARD_EDGE_PROTOCOL; // // Maximum size for a Smart Card AID (Application IDentifier) // -#define SCARD_AID_MAXSIZE 0x0010 +#define SCARD_AID_MAXSIZE 0x0010 // // Size of CSN (Card Serial Number) // -#define SCARD_CSN_SIZE 0x0010 +#define SCARD_CSN_SIZE 0x0010 // // Current specification version 1.00 // -#define SMART_CARD_EDGE_PROTOCOL_VERSION_1 0x00000100 +#define SMART_CARD_EDGE_PROTOCOL_VERSION_1 0x00000100 // // Parameters type definition // @@ -47,23 +47,23 @@ typedef UINT8 SMART_CARD_CSN[SCARD_CSN_SIZE]; // // value of tag field for header, the number of containers // -#define SC_EDGE_TAG_HEADER 0x0000 +#define SC_EDGE_TAG_HEADER 0x0000 // // value of tag field for certificate // -#define SC_EDGE_TAG_CERT 0x0001 +#define SC_EDGE_TAG_CERT 0x0001 // // value of tag field for key index associated with certificate // -#define SC_EDGE_TAG_KEY_ID 0x0002 +#define SC_EDGE_TAG_KEY_ID 0x0002 // // value of tag field for key type // -#define SC_EDGE_TAG_KEY_TYPE 0x0003 +#define SC_EDGE_TAG_KEY_TYPE 0x0003 // // value of tag field for key size // -#define SC_EDGE_TAG_KEY_SIZE 0x0004 +#define SC_EDGE_TAG_KEY_SIZE 0x0004 // // Length of L fields of TLV items @@ -71,42 +71,42 @@ typedef UINT8 SMART_CARD_CSN[SCARD_CSN_SIZE]; // // size of L field for header // -#define SC_EDGE_L_SIZE_HEADER 1 +#define SC_EDGE_L_SIZE_HEADER 1 // // size of L field for certificate (big endian) // -#define SC_EDGE_L_SIZE_CERT 2 +#define SC_EDGE_L_SIZE_CERT 2 // // size of L field for key index // -#define SC_EDGE_L_SIZE_KEY_ID 1 +#define SC_EDGE_L_SIZE_KEY_ID 1 // // size of L field for key type // -#define SC_EDGE_L_SIZE_KEY_TYPE 1 +#define SC_EDGE_L_SIZE_KEY_TYPE 1 // // size of L field for key size (big endian) // -#define SC_EDGE_L_SIZE_KEY_SIZE 2 +#define SC_EDGE_L_SIZE_KEY_SIZE 2 // // Some TLV items have a fixed value for L field // // value of L field for header // -#define SC_EDGE_L_VALUE_HEADER 1 +#define SC_EDGE_L_VALUE_HEADER 1 // // value of L field for key index // -#define SC_EDGE_L_VALUE_KEY_ID 1 +#define SC_EDGE_L_VALUE_KEY_ID 1 // // value of L field for key type // -#define SC_EDGE_L_VALUE_KEY_TYPE 1 +#define SC_EDGE_L_VALUE_KEY_TYPE 1 // // value of L field for key size // -#define SC_EDGE_L_VALUE_KEY_SIZE 2 +#define SC_EDGE_L_VALUE_KEY_SIZE 2 // // Possible values for key type @@ -114,35 +114,35 @@ typedef UINT8 SMART_CARD_CSN[SCARD_CSN_SIZE]; // // RSA decryption // -#define SC_EDGE_RSA_EXCHANGE 0x01 +#define SC_EDGE_RSA_EXCHANGE 0x01 // // RSA signature // -#define SC_EDGE_RSA_SIGNATURE 0x02 +#define SC_EDGE_RSA_SIGNATURE 0x02 // // ECDSA signature // -#define SC_EDGE_ECDSA_256 0x03 +#define SC_EDGE_ECDSA_256 0x03 // // ECDSA signature // -#define SC_EDGE_ECDSA_384 0x04 +#define SC_EDGE_ECDSA_384 0x04 // // ECDSA signature // -#define SC_EDGE_ECDSA_521 0x05 +#define SC_EDGE_ECDSA_521 0x05 // // ECDH agreement // -#define SC_EDGE_ECDH_256 0x06 +#define SC_EDGE_ECDH_256 0x06 // // ECDH agreement // -#define SC_EDGE_ECDH_384 0x07 +#define SC_EDGE_ECDH_384 0x07 // // ECDH agreement // -#define SC_EDGE_ECDH_521 0x08 +#define SC_EDGE_ECDH_521 0x08 // // Padding methods GUIDs for signature @@ -155,7 +155,7 @@ typedef UINT8 SMART_CARD_CSN[SCARD_CSN_SIZE]; 0x9317ec24, 0x7cb0, 0x4d0e, {0x8b, 0x32, 0x2e, 0xd9, 0x20, 0x9c, 0xd8, 0xaf} \ } -extern EFI_GUID gEfiPaddingRsassaPkcs1V1P5Guid; +extern EFI_GUID gEfiPaddingRsassaPkcs1V1P5Guid; // // RSASSA-PSS padding method, for signature @@ -165,7 +165,7 @@ extern EFI_GUID gEfiPaddingRsassaPkcs1V1P5Guid; 0x7b2349e0, 0x522d, 0x4f8e, {0xb9, 0x27, 0x69, 0xd9, 0x7c, 0x9e, 0x79, 0x5f} \ } -extern EFI_GUID gEfiPaddingRsassaPssGuid; +extern EFI_GUID gEfiPaddingRsassaPssGuid; // // Padding methods GUIDs for decryption @@ -178,7 +178,7 @@ extern EFI_GUID gEfiPaddingRsassaPssGuid; 0x3629ddb1, 0x228c, 0x452e, {0xb6, 0x16, 0x09, 0xed, 0x31, 0x6a, 0x97, 0x00} \ } -extern EFI_GUID gEfiPaddingNoneGuid; +extern EFI_GUID gEfiPaddingNoneGuid; // // RSAES-PKCS#1-V1.5 padding, for decryption @@ -188,7 +188,7 @@ extern EFI_GUID gEfiPaddingNoneGuid; 0xe1c1d0a9, 0x40b1, 0x4632, {0xbd, 0xcc, 0xd9, 0xd6, 0xe5, 0x29, 0x56, 0x31} \ } -extern EFI_GUID gEfiPaddingRsaesPkcs1V1P5Guid; +extern EFI_GUID gEfiPaddingRsaesPkcs1V1P5Guid; // // RSAES-OAEP padding, for decryption @@ -198,7 +198,7 @@ extern EFI_GUID gEfiPaddingRsaesPkcs1V1P5Guid; 0xc1e63ac4, 0xd0cf, 0x4ce6, {0x83, 0x5b, 0xee, 0xd0, 0xe6, 0xa8, 0xa4, 0x5b} \ } -extern EFI_GUID gEfiPaddingRsaesOaepGuid; +extern EFI_GUID gEfiPaddingRsaesOaepGuid; /** This function retrieves the context driver. @@ -245,15 +245,15 @@ extern EFI_GUID gEfiPaddingRsaesOaepGuid; **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_GET_CONTEXT) ( +(EFIAPI *EFI_SMART_CARD_EDGE_GET_CONTEXT)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, - OUT UINTN *NumberAidSupported, + OUT UINTN *NumberAidSupported, IN OUT UINTN *AidTableSize OPTIONAL, - OUT SMART_CARD_AID *AidTable OPTIONAL, - OUT UINTN *NumberSCPresent, + OUT SMART_CARD_AID *AidTable OPTIONAL, + OUT UINTN *NumberSCPresent, IN OUT UINTN *CsnTableSize OPTIONAL, - OUT SMART_CARD_CSN *CsnTable OPTIONAL, - OUT UINT32 *VersionScEdgeProtocol OPTIONAL + OUT SMART_CARD_CSN *CsnTable OPTIONAL, + OUT UINT32 *VersionScEdgeProtocol OPTIONAL ); /** @@ -287,11 +287,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_CONNECT) ( +(EFIAPI *EFI_SMART_CARD_EDGE_CONNECT)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, - OUT EFI_HANDLE *SCardHandle, + OUT EFI_HANDLE *SCardHandle, IN UINT8 *ScardCsn OPTIONAL, - OUT UINT8 *ScardAid OPTIONAL + OUT UINT8 *ScardAid OPTIONAL ); /** @@ -311,7 +311,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_DISCONNECT) ( +(EFIAPI *EFI_SMART_CARD_EDGE_DISCONNECT)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, IN EFI_HANDLE SCardHandle ); @@ -332,10 +332,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_GET_CSN) ( +(EFIAPI *EFI_SMART_CARD_EDGE_GET_CSN)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, IN EFI_HANDLE SCardHandle, - OUT UINT8 Csn[SCARD_CSN_SIZE] + OUT UINT8 Csn[SCARD_CSN_SIZE] ); /** @@ -359,11 +359,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_GET_READER_NAME) ( +(EFIAPI *EFI_SMART_CARD_EDGE_GET_READER_NAME)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, IN EFI_HANDLE SCardHandle, IN OUT UINTN *ReaderNameLength, - OUT CHAR16 *ReaderName OPTIONAL + OUT CHAR16 *ReaderName OPTIONAL ); /** @@ -409,13 +409,13 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_VERIFY_PIN) ( +(EFIAPI *EFI_SMART_CARD_EDGE_VERIFY_PIN)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, IN EFI_HANDLE SCardHandle, IN INT32 PinSize, IN UINT8 *PinCode, - OUT BOOLEAN *PinResult, - OUT UINT32 *RemainingAttempts OPTIONAL + OUT BOOLEAN *PinResult, + OUT UINT32 *RemainingAttempts OPTIONAL ); /** @@ -440,10 +440,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_GET_PIN_REMAINING) ( +(EFIAPI *EFI_SMART_CARD_EDGE_GET_PIN_REMAINING)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, IN EFI_HANDLE SCardHandle, - OUT UINT32 *RemainingAttempts + OUT UINT32 *RemainingAttempts ); /** @@ -479,12 +479,12 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_GET_DATA) ( +(EFIAPI *EFI_SMART_CARD_EDGE_GET_DATA)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, IN EFI_HANDLE SCardHandle, IN EFI_GUID *DataId, IN OUT UINTN *DataSize, - OUT VOID *Data OPTIONAL + OUT VOID *Data OPTIONAL ); /** @@ -530,11 +530,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_GET_CREDENTIAL) ( +(EFIAPI *EFI_SMART_CARD_EDGE_GET_CREDENTIAL)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, IN EFI_HANDLE SCardHandle, IN OUT UINTN *CredentialSize, - OUT UINT8 *CredentialList OPTIONAL + OUT UINT8 *CredentialList OPTIONAL ); /** @@ -588,7 +588,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_SIGN_DATA) ( +(EFIAPI *EFI_SMART_CARD_EDGE_SIGN_DATA)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, IN EFI_HANDLE SCardHandle, IN UINTN KeyId, @@ -596,7 +596,7 @@ EFI_STATUS IN EFI_GUID *HashAlgorithm, IN EFI_GUID *PaddingMethod, IN UINT8 *HashedData, - OUT UINT8 *SignatureData + OUT UINT8 *SignatureData ); /** @@ -652,7 +652,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_DECRYPT_DATA) ( +(EFIAPI *EFI_SMART_CARD_EDGE_DECRYPT_DATA)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, IN EFI_HANDLE SCardHandle, IN UINTN KeyId, @@ -661,7 +661,7 @@ EFI_STATUS IN UINTN EncryptedSize, IN UINT8 *EncryptedData, IN OUT UINTN *PlaintextSize, - OUT UINT8 *PlaintextData + OUT UINT8 *PlaintextData ); /** @@ -702,13 +702,13 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_EDGE_BUILD_DH_AGREEMENT) ( +(EFIAPI *EFI_SMART_CARD_EDGE_BUILD_DH_AGREEMENT)( IN EFI_SMART_CARD_EDGE_PROTOCOL *This, IN EFI_HANDLE SCardHandle, IN UINTN KeyId, IN UINT8 *dataQx, IN UINT8 *dataQy, - OUT UINT8 *DHAgreement + OUT UINT8 *DHAgreement ); /// @@ -716,21 +716,20 @@ EFI_STATUS /// smart card in the reader or to the reader itself. /// struct _EFI_SMART_CARD_EDGE_PROTOCOL { - EFI_SMART_CARD_EDGE_GET_CONTEXT GetContext; - EFI_SMART_CARD_EDGE_CONNECT Connect; - EFI_SMART_CARD_EDGE_DISCONNECT Disconnect; - EFI_SMART_CARD_EDGE_GET_CSN GetCsn; - EFI_SMART_CARD_EDGE_GET_READER_NAME GetReaderName; - EFI_SMART_CARD_EDGE_VERIFY_PIN VerifyPin; - EFI_SMART_CARD_EDGE_GET_PIN_REMAINING GetPinRemaining; - EFI_SMART_CARD_EDGE_GET_DATA GetData; - EFI_SMART_CARD_EDGE_GET_CREDENTIAL GetCredential; - EFI_SMART_CARD_EDGE_SIGN_DATA SignData; - EFI_SMART_CARD_EDGE_DECRYPT_DATA DecryptData; - EFI_SMART_CARD_EDGE_BUILD_DH_AGREEMENT BuildDHAgreement; + EFI_SMART_CARD_EDGE_GET_CONTEXT GetContext; + EFI_SMART_CARD_EDGE_CONNECT Connect; + EFI_SMART_CARD_EDGE_DISCONNECT Disconnect; + EFI_SMART_CARD_EDGE_GET_CSN GetCsn; + EFI_SMART_CARD_EDGE_GET_READER_NAME GetReaderName; + EFI_SMART_CARD_EDGE_VERIFY_PIN VerifyPin; + EFI_SMART_CARD_EDGE_GET_PIN_REMAINING GetPinRemaining; + EFI_SMART_CARD_EDGE_GET_DATA GetData; + EFI_SMART_CARD_EDGE_GET_CREDENTIAL GetCredential; + EFI_SMART_CARD_EDGE_SIGN_DATA SignData; + EFI_SMART_CARD_EDGE_DECRYPT_DATA DecryptData; + EFI_SMART_CARD_EDGE_BUILD_DH_AGREEMENT BuildDHAgreement; }; -extern EFI_GUID gEfiSmartCardEdgeProtocolGuid; +extern EFI_GUID gEfiSmartCardEdgeProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmartCardReader.h b/MdePkg/Include/Protocol/SmartCardReader.h index 8fb670be65..0ce117c9c7 100644 --- a/MdePkg/Include/Protocol/SmartCardReader.h +++ b/MdePkg/Include/Protocol/SmartCardReader.h @@ -17,40 +17,40 @@ 0x2a4d1adf, 0x21dc, 0x4b81, {0xa4, 0x2f, 0x8b, 0x8e, 0xe2, 0x38, 0x00, 0x60} \ } -typedef struct _EFI_SMART_CARD_READER_PROTOCOL EFI_SMART_CARD_READER_PROTOCOL; +typedef struct _EFI_SMART_CARD_READER_PROTOCOL EFI_SMART_CARD_READER_PROTOCOL; // // Codes for access mode // -#define SCARD_AM_READER 0x0001 // Exclusive access to reader -#define SCARD_AM_CARD 0x0002 // Exclusive access to card +#define SCARD_AM_READER 0x0001 // Exclusive access to reader +#define SCARD_AM_CARD 0x0002 // Exclusive access to card // // Codes for card action // -#define SCARD_CA_NORESET 0x0000 // Don't reset card -#define SCARD_CA_COLDRESET 0x0001 // Perform a cold reset -#define SCARD_CA_WARMRESET 0x0002 // Perform a warm reset -#define SCARD_CA_UNPOWER 0x0003 // Power off the card -#define SCARD_CA_EJECT 0x0004 // Eject the card +#define SCARD_CA_NORESET 0x0000 // Don't reset card +#define SCARD_CA_COLDRESET 0x0001 // Perform a cold reset +#define SCARD_CA_WARMRESET 0x0002 // Perform a warm reset +#define SCARD_CA_UNPOWER 0x0003 // Power off the card +#define SCARD_CA_EJECT 0x0004 // Eject the card // // Protocol types // -#define SCARD_PROTOCOL_UNDEFINED 0x0000 -#define SCARD_PROTOCOL_T0 0x0001 -#define SCARD_PROTOCOL_T1 0x0002 -#define SCARD_PROTOCOL_RAW 0x0004 +#define SCARD_PROTOCOL_UNDEFINED 0x0000 +#define SCARD_PROTOCOL_T0 0x0001 +#define SCARD_PROTOCOL_T1 0x0002 +#define SCARD_PROTOCOL_RAW 0x0004 // // Codes for state type // -#define SCARD_UNKNOWN 0x0000 /* state is unknown */ -#define SCARD_ABSENT 0x0001 /* Card is absent */ -#define SCARD_INACTIVE 0x0002 /* Card is present and not powered*/ -#define SCARD_ACTIVE 0x0003 /* Card is present and powered */ +#define SCARD_UNKNOWN 0x0000 /* state is unknown */ +#define SCARD_ABSENT 0x0001 /* Card is absent */ +#define SCARD_INACTIVE 0x0002 /* Card is present and not powered*/ +#define SCARD_ACTIVE 0x0003 /* Card is present and powered */ // // Macro to generate a ControlCode & PC/SC part 10 control code // -#define SCARD_CTL_CODE(code) (0x42000000 + (code)) -#define CM_IOCTL_GET_FEATURE_REQUEST SCARD_CTL_CODE(3400) +#define SCARD_CTL_CODE(code) (0x42000000 + (code)) +#define CM_IOCTL_GET_FEATURE_REQUEST SCARD_CTL_CODE(3400) /** This function requests connection to the smart card or the reader, using the @@ -87,12 +87,12 @@ typedef struct _EFI_SMART_CARD_READER_PROTOCOL EFI_SMART_CARD_READER_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_READER_CONNECT) ( +(EFIAPI *EFI_SMART_CARD_READER_CONNECT)( IN EFI_SMART_CARD_READER_PROTOCOL *This, IN UINT32 AccessMode, IN UINT32 CardAction, IN UINT32 PreferredProtocols, - OUT UINT32 *ActiveProtocol + OUT UINT32 *ActiveProtocol ); /** @@ -116,7 +116,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_READER_DISCONNECT) ( +(EFIAPI *EFI_SMART_CARD_READER_DISCONNECT)( IN EFI_SMART_CARD_READER_PROTOCOL *This, IN UINT32 CardAction ); @@ -159,13 +159,13 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_READER_STATUS) ( +(EFIAPI *EFI_SMART_CARD_READER_STATUS)( IN EFI_SMART_CARD_READER_PROTOCOL *This, - OUT CHAR16 *ReaderName OPTIONAL, + OUT CHAR16 *ReaderName OPTIONAL, IN OUT UINTN *ReaderNameLength OPTIONAL, - OUT UINT32 *State OPTIONAL, - OUT UINT32 *CardProtocol OPTIONAL, - OUT UINT8 *Atr OPTIONAL, + OUT UINT32 *State OPTIONAL, + OUT UINT32 *CardProtocol OPTIONAL, + OUT UINT8 *Atr OPTIONAL, IN OUT UINTN *AtrLength OPTIONAL ); @@ -203,11 +203,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_READER_TRANSMIT) ( +(EFIAPI *EFI_SMART_CARD_READER_TRANSMIT)( IN EFI_SMART_CARD_READER_PROTOCOL *This, IN UINT8 *CAPDU, IN UINTN CAPDULength, - OUT UINT8 *RAPDU, + OUT UINT8 *RAPDU, IN OUT UINTN *RAPDULength ); @@ -252,12 +252,12 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_READER_CONTROL) ( +(EFIAPI *EFI_SMART_CARD_READER_CONTROL)( IN EFI_SMART_CARD_READER_PROTOCOL *This, IN UINT32 ControlCode, IN UINT8 *InBuffer OPTIONAL, IN UINTN InBufferLength OPTIONAL, - OUT UINT8 *OutBuffer OPTIONAL, + OUT UINT8 *OutBuffer OPTIONAL, IN OUT UINTN *OutBufferLength OPTIONAL ); @@ -293,10 +293,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SMART_CARD_READER_GET_ATTRIB) ( +(EFIAPI *EFI_SMART_CARD_READER_GET_ATTRIB)( IN EFI_SMART_CARD_READER_PROTOCOL *This, IN UINT32 Attrib, - OUT UINT8 *OutBuffer, + OUT UINT8 *OutBuffer, IN OUT UINTN *OutBufferLength ); @@ -305,15 +305,14 @@ EFI_STATUS /// smart card in the reader or to the reader itself. /// struct _EFI_SMART_CARD_READER_PROTOCOL { - EFI_SMART_CARD_READER_CONNECT SCardConnect; - EFI_SMART_CARD_READER_DISCONNECT SCardDisconnect; - EFI_SMART_CARD_READER_STATUS SCardStatus; - EFI_SMART_CARD_READER_TRANSMIT SCardTransmit; - EFI_SMART_CARD_READER_CONTROL SCardControl; - EFI_SMART_CARD_READER_GET_ATTRIB SCardGetAttrib; + EFI_SMART_CARD_READER_CONNECT SCardConnect; + EFI_SMART_CARD_READER_DISCONNECT SCardDisconnect; + EFI_SMART_CARD_READER_STATUS SCardStatus; + EFI_SMART_CARD_READER_TRANSMIT SCardTransmit; + EFI_SMART_CARD_READER_CONTROL SCardControl; + EFI_SMART_CARD_READER_GET_ATTRIB SCardGetAttrib; }; -extern EFI_GUID gEfiSmartCardReaderProtocolGuid; +extern EFI_GUID gEfiSmartCardReaderProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/Smbios.h b/MdePkg/Include/Protocol/Smbios.h index ee39636bff..f9346aac72 100644 --- a/MdePkg/Include/Protocol/Smbios.h +++ b/MdePkg/Include/Protocol/Smbios.h @@ -26,58 +26,58 @@ #define EFI_SMBIOS_PROTOCOL_GUID \ { 0x3583ff6, 0xcb36, 0x4940, { 0x94, 0x7e, 0xb9, 0xb3, 0x9f, 0x4a, 0xfa, 0xf7 }} -#define EFI_SMBIOS_TYPE_BIOS_INFORMATION SMBIOS_TYPE_BIOS_INFORMATION -#define EFI_SMBIOS_TYPE_SYSTEM_INFORMATION SMBIOS_TYPE_SYSTEM_INFORMATION -#define EFI_SMBIOS_TYPE_BASEBOARD_INFORMATION SMBIOS_TYPE_BASEBOARD_INFORMATION -#define EFI_SMBIOS_TYPE_SYSTEM_ENCLOSURE SMBIOS_TYPE_SYSTEM_ENCLOSURE -#define EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION SMBIOS_TYPE_PROCESSOR_INFORMATION -#define EFI_SMBIOS_TYPE_MEMORY_CONTROLLER_INFORMATION SMBIOS_TYPE_MEMORY_CONTROLLER_INFORMATION -#define EFI_SMBIOS_TYPE_MEMORY_MODULE_INFORMATON SMBIOS_TYPE_MEMORY_MODULE_INFORMATON -#define EFI_SMBIOS_TYPE_CACHE_INFORMATION SMBIOS_TYPE_CACHE_INFORMATION -#define EFI_SMBIOS_TYPE_PORT_CONNECTOR_INFORMATION SMBIOS_TYPE_PORT_CONNECTOR_INFORMATION -#define EFI_SMBIOS_TYPE_SYSTEM_SLOTS SMBIOS_TYPE_SYSTEM_SLOTS -#define EFI_SMBIOS_TYPE_ONBOARD_DEVICE_INFORMATION SMBIOS_TYPE_ONBOARD_DEVICE_INFORMATION -#define EFI_SMBIOS_TYPE_OEM_STRINGS SMBIOS_TYPE_OEM_STRINGS -#define EFI_SMBIOS_TYPE_SYSTEM_CONFIGURATION_OPTIONS SMBIOS_TYPE_SYSTEM_CONFIGURATION_OPTIONS -#define EFI_SMBIOS_TYPE_BIOS_LANGUAGE_INFORMATION SMBIOS_TYPE_BIOS_LANGUAGE_INFORMATION -#define EFI_SMBIOS_TYPE_GROUP_ASSOCIATIONS SMBIOS_TYPE_GROUP_ASSOCIATIONS -#define EFI_SMBIOS_TYPE_SYSTEM_EVENT_LOG SMBIOS_TYPE_SYSTEM_EVENT_LOG -#define EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY -#define EFI_SMBIOS_TYPE_MEMORY_DEVICE SMBIOS_TYPE_MEMORY_DEVICE -#define EFI_SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION -#define EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS -#define EFI_SMBIOS_TYPE_MEMORY_DEVICE_MAPPED_ADDRESS SMBIOS_TYPE_MEMORY_DEVICE_MAPPED_ADDRESS -#define EFI_SMBIOS_TYPE_BUILT_IN_POINTING_DEVICE SMBIOS_TYPE_BUILT_IN_POINTING_DEVICE -#define EFI_SMBIOS_TYPE_PORTABLE_BATTERY SMBIOS_TYPE_PORTABLE_BATTERY -#define EFI_SMBIOS_TYPE_SYSTEM_RESET SMBIOS_TYPE_SYSTEM_RESET -#define EFI_SMBIOS_TYPE_HARDWARE_SECURITY SMBIOS_TYPE_HARDWARE_SECURITY -#define EFI_SMBIOS_TYPE_SYSTEM_POWER_CONTROLS SMBIOS_TYPE_SYSTEM_POWER_CONTROLS -#define EFI_SMBIOS_TYPE_VOLTAGE_PROBE SMBIOS_TYPE_VOLTAGE_PROBE -#define EFI_SMBIOS_TYPE_COOLING_DEVICE SMBIOS_TYPE_COOLING_DEVICE -#define EFI_SMBIOS_TYPE_TEMPERATURE_PROBE SMBIOS_TYPE_TEMPERATURE_PROBE -#define EFI_SMBIOS_TYPE_ELECTRICAL_CURRENT_PROBE SMBIOS_TYPE_ELECTRICAL_CURRENT_PROBE -#define EFI_SMBIOS_TYPE_OUT_OF_BAND_REMOTE_ACCESS SMBIOS_TYPE_OUT_OF_BAND_REMOTE_ACCESS -#define EFI_SMBIOS_TYPE_BOOT_INTEGRITY_SERVICE SMBIOS_TYPE_BOOT_INTEGRITY_SERVICE -#define EFI_SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION -#define EFI_SMBIOS_TYPE_64BIT_MEMORY_ERROR_INFORMATION SMBIOS_TYPE_64BIT_MEMORY_ERROR_INFORMATION -#define EFI_SMBIOS_TYPE_MANAGEMENT_DEVICE SMBIOS_TYPE_MANAGEMENT_DEVICE -#define EFI_SMBIOS_TYPE_MANAGEMENT_DEVICE_COMPONENT SMBIOS_TYPE_MANAGEMENT_DEVICE_COMPONENT -#define EFI_SMBIOS_TYPE_MANAGEMENT_DEVICE_THRESHOLD_DATA SMBIOS_TYPE_MANAGEMENT_DEVICE_THRESHOLD_DATA -#define EFI_SMBIOS_TYPE_MEMORY_CHANNEL SMBIOS_TYPE_MEMORY_CHANNEL -#define EFI_SMBIOS_TYPE_IPMI_DEVICE_INFORMATION SMBIOS_TYPE_IPMI_DEVICE_INFORMATION -#define EFI_SMBIOS_TYPE_SYSTEM_POWER_SUPPLY SMBIOS_TYPE_SYSTEM_POWER_SUPPLY -#define EFI_SMBIOS_TYPE_ADDITIONAL_INFORMATION SMBIOS_TYPE_ADDITIONAL_INFORMATION -#define EFI_SMBIOS_TYPE_ONBOARD_DEVICES_EXTENDED_INFORMATION SMBIOS_TYPE_ONBOARD_DEVICES_EXTENDED_INFORMATION -#define EFI_SMBIOS_TYPE_MANAGEMENT_CONTROLLER_HOST_INTERFACE SMBIOS_TYPE_MANAGEMENT_CONTROLLER_HOST_INTERFACE -#define EFI_SMBIOS_TYPE_INACTIVE SMBIOS_TYPE_INACTIVE -#define EFI_SMBIOS_TYPE_END_OF_TABLE SMBIOS_TYPE_END_OF_TABLE -#define EFI_SMBIOS_OEM_BEGIN SMBIOS_OEM_BEGIN -#define EFI_SMBIOS_OEM_END SMBIOS_OEM_END - -typedef SMBIOS_TABLE_STRING EFI_SMBIOS_STRING; -typedef SMBIOS_TYPE EFI_SMBIOS_TYPE; -typedef SMBIOS_HANDLE EFI_SMBIOS_HANDLE; -typedef SMBIOS_STRUCTURE EFI_SMBIOS_TABLE_HEADER; +#define EFI_SMBIOS_TYPE_BIOS_INFORMATION SMBIOS_TYPE_BIOS_INFORMATION +#define EFI_SMBIOS_TYPE_SYSTEM_INFORMATION SMBIOS_TYPE_SYSTEM_INFORMATION +#define EFI_SMBIOS_TYPE_BASEBOARD_INFORMATION SMBIOS_TYPE_BASEBOARD_INFORMATION +#define EFI_SMBIOS_TYPE_SYSTEM_ENCLOSURE SMBIOS_TYPE_SYSTEM_ENCLOSURE +#define EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION SMBIOS_TYPE_PROCESSOR_INFORMATION +#define EFI_SMBIOS_TYPE_MEMORY_CONTROLLER_INFORMATION SMBIOS_TYPE_MEMORY_CONTROLLER_INFORMATION +#define EFI_SMBIOS_TYPE_MEMORY_MODULE_INFORMATON SMBIOS_TYPE_MEMORY_MODULE_INFORMATON +#define EFI_SMBIOS_TYPE_CACHE_INFORMATION SMBIOS_TYPE_CACHE_INFORMATION +#define EFI_SMBIOS_TYPE_PORT_CONNECTOR_INFORMATION SMBIOS_TYPE_PORT_CONNECTOR_INFORMATION +#define EFI_SMBIOS_TYPE_SYSTEM_SLOTS SMBIOS_TYPE_SYSTEM_SLOTS +#define EFI_SMBIOS_TYPE_ONBOARD_DEVICE_INFORMATION SMBIOS_TYPE_ONBOARD_DEVICE_INFORMATION +#define EFI_SMBIOS_TYPE_OEM_STRINGS SMBIOS_TYPE_OEM_STRINGS +#define EFI_SMBIOS_TYPE_SYSTEM_CONFIGURATION_OPTIONS SMBIOS_TYPE_SYSTEM_CONFIGURATION_OPTIONS +#define EFI_SMBIOS_TYPE_BIOS_LANGUAGE_INFORMATION SMBIOS_TYPE_BIOS_LANGUAGE_INFORMATION +#define EFI_SMBIOS_TYPE_GROUP_ASSOCIATIONS SMBIOS_TYPE_GROUP_ASSOCIATIONS +#define EFI_SMBIOS_TYPE_SYSTEM_EVENT_LOG SMBIOS_TYPE_SYSTEM_EVENT_LOG +#define EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY +#define EFI_SMBIOS_TYPE_MEMORY_DEVICE SMBIOS_TYPE_MEMORY_DEVICE +#define EFI_SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION SMBIOS_TYPE_32BIT_MEMORY_ERROR_INFORMATION +#define EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS +#define EFI_SMBIOS_TYPE_MEMORY_DEVICE_MAPPED_ADDRESS SMBIOS_TYPE_MEMORY_DEVICE_MAPPED_ADDRESS +#define EFI_SMBIOS_TYPE_BUILT_IN_POINTING_DEVICE SMBIOS_TYPE_BUILT_IN_POINTING_DEVICE +#define EFI_SMBIOS_TYPE_PORTABLE_BATTERY SMBIOS_TYPE_PORTABLE_BATTERY +#define EFI_SMBIOS_TYPE_SYSTEM_RESET SMBIOS_TYPE_SYSTEM_RESET +#define EFI_SMBIOS_TYPE_HARDWARE_SECURITY SMBIOS_TYPE_HARDWARE_SECURITY +#define EFI_SMBIOS_TYPE_SYSTEM_POWER_CONTROLS SMBIOS_TYPE_SYSTEM_POWER_CONTROLS +#define EFI_SMBIOS_TYPE_VOLTAGE_PROBE SMBIOS_TYPE_VOLTAGE_PROBE +#define EFI_SMBIOS_TYPE_COOLING_DEVICE SMBIOS_TYPE_COOLING_DEVICE +#define EFI_SMBIOS_TYPE_TEMPERATURE_PROBE SMBIOS_TYPE_TEMPERATURE_PROBE +#define EFI_SMBIOS_TYPE_ELECTRICAL_CURRENT_PROBE SMBIOS_TYPE_ELECTRICAL_CURRENT_PROBE +#define EFI_SMBIOS_TYPE_OUT_OF_BAND_REMOTE_ACCESS SMBIOS_TYPE_OUT_OF_BAND_REMOTE_ACCESS +#define EFI_SMBIOS_TYPE_BOOT_INTEGRITY_SERVICE SMBIOS_TYPE_BOOT_INTEGRITY_SERVICE +#define EFI_SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION +#define EFI_SMBIOS_TYPE_64BIT_MEMORY_ERROR_INFORMATION SMBIOS_TYPE_64BIT_MEMORY_ERROR_INFORMATION +#define EFI_SMBIOS_TYPE_MANAGEMENT_DEVICE SMBIOS_TYPE_MANAGEMENT_DEVICE +#define EFI_SMBIOS_TYPE_MANAGEMENT_DEVICE_COMPONENT SMBIOS_TYPE_MANAGEMENT_DEVICE_COMPONENT +#define EFI_SMBIOS_TYPE_MANAGEMENT_DEVICE_THRESHOLD_DATA SMBIOS_TYPE_MANAGEMENT_DEVICE_THRESHOLD_DATA +#define EFI_SMBIOS_TYPE_MEMORY_CHANNEL SMBIOS_TYPE_MEMORY_CHANNEL +#define EFI_SMBIOS_TYPE_IPMI_DEVICE_INFORMATION SMBIOS_TYPE_IPMI_DEVICE_INFORMATION +#define EFI_SMBIOS_TYPE_SYSTEM_POWER_SUPPLY SMBIOS_TYPE_SYSTEM_POWER_SUPPLY +#define EFI_SMBIOS_TYPE_ADDITIONAL_INFORMATION SMBIOS_TYPE_ADDITIONAL_INFORMATION +#define EFI_SMBIOS_TYPE_ONBOARD_DEVICES_EXTENDED_INFORMATION SMBIOS_TYPE_ONBOARD_DEVICES_EXTENDED_INFORMATION +#define EFI_SMBIOS_TYPE_MANAGEMENT_CONTROLLER_HOST_INTERFACE SMBIOS_TYPE_MANAGEMENT_CONTROLLER_HOST_INTERFACE +#define EFI_SMBIOS_TYPE_INACTIVE SMBIOS_TYPE_INACTIVE +#define EFI_SMBIOS_TYPE_END_OF_TABLE SMBIOS_TYPE_END_OF_TABLE +#define EFI_SMBIOS_OEM_BEGIN SMBIOS_OEM_BEGIN +#define EFI_SMBIOS_OEM_END SMBIOS_OEM_END + +typedef SMBIOS_TABLE_STRING EFI_SMBIOS_STRING; +typedef SMBIOS_TYPE EFI_SMBIOS_TYPE; +typedef SMBIOS_HANDLE EFI_SMBIOS_HANDLE; +typedef SMBIOS_STRUCTURE EFI_SMBIOS_TABLE_HEADER; typedef struct _EFI_SMBIOS_PROTOCOL EFI_SMBIOS_PROTOCOL; @@ -116,7 +116,7 @@ EFI_STATUS IN EFI_HANDLE ProducerHandle OPTIONAL, IN OUT EFI_SMBIOS_HANDLE *SmbiosHandle, IN EFI_SMBIOS_TABLE_HEADER *Record -); + ); /** Update the string associated with an existing SMBIOS record. @@ -137,11 +137,11 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_SMBIOS_UPDATE_STRING)( - IN CONST EFI_SMBIOS_PROTOCOL *This, - IN EFI_SMBIOS_HANDLE *SmbiosHandle, - IN UINTN *StringNumber, - IN CHAR8 *String -); + IN CONST EFI_SMBIOS_PROTOCOL *This, + IN EFI_SMBIOS_HANDLE *SmbiosHandle, + IN UINTN *StringNumber, + IN CHAR8 *String + ); /** Remove an SMBIOS record. @@ -157,9 +157,9 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_SMBIOS_REMOVE)( - IN CONST EFI_SMBIOS_PROTOCOL *This, - IN EFI_SMBIOS_HANDLE SmbiosHandle -); + IN CONST EFI_SMBIOS_PROTOCOL *This, + IN EFI_SMBIOS_HANDLE SmbiosHandle + ); /** Allow the caller to discover all or some of the SMBIOS records. @@ -186,22 +186,22 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_SMBIOS_GET_NEXT)( - IN CONST EFI_SMBIOS_PROTOCOL *This, - IN OUT EFI_SMBIOS_HANDLE *SmbiosHandle, - IN EFI_SMBIOS_TYPE *Type OPTIONAL, - OUT EFI_SMBIOS_TABLE_HEADER **Record, - OUT EFI_HANDLE *ProducerHandle OPTIONAL -); + IN CONST EFI_SMBIOS_PROTOCOL *This, + IN OUT EFI_SMBIOS_HANDLE *SmbiosHandle, + IN EFI_SMBIOS_TYPE *Type OPTIONAL, + OUT EFI_SMBIOS_TABLE_HEADER **Record, + OUT EFI_HANDLE *ProducerHandle OPTIONAL + ); struct _EFI_SMBIOS_PROTOCOL { - EFI_SMBIOS_ADD Add; - EFI_SMBIOS_UPDATE_STRING UpdateString; - EFI_SMBIOS_REMOVE Remove; - EFI_SMBIOS_GET_NEXT GetNext; - UINT8 MajorVersion; ///< The major revision of the SMBIOS specification supported. - UINT8 MinorVersion; ///< The minor revision of the SMBIOS specification supported. + EFI_SMBIOS_ADD Add; + EFI_SMBIOS_UPDATE_STRING UpdateString; + EFI_SMBIOS_REMOVE Remove; + EFI_SMBIOS_GET_NEXT GetNext; + UINT8 MajorVersion; ///< The major revision of the SMBIOS specification supported. + UINT8 MinorVersion; ///< The minor revision of the SMBIOS specification supported. }; -extern EFI_GUID gEfiSmbiosProtocolGuid; +extern EFI_GUID gEfiSmbiosProtocolGuid; #endif // __SMBIOS_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/SmbusHc.h b/MdePkg/Include/Protocol/SmbusHc.h index 3945a2c432..9a4155e803 100644 --- a/MdePkg/Include/Protocol/SmbusHc.h +++ b/MdePkg/Include/Protocol/SmbusHc.h @@ -123,9 +123,7 @@ EFI_STATUS IN BOOLEAN PecCheck, IN OUT UINTN *Length, IN OUT VOID *Buffer -); - - + ); /** @@ -186,8 +184,7 @@ EFI_STATUS IN BOOLEAN ArpAll, IN EFI_SMBUS_UDID *SmbusUdid OPTIONAL, IN OUT EFI_SMBUS_DEVICE_ADDRESS *SlaveAddress OPTIONAL -); - + ); /** The GetArpMap() function returns the mapping of all the SMBus devices @@ -214,7 +211,7 @@ EFI_STATUS IN CONST EFI_SMBUS_HC_PROTOCOL *This, IN OUT UINTN *Length, IN OUT EFI_SMBUS_DEVICE_MAP **SmbusDeviceMap -); + ); /** The notify function does some actions. @@ -232,8 +229,7 @@ EFI_STATUS (EFIAPI *EFI_SMBUS_NOTIFY_FUNCTION)( IN EFI_SMBUS_DEVICE_ADDRESS SlaveAddress, IN UINTN Data -); - + ); /** @@ -267,8 +263,7 @@ EFI_STATUS IN EFI_SMBUS_DEVICE_ADDRESS SlaveAddress, IN UINTN Data, IN EFI_SMBUS_NOTIFY_FUNCTION NotifyFunction -); - + ); /// /// The EFI_SMBUS_HC_PROTOCOL provides SMBus host controller management and basic data @@ -276,13 +271,12 @@ EFI_STATUS /// host controller. /// struct _EFI_SMBUS_HC_PROTOCOL { - EFI_SMBUS_HC_EXECUTE_OPERATION Execute; - EFI_SMBUS_HC_PROTOCOL_ARP_DEVICE ArpDevice; - EFI_SMBUS_HC_PROTOCOL_GET_ARP_MAP GetArpMap; - EFI_SMBUS_HC_PROTOCOL_NOTIFY Notify; + EFI_SMBUS_HC_EXECUTE_OPERATION Execute; + EFI_SMBUS_HC_PROTOCOL_ARP_DEVICE ArpDevice; + EFI_SMBUS_HC_PROTOCOL_GET_ARP_MAP GetArpMap; + EFI_SMBUS_HC_PROTOCOL_NOTIFY Notify; }; - -extern EFI_GUID gEfiSmbusHcProtocolGuid; +extern EFI_GUID gEfiSmbusHcProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SmmAccess2.h b/MdePkg/Include/Protocol/SmmAccess2.h index cc71de4752..1df3156cc5 100644 --- a/MdePkg/Include/Protocol/SmmAccess2.h +++ b/MdePkg/Include/Protocol/SmmAccess2.h @@ -21,9 +21,9 @@ #include -#define EFI_SMM_ACCESS2_PROTOCOL_GUID EFI_MM_ACCESS_PROTOCOL_GUID +#define EFI_SMM_ACCESS2_PROTOCOL_GUID EFI_MM_ACCESS_PROTOCOL_GUID -typedef EFI_MM_ACCESS_PROTOCOL EFI_SMM_ACCESS2_PROTOCOL; +typedef EFI_MM_ACCESS_PROTOCOL EFI_SMM_ACCESS2_PROTOCOL; typedef EFI_MM_OPEN EFI_SMM_OPEN2; @@ -32,7 +32,6 @@ typedef EFI_MM_CLOSE EFI_SMM_CLOSE2; typedef EFI_MM_LOCK EFI_SMM_LOCK2; typedef EFI_MM_CAPABILITIES EFI_SMM_CAPABILITIES2; -extern EFI_GUID gEfiSmmAccess2ProtocolGuid; +extern EFI_GUID gEfiSmmAccess2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmBase2.h b/MdePkg/Include/Protocol/SmmBase2.h index f42bf9c1b9..04fb6b1587 100644 --- a/MdePkg/Include/Protocol/SmmBase2.h +++ b/MdePkg/Include/Protocol/SmmBase2.h @@ -17,7 +17,7 @@ #define EFI_SMM_BASE2_PROTOCOL_GUID EFI_MM_BASE_PROTOCOL_GUID -typedef struct _EFI_SMM_BASE2_PROTOCOL EFI_SMM_BASE2_PROTOCOL; +typedef struct _EFI_SMM_BASE2_PROTOCOL EFI_SMM_BASE2_PROTOCOL; /** Service to indicate whether the driver is currently executing in the SMM Initialization phase. @@ -69,11 +69,10 @@ EFI_STATUS /// services and determine whether the driver is being invoked inside SMRAM or outside of SMRAM. /// struct _EFI_SMM_BASE2_PROTOCOL { - EFI_SMM_INSIDE_OUT2 InSmm; - EFI_SMM_GET_SMST_LOCATION2 GetSmstLocation; + EFI_SMM_INSIDE_OUT2 InSmm; + EFI_SMM_GET_SMST_LOCATION2 GetSmstLocation; }; -extern EFI_GUID gEfiSmmBase2ProtocolGuid; +extern EFI_GUID gEfiSmmBase2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmCommunication.h b/MdePkg/Include/Protocol/SmmCommunication.h index 535913d0c0..01829acb5c 100644 --- a/MdePkg/Include/Protocol/SmmCommunication.h +++ b/MdePkg/Include/Protocol/SmmCommunication.h @@ -14,14 +14,12 @@ #include - typedef EFI_MM_COMMUNICATE_HEADER EFI_SMM_COMMUNICATE_HEADER; -#define EFI_SMM_COMMUNICATION_PROTOCOL_GUID EFI_MM_COMMUNICATION_PROTOCOL_GUID +#define EFI_SMM_COMMUNICATION_PROTOCOL_GUID EFI_MM_COMMUNICATION_PROTOCOL_GUID typedef EFI_MM_COMMUNICATION_PROTOCOL EFI_SMM_COMMUNICATION_PROTOCOL; -extern EFI_GUID gEfiSmmCommunicationProtocolGuid; +extern EFI_GUID gEfiSmmCommunicationProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmConfiguration.h b/MdePkg/Include/Protocol/SmmConfiguration.h index 8c605489cd..bd76f76d1c 100644 --- a/MdePkg/Include/Protocol/SmmConfiguration.h +++ b/MdePkg/Include/Protocol/SmmConfiguration.h @@ -17,7 +17,7 @@ #include #include -#define EFI_SMM_CONFIGURATION_PROTOCOL_GUID EFI_MM_CONFIGURATION_PROTOCOL_GUID +#define EFI_SMM_CONFIGURATION_PROTOCOL_GUID EFI_MM_CONFIGURATION_PROTOCOL_GUID /// /// Structure describing a SMRAM region which cannot be used for the SMRAM heap. @@ -35,7 +35,7 @@ typedef struct _EFI_SMM_RESERVED_SMRAM_REGION { UINT64 SmramReservedSize; } EFI_SMM_RESERVED_SMRAM_REGION; -typedef struct _EFI_SMM_CONFIGURATION_PROTOCOL EFI_SMM_CONFIGURATION_PROTOCOL; +typedef struct _EFI_SMM_CONFIGURATION_PROTOCOL EFI_SMM_CONFIGURATION_PROTOCOL; /** Register the SMM Foundation entry point. @@ -68,11 +68,10 @@ struct _EFI_SMM_CONFIGURATION_PROTOCOL { /// /// A pointer to an array SMRAM ranges used by the initial SMM entry code. /// - EFI_SMM_RESERVED_SMRAM_REGION *SmramReservedRegions; - EFI_SMM_REGISTER_SMM_ENTRY RegisterSmmEntry; + EFI_SMM_RESERVED_SMRAM_REGION *SmramReservedRegions; + EFI_SMM_REGISTER_SMM_ENTRY RegisterSmmEntry; }; -extern EFI_GUID gEfiSmmConfigurationProtocolGuid; +extern EFI_GUID gEfiSmmConfigurationProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmControl2.h b/MdePkg/Include/Protocol/SmmControl2.h index b28c3c1a35..4d23e4e13b 100644 --- a/MdePkg/Include/Protocol/SmmControl2.h +++ b/MdePkg/Include/Protocol/SmmControl2.h @@ -21,15 +21,14 @@ #include -#define EFI_SMM_CONTROL2_PROTOCOL_GUID EFI_MM_CONTROL_PROTOCOL_GUID +#define EFI_SMM_CONTROL2_PROTOCOL_GUID EFI_MM_CONTROL_PROTOCOL_GUID typedef EFI_MM_CONTROL_PROTOCOL EFI_SMM_CONTROL2_PROTOCOL; -typedef EFI_MM_PERIOD EFI_SMM_PERIOD; +typedef EFI_MM_PERIOD EFI_SMM_PERIOD; typedef EFI_MM_ACTIVATE EFI_SMM_ACTIVATE2; typedef EFI_MM_DEACTIVATE EFI_SMM_DEACTIVATE2; -extern EFI_GUID gEfiSmmControl2ProtocolGuid; +extern EFI_GUID gEfiSmmControl2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmCpu.h b/MdePkg/Include/Protocol/SmmCpu.h index 90a7321ac5..d72b512907 100644 --- a/MdePkg/Include/Protocol/SmmCpu.h +++ b/MdePkg/Include/Protocol/SmmCpu.h @@ -92,29 +92,27 @@ #define EFI_SMM_SAVE_STATE_REGISTER_LMA EFI_MM_SAVE_STATE_REGISTER_LMA #define EFI_SMM_SAVE_STATE_REGISTER_PROCESSOR_ID EFI_MM_SAVE_STATE_REGISTER_PROCESSOR_ID -typedef EFI_MM_SAVE_STATE_REGISTER EFI_SMM_SAVE_STATE_REGISTER; - - -#define EFI_SMM_SAVE_STATE_REGISTER_LMA_32BIT EFI_MM_SAVE_STATE_REGISTER_LMA_32BIT -#define EFI_SMM_SAVE_STATE_REGISTER_LMA_64BIT EFI_MM_SAVE_STATE_REGISTER_LMA_64BIT +typedef EFI_MM_SAVE_STATE_REGISTER EFI_SMM_SAVE_STATE_REGISTER; +#define EFI_SMM_SAVE_STATE_REGISTER_LMA_32BIT EFI_MM_SAVE_STATE_REGISTER_LMA_32BIT +#define EFI_SMM_SAVE_STATE_REGISTER_LMA_64BIT EFI_MM_SAVE_STATE_REGISTER_LMA_64BIT /// /// Size width of I/O instruction /// -#define EFI_SMM_SAVE_STATE_IO_WIDTH_UINT8 EFI_MM_SAVE_STATE_IO_WIDTH_UINT8 -#define EFI_SMM_SAVE_STATE_IO_WIDTH_UINT16 EFI_MM_SAVE_STATE_IO_WIDTH_UINT16 -#define EFI_SMM_SAVE_STATE_IO_WIDTH_UINT32 EFI_MM_SAVE_STATE_IO_WIDTH_UINT32 -#define EFI_SMM_SAVE_STATE_IO_WIDTH_UINT64 EFI_MM_SAVE_STATE_IO_WIDTH_UINT64 +#define EFI_SMM_SAVE_STATE_IO_WIDTH_UINT8 EFI_MM_SAVE_STATE_IO_WIDTH_UINT8 +#define EFI_SMM_SAVE_STATE_IO_WIDTH_UINT16 EFI_MM_SAVE_STATE_IO_WIDTH_UINT16 +#define EFI_SMM_SAVE_STATE_IO_WIDTH_UINT32 EFI_MM_SAVE_STATE_IO_WIDTH_UINT32 +#define EFI_SMM_SAVE_STATE_IO_WIDTH_UINT64 EFI_MM_SAVE_STATE_IO_WIDTH_UINT64 typedef EFI_MM_SAVE_STATE_IO_WIDTH EFI_SMM_SAVE_STATE_IO_WIDTH; /// /// Types of I/O instruction /// -#define EFI_SMM_SAVE_STATE_IO_TYPE_INPUT EFI_MM_SAVE_STATE_IO_TYPE_INPUT -#define EFI_SMM_SAVE_STATE_IO_TYPE_OUTPUT EFI_MM_SAVE_STATE_IO_TYPE_OUTPUT -#define EFI_SMM_SAVE_STATE_IO_TYPE_STRING EFI_MM_SAVE_STATE_IO_TYPE_STRING -#define EFI_SMM_SAVE_STATE_IO_TYPE_REP_PREFIX EFI_MM_SAVE_STATE_IO_TYPE_REP_PREFIX +#define EFI_SMM_SAVE_STATE_IO_TYPE_INPUT EFI_MM_SAVE_STATE_IO_TYPE_INPUT +#define EFI_SMM_SAVE_STATE_IO_TYPE_OUTPUT EFI_MM_SAVE_STATE_IO_TYPE_OUTPUT +#define EFI_SMM_SAVE_STATE_IO_TYPE_STRING EFI_MM_SAVE_STATE_IO_TYPE_STRING +#define EFI_SMM_SAVE_STATE_IO_TYPE_REP_PREFIX EFI_MM_SAVE_STATE_IO_TYPE_REP_PREFIX typedef EFI_MM_SAVE_STATE_IO_TYPE EFI_SMM_SAVE_STATE_IO_TYPE; typedef EFI_MM_SAVE_STATE_IO_INFO EFI_SMM_SAVE_STATE_IO_INFO; @@ -124,7 +122,6 @@ typedef EFI_MM_CPU_PROTOCOL EFI_SMM_CPU_PROTOCOL; typedef EFI_MM_READ_SAVE_STATE EFI_SMM_READ_SAVE_STATE; typedef EFI_MM_WRITE_SAVE_STATE EFI_SMM_WRITE_SAVE_STATE; -extern EFI_GUID gEfiSmmCpuProtocolGuid; +extern EFI_GUID gEfiSmmCpuProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmCpuIo2.h b/MdePkg/Include/Protocol/SmmCpuIo2.h index 78b85464e2..4b52ec5434 100644 --- a/MdePkg/Include/Protocol/SmmCpuIo2.h +++ b/MdePkg/Include/Protocol/SmmCpuIo2.h @@ -13,23 +13,23 @@ #include -#define EFI_SMM_CPU_IO2_PROTOCOL_GUID EFI_MM_CPU_IO_PROTOCOL_GUID +#define EFI_SMM_CPU_IO2_PROTOCOL_GUID EFI_MM_CPU_IO_PROTOCOL_GUID -typedef EFI_MM_CPU_IO_PROTOCOL EFI_SMM_CPU_IO2_PROTOCOL; +typedef EFI_MM_CPU_IO_PROTOCOL EFI_SMM_CPU_IO2_PROTOCOL; /// /// Width of the SMM CPU I/O operations /// -#define SMM_IO_UINT8 MM_IO_UINT8 -#define SMM_IO_UINT16 MM_IO_UINT16 -#define SMM_IO_UINT32 MM_IO_UINT32 -#define SMM_IO_UINT64 MM_IO_UINT64 +#define SMM_IO_UINT8 MM_IO_UINT8 +#define SMM_IO_UINT16 MM_IO_UINT16 +#define SMM_IO_UINT32 MM_IO_UINT32 +#define SMM_IO_UINT64 MM_IO_UINT64 typedef EFI_MM_IO_WIDTH EFI_SMM_IO_WIDTH; -typedef EFI_MM_CPU_IO EFI_SMM_CPU_IO2; +typedef EFI_MM_CPU_IO EFI_SMM_CPU_IO2; typedef EFI_MM_IO_ACCESS EFI_SMM_IO_ACCESS2; -extern EFI_GUID gEfiSmmCpuIo2ProtocolGuid; +extern EFI_GUID gEfiSmmCpuIo2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SmmEndOfDxe.h b/MdePkg/Include/Protocol/SmmEndOfDxe.h index ca69c1c512..db9e6bbf19 100644 --- a/MdePkg/Include/Protocol/SmmEndOfDxe.h +++ b/MdePkg/Include/Protocol/SmmEndOfDxe.h @@ -19,8 +19,8 @@ #include -#define EFI_SMM_END_OF_DXE_PROTOCOL_GUID EFI_MM_END_OF_DXE_PROTOCOL_GUID +#define EFI_SMM_END_OF_DXE_PROTOCOL_GUID EFI_MM_END_OF_DXE_PROTOCOL_GUID -extern EFI_GUID gEfiSmmEndOfDxeProtocolGuid; +extern EFI_GUID gEfiSmmEndOfDxeProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SmmGpiDispatch2.h b/MdePkg/Include/Protocol/SmmGpiDispatch2.h index b5787e2131..38b6386ba3 100644 --- a/MdePkg/Include/Protocol/SmmGpiDispatch2.h +++ b/MdePkg/Include/Protocol/SmmGpiDispatch2.h @@ -23,11 +23,11 @@ #include #include -#define EFI_SMM_GPI_DISPATCH2_PROTOCOL_GUID EFI_MM_GPI_DISPATCH_PROTOCOL_GUID +#define EFI_SMM_GPI_DISPATCH2_PROTOCOL_GUID EFI_MM_GPI_DISPATCH_PROTOCOL_GUID /// /// The dispatch function's context. /// -typedef EFI_MM_GPI_REGISTER_CONTEXT EFI_SMM_GPI_REGISTER_CONTEXT; +typedef EFI_MM_GPI_REGISTER_CONTEXT EFI_SMM_GPI_REGISTER_CONTEXT; typedef EFI_MM_GPI_REGISTER EFI_SMM_GPI_REGISTER2; @@ -35,9 +35,6 @@ typedef EFI_MM_GPI_UNREGISTER EFI_SMM_GPI_UNREGISTER2; typedef EFI_MM_GPI_DISPATCH_PROTOCOL EFI_SMM_GPI_DISPATCH2_PROTOCOL; - - -extern EFI_GUID gEfiSmmGpiDispatch2ProtocolGuid; +extern EFI_GUID gEfiSmmGpiDispatch2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmIoTrapDispatch2.h b/MdePkg/Include/Protocol/SmmIoTrapDispatch2.h index 3756b10d14..b7f62d6ce8 100644 --- a/MdePkg/Include/Protocol/SmmIoTrapDispatch2.h +++ b/MdePkg/Include/Protocol/SmmIoTrapDispatch2.h @@ -37,11 +37,10 @@ typedef EFI_MM_IO_TRAP_CONTEXT EFI_SMM_IO_TRAP_CONTEXT; typedef EFI_MM_IO_TRAP_DISPATCH_PROTOCOL EFI_SMM_IO_TRAP_DISPATCH2_PROTOCOL; -typedef EFI_MM_IO_TRAP_DISPATCH_REGISTER EFI_SMM_IO_TRAP_DISPATCH2_REGISTER; +typedef EFI_MM_IO_TRAP_DISPATCH_REGISTER EFI_SMM_IO_TRAP_DISPATCH2_REGISTER; typedef EFI_MM_IO_TRAP_DISPATCH_UNREGISTER EFI_SMM_IO_TRAP_DISPATCH2_UNREGISTER; -extern EFI_GUID gEfiSmmIoTrapDispatch2ProtocolGuid; +extern EFI_GUID gEfiSmmIoTrapDispatch2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmPciRootBridgeIo.h b/MdePkg/Include/Protocol/SmmPciRootBridgeIo.h index a275be3d58..93ddcb439a 100644 --- a/MdePkg/Include/Protocol/SmmPciRootBridgeIo.h +++ b/MdePkg/Include/Protocol/SmmPciRootBridgeIo.h @@ -13,16 +13,15 @@ #include -#define EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID EFI_MM_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID +#define EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID EFI_MM_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID /// /// This protocol provides the same functionality as the PCI Root Bridge I/O Protocol defined in the /// UEFI 2.1 Specifcation, section 13.2, except that the functions for Map() and Unmap() may return /// EFI_UNSUPPORTED. /// -typedef EFI_MM_PCI_ROOT_BRIDGE_IO_PROTOCOL EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL; +typedef EFI_MM_PCI_ROOT_BRIDGE_IO_PROTOCOL EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL; -extern EFI_GUID gEfiSmmPciRootBridgeIoProtocolGuid; +extern EFI_GUID gEfiSmmPciRootBridgeIoProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h b/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h index 79b64fe08f..9dca4de889 100644 --- a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h +++ b/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch2.h @@ -18,7 +18,7 @@ #include #include -#define EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL_GUID EFI_MM_PERIODIC_TIMER_DISPATCH_PROTOCOL_GUID +#define EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL_GUID EFI_MM_PERIODIC_TIMER_DISPATCH_PROTOCOL_GUID /// /// Example: A chipset supports periodic SMIs on every 64ms or 2 seconds. @@ -44,13 +44,13 @@ typedef struct { /// The minimum period of time in 100 nanosecond units that the child gets called. The /// child will be called back after a time greater than the time Period. /// - UINT64 Period; + UINT64 Period; /// /// The period of time interval between SMIs. Children of this interface should use this /// field when registering for periodic timer intervals when a finer granularity periodic /// SMI is desired. /// - UINT64 SmiTickInterval; + UINT64 SmiTickInterval; } EFI_SMM_PERIODIC_TIMER_REGISTER_CONTEXT; /// @@ -60,7 +60,7 @@ typedef struct { /// typedef EFI_MM_PERIODIC_TIMER_CONTEXT EFI_SMM_PERIODIC_TIMER_CONTEXT; -typedef struct _EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL; +typedef struct _EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL; /** Register a child SMI source dispatch function for SMM periodic timer. @@ -145,12 +145,11 @@ EFI_STATUS /// This protocol provides the parent dispatch service for the periodical timer SMI source generator. /// struct _EFI_SMM_PERIODIC_TIMER_DISPATCH2_PROTOCOL { - EFI_SMM_PERIODIC_TIMER_REGISTER2 Register; - EFI_SMM_PERIODIC_TIMER_UNREGISTER2 UnRegister; - EFI_SMM_PERIODIC_TIMER_INTERVAL2 GetNextShorterInterval; + EFI_SMM_PERIODIC_TIMER_REGISTER2 Register; + EFI_SMM_PERIODIC_TIMER_UNREGISTER2 UnRegister; + EFI_SMM_PERIODIC_TIMER_INTERVAL2 GetNextShorterInterval; }; -extern EFI_GUID gEfiSmmPeriodicTimerDispatch2ProtocolGuid; +extern EFI_GUID gEfiSmmPeriodicTimerDispatch2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h b/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h index 2b1f249c24..5a37aa319b 100644 --- a/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h +++ b/MdePkg/Include/Protocol/SmmPowerButtonDispatch2.h @@ -17,7 +17,7 @@ #include -#define EFI_SMM_POWER_BUTTON_DISPATCH2_PROTOCOL_GUID EFI_MM_POWER_BUTTON_DISPATCH_PROTOCOL_GUID +#define EFI_SMM_POWER_BUTTON_DISPATCH2_PROTOCOL_GUID EFI_MM_POWER_BUTTON_DISPATCH_PROTOCOL_GUID /// /// The dispatch function's context. @@ -30,7 +30,6 @@ typedef EFI_MM_POWER_BUTTON_REGISTER EFI_SMM_POWER_BUTTON_REGISTER2; typedef EFI_MM_POWER_BUTTON_UNREGISTER EFI_SMM_POWER_BUTTON_UNREGISTER2; -extern EFI_GUID gEfiSmmPowerButtonDispatch2ProtocolGuid; +extern EFI_GUID gEfiSmmPowerButtonDispatch2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmReadyToLock.h b/MdePkg/Include/Protocol/SmmReadyToLock.h index f701984d00..236aec684c 100644 --- a/MdePkg/Include/Protocol/SmmReadyToLock.h +++ b/MdePkg/Include/Protocol/SmmReadyToLock.h @@ -21,8 +21,8 @@ #include -#define EFI_SMM_READY_TO_LOCK_PROTOCOL_GUID EFI_MM_READY_TO_LOCK_PROTOCOL_GUID +#define EFI_SMM_READY_TO_LOCK_PROTOCOL_GUID EFI_MM_READY_TO_LOCK_PROTOCOL_GUID -extern EFI_GUID gEfiSmmReadyToLockProtocolGuid; +extern EFI_GUID gEfiSmmReadyToLockProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SmmReportStatusCodeHandler.h b/MdePkg/Include/Protocol/SmmReportStatusCodeHandler.h index d0b36ac81b..9b24eb3bf1 100644 --- a/MdePkg/Include/Protocol/SmmReportStatusCodeHandler.h +++ b/MdePkg/Include/Protocol/SmmReportStatusCodeHandler.h @@ -14,7 +14,7 @@ #include -#define EFI_SMM_RSC_HANDLER_PROTOCOL_GUID EFI_MM_RSC_HANDLER_PROTOCOL_GUID +#define EFI_SMM_RSC_HANDLER_PROTOCOL_GUID EFI_MM_RSC_HANDLER_PROTOCOL_GUID typedef EFI_MM_RSC_HANDLER_CALLBACK EFI_SMM_RSC_HANDLER_CALLBACK; @@ -24,6 +24,6 @@ typedef EFI_MM_RSC_HANDLER_UNREGISTER EFI_SMM_RSC_HANDLER_UNREGISTER; typedef EFI_MM_RSC_HANDLER_PROTOCOL EFI_SMM_RSC_HANDLER_PROTOCOL; -extern EFI_GUID gEfiSmmRscHandlerProtocolGuid; +extern EFI_GUID gEfiSmmRscHandlerProtocolGuid; #endif // __SMM_REPORT_STATUS_CODE_HANDLER_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h b/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h index c41c180553..ca26d58a4e 100644 --- a/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h +++ b/MdePkg/Include/Protocol/SmmStandbyButtonDispatch2.h @@ -17,7 +17,7 @@ #include -#define EFI_SMM_STANDBY_BUTTON_DISPATCH2_PROTOCOL_GUID EFI_MM_STANDBY_BUTTON_DISPATCH_PROTOCOL_GUID +#define EFI_SMM_STANDBY_BUTTON_DISPATCH2_PROTOCOL_GUID EFI_MM_STANDBY_BUTTON_DISPATCH_PROTOCOL_GUID /// /// The dispatch function's context. @@ -30,7 +30,6 @@ typedef EFI_MM_STANDBY_BUTTON_REGISTER EFI_SMM_STANDBY_BUTTON_REGISTER2; typedef EFI_MM_STANDBY_BUTTON_UNREGISTER EFI_SMM_STANDBY_BUTTON_UNREGISTER2; -extern EFI_GUID gEfiSmmStandbyButtonDispatch2ProtocolGuid; +extern EFI_GUID gEfiSmmStandbyButtonDispatch2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmStatusCode.h b/MdePkg/Include/Protocol/SmmStatusCode.h index 521c0d84a4..79ca480990 100644 --- a/MdePkg/Include/Protocol/SmmStatusCode.h +++ b/MdePkg/Include/Protocol/SmmStatusCode.h @@ -13,13 +13,12 @@ #include -#define EFI_SMM_STATUS_CODE_PROTOCOL_GUID EFI_MM_STATUS_CODE_PROTOCOL_GUID +#define EFI_SMM_STATUS_CODE_PROTOCOL_GUID EFI_MM_STATUS_CODE_PROTOCOL_GUID -typedef EFI_MM_STATUS_CODE_PROTOCOL EFI_SMM_STATUS_CODE_PROTOCOL; +typedef EFI_MM_STATUS_CODE_PROTOCOL EFI_SMM_STATUS_CODE_PROTOCOL; typedef EFI_MM_REPORT_STATUS_CODE EFI_SMM_REPORT_STATUS_CODE; -extern EFI_GUID gEfiSmmStatusCodeProtocolGuid; +extern EFI_GUID gEfiSmmStatusCodeProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SmmSwDispatch2.h b/MdePkg/Include/Protocol/SmmSwDispatch2.h index f264bb3e43..d0db953f06 100644 --- a/MdePkg/Include/Protocol/SmmSwDispatch2.h +++ b/MdePkg/Include/Protocol/SmmSwDispatch2.h @@ -15,7 +15,7 @@ #include #include -#define EFI_SMM_SW_DISPATCH2_PROTOCOL_GUID EFI_MM_SW_DISPATCH_PROTOCOL_GUID +#define EFI_SMM_SW_DISPATCH2_PROTOCOL_GUID EFI_MM_SW_DISPATCH_PROTOCOL_GUID /// /// A particular chipset may not support all possible software SMI input values. @@ -23,7 +23,7 @@ /// child registration for each SwSmiInputValue. /// typedef struct { - UINTN SwSmiInputValue; + UINTN SwSmiInputValue; } EFI_SMM_SW_REGISTER_CONTEXT; /// @@ -36,18 +36,18 @@ typedef struct { /// /// The 0-based index of the CPU which generated the software SMI. /// - UINTN SwSmiCpuIndex; + UINTN SwSmiCpuIndex; /// /// This value corresponds directly to the CommandPort parameter used in the call to Trigger(). /// - UINT8 CommandPort; + UINT8 CommandPort; /// /// This value corresponds directly to the DataPort parameter used in the call to Trigger(). /// - UINT8 DataPort; + UINT8 DataPort; } EFI_SMM_SW_CONTEXT; -typedef struct _EFI_SMM_SW_DISPATCH2_PROTOCOL EFI_SMM_SW_DISPATCH2_PROTOCOL; +typedef struct _EFI_SMM_SW_DISPATCH2_PROTOCOL EFI_SMM_SW_DISPATCH2_PROTOCOL; /** Register a child SMI source dispatch function for the specified software SMI. @@ -104,7 +104,7 @@ EFI_STATUS (EFIAPI *EFI_SMM_SW_UNREGISTER2)( IN CONST EFI_SMM_SW_DISPATCH2_PROTOCOL *This, IN EFI_HANDLE DispatchHandle -); + ); /// /// Interface structure for the SMM Software SMI Dispatch Protocol. @@ -114,15 +114,15 @@ EFI_STATUS /// interrupt in the EFI_SMM_SW_REGISTER_CONTEXT is denoted by MaximumSwiValue. /// struct _EFI_SMM_SW_DISPATCH2_PROTOCOL { - EFI_SMM_SW_REGISTER2 Register; - EFI_SMM_SW_UNREGISTER2 UnRegister; + EFI_SMM_SW_REGISTER2 Register; + EFI_SMM_SW_UNREGISTER2 UnRegister; /// /// A read-only field that describes the maximum value that can be used in the /// EFI_SMM_SW_DISPATCH2_PROTOCOL.Register() service. /// - UINTN MaximumSwiValue; + UINTN MaximumSwiValue; }; -extern EFI_GUID gEfiSmmSwDispatch2ProtocolGuid; +extern EFI_GUID gEfiSmmSwDispatch2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SmmSxDispatch2.h b/MdePkg/Include/Protocol/SmmSxDispatch2.h index c3ab8bb7b5..ff44530e5f 100644 --- a/MdePkg/Include/Protocol/SmmSxDispatch2.h +++ b/MdePkg/Include/Protocol/SmmSxDispatch2.h @@ -14,19 +14,19 @@ #include -#define EFI_SMM_SX_DISPATCH2_PROTOCOL_GUID EFI_MM_SX_DISPATCH_PROTOCOL_GUID +#define EFI_SMM_SX_DISPATCH2_PROTOCOL_GUID EFI_MM_SX_DISPATCH_PROTOCOL_GUID /// /// The dispatch function's context /// typedef EFI_MM_SX_REGISTER_CONTEXT EFI_SMM_SX_REGISTER_CONTEXT; -typedef EFI_MM_SX_DISPATCH_PROTOCOL EFI_SMM_SX_DISPATCH2_PROTOCOL; +typedef EFI_MM_SX_DISPATCH_PROTOCOL EFI_SMM_SX_DISPATCH2_PROTOCOL; typedef EFI_MM_SX_REGISTER EFI_SMM_SX_REGISTER2; typedef EFI_MM_SX_UNREGISTER EFI_SMM_SX_UNREGISTER2; -extern EFI_GUID gEfiSmmSxDispatch2ProtocolGuid; +extern EFI_GUID gEfiSmmSxDispatch2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SmmUsbDispatch2.h b/MdePkg/Include/Protocol/SmmUsbDispatch2.h index a74fb9030a..5c0dc5eacf 100644 --- a/MdePkg/Include/Protocol/SmmUsbDispatch2.h +++ b/MdePkg/Include/Protocol/SmmUsbDispatch2.h @@ -17,7 +17,7 @@ #include -#define EFI_SMM_USB_DISPATCH2_PROTOCOL_GUID EFI_MM_USB_DISPATCH_PROTOCOL_GUID +#define EFI_SMM_USB_DISPATCH2_PROTOCOL_GUID EFI_MM_USB_DISPATCH_PROTOCOL_GUID /// /// USB SMI event types @@ -35,7 +35,6 @@ typedef EFI_MM_USB_REGISTER EFI_SMM_USB_REGISTER2; typedef EFI_MM_USB_UNREGISTER EFI_SMM_USB_UNREGISTER2; -extern EFI_GUID gEfiSmmUsbDispatch2ProtocolGuid; +extern EFI_GUID gEfiSmmUsbDispatch2ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/SpiConfiguration.h b/MdePkg/Include/Protocol/SpiConfiguration.h index 44e4760f88..3f8fb9ff62 100644 --- a/MdePkg/Include/Protocol/SpiConfiguration.h +++ b/MdePkg/Include/Protocol/SpiConfiguration.h @@ -54,7 +54,7 @@ typedef struct _EFI_SPI_PERIPHERAL EFI_SPI_PERIPHERAL; **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_CHIP_SELECT) ( +(EFIAPI *EFI_SPI_CHIP_SELECT)( IN CONST EFI_SPI_PERIPHERAL *SpiPeripheral, IN BOOLEAN PinValue ); @@ -85,7 +85,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_CLOCK) ( +(EFIAPI *EFI_SPI_CLOCK)( IN CONST EFI_SPI_PERIPHERAL *SpiPeripheral, IN UINT32 *ClockHz ); @@ -99,31 +99,31 @@ typedef struct _EFI_SPI_PART { /// /// A Unicode string specifying the SPI chip vendor. /// - CONST CHAR16 *Vendor; + CONST CHAR16 *Vendor; /// /// A Unicode string specifying the SPI chip part number. /// - CONST CHAR16 *PartNumber; + CONST CHAR16 *PartNumber; /// /// The minimum SPI bus clock frequency used to access this chip. This value /// may be specified in the chip's datasheet. If not, use the value of zero. /// - UINT32 MinClockHz; + UINT32 MinClockHz; /// /// The maximum SPI bus clock frequency used to access this chip. This value /// is found in the chip's datasheet. /// - UINT32 MaxClockHz; + UINT32 MaxClockHz; /// /// Specify the polarity of the chip select pin. This value can be found in /// the SPI chip's datasheet. Specify TRUE when a one asserts the chip select - ///and FALSE when a zero asserts the chip select. + /// and FALSE when a zero asserts the chip select. /// - BOOLEAN ChipSelectPolarity; + BOOLEAN ChipSelectPolarity; } EFI_SPI_PART; /// @@ -137,26 +137,26 @@ typedef struct _EFI_SPI_BUS { /// /// A Unicode string describing the SPI bus /// - CONST CHAR16 *FriendlyName; + CONST CHAR16 *FriendlyName; /// /// Address of the first EFI_SPI_PERIPHERAL data structure connected to this /// bus. Specify NULL if there are no SPI peripherals connected to this bus. /// - CONST EFI_SPI_PERIPHERAL *Peripherallist; + CONST EFI_SPI_PERIPHERAL *Peripherallist; /// /// Address of an EFI_DEVICE_PATH_PROTOCOL data structure which uniquely /// describes the SPI controller. /// - CONST EFI_DEVICE_PATH_PROTOCOL *ControllerPath; + CONST EFI_DEVICE_PATH_PROTOCOL *ControllerPath; /// /// Address of the routine which controls the clock used by the SPI bus for /// this SPI peripheral. The SPI host co ntroller's clock routine is called /// when this value is set to NULL. /// - EFI_SPI_CLOCK Clock; + EFI_SPI_CLOCK Clock; /// /// Address of a data structure containing the additional values which @@ -165,7 +165,7 @@ typedef struct _EFI_SPI_BUS { /// host's SPI controller driver. When Clock is not NULL, the declaration for /// this data structure is provided by the board layer. /// - VOID *ClockParameter; + VOID *ClockParameter; } EFI_SPI_BUS; /// @@ -180,12 +180,12 @@ struct _EFI_SPI_PERIPHERAL { /// Address of the next EFI_SPI_PERIPHERAL data structure. Specify NULL if /// the current data structure is the last one on the SPI bus. /// - CONST EFI_SPI_PERIPHERAL *NextSpiPeripheral; + CONST EFI_SPI_PERIPHERAL *NextSpiPeripheral; /// /// A unicode string describing the function of the SPI part. /// - CONST CHAR16 *FriendlyName; + CONST CHAR16 *FriendlyName; /// /// Address of a GUID provided by the vendor of the SPI peripheral driver. @@ -195,32 +195,32 @@ struct _EFI_SPI_PERIPHERAL { /// This reduces the comparison logic in the SPI peripheral driver's /// Supported routine. /// - CONST GUID *SpiPeripheralDriverGuid; + CONST GUID *SpiPeripheralDriverGuid; /// /// The address of an EFI_SPI_PART data structure which describes this chip. /// - CONST EFI_SPI_PART *SpiPart; + CONST EFI_SPI_PART *SpiPart; /// /// The maximum clock frequency is specified in the EFI_SPI_P ART. When this /// this value is non-zero and less than the value in the EFI_SPI_PART then /// this value is used for the maximum clock frequency for the SPI part. /// - UINT32 MaxClockHz; + UINT32 MaxClockHz; /// /// Specify the idle value of the clock as found in the datasheet. /// Use zero (0) if the clock'S idle value is low or one (1) if the the /// clock's idle value is high. /// - BOOLEAN ClockPolarity; + BOOLEAN ClockPolarity; /// /// Specify the clock delay after chip select. Specify zero (0) to delay an /// entire clock cycle or one (1) to delay only half a clock cycle. /// - BOOLEAN ClockPhase; + BOOLEAN ClockPhase; /// /// SPI peripheral attributes, select zero or more of: @@ -229,27 +229,27 @@ struct _EFI_SPI_PERIPHERAL { /// * SPI_PART_SUPPORTS_4_B1T_DATA_BUS_W1DTH - The SPI peripheral is wired to /// support a 4-bit data bus /// - UINT32 Attributes; + UINT32 Attributes; /// /// Address of a vendor specific data structure containing additional board /// configuration details related to the SPI chip. The SPI peripheral layer /// uses this data structure when configuring the chip. /// - CONST VOID *ConfigurationData; + CONST VOID *ConfigurationData; /// /// The address of an EFI_SPI_BUS data structure which describes the SPI bus /// to which this chip is connected. /// - CONST EFI_SPI_BUS *SpiBus; + CONST EFI_SPI_BUS *SpiBus; /// /// Address of the routine which controls the chip select pin for this SPI /// peripheral. Call the SPI host controller's chip select routine when this /// value is set to NULL. /// - EFI_SPI_CHIP_SELECT ChipSelect; + EFI_SPI_CHIP_SELECT ChipSelect; /// /// Address of a data structure containing the additional values which @@ -260,7 +260,7 @@ struct _EFI_SPI_PERIPHERAL { /// control. When Chipselect is not NULL, the declaration for this data /// structure is provided by the board layer. /// - VOID *ChipSelectParameter; + VOID *ChipSelectParameter; }; /// @@ -274,14 +274,14 @@ typedef struct _EFI_SPI_CONFIGURATION_PROTOCOL { /// /// The number of SPI busses on the board. /// - UINT32 BusCount; + UINT32 BusCount; /// /// The address of an array of EFI_SPI_BUS data structure addresses. /// - CONST EFI_SPI_BUS *CONST *CONST Buslist; + CONST EFI_SPI_BUS *CONST *CONST Buslist; } EFI_SPI_CONFIGURATION_PROTOCOL; -extern EFI_GUID gEfiSpiConfigurationProtocolGuid; +extern EFI_GUID gEfiSpiConfigurationProtocolGuid; #endif // __SPI_CONFIGURATION_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/SpiHc.h b/MdePkg/Include/Protocol/SpiHc.h index 6840c25ece..30128dd5c4 100644 --- a/MdePkg/Include/Protocol/SpiHc.h +++ b/MdePkg/Include/Protocol/SpiHc.h @@ -54,7 +54,7 @@ typedef struct _EFI_SPI_HC_PROTOCOL EFI_SPI_HC_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_HC_PROTOCOL_CHIP_SELECT) ( +(EFIAPI *EFI_SPI_HC_PROTOCOL_CHIP_SELECT)( IN CONST EFI_SPI_HC_PROTOCOL *This, IN CONST EFI_SPI_PERIPHERAL *SpiPeripheral, IN BOOLEAN PinValue @@ -87,7 +87,7 @@ typedef EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_HC_PROTOCOL_CLOCK) ( +(EFIAPI *EFI_SPI_HC_PROTOCOL_CLOCK)( IN CONST EFI_SPI_HC_PROTOCOL *This, IN CONST EFI_SPI_PERIPHERAL *SpiPeripheral, IN UINT32 *ClockHz @@ -116,7 +116,7 @@ typedef EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_HC_PROTOCOL_TRANSACTION) ( +(EFIAPI *EFI_SPI_HC_PROTOCOL_TRANSACTION)( IN CONST EFI_SPI_HC_PROTOCOL *This, IN EFI_SPI_BUS_TRANSACTION *BusTransaction ); @@ -151,38 +151,38 @@ struct _EFI_SPI_HC_PROTOCOL { /// sending) operation.The SPI host controller must support a 1 - bit bus /// width. /// - UINT32 Attributes; + UINT32 Attributes; /// /// Mask of frame sizes which the SPI host controller supports. Frame size of /// N-bits is supported when bit N-1 is set. The host controller must support /// a frame size of 8-bits. /// - UINT32 FrameSizeSupportMask; + UINT32 FrameSizeSupportMask; /// /// Maximum transfer size in bytes: 1 - Oxffffffff /// - UINT32 MaximumTransferBytes; + UINT32 MaximumTransferBytes; /// /// Assert or deassert the SPI chip select. /// - EFI_SPI_HC_PROTOCOL_CHIP_SELECT ChipSelect; + EFI_SPI_HC_PROTOCOL_CHIP_SELECT ChipSelect; /// /// Set up the clock generator to produce the correct clock frequency, phase /// and polarity for a SPI chip. /// - EFI_SPI_HC_PROTOCOL_CLOCK Clock; + EFI_SPI_HC_PROTOCOL_CLOCK Clock; /// /// Perform the SPI transaction on the SPI peripheral using the SPI host /// controller. /// - EFI_SPI_HC_PROTOCOL_TRANSACTION Transaction; + EFI_SPI_HC_PROTOCOL_TRANSACTION Transaction; }; -extern EFI_GUID gEfiSpiHcProtocolGuid; +extern EFI_GUID gEfiSpiHcProtocolGuid; #endif // __SPI_HC_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/SpiIo.h b/MdePkg/Include/Protocol/SpiIo.h index 3e9c4b0e7a..b4fc5e03b8 100644 --- a/MdePkg/Include/Protocol/SpiIo.h +++ b/MdePkg/Include/Protocol/SpiIo.h @@ -125,7 +125,7 @@ typedef enum { **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_IO_PROTOCOL_TRANSACTION) ( +(EFIAPI *EFI_SPI_IO_PROTOCOL_TRANSACTION)( IN CONST EFI_SPI_IO_PROTOCOL *This, IN EFI_SPI_TRANSACTION_TYPE TransactionType, IN BOOLEAN DebugTransaction, @@ -158,7 +158,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_IO_PROTOCOL_UPDATE_SPI_PERIPHERAL) ( +(EFIAPI *EFI_SPI_IO_PROTOCOL_UPDATE_SPI_PERIPHERAL)( IN CONST EFI_SPI_IO_PROTOCOL *This, IN CONST EFI_SPI_PERIPHERAL *SpiPeripheral ); @@ -171,13 +171,13 @@ typedef struct _EFI_SPI_BUS_TRANSACTION { /// /// Pointer to the SPI peripheral being manipulated. /// - CONST EFI_SPI_PERIPHERAL *SpiPeripheral; + CONST EFI_SPI_PERIPHERAL *SpiPeripheral; /// /// Type of transaction specified by one of the EFI_SPI_TRANSACTION_TYPE /// values. /// - EFI_SPI_TRANSACTION_TYPE TransactionType; + EFI_SPI_TRANSACTION_TYPE TransactionType; /// /// TRUE if the transaction is being debugged. Debugging may be turned on for @@ -185,34 +185,34 @@ typedef struct _EFI_SPI_BUS_TRANSACTION { /// messages. All other transactions with this value set to FALSE will not /// display any debugging messages. /// - BOOLEAN DebugTransaction; + BOOLEAN DebugTransaction; /// /// SPI bus width in bits: 1, 2, 4 /// - UINT32 BusWidth; + UINT32 BusWidth; /// /// Frame size in bits, range: 1 - 32 /// - UINT32 FrameSize; + UINT32 FrameSize; /// /// Length of the write buffer in bytes /// - UINT32 WriteBytes; + UINT32 WriteBytes; /// /// Buffer containing data to send to the SPI peripheral /// Frame sizes 1 - 8 bits: UINT8 (one byte) per frame /// Frame sizes 7 - 16 bits : UINT16 (two bytes) per frame /// - UINT8 *WriteBuffer; + UINT8 *WriteBuffer; /// /// Length of the read buffer in bytes /// - UINT32 ReadBytes; + UINT32 ReadBytes; /// /// Buffer to receive the data from the SPI peripheral @@ -220,7 +220,7 @@ typedef struct _EFI_SPI_BUS_TRANSACTION { /// * Frame sizes 7 - 16 bits : UINT16 (two bytes) per frame /// * Frame sizes 17 - 32 bits : UINT32 (four bytes) per frame /// - UINT8 *ReadBuffer; + UINT8 *ReadBuffer; } EFI_SPI_BUS_TRANSACTION; /// @@ -232,13 +232,13 @@ struct _EFI_SPI_IO_PROTOCOL { /// Address of an EFI_SPI_PERIPHERAL data structure associated with this /// protocol instance. /// - CONST EFI_SPI_PERIPHERAL *SpiPeripheral; + CONST EFI_SPI_PERIPHERAL *SpiPeripheral; /// /// Address of the original EFI_SPI_PERIPHERAL data structure associated with /// this protocol instance. /// - CONST EFI_SPI_PERIPHERAL *OriginalSpiPeripheral; + CONST EFI_SPI_PERIPHERAL *OriginalSpiPeripheral; /// /// Mask of frame sizes which the SPI 10 layer supports. Frame size of N-bits @@ -247,12 +247,12 @@ struct _EFI_SPI_IO_PROTOCOL { /// 8-bit frame sizes by the SPI bus layer if the frame size is not supported /// by the SPI host controller. /// - UINT32 FrameSizeSupportMask; + UINT32 FrameSizeSupportMask; /// /// Maximum transfer size in bytes: 1 - Oxffffffff /// - UINT32 MaximumTransferBytes; + UINT32 MaximumTransferBytes; /// /// Transaction attributes: One or more from: @@ -265,22 +265,22 @@ struct _EFI_SPI_IO_PROTOCOL { /// * SPI_IO_TRANSFER_SIZE_INCLUDES_ADDRESS /// - Transfer size includes the 3 address bytes /// - UINT32 Attributes; + UINT32 Attributes; /// /// Pointer to legacy SPI controller protocol /// - CONST EFI_LEGACY_SPI_CONTROLLER_PROTOCOL *LegacySpiProtocol; + CONST EFI_LEGACY_SPI_CONTROLLER_PROTOCOL *LegacySpiProtocol; /// /// Initiate a SPI transaction between the host and a SPI peripheral. /// - EFI_SPI_IO_PROTOCOL_TRANSACTION Transaction; + EFI_SPI_IO_PROTOCOL_TRANSACTION Transaction; /// /// Update the SPI peripheral associated with this SPI 10 instance. /// - EFI_SPI_IO_PROTOCOL_UPDATE_SPI_PERIPHERAL UpdateSpiPeripheral; + EFI_SPI_IO_PROTOCOL_UPDATE_SPI_PERIPHERAL UpdateSpiPeripheral; }; #endif // __SPI_IO_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/SpiNorFlash.h b/MdePkg/Include/Protocol/SpiNorFlash.h index 87aeb04786..bab1d363d9 100644 --- a/MdePkg/Include/Protocol/SpiNorFlash.h +++ b/MdePkg/Include/Protocol/SpiNorFlash.h @@ -44,7 +44,7 @@ typedef struct _EFI_SPI_NOR_FLASH_PROTOCOL EFI_SPI_NOR_FLASH_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_GET_FLASH_ID) ( +(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_GET_FLASH_ID)( IN CONST EFI_SPI_NOR_FLASH_PROTOCOL *This, OUT UINT8 *Buffer ); @@ -69,7 +69,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_READ_DATA) ( +(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_READ_DATA)( IN CONST EFI_SPI_NOR_FLASH_PROTOCOL *This, IN UINT32 FlashAddress, IN UINT32 LengthInBytes, @@ -92,7 +92,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_READ_STATUS) ( +(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_READ_STATUS)( IN CONST EFI_SPI_NOR_FLASH_PROTOCOL *This, IN UINT32 LengthInBytes, OUT UINT8 *FlashStatus @@ -115,7 +115,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_WRITE_STATUS) ( +(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_WRITE_STATUS)( IN CONST EFI_SPI_NOR_FLASH_PROTOCOL *This, IN UINT32 LengthInBytes, IN UINT8 *FlashStatus @@ -143,7 +143,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_WRITE_DATA) ( +(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_WRITE_DATA)( IN CONST EFI_SPI_NOR_FLASH_PROTOCOL *This, IN UINT32 FlashAddress, IN UINT32 LengthInBytes, @@ -170,7 +170,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_ERASE) ( +(EFIAPI *EFI_SPI_NOR_FLASH_PROTOCOL_ERASE)( IN CONST EFI_SPI_NOR_FLASH_PROTOCOL *This, IN UINT32 FlashAddress, IN UINT32 BlockCount @@ -198,59 +198,59 @@ struct _EFI_SPI_NOR_FLASH_PROTOCOL { /// /// Pointer to an EFI_SPI_PERIPHERAL data structure /// - CONST EFI_SPI_PERIPHERAL *SpiPeripheral; + CONST EFI_SPI_PERIPHERAL *SpiPeripheral; /// /// Flash size in bytes /// - UINT32 FlashSize; + UINT32 FlashSize; /// /// Manufacture and Device ID /// - UINT8 Deviceid[3]; + UINT8 Deviceid[3]; /// /// Erase block size in bytes /// - UINT32 EraseBlockBytes; + UINT32 EraseBlockBytes; /// /// Read the 3 byte manufacture and device ID from the SPI flash. /// - EFI_SPI_NOR_FLASH_PROTOCOL_GET_FLASH_ID GetFlashid; + EFI_SPI_NOR_FLASH_PROTOCOL_GET_FLASH_ID GetFlashid; /// /// Read data from the SPI flash. /// - EFI_SPI_NOR_FLASH_PROTOCOL_READ_DATA ReadData; + EFI_SPI_NOR_FLASH_PROTOCOL_READ_DATA ReadData; /// /// Low frequency read data from the SPI flash. /// - EFI_SPI_NOR_FLASH_PROTOCOL_READ_DATA LfReadData; + EFI_SPI_NOR_FLASH_PROTOCOL_READ_DATA LfReadData; /// /// Read the flash status register. /// - EFI_SPI_NOR_FLASH_PROTOCOL_READ_STATUS ReadStatus; + EFI_SPI_NOR_FLASH_PROTOCOL_READ_STATUS ReadStatus; /// /// Write the flash status register. /// - EFI_SPI_NOR_FLASH_PROTOCOL_WRITE_STATUS WriteStatus; + EFI_SPI_NOR_FLASH_PROTOCOL_WRITE_STATUS WriteStatus; /// /// Write data to the SPI flash. /// - EFI_SPI_NOR_FLASH_PROTOCOL_WRITE_DATA WriteData; + EFI_SPI_NOR_FLASH_PROTOCOL_WRITE_DATA WriteData; /// /// Efficiently erases one or more 4KiB regions in the SPI flash. /// - EFI_SPI_NOR_FLASH_PROTOCOL_ERASE Erase; + EFI_SPI_NOR_FLASH_PROTOCOL_ERASE Erase; }; -extern EFI_GUID gEfiSpiNorFlashProtocolGuid; +extern EFI_GUID gEfiSpiNorFlashProtocolGuid; #endif // __SPI_NOR_FLASH_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/SpiSmmConfiguration.h b/MdePkg/Include/Protocol/SpiSmmConfiguration.h index 8ec5c2688b..c9e4f6e254 100644 --- a/MdePkg/Include/Protocol/SpiSmmConfiguration.h +++ b/MdePkg/Include/Protocol/SpiSmmConfiguration.h @@ -22,9 +22,9 @@ { 0xa3, 0xaa, 0xfd, 0x4c, 0x9c, 0x9d, 0xef, 0x59 }} typedef -struct _EFI_SPI_CONFIGURATION_PROTOCOL + struct _EFI_SPI_CONFIGURATION_PROTOCOL EFI_SPI_SMM_CONFIGURATION_PROTOCOL; -extern EFI_GUID gEfiSpiSmmConfigurationProtocolGuid; +extern EFI_GUID gEfiSpiSmmConfigurationProtocolGuid; #endif // __SPI_SMM_CONFIGURATION_H__ diff --git a/MdePkg/Include/Protocol/SpiSmmHc.h b/MdePkg/Include/Protocol/SpiSmmHc.h index a7a812e4df..b2b4c49bf3 100644 --- a/MdePkg/Include/Protocol/SpiSmmHc.h +++ b/MdePkg/Include/Protocol/SpiSmmHc.h @@ -22,9 +22,9 @@ { 0x8a, 0x54, 0x5c, 0x2c, 0xff, 0xe7, 0x3e, 0xcb }} typedef -struct _EFI_SPI_HC_PROTOCOL + struct _EFI_SPI_HC_PROTOCOL EFI_SPI_SMM_HC_PROTOCOL; -extern EFI_GUID gEfiSpiSmmHcProtocolGuid; +extern EFI_GUID gEfiSpiSmmHcProtocolGuid; #endif // __SPI_SMM_HC_H__ diff --git a/MdePkg/Include/Protocol/SpiSmmNorFlash.h b/MdePkg/Include/Protocol/SpiSmmNorFlash.h index 7f1558e173..48b5e0ffcd 100644 --- a/MdePkg/Include/Protocol/SpiSmmNorFlash.h +++ b/MdePkg/Include/Protocol/SpiSmmNorFlash.h @@ -22,9 +22,9 @@ { 0x86, 0x04, 0x87, 0xff, 0x6d, 0x66, 0x2c, 0x9a } } typedef -struct _EFI_SPI_NOR_FLASH_PROTOCOL + struct _EFI_SPI_NOR_FLASH_PROTOCOL EFI_SPI_SMM_NOR_FLASH_PROTOCOL; -extern EFI_GUID gEfiSpiSmmNorFlashProtocolGuid; +extern EFI_GUID gEfiSpiSmmNorFlashProtocolGuid; #endif // __SPI_SMM_NOR_FLASH_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/StatusCode.h b/MdePkg/Include/Protocol/StatusCode.h index 265453a758..ad5fbf5b26 100644 --- a/MdePkg/Include/Protocol/StatusCode.h +++ b/MdePkg/Include/Protocol/StatusCode.h @@ -45,9 +45,9 @@ EFI_STATUS /// This protocol must be produced by a runtime DXE driver. /// typedef struct _EFI_STATUS_CODE_PROTOCOL { - EFI_REPORT_STATUS_CODE ReportStatusCode; + EFI_REPORT_STATUS_CODE ReportStatusCode; } EFI_STATUS_CODE_PROTOCOL; -extern EFI_GUID gEfiStatusCodeRuntimeProtocolGuid; +extern EFI_GUID gEfiStatusCodeRuntimeProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/StorageSecurityCommand.h b/MdePkg/Include/Protocol/StorageSecurityCommand.h index 5d43cbcfa5..810af59b85 100644 --- a/MdePkg/Include/Protocol/StorageSecurityCommand.h +++ b/MdePkg/Include/Protocol/StorageSecurityCommand.h @@ -18,7 +18,7 @@ 0xC88B0B6D, 0x0DFC, 0x49A7, {0x9C, 0xB4, 0x49, 0x07, 0x4B, 0x4C, 0x3A, 0x78 } \ } -typedef struct _EFI_STORAGE_SECURITY_COMMAND_PROTOCOL EFI_STORAGE_SECURITY_COMMAND_PROTOCOL; +typedef struct _EFI_STORAGE_SECURITY_COMMAND_PROTOCOL EFI_STORAGE_SECURITY_COMMAND_PROTOCOL; /** Send a security protocol command to a device that receives data and/or the result @@ -166,7 +166,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_STORAGE_SECURITY_SEND_DATA) ( +(EFIAPI *EFI_STORAGE_SECURITY_SEND_DATA)( IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL *This, IN UINT32 MediaId, IN UINT64 Timeout, @@ -174,7 +174,7 @@ EFI_STATUS IN UINT16 SecurityProtocolSpecificData, IN UINTN PayloadBufferSize, IN VOID *PayloadBuffer -); + ); /// /// The EFI_STORAGE_SECURITY_COMMAND_PROTOCOL is used to send security protocol @@ -197,10 +197,10 @@ EFI_STATUS /// or their successors. /// struct _EFI_STORAGE_SECURITY_COMMAND_PROTOCOL { - EFI_STORAGE_SECURITY_RECEIVE_DATA ReceiveData; - EFI_STORAGE_SECURITY_SEND_DATA SendData; + EFI_STORAGE_SECURITY_RECEIVE_DATA ReceiveData; + EFI_STORAGE_SECURITY_SEND_DATA SendData; }; -extern EFI_GUID gEfiStorageSecurityCommandProtocolGuid; +extern EFI_GUID gEfiStorageSecurityCommandProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/SuperIo.h b/MdePkg/Include/Protocol/SuperIo.h index 34db6471f2..802615030c 100644 --- a/MdePkg/Include/Protocol/SuperIo.h +++ b/MdePkg/Include/Protocol/SuperIo.h @@ -18,17 +18,17 @@ { 0x215fdd18, 0xbd50, 0x4feb, { 0x89, 0xb, 0x58, 0xca, 0xb, 0x47, 0x39, 0xe9 } } typedef union { - ACPI_SMALL_RESOURCE_HEADER *SmallHeader; - ACPI_LARGE_RESOURCE_HEADER *LargeHeader; + ACPI_SMALL_RESOURCE_HEADER *SmallHeader; + ACPI_LARGE_RESOURCE_HEADER *LargeHeader; } ACPI_RESOURCE_HEADER_PTR; typedef struct { - UINT8 Register; ///< Register number. - UINT8 AndMask; ///< Bitwise AND mask. - UINT8 OrMask; ///< Bitwise OR mask. + UINT8 Register; ///< Register number. + UINT8 AndMask; ///< Bitwise AND mask. + UINT8 OrMask; ///< Bitwise OR mask. } EFI_SIO_REGISTER_MODIFY; -typedef struct _EFI_SIO_PROTOCOL EFI_SIO_PROTOCOL; +typedef struct _EFI_SIO_PROTOCOL EFI_SIO_PROTOCOL; /** Provides a low level access to the registers for the Super I/O. @@ -62,7 +62,7 @@ EFI_STATUS IN BOOLEAN ExitCfgMode, IN UINT8 Register, IN OUT UINT8 *Value -); + ); /** Provides an interface to get a list of the current resources consumed by the device in the ACPI @@ -88,7 +88,7 @@ EFI_STATUS (EFIAPI *EFI_SIO_GET_RESOURCES)( IN CONST EFI_SIO_PROTOCOL *This, OUT ACPI_RESOURCE_HEADER_PTR *ResourceList -); + ); /** Sets the resources for the device. @@ -108,7 +108,7 @@ EFI_STATUS (EFIAPI *EFI_SIO_SET_RESOURCES)( IN CONST EFI_SIO_PROTOCOL *This, IN ACPI_RESOURCE_HEADER_PTR ResourceList -); + ); /** Provides a collection of resource descriptor lists. Each resource descriptor list in the collection @@ -125,7 +125,7 @@ EFI_STATUS (EFIAPI *EFI_SIO_POSSIBLE_RESOURCES)( IN CONST EFI_SIO_PROTOCOL *This, OUT ACPI_RESOURCE_HEADER_PTR *ResourceCollection -); + ); /** Provides an interface for a table based programming of the Super I/O registers. @@ -154,16 +154,16 @@ EFI_STATUS IN CONST EFI_SIO_PROTOCOL *This, IN CONST EFI_SIO_REGISTER_MODIFY *Command, IN UINTN NumberOfCommands -); + ); struct _EFI_SIO_PROTOCOL { EFI_SIO_REGISTER_ACCESS RegisterAccess; EFI_SIO_GET_RESOURCES GetResources; EFI_SIO_SET_RESOURCES SetResources; EFI_SIO_POSSIBLE_RESOURCES PossibleResources; - EFI_SIO_MODIFY Modify; + EFI_SIO_MODIFY Modify; }; -extern EFI_GUID gEfiSioProtocolGuid; +extern EFI_GUID gEfiSioProtocolGuid; #endif // __EFI_SUPER_IO_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/SuperIoControl.h b/MdePkg/Include/Protocol/SuperIoControl.h index c49bb891e5..811607074e 100644 --- a/MdePkg/Include/Protocol/SuperIoControl.h +++ b/MdePkg/Include/Protocol/SuperIoControl.h @@ -19,8 +19,8 @@ 0xb91978df, 0x9fc1, 0x427d, { 0xbb, 0x5, 0x4c, 0x82, 0x84, 0x55, 0xca, 0x27 } \ } -typedef struct _EFI_SIO_CONTROL_PROTOCOL EFI_SIO_CONTROL_PROTOCOL; -typedef struct _EFI_SIO_CONTROL_PROTOCOL *PEFI_SIO_CONTROL_PROTOCOL; +typedef struct _EFI_SIO_CONTROL_PROTOCOL EFI_SIO_CONTROL_PROTOCOL; +typedef struct _EFI_SIO_CONTROL_PROTOCOL *PEFI_SIO_CONTROL_PROTOCOL; /** Enable an ISA-style device. @@ -70,17 +70,17 @@ struct _EFI_SIO_CONTROL_PROTOCOL { /// /// The version of this protocol. /// - UINT32 Version; + UINT32 Version; /// /// Enable a device. /// - EFI_SIO_CONTROL_ENABLE EnableDevice; + EFI_SIO_CONTROL_ENABLE EnableDevice; /// /// Disable a device. /// - EFI_SIO_CONTROL_DISABLE DisableDevice; + EFI_SIO_CONTROL_DISABLE DisableDevice; }; -extern EFI_GUID gEfiSioControlProtocolGuid; +extern EFI_GUID gEfiSioControlProtocolGuid; #endif // __EFI_SUPER_IO_CONTROL_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/Supplicant.h b/MdePkg/Include/Protocol/Supplicant.h index a55d8119cf..d786221125 100644 --- a/MdePkg/Include/Protocol/Supplicant.h +++ b/MdePkg/Include/Protocol/Supplicant.h @@ -212,10 +212,10 @@ typedef struct { // If TRUE, indicates GTK is just refreshed after a successful call to // EFI_SUPPLICANT_PROTOCOL.BuildResponsePacket(). // - BOOLEAN GTKRefresh; + BOOLEAN GTKRefresh; } EFI_SUPPLICANT_KEY_REFRESH; -#define EFI_MAX_KEY_LEN 64 +#define EFI_MAX_KEY_LEN 64 /// /// EFI_SUPPLICANT_KEY @@ -224,45 +224,45 @@ typedef struct { // // The key value. // - UINT8 Key[EFI_MAX_KEY_LEN]; + UINT8 Key[EFI_MAX_KEY_LEN]; // // Length in bytes of the Key. Should be up to EFI_MAX_KEY_LEN. // - UINT8 KeyLen; + UINT8 KeyLen; // // The key identifier. // - UINT8 KeyId; + UINT8 KeyId; // // Defines whether this key is a group key, pairwise key, PeerKey, or // Integrity Group. // - EFI_SUPPLICANT_KEY_TYPE KeyType; + EFI_SUPPLICANT_KEY_TYPE KeyType; // // The value is set according to the KeyType. // - EFI_80211_MAC_ADDRESS Addr; + EFI_80211_MAC_ADDRESS Addr; // // The Receive Sequence Count value. // - UINT8 Rsc[8]; + UINT8 Rsc[8]; // // Length in bytes of the Rsc. Should be up to 8. // - UINT8 RscLen; + UINT8 RscLen; // // Indicates whether the key is configured by the Authenticator or // Supplicant. The value true indicates Authenticator. // - BOOLEAN IsAuthenticator; + BOOLEAN IsAuthenticator; // // The cipher suite required for this association. // - EFI_80211_SUITE_SELECTOR CipherSuite; + EFI_80211_SUITE_SELECTOR CipherSuite; // // Indicates the direction for which the keys are to be installed. // - EFI_SUPPLICANT_KEY_DIRECTION Direction; + EFI_SUPPLICANT_KEY_DIRECTION Direction; } EFI_SUPPLICANT_KEY; /// @@ -272,12 +272,12 @@ typedef struct { // // Indicates the number of GTKs that are contained in GTKList. // - UINT8 GTKCount; + UINT8 GTKCount; // // A variable-length array of GTKs of type EFI_SUPPLICANT_KEY. The number of // entries is specified by GTKCount. // - EFI_SUPPLICANT_KEY GTKList[1]; + EFI_SUPPLICANT_KEY GTKList[1]; } EFI_SUPPLICANT_GTK_LIST; /// @@ -287,11 +287,11 @@ typedef struct { // // Length of data buffer in the fragment. // - UINT32 FragmentLength; + UINT32 FragmentLength; // // Pointer to the data buffer in the fragment. // - VOID *FragmentBuffer; + VOID *FragmentBuffer; } EFI_SUPPLICANT_FRAGMENT_DATA; /** @@ -333,11 +333,11 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_SUPPLICANT_BUILD_RESPONSE_PACKET) ( +(EFIAPI *EFI_SUPPLICANT_BUILD_RESPONSE_PACKET)( IN EFI_SUPPLICANT_PROTOCOL *This, IN UINT8 *RequestBuffer OPTIONAL, IN UINTN RequestBufferSize OPTIONAL, - OUT UINT8 *Buffer, + OUT UINT8 *Buffer, IN OUT UINTN *BufferSize ); @@ -367,7 +367,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SUPPLICANT_PROCESS_PACKET) ( +(EFIAPI *EFI_SUPPLICANT_PROCESS_PACKET)( IN EFI_SUPPLICANT_PROTOCOL *This, IN OUT EFI_SUPPLICANT_FRAGMENT_DATA **FragmentTable, IN UINT32 *FragmentCount, @@ -395,7 +395,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SUPPLICANT_SET_DATA) ( +(EFIAPI *EFI_SUPPLICANT_SET_DATA)( IN EFI_SUPPLICANT_PROTOCOL *This, IN EFI_SUPPLICANT_DATA_TYPE DataType, IN VOID *Data, @@ -432,10 +432,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_SUPPLICANT_GET_DATA) ( +(EFIAPI *EFI_SUPPLICANT_GET_DATA)( IN EFI_SUPPLICANT_PROTOCOL *This, IN EFI_SUPPLICANT_DATA_TYPE DataType, - OUT UINT8 *Data OPTIONAL, + OUT UINT8 *Data OPTIONAL, IN OUT UINTN *DataSize ); @@ -452,7 +452,7 @@ struct _EFI_SUPPLICANT_PROTOCOL { EFI_SUPPLICANT_GET_DATA GetData; }; -extern EFI_GUID gEfiSupplicantServiceBindingProtocolGuid; -extern EFI_GUID gEfiSupplicantProtocolGuid; +extern EFI_GUID gEfiSupplicantServiceBindingProtocolGuid; +extern EFI_GUID gEfiSupplicantProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/TapeIo.h b/MdePkg/Include/Protocol/TapeIo.h index 359f0644ad..350b8460ab 100644 --- a/MdePkg/Include/Protocol/TapeIo.h +++ b/MdePkg/Include/Protocol/TapeIo.h @@ -18,23 +18,23 @@ SPDX-License-Identifier: BSD-2-Clause-Patent typedef struct _EFI_TAPE_IO_PROTOCOL EFI_TAPE_IO_PROTOCOL; typedef struct _EFI_TAPE_HEADER { - UINT64 Signature; - UINT32 Revision; - UINT32 BootDescSize; - UINT32 BootDescCRC; - EFI_GUID TapeGUID; - EFI_GUID TapeType; - EFI_GUID TapeUnique; - UINT32 BLLocation; - UINT32 BLBlocksize; - UINT32 BLFilesize; - CHAR8 OSVersion[40]; - CHAR8 AppVersion[40]; - CHAR8 CreationDate[10]; - CHAR8 CreationTime[10]; - CHAR8 SystemName[256]; // UTF-8 - CHAR8 TapeTitle[120]; // UTF-8 - CHAR8 pad[468]; // pad to 1024 + UINT64 Signature; + UINT32 Revision; + UINT32 BootDescSize; + UINT32 BootDescCRC; + EFI_GUID TapeGUID; + EFI_GUID TapeType; + EFI_GUID TapeUnique; + UINT32 BLLocation; + UINT32 BLBlocksize; + UINT32 BLFilesize; + CHAR8 OSVersion[40]; + CHAR8 AppVersion[40]; + CHAR8 CreationDate[10]; + CHAR8 CreationTime[10]; + CHAR8 SystemName[256]; // UTF-8 + CHAR8 TapeTitle[120]; // UTF-8 + CHAR8 pad[468]; // pad to 1024 } EFI_TAPE_HEADER; /** @@ -108,7 +108,6 @@ EFI_STATUS IN VOID *Buffer ); - /** Rewinds the tape. @@ -129,7 +128,6 @@ EFI_STATUS IN EFI_TAPE_IO_PROTOCOL *This ); - /** Positions the tape. @@ -162,7 +160,6 @@ EFI_STATUS IN UINTN Type ); - /** Writes filemarks to the media. @@ -188,7 +185,6 @@ EFI_STATUS IN UINTN Count ); - /** Resets the tape device. @@ -218,14 +214,14 @@ EFI_STATUS /// to load the bootloader image from tape. /// struct _EFI_TAPE_IO_PROTOCOL { - EFI_TAPE_READ TapeRead; - EFI_TAPE_WRITE TapeWrite; - EFI_TAPE_REWIND TapeRewind; - EFI_TAPE_SPACE TapeSpace; - EFI_TAPE_WRITEFM TapeWriteFM; - EFI_TAPE_RESET TapeReset; + EFI_TAPE_READ TapeRead; + EFI_TAPE_WRITE TapeWrite; + EFI_TAPE_REWIND TapeRewind; + EFI_TAPE_SPACE TapeSpace; + EFI_TAPE_WRITEFM TapeWriteFM; + EFI_TAPE_RESET TapeReset; }; -extern EFI_GUID gEfiTapeIoProtocolGuid; +extern EFI_GUID gEfiTapeIoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Tcg2Protocol.h b/MdePkg/Include/Protocol/Tcg2Protocol.h index 5ef13cc607..f1326a5ef0 100644 --- a/MdePkg/Include/Protocol/Tcg2Protocol.h +++ b/MdePkg/Include/Protocol/Tcg2Protocol.h @@ -19,79 +19,79 @@ SPDX-License-Identifier: BSD-2-Clause-Patent typedef struct tdEFI_TCG2_PROTOCOL EFI_TCG2_PROTOCOL; typedef struct tdEFI_TCG2_VERSION { - UINT8 Major; - UINT8 Minor; + UINT8 Major; + UINT8 Minor; } EFI_TCG2_VERSION; typedef UINT32 EFI_TCG2_EVENT_LOG_BITMAP; typedef UINT32 EFI_TCG2_EVENT_LOG_FORMAT; typedef UINT32 EFI_TCG2_EVENT_ALGORITHM_BITMAP; -#define EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2 0x00000001 -#define EFI_TCG2_EVENT_LOG_FORMAT_TCG_2 0x00000002 +#define EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2 0x00000001 +#define EFI_TCG2_EVENT_LOG_FORMAT_TCG_2 0x00000002 typedef struct tdEFI_TCG2_BOOT_SERVICE_CAPABILITY { // // Allocated size of the structure // - UINT8 Size; + UINT8 Size; // // Version of the EFI_TCG2_BOOT_SERVICE_CAPABILITY structure itself. // For this version of the protocol, the Major version shall be set to 1 // and the Minor version shall be set to 1. // - EFI_TCG2_VERSION StructureVersion; + EFI_TCG2_VERSION StructureVersion; // // Version of the EFI TCG2 protocol. // For this version of the protocol, the Major version shall be set to 1 // and the Minor version shall be set to 1. // - EFI_TCG2_VERSION ProtocolVersion; + EFI_TCG2_VERSION ProtocolVersion; // // Supported hash algorithms (this bitmap is determined by the supported PCR // banks in the TPM and the hashing algorithms supported by the firmware) // - EFI_TCG2_EVENT_ALGORITHM_BITMAP HashAlgorithmBitmap; + EFI_TCG2_EVENT_ALGORITHM_BITMAP HashAlgorithmBitmap; // // Bitmap of supported event log formats // - EFI_TCG2_EVENT_LOG_BITMAP SupportedEventLogs; + EFI_TCG2_EVENT_LOG_BITMAP SupportedEventLogs; // // False = TPM not present // - BOOLEAN TPMPresentFlag; + BOOLEAN TPMPresentFlag; // // Max size (in bytes) of a command that can be sent to the TPM // - UINT16 MaxCommandSize; + UINT16 MaxCommandSize; // // Max size (in bytes) of a response that can be provided by the TPM // - UINT16 MaxResponseSize; + UINT16 MaxResponseSize; // // 4-byte Vendor ID // (see TCG Vendor ID registry, Section "TPM Capabilities Vendor ID") // - UINT32 ManufacturerID; + UINT32 ManufacturerID; // // Maximum number of PCR banks (hashing algorithms) supported. // No granularity is provided to support a specific set of algorithms. // Minimum value is 1. // - UINT32 NumberOfPCRBanks; + UINT32 NumberOfPCRBanks; // // A bitmap of currently active PCR banks (hashing algorithms). // This is a subset of the supported hashing algorithms reported in HashAlgorithmBitMap. // NumberOfPcrBanks defines the number of bits that are set. // - EFI_TCG2_EVENT_ALGORITHM_BITMAP ActivePcrBanks; + EFI_TCG2_EVENT_ALGORITHM_BITMAP ActivePcrBanks; } EFI_TCG2_BOOT_SERVICE_CAPABILITY; -#define EFI_TCG2_BOOT_HASH_ALG_SHA1 0x00000001 -#define EFI_TCG2_BOOT_HASH_ALG_SHA256 0x00000002 -#define EFI_TCG2_BOOT_HASH_ALG_SHA384 0x00000004 -#define EFI_TCG2_BOOT_HASH_ALG_SHA512 0x00000008 -#define EFI_TCG2_BOOT_HASH_ALG_SM3_256 0x00000010 +#define EFI_TCG2_BOOT_HASH_ALG_SHA1 0x00000001 +#define EFI_TCG2_BOOT_HASH_ALG_SHA256 0x00000002 +#define EFI_TCG2_BOOT_HASH_ALG_SHA384 0x00000004 +#define EFI_TCG2_BOOT_HASH_ALG_SHA512 0x00000008 +#define EFI_TCG2_BOOT_HASH_ALG_SM3_256 0x00000010 // // This bit is shall be set when an event shall be extended but not logged. @@ -100,7 +100,7 @@ typedef struct tdEFI_TCG2_BOOT_SERVICE_CAPABILITY { // // This bit shall be set when the intent is to measure a PE/COFF image. // -#define PE_COFF_IMAGE 0x0000000000000010 +#define PE_COFF_IMAGE 0x0000000000000010 #define MAX_PCR_INDEX 23 @@ -112,28 +112,28 @@ typedef struct { // // Size of the event header itself (sizeof(EFI_TCG2_EVENT_HEADER)). // - UINT32 HeaderSize; + UINT32 HeaderSize; // // Header version. For this version of this specification, the value shall be 1. // - UINT16 HeaderVersion; + UINT16 HeaderVersion; // // Index of the PCR that shall be extended (0 - 23). // - TCG_PCRINDEX PCRIndex; + TCG_PCRINDEX PCRIndex; // // Type of the event that shall be extended (and optionally logged). // - TCG_EVENTTYPE EventType; + TCG_EVENTTYPE EventType; } EFI_TCG2_EVENT_HEADER; typedef struct tdEFI_TCG2_EVENT { // // Total size of the event including the Size component, the header and the Event data. // - UINT32 Size; - EFI_TCG2_EVENT_HEADER Header; - UINT8 Event[1]; + UINT32 Size; + EFI_TCG2_EVENT_HEADER Header; + UINT8 Event[1]; } EFI_TCG2_EVENT; #pragma pack() @@ -159,7 +159,7 @@ typedef struct tdEFI_TCG2_EVENT { **/ typedef EFI_STATUS -(EFIAPI *EFI_TCG2_GET_CAPABILITY) ( +(EFIAPI *EFI_TCG2_GET_CAPABILITY)( IN EFI_TCG2_PROTOCOL *This, IN OUT EFI_TCG2_BOOT_SERVICE_CAPABILITY *ProtocolCapability ); @@ -183,7 +183,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_TCG2_GET_EVENT_LOG) ( +(EFIAPI *EFI_TCG2_GET_EVENT_LOG)( IN EFI_TCG2_PROTOCOL *This, IN EFI_TCG2_EVENT_LOG_FORMAT EventLogFormat, OUT EFI_PHYSICAL_ADDRESS *EventLogLocation, @@ -212,7 +212,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_TCG2_HASH_LOG_EXTEND_EVENT) ( +(EFIAPI *EFI_TCG2_HASH_LOG_EXTEND_EVENT)( IN EFI_TCG2_PROTOCOL *This, IN UINT64 Flags, IN EFI_PHYSICAL_ADDRESS DataToHash, @@ -236,7 +236,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_TCG2_SUBMIT_COMMAND) ( +(EFIAPI *EFI_TCG2_SUBMIT_COMMAND)( IN EFI_TCG2_PROTOCOL *This, IN UINT32 InputParameterBlockSize, IN UINT8 *InputParameterBlock, @@ -255,7 +255,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_TCG2_GET_ACTIVE_PCR_BANKS) ( +(EFIAPI *EFI_TCG2_GET_ACTIVE_PCR_BANKS)( IN EFI_TCG2_PROTOCOL *This, OUT UINT32 *ActivePcrBanks ); @@ -271,7 +271,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_TCG2_SET_ACTIVE_PCR_BANKS) ( +(EFIAPI *EFI_TCG2_SET_ACTIVE_PCR_BANKS)( IN EFI_TCG2_PROTOCOL *This, IN UINT32 ActivePcrBanks ); @@ -288,23 +288,23 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_TCG2_GET_RESULT_OF_SET_ACTIVE_PCR_BANKS) ( +(EFIAPI *EFI_TCG2_GET_RESULT_OF_SET_ACTIVE_PCR_BANKS)( IN EFI_TCG2_PROTOCOL *This, OUT UINT32 *OperationPresent, OUT UINT32 *Response ); struct tdEFI_TCG2_PROTOCOL { - EFI_TCG2_GET_CAPABILITY GetCapability; - EFI_TCG2_GET_EVENT_LOG GetEventLog; - EFI_TCG2_HASH_LOG_EXTEND_EVENT HashLogExtendEvent; - EFI_TCG2_SUBMIT_COMMAND SubmitCommand; - EFI_TCG2_GET_ACTIVE_PCR_BANKS GetActivePcrBanks; - EFI_TCG2_SET_ACTIVE_PCR_BANKS SetActivePcrBanks; - EFI_TCG2_GET_RESULT_OF_SET_ACTIVE_PCR_BANKS GetResultOfSetActivePcrBanks; + EFI_TCG2_GET_CAPABILITY GetCapability; + EFI_TCG2_GET_EVENT_LOG GetEventLog; + EFI_TCG2_HASH_LOG_EXTEND_EVENT HashLogExtendEvent; + EFI_TCG2_SUBMIT_COMMAND SubmitCommand; + EFI_TCG2_GET_ACTIVE_PCR_BANKS GetActivePcrBanks; + EFI_TCG2_SET_ACTIVE_PCR_BANKS SetActivePcrBanks; + EFI_TCG2_GET_RESULT_OF_SET_ACTIVE_PCR_BANKS GetResultOfSetActivePcrBanks; }; -extern EFI_GUID gEfiTcg2ProtocolGuid; +extern EFI_GUID gEfiTcg2ProtocolGuid; // // Log entries after Get Event Log service @@ -313,23 +313,23 @@ extern EFI_GUID gEfiTcg2ProtocolGuid; #define EFI_TCG2_FINAL_EVENTS_TABLE_GUID \ {0x1e2ed096, 0x30e2, 0x4254, { 0xbd, 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25 }} -extern EFI_GUID gEfiTcg2FinalEventsTableGuid; +extern EFI_GUID gEfiTcg2FinalEventsTableGuid; typedef struct tdEFI_TCG2_FINAL_EVENTS_TABLE { // // The version of this structure. // - UINT64 Version; + UINT64 Version; // // Number of events recorded after invocation of GetEventLog API // - UINT64 NumberOfEvents; + UINT64 NumberOfEvents; // // List of events of type TCG_PCR_EVENT2. // -//TCG_PCR_EVENT2 Event[1]; + // TCG_PCR_EVENT2 Event[1]; } EFI_TCG2_FINAL_EVENTS_TABLE; -#define EFI_TCG2_FINAL_EVENTS_TABLE_VERSION 1 +#define EFI_TCG2_FINAL_EVENTS_TABLE_VERSION 1 #endif diff --git a/MdePkg/Include/Protocol/TcgService.h b/MdePkg/Include/Protocol/TcgService.h index 0d4625ba54..a87157ab77 100644 --- a/MdePkg/Include/Protocol/TcgService.h +++ b/MdePkg/Include/Protocol/TcgService.h @@ -18,10 +18,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent typedef struct _EFI_TCG_PROTOCOL EFI_TCG_PROTOCOL; typedef struct { - UINT8 Major; - UINT8 Minor; - UINT8 RevMajor; - UINT8 RevMinor; + UINT8 Major; + UINT8 Minor; + UINT8 RevMajor; + UINT8 RevMinor; } TCG_VERSION; typedef struct _TCG_EFI_BOOT_SERVICE_CAPABILITY { @@ -34,7 +34,7 @@ typedef struct _TCG_EFI_BOOT_SERVICE_CAPABILITY { BOOLEAN TPMDeactivatedFlag; /// 01h = TPM currently deactivated. } TCG_EFI_BOOT_SERVICE_CAPABILITY; -typedef UINT32 TCG_ALGORITHM_ID; +typedef UINT32 TCG_ALGORITHM_ID; /** This service provides EFI protocol capability information, state information @@ -62,7 +62,7 @@ EFI_STATUS (EFIAPI *EFI_TCG_STATUS_CHECK)( IN EFI_TCG_PROTOCOL *This, OUT TCG_EFI_BOOT_SERVICE_CAPABILITY - *ProtocolCapability, + *ProtocolCapability, OUT UINT32 *TCGFeatureFlags, OUT EFI_PHYSICAL_ADDRESS *EventLogLocation, OUT EFI_PHYSICAL_ADDRESS *EventLogLastEntry @@ -176,20 +176,20 @@ EFI_STATUS IN TCG_ALGORITHM_ID AlgorithmId, IN OUT TCG_PCR_EVENT *TCGLogData, IN OUT UINT32 *EventNumber, - OUT EFI_PHYSICAL_ADDRESS *EventLogLastEntry + OUT EFI_PHYSICAL_ADDRESS *EventLogLastEntry ); /// /// The EFI_TCG Protocol abstracts TCG activity. /// struct _EFI_TCG_PROTOCOL { - EFI_TCG_STATUS_CHECK StatusCheck; - EFI_TCG_HASH_ALL HashAll; - EFI_TCG_LOG_EVENT LogEvent; - EFI_TCG_PASS_THROUGH_TO_TPM PassThroughToTpm; - EFI_TCG_HASH_LOG_EXTEND_EVENT HashLogExtendEvent; + EFI_TCG_STATUS_CHECK StatusCheck; + EFI_TCG_HASH_ALL HashAll; + EFI_TCG_LOG_EVENT LogEvent; + EFI_TCG_PASS_THROUGH_TO_TPM PassThroughToTpm; + EFI_TCG_HASH_LOG_EXTEND_EVENT HashLogExtendEvent; }; -extern EFI_GUID gEfiTcgProtocolGuid; +extern EFI_GUID gEfiTcgProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Tcp4.h b/MdePkg/Include/Protocol/Tcp4.h index 8ebd1c6655..e81c2e71f6 100644 --- a/MdePkg/Include/Protocol/Tcp4.h +++ b/MdePkg/Include/Protocol/Tcp4.h @@ -34,11 +34,11 @@ typedef struct _EFI_TCP4_PROTOCOL EFI_TCP4_PROTOCOL; /// The definition in here is only present to provide backwards compatability. /// typedef struct { - EFI_HANDLE InstanceHandle; - EFI_IPv4_ADDRESS LocalAddress; - UINT16 LocalPort; - EFI_IPv4_ADDRESS RemoteAddress; - UINT16 RemotePort; + EFI_HANDLE InstanceHandle; + EFI_IPv4_ADDRESS LocalAddress; + UINT16 LocalPort; + EFI_IPv4_ADDRESS RemoteAddress; + UINT16 RemotePort; } EFI_TCP4_SERVICE_POINT; /// @@ -46,77 +46,77 @@ typedef struct { /// The definition in here is only present to provide backwards compatability. /// typedef struct { - EFI_HANDLE DriverHandle; - UINT32 ServiceCount; - EFI_TCP4_SERVICE_POINT Services[1]; + EFI_HANDLE DriverHandle; + UINT32 ServiceCount; + EFI_TCP4_SERVICE_POINT Services[1]; } EFI_TCP4_VARIABLE_DATA; typedef struct { - BOOLEAN UseDefaultAddress; - EFI_IPv4_ADDRESS StationAddress; - EFI_IPv4_ADDRESS SubnetMask; - UINT16 StationPort; - EFI_IPv4_ADDRESS RemoteAddress; - UINT16 RemotePort; - BOOLEAN ActiveFlag; + BOOLEAN UseDefaultAddress; + EFI_IPv4_ADDRESS StationAddress; + EFI_IPv4_ADDRESS SubnetMask; + UINT16 StationPort; + EFI_IPv4_ADDRESS RemoteAddress; + UINT16 RemotePort; + BOOLEAN ActiveFlag; } EFI_TCP4_ACCESS_POINT; typedef struct { - UINT32 ReceiveBufferSize; - UINT32 SendBufferSize; - UINT32 MaxSynBackLog; - UINT32 ConnectionTimeout; - UINT32 DataRetries; - UINT32 FinTimeout; - UINT32 TimeWaitTimeout; - UINT32 KeepAliveProbes; - UINT32 KeepAliveTime; - UINT32 KeepAliveInterval; - BOOLEAN EnableNagle; - BOOLEAN EnableTimeStamp; - BOOLEAN EnableWindowScaling; - BOOLEAN EnableSelectiveAck; - BOOLEAN EnablePathMtuDiscovery; + UINT32 ReceiveBufferSize; + UINT32 SendBufferSize; + UINT32 MaxSynBackLog; + UINT32 ConnectionTimeout; + UINT32 DataRetries; + UINT32 FinTimeout; + UINT32 TimeWaitTimeout; + UINT32 KeepAliveProbes; + UINT32 KeepAliveTime; + UINT32 KeepAliveInterval; + BOOLEAN EnableNagle; + BOOLEAN EnableTimeStamp; + BOOLEAN EnableWindowScaling; + BOOLEAN EnableSelectiveAck; + BOOLEAN EnablePathMtuDiscovery; } EFI_TCP4_OPTION; typedef struct { // // I/O parameters // - UINT8 TypeOfService; - UINT8 TimeToLive; + UINT8 TypeOfService; + UINT8 TimeToLive; // // Access Point // - EFI_TCP4_ACCESS_POINT AccessPoint; + EFI_TCP4_ACCESS_POINT AccessPoint; // // TCP Control Options // - EFI_TCP4_OPTION *ControlOption; + EFI_TCP4_OPTION *ControlOption; } EFI_TCP4_CONFIG_DATA; /// /// TCP4 connnection state /// typedef enum { - Tcp4StateClosed = 0, - Tcp4StateListen = 1, - Tcp4StateSynSent = 2, - Tcp4StateSynReceived = 3, - Tcp4StateEstablished = 4, - Tcp4StateFinWait1 = 5, - Tcp4StateFinWait2 = 6, - Tcp4StateClosing = 7, - Tcp4StateTimeWait = 8, - Tcp4StateCloseWait = 9, - Tcp4StateLastAck = 10 + Tcp4StateClosed = 0, + Tcp4StateListen = 1, + Tcp4StateSynSent = 2, + Tcp4StateSynReceived = 3, + Tcp4StateEstablished = 4, + Tcp4StateFinWait1 = 5, + Tcp4StateFinWait2 = 6, + Tcp4StateClosing = 7, + Tcp4StateTimeWait = 8, + Tcp4StateCloseWait = 9, + Tcp4StateLastAck = 10 } EFI_TCP4_CONNECTION_STATE; typedef struct { - EFI_EVENT Event; - EFI_STATUS Status; + EFI_EVENT Event; + EFI_STATUS Status; } EFI_TCP4_COMPLETION_TOKEN; typedef struct { @@ -146,17 +146,17 @@ typedef struct { /// EFI_DEVICE_ERROR: An unexpected system or network error occurred. /// EFI_NO_MEDIA: There was a media error. /// - EFI_TCP4_COMPLETION_TOKEN CompletionToken; + EFI_TCP4_COMPLETION_TOKEN CompletionToken; } EFI_TCP4_CONNECTION_TOKEN; typedef struct { - EFI_TCP4_COMPLETION_TOKEN CompletionToken; - EFI_HANDLE NewChildHandle; + EFI_TCP4_COMPLETION_TOKEN CompletionToken; + EFI_HANDLE NewChildHandle; } EFI_TCP4_LISTEN_TOKEN; typedef struct { - UINT32 FragmentLength; - VOID *FragmentBuffer; + UINT32 FragmentLength; + VOID *FragmentBuffer; } EFI_TCP4_FRAGMENT_DATA; typedef struct { @@ -202,22 +202,22 @@ typedef struct { /// EFI_DEVICE_ERROR: An unexpected system or network error occurs. /// EFI_NO_MEDIA: There was a media error. /// - EFI_TCP4_COMPLETION_TOKEN CompletionToken; + EFI_TCP4_COMPLETION_TOKEN CompletionToken; union { /// /// When this token is used for receiving, RxData is a pointer to EFI_TCP4_RECEIVE_DATA. /// - EFI_TCP4_RECEIVE_DATA *RxData; + EFI_TCP4_RECEIVE_DATA *RxData; /// /// When this token is used for transmitting, TxData is a pointer to EFI_TCP4_TRANSMIT_DATA. /// - EFI_TCP4_TRANSMIT_DATA *TxData; + EFI_TCP4_TRANSMIT_DATA *TxData; } Packet; } EFI_TCP4_IO_TOKEN; typedef struct { - EFI_TCP4_COMPLETION_TOKEN CompletionToken; - BOOLEAN AbortOnClose; + EFI_TCP4_COMPLETION_TOKEN CompletionToken; + BOOLEAN AbortOnClose; } EFI_TCP4_CLOSE_TOKEN; // @@ -281,7 +281,6 @@ EFI_STATUS IN EFI_TCP4_CONFIG_DATA *TcpConfigData OPTIONAL ); - /** Add or delete a route entry to the route table @@ -353,7 +352,6 @@ EFI_STATUS IN EFI_TCP4_CONNECTION_TOKEN *ConnectionToken ); - /** Listen on the passive instance to accept an incoming connection request. This is a nonblocking operation. @@ -420,7 +418,6 @@ EFI_STATUS IN EFI_TCP4_IO_TOKEN *Token ); - /** Places an asynchronous receive request into the receiving queue. @@ -525,7 +522,6 @@ EFI_STATUS IN EFI_TCP4_COMPLETION_TOKEN *Token OPTIONAL ); - /** Poll to receive incoming data and transmit outgoing segments. @@ -553,19 +549,19 @@ EFI_STATUS /// such as the routing table. /// struct _EFI_TCP4_PROTOCOL { - EFI_TCP4_GET_MODE_DATA GetModeData; - EFI_TCP4_CONFIGURE Configure; - EFI_TCP4_ROUTES Routes; - EFI_TCP4_CONNECT Connect; - EFI_TCP4_ACCEPT Accept; - EFI_TCP4_TRANSMIT Transmit; - EFI_TCP4_RECEIVE Receive; - EFI_TCP4_CLOSE Close; - EFI_TCP4_CANCEL Cancel; - EFI_TCP4_POLL Poll; + EFI_TCP4_GET_MODE_DATA GetModeData; + EFI_TCP4_CONFIGURE Configure; + EFI_TCP4_ROUTES Routes; + EFI_TCP4_CONNECT Connect; + EFI_TCP4_ACCEPT Accept; + EFI_TCP4_TRANSMIT Transmit; + EFI_TCP4_RECEIVE Receive; + EFI_TCP4_CLOSE Close; + EFI_TCP4_CANCEL Cancel; + EFI_TCP4_POLL Poll; }; -extern EFI_GUID gEfiTcp4ServiceBindingProtocolGuid; -extern EFI_GUID gEfiTcp4ProtocolGuid; +extern EFI_GUID gEfiTcp4ServiceBindingProtocolGuid; +extern EFI_GUID gEfiTcp4ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Tcp6.h b/MdePkg/Include/Protocol/Tcp6.h index 7f22c421c7..a8787dd3af 100644 --- a/MdePkg/Include/Protocol/Tcp6.h +++ b/MdePkg/Include/Protocol/Tcp6.h @@ -28,7 +28,6 @@ 0x46e44855, 0xbd60, 0x4ab7, {0xab, 0x0d, 0xa6, 0x79, 0xb9, 0x44, 0x7d, 0x77 } \ } - typedef struct _EFI_TCP6_PROTOCOL EFI_TCP6_PROTOCOL; /// @@ -40,27 +39,27 @@ typedef struct { /// The EFI TCPv6 Protocol instance handle that is using this /// address/port pair. /// - EFI_HANDLE InstanceHandle; + EFI_HANDLE InstanceHandle; /// /// The local IPv6 address to which this TCP instance is bound. Set /// to 0::/128, if this TCP instance is configured to listen on all /// available source addresses. /// - EFI_IPv6_ADDRESS LocalAddress; + EFI_IPv6_ADDRESS LocalAddress; /// /// The local port number in host byte order. /// - UINT16 LocalPort; + UINT16 LocalPort; /// /// The remote IPv6 address. It may be 0::/128 if this TCP instance is /// not connected to any remote host. /// - EFI_IPv6_ADDRESS RemoteAddress; + EFI_IPv6_ADDRESS RemoteAddress; /// /// The remote port number in host byte order. It may be zero if this /// TCP instance is not connected to any remote host. /// - UINT16 RemotePort; + UINT16 RemotePort; } EFI_TCP6_SERVICE_POINT; /// @@ -68,9 +67,9 @@ typedef struct { /// The definition in here is only present to provide backwards compatability. /// typedef struct { - EFI_HANDLE DriverHandle; ///< The handle of the driver that creates this entry. - UINT32 ServiceCount; ///< The number of address/port pairs following this data structure. - EFI_TCP6_SERVICE_POINT Services[1]; ///< List of address/port pairs that are currently in use. + EFI_HANDLE DriverHandle; ///< The handle of the driver that creates this entry. + UINT32 ServiceCount; ///< The number of address/port pairs following this data structure. + EFI_TCP6_SERVICE_POINT Services[1]; ///< List of address/port pairs that are currently in use. } EFI_TCP6_VARIABLE_DATA; /// @@ -85,13 +84,13 @@ typedef struct { /// it must be one of the configured IP addresses in the underlying /// IPv6 driver. /// - EFI_IPv6_ADDRESS StationAddress; + EFI_IPv6_ADDRESS StationAddress; /// /// The local port number to which this EFI TCPv6 Protocol instance /// is bound. If the instance doesn't care the local port number, set /// StationPort to zero to use an ephemeral port. /// - UINT16 StationPort; + UINT16 StationPort; /// /// The remote IP address to which this EFI TCPv6 Protocol instance /// is connected. If ActiveFlag is FALSE (i.e. a passive TCPv6 @@ -103,7 +102,7 @@ typedef struct { /// can be set to zero and means that incoming connection requests /// from any address will be accepted. /// - EFI_IPv6_ADDRESS RemoteAddress; + EFI_IPv6_ADDRESS RemoteAddress; /// /// The remote port to which this EFI TCPv6 Protocol instance /// connects or from which connection request will be accepted by @@ -112,12 +111,12 @@ typedef struct { /// any port will be accepted. Its value can not be zero when /// ActiveFlag is TRUE. /// - UINT16 RemotePort; + UINT16 RemotePort; /// /// Set it to TRUE to initiate an active open. Set it to FALSE to /// initiate a passive open to act as a server. /// - BOOLEAN ActiveFlag; + BOOLEAN ActiveFlag; } EFI_TCP6_ACCESS_POINT; /// @@ -127,28 +126,28 @@ typedef struct { /// /// The size of the TCP receive buffer. /// - UINT32 ReceiveBufferSize; + UINT32 ReceiveBufferSize; /// /// The size of the TCP send buffer. /// - UINT32 SendBufferSize; + UINT32 SendBufferSize; /// /// The length of incoming connect request queue for a passive /// instance. When set to zero, the value is implementation specific. /// - UINT32 MaxSynBackLog; + UINT32 MaxSynBackLog; /// /// The maximum seconds a TCP instance will wait for before a TCP /// connection established. When set to zero, the value is /// implementation specific. /// - UINT32 ConnectionTimeout; + UINT32 ConnectionTimeout; /// - ///The number of times TCP will attempt to retransmit a packet on - ///an established connection. When set to zero, the value is - ///implementation specific. + /// The number of times TCP will attempt to retransmit a packet on + /// an established connection. When set to zero, the value is + /// implementation specific. /// - UINT32 DataRetries; + UINT32 DataRetries; /// /// How many seconds to wait in the FIN_WAIT_2 states for a final /// FIN flag before the TCP instance is closed. This timeout is in @@ -158,61 +157,61 @@ typedef struct { /// it should be disabled because the FIN_WAIT_2 timer itself is /// against the standard. The default value is 60. /// - UINT32 FinTimeout; + UINT32 FinTimeout; /// /// How many seconds to wait in TIME_WAIT state before the TCP /// instance is closed. The timer is disabled completely to provide a /// method to close the TCP connection quickly if it is set to zero. It /// is against the related RFC documents. /// - UINT32 TimeWaitTimeout; + UINT32 TimeWaitTimeout; /// /// The maximum number of TCP keep-alive probes to send before /// giving up and resetting the connection if no response from the /// other end. Set to zero to disable keep-alive probe. /// - UINT32 KeepAliveProbes; + UINT32 KeepAliveProbes; /// /// The number of seconds a connection needs to be idle before TCP /// sends out periodical keep-alive probes. When set to zero, the /// value is implementation specific. It should be ignored if keep- /// alive probe is disabled. /// - UINT32 KeepAliveTime; + UINT32 KeepAliveTime; /// /// The number of seconds between TCP keep-alive probes after the /// periodical keep-alive probe if no response. When set to zero, the /// value is implementation specific. It should be ignored if keep- /// alive probe is disabled. /// - UINT32 KeepAliveInterval; + UINT32 KeepAliveInterval; /// /// Set it to TRUE to enable the Nagle algorithm as defined in /// RFC896. Set it to FALSE to disable it. /// - BOOLEAN EnableNagle; + BOOLEAN EnableNagle; /// /// Set it to TRUE to enable TCP timestamps option as defined in /// RFC1323. Set to FALSE to disable it. /// - BOOLEAN EnableTimeStamp; + BOOLEAN EnableTimeStamp; /// /// Set it to TRUE to enable TCP window scale option as defined in /// RFC1323. Set it to FALSE to disable it. /// - BOOLEAN EnableWindowScaling; + BOOLEAN EnableWindowScaling; /// /// Set it to TRUE to enable selective acknowledge mechanism /// described in RFC 2018. Set it to FALSE to disable it. /// Implementation that supports SACK can optionally support /// DSAK as defined in RFC 2883. /// - BOOLEAN EnableSelectiveAck; + BOOLEAN EnableSelectiveAck; /// /// Set it to TRUE to enable path MTU discovery as defined in /// RFC 1191. Set to FALSE to disable it. /// - BOOLEAN EnablePathMtuDiscovery; + BOOLEAN EnablePathMtuDiscovery; } EFI_TCP6_OPTION; /// @@ -222,20 +221,20 @@ typedef struct { /// /// TrafficClass field in transmitted IPv6 packets. /// - UINT8 TrafficClass; + UINT8 TrafficClass; /// /// HopLimit field in transmitted IPv6 packets. /// - UINT8 HopLimit; + UINT8 HopLimit; /// /// Used to specify TCP communication end settings for a TCP instance. /// - EFI_TCP6_ACCESS_POINT AccessPoint; + EFI_TCP6_ACCESS_POINT AccessPoint; /// /// Used to configure the advance TCP option for a connection. If set /// to NULL, implementation specific options for TCP connection will be used. /// - EFI_TCP6_OPTION *ControlOption; + EFI_TCP6_OPTION *ControlOption; } EFI_TCP6_CONFIG_DATA; /// @@ -264,11 +263,11 @@ typedef struct { /// The Event to signal after request is finished and Status field is /// updated by the EFI TCPv6 Protocol driver. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// The result of the completed operation. /// - EFI_STATUS Status; + EFI_STATUS Status; } EFI_TCP6_COMPLETION_TOKEN; /// @@ -304,7 +303,7 @@ typedef struct { /// EFI_SECURITY_VIOLATION: The active open was failed because of IPSec policy check. /// EFI_NO_MEDIA: There was a media error. /// - EFI_TCP6_COMPLETION_TOKEN CompletionToken; + EFI_TCP6_COMPLETION_TOKEN CompletionToken; } EFI_TCP6_CONNECTION_TOKEN; /// @@ -323,8 +322,8 @@ typedef struct { /// EFI_ABORTED: The accept request has been aborted. /// EFI_SECURITY_VIOLATION: The accept operation was failed because of IPSec policy check. /// - EFI_TCP6_COMPLETION_TOKEN CompletionToken; - EFI_HANDLE NewChildHandle; + EFI_TCP6_COMPLETION_TOKEN CompletionToken; + EFI_HANDLE NewChildHandle; } EFI_TCP6_LISTEN_TOKEN; /// @@ -333,8 +332,8 @@ typedef struct { /// purpose of this structure is to provide scattered read and write. /// typedef struct { - UINT32 FragmentLength; ///< Length of data buffer in the fragment. - VOID *FragmentBuffer; ///< Pointer to the data buffer in the fragment. + UINT32 FragmentLength; ///< Length of data buffer in the fragment. + VOID *FragmentBuffer; ///< Pointer to the data buffer in the fragment. } EFI_TCP6_FRAGMENT_DATA; /// @@ -348,22 +347,22 @@ typedef struct { /// Whether the data is urgent. When this flag is set, the instance is in /// urgent mode. /// - BOOLEAN UrgentFlag; + BOOLEAN UrgentFlag; /// /// When calling Receive() function, it is the byte counts of all /// Fragmentbuffer in FragmentTable allocated by user. /// When the token is signaled by TCPv6 driver it is the length of /// received data in the fragments. /// - UINT32 DataLength; + UINT32 DataLength; /// /// Number of fragments. /// - UINT32 FragmentCount; + UINT32 FragmentCount; /// /// An array of fragment descriptors. /// - EFI_TCP6_FRAGMENT_DATA FragmentTable[1]; + EFI_TCP6_FRAGMENT_DATA FragmentTable[1]; } EFI_TCP6_RECEIVE_DATA; /// @@ -378,24 +377,24 @@ typedef struct { /// transmission may be delayed to combine with data from /// subsequent Transmit()s for efficiency. /// - BOOLEAN Push; + BOOLEAN Push; /// /// The data in the fragment table are urgent and urgent point is in /// effect if TRUE. Otherwise those data are NOT considered urgent. /// - BOOLEAN Urgent; + BOOLEAN Urgent; /// /// Length of the data in the fragments. /// - UINT32 DataLength; + UINT32 DataLength; /// /// Number of fragments. /// - UINT32 FragmentCount; + UINT32 FragmentCount; /// /// An array of fragment descriptors. /// - EFI_TCP6_FRAGMENT_DATA FragmentTable[1]; + EFI_TCP6_FRAGMENT_DATA FragmentTable[1]; } EFI_TCP6_TRANSMIT_DATA; /// @@ -432,18 +431,18 @@ typedef struct { /// operation was failed because of IPSec policy check /// EFI_NO_MEDIA: There was a media error. /// - EFI_TCP6_COMPLETION_TOKEN CompletionToken; + EFI_TCP6_COMPLETION_TOKEN CompletionToken; union { /// /// When this token is used for receiving, RxData is a pointer to /// EFI_TCP6_RECEIVE_DATA. /// - EFI_TCP6_RECEIVE_DATA *RxData; + EFI_TCP6_RECEIVE_DATA *RxData; /// /// When this token is used for transmitting, TxData is a pointer to /// EFI_TCP6_TRANSMIT_DATA. /// - EFI_TCP6_TRANSMIT_DATA *TxData; + EFI_TCP6_TRANSMIT_DATA *TxData; } Packet; } EFI_TCP6_IO_TOKEN; @@ -459,13 +458,13 @@ typedef struct { /// EFI_ABORTED: User called configure with NULL without close stopping. /// EFI_SECURITY_VIOLATION: The close operation was failed because of IPSec policy check. /// - EFI_TCP6_COMPLETION_TOKEN CompletionToken; + EFI_TCP6_COMPLETION_TOKEN CompletionToken; /// /// Abort the TCP connection on close instead of the standard TCP /// close process when it is set to TRUE. This option can be used to /// satisfy a fast disconnect. /// - BOOLEAN AbortOnClose; + BOOLEAN AbortOnClose; } EFI_TCP6_CLOSE_TOKEN; /** @@ -840,19 +839,18 @@ EFI_STATUS /// Each instance has its own independent settings. /// struct _EFI_TCP6_PROTOCOL { - EFI_TCP6_GET_MODE_DATA GetModeData; - EFI_TCP6_CONFIGURE Configure; - EFI_TCP6_CONNECT Connect; - EFI_TCP6_ACCEPT Accept; - EFI_TCP6_TRANSMIT Transmit; - EFI_TCP6_RECEIVE Receive; - EFI_TCP6_CLOSE Close; - EFI_TCP6_CANCEL Cancel; - EFI_TCP6_POLL Poll; + EFI_TCP6_GET_MODE_DATA GetModeData; + EFI_TCP6_CONFIGURE Configure; + EFI_TCP6_CONNECT Connect; + EFI_TCP6_ACCEPT Accept; + EFI_TCP6_TRANSMIT Transmit; + EFI_TCP6_RECEIVE Receive; + EFI_TCP6_CLOSE Close; + EFI_TCP6_CANCEL Cancel; + EFI_TCP6_POLL Poll; }; -extern EFI_GUID gEfiTcp6ServiceBindingProtocolGuid; -extern EFI_GUID gEfiTcp6ProtocolGuid; +extern EFI_GUID gEfiTcp6ServiceBindingProtocolGuid; +extern EFI_GUID gEfiTcp6ProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/Timer.h b/MdePkg/Include/Protocol/Timer.h index e7860071e5..865de8e696 100644 --- a/MdePkg/Include/Protocol/Timer.h +++ b/MdePkg/Include/Protocol/Timer.h @@ -20,7 +20,7 @@ /// /// Declare forward reference for the Timer Architectural Protocol /// -typedef struct _EFI_TIMER_ARCH_PROTOCOL EFI_TIMER_ARCH_PROTOCOL; +typedef struct _EFI_TIMER_ARCH_PROTOCOL EFI_TIMER_ARCH_PROTOCOL; /** This function of this type is called when a timer interrupt fires. This @@ -76,7 +76,7 @@ EFI_STATUS (EFIAPI *EFI_TIMER_REGISTER_HANDLER)( IN EFI_TIMER_ARCH_PROTOCOL *This, IN EFI_TIMER_NOTIFY NotifyFunction -); + ); /** This function adjusts the period of timer interrupts to the value specified @@ -153,7 +153,6 @@ EFI_STATUS IN EFI_TIMER_ARCH_PROTOCOL *This ); - /// /// This protocol provides the services to initialize a periodic timer /// interrupt, and to register a handler that is called each time the timer @@ -163,12 +162,12 @@ EFI_STATUS /// interrupt. /// struct _EFI_TIMER_ARCH_PROTOCOL { - EFI_TIMER_REGISTER_HANDLER RegisterHandler; - EFI_TIMER_SET_TIMER_PERIOD SetTimerPeriod; - EFI_TIMER_GET_TIMER_PERIOD GetTimerPeriod; - EFI_TIMER_GENERATE_SOFT_INTERRUPT GenerateSoftInterrupt; + EFI_TIMER_REGISTER_HANDLER RegisterHandler; + EFI_TIMER_SET_TIMER_PERIOD SetTimerPeriod; + EFI_TIMER_GET_TIMER_PERIOD GetTimerPeriod; + EFI_TIMER_GENERATE_SOFT_INTERRUPT GenerateSoftInterrupt; }; -extern EFI_GUID gEfiTimerArchProtocolGuid; +extern EFI_GUID gEfiTimerArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Timestamp.h b/MdePkg/Include/Protocol/Timestamp.h index aab2ba4623..eb1e6d653c 100644 --- a/MdePkg/Include/Protocol/Timestamp.h +++ b/MdePkg/Include/Protocol/Timestamp.h @@ -13,14 +13,13 @@ #ifndef __EFI_TIME_STAMP_PROTOCOL_H__ #define __EFI_TIME_STAMP_PROTOCOL_H__ - #define EFI_TIMESTAMP_PROTOCOL_GUID \ { 0xafbfde41, 0x2e6e, 0x4262, {0xba, 0x65, 0x62, 0xb9, 0x23, 0x6e, 0x54, 0x95 } } /// /// Declare forward reference for the Time Stamp Protocol /// -typedef struct _EFI_TIMESTAMP_PROTOCOL EFI_TIMESTAMP_PROTOCOL; +typedef struct _EFI_TIMESTAMP_PROTOCOL EFI_TIMESTAMP_PROTOCOL; /// /// EFI_TIMESTAMP_PROPERTIES @@ -29,13 +28,13 @@ typedef struct { /// /// The frequency of the timestamp counter in Hz. /// - UINT64 Frequency; + UINT64 Frequency; /// /// The value that the timestamp counter ends with immediately before it rolls over. /// For example, a 64-bit free running counter would have an EndValue of 0xFFFFFFFFFFFFFFFF. /// A 24-bit free running counter would have an EndValue of 0xFFFFFF. /// - UINT64 EndValue; + UINT64 EndValue; } EFI_TIMESTAMP_PROPERTIES; /** @@ -77,19 +76,16 @@ EFI_STATUS OUT EFI_TIMESTAMP_PROPERTIES *Properties ); - - /// /// EFI_TIMESTAMP_PROTOCOL /// The protocol provides a platform independent interface for retrieving a high resolution /// timestamp counter. /// struct _EFI_TIMESTAMP_PROTOCOL { - TIMESTAMP_GET GetTimestamp; - TIMESTAMP_GET_PROPERTIES GetProperties; + TIMESTAMP_GET GetTimestamp; + TIMESTAMP_GET_PROPERTIES GetProperties; }; -extern EFI_GUID gEfiTimestampProtocolGuid; +extern EFI_GUID gEfiTimestampProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/Tls.h b/MdePkg/Include/Protocol/Tls.h index fccbdb8992..edcf0e3e72 100644 --- a/MdePkg/Include/Protocol/Tls.h +++ b/MdePkg/Include/Protocol/Tls.h @@ -114,8 +114,8 @@ typedef enum { /// SSL2.0 is obsolete and should not be used. /// typedef struct { - UINT8 Major; - UINT8 Minor; + UINT8 Major; + UINT8 Minor; } EFI_TLS_VERSION; /// @@ -134,8 +134,8 @@ typedef enum { /// #pragma pack (1) typedef struct { - UINT8 Data1; - UINT8 Data2; + UINT8 Data1; + UINT8 Data2; } EFI_TLS_CIPHER; #pragma pack () @@ -152,9 +152,9 @@ typedef UINT8 EFI_TLS_COMPRESSION; /// #pragma pack (1) typedef struct { - UINT16 ExtensionType; - UINT16 Length; - UINT8 Data[1]; + UINT16 ExtensionType; + UINT16 Length; + UINT8 Data[1]; } EFI_TLS_EXTENSION; #pragma pack () @@ -163,17 +163,17 @@ typedef struct { /// Use either EFI_TLS_VERIFY_NONE or EFI_TLS_VERIFY_PEER, the last two options /// are 'ORed' with EFI_TLS_VERIFY_PEER if they are desired. /// -typedef UINT32 EFI_TLS_VERIFY; +typedef UINT32 EFI_TLS_VERIFY; /// /// No certificates will be sent or the TLS/SSL handshake will be continued regardless /// of the certificate verification result. /// -#define EFI_TLS_VERIFY_NONE 0x0 +#define EFI_TLS_VERIFY_NONE 0x0 /// /// The TLS/SSL handshake is immediately terminated with an alert message containing /// the reason for the certificate verification failure. /// -#define EFI_TLS_VERIFY_PEER 0x1 +#define EFI_TLS_VERIFY_PEER 0x1 /// /// EFI_TLS_VERIFY_FAIL_IF_NO_PEER_CERT is only meaningful in the server mode. /// TLS session will fail if client certificate is absent. @@ -183,7 +183,7 @@ typedef UINT32 EFI_TLS_VERIFY; /// TLS session only verify client once, and doesn't request certificate during /// re-negotiation. /// -#define EFI_TLS_VERIFY_CLIENT_ONCE 0x4 +#define EFI_TLS_VERIFY_CLIENT_ONCE 0x4 /// /// EFI_TLS_VERIFY_HOST_FLAG @@ -193,43 +193,43 @@ typedef UINT32 EFI_TLS_VERIFY_HOST_FLAG; /// There is no additional flags set for hostname validation. /// Wildcards are supported and they match only in the left-most label. /// -#define EFI_TLS_VERIFY_FLAG_NONE 0x00 +#define EFI_TLS_VERIFY_FLAG_NONE 0x00 /// /// Always check the Subject Distinguished Name (DN) in the peer certificate even if the /// certificate contains Subject Alternative Name (SAN). /// -#define EFI_TLS_VERIFY_FLAG_ALWAYS_CHECK_SUBJECT 0x01 +#define EFI_TLS_VERIFY_FLAG_ALWAYS_CHECK_SUBJECT 0x01 /// /// Disable the match of all wildcards. /// -#define EFI_TLS_VERIFY_FLAG_NO_WILDCARDS 0x02 +#define EFI_TLS_VERIFY_FLAG_NO_WILDCARDS 0x02 /// /// Disable the "*" as wildcard in labels that have a prefix or suffix (e.g. "www*" or "*www"). /// -#define EFI_TLS_VERIFY_FLAG_NO_PARTIAL_WILDCARDS 0x04 +#define EFI_TLS_VERIFY_FLAG_NO_PARTIAL_WILDCARDS 0x04 /// /// Allow the "*" to match more than one labels. Otherwise, only matches a single label. /// -#define EFI_TLS_VERIFY_FLAG_MULTI_LABEL_WILDCARDS 0x08 +#define EFI_TLS_VERIFY_FLAG_MULTI_LABEL_WILDCARDS 0x08 /// /// Restrict to only match direct child sub-domains which start with ".". /// For example, a name of ".example.com" would match "www.example.com" with this flag, /// but would not match "www.sub.example.com". /// -#define EFI_TLS_VERIFY_FLAG_SINGLE_LABEL_SUBDOMAINS 0x10 +#define EFI_TLS_VERIFY_FLAG_SINGLE_LABEL_SUBDOMAINS 0x10 /// /// Never check the Subject Distinguished Name (DN) even there is no /// Subject Alternative Name (SAN) in the certificate. /// -#define EFI_TLS_VERIFY_FLAG_NEVER_CHECK_SUBJECT 0x20 +#define EFI_TLS_VERIFY_FLAG_NEVER_CHECK_SUBJECT 0x20 /// /// EFI_TLS_VERIFY_HOST /// #pragma pack (1) typedef struct { - EFI_TLS_VERIFY_HOST_FLAG Flags; - CHAR8 *HostName; + EFI_TLS_VERIFY_HOST_FLAG Flags; + CHAR8 *HostName; } EFI_TLS_VERIFY_HOST; #pragma pack () @@ -240,8 +240,8 @@ typedef struct { /// #pragma pack (1) typedef struct { - UINT32 GmtUnixTime; - UINT8 RandomBytes[28]; + UINT32 GmtUnixTime; + UINT8 RandomBytes[28]; } EFI_TLS_RANDOM; #pragma pack () @@ -252,7 +252,7 @@ typedef struct { /// #pragma pack (1) typedef struct { - UINT8 Data[48]; + UINT8 Data[48]; } EFI_TLS_MASTER_SECRET; #pragma pack () @@ -263,8 +263,8 @@ typedef struct { #define MAX_TLS_SESSION_ID_LENGTH 32 #pragma pack (1) typedef struct { - UINT16 Length; - UINT8 Data[MAX_TLS_SESSION_ID_LENGTH]; + UINT16 Length; + UINT8 Data[MAX_TLS_SESSION_ID_LENGTH]; } EFI_TLS_SESSION_ID; #pragma pack () @@ -305,7 +305,6 @@ typedef enum { EfiTlsSessionError, EfiTlsSessionStateMaximum - } EFI_TLS_SESSION_STATE; /// @@ -315,11 +314,11 @@ typedef struct { /// /// Length of data buffer in the fragment. /// - UINT32 FragmentLength; + UINT32 FragmentLength; /// /// Pointer to the data buffer in the fragment. /// - VOID *FragmentBuffer; + VOID *FragmentBuffer; } EFI_TLS_FRAGMENT_DATA; /// @@ -363,7 +362,7 @@ typedef enum { **/ typedef EFI_STATUS -(EFIAPI *EFI_TLS_SET_SESSION_DATA) ( +(EFIAPI *EFI_TLS_SET_SESSION_DATA)( IN EFI_TLS_PROTOCOL *This, IN EFI_TLS_SESSION_DATA_TYPE DataType, IN VOID *Data, @@ -395,7 +394,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_TLS_GET_SESSION_DATA) ( +(EFIAPI *EFI_TLS_GET_SESSION_DATA)( IN EFI_TLS_PROTOCOL *This, IN EFI_TLS_SESSION_DATA_TYPE DataType, IN OUT VOID *Data OPTIONAL, @@ -442,7 +441,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_TLS_BUILD_RESPONSE_PACKET) ( +(EFIAPI *EFI_TLS_BUILD_RESPONSE_PACKET)( IN EFI_TLS_PROTOCOL *This, IN UINT8 *RequestBuffer OPTIONAL, IN UINTN RequestSize OPTIONAL, @@ -486,7 +485,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_TLS_PROCESS_PACKET) ( +(EFIAPI *EFI_TLS_PROCESS_PACKET)( IN EFI_TLS_PROTOCOL *This, IN OUT EFI_TLS_FRAGMENT_DATA **FragmentTable, IN UINT32 *FragmentCount, @@ -498,13 +497,13 @@ EFI_STATUS /// For detail of TLS, please refer to TLS related RFC. /// struct _EFI_TLS_PROTOCOL { - EFI_TLS_SET_SESSION_DATA SetSessionData; - EFI_TLS_GET_SESSION_DATA GetSessionData; - EFI_TLS_BUILD_RESPONSE_PACKET BuildResponsePacket; - EFI_TLS_PROCESS_PACKET ProcessPacket; + EFI_TLS_SET_SESSION_DATA SetSessionData; + EFI_TLS_GET_SESSION_DATA GetSessionData; + EFI_TLS_BUILD_RESPONSE_PACKET BuildResponsePacket; + EFI_TLS_PROCESS_PACKET ProcessPacket; }; -extern EFI_GUID gEfiTlsServiceBindingProtocolGuid; -extern EFI_GUID gEfiTlsProtocolGuid; +extern EFI_GUID gEfiTlsServiceBindingProtocolGuid; +extern EFI_GUID gEfiTlsProtocolGuid; -#endif // __EFI_TLS_PROTOCOL_H__ +#endif // __EFI_TLS_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/TlsConfig.h b/MdePkg/Include/Protocol/TlsConfig.h index e02ac55f06..8b2a94d41f 100644 --- a/MdePkg/Include/Protocol/TlsConfig.h +++ b/MdePkg/Include/Protocol/TlsConfig.h @@ -9,6 +9,7 @@ This Protocol is introduced in UEFI Specification 2.5 **/ + #ifndef __EFI_TLS_CONFIGURATION_PROTOCOL_H__ #define __EFI_TLS_CONFIGURATION_PROTOCOL_H__ @@ -48,7 +49,6 @@ typedef enum { EfiTlsConfigDataTypeCertRevocationList, EfiTlsConfigDataTypeMaximum - } EFI_TLS_CONFIG_DATA_TYPE; /** @@ -117,10 +117,10 @@ EFI_STATUS /// TLS configuration, such as Certificate, private key data. /// struct _EFI_TLS_CONFIGURATION_PROTOCOL { - EFI_TLS_CONFIGURATION_SET_DATA SetData; - EFI_TLS_CONFIGURATION_GET_DATA GetData; + EFI_TLS_CONFIGURATION_SET_DATA SetData; + EFI_TLS_CONFIGURATION_GET_DATA GetData; }; -extern EFI_GUID gEfiTlsConfigurationProtocolGuid; +extern EFI_GUID gEfiTlsConfigurationProtocolGuid; -#endif //__EFI_TLS_CONFIGURATION_PROTOCOL_H__ +#endif //__EFI_TLS_CONFIGURATION_PROTOCOL_H__ diff --git a/MdePkg/Include/Protocol/TrEEProtocol.h b/MdePkg/Include/Protocol/TrEEProtocol.h index caacd613ca..68d49b5eb0 100644 --- a/MdePkg/Include/Protocol/TrEEProtocol.h +++ b/MdePkg/Include/Protocol/TrEEProtocol.h @@ -18,65 +18,65 @@ SPDX-License-Identifier: BSD-2-Clause-Patent typedef struct _EFI_TREE_PROTOCOL EFI_TREE_PROTOCOL; typedef struct _TREE_VERSION { - UINT8 Major; - UINT8 Minor; + UINT8 Major; + UINT8 Minor; } TREE_VERSION; typedef UINT32 TREE_EVENT_LOG_BITMAP; typedef UINT32 TREE_EVENT_LOG_FORMAT; -#define TREE_EVENT_LOG_FORMAT_TCG_1_2 0x00000001 +#define TREE_EVENT_LOG_FORMAT_TCG_1_2 0x00000001 typedef struct _TREE_BOOT_SERVICE_CAPABILITY { // // Allocated size of the structure passed in // - UINT8 Size; + UINT8 Size; // // Version of the TREE_BOOT_SERVICE_CAPABILITY structure itself. // For this version of the protocol, the Major version shall be set to 1 // and the Minor version shall be set to 0. // - TREE_VERSION StructureVersion; + TREE_VERSION StructureVersion; // // Version of the TrEE protocol. // For this version of the protocol, the Major version shall be set to 1 // and the Minor version shall be set to 0. // - TREE_VERSION ProtocolVersion; + TREE_VERSION ProtocolVersion; // // Supported hash algorithms // - UINT32 HashAlgorithmBitmap; + UINT32 HashAlgorithmBitmap; // // Bitmap of supported event log formats // - TREE_EVENT_LOG_BITMAP SupportedEventLogs; + TREE_EVENT_LOG_BITMAP SupportedEventLogs; // // False = TrEE not present // - BOOLEAN TrEEPresentFlag; + BOOLEAN TrEEPresentFlag; // // Max size (in bytes) of a command that can be sent to the TrEE // - UINT16 MaxCommandSize; + UINT16 MaxCommandSize; // // Max size (in bytes) of a response that can be provided by the TrEE // - UINT16 MaxResponseSize; + UINT16 MaxResponseSize; // // 4-byte Vendor ID (see Trusted Computing Group, "TCG Vendor ID Registry," // Version 1.0, Revision 0.1, August 31, 2007, "TPM Capabilities Vendor ID" section) // - UINT32 ManufacturerID; + UINT32 ManufacturerID; } TREE_BOOT_SERVICE_CAPABILITY_1_0; typedef TREE_BOOT_SERVICE_CAPABILITY_1_0 TREE_BOOT_SERVICE_CAPABILITY; -#define TREE_BOOT_HASH_ALG_SHA1 0x00000001 -#define TREE_BOOT_HASH_ALG_SHA256 0x00000002 -#define TREE_BOOT_HASH_ALG_SHA384 0x00000004 -#define TREE_BOOT_HASH_ALG_SHA512 0x00000008 +#define TREE_BOOT_HASH_ALG_SHA1 0x00000001 +#define TREE_BOOT_HASH_ALG_SHA256 0x00000002 +#define TREE_BOOT_HASH_ALG_SHA384 0x00000004 +#define TREE_BOOT_HASH_ALG_SHA512 0x00000008 // // This bit is shall be set when an event shall be extended but not logged. @@ -85,12 +85,12 @@ typedef TREE_BOOT_SERVICE_CAPABILITY_1_0 TREE_BOOT_SERVICE_CAPABILITY; // // This bit shall be set when the intent is to measure a PE/COFF image. // -#define PE_COFF_IMAGE 0x0000000000000010 +#define PE_COFF_IMAGE 0x0000000000000010 typedef UINT32 TrEE_PCRINDEX; typedef UINT32 TrEE_EVENTTYPE; -#define MAX_PCR_INDEX 23 +#define MAX_PCR_INDEX 23 #define TREE_EVENT_HEADER_VERSION 1 #pragma pack(1) @@ -118,9 +118,9 @@ typedef struct { // // Total size of the event including the Size component, the header and the Event data. // - UINT32 Size; - TrEE_EVENT_HEADER Header; - UINT8 Event[1]; + UINT32 Size; + TrEE_EVENT_HEADER Header; + UINT8 Event[1]; } TrEE_EVENT; #pragma pack() @@ -146,7 +146,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_TREE_GET_CAPABILITY) ( +(EFIAPI *EFI_TREE_GET_CAPABILITY)( IN EFI_TREE_PROTOCOL *This, IN OUT TREE_BOOT_SERVICE_CAPABILITY *ProtocolCapability ); @@ -170,7 +170,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_TREE_GET_EVENT_LOG) ( +(EFIAPI *EFI_TREE_GET_EVENT_LOG)( IN EFI_TREE_PROTOCOL *This, IN TREE_EVENT_LOG_FORMAT EventLogFormat, OUT EFI_PHYSICAL_ADDRESS *EventLogLocation, @@ -199,7 +199,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI * EFI_TREE_HASH_LOG_EXTEND_EVENT) ( +(EFIAPI *EFI_TREE_HASH_LOG_EXTEND_EVENT)( IN EFI_TREE_PROTOCOL *This, IN UINT64 Flags, IN EFI_PHYSICAL_ADDRESS DataToHash, @@ -223,7 +223,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_TREE_SUBMIT_COMMAND) ( +(EFIAPI *EFI_TREE_SUBMIT_COMMAND)( IN EFI_TREE_PROTOCOL *This, IN UINT32 InputParameterBlockSize, IN UINT8 *InputParameterBlock, @@ -232,12 +232,12 @@ EFI_STATUS ); struct _EFI_TREE_PROTOCOL { - EFI_TREE_GET_CAPABILITY GetCapability; - EFI_TREE_GET_EVENT_LOG GetEventLog; - EFI_TREE_HASH_LOG_EXTEND_EVENT HashLogExtendEvent; - EFI_TREE_SUBMIT_COMMAND SubmitCommand; + EFI_TREE_GET_CAPABILITY GetCapability; + EFI_TREE_GET_EVENT_LOG GetEventLog; + EFI_TREE_HASH_LOG_EXTEND_EVENT HashLogExtendEvent; + EFI_TREE_SUBMIT_COMMAND SubmitCommand; }; -extern EFI_GUID gEfiTrEEProtocolGuid; +extern EFI_GUID gEfiTrEEProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Udp4.h b/MdePkg/Include/Protocol/Udp4.h index d071f508b2..a4ac6fd4e7 100644 --- a/MdePkg/Include/Protocol/Udp4.h +++ b/MdePkg/Include/Protocol/Udp4.h @@ -17,7 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include // -//GUID definitions +// GUID definitions // #define EFI_UDP4_SERVICE_BINDING_PROTOCOL_GUID \ { \ @@ -36,11 +36,11 @@ typedef struct _EFI_UDP4_PROTOCOL EFI_UDP4_PROTOCOL; /// The definition in here is only present to provide backwards compatability. /// typedef struct { - EFI_HANDLE InstanceHandle; - EFI_IPv4_ADDRESS LocalAddress; - UINT16 LocalPort; - EFI_IPv4_ADDRESS RemoteAddress; - UINT16 RemotePort; + EFI_HANDLE InstanceHandle; + EFI_IPv4_ADDRESS LocalAddress; + UINT16 LocalPort; + EFI_IPv4_ADDRESS RemoteAddress; + UINT16 RemotePort; } EFI_UDP4_SERVICE_POINT; /// @@ -48,52 +48,52 @@ typedef struct { /// The definition in here is only present to provide backwards compatability. /// typedef struct { - EFI_HANDLE DriverHandle; - UINT32 ServiceCount; - EFI_UDP4_SERVICE_POINT Services[1]; + EFI_HANDLE DriverHandle; + UINT32 ServiceCount; + EFI_UDP4_SERVICE_POINT Services[1]; } EFI_UDP4_VARIABLE_DATA; typedef struct { - UINT32 FragmentLength; - VOID *FragmentBuffer; + UINT32 FragmentLength; + VOID *FragmentBuffer; } EFI_UDP4_FRAGMENT_DATA; typedef struct { - EFI_IPv4_ADDRESS SourceAddress; - UINT16 SourcePort; - EFI_IPv4_ADDRESS DestinationAddress; - UINT16 DestinationPort; + EFI_IPv4_ADDRESS SourceAddress; + UINT16 SourcePort; + EFI_IPv4_ADDRESS DestinationAddress; + UINT16 DestinationPort; } EFI_UDP4_SESSION_DATA; typedef struct { // // Receiving Filters // - BOOLEAN AcceptBroadcast; - BOOLEAN AcceptPromiscuous; - BOOLEAN AcceptAnyPort; - BOOLEAN AllowDuplicatePort; + BOOLEAN AcceptBroadcast; + BOOLEAN AcceptPromiscuous; + BOOLEAN AcceptAnyPort; + BOOLEAN AllowDuplicatePort; // // I/O parameters // - UINT8 TypeOfService; - UINT8 TimeToLive; - BOOLEAN DoNotFragment; - UINT32 ReceiveTimeout; - UINT32 TransmitTimeout; + UINT8 TypeOfService; + UINT8 TimeToLive; + BOOLEAN DoNotFragment; + UINT32 ReceiveTimeout; + UINT32 TransmitTimeout; // // Access Point // - BOOLEAN UseDefaultAddress; - EFI_IPv4_ADDRESS StationAddress; - EFI_IPv4_ADDRESS SubnetMask; - UINT16 StationPort; - EFI_IPv4_ADDRESS RemoteAddress; - UINT16 RemotePort; + BOOLEAN UseDefaultAddress; + EFI_IPv4_ADDRESS StationAddress; + EFI_IPv4_ADDRESS SubnetMask; + UINT16 StationPort; + EFI_IPv4_ADDRESS RemoteAddress; + UINT16 RemotePort; } EFI_UDP4_CONFIG_DATA; typedef struct { - EFI_UDP4_SESSION_DATA *UdpSessionData; //OPTIONAL - EFI_IPv4_ADDRESS *GatewayAddress; //OPTIONAL + EFI_UDP4_SESSION_DATA *UdpSessionData; // OPTIONAL + EFI_IPv4_ADDRESS *GatewayAddress; // OPTIONAL UINT32 DataLength; UINT32 FragmentCount; EFI_UDP4_FRAGMENT_DATA FragmentTable[1]; @@ -108,13 +108,12 @@ typedef struct { EFI_UDP4_FRAGMENT_DATA FragmentTable[1]; } EFI_UDP4_RECEIVE_DATA; - typedef struct { - EFI_EVENT Event; - EFI_STATUS Status; + EFI_EVENT Event; + EFI_STATUS Status; union { - EFI_UDP4_RECEIVE_DATA *RxData; - EFI_UDP4_TRANSMIT_DATA *TxData; + EFI_UDP4_RECEIVE_DATA *RxData; + EFI_UDP4_TRANSMIT_DATA *TxData; } Packet; } EFI_UDP4_COMPLETION_TOKEN; @@ -148,7 +147,6 @@ EFI_STATUS OUT EFI_SIMPLE_NETWORK_MODE *SnpModeData OPTIONAL ); - /** Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv4 Protocol. @@ -423,17 +421,17 @@ EFI_STATUS /// such as the routing table and group table, which are independent from each other. /// struct _EFI_UDP4_PROTOCOL { - EFI_UDP4_GET_MODE_DATA GetModeData; - EFI_UDP4_CONFIGURE Configure; - EFI_UDP4_GROUPS Groups; - EFI_UDP4_ROUTES Routes; - EFI_UDP4_TRANSMIT Transmit; - EFI_UDP4_RECEIVE Receive; - EFI_UDP4_CANCEL Cancel; - EFI_UDP4_POLL Poll; + EFI_UDP4_GET_MODE_DATA GetModeData; + EFI_UDP4_CONFIGURE Configure; + EFI_UDP4_GROUPS Groups; + EFI_UDP4_ROUTES Routes; + EFI_UDP4_TRANSMIT Transmit; + EFI_UDP4_RECEIVE Receive; + EFI_UDP4_CANCEL Cancel; + EFI_UDP4_POLL Poll; }; -extern EFI_GUID gEfiUdp4ServiceBindingProtocolGuid; -extern EFI_GUID gEfiUdp4ProtocolGuid; +extern EFI_GUID gEfiUdp4ServiceBindingProtocolGuid; +extern EFI_GUID gEfiUdp4ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Udp6.h b/MdePkg/Include/Protocol/Udp6.h index 11696125e0..61fa623917 100644 --- a/MdePkg/Include/Protocol/Udp6.h +++ b/MdePkg/Include/Protocol/Udp6.h @@ -65,15 +65,15 @@ typedef struct { /// /// The handle of the driver that creates this entry. /// - EFI_HANDLE DriverHandle; + EFI_HANDLE DriverHandle; /// /// The number of address/port pairs that follow this data structure. /// - UINT32 ServiceCount; + UINT32 ServiceCount; /// /// List of address/port pairs that are currently in use. /// - EFI_UDP6_SERVICE_POINT Services[1]; + EFI_UDP6_SERVICE_POINT Services[1]; } EFI_UDP6_VARIABLE_DATA; typedef struct _EFI_UDP6_PROTOCOL EFI_UDP6_PROTOCOL; @@ -83,8 +83,8 @@ typedef struct _EFI_UDP6_PROTOCOL EFI_UDP6_PROTOCOL; /// The purpose of this structure is to avoid copying the same packet multiple times. /// typedef struct { - UINT32 FragmentLength; ///< Length of the fragment data buffer. - VOID *FragmentBuffer; ///< Pointer to the fragment data buffer. + UINT32 FragmentLength; ///< Length of the fragment data buffer. + VOID *FragmentBuffer; ///< Pointer to the fragment data buffer. } EFI_UDP6_FRAGMENT_DATA; /// @@ -97,56 +97,56 @@ typedef struct { /// Address from which this packet is sent. This field should not be used when /// sending packets. /// - EFI_IPv6_ADDRESS SourceAddress; + EFI_IPv6_ADDRESS SourceAddress; /// /// Port from which this packet is sent. It is in host byte order. This field should /// not be used when sending packets. /// - UINT16 SourcePort; + UINT16 SourcePort; /// /// Address to which this packet is sent. When sending packet, it'll be ignored /// if it is zero. /// - EFI_IPv6_ADDRESS DestinationAddress; + EFI_IPv6_ADDRESS DestinationAddress; /// /// Port to which this packet is sent. When sending packet, it'll be /// ignored if it is zero. /// - UINT16 DestinationPort; + UINT16 DestinationPort; } EFI_UDP6_SESSION_DATA; typedef struct { /// /// Set to TRUE to accept UDP packets that are sent to any address. /// - BOOLEAN AcceptPromiscuous; + BOOLEAN AcceptPromiscuous; /// /// Set to TRUE to accept UDP packets that are sent to any port. /// - BOOLEAN AcceptAnyPort; + BOOLEAN AcceptAnyPort; /// /// Set to TRUE to allow this EFI UDPv6 Protocol child instance to open a port number /// that is already being used by another EFI UDPv6 Protocol child instance. /// - BOOLEAN AllowDuplicatePort; + BOOLEAN AllowDuplicatePort; /// /// TrafficClass field in transmitted IPv6 packets. /// - UINT8 TrafficClass; + UINT8 TrafficClass; /// /// HopLimit field in transmitted IPv6 packets. /// - UINT8 HopLimit; + UINT8 HopLimit; /// /// The receive timeout value (number of microseconds) to be associated with each /// incoming packet. Zero means do not drop incoming packets. /// - UINT32 ReceiveTimeout; + UINT32 ReceiveTimeout; /// /// The transmit timeout value (number of microseconds) to be associated with each /// outgoing packet. Zero means do not drop outgoing packets. /// - UINT32 TransmitTimeout; + UINT32 TransmitTimeout; /// /// The station IP address that will be assigned to this EFI UDPv6 Protocol instance. /// The EFI UDPv6 and EFI IPv6 Protocol drivers will only deliver incoming packets @@ -158,28 +158,28 @@ typedef struct { /// transitioning from the stopped to the started states. If no address is available /// for selecting, the EFI IPv6 Protocol driver will use EFI_IP6_CONFIG_PROTOCOL to /// retrieve the IPv6 address. - EFI_IPv6_ADDRESS StationAddress; + EFI_IPv6_ADDRESS StationAddress; /// /// The port number to which this EFI UDPv6 Protocol instance is bound. If a client /// of the EFI UDPv6 Protocol does not care about the port number, set StationPort /// to zero. The EFI UDPv6 Protocol driver will assign a random port number to transmitted /// UDP packets. Ignored it if AcceptAnyPort is TRUE. /// - UINT16 StationPort; + UINT16 StationPort; /// /// The IP address of remote host to which this EFI UDPv6 Protocol instance is connecting. /// If RemoteAddress is not 0::/128, this EFI UDPv6 Protocol instance will be connected to /// RemoteAddress; i.e., outgoing packets of this EFI UDPv6 Protocol instance will be sent /// to this address by default and only incoming packets from this address will be delivered /// to client. Ignored for incoming filtering if AcceptPromiscuous is TRUE. - EFI_IPv6_ADDRESS RemoteAddress; + EFI_IPv6_ADDRESS RemoteAddress; /// /// The port number of the remote host to which this EFI UDPv6 Protocol instance is connecting. /// If it is not zero, outgoing packets of this EFI UDPv6 Protocol instance will be sent to /// this port number by default and only incoming packets from this port will be delivered /// to client. Ignored if RemoteAddress is 0::/128 and ignored for incoming filtering if /// AcceptPromiscuous is TRUE. - UINT16 RemotePort; + UINT16 RemotePort; } EFI_UDP6_CONFIG_DATA; /// @@ -259,7 +259,7 @@ typedef struct { /// This Event will be signaled after the Status field is updated by the EFI UDPv6 Protocol /// driver. The type of Event must be EVT_NOTIFY_SIGNAL. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Will be set to one of the following values: /// - EFI_SUCCESS: The receive or transmit operation completed successfully. @@ -280,16 +280,16 @@ typedef struct { /// - EFI_SECURITY_VIOLATION: The transmit or receive was failed because of IPsec policy check. /// - EFI_NO_MEDIA: There was a media error. /// - EFI_STATUS Status; + EFI_STATUS Status; union { /// /// When this token is used for receiving, RxData is a pointer to EFI_UDP6_RECEIVE_DATA. /// - EFI_UDP6_RECEIVE_DATA *RxData; + EFI_UDP6_RECEIVE_DATA *RxData; /// /// When this token is used for transmitting, TxData is a pointer to EFI_UDP6_TRANSMIT_DATA. /// - EFI_UDP6_TRANSMIT_DATA *TxData; + EFI_UDP6_TRANSMIT_DATA *TxData; } Packet; } EFI_UDP6_COMPLETION_TOKEN; @@ -321,7 +321,7 @@ EFI_STATUS OUT EFI_IP6_MODE_DATA *Ip6ModeData OPTIONAL, OUT EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData OPTIONAL, OUT EFI_SIMPLE_NETWORK_MODE *SnpModeData OPTIONAL -); + ); /** Initializes, changes, or resets the operational parameters for this instance of the EFI UDPv6 @@ -369,7 +369,7 @@ EFI_STATUS (EFIAPI *EFI_UDP6_CONFIGURE)( IN EFI_UDP6_PROTOCOL *This, IN EFI_UDP6_CONFIG_DATA *UdpConfigData OPTIONAL -); + ); /** Joins and leaves multicast groups. @@ -400,7 +400,7 @@ EFI_STATUS IN EFI_UDP6_PROTOCOL *This, IN BOOLEAN JoinFlag, IN EFI_IPv6_ADDRESS *MulticastAddress OPTIONAL -); + ); /** Queues outgoing data packets into the transmit queue. @@ -456,7 +456,7 @@ EFI_STATUS (EFIAPI *EFI_UDP6_TRANSMIT)( IN EFI_UDP6_PROTOCOL *This, IN EFI_UDP6_COMPLETION_TOKEN *Token -); + ); /** Places an asynchronous receive request into the receiving queue. @@ -495,7 +495,7 @@ EFI_STATUS (EFIAPI *EFI_UDP6_RECEIVE)( IN EFI_UDP6_PROTOCOL *This, IN EFI_UDP6_COMPLETION_TOKEN *Token -); + ); /** Aborts an asynchronous transmit or receive request. @@ -525,7 +525,7 @@ EFI_STATUS (EFIAPI *EFI_UDP6_CANCEL)( IN EFI_UDP6_PROTOCOL *This, IN EFI_UDP6_COMPLETION_TOKEN *Token OPTIONAL -); + ); /** Polls for incoming data packets and processes outgoing data packets. @@ -550,7 +550,7 @@ typedef EFI_STATUS (EFIAPI *EFI_UDP6_POLL)( IN EFI_UDP6_PROTOCOL *This -); + ); /// /// The EFI_UDP6_PROTOCOL defines an EFI UDPv6 Protocol session that can be used by any network drivers, @@ -559,16 +559,16 @@ EFI_STATUS /// Each instance has its own settings, such as group table, that are independent from each other. /// struct _EFI_UDP6_PROTOCOL { - EFI_UDP6_GET_MODE_DATA GetModeData; - EFI_UDP6_CONFIGURE Configure; - EFI_UDP6_GROUPS Groups; - EFI_UDP6_TRANSMIT Transmit; - EFI_UDP6_RECEIVE Receive; - EFI_UDP6_CANCEL Cancel; - EFI_UDP6_POLL Poll; + EFI_UDP6_GET_MODE_DATA GetModeData; + EFI_UDP6_CONFIGURE Configure; + EFI_UDP6_GROUPS Groups; + EFI_UDP6_TRANSMIT Transmit; + EFI_UDP6_RECEIVE Receive; + EFI_UDP6_CANCEL Cancel; + EFI_UDP6_POLL Poll; }; -extern EFI_GUID gEfiUdp6ServiceBindingProtocolGuid; -extern EFI_GUID gEfiUdp6ProtocolGuid; +extern EFI_GUID gEfiUdp6ServiceBindingProtocolGuid; +extern EFI_GUID gEfiUdp6ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/UfsDeviceConfig.h b/MdePkg/Include/Protocol/UfsDeviceConfig.h index fdc1e1fcd8..34676c7831 100644 --- a/MdePkg/Include/Protocol/UfsDeviceConfig.h +++ b/MdePkg/Include/Protocol/UfsDeviceConfig.h @@ -21,7 +21,7 @@ // // Forward reference for pure ANSI compatability // -typedef struct _EFI_UFS_DEVICE_CONFIG_PROTOCOL EFI_UFS_DEVICE_CONFIG_PROTOCOL; +typedef struct _EFI_UFS_DEVICE_CONFIG_PROTOCOL EFI_UFS_DEVICE_CONFIG_PROTOCOL; /** Read or write specified device descriptor of a UFS device. @@ -48,7 +48,7 @@ typedef struct _EFI_UFS_DEVICE_CONFIG_PROTOCOL EFI_UFS_DEVICE_CONFIG_PROTOCOL; **/ typedef EFI_STATUS -(EFIAPI *EFI_UFS_DEVICE_CONFIG_RW_DESCRIPTOR) ( +(EFIAPI *EFI_UFS_DEVICE_CONFIG_RW_DESCRIPTOR)( IN EFI_UFS_DEVICE_CONFIG_PROTOCOL *This, IN BOOLEAN Read, IN UINT8 DescId, @@ -78,7 +78,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_UFS_DEVICE_CONFIG_RW_FLAG) ( +(EFIAPI *EFI_UFS_DEVICE_CONFIG_RW_FLAG)( IN EFI_UFS_DEVICE_CONFIG_PROTOCOL *This, IN BOOLEAN Read, IN UINT8 FlagId, @@ -110,7 +110,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_UFS_DEVICE_CONFIG_RW_ATTRIBUTE) ( +(EFIAPI *EFI_UFS_DEVICE_CONFIG_RW_ATTRIBUTE)( IN EFI_UFS_DEVICE_CONFIG_PROTOCOL *This, IN BOOLEAN Read, IN UINT8 AttrId, @@ -132,6 +132,6 @@ struct _EFI_UFS_DEVICE_CONFIG_PROTOCOL { /// /// UFS Device Config Protocol GUID variable. /// -extern EFI_GUID gEfiUfsDeviceConfigProtocolGuid; +extern EFI_GUID gEfiUfsDeviceConfigProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/UgaDraw.h b/MdePkg/Include/Protocol/UgaDraw.h index 288d2f443a..8d33bf873c 100644 --- a/MdePkg/Include/Protocol/UgaDraw.h +++ b/MdePkg/Include/Protocol/UgaDraw.h @@ -11,7 +11,6 @@ #ifndef __UGA_DRAW_H__ #define __UGA_DRAW_H__ - #define EFI_UGA_DRAW_PROTOCOL_GUID \ { \ 0x982c298b, 0xf4fa, 0x41cb, {0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39 } \ @@ -67,15 +66,15 @@ EFI_STATUS ); typedef struct { - UINT8 Blue; - UINT8 Green; - UINT8 Red; - UINT8 Reserved; + UINT8 Blue; + UINT8 Green; + UINT8 Red; + UINT8 Reserved; } EFI_UGA_PIXEL; typedef union { - EFI_UGA_PIXEL Pixel; - UINT32 Raw; + EFI_UGA_PIXEL Pixel; + UINT32 Raw; } EFI_UGA_PIXEL_UNION; /// @@ -133,8 +132,8 @@ typedef enum { typedef EFI_STATUS (EFIAPI *EFI_UGA_DRAW_PROTOCOL_BLT)( - IN EFI_UGA_DRAW_PROTOCOL * This, - IN EFI_UGA_PIXEL * BltBuffer OPTIONAL, + IN EFI_UGA_DRAW_PROTOCOL *This, + IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, IN EFI_UGA_BLT_OPERATION BltOperation, IN UINTN SourceX, IN UINTN SourceY, @@ -150,11 +149,11 @@ EFI_STATUS /// copy pixels to and from the graphics controller's frame buffer. /// struct _EFI_UGA_DRAW_PROTOCOL { - EFI_UGA_DRAW_PROTOCOL_GET_MODE GetMode; - EFI_UGA_DRAW_PROTOCOL_SET_MODE SetMode; - EFI_UGA_DRAW_PROTOCOL_BLT Blt; + EFI_UGA_DRAW_PROTOCOL_GET_MODE GetMode; + EFI_UGA_DRAW_PROTOCOL_SET_MODE SetMode; + EFI_UGA_DRAW_PROTOCOL_BLT Blt; }; -extern EFI_GUID gEfiUgaDrawProtocolGuid; +extern EFI_GUID gEfiUgaDrawProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/UgaIo.h b/MdePkg/Include/Protocol/UgaIo.h index 67a6abd226..ffc5b3abe9 100644 --- a/MdePkg/Include/Protocol/UgaIo.h +++ b/MdePkg/Include/Protocol/UgaIo.h @@ -16,10 +16,10 @@ typedef struct _EFI_UGA_IO_PROTOCOL EFI_UGA_IO_PROTOCOL; -typedef UINT32 UGA_STATUS; +typedef UINT32 UGA_STATUS; typedef enum { - UgaDtParentBus = 1, + UgaDtParentBus = 1, UgaDtGraphicsController, UgaDtOutputController, UgaDtOutputPort, @@ -29,24 +29,24 @@ typedef enum { typedef UINT32 UGA_DEVICE_ID, *PUGA_DEVICE_ID; typedef struct { - UGA_DEVICE_TYPE deviceType; - UGA_DEVICE_ID deviceId; - UINT32 ui32DeviceContextSize; - UINT32 ui32SharedContextSize; + UGA_DEVICE_TYPE deviceType; + UGA_DEVICE_ID deviceId; + UINT32 ui32DeviceContextSize; + UINT32 ui32SharedContextSize; } UGA_DEVICE_DATA, *PUGA_DEVICE_DATA; typedef struct _UGA_DEVICE { - VOID *pvDeviceContext; - VOID *pvSharedContext; - VOID *pvRunTimeContext; - struct _UGA_DEVICE *pParentDevice; - VOID *pvBusIoServices; - VOID *pvStdIoServices; - UGA_DEVICE_DATA deviceData; + VOID *pvDeviceContext; + VOID *pvSharedContext; + VOID *pvRunTimeContext; + struct _UGA_DEVICE *pParentDevice; + VOID *pvBusIoServices; + VOID *pvStdIoServices; + UGA_DEVICE_DATA deviceData; } UGA_DEVICE, *PUGA_DEVICE; typedef enum { - UgaIoGetVersion = 1, + UgaIoGetVersion = 1, UgaIoGetChildDevice, UgaIoStartDevice, UgaIoStopDevice, @@ -72,15 +72,14 @@ typedef enum { } UGA_IO_REQUEST_CODE, *PUGA_IO_REQUEST_CODE; typedef struct { - IN UGA_IO_REQUEST_CODE ioRequestCode; - IN VOID *pvInBuffer; - IN UINT64 ui64InBufferSize; - OUT VOID *pvOutBuffer; - IN UINT64 ui64OutBufferSize; - OUT UINT64 ui64BytesReturned; + IN UGA_IO_REQUEST_CODE ioRequestCode; + IN VOID *pvInBuffer; + IN UINT64 ui64InBufferSize; + OUT VOID *pvOutBuffer; + IN UINT64 ui64OutBufferSize; + OUT UINT64 ui64BytesReturned; } UGA_IO_REQUEST, *PUGA_IO_REQUEST; - /** Dynamically allocate storage for a child UGA_DEVICE. @@ -108,7 +107,6 @@ EFI_STATUS OUT UGA_DEVICE **Device ); - /** Delete a dynamically allocated child UGA_DEVICE object that was allocated via CreateDevice(). @@ -125,8 +123,8 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_UGA_IO_PROTOCOL_DELETE_DEVICE)( - IN EFI_UGA_IO_PROTOCOL * This, - IN UGA_DEVICE * Device + IN EFI_UGA_IO_PROTOCOL *This, + IN UGA_DEVICE *Device ); /** @@ -156,12 +154,12 @@ typedef UGA_STATUS /// Provides a basic abstraction to send I/O requests to the graphics device and any of its children. /// struct _EFI_UGA_IO_PROTOCOL { - EFI_UGA_IO_PROTOCOL_CREATE_DEVICE CreateDevice; - EFI_UGA_IO_PROTOCOL_DELETE_DEVICE DeleteDevice; - PUGA_FW_SERVICE_DISPATCH DispatchService; + EFI_UGA_IO_PROTOCOL_CREATE_DEVICE CreateDevice; + EFI_UGA_IO_PROTOCOL_DELETE_DEVICE DeleteDevice; + PUGA_FW_SERVICE_DISPATCH DispatchService; }; -extern EFI_GUID gEfiUgaIoProtocolGuid; +extern EFI_GUID gEfiUgaIoProtocolGuid; // // Data structure that is stored in the EFI Configuration Table with the @@ -169,10 +167,10 @@ extern EFI_GUID gEfiUgaIoProtocolGuid; // EBC UGA drivers. // typedef struct { - UINT32 Version; - UINT32 HeaderSize; - UINT32 SizeOfEntries; - UINT32 NumberOfEntries; + UINT32 Version; + UINT32 HeaderSize; + UINT32 SizeOfEntries; + UINT32 NumberOfEntries; } EFI_DRIVER_OS_HANDOFF_HEADER; typedef enum { @@ -182,10 +180,10 @@ typedef enum { } EFI_DRIVER_HANOFF_ENUM; typedef struct { - EFI_DRIVER_HANOFF_ENUM Type; - EFI_DEVICE_PATH_PROTOCOL *DevicePath; - VOID *PciRomImage; - UINT64 PciRomSize; + EFI_DRIVER_HANOFF_ENUM Type; + EFI_DEVICE_PATH_PROTOCOL *DevicePath; + VOID *PciRomImage; + UINT64 PciRomSize; } EFI_DRIVER_OS_HANDOFF; #endif diff --git a/MdePkg/Include/Protocol/UnicodeCollation.h b/MdePkg/Include/Protocol/UnicodeCollation.h index c337c7bdf4..c4025eb4ff 100644 --- a/MdePkg/Include/Protocol/UnicodeCollation.h +++ b/MdePkg/Include/Protocol/UnicodeCollation.h @@ -21,27 +21,27 @@ SPDX-License-Identifier: BSD-2-Clause-Patent 0xa4c751fc, 0x23ae, 0x4c3e, {0x92, 0xe9, 0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 } \ } -typedef struct _EFI_UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL; - +typedef struct _EFI_UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL; /// /// Protocol GUID name defined in EFI1.1. /// -#define UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL_GUID +#define UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL_GUID /// /// Protocol defined in EFI1.1. /// -typedef EFI_UNICODE_COLLATION_PROTOCOL UNICODE_COLLATION_INTERFACE; +typedef EFI_UNICODE_COLLATION_PROTOCOL UNICODE_COLLATION_INTERFACE; /// /// Protocol data structures and defines /// -#define EFI_UNICODE_BYTE_ORDER_MARK (CHAR16) (0xfeff) +#define EFI_UNICODE_BYTE_ORDER_MARK (CHAR16) (0xfeff) // // Protocol member functions // + /** Performs a case-insensitive comparison of two Null-terminated strings. @@ -161,26 +161,26 @@ BOOLEAN /// comparisons of strings. /// struct _EFI_UNICODE_COLLATION_PROTOCOL { - EFI_UNICODE_COLLATION_STRICOLL StriColl; - EFI_UNICODE_COLLATION_METAIMATCH MetaiMatch; - EFI_UNICODE_COLLATION_STRLWR StrLwr; - EFI_UNICODE_COLLATION_STRUPR StrUpr; + EFI_UNICODE_COLLATION_STRICOLL StriColl; + EFI_UNICODE_COLLATION_METAIMATCH MetaiMatch; + EFI_UNICODE_COLLATION_STRLWR StrLwr; + EFI_UNICODE_COLLATION_STRUPR StrUpr; // // for supporting fat volumes // - EFI_UNICODE_COLLATION_FATTOSTR FatToStr; - EFI_UNICODE_COLLATION_STRTOFAT StrToFat; + EFI_UNICODE_COLLATION_FATTOSTR FatToStr; + EFI_UNICODE_COLLATION_STRTOFAT StrToFat; /// /// A Null-terminated ASCII string array that contains one or more language codes. /// When this field is used for UnicodeCollation2, it is specified in RFC 4646 format. /// When it is used for UnicodeCollation, it is specified in ISO 639-2 format. /// - CHAR8 *SupportedLanguages; + CHAR8 *SupportedLanguages; }; -extern EFI_GUID gEfiUnicodeCollationProtocolGuid; -extern EFI_GUID gEfiUnicodeCollation2ProtocolGuid; +extern EFI_GUID gEfiUnicodeCollationProtocolGuid; +extern EFI_GUID gEfiUnicodeCollation2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/Usb2HostController.h b/MdePkg/Include/Protocol/Usb2HostController.h index a2c6767a70..06e20beba8 100644 --- a/MdePkg/Include/Protocol/Usb2HostController.h +++ b/MdePkg/Include/Protocol/Usb2HostController.h @@ -24,35 +24,33 @@ /// typedef struct _EFI_USB2_HC_PROTOCOL EFI_USB2_HC_PROTOCOL; - typedef struct { - UINT16 PortStatus; ///< Contains current port status bitmap. - UINT16 PortChangeStatus; ///< Contains current port status change bitmap. + UINT16 PortStatus; ///< Contains current port status bitmap. + UINT16 PortChangeStatus; ///< Contains current port status change bitmap. } EFI_USB_PORT_STATUS; /// /// EFI_USB_PORT_STATUS.PortStatus bit definition /// -#define USB_PORT_STAT_CONNECTION 0x0001 -#define USB_PORT_STAT_ENABLE 0x0002 -#define USB_PORT_STAT_SUSPEND 0x0004 -#define USB_PORT_STAT_OVERCURRENT 0x0008 -#define USB_PORT_STAT_RESET 0x0010 -#define USB_PORT_STAT_POWER 0x0100 -#define USB_PORT_STAT_LOW_SPEED 0x0200 -#define USB_PORT_STAT_HIGH_SPEED 0x0400 -#define USB_PORT_STAT_SUPER_SPEED 0x0800 -#define USB_PORT_STAT_OWNER 0x2000 +#define USB_PORT_STAT_CONNECTION 0x0001 +#define USB_PORT_STAT_ENABLE 0x0002 +#define USB_PORT_STAT_SUSPEND 0x0004 +#define USB_PORT_STAT_OVERCURRENT 0x0008 +#define USB_PORT_STAT_RESET 0x0010 +#define USB_PORT_STAT_POWER 0x0100 +#define USB_PORT_STAT_LOW_SPEED 0x0200 +#define USB_PORT_STAT_HIGH_SPEED 0x0400 +#define USB_PORT_STAT_SUPER_SPEED 0x0800 +#define USB_PORT_STAT_OWNER 0x2000 /// /// EFI_USB_PORT_STATUS.PortChangeStatus bit definition /// -#define USB_PORT_STAT_C_CONNECTION 0x0001 -#define USB_PORT_STAT_C_ENABLE 0x0002 -#define USB_PORT_STAT_C_SUSPEND 0x0004 -#define USB_PORT_STAT_C_OVERCURRENT 0x0008 -#define USB_PORT_STAT_C_RESET 0x0010 - +#define USB_PORT_STAT_C_CONNECTION 0x0001 +#define USB_PORT_STAT_C_ENABLE 0x0002 +#define USB_PORT_STAT_C_SUSPEND 0x0004 +#define USB_PORT_STAT_C_OVERCURRENT 0x0008 +#define USB_PORT_STAT_C_RESET 0x0010 /// /// Usb port features value @@ -72,14 +70,14 @@ typedef enum { EfiUsbPortResetChange = 20 } EFI_USB_PORT_FEATURE; -#define EFI_USB_SPEED_FULL 0x0000 ///< 12 Mb/s, USB 1.1 OHCI and UHCI HC. -#define EFI_USB_SPEED_LOW 0x0001 ///< 1 Mb/s, USB 1.1 OHCI and UHCI HC. -#define EFI_USB_SPEED_HIGH 0x0002 ///< 480 Mb/s, USB 2.0 EHCI HC. -#define EFI_USB_SPEED_SUPER 0x0003 ///< 4.8 Gb/s, USB 3.0 XHCI HC. +#define EFI_USB_SPEED_FULL 0x0000 ///< 12 Mb/s, USB 1.1 OHCI and UHCI HC. +#define EFI_USB_SPEED_LOW 0x0001 ///< 1 Mb/s, USB 1.1 OHCI and UHCI HC. +#define EFI_USB_SPEED_HIGH 0x0002 ///< 480 Mb/s, USB 2.0 EHCI HC. +#define EFI_USB_SPEED_SUPER 0x0003 ///< 4.8 Gb/s, USB 3.0 XHCI HC. typedef struct { - UINT8 TranslatorHubAddress; ///< device address - UINT8 TranslatorPortNumber; ///< the port number of the hub that device is connected to. + UINT8 TranslatorHubAddress; ///< device address + UINT8 TranslatorPortNumber; ///< the port number of the hub that device is connected to. } EFI_USB2_HC_TRANSACTION_TRANSLATOR; // @@ -114,6 +112,7 @@ EFI_STATUS #define EFI_USB_HC_RESET_HOST_CONTROLLER 0x0002 #define EFI_USB_HC_RESET_GLOBAL_WITH_DEBUG 0x0004 #define EFI_USB_HC_RESET_HOST_WITH_DEBUG 0x0008 + /** Provides software reset for the USB host controller. @@ -192,7 +191,7 @@ EFI_STATUS (EFIAPI *EFI_USB2_HC_PROTOCOL_GET_STATE)( IN EFI_USB2_HC_PROTOCOL *This, OUT EFI_USB_HC_STATE *State -); + ); /** Sets the USB host controller to a specific state. @@ -258,7 +257,7 @@ EFI_STATUS OUT UINT32 *TransferResult ); -#define EFI_USB_MAX_BULK_BUFFER_NUM 10 +#define EFI_USB_MAX_BULK_BUFFER_NUM 10 /** Submits bulk transfer to a bulk endpoint of a USB device. @@ -401,8 +400,8 @@ EFI_STATUS OUT UINT32 *TransferResult ); -#define EFI_USB_MAX_ISO_BUFFER_NUM 7 -#define EFI_USB_MAX_ISO_BUFFER_NUM1 2 +#define EFI_USB_MAX_ISO_BUFFER_NUM 7 +#define EFI_USB_MAX_ISO_BUFFER_NUM1 2 /** Submits isochronous transfer to an isochronous endpoint of a USB device. @@ -624,35 +623,35 @@ EFI_STATUS /// instance, and an EFI_USB2_HC_PROTOCOL instance. /// struct _EFI_USB2_HC_PROTOCOL { - EFI_USB2_HC_PROTOCOL_GET_CAPABILITY GetCapability; - EFI_USB2_HC_PROTOCOL_RESET Reset; - EFI_USB2_HC_PROTOCOL_GET_STATE GetState; - EFI_USB2_HC_PROTOCOL_SET_STATE SetState; - EFI_USB2_HC_PROTOCOL_CONTROL_TRANSFER ControlTransfer; - EFI_USB2_HC_PROTOCOL_BULK_TRANSFER BulkTransfer; - EFI_USB2_HC_PROTOCOL_ASYNC_INTERRUPT_TRANSFER AsyncInterruptTransfer; - EFI_USB2_HC_PROTOCOL_SYNC_INTERRUPT_TRANSFER SyncInterruptTransfer; - EFI_USB2_HC_PROTOCOL_ISOCHRONOUS_TRANSFER IsochronousTransfer; - EFI_USB2_HC_PROTOCOL_ASYNC_ISOCHRONOUS_TRANSFER AsyncIsochronousTransfer; - EFI_USB2_HC_PROTOCOL_GET_ROOTHUB_PORT_STATUS GetRootHubPortStatus; - EFI_USB2_HC_PROTOCOL_SET_ROOTHUB_PORT_FEATURE SetRootHubPortFeature; - EFI_USB2_HC_PROTOCOL_CLEAR_ROOTHUB_PORT_FEATURE ClearRootHubPortFeature; + EFI_USB2_HC_PROTOCOL_GET_CAPABILITY GetCapability; + EFI_USB2_HC_PROTOCOL_RESET Reset; + EFI_USB2_HC_PROTOCOL_GET_STATE GetState; + EFI_USB2_HC_PROTOCOL_SET_STATE SetState; + EFI_USB2_HC_PROTOCOL_CONTROL_TRANSFER ControlTransfer; + EFI_USB2_HC_PROTOCOL_BULK_TRANSFER BulkTransfer; + EFI_USB2_HC_PROTOCOL_ASYNC_INTERRUPT_TRANSFER AsyncInterruptTransfer; + EFI_USB2_HC_PROTOCOL_SYNC_INTERRUPT_TRANSFER SyncInterruptTransfer; + EFI_USB2_HC_PROTOCOL_ISOCHRONOUS_TRANSFER IsochronousTransfer; + EFI_USB2_HC_PROTOCOL_ASYNC_ISOCHRONOUS_TRANSFER AsyncIsochronousTransfer; + EFI_USB2_HC_PROTOCOL_GET_ROOTHUB_PORT_STATUS GetRootHubPortStatus; + EFI_USB2_HC_PROTOCOL_SET_ROOTHUB_PORT_FEATURE SetRootHubPortFeature; + EFI_USB2_HC_PROTOCOL_CLEAR_ROOTHUB_PORT_FEATURE ClearRootHubPortFeature; /// /// The major revision number of the USB host controller. The revision information /// indicates the release of the Universal Serial Bus Specification with which the /// host controller is compliant. /// - UINT16 MajorRevision; + UINT16 MajorRevision; /// /// The minor revision number of the USB host controller. The revision information /// indicates the release of the Universal Serial Bus Specification with which the /// host controller is compliant. /// - UINT16 MinorRevision; + UINT16 MinorRevision; }; -extern EFI_GUID gEfiUsb2HcProtocolGuid; +extern EFI_GUID gEfiUsb2HcProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/UsbFunctionIo.h b/MdePkg/Include/Protocol/UsbFunctionIo.h index 1c003db387..e360b60480 100644 --- a/MdePkg/Include/Protocol/UsbFunctionIo.h +++ b/MdePkg/Include/Protocol/UsbFunctionIo.h @@ -29,9 +29,9 @@ 0x32d2963a, 0xfe5d, 0x4f30, {0xb6, 0x33, 0x6e, 0x5d, 0xc5, 0x58, 0x3, 0xcc} \ } -typedef struct _EFI_USBFN_IO_PROTOCOL EFI_USBFN_IO_PROTOCOL; +typedef struct _EFI_USBFN_IO_PROTOCOL EFI_USBFN_IO_PROTOCOL; -#define EFI_USBFN_IO_PROTOCOL_REVISION 0x00010001 +#define EFI_USBFN_IO_PROTOCOL_REVISION 0x00010001 typedef enum _EFI_USBFN_PORT_TYPE { EfiUsbUnknownPort = 0, @@ -42,25 +42,25 @@ typedef enum _EFI_USBFN_PORT_TYPE { } EFI_USBFN_PORT_TYPE; typedef struct { - EFI_USB_INTERFACE_DESCRIPTOR *InterfaceDescriptor; - EFI_USB_ENDPOINT_DESCRIPTOR **EndpointDescriptorTable; + EFI_USB_INTERFACE_DESCRIPTOR *InterfaceDescriptor; + EFI_USB_ENDPOINT_DESCRIPTOR **EndpointDescriptorTable; } EFI_USB_INTERFACE_INFO; typedef struct { - EFI_USB_CONFIG_DESCRIPTOR *ConfigDescriptor; - EFI_USB_INTERFACE_INFO **InterfaceInfoTable; + EFI_USB_CONFIG_DESCRIPTOR *ConfigDescriptor; + EFI_USB_INTERFACE_INFO **InterfaceInfoTable; } EFI_USB_CONFIG_INFO; typedef struct { - EFI_USB_DEVICE_DESCRIPTOR *DeviceDescriptor; - EFI_USB_CONFIG_INFO **ConfigInfoTable; + EFI_USB_DEVICE_DESCRIPTOR *DeviceDescriptor; + EFI_USB_CONFIG_INFO **ConfigInfoTable; } EFI_USB_DEVICE_INFO; typedef enum _EFI_USB_ENDPOINT_TYPE { UsbEndpointControl = 0x00, - //UsbEndpointIsochronous = 0x01, + // UsbEndpointIsochronous = 0x01, UsbEndpointBulk = 0x02, - //UsbEndpointInterrupt = 0x03 + // UsbEndpointInterrupt = 0x03 } EFI_USB_ENDPOINT_TYPE; typedef enum _EFI_USBFN_DEVICE_INFO_ID { @@ -139,11 +139,11 @@ typedef enum _EFI_USBFN_TRANSFER_STATUS { } EFI_USBFN_TRANSFER_STATUS; typedef struct _EFI_USBFN_TRANSFER_RESULT { - UINTN BytesTransferred; - EFI_USBFN_TRANSFER_STATUS TransferStatus; - UINT8 EndpointIndex; - EFI_USBFN_ENDPOINT_DIRECTION Direction; - VOID *Buffer; + UINTN BytesTransferred; + EFI_USBFN_TRANSFER_STATUS TransferStatus; + UINT8 EndpointIndex; + EFI_USBFN_ENDPOINT_DIRECTION Direction; + VOID *Buffer; } EFI_USBFN_TRANSFER_RESULT; typedef enum _EFI_USB_BUS_SPEED { @@ -184,9 +184,9 @@ typedef enum _EFI_USBFN_POLICY_TYPE { **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_DETECT_PORT) ( +(EFIAPI *EFI_USBFN_IO_DETECT_PORT)( IN EFI_USBFN_IO_PROTOCOL *This, - OUT EFI_USBFN_PORT_TYPE *PortType + OUT EFI_USBFN_PORT_TYPE *PortType ); /** @@ -214,9 +214,9 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_CONFIGURE_ENABLE_ENDPOINTS) ( +(EFIAPI *EFI_USBFN_IO_CONFIGURE_ENABLE_ENDPOINTS)( IN EFI_USBFN_IO_PROTOCOL *This, - OUT EFI_USB_DEVICE_INFO *DeviceInfo + OUT EFI_USB_DEVICE_INFO *DeviceInfo ); /** @@ -244,11 +244,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_GET_ENDPOINT_MAXPACKET_SIZE) ( +(EFIAPI *EFI_USBFN_IO_GET_ENDPOINT_MAXPACKET_SIZE)( IN EFI_USBFN_IO_PROTOCOL *This, IN EFI_USB_ENDPOINT_TYPE EndpointType, IN EFI_USB_BUS_SPEED BusSpeed, - OUT UINT16 *MaxPacketSize + OUT UINT16 *MaxPacketSize ); /** @@ -281,12 +281,12 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_GET_DEVICE_INFO) ( +(EFIAPI *EFI_USBFN_IO_GET_DEVICE_INFO)( IN EFI_USBFN_IO_PROTOCOL *This, IN EFI_USBFN_DEVICE_INFO_ID Id, IN OUT UINTN *BufferSize, - OUT VOID *Buffer OPTIONAL -); + OUT VOID *Buffer OPTIONAL + ); /** Returns the vendor-id and product-id of the device. @@ -302,11 +302,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_GET_VENDOR_ID_PRODUCT_ID) ( +(EFIAPI *EFI_USBFN_IO_GET_VENDOR_ID_PRODUCT_ID)( IN EFI_USBFN_IO_PROTOCOL *This, - OUT UINT16 *Vid, - OUT UINT16 *Pid -); + OUT UINT16 *Vid, + OUT UINT16 *Pid + ); /** Aborts the transfer on the specified endpoint. @@ -328,11 +328,11 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_ABORT_TRANSFER) ( +(EFIAPI *EFI_USBFN_IO_ABORT_TRANSFER)( IN EFI_USBFN_IO_PROTOCOL *This, IN UINT8 EndpointIndex, IN EFI_USBFN_ENDPOINT_DIRECTION Direction -); + ); /** Returns the stall state on the specified endpoint. @@ -355,12 +355,12 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_GET_ENDPOINT_STALL_STATE) ( +(EFIAPI *EFI_USBFN_IO_GET_ENDPOINT_STALL_STATE)( IN EFI_USBFN_IO_PROTOCOL *This, IN UINT8 EndpointIndex, IN EFI_USBFN_ENDPOINT_DIRECTION Direction, IN OUT BOOLEAN *State -); + ); /** Sets or clears the stall state on the specified endpoint. @@ -384,12 +384,12 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_SET_ENDPOINT_STALL_STATE) ( +(EFIAPI *EFI_USBFN_IO_SET_ENDPOINT_STALL_STATE)( IN EFI_USBFN_IO_PROTOCOL *This, IN UINT8 EndpointIndex, IN EFI_USBFN_ENDPOINT_DIRECTION Direction, IN OUT BOOLEAN *State -); + ); /** This function is called repeatedly to get information on USB bus states, @@ -419,12 +419,12 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_EVENTHANDLER) ( +(EFIAPI *EFI_USBFN_IO_EVENTHANDLER)( IN EFI_USBFN_IO_PROTOCOL *This, - OUT EFI_USBFN_MESSAGE *Message, + OUT EFI_USBFN_MESSAGE *Message, IN OUT UINTN *PayloadSize, - OUT EFI_USBFN_MESSAGE_PAYLOAD *Payload -); + OUT EFI_USBFN_MESSAGE_PAYLOAD *Payload + ); /** This function handles transferring data to or from the host on the specified @@ -467,13 +467,13 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_TRANSFER) ( +(EFIAPI *EFI_USBFN_IO_TRANSFER)( IN EFI_USBFN_IO_PROTOCOL *This, IN UINT8 EndpointIndex, IN EFI_USBFN_ENDPOINT_DIRECTION Direction, IN OUT UINTN *BufferSize, IN OUT VOID *Buffer -); + ); /** Returns the maximum supported transfer size. @@ -493,9 +493,9 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_GET_MAXTRANSFER_SIZE) ( +(EFIAPI *EFI_USBFN_IO_GET_MAXTRANSFER_SIZE)( IN EFI_USBFN_IO_PROTOCOL *This, - OUT UINTN *MaxTransferSize + OUT UINTN *MaxTransferSize ); /** @@ -521,10 +521,10 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_ALLOCATE_TRANSFER_BUFFER) ( +(EFIAPI *EFI_USBFN_IO_ALLOCATE_TRANSFER_BUFFER)( IN EFI_USBFN_IO_PROTOCOL *This, IN UINTN Size, - OUT VOID **Buffer + OUT VOID **Buffer ); /** @@ -544,7 +544,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_FREE_TRANSFER_BUFFER) ( +(EFIAPI *EFI_USBFN_IO_FREE_TRANSFER_BUFFER)( IN EFI_USBFN_IO_PROTOCOL *This, IN VOID *Buffer ); @@ -563,7 +563,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_START_CONTROLLER) ( +(EFIAPI *EFI_USBFN_IO_START_CONTROLLER)( IN EFI_USBFN_IO_PROTOCOL *This ); @@ -579,7 +579,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_STOP_CONTROLLER) ( +(EFIAPI *EFI_USBFN_IO_STOP_CONTROLLER)( IN EFI_USBFN_IO_PROTOCOL *This ); @@ -608,7 +608,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_SET_ENDPOINT_POLICY) ( +(EFIAPI *EFI_USBFN_IO_SET_ENDPOINT_POLICY)( IN EFI_USBFN_IO_PROTOCOL *This, IN UINT8 EndpointIndex, IN EFI_USBFN_ENDPOINT_DIRECTION Direction, @@ -644,7 +644,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_USBFN_IO_GET_ENDPOINT_POLICY) ( +(EFIAPI *EFI_USBFN_IO_GET_ENDPOINT_POLICY)( IN EFI_USBFN_IO_PROTOCOL *This, IN UINT8 EndpointIndex, IN EFI_USBFN_ENDPOINT_DIRECTION Direction, @@ -658,27 +658,26 @@ EFI_STATUS /// controller management for a USB Function port. /// struct _EFI_USBFN_IO_PROTOCOL { - UINT32 Revision; - EFI_USBFN_IO_DETECT_PORT DetectPort; - EFI_USBFN_IO_CONFIGURE_ENABLE_ENDPOINTS ConfigureEnableEndpoints; - EFI_USBFN_IO_GET_ENDPOINT_MAXPACKET_SIZE GetEndpointMaxPacketSize; - EFI_USBFN_IO_GET_DEVICE_INFO GetDeviceInfo; - EFI_USBFN_IO_GET_VENDOR_ID_PRODUCT_ID GetVendorIdProductId; - EFI_USBFN_IO_ABORT_TRANSFER AbortTransfer; - EFI_USBFN_IO_GET_ENDPOINT_STALL_STATE GetEndpointStallState; - EFI_USBFN_IO_SET_ENDPOINT_STALL_STATE SetEndpointStallState; - EFI_USBFN_IO_EVENTHANDLER EventHandler; - EFI_USBFN_IO_TRANSFER Transfer; - EFI_USBFN_IO_GET_MAXTRANSFER_SIZE GetMaxTransferSize; - EFI_USBFN_IO_ALLOCATE_TRANSFER_BUFFER AllocateTransferBuffer; - EFI_USBFN_IO_FREE_TRANSFER_BUFFER FreeTransferBuffer; - EFI_USBFN_IO_START_CONTROLLER StartController; - EFI_USBFN_IO_STOP_CONTROLLER StopController; - EFI_USBFN_IO_SET_ENDPOINT_POLICY SetEndpointPolicy; - EFI_USBFN_IO_GET_ENDPOINT_POLICY GetEndpointPolicy; + UINT32 Revision; + EFI_USBFN_IO_DETECT_PORT DetectPort; + EFI_USBFN_IO_CONFIGURE_ENABLE_ENDPOINTS ConfigureEnableEndpoints; + EFI_USBFN_IO_GET_ENDPOINT_MAXPACKET_SIZE GetEndpointMaxPacketSize; + EFI_USBFN_IO_GET_DEVICE_INFO GetDeviceInfo; + EFI_USBFN_IO_GET_VENDOR_ID_PRODUCT_ID GetVendorIdProductId; + EFI_USBFN_IO_ABORT_TRANSFER AbortTransfer; + EFI_USBFN_IO_GET_ENDPOINT_STALL_STATE GetEndpointStallState; + EFI_USBFN_IO_SET_ENDPOINT_STALL_STATE SetEndpointStallState; + EFI_USBFN_IO_EVENTHANDLER EventHandler; + EFI_USBFN_IO_TRANSFER Transfer; + EFI_USBFN_IO_GET_MAXTRANSFER_SIZE GetMaxTransferSize; + EFI_USBFN_IO_ALLOCATE_TRANSFER_BUFFER AllocateTransferBuffer; + EFI_USBFN_IO_FREE_TRANSFER_BUFFER FreeTransferBuffer; + EFI_USBFN_IO_START_CONTROLLER StartController; + EFI_USBFN_IO_STOP_CONTROLLER StopController; + EFI_USBFN_IO_SET_ENDPOINT_POLICY SetEndpointPolicy; + EFI_USBFN_IO_GET_ENDPOINT_POLICY GetEndpointPolicy; }; -extern EFI_GUID gEfiUsbFunctionIoProtocolGuid; +extern EFI_GUID gEfiUsbFunctionIoProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/UsbHostController.h b/MdePkg/Include/Protocol/UsbHostController.h index 4b69faaf41..8b626ec52a 100644 --- a/MdePkg/Include/Protocol/UsbHostController.h +++ b/MdePkg/Include/Protocol/UsbHostController.h @@ -461,7 +461,6 @@ EFI_STATUS IN EFI_USB_PORT_FEATURE PortFeature ); - /// /// The EFI_USB_HC_PROTOCOL provides USB host controller management, basic data transactions /// over a USB bus, and USB root hub access. A device driver that wishes to manage a USB bus in a @@ -470,33 +469,33 @@ EFI_STATUS /// EFI_DEVICE_PATH_PROTOCOL instance, and an EFI_USB_HC_PROTOCOL instance. /// struct _EFI_USB_HC_PROTOCOL { - EFI_USB_HC_PROTOCOL_RESET Reset; - EFI_USB_HC_PROTOCOL_GET_STATE GetState; - EFI_USB_HC_PROTOCOL_SET_STATE SetState; - EFI_USB_HC_PROTOCOL_CONTROL_TRANSFER ControlTransfer; - EFI_USB_HC_PROTOCOL_BULK_TRANSFER BulkTransfer; - EFI_USB_HC_PROTOCOL_ASYNC_INTERRUPT_TRANSFER AsyncInterruptTransfer; - EFI_USB_HC_PROTOCOL_SYNC_INTERRUPT_TRANSFER SyncInterruptTransfer; - EFI_USB_HC_PROTOCOL_ISOCHRONOUS_TRANSFER IsochronousTransfer; - EFI_USB_HC_PROTOCOL_ASYNC_ISOCHRONOUS_TRANSFER AsyncIsochronousTransfer; - EFI_USB_HC_PROTOCOL_GET_ROOTHUB_PORT_NUMBER GetRootHubPortNumber; - EFI_USB_HC_PROTOCOL_GET_ROOTHUB_PORT_STATUS GetRootHubPortStatus; - EFI_USB_HC_PROTOCOL_SET_ROOTHUB_PORT_FEATURE SetRootHubPortFeature; - EFI_USB_HC_PROTOCOL_CLEAR_ROOTHUB_PORT_FEATURE ClearRootHubPortFeature; + EFI_USB_HC_PROTOCOL_RESET Reset; + EFI_USB_HC_PROTOCOL_GET_STATE GetState; + EFI_USB_HC_PROTOCOL_SET_STATE SetState; + EFI_USB_HC_PROTOCOL_CONTROL_TRANSFER ControlTransfer; + EFI_USB_HC_PROTOCOL_BULK_TRANSFER BulkTransfer; + EFI_USB_HC_PROTOCOL_ASYNC_INTERRUPT_TRANSFER AsyncInterruptTransfer; + EFI_USB_HC_PROTOCOL_SYNC_INTERRUPT_TRANSFER SyncInterruptTransfer; + EFI_USB_HC_PROTOCOL_ISOCHRONOUS_TRANSFER IsochronousTransfer; + EFI_USB_HC_PROTOCOL_ASYNC_ISOCHRONOUS_TRANSFER AsyncIsochronousTransfer; + EFI_USB_HC_PROTOCOL_GET_ROOTHUB_PORT_NUMBER GetRootHubPortNumber; + EFI_USB_HC_PROTOCOL_GET_ROOTHUB_PORT_STATUS GetRootHubPortStatus; + EFI_USB_HC_PROTOCOL_SET_ROOTHUB_PORT_FEATURE SetRootHubPortFeature; + EFI_USB_HC_PROTOCOL_CLEAR_ROOTHUB_PORT_FEATURE ClearRootHubPortFeature; /// /// The major revision number of the USB host controller. The revision information /// indicates the release of the Universal Serial Bus Specification with which the /// host controller is compliant. /// - UINT16 MajorRevision; + UINT16 MajorRevision; /// /// The minor revision number of the USB host controller. The revision information /// indicates the release of the Universal Serial Bus Specification with which the /// host controller is compliant. /// - UINT16 MinorRevision; + UINT16 MinorRevision; }; -extern EFI_GUID gEfiUsbHcProtocolGuid; +extern EFI_GUID gEfiUsbHcProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/UsbIo.h b/MdePkg/Include/Protocol/UsbIo.h index 838db0408d..4816b9039e 100644 --- a/MdePkg/Include/Protocol/UsbIo.h +++ b/MdePkg/Include/Protocol/UsbIo.h @@ -23,7 +23,7 @@ 0x2B2F68D6, 0x0CD2, 0x44cf, {0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 } \ } -typedef struct _EFI_USB_IO_PROTOCOL EFI_USB_IO_PROTOCOL; +typedef struct _EFI_USB_IO_PROTOCOL EFI_USB_IO_PROTOCOL; // // Related Definition for EFI USB I/O protocol @@ -32,11 +32,11 @@ typedef struct _EFI_USB_IO_PROTOCOL EFI_USB_IO_PROTOCOL; // // USB standard descriptors and reqeust // -typedef USB_DEVICE_REQUEST EFI_USB_DEVICE_REQUEST; -typedef USB_DEVICE_DESCRIPTOR EFI_USB_DEVICE_DESCRIPTOR; -typedef USB_CONFIG_DESCRIPTOR EFI_USB_CONFIG_DESCRIPTOR; -typedef USB_INTERFACE_DESCRIPTOR EFI_USB_INTERFACE_DESCRIPTOR; -typedef USB_ENDPOINT_DESCRIPTOR EFI_USB_ENDPOINT_DESCRIPTOR; +typedef USB_DEVICE_REQUEST EFI_USB_DEVICE_REQUEST; +typedef USB_DEVICE_DESCRIPTOR EFI_USB_DEVICE_DESCRIPTOR; +typedef USB_CONFIG_DESCRIPTOR EFI_USB_CONFIG_DESCRIPTOR; +typedef USB_INTERFACE_DESCRIPTOR EFI_USB_INTERFACE_DESCRIPTOR; +typedef USB_ENDPOINT_DESCRIPTOR EFI_USB_ENDPOINT_DESCRIPTOR; /// /// USB data transfer direction @@ -50,16 +50,16 @@ typedef enum { // // USB Transfer Results // -#define EFI_USB_NOERROR 0x00 -#define EFI_USB_ERR_NOTEXECUTE 0x01 -#define EFI_USB_ERR_STALL 0x02 -#define EFI_USB_ERR_BUFFER 0x04 -#define EFI_USB_ERR_BABBLE 0x08 -#define EFI_USB_ERR_NAK 0x10 -#define EFI_USB_ERR_CRC 0x20 -#define EFI_USB_ERR_TIMEOUT 0x40 -#define EFI_USB_ERR_BITSTUFF 0x80 -#define EFI_USB_ERR_SYSTEM 0x100 +#define EFI_USB_NOERROR 0x00 +#define EFI_USB_ERR_NOTEXECUTE 0x01 +#define EFI_USB_ERR_STALL 0x02 +#define EFI_USB_ERR_BUFFER 0x04 +#define EFI_USB_ERR_BABBLE 0x08 +#define EFI_USB_ERR_NAK 0x10 +#define EFI_USB_ERR_CRC 0x20 +#define EFI_USB_ERR_TIMEOUT 0x40 +#define EFI_USB_ERR_BITSTUFF 0x80 +#define EFI_USB_ERR_SYSTEM 0x100 /** Async USB transfer callback routine. @@ -88,7 +88,6 @@ EFI_STATUS // Prototype for EFI USB I/O protocol // - /** This function is used to manage a USB device with a control transfer pipe. A control transfer is typically used to perform device initialization and configuration. @@ -478,29 +477,29 @@ struct _EFI_USB_IO_PROTOCOL { // // IO transfer // - EFI_USB_IO_CONTROL_TRANSFER UsbControlTransfer; - EFI_USB_IO_BULK_TRANSFER UsbBulkTransfer; - EFI_USB_IO_ASYNC_INTERRUPT_TRANSFER UsbAsyncInterruptTransfer; - EFI_USB_IO_SYNC_INTERRUPT_TRANSFER UsbSyncInterruptTransfer; - EFI_USB_IO_ISOCHRONOUS_TRANSFER UsbIsochronousTransfer; - EFI_USB_IO_ASYNC_ISOCHRONOUS_TRANSFER UsbAsyncIsochronousTransfer; + EFI_USB_IO_CONTROL_TRANSFER UsbControlTransfer; + EFI_USB_IO_BULK_TRANSFER UsbBulkTransfer; + EFI_USB_IO_ASYNC_INTERRUPT_TRANSFER UsbAsyncInterruptTransfer; + EFI_USB_IO_SYNC_INTERRUPT_TRANSFER UsbSyncInterruptTransfer; + EFI_USB_IO_ISOCHRONOUS_TRANSFER UsbIsochronousTransfer; + EFI_USB_IO_ASYNC_ISOCHRONOUS_TRANSFER UsbAsyncIsochronousTransfer; // // Common device request // - EFI_USB_IO_GET_DEVICE_DESCRIPTOR UsbGetDeviceDescriptor; - EFI_USB_IO_GET_CONFIG_DESCRIPTOR UsbGetConfigDescriptor; - EFI_USB_IO_GET_INTERFACE_DESCRIPTOR UsbGetInterfaceDescriptor; - EFI_USB_IO_GET_ENDPOINT_DESCRIPTOR UsbGetEndpointDescriptor; - EFI_USB_IO_GET_STRING_DESCRIPTOR UsbGetStringDescriptor; - EFI_USB_IO_GET_SUPPORTED_LANGUAGE UsbGetSupportedLanguages; + EFI_USB_IO_GET_DEVICE_DESCRIPTOR UsbGetDeviceDescriptor; + EFI_USB_IO_GET_CONFIG_DESCRIPTOR UsbGetConfigDescriptor; + EFI_USB_IO_GET_INTERFACE_DESCRIPTOR UsbGetInterfaceDescriptor; + EFI_USB_IO_GET_ENDPOINT_DESCRIPTOR UsbGetEndpointDescriptor; + EFI_USB_IO_GET_STRING_DESCRIPTOR UsbGetStringDescriptor; + EFI_USB_IO_GET_SUPPORTED_LANGUAGE UsbGetSupportedLanguages; // // Reset controller's parent port // - EFI_USB_IO_PORT_RESET UsbPortReset; + EFI_USB_IO_PORT_RESET UsbPortReset; }; -extern EFI_GUID gEfiUsbIoProtocolGuid; +extern EFI_GUID gEfiUsbIoProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/UserCredential.h b/MdePkg/Include/Protocol/UserCredential.h index 0b49f157ff..986cf44994 100644 --- a/MdePkg/Include/Protocol/UserCredential.h +++ b/MdePkg/Include/Protocol/UserCredential.h @@ -19,7 +19,7 @@ 0x71ee5e94, 0x65b9, 0x45d5, { 0x82, 0x1a, 0x3a, 0x4d, 0x86, 0xcf, 0xe6, 0xbe } \ } -typedef struct _EFI_USER_CREDENTIAL_PROTOCOL EFI_USER_CREDENTIAL_PROTOCOL; +typedef struct _EFI_USER_CREDENTIAL_PROTOCOL EFI_USER_CREDENTIAL_PROTOCOL; /** Enroll a user on a credential provider. @@ -266,21 +266,21 @@ EFI_STATUS /// This protocol provides support for a single class of credentials /// struct _EFI_USER_CREDENTIAL_PROTOCOL { - EFI_GUID Identifier; ///< Uniquely identifies this credential provider. - EFI_GUID Type; ///< Identifies this class of User Credential Provider. - EFI_CREDENTIAL_ENROLL Enroll; - EFI_CREDENTIAL_FORM Form; - EFI_CREDENTIAL_TILE Tile; - EFI_CREDENTIAL_TITLE Title; - EFI_CREDENTIAL_USER User; - EFI_CREDENTIAL_SELECT Select; - EFI_CREDENTIAL_DESELECT Deselect; - EFI_CREDENTIAL_DEFAULT Default; - EFI_CREDENTIAL_GET_INFO GetInfo; - EFI_CREDENTIAL_GET_NEXT_INFO GetNextInfo; - EFI_CREDENTIAL_CAPABILITIES Capabilities; + EFI_GUID Identifier; ///< Uniquely identifies this credential provider. + EFI_GUID Type; ///< Identifies this class of User Credential Provider. + EFI_CREDENTIAL_ENROLL Enroll; + EFI_CREDENTIAL_FORM Form; + EFI_CREDENTIAL_TILE Tile; + EFI_CREDENTIAL_TITLE Title; + EFI_CREDENTIAL_USER User; + EFI_CREDENTIAL_SELECT Select; + EFI_CREDENTIAL_DESELECT Deselect; + EFI_CREDENTIAL_DEFAULT Default; + EFI_CREDENTIAL_GET_INFO GetInfo; + EFI_CREDENTIAL_GET_NEXT_INFO GetNextInfo; + EFI_CREDENTIAL_CAPABILITIES Capabilities; }; -extern EFI_GUID gEfiUserCredentialProtocolGuid; +extern EFI_GUID gEfiUserCredentialProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/UserCredential2.h b/MdePkg/Include/Protocol/UserCredential2.h index f507b74d1f..fc64ba544a 100644 --- a/MdePkg/Include/Protocol/UserCredential2.h +++ b/MdePkg/Include/Protocol/UserCredential2.h @@ -18,7 +18,7 @@ 0xe98adb03, 0xb8b9, 0x4af8, { 0xba, 0x20, 0x26, 0xe9, 0x11, 0x4c, 0xbc, 0xe5 } \ } -typedef struct _EFI_USER_CREDENTIAL2_PROTOCOL EFI_USER_CREDENTIAL2_PROTOCOL; +typedef struct _EFI_USER_CREDENTIAL2_PROTOCOL EFI_USER_CREDENTIAL2_PROTOCOL; /** Enroll a user on a credential provider. @@ -279,30 +279,30 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_CREDENTIAL2_DELETE)( - IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This, - IN EFI_USER_PROFILE_HANDLE User -); + IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This, + IN EFI_USER_PROFILE_HANDLE User + ); /// /// This protocol provides support for a single class of credentials /// struct _EFI_USER_CREDENTIAL2_PROTOCOL { - EFI_GUID Identifier; ///< Uniquely identifies this credential provider. - EFI_GUID Type; ///< Identifies this class of User Credential Provider. - EFI_CREDENTIAL2_ENROLL Enroll; - EFI_CREDENTIAL2_FORM Form; - EFI_CREDENTIAL2_TILE Tile; - EFI_CREDENTIAL2_TITLE Title; - EFI_CREDENTIAL2_USER User; - EFI_CREDENTIAL2_SELECT Select; - EFI_CREDENTIAL2_DESELECT Deselect; - EFI_CREDENTIAL2_DEFAULT Default; - EFI_CREDENTIAL2_GET_INFO GetInfo; - EFI_CREDENTIAL2_GET_NEXT_INFO GetNextInfo; - EFI_CREDENTIAL_CAPABILITIES Capabilities; - EFI_CREDENTIAL2_DELETE Delete; + EFI_GUID Identifier; ///< Uniquely identifies this credential provider. + EFI_GUID Type; ///< Identifies this class of User Credential Provider. + EFI_CREDENTIAL2_ENROLL Enroll; + EFI_CREDENTIAL2_FORM Form; + EFI_CREDENTIAL2_TILE Tile; + EFI_CREDENTIAL2_TITLE Title; + EFI_CREDENTIAL2_USER User; + EFI_CREDENTIAL2_SELECT Select; + EFI_CREDENTIAL2_DESELECT Deselect; + EFI_CREDENTIAL2_DEFAULT Default; + EFI_CREDENTIAL2_GET_INFO GetInfo; + EFI_CREDENTIAL2_GET_NEXT_INFO GetNextInfo; + EFI_CREDENTIAL_CAPABILITIES Capabilities; + EFI_CREDENTIAL2_DELETE Delete; }; -extern EFI_GUID gEfiUserCredential2ProtocolGuid; +extern EFI_GUID gEfiUserCredential2ProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/UserManager.h b/MdePkg/Include/Protocol/UserManager.h index 26ac4955f1..62b0d1a2a8 100644 --- a/MdePkg/Include/Protocol/UserManager.h +++ b/MdePkg/Include/Protocol/UserManager.h @@ -24,23 +24,23 @@ 0xbaf1e6de, 0x209e, 0x4adb, { 0x8d, 0x96, 0xfd, 0x8b, 0x71, 0xf3, 0xf6, 0x83 } \ } -typedef VOID *EFI_USER_PROFILE_HANDLE; -typedef VOID *EFI_USER_INFO_HANDLE; +typedef VOID *EFI_USER_PROFILE_HANDLE; +typedef VOID *EFI_USER_INFO_HANDLE; /// /// The attributes of the user profile information. /// typedef UINT16 EFI_USER_INFO_ATTRIBS; -#define EFI_USER_INFO_STORAGE 0x000F -#define EFI_USER_INFO_STORAGE_VOLATILE 0x0000 -#define EFI_USER_INFO_STORAGE_CREDENTIAL_NV 0x0001 -#define EFI_USER_INFO_STORAGE_PLATFORM_NV 0x0002 +#define EFI_USER_INFO_STORAGE 0x000F +#define EFI_USER_INFO_STORAGE_VOLATILE 0x0000 +#define EFI_USER_INFO_STORAGE_CREDENTIAL_NV 0x0001 +#define EFI_USER_INFO_STORAGE_PLATFORM_NV 0x0002 -#define EFI_USER_INFO_ACCESS 0x0070 -#define EFI_USER_INFO_PUBLIC 0x0010 -#define EFI_USER_INFO_PRIVATE 0x0020 -#define EFI_USER_INFO_PROTECTED 0x0030 -#define EFI_USER_INFO_EXCLUSIVE 0x0080 +#define EFI_USER_INFO_ACCESS 0x0070 +#define EFI_USER_INFO_PUBLIC 0x0010 +#define EFI_USER_INFO_PRIVATE 0x0020 +#define EFI_USER_INFO_PROTECTED 0x0030 +#define EFI_USER_INFO_EXCLUSIVE 0x0080 /// /// User information structure @@ -50,23 +50,23 @@ typedef struct { /// The user credential identifier associated with this user information or else Nil if the /// information is not associated with any specific credential. /// - EFI_GUID Credential; + EFI_GUID Credential; /// /// The type of user information. /// - UINT8 InfoType; + UINT8 InfoType; /// /// Must be set to 0. /// - UINT8 Reserved1; + UINT8 Reserved1; /// /// The attributes of the user profile information. /// - EFI_USER_INFO_ATTRIBS InfoAttribs; + EFI_USER_INFO_ATTRIBS InfoAttribs; /// /// The size of the user information, in bytes, including this header. /// - UINT32 InfoSize; + UINT32 InfoSize; } EFI_USER_INFO; /// @@ -85,15 +85,15 @@ typedef struct { #define EFI_USER_CREDENTIAL_CLASS_SECURE_CARD \ { 0x8a6b4a83, 0x42fe, 0x45d2, { 0xa2, 0xef, 0x46, 0xf0, 0x6c, 0x7d, 0x98, 0x52 } } -typedef UINT64 EFI_CREDENTIAL_CAPABILITIES; +typedef UINT64 EFI_CREDENTIAL_CAPABILITIES; #define EFI_CREDENTIAL_CAPABILITIES_ENROLL 0x0000000000000001 /// /// Credential logon flags /// typedef UINT32 EFI_CREDENTIAL_LOGON_FLAGS; -#define EFI_CREDENTIAL_LOGON_FLAG_AUTO 0x00000001 -#define EFI_CREDENTIAL_LOGON_FLAG_DEFAULT 0x00000002 +#define EFI_CREDENTIAL_LOGON_FLAG_AUTO 0x00000001 +#define EFI_CREDENTIAL_LOGON_FLAG_DEFAULT 0x00000002 /// /// User information record types @@ -102,81 +102,81 @@ typedef UINT32 EFI_CREDENTIAL_LOGON_FLAGS; /// /// No information. /// -#define EFI_USER_INFO_EMPTY_RECORD 0x00 +#define EFI_USER_INFO_EMPTY_RECORD 0x00 /// /// Provide the user's name for the enrolled user. /// -#define EFI_USER_INFO_NAME_RECORD 0x01 +#define EFI_USER_INFO_NAME_RECORD 0x01 typedef CHAR16 *EFI_USER_INFO_NAME; /// /// Provides the date and time when the user profile was created. /// -#define EFI_USER_INFO_CREATE_DATE_RECORD 0x02 +#define EFI_USER_INFO_CREATE_DATE_RECORD 0x02 typedef EFI_TIME EFI_USER_INFO_CREATE_DATE; /// /// Provides the date and time when the user profile was selected. /// -#define EFI_USER_INFO_USAGE_DATE_RECORD 0x03 +#define EFI_USER_INFO_USAGE_DATE_RECORD 0x03 typedef EFI_TIME EFI_USER_INFO_USAGE_DATE; /// /// Provides the number of times that the user profile has been selected. /// -#define EFI_USER_INFO_USAGE_COUNT_RECORD 0x04 +#define EFI_USER_INFO_USAGE_COUNT_RECORD 0x04 typedef UINT64 EFI_USER_INFO_USAGE_COUNT; /// /// Provides a unique non-volatile user identifier for each enrolled user. /// -#define EFI_USER_INFO_IDENTIFIER_RECORD 0x05 +#define EFI_USER_INFO_IDENTIFIER_RECORD 0x05 typedef UINT8 EFI_USER_INFO_IDENTIFIER[16]; /// /// Specifies the type of a particular credential associated with the user profile. /// -#define EFI_USER_INFO_CREDENTIAL_TYPE_RECORD 0x06 +#define EFI_USER_INFO_CREDENTIAL_TYPE_RECORD 0x06 typedef EFI_GUID EFI_USER_INFO_CREDENTIAL_TYPE; /// /// Specifies the user-readable name of a particular credential type. /// -#define EFI_USER_INFO_CREDENTIAL_TYPE_NAME_RECORD 0x07 +#define EFI_USER_INFO_CREDENTIAL_TYPE_NAME_RECORD 0x07 typedef CHAR16 *EFI_USER_INFO_CREDENTIAL_TYPE_NAME; /// /// Specifies the credential provider. /// -#define EFI_USER_INFO_CREDENTIAL_PROVIDER_RECORD 0x08 +#define EFI_USER_INFO_CREDENTIAL_PROVIDER_RECORD 0x08 typedef EFI_GUID EFI_USER_INFO_CREDENTIAL_PROVIDER; /// /// Specifies the user-readable name of a particular credential's provider. /// -#define EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD 0x09 +#define EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD 0x09 typedef CHAR16 *EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME; /// /// Provides PKCS#11 credential information from a smart card. /// -#define EFI_USER_INFO_PKCS11_RECORD 0x0A +#define EFI_USER_INFO_PKCS11_RECORD 0x0A /// /// Provides standard biometric information in the format specified by the ISO 19785 (Common /// Biometric Exchange Formats Framework) specification. /// -#define EFI_USER_INFO_CBEFF_RECORD 0x0B +#define EFI_USER_INFO_CBEFF_RECORD 0x0B typedef VOID *EFI_USER_INFO_CBEFF; /// /// Indicates how close of a match the fingerprint must be in order to be considered a match. /// -#define EFI_USER_INFO_FAR_RECORD 0x0C +#define EFI_USER_INFO_FAR_RECORD 0x0C typedef UINT8 EFI_USER_INFO_FAR; /// /// Indicates how many attempts the user has to with a particular credential before the system prevents /// further attempts. /// -#define EFI_USER_INFO_RETRY_RECORD 0x0D +#define EFI_USER_INFO_RETRY_RECORD 0x0D typedef UINT8 EFI_USER_INFO_RETRY; /// /// Provides the user's pre-OS access rights. /// -#define EFI_USER_INFO_ACCESS_POLICY_RECORD 0x0E +#define EFI_USER_INFO_ACCESS_POLICY_RECORD 0x0E typedef struct { - UINT32 Type; ///< Specifies the type of user access control. - UINT32 Size; ///< Specifies the size of the user access control record, in bytes, including this header. + UINT32 Type; ///< Specifies the type of user access control. + UINT32 Size; ///< Specifies the size of the user access control record, in bytes, including this header. } EFI_USER_INFO_ACCESS_CONTROL; typedef EFI_USER_INFO_ACCESS_CONTROL EFI_USER_INFO_ACCESS_POLICY; @@ -189,7 +189,7 @@ typedef EFI_USER_INFO_ACCESS_CONTROL EFI_USER_INFO_ACCESS_POLICY; /// Forbids the user from booting or loading executables from the specified device path or any child /// device paths. /// -#define EFI_USER_INFO_ACCESS_FORBID_LOAD 0x00000001 +#define EFI_USER_INFO_ACCESS_FORBID_LOAD 0x00000001 /// /// Permits the user from booting or loading executables from the specified device path or any child /// device paths. @@ -197,23 +197,23 @@ typedef EFI_USER_INFO_ACCESS_CONTROL EFI_USER_INFO_ACCESS_POLICY; /// The definition EFI_USER_INFO_ACCESS_PERMIT_BOOT in the specification should be typo and wait for /// spec update. /// -#define EFI_USER_INFO_ACCESS_PERMIT_LOAD 0x00000002 +#define EFI_USER_INFO_ACCESS_PERMIT_LOAD 0x00000002 /// /// Presence of this record indicates that a user can update enrollment information. /// -#define EFI_USER_INFO_ACCESS_ENROLL_SELF 0x00000003 +#define EFI_USER_INFO_ACCESS_ENROLL_SELF 0x00000003 /// /// Presence of this record indicates that a user can enroll new users. /// -#define EFI_USER_INFO_ACCESS_ENROLL_OTHERS 0x00000004 +#define EFI_USER_INFO_ACCESS_ENROLL_OTHERS 0x00000004 /// /// Presence of this record indicates that a user can update the user information of any user. /// -#define EFI_USER_INFO_ACCESS_MANAGE 0x00000005 +#define EFI_USER_INFO_ACCESS_MANAGE 0x00000005 /// /// Describes permissions usable when configuring the platform. /// -#define EFI_USER_INFO_ACCESS_SETUP 0x00000006 +#define EFI_USER_INFO_ACCESS_SETUP 0x00000006 /// /// Standard GUIDs for access to configure the platform. /// @@ -227,61 +227,61 @@ typedef EFI_USER_INFO_ACCESS_CONTROL EFI_USER_INFO_ACCESS_POLICY; /// /// Forbids UEFI drivers from being started from the specified device path(s) or any child device paths. /// -#define EFI_USER_INFO_ACCESS_FORBID_CONNECT 0x00000007 +#define EFI_USER_INFO_ACCESS_FORBID_CONNECT 0x00000007 /// /// Permits UEFI drivers to be started on the specified device path(s) or any child device paths. /// -#define EFI_USER_INFO_ACCESS_PERMIT_CONNECT 0x00000008 +#define EFI_USER_INFO_ACCESS_PERMIT_CONNECT 0x00000008 /// /// Modifies the boot order. /// -#define EFI_USER_INFO_ACCESS_BOOT_ORDER 0x00000009 +#define EFI_USER_INFO_ACCESS_BOOT_ORDER 0x00000009 typedef UINT32 EFI_USER_INFO_ACCESS_BOOT_ORDER_HDR; -#define EFI_USER_INFO_ACCESS_BOOT_ORDER_MASK 0x0000000F +#define EFI_USER_INFO_ACCESS_BOOT_ORDER_MASK 0x0000000F /// /// Insert new boot options at the beginning of the boot order. /// -#define EFI_USER_INFO_ACCESS_BOOT_ORDER_INSERT 0x00000000 +#define EFI_USER_INFO_ACCESS_BOOT_ORDER_INSERT 0x00000000 /// /// Append new boot options to the end of the boot order. /// -#define EFI_USER_INFO_ACCESS_BOOT_ORDER_APPEND 0x00000001 +#define EFI_USER_INFO_ACCESS_BOOT_ORDER_APPEND 0x00000001 /// /// Replace the entire boot order. /// -#define EFI_USER_INFO_ACCESS_BOOT_ORDER_REPLACE 0x00000002 +#define EFI_USER_INFO_ACCESS_BOOT_ORDER_REPLACE 0x00000002 /// /// The Boot Manager will not attempt find a default boot device /// when the default boot order is does not lead to a bootable device. /// -#define EFI_USER_INFO_ACCESS_BOOT_ORDER_NODEFAULT 0x00000010 +#define EFI_USER_INFO_ACCESS_BOOT_ORDER_NODEFAULT 0x00000010 /// /// Provides the expression which determines which credentials are required to assert user identity. /// -#define EFI_USER_INFO_IDENTITY_POLICY_RECORD 0x0F +#define EFI_USER_INFO_IDENTITY_POLICY_RECORD 0x0F typedef struct { - UINT32 Type; ///< Specifies either an operator or a data item. - UINT32 Length; ///< The length of this block, in bytes, including this header. + UINT32 Type; ///< Specifies either an operator or a data item. + UINT32 Length; ///< The length of this block, in bytes, including this header. } EFI_USER_INFO_IDENTITY_POLICY; /// /// User identity policy expression operators. /// -#define EFI_USER_INFO_IDENTITY_FALSE 0x00 -#define EFI_USER_INFO_IDENTITY_TRUE 0x01 -#define EFI_USER_INFO_IDENTITY_CREDENTIAL_TYPE 0x02 -#define EFI_USER_INFO_IDENTITY_CREDENTIAL_PROVIDER 0x03 -#define EFI_USER_INFO_IDENTITY_NOT 0x10 -#define EFI_USER_INFO_IDENTITY_AND 0x11 -#define EFI_USER_INFO_IDENTITY_OR 0x12 +#define EFI_USER_INFO_IDENTITY_FALSE 0x00 +#define EFI_USER_INFO_IDENTITY_TRUE 0x01 +#define EFI_USER_INFO_IDENTITY_CREDENTIAL_TYPE 0x02 +#define EFI_USER_INFO_IDENTITY_CREDENTIAL_PROVIDER 0x03 +#define EFI_USER_INFO_IDENTITY_NOT 0x10 +#define EFI_USER_INFO_IDENTITY_AND 0x11 +#define EFI_USER_INFO_IDENTITY_OR 0x12 /// /// Provides placeholder for additional user profile information identified by a GUID. /// -#define EFI_USER_INFO_GUID_RECORD 0xFF +#define EFI_USER_INFO_GUID_RECORD 0xFF typedef EFI_GUID EFI_USER_INFO_GUID; /// @@ -289,10 +289,10 @@ typedef EFI_GUID EFI_USER_INFO_GUID; /// A collection of EFI_USER_INFO records, prefixed with this header. /// typedef struct { - UINT64 Size; ///< Total size of the user information table, in bytes. + UINT64 Size; ///< Total size of the user information table, in bytes. } EFI_USER_INFO_TABLE; -typedef struct _EFI_USER_MANAGER_PROTOCOL EFI_USER_MANAGER_PROTOCOL; +typedef struct _EFI_USER_MANAGER_PROTOCOL EFI_USER_MANAGER_PROTOCOL; /** Create a new user profile. @@ -590,29 +590,29 @@ EFI_STATUS /// This protocol provides the services used to manage user profiles. /// struct _EFI_USER_MANAGER_PROTOCOL { - EFI_USER_PROFILE_CREATE Create; - EFI_USER_PROFILE_DELETE Delete; - EFI_USER_PROFILE_GET_NEXT GetNext; - EFI_USER_PROFILE_CURRENT Current; - EFI_USER_PROFILE_IDENTIFY Identify; - EFI_USER_PROFILE_FIND Find; - EFI_USER_PROFILE_NOTIFY Notify; - EFI_USER_PROFILE_GET_INFO GetInfo; - EFI_USER_PROFILE_SET_INFO SetInfo; - EFI_USER_PROFILE_DELETE_INFO DeleteInfo; - EFI_USER_PROFILE_GET_NEXT_INFO GetNextInfo; + EFI_USER_PROFILE_CREATE Create; + EFI_USER_PROFILE_DELETE Delete; + EFI_USER_PROFILE_GET_NEXT GetNext; + EFI_USER_PROFILE_CURRENT Current; + EFI_USER_PROFILE_IDENTIFY Identify; + EFI_USER_PROFILE_FIND Find; + EFI_USER_PROFILE_NOTIFY Notify; + EFI_USER_PROFILE_GET_INFO GetInfo; + EFI_USER_PROFILE_SET_INFO SetInfo; + EFI_USER_PROFILE_DELETE_INFO DeleteInfo; + EFI_USER_PROFILE_GET_NEXT_INFO GetNextInfo; }; -extern EFI_GUID gEfiUserManagerProtocolGuid; -extern EFI_GUID gEfiEventUserProfileChangedGuid; -extern EFI_GUID gEfiUserCredentialClassUnknownGuid; -extern EFI_GUID gEfiUserCredentialClassPasswordGuid; -extern EFI_GUID gEfiUserCredentialClassSmartCardGuid; -extern EFI_GUID gEfiUserCredentialClassFingerprintGuid; -extern EFI_GUID gEfiUserCredentialClassHandprintGuid; -extern EFI_GUID gEfiUserCredentialClassSecureCardGuid; -extern EFI_GUID gEfiUserInfoAccessSetupAdminGuid; -extern EFI_GUID gEfiUserInfoAccessSetupNormalGuid; -extern EFI_GUID gEfiUserInfoAccessSetupRestrictedGuid; +extern EFI_GUID gEfiUserManagerProtocolGuid; +extern EFI_GUID gEfiEventUserProfileChangedGuid; +extern EFI_GUID gEfiUserCredentialClassUnknownGuid; +extern EFI_GUID gEfiUserCredentialClassPasswordGuid; +extern EFI_GUID gEfiUserCredentialClassSmartCardGuid; +extern EFI_GUID gEfiUserCredentialClassFingerprintGuid; +extern EFI_GUID gEfiUserCredentialClassHandprintGuid; +extern EFI_GUID gEfiUserCredentialClassSecureCardGuid; +extern EFI_GUID gEfiUserInfoAccessSetupAdminGuid; +extern EFI_GUID gEfiUserInfoAccessSetupNormalGuid; +extern EFI_GUID gEfiUserInfoAccessSetupRestrictedGuid; #endif diff --git a/MdePkg/Include/Protocol/Variable.h b/MdePkg/Include/Protocol/Variable.h index 7be33ff7a8..3382eb1587 100644 --- a/MdePkg/Include/Protocol/Variable.h +++ b/MdePkg/Include/Protocol/Variable.h @@ -34,6 +34,6 @@ #define EFI_VARIABLE_ARCH_PROTOCOL_GUID \ { 0x1e5668e2, 0x8481, 0x11d4, {0xbc, 0xf1, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } } -extern EFI_GUID gEfiVariableArchProtocolGuid; +extern EFI_GUID gEfiVariableArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/VariableWrite.h b/MdePkg/Include/Protocol/VariableWrite.h index 850e29640e..db5e392b05 100644 --- a/MdePkg/Include/Protocol/VariableWrite.h +++ b/MdePkg/Include/Protocol/VariableWrite.h @@ -34,6 +34,6 @@ #define EFI_VARIABLE_WRITE_ARCH_PROTOCOL_GUID \ { 0x6441f818, 0x6362, 0x4e44, {0xb5, 0x70, 0x7d, 0xba, 0x31, 0xdd, 0x24, 0x53 } } -extern EFI_GUID gEfiVariableWriteArchProtocolGuid; +extern EFI_GUID gEfiVariableWriteArchProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/VlanConfig.h b/MdePkg/Include/Protocol/VlanConfig.h index f1b6d21ddb..a22a559cd1 100644 --- a/MdePkg/Include/Protocol/VlanConfig.h +++ b/MdePkg/Include/Protocol/VlanConfig.h @@ -12,7 +12,6 @@ #ifndef __EFI_VLANCONFIG_PROTOCOL_H__ #define __EFI_VLANCONFIG_PROTOCOL_H__ - #define EFI_VLAN_CONFIG_PROTOCOL_GUID \ { \ 0x9e23d768, 0xd2f3, 0x4366, {0x9f, 0xc3, 0x3a, 0x7a, 0xba, 0x86, 0x43, 0x74 } \ @@ -20,16 +19,14 @@ typedef struct _EFI_VLAN_CONFIG_PROTOCOL EFI_VLAN_CONFIG_PROTOCOL; - /// /// EFI_VLAN_FIND_DATA /// typedef struct { - UINT16 VlanId; ///< Vlan Identifier. - UINT8 Priority; ///< Priority of this VLAN. + UINT16 VlanId; ///< Vlan Identifier. + UINT8 Priority; ///< Priority of this VLAN. } EFI_VLAN_FIND_DATA; - /** Create a VLAN device or modify the configuration parameter of an already-configured VLAN. @@ -127,11 +124,11 @@ EFI_STATUS /// VLAN tagging implementation is IEEE802.1Q. /// struct _EFI_VLAN_CONFIG_PROTOCOL { - EFI_VLAN_CONFIG_SET Set; - EFI_VLAN_CONFIG_FIND Find; - EFI_VLAN_CONFIG_REMOVE Remove; + EFI_VLAN_CONFIG_SET Set; + EFI_VLAN_CONFIG_FIND Find; + EFI_VLAN_CONFIG_REMOVE Remove; }; -extern EFI_GUID gEfiVlanConfigProtocolGuid; +extern EFI_GUID gEfiVlanConfigProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/WatchdogTimer.h b/MdePkg/Include/Protocol/WatchdogTimer.h index d2dee483e8..f0cf5961b5 100644 --- a/MdePkg/Include/Protocol/WatchdogTimer.h +++ b/MdePkg/Include/Protocol/WatchdogTimer.h @@ -19,7 +19,7 @@ /// /// Declare forward reference for the Timer Architectural Protocol /// -typedef struct _EFI_WATCHDOG_TIMER_ARCH_PROTOCOL EFI_WATCHDOG_TIMER_ARCH_PROTOCOL; +typedef struct _EFI_WATCHDOG_TIMER_ARCH_PROTOCOL EFI_WATCHDOG_TIMER_ARCH_PROTOCOL; /** A function of this type is called when the watchdog timer fires if a @@ -114,7 +114,6 @@ EFI_STATUS OUT UINT64 *TimerPeriod ); - /// /// This protocol provides the services required to implement the Boot Service /// SetWatchdogTimer(). It provides a service to set the amount of time to wait @@ -127,12 +126,11 @@ EFI_STATUS /// reset by calling the Runtime Service ResetSystem(). /// struct _EFI_WATCHDOG_TIMER_ARCH_PROTOCOL { - EFI_WATCHDOG_TIMER_REGISTER_HANDLER RegisterHandler; - EFI_WATCHDOG_TIMER_SET_TIMER_PERIOD SetTimerPeriod; - EFI_WATCHDOG_TIMER_GET_TIMER_PERIOD GetTimerPeriod; + EFI_WATCHDOG_TIMER_REGISTER_HANDLER RegisterHandler; + EFI_WATCHDOG_TIMER_SET_TIMER_PERIOD SetTimerPeriod; + EFI_WATCHDOG_TIMER_GET_TIMER_PERIOD GetTimerPeriod; }; -extern EFI_GUID gEfiWatchdogTimerArchProtocolGuid; +extern EFI_GUID gEfiWatchdogTimerArchProtocolGuid; #endif - diff --git a/MdePkg/Include/Protocol/WiFi.h b/MdePkg/Include/Protocol/WiFi.h index e82607caa4..daca023d58 100644 --- a/MdePkg/Include/Protocol/WiFi.h +++ b/MdePkg/Include/Protocol/WiFi.h @@ -138,11 +138,11 @@ typedef struct { /// /// A unique element ID defined in IEEE 802.11 specification. /// - UINT8 ElementID; + UINT8 ElementID; /// /// Specifies the number of octets in the element body. /// - UINT8 Length; + UINT8 Length; } EFI_80211_ELEMENT_HEADER; /// @@ -152,12 +152,12 @@ typedef struct { /// /// Common header of an element. /// - EFI_80211_ELEMENT_HEADER Hdr; + EFI_80211_ELEMENT_HEADER Hdr; /// /// Start of elements that are requested to be included in the Probe Response frame. /// The elements are listed in order of increasing element ID. /// - UINT8 RequestIDs[1]; + UINT8 RequestIDs[1]; } EFI_80211_ELEMENT_REQ; /// @@ -167,11 +167,11 @@ typedef struct { /// /// Common header of an element. /// - EFI_80211_ELEMENT_HEADER Hdr; + EFI_80211_ELEMENT_HEADER Hdr; /// /// Service set identifier. If Hdr.Length is zero, this field is ignored. /// - UINT8 SSId[32]; + UINT8 SSId[32]; } EFI_80211_ELEMENT_SSID; /// @@ -182,63 +182,63 @@ typedef struct { /// Determines whether infrastructure BSS, IBSS, MBSS, or all, are included in the /// scan. /// - EFI_80211_BSS_TYPE BSSType; + EFI_80211_BSS_TYPE BSSType; /// /// Indicates a specific or wildcard BSSID. Use all binary 1s to represent all SSIDs. /// - EFI_80211_MAC_ADDRESS BSSId; + EFI_80211_MAC_ADDRESS BSSId; /// /// Length in bytes of the SSId. If zero, ignore SSId field. /// - UINT8 SSIdLen; + UINT8 SSIdLen; /// /// Specifies the desired SSID or the wildcard SSID. Use NULL to represent all SSIDs. /// - UINT8 *SSId; + UINT8 *SSId; /// /// Indicates passive scanning if TRUE. /// - BOOLEAN PassiveMode; + BOOLEAN PassiveMode; /// /// The delay in microseconds to be used prior to transmitting a Probe frame during /// active scanning. If zero, the value can be overridden by an /// implementation-dependent default value. /// - UINT32 ProbeDelay; + UINT32 ProbeDelay; /// /// Specifies a list of channels that are examined when scanning for a BSS. If set to /// NULL, all valid channels will be scanned. /// - UINT32 *ChannelList; + UINT32 *ChannelList; /// /// Indicates the minimum time in TU to spend on each channel when scanning. If zero, /// the value can be overridden by an implementation-dependent default value. /// - UINT32 MinChannelTime; + UINT32 MinChannelTime; /// /// Indicates the maximum time in TU to spend on each channel when scanning. If zero, /// the value can be overridden by an implementation-dependent default value. /// - UINT32 MaxChannelTime; + UINT32 MaxChannelTime; /// /// Points to an optionally present element. This is an optional parameter and may be /// NULL. /// - EFI_80211_ELEMENT_REQ *RequestInformation; + EFI_80211_ELEMENT_REQ *RequestInformation; /// /// Indicates one or more SSID elements that are optionally present. This is an /// optional parameter and may be NULL. /// - EFI_80211_ELEMENT_SSID *SSIDList; + EFI_80211_ELEMENT_SSID *SSIDList; /// /// Specifies a desired specific access network type or the wildcard access network /// type. Use 15 as wildcard access network type. /// - EFI_80211_ACC_NET_TYPE AccessNetworkType; + EFI_80211_ACC_NET_TYPE AccessNetworkType; /// /// Specifies zero or more elements. This is an optional parameter and may be NULL. /// - UINT8 *VendorSpecificInfo; + UINT8 *VendorSpecificInfo; } EFI_80211_SCAN_DATA; /// @@ -249,15 +249,15 @@ typedef struct { /// Indicates the lowest channel number in the subband. It has a positive integer /// value less than 201. /// - UINT8 FirstChannelNum; + UINT8 FirstChannelNum; /// /// Indicates the number of channels in the subband. /// - UINT8 NumOfChannels; + UINT8 NumOfChannels; /// /// Indicates the maximum power in dBm allowed to be transmitted. /// - UINT8 MaxTxPowerLevel; + UINT8 MaxTxPowerLevel; } EFI_80211_COUNTRY_TRIPLET_SUBBAND; /// @@ -268,16 +268,16 @@ typedef struct { /// Indicates the operating extension identifier. It has a positive integer value of /// 201 or greater. /// - UINT8 OperatingExtId; + UINT8 OperatingExtId; /// /// Index into a set of values for radio equipment set of rules. /// - UINT8 OperatingClass; + UINT8 OperatingClass; /// /// Specifies aAirPropagationTime characteristics used in BSS operation. Refer the /// definition of aAirPropagationTime in IEEE 802.11 specification. /// - UINT8 CoverageClass; + UINT8 CoverageClass; } EFI_80211_COUNTRY_TRIPLET_OPERATE; /// @@ -287,11 +287,11 @@ typedef union { /// /// The subband triplet. /// - EFI_80211_COUNTRY_TRIPLET_SUBBAND Subband; + EFI_80211_COUNTRY_TRIPLET_SUBBAND Subband; /// /// The operating triplet. /// - EFI_80211_COUNTRY_TRIPLET_OPERATE Operating; + EFI_80211_COUNTRY_TRIPLET_OPERATE Operating; } EFI_80211_COUNTRY_TRIPLET; /// @@ -301,16 +301,16 @@ typedef struct { /// /// Common header of an element. /// - EFI_80211_ELEMENT_HEADER Hdr; + EFI_80211_ELEMENT_HEADER Hdr; /// /// Specifies country strings in 3 octets. /// - UINT8 CountryStr[3]; + UINT8 CountryStr[3]; /// /// Indicates a triplet that repeated in country element. The number of triplets is /// determined by the Hdr.Length field. /// - EFI_80211_COUNTRY_TRIPLET CountryTriplet[1]; + EFI_80211_COUNTRY_TRIPLET CountryTriplet[1]; } EFI_80211_ELEMENT_COUNTRY; /// @@ -321,47 +321,47 @@ typedef struct { /// Indicates the version number of the RSNA protocol. Value 1 is defined in current /// IEEE 802.11 specification. /// - UINT16 Version; + UINT16 Version; /// /// Specifies the cipher suite selector used by the BSS to protect group address frames. /// - UINT32 GroupDataCipherSuite; + UINT32 GroupDataCipherSuite; /// /// Indicates the number of pairwise cipher suite selectors that are contained in /// PairwiseCipherSuiteList. /// -//UINT16 PairwiseCipherSuiteCount; + // UINT16 PairwiseCipherSuiteCount; /// /// Contains a series of cipher suite selectors that indicate the pairwise cipher /// suites contained in this element. /// -//UINT32 PairwiseCipherSuiteList[PairwiseCipherSuiteCount]; + // UINT32 PairwiseCipherSuiteList[PairwiseCipherSuiteCount]; /// /// Indicates the number of AKM suite selectors that are contained in AKMSuiteList. /// -//UINT16 AKMSuiteCount; + // UINT16 AKMSuiteCount; /// /// Contains a series of AKM suite selectors that indicate the AKM suites contained in /// this element. /// -//UINT32 AKMSuiteList[AKMSuiteCount]; + // UINT32 AKMSuiteList[AKMSuiteCount]; /// /// Indicates requested or advertised capabilities. /// -//UINT16 RSNCapabilities; + // UINT16 RSNCapabilities; /// /// Indicates the number of PKMIDs in the PMKIDList. /// -//UINT16 PMKIDCount; + // UINT16 PMKIDCount; /// /// Contains zero or more PKMIDs that the STA believes to be valid for the destination /// AP. -//UINT8 PMKIDList[PMKIDCount][16]; + // UINT8 PMKIDList[PMKIDCount][16]; /// /// Specifies the cipher suite selector used by the BSS to protect group addressed /// robust management frames. /// -//UINT32 GroupManagementCipherSuite; + // UINT32 GroupManagementCipherSuite; } EFI_80211_ELEMENT_DATA_RSN; /// @@ -371,11 +371,11 @@ typedef struct { /// /// Common header of an element. /// - EFI_80211_ELEMENT_HEADER Hdr; + EFI_80211_ELEMENT_HEADER Hdr; /// /// Points to RSN element. The size of a RSN element is limited to 255 octets. /// - EFI_80211_ELEMENT_DATA_RSN *Data; + EFI_80211_ELEMENT_DATA_RSN *Data; } EFI_80211_ELEMENT_RSN; /// @@ -385,13 +385,13 @@ typedef struct { /// /// Common header of an element. /// - EFI_80211_ELEMENT_HEADER Hdr; + EFI_80211_ELEMENT_HEADER Hdr; /// /// Indicates the capabilities being advertised by the STA transmitting the element. /// This is a bit field with variable length. Refer to IEEE 802.11 specification for /// bit value. /// - UINT8 Capabilities[1]; + UINT8 Capabilities[1]; } EFI_80211_ELEMENT_EXT_CAP; /// @@ -401,77 +401,77 @@ typedef struct { /// /// Indicates a specific BSSID of the found BSS. /// - EFI_80211_MAC_ADDRESS BSSId; + EFI_80211_MAC_ADDRESS BSSId; /// /// Specifies the SSID of the found BSS. If NULL, ignore SSIdLen field. /// - UINT8 *SSId; + UINT8 *SSId; /// /// Specifies the SSID of the found BSS. If NULL, ignore SSIdLen field. /// - UINT8 SSIdLen; + UINT8 SSIdLen; /// /// Specifies the type of the found BSS. /// - EFI_80211_BSS_TYPE BSSType; + EFI_80211_BSS_TYPE BSSType; /// /// The beacon period in TU of the found BSS. /// - UINT16 BeaconPeriod; + UINT16 BeaconPeriod; /// /// The timestamp of the received frame from the found BSS. /// - UINT64 Timestamp; + UINT64 Timestamp; /// /// The advertised capabilities of the BSS. /// - UINT16 CapabilityInfo; + UINT16 CapabilityInfo; /// /// The set of data rates that shall be supported by all STAs that desire to join this /// BSS. /// - UINT8 *BSSBasicRateSet; + UINT8 *BSSBasicRateSet; /// /// The set of data rates that the peer STA desires to use for communication within /// the BSS. /// - UINT8 *OperationalRateSet; + UINT8 *OperationalRateSet; /// /// The information required to identify the regulatory domain in which the peer STA /// is located. /// - EFI_80211_ELEMENT_COUNTRY *Country; + EFI_80211_ELEMENT_COUNTRY *Country; /// /// The cipher suites and AKM suites supported in the BSS. /// - EFI_80211_ELEMENT_RSN RSN; + EFI_80211_ELEMENT_RSN RSN; /// /// Specifies the RSSI of the received frame. /// - UINT8 RSSI; + UINT8 RSSI; /// /// Specifies the RCPI of the received frame. /// - UINT8 RCPIMeasurement; + UINT8 RCPIMeasurement; /// /// Specifies the RSNI of the received frame. /// - UINT8 RSNIMeasurement; + UINT8 RSNIMeasurement; /// /// Specifies the elements requested by the request element of the Probe Request frame. /// This is an optional parameter and may be NULL. /// - UINT8 *RequestedElements; + UINT8 *RequestedElements; /// /// Specifies the BSS membership selectors that represent the set of features that /// shall be supported by all STAs to join this BSS. /// - UINT8 *BSSMembershipSelectorSet; + UINT8 *BSSMembershipSelectorSet; /// /// Specifies the parameters within the Extended Capabilities element that are /// supported by the MAC entity. This is an optional parameter and may be NULL. /// - EFI_80211_ELEMENT_EXT_CAP *ExtCapElement; + EFI_80211_ELEMENT_EXT_CAP *ExtCapElement; } EFI_80211_BSS_DESCRIPTION; /// @@ -481,15 +481,15 @@ typedef struct { /// /// Indicates the unique identifier within the containing element or sub-element. /// - UINT8 SubElementID; + UINT8 SubElementID; /// /// Specifies the number of octets in the Data field. /// - UINT8 Length; + UINT8 Length; /// /// A variable length data buffer. /// - UINT8 Data[1]; + UINT8 Data[1]; } EFI_80211_SUBELEMENT_INFO; /// @@ -499,16 +499,16 @@ typedef struct { /// /// Common header of an element. /// - EFI_80211_ELEMENT_HEADER Hdr; + EFI_80211_ELEMENT_HEADER Hdr; /// /// Indicates the maximum number of BSSIDs in the multiple BSSID set. When Indicator /// is set to n, 2n is the maximum number. /// - UINT8 Indicator; + UINT8 Indicator; /// /// Contains zero or more sub-elements. /// - EFI_80211_SUBELEMENT_INFO SubElement[1]; + EFI_80211_SUBELEMENT_INFO SubElement[1]; } EFI_80211_MULTIPLE_BSSID; /// @@ -518,43 +518,43 @@ typedef struct { /// /// Indicates a specific BSSID of the found BSS. /// - EFI_80211_MAC_ADDRESS BSSId; + EFI_80211_MAC_ADDRESS BSSId; /// /// Specifies the type of the found BSS. /// - EFI_80211_BSS_TYPE BSSType; + EFI_80211_BSS_TYPE BSSType; /// /// One octet field to report condensed capability information. /// - UINT8 ConCapInfo; + UINT8 ConCapInfo; /// /// Two octet's field to report condensed country string. /// - UINT8 ConCountryStr[2]; + UINT8 ConCountryStr[2]; /// /// Indicates the operating class value for the operating channel. /// - UINT8 OperatingClass; + UINT8 OperatingClass; /// /// Indicates the operating channel. /// - UINT8 Channel; + UINT8 Channel; /// /// Indicates the measurement pilot interval in TU. /// - UINT8 Interval; + UINT8 Interval; /// /// Indicates that the BSS is within a multiple BSSID set. /// - EFI_80211_MULTIPLE_BSSID *MultipleBSSID; + EFI_80211_MULTIPLE_BSSID *MultipleBSSID; /// /// Specifies the RCPI of the received frame. /// - UINT8 RCPIMeasurement; + UINT8 RCPIMeasurement; /// /// Specifies the RSNI of the received frame. /// - UINT8 RSNIMeasurement; + UINT8 RSNIMeasurement; } EFI_80211_BSS_DESP_PILOT; /// @@ -565,24 +565,24 @@ typedef struct { /// The number of EFI_80211_BSS_DESCRIPTION in BSSDespSet. If zero, BSSDespSet should /// be ignored. /// - UINTN NumOfBSSDesp; + UINTN NumOfBSSDesp; /// /// Points to zero or more instances of EFI_80211_BSS_DESCRIPTION. /// - EFI_80211_BSS_DESCRIPTION **BSSDespSet; + EFI_80211_BSS_DESCRIPTION **BSSDespSet; /// /// The number of EFI_80211_BSS_DESP_PILOT in BSSDespFromPilotSet. If zero, /// BSSDespFromPilotSet should be ignored. /// - UINTN NumofBSSDespFromPilot; + UINTN NumofBSSDespFromPilot; /// /// Points to zero or more instances of EFI_80211_BSS_DESP_PILOT. /// - EFI_80211_BSS_DESP_PILOT **BSSDespFromPilotSet; + EFI_80211_BSS_DESP_PILOT **BSSDespFromPilotSet; /// /// Specifies zero or more elements. This is an optional parameter and may be NULL. /// - UINT8 *VendorSpecificInfo; + UINT8 *VendorSpecificInfo; } EFI_80211_SCAN_RESULT; /// @@ -593,7 +593,7 @@ typedef struct { /// This Event will be signaled after the Status field is updated by the EFI Wireless /// MAC Connection Protocol driver. The type of Event must be EFI_NOTIFY_SIGNAL. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Will be set to one of the following values: /// EFI_SUCCESS: Scan operation completed successfully. @@ -602,19 +602,19 @@ typedef struct { /// EFI_ACCESS_DENIED: The scan operation is not completed due to some underlying /// hardware or software state. /// EFI_NOT_READY: The scan operation is started but not yet completed. - EFI_STATUS Status; + EFI_STATUS Status; /// /// Pointer to the scan data. /// - EFI_80211_SCAN_DATA *Data; + EFI_80211_SCAN_DATA *Data; /// /// Indicates the scan state. /// - EFI_80211_SCAN_RESULT_CODE ResultCode; + EFI_80211_SCAN_RESULT_CODE ResultCode; /// /// Indicates the scan result. It is caller's responsibility to free this buffer. /// - EFI_80211_SCAN_RESULT *Result; + EFI_80211_SCAN_RESULT *Result; } EFI_80211_SCAN_DATA_TOKEN; /// @@ -624,11 +624,11 @@ typedef struct { /// /// The first channel number in a subband of supported channels. /// - UINT8 FirstChannelNumber; + UINT8 FirstChannelNumber; /// /// The number of channels in a subband of supported channels. /// - UINT8 NumberOfChannels; + UINT8 NumberOfChannels; } EFI_80211_ELEMENT_SUPP_CHANNEL_TUPLE; /// @@ -652,37 +652,37 @@ typedef struct { /// /// Specifies the address of the peer MAC entity to associate with. /// - EFI_80211_MAC_ADDRESS BSSId; + EFI_80211_MAC_ADDRESS BSSId; /// /// Specifies the requested operational capabilities to the AP in 2 octets. /// - UINT16 CapabilityInfo; + UINT16 CapabilityInfo; /// /// Specifies a time limit in TU, after which the associate procedure is terminated. /// - UINT32 FailureTimeout; + UINT32 FailureTimeout; /// /// Specifies if in power save mode, how often the STA awakes and listens for the next /// beacon frame in TU. /// - UINT32 ListenInterval; + UINT32 ListenInterval; /// /// Indicates a list of channels in which the STA is capable of operating. /// - EFI_80211_ELEMENT_SUPP_CHANNEL *Channels; + EFI_80211_ELEMENT_SUPP_CHANNEL *Channels; /// /// The cipher suites and AKM suites selected by the STA. /// - EFI_80211_ELEMENT_RSN RSN; + EFI_80211_ELEMENT_RSN RSN; /// /// Specifies the parameters within the Extended Capabilities element that are /// supported by the MAC entity. This is an optional parameter and may be NULL. /// - EFI_80211_ELEMENT_EXT_CAP *ExtCapElement; + EFI_80211_ELEMENT_EXT_CAP *ExtCapElement; /// /// Specifies zero or more elements. This is an optional parameter and may be NULL. /// - UINT8 *VendorSpecificInfo; + UINT8 *VendorSpecificInfo; } EFI_80211_ASSOCIATE_DATA; /// @@ -692,15 +692,15 @@ typedef struct { /// /// Common header of an element. /// - EFI_80211_ELEMENT_HEADER Hdr; + EFI_80211_ELEMENT_HEADER Hdr; /// /// Specifies the timeout interval type. /// - UINT8 Type; + UINT8 Type; /// /// Specifies the timeout interval value. /// - UINT32 Value; + UINT32 Value; } EFI_80211_ELEMENT_TIMEOUT_VAL; /// @@ -711,38 +711,38 @@ typedef struct { /// Specifies the address of the peer MAC entity from which the association request /// was received. /// - EFI_80211_MAC_ADDRESS BSSId; + EFI_80211_MAC_ADDRESS BSSId; /// /// Specifies the operational capabilities advertised by the AP. /// - UINT16 CapabilityInfo; + UINT16 CapabilityInfo; /// /// Specifies the association ID value assigned by the AP. /// - UINT16 AssociationID; + UINT16 AssociationID; /// /// Indicates the measured RCPI of the corresponding association request frame. It is /// an optional parameter and is set to zero if unavailable. /// - UINT8 RCPIValue; + UINT8 RCPIValue; /// /// Indicates the measured RSNI at the time the corresponding association request /// frame was received. It is an optional parameter and is set to zero if unavailable. /// - UINT8 RSNIValue; + UINT8 RSNIValue; /// /// Specifies the parameters within the Extended Capabilities element that are /// supported by the MAC entity. This is an optional parameter and may be NULL. /// - EFI_80211_ELEMENT_EXT_CAP *ExtCapElement; + EFI_80211_ELEMENT_EXT_CAP *ExtCapElement; /// /// Specifies the timeout interval when the result code is AssociateRefusedTemporarily. /// - EFI_80211_ELEMENT_TIMEOUT_VAL TimeoutInterval; + EFI_80211_ELEMENT_TIMEOUT_VAL TimeoutInterval; /// /// Specifies zero or more elements. This is an optional parameter and may be NULL. /// - UINT8 *VendorSpecificInfo; + UINT8 *VendorSpecificInfo; } EFI_80211_ASSOCIATE_RESULT; /// @@ -783,15 +783,15 @@ typedef struct { /// Specifies the address of the peer MAC entity with which to perform the /// disassociation process. /// - EFI_80211_MAC_ADDRESS BSSId; + EFI_80211_MAC_ADDRESS BSSId; /// /// Specifies the reason for initiating the disassociation process. /// - EFI_80211_REASON_CODE ReasonCode; + EFI_80211_REASON_CODE ReasonCode; /// /// Zero or more elements, may be NULL. /// - UINT8 *VendorSpecificInfo; + UINT8 *VendorSpecificInfo; } EFI_80211_DISASSOCIATE_DATA; /// @@ -802,7 +802,7 @@ typedef struct { /// This Event will be signaled after the Status field is updated by the EFI Wireless /// MAC Connection Protocol driver. The type of Event must be EFI_NOTIFY_SIGNAL. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Will be set to one of the following values: /// EFI_SUCCESS: Disassociation operation completed successfully. @@ -811,15 +811,15 @@ typedef struct { /// underlying hardware or software state. /// EFI_NOT_READY: The disassociation operation is started but not yet completed. /// - EFI_STATUS Status; + EFI_STATUS Status; /// /// Pointer to the disassociation data. /// - EFI_80211_DISASSOCIATE_DATA *Data; + EFI_80211_DISASSOCIATE_DATA *Data; /// /// Indicates the disassociation state. /// - EFI_80211_DISASSOCIATE_RESULT_CODE ResultCode; + EFI_80211_DISASSOCIATE_RESULT_CODE ResultCode; } EFI_80211_DISASSOCIATE_DATA_TOKEN; /// @@ -830,31 +830,31 @@ typedef struct { /// Specifies the address of the peer MAC entity with which to perform the /// authentication process. /// - EFI_80211_MAC_ADDRESS BSSId; + EFI_80211_MAC_ADDRESS BSSId; /// /// Specifies the type of authentication algorithm to use during the authentication /// process. /// - EFI_80211_AUTHENTICATION_TYPE AuthType; + EFI_80211_AUTHENTICATION_TYPE AuthType; /// /// Specifies a time limit in TU after which the authentication procedure is /// terminated. /// - UINT32 FailureTimeout; + UINT32 FailureTimeout; /// /// Specifies the set of elements to be included in the first message of the FT /// authentication sequence, may be NULL. /// - UINT8 *FTContent; + UINT8 *FTContent; /// /// Specifies the set of elements to be included in the SAE Commit Message or SAE /// Confirm Message, may be NULL. /// - UINT8 *SAEContent; + UINT8 *SAEContent; /// /// Zero or more elements, may be NULL. /// - UINT8 *VendorSpecificInfo; + UINT8 *VendorSpecificInfo; } EFI_80211_AUTHENTICATE_DATA; /// @@ -865,21 +865,21 @@ typedef struct { /// Specifies the address of the peer MAC entity from which the authentication request /// was received. /// - EFI_80211_MAC_ADDRESS BSSId; + EFI_80211_MAC_ADDRESS BSSId; /// /// Specifies the set of elements to be included in the second message of the FT /// authentication sequence, may be NULL. /// - UINT8 *FTContent; + UINT8 *FTContent; /// /// Specifies the set of elements to be included in the SAE Commit Message or SAE /// Confirm Message, may be NULL. /// - UINT8 *SAEContent; + UINT8 *SAEContent; /// /// Zero or more elements, may be NULL. /// - UINT8 *VendorSpecificInfo; + UINT8 *VendorSpecificInfo; } EFI_80211_AUTHENTICATE_RESULT; /// @@ -890,7 +890,7 @@ typedef struct { /// This Event will be signaled after the Status field is updated by the EFI Wireless /// MAC Connection Protocol driver. The type of Event must be EFI_NOTIFY_SIGNAL. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Will be set to one of the following values: /// EFI_SUCCESS: Authentication operation completed successfully. @@ -901,20 +901,20 @@ typedef struct { /// underlying hardware or software state. /// EFI_NOT_READY: The authentication operation is started but not yet completed. /// - EFI_STATUS Status; + EFI_STATUS Status; /// /// Pointer to the authentication data. /// - EFI_80211_AUTHENTICATE_DATA *Data; + EFI_80211_AUTHENTICATE_DATA *Data; /// /// Indicates the association state. /// - EFI_80211_AUTHENTICATE_RESULT_CODE ResultCode; + EFI_80211_AUTHENTICATE_RESULT_CODE ResultCode; /// /// Indicates the association result. It is caller's responsibility to free this /// buffer. /// - EFI_80211_AUTHENTICATE_RESULT *Result; + EFI_80211_AUTHENTICATE_RESULT *Result; } EFI_80211_AUTHENTICATE_DATA_TOKEN; /// @@ -925,15 +925,15 @@ typedef struct { /// Specifies the address of the peer MAC entity with which to perform the /// deauthentication process. /// - EFI_80211_MAC_ADDRESS BSSId; + EFI_80211_MAC_ADDRESS BSSId; /// /// Specifies the reason for initiating the deauthentication process. /// - EFI_80211_REASON_CODE ReasonCode; + EFI_80211_REASON_CODE ReasonCode; /// /// Zero or more elements, may be NULL. /// - UINT8 *VendorSpecificInfo; + UINT8 *VendorSpecificInfo; } EFI_80211_DEAUTHENTICATE_DATA; /// @@ -944,7 +944,7 @@ typedef struct { /// This Event will be signaled after the Status field is updated by the EFI Wireless /// MAC Connection Protocol driver. The type of Event must be EFI_NOTIFY_SIGNAL. /// - EFI_EVENT Event; + EFI_EVENT Event; /// /// Will be set to one of the following values: /// EFI_SUCCESS: Deauthentication operation completed successfully. @@ -954,11 +954,11 @@ typedef struct { /// EFI_NOT_READY: The deauthentication operation is started but not yet /// completed. /// - EFI_STATUS Status; + EFI_STATUS Status; /// /// Pointer to the deauthentication data. /// - EFI_80211_DEAUTHENTICATE_DATA *Data; + EFI_80211_DEAUTHENTICATE_DATA *Data; } EFI_80211_DEAUTHENTICATE_DATA_TOKEN; /** @@ -1111,13 +1111,13 @@ EFI_STATUS /// communication device that the EFI wireless network stack runs on. /// struct _EFI_WIRELESS_MAC_CONNECTION_PROTOCOL { - EFI_WIRELESS_MAC_CONNECTION_SCAN Scan; - EFI_WIRELESS_MAC_CONNECTION_ASSOCIATE Associate; - EFI_WIRELESS_MAC_CONNECTION_DISASSOCIATE Disassociate; - EFI_WIRELESS_MAC_CONNECTION_AUTHENTICATE Authenticate; - EFI_WIRELESS_MAC_CONNECTION_DEAUTHENTICATE Deauthenticate; + EFI_WIRELESS_MAC_CONNECTION_SCAN Scan; + EFI_WIRELESS_MAC_CONNECTION_ASSOCIATE Associate; + EFI_WIRELESS_MAC_CONNECTION_DISASSOCIATE Disassociate; + EFI_WIRELESS_MAC_CONNECTION_AUTHENTICATE Authenticate; + EFI_WIRELESS_MAC_CONNECTION_DEAUTHENTICATE Deauthenticate; }; -extern EFI_GUID gEfiWiFiProtocolGuid; +extern EFI_GUID gEfiWiFiProtocolGuid; #endif diff --git a/MdePkg/Include/Protocol/WiFi2.h b/MdePkg/Include/Protocol/WiFi2.h index 844e7447d0..1cdbb58712 100644 --- a/MdePkg/Include/Protocol/WiFi2.h +++ b/MdePkg/Include/Protocol/WiFi2.h @@ -60,10 +60,10 @@ typedef enum { /// EFI_80211_MAC_ADDRESS /// typedef struct { - UINT8 Addr[6]; + UINT8 Addr[6]; } EFI_80211_MAC_ADDRESS; -#define EFI_MAX_SSID_LEN 32 +#define EFI_MAX_SSID_LEN 32 /// /// EFI_80211_SSID @@ -72,11 +72,11 @@ typedef struct { // // Length in bytes of the SSId. If zero, ignore SSId field. // - UINT8 SSIdLen; + UINT8 SSIdLen; // // Specifies the service set identifier. // - UINT8 SSId[EFI_MAX_SSID_LEN]; + UINT8 SSId[EFI_MAX_SSID_LEN]; } EFI_80211_SSID; /// @@ -87,7 +87,7 @@ typedef struct { // The number of EFI_80211_SSID in SSIDList. If zero, SSIDList should be // ignored. // - UINT32 NumOfSSID; + UINT32 NumOfSSID; // // The SSIDList is a pointer to an array of EFI_80211_SSID instances. The // number of entries is specified by NumOfSSID. The array should only include @@ -95,7 +95,7 @@ typedef struct { // 10 elements in the SSIDList. It is the caller's responsibility to free // this buffer. // - EFI_80211_SSID SSIDList[1]; + EFI_80211_SSID SSIDList[1]; } EFI_80211_GET_NETWORKS_DATA; /// @@ -106,11 +106,11 @@ typedef struct { // Organization Unique Identifier, as defined in IEEE 802.11 standard, // usually set to 00-0F-AC. // - UINT8 Oui[3]; + UINT8 Oui[3]; // // Suites types, as defined in IEEE 802.11 standard. // - UINT8 SuiteType; + UINT8 SuiteType; } EFI_80211_SUITE_SELECTOR; /// @@ -121,12 +121,12 @@ typedef struct { // Indicates the number of AKM suite selectors that are contained in // AKMSuiteList. If zero, the AKMSuiteList is ignored. // - UINT16 AKMSuiteCount; + UINT16 AKMSuiteCount; // // A variable-length array of AKM suites, as defined in IEEE 802.11 standard, // Table 8-101. The number of entries is specified by AKMSuiteCount. // - EFI_80211_SUITE_SELECTOR AKMSuiteList[1]; + EFI_80211_SUITE_SELECTOR AKMSuiteList[1]; } EFI_80211_AKM_SUITE_SELECTOR; /// @@ -137,13 +137,13 @@ typedef struct { // Indicates the number of cipher suites that are contained in // CipherSuiteList. If zero, the CipherSuiteList is ignored. // - UINT16 CipherSuiteCount; + UINT16 CipherSuiteCount; // // A variable-length array of cipher suites, as defined in IEEE 802.11 // standard, Table 8-99. The number of entries is specified by // CipherSuiteCount. // - EFI_80211_SUITE_SELECTOR CipherSuiteList[1]; + EFI_80211_SUITE_SELECTOR CipherSuiteList[1]; } EFI_80211_CIPHER_SUITE_SELECTOR; /// @@ -153,19 +153,19 @@ typedef struct { // // Specifies the type of the BSS. // - EFI_80211_BSS_TYPE BSSType; + EFI_80211_BSS_TYPE BSSType; // // Specifies the SSID of the BSS. // - EFI_80211_SSID SSId; + EFI_80211_SSID SSId; // // Pointer to the AKM suites supported in the wireless network. // - EFI_80211_AKM_SUITE_SELECTOR *AKMSuite; + EFI_80211_AKM_SUITE_SELECTOR *AKMSuite; // // Pointer to the cipher suites supported in the wireless network. // - EFI_80211_CIPHER_SUITE_SELECTOR *CipherSuite; + EFI_80211_CIPHER_SUITE_SELECTOR *CipherSuite; } EFI_80211_NETWORK; /// @@ -175,12 +175,12 @@ typedef struct { // // Specifies the found wireless network. // - EFI_80211_NETWORK Network; + EFI_80211_NETWORK Network; // // Indicates the network quality as a value between 0 to 100, where 100 // indicates the highest network quality. // - UINT8 NetworkQuality; + UINT8 NetworkQuality; } EFI_80211_NETWORK_DESCRIPTION; /// @@ -191,12 +191,12 @@ typedef struct { // The number of EFI_80211_NETWORK_DESCRIPTION in NetworkDesc. If zero, // NetworkDesc should be ignored. // - UINT8 NumOfNetworkDesc; + UINT8 NumOfNetworkDesc; // // The NetworkDesc is a pointer to an array of EFI_80211_NETWORK_DESCRIPTION // instances. It is caller's responsibility to free this buffer. // - EFI_80211_NETWORK_DESCRIPTION NetworkDesc[1]; + EFI_80211_NETWORK_DESCRIPTION NetworkDesc[1]; } EFI_80211_GET_NETWORKS_RESULT; /// @@ -209,7 +209,7 @@ typedef struct { // Wireless MAC Connection Protocol II driver. The type of Event must be // EFI_NOTIFY_SIGNAL. // - EFI_EVENT Event; + EFI_EVENT Event; // // Will be set to one of the following values: // EFI_SUCCESS: The operation completed successfully. @@ -219,16 +219,16 @@ typedef struct { // hardware or software state. // EFI_NOT_READY: The operation is started but not yet completed. // - EFI_STATUS Status; + EFI_STATUS Status; // // Pointer to the input data for getting networks. // - EFI_80211_GET_NETWORKS_DATA *Data; + EFI_80211_GET_NETWORKS_DATA *Data; // // Indicates the scan result. It is caller's responsibility to free this // buffer. // - EFI_80211_GET_NETWORKS_RESULT *Result; + EFI_80211_GET_NETWORKS_RESULT *Result; } EFI_80211_GET_NETWORKS_TOKEN; /// @@ -238,14 +238,14 @@ typedef struct { // // Specifies the wireless network to connect to. // - EFI_80211_NETWORK *Network; + EFI_80211_NETWORK *Network; // // Specifies a time limit in seconds that is optionally present, after which // the connection establishment procedure is terminated by the UNDI driver. // This is an optional parameter and may be 0. Values of 5 seconds or higher // are recommended. // - UINT32 FailureTimeout; + UINT32 FailureTimeout; } EFI_80211_CONNECT_NETWORK_DATA; /// @@ -258,7 +258,7 @@ typedef struct { // Wireless MAC Connection Protocol II driver. The type of Event must be // EFI_NOTIFY_SIGNAL. // - EFI_EVENT Event; + EFI_EVENT Event; // // Will be set to one of the following values: // EFI_SUCCESS: The operation completed successfully. @@ -267,15 +267,15 @@ typedef struct { // hardware or software state. // EFI_NOT_READY: The operation is started but not yet completed. // - EFI_STATUS Status; + EFI_STATUS Status; // // Pointer to the connection data. // - EFI_80211_CONNECT_NETWORK_DATA *Data; + EFI_80211_CONNECT_NETWORK_DATA *Data; // // Indicates the connection state. // - EFI_80211_CONNECT_NETWORK_RESULT_CODE ResultCode; + EFI_80211_CONNECT_NETWORK_RESULT_CODE ResultCode; } EFI_80211_CONNECT_NETWORK_TOKEN; /// @@ -288,7 +288,7 @@ typedef struct { // Wireless MAC Connection Protocol II driver. The type of Event must be // EFI_NOTIFY_SIGNAL. // - EFI_EVENT Event; + EFI_EVENT Event; // // Will be set to one of the following values: // EFI_SUCCESS: The operation completed successfully @@ -296,7 +296,7 @@ typedef struct { // EFI_ACCESS_DENIED: The operation is not completed due to some underlying // hardware or software state. // - EFI_STATUS Status; + EFI_STATUS Status; } EFI_80211_DISCONNECT_NETWORK_TOKEN; /** @@ -325,7 +325,7 @@ typedef struct { **/ typedef EFI_STATUS -(EFIAPI *EFI_WIRELESS_MAC_CONNECTION_II_GET_NETWORKS) ( +(EFIAPI *EFI_WIRELESS_MAC_CONNECTION_II_GET_NETWORKS)( IN EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL *This, IN EFI_80211_GET_NETWORKS_TOKEN *Token ); @@ -356,7 +356,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_WIRELESS_MAC_CONNECTION_II_CONNECT_NETWORK) ( +(EFIAPI *EFI_WIRELESS_MAC_CONNECTION_II_CONNECT_NETWORK)( IN EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL *This, IN EFI_80211_CONNECT_NETWORK_TOKEN *Token ); @@ -385,7 +385,7 @@ EFI_STATUS **/ typedef EFI_STATUS -(EFIAPI *EFI_WIRELESS_MAC_CONNECTION_II_DISCONNECT_NETWORK) ( +(EFIAPI *EFI_WIRELESS_MAC_CONNECTION_II_DISCONNECT_NETWORK)( IN EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL *This, IN EFI_80211_DISCONNECT_NETWORK_TOKEN *Token ); @@ -397,11 +397,11 @@ EFI_STATUS /// network. /// struct _EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL { - EFI_WIRELESS_MAC_CONNECTION_II_GET_NETWORKS GetNetworks; - EFI_WIRELESS_MAC_CONNECTION_II_CONNECT_NETWORK ConnectNetwork; - EFI_WIRELESS_MAC_CONNECTION_II_DISCONNECT_NETWORK DisconnectNetwork; + EFI_WIRELESS_MAC_CONNECTION_II_GET_NETWORKS GetNetworks; + EFI_WIRELESS_MAC_CONNECTION_II_CONNECT_NETWORK ConnectNetwork; + EFI_WIRELESS_MAC_CONNECTION_II_DISCONNECT_NETWORK DisconnectNetwork; }; -extern EFI_GUID gEfiWiFi2ProtocolGuid; +extern EFI_GUID gEfiWiFi2ProtocolGuid; #endif -- cgit v1.2.3